[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2022-10-15 Thread Jakov Smolić 
commit: 3f8e8337b027ee645ffa46157294895add2efaf2
Author: Xin Yang  icloud  com>
AuthorDate: Sun Oct  9 06:51:58 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Oct 15 06:49:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f8e8337

app-accessibility/edbrowse: keyword edbrowse-3.8.2.1-r2 riscv #876253

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/27703
Signed-off-by: Jakov Smolić  gentoo.org>

 app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
index 98763b8f9d32..49a249f77266 100644
--- a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
>=app-text/htmltidy-5.0.0:=

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2022-05-30 Thread Sam James 
commit: c98a318359cc30c987843267d408df9088da3a95
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Mon May 30 22:50:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 30 23:05:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c98a3183

app-accessibility/edbrowse: edo

Signed-off-by: Anna Vyalkova  sysrq.in>
Closes: https://github.com/gentoo/gentoo/pull/25697
Signed-off-by: Sam James  gentoo.org>

 app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
index e9d16a2ecad8..98763b8f9d32 100644
--- a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit edo toolchain-funcs
 
 QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d
 QUICKJS_SHORT=2788d71
@@ -47,7 +47,7 @@ src_prepare() {
 src_compile() {
# First build quickjs so we can link to its static library.
# Also, quickjs doesn't appear to tag releases.
-   tools/quickjobfixup "${QUICKJS_S}" || die
+   edo tools/quickjobfixup "${QUICKJS_S}"
emake -C "${QUICKJS_S}" CC="$(tc-getCC)" AR="$(tc-getAR)" libquickjs.a
 
tc-export CC

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2022-05-30 Thread Sam James 
commit: 2eb272b17f3de35a778727c374ae4585b65ee775
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Mon May 30 22:23:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 30 23:05:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb272b1

app-accessibility/edbrowse: don't build unneeded quickjs parts

Signed-off-by: Anna Vyalkova  sysrq.in>
Signed-off-by: Sam James  gentoo.org>

 app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
index f5d434c6cd2d..6c2cb5e77961 100644
--- a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
@@ -38,7 +38,7 @@ src_compile() {
# First build quickjs so we can link to its static library.
# Also, quickjs doesn't appear to tag releases.
tools/quickjobfixup "${QUICKJS_S}" || die
-   emake -C "${QUICKJS_S}"
+   emake -C "${QUICKJS_S}" libquickjs.a
emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP=
 }

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2022-05-30 Thread Sam James 
commit: 03aa661269d1eca0515be75c6dad2ef743667629
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Mon May 30 22:11:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 30 23:05:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03aa6612

app-accessibility/edbrowse: depend on dev-db/unixODBC undonditionally

Closes: https://bugs.gentoo.org/843056
Signed-off-by: Anna Vyalkova  sysrq.in>
Signed-off-by: Sam James  gentoo.org>

 ...dbrowse-3.8.2.1-r1.ebuild => edbrowse-3.8.2.1-r2.ebuild} | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
similarity index 90%
rename from app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
rename to app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
index d9e6b8f22449..f5d434c6cd2d 100644
--- a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
@@ -15,23 +15,24 @@ 
SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="odbc"
 
 RDEPEND="
>=app-text/htmltidy-5.0.0:=
+   dev-db/unixODBC
dev-libs/libpcre2:=
net-misc/curl
sys-libs/readline:=
-   odbc? ( dev-db/unixODBC )"
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
dev-lang/perl
sys-apps/ed
-   virtual/pkgconfig"
+   virtual/pkgconfig
+"
 
-   PATCHES=(
-   "${FILESDIR}/${P}"-respect-ldflags.patch
-   )
+PATCHES=(
+   "${FILESDIR}/${P}"-respect-ldflags.patch
+)
 
 src_compile() {
# First build quickjs so we can link to its static library.

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/, app-accessibility/edbrowse/files/

2022-05-30 Thread Sam James 
commit: 9c671ac48e02078dad50e8e97bc453bea777609e
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Mon May 30 22:49:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 30 23:05:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c671ac4

app-accessibility/edbrowse: respect flags and toolchain

Closes: https://bugs.gentoo.org/843059
Signed-off-by: Anna Vyalkova  sysrq.in>
Signed-off-by: Sam James  gentoo.org>

 .../edbrowse/edbrowse-3.8.2.1-r2.ebuild| 14 +++-
 .../edbrowse-3.8.2.1-quickjs-respect-flags.patch   | 41 ++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
index 6c2cb5e77961..e9d16a2ecad8 100644
--- a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
+inherit toolchain-funcs
+
 QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d
 QUICKJS_SHORT=2788d71
 QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}"
@@ -34,11 +37,20 @@ PATCHES=(
"${FILESDIR}/${P}"-respect-ldflags.patch
 )
 
+src_prepare() {
+   default
+
+   cd "${QUICKJS_S}" || die
+   eapply "${FILESDIR}/${P}"-quickjs-respect-flags.patch
+}
+
 src_compile() {
# First build quickjs so we can link to its static library.
# Also, quickjs doesn't appear to tag releases.
tools/quickjobfixup "${QUICKJS_S}" || die
-   emake -C "${QUICKJS_S}" libquickjs.a
+   emake -C "${QUICKJS_S}" CC="$(tc-getCC)" AR="$(tc-getAR)" libquickjs.a
+
+   tc-export CC
emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP=
 }
 

diff --git 
a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch
new file mode 100644
index ..f0af474427f0
--- /dev/null
+++ 
b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch
@@ -0,0 +1,41 @@
+* Don't overwrite CFLAGS
+* Respect CPPFLAGS
+
+--- a/Makefile
 b/Makefile
+@@ -66,7 +66,7 @@
+ ifdef CONFIG_CLANG
+   HOST_CC=clang
+   CC=$(CROSS_PREFIX)clang
+-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
++  CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wextra
+   CFLAGS += -Wno-sign-compare
+   CFLAGS += -Wno-missing-field-initializers
+@@ -87,7 +87,7 @@
+ else
+   HOST_CC=gcc
+   CC=$(CROSS_PREFIX)gcc
+-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
++  CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wno-array-bounds -Wno-format-truncation
+   ifdef CONFIG_LTO
+ AR=$(CROSS_PREFIX)gcc-ar
+@@ -110,7 +110,7 @@
+ CFLAGS+=$(DEFINES)
+ CFLAGS_DEBUG=$(CFLAGS) -O0
+ CFLAGS_SMALL=$(CFLAGS) -Os
+-CFLAGS_OPT=$(CFLAGS) -O2
++CFLAGS_OPT=$(CFLAGS)
+ CFLAGS_NOLTO:=$(CFLAGS_OPT)
+ LDFLAGS=-g
+ ifdef CONFIG_LTO
+@@ -269,7 +269,7 @@
+   $(CC) $(CFLAGS_OPT) -fPIC -DJS_SHARED_LIBRARY -c -o $@ $<
+ 
+ $(OBJDIR)/%.nolto.o: %.c | $(OBJDIR)
+-  $(CC) $(CFLAGS_NOLTO) -c -o $@ $<
++  $(CC) $(CFLAGS_NOLTO) $(CPPFLAGS) -c -o $@ $<
+ 
+ $(OBJDIR)/%.m32.o: %.c | $(OBJDIR)
+   $(CC) -m32 $(CFLAGS_OPT) -c -o $@ $<

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2022-05-06 Thread Sam James 
commit: 86c10f9667c5954680d93701030465d9171feb5f
Author: Sam James  gentoo  org>
AuthorDate: Sat May  7 05:33:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  7 05:33:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c10f96

app-accessibility/edbrowse: revbump for libpcre2 dep change

Signed-off-by: Sam James  gentoo.org>

 .../edbrowse/{edbrowse-3.8.2.1.ebuild => edbrowse-3.8.2.1-r1.ebuild}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
similarity index 100%
rename from app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild
rename to app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2022-05-06 Thread William Hubbs 
commit: 3c587f82ba61c75c873112414e54432da573f600
Author: William Hubbs  gentoo  org>
AuthorDate: Sat May  7 01:11:33 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Sat May  7 01:11:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c587f82

app-accessibility/edbrowse: fix libpcre2 dependency

Signed-off-by: William Hubbs  gentoo.org>

 app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild
index 53a246557d29..d9e6b8f22449 100644
--- a/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild
@@ -19,7 +19,7 @@ IUSE="odbc"
 
 RDEPEND="
>=app-text/htmltidy-5.0.0:=
-   dev-libs/libpcre:=
+   dev-libs/libpcre2:=
net-misc/curl
sys-libs/readline:=
odbc? ( dev-db/unixODBC )"

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/, app-accessibility/edbrowse/files/

2022-05-06 Thread William Hubbs 
commit: 07be3fee9291d14d24c36c3c5215ef90331b18f5
Author: William Hubbs  gentoo  org>
AuthorDate: Fri May  6 16:22:41 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri May  6 16:23:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07be3fee

app-accessibility/edbrowse: add 3.8.2.1

Closes: https://bugs.gentoo.org/732616
Closes: https://bugs.gentoo.org/838001
Signed-off-by: William Hubbs  gentoo.org>

 app-accessibility/edbrowse/Manifest|  2 +
 app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild | 50 ++
 .../files/edbrowse-3.8.2.1-respect-ldflags.patch   | 13 ++
 3 files changed, 65 insertions(+)

diff --git a/app-accessibility/edbrowse/Manifest 
b/app-accessibility/edbrowse/Manifest
index 383cdd368c26..85a299692e6d 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1 +1,3 @@
 DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 
7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e
 SHA512 
ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a
+DIST edbrowse-3.8.2.1.tar.gz 909574 BLAKE2B 
e5358861f6747dfe12498403b2d4761ab16dabc513fe94455d88c44e07793fb1128b0c1b7ebdf9ef922e371148182f8127f67f11eb123877e804858cb7e6378b
 SHA512 
b5774a836efe96aae77052b02f6fcc85920b5f86a6ab8436a6dc363d81531b30e7f9c7555aacb20af27e59565042bdd685eed2acd4dfde8b99e2ad0358f19927
+DIST quickjs-2788d71.tar.gz 599260 BLAKE2B 
67618f491c3efd1aa15a8906557983dd7123a3cfb2584f2f499f005667ccac4ded1c77934d2807cfce9e042572c6c41d63982b3df7afab5b2c67f4ce9f357879
 SHA512 
4493d11bc60855711955e0159e9f568d7e3db59c9843ef3aae00846f82c5e33f501372f7f5861b431353355f400f77720f3265963ea7bc0e38635ab5b89a27a0

diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild
new file mode 100644
index ..53a246557d29
--- /dev/null
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d
+QUICKJS_SHORT=2788d71
+QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}"
+QUICKJS_P="quickjs-${QUICKJS_SHORT}"
+
+DESCRIPTION="Combination editor, browser, and mail client that is 100% text 
based"
+HOMEPAGE="https://edbrowse.org;
+SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz
+   https://github.com/bellard/quickjs/archive/${QUICKJS_HASH}.tar.gz -> 
${QUICKJS_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="odbc"
+
+RDEPEND="
+   >=app-text/htmltidy-5.0.0:=
+   dev-libs/libpcre:=
+   net-misc/curl
+   sys-libs/readline:=
+   odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-lang/perl
+   sys-apps/ed
+   virtual/pkgconfig"
+
+   PATCHES=(
+   "${FILESDIR}/${P}"-respect-ldflags.patch
+   )
+
+src_compile() {
+   # First build quickjs so we can link to its static library.
+   # Also, quickjs doesn't appear to tag releases.
+   tools/quickjobfixup "${QUICKJS_S}" || die
+   emake -C "${QUICKJS_S}"
+   emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP=
+}
+
+src_install() {
+   dobin src/edbrowse
+   newman doc/man-edbrowse-debian.1 edbrowse.1
+   DOCS="doc/sample*"
+   HTML_DOCS="doc/*.html"
+   einstalldocs
+}

diff --git 
a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch
new file mode 100644
index ..3b511e1d2b38
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/src/makefile b/src/makefile
+index d65369a3..410d3e9d 100644
+--- a/src/makefile
 b/src/makefile
+@@ -31,7 +31,7 @@ endif
+ CFLAGS += $(DEBUGFLAGS)
+ 
+ #  Libraries and linker flags for edbrowse.
+-LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm
++LDFLAGS += $(STRIP) $(LINKER_LIBS) -lpthread -lm
+ 
+ # LDFLAGS for quickjs loading.
+ QUICKJS_LDFLAGS = $(QUICKJS_DIR)/libquickjs.a -ldl

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/, app-accessibility/edbrowse/files/

2022-05-06 Thread William Hubbs 
commit: d3e4ffec4b46ce737b74a003a60cb97d475b2360
Author: William Hubbs  gentoo  org>
AuthorDate: Fri May  6 16:25:16 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri May  6 16:25:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e4ffec

app-accessibility/edbrowse: drop 3.7.5.1-r3

Signed-off-by: William Hubbs  gentoo.org>

 app-accessibility/edbrowse/Manifest|  1 -
 .../edbrowse/edbrowse-3.7.5.1-r3.ebuild| 45 --
 .../files/edbrowse-3.7.5.1-fno-common.patch| 11 --
 .../edbrowse/files/edbrowse-3.7.5.1-manpage.patch  | 23 ---
 4 files changed, 80 deletions(-)

diff --git a/app-accessibility/edbrowse/Manifest 
b/app-accessibility/edbrowse/Manifest
index 85a299692e6d..d44dfe55ad02 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,3 +1,2 @@
-DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 
7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e
 SHA512 
ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a
 DIST edbrowse-3.8.2.1.tar.gz 909574 BLAKE2B 
e5358861f6747dfe12498403b2d4761ab16dabc513fe94455d88c44e07793fb1128b0c1b7ebdf9ef922e371148182f8127f67f11eb123877e804858cb7e6378b
 SHA512 
b5774a836efe96aae77052b02f6fcc85920b5f86a6ab8436a6dc363d81531b30e7f9c7555aacb20af27e59565042bdd685eed2acd4dfde8b99e2ad0358f19927
 DIST quickjs-2788d71.tar.gz 599260 BLAKE2B 
67618f491c3efd1aa15a8906557983dd7123a3cfb2584f2f499f005667ccac4ded1c77934d2807cfce9e042572c6c41d63982b3df7afab5b2c67f4ce9f357879
 SHA512 
4493d11bc60855711955e0159e9f568d7e3db59c9843ef3aae00846f82c5e33f501372f7f5861b431353355f400f77720f3265963ea7bc0e38635ab5b89a27a0

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
deleted file mode 100644
index 5fc5f1ffa3c1..
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Combination editor, browser, and mail client that is 100% text 
based"
-HOMEPAGE="http://edbrowse.org;
-SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="odbc"
-
-RDEPEND="
-   >=app-text/htmltidy-5.0.0:=
-   dev-lang/duktape:=
-   dev-libs/libpcre:=
-   net-misc/curl
-   sys-libs/readline:=
-   odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   dev-lang/perl
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-fno-common.patch
-   "${FILESDIR}"/${P}-manpage.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${PF}:" 
CMakeLists.txt || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_EDBR_ODBC=$(usex odbc)
-   )
-   cmake_src_configure
-}

diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
deleted file mode 100644
index bf9fa08245da..
--- a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/src/eb.h
-+++ b/src/eb.h
-@@ -287,7 +287,7 @@ extern char *sslCerts; /* ssl certificates to 
validate the secure server */
- extern int verifyCertificates;/* is a certificate required for the 
ssl connection? */
- extern int displayLength; // when printing a line
- extern int formatLineLength;  // when formatting html
--bool formatOverflow;
-+extern bool formatOverflow;
- extern int webTimeout, mailTimeout;
- extern uchar browseLocal;
- extern bool sqlPresent;   /* Was edbrowse compiled with SQL built 
in? */

diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
deleted file mode 100644
index f0d667669113..
--- a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -249,19 +249,7 @@ if (UNIX)
- endif()
- # copy to build dir
- configure_file( ${UnixManFile} ${CMAKE_BINARY_DIR}/edbrowse.1 )
--# find 'gzip' - warn if not...
--find_program(GZIP_EXE gzip PATHS /bin )
--if (GZIP_EXE)
--# gzip it in place
--execute_process(COMMAND ${GZIP_EXE} -f "edbrowse.1"
--WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
--INPUT_FILE edbrowse.1
--OUTPUT_FILE edbrowse.1.gz )
--# install it
--  install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1.gz DESTINATION 
${UnixManDir})
--else ()
--

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2022-04-12 Thread Sam James 
commit: 317dc70c77720e33a44eafa7ab9412b7a395c785
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 12 07:34:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 12 07:54:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317dc70c

app-accessibility/edbrowse: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 app-accessibility/edbrowse/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-accessibility/edbrowse/metadata.xml 
b/app-accessibility/edbrowse/metadata.xml
index 83094582472e..98abcd56c4be 100644
--- a/app-accessibility/edbrowse/metadata.xml
+++ b/app-accessibility/edbrowse/metadata.xml
@@ -5,4 +5,7 @@
accessibil...@gentoo.org
Gentoo Accessibility Project
 
+
+   CMB/edbrowse
+

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2021-11-11 Thread Sam James 
commit: c08b9eb3810857cb8a127fc9b2f43c56c3c3d345
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Thu Oct 28 21:36:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 12 02:04:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c08b9eb3

app-accessibility/edbrowse: Add := on relevant deps

This also drops app-text/tidy-html5 as it is last-rited as you can't have :=
inside ||( … )

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/22747
Signed-off-by: Sam James  gentoo.org>

 .../{edbrowse-3.7.5.1-r2.ebuild => edbrowse-3.7.5.1-r3.ebuild}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
similarity index 94%
rename from app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild
rename to app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
index 0a2e00cc87a..5fc5f1ffa3c 100644
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
@@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="odbc"
 
 RDEPEND="
-   >=app-text/htmltidy-5.0.0
+   >=app-text/htmltidy-5.0.0:=
dev-lang/duktape:=
-   dev-libs/libpcre
+   dev-libs/libpcre:=
net-misc/curl
sys-libs/readline:=
odbc? ( dev-db/unixODBC )"

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2021-11-10 Thread Jakov Smolić 
commit: 6197b189f67e7cca5f444e48eb7a41bf04834b24
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Nov 10 12:24:51 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Nov 10 12:48:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6197b189

app-accessibility/edbrowse: Remove app-text/tidy-html5 dep

Signed-off-by: Jakov Smolić  gentoo.org>

 app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild
index c83ed47a9aa..0a2e00cc87a 100644
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="odbc"
 
 RDEPEND="
-   || ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 )
+   >=app-text/htmltidy-5.0.0
dev-lang/duktape:=
dev-libs/libpcre
net-misc/curl

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2021-08-29 Thread Sam James 
commit: 3af0f9c51b3fa750aab08c5f81d3d8d7fbadf91e
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 29 18:24:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 29 18:28:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af0f9c5

app-accessibility/edbrowse: [QA] revbump for changed RDEPEND

It's necessary to have a revision bump for changes in RDEPEND,
but especially where we're changing the providers of an
any-of || ( ... ) dependency.

In this case, if one already has edbrowse installed,
once/if tidy-html5 is masked for removal (which seems to be
the plan), there's no reason the package manage is obligated
to realise that the existing ebuild was modified to allow
htmltidy instead. Hence, a revision bump is required
to apply the metadata change.

Fixes: cbe72b5751be392c4b8b2ba2b39cc582182d983a
Signed-off-by: Sam James  gentoo.org>

 .../edbrowse/{edbrowse-3.7.5.1-r1.ebuild => edbrowse-3.7.5.1-r2.ebuild}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild
similarity index 100%
rename from app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
rename to app-accessibility/edbrowse/edbrowse-3.7.5.1-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2021-08-27 Thread Marek Szuba 
commit: cbe72b5751be392c4b8b2ba2b39cc582182d983a
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Aug 27 10:26:04 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Aug 27 10:26:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe72b57

app-accessibility/edbrowse: allow both htmltidy-5+ and tidy-html5

Signed-off-by: Marek Szuba  gentoo.org>

 app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
index fe983eda819..c83ed47a9aa 100644
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="odbc"
 
 RDEPEND="
-   app-text/tidy-html5
+   || ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 )
dev-lang/duktape:=
dev-libs/libpcre
net-misc/curl

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/, app-accessibility/edbrowse/files/

2020-12-28 Thread David Seifert 
commit: 45a96dfad92d10a438656a79f1e7a54abcb108bb
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Dec 28 14:15:29 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 28 14:15:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a96dfa

app-accessibility/edbrowse: Fix build with gcc-10

* Thanks to Sam James for providing the patch link
* Port to cmake eclass
* Additional minor cleanup

Closes: https://bugs.gentoo.org/707500
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../edbrowse/edbrowse-3.7.5.1-r1.ebuild| 23 ++
 .../files/edbrowse-3.7.5.1-fno-common.patch| 11 +++
 .../edbrowse/files/edbrowse-3.7.5.1-manpage.patch  | 23 ++
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
index 1f0f66a9bb1..fe983eda819 100644
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils
+
+inherit cmake
 
 DESCRIPTION="Combination editor, browser, and mail client that is 100% text 
based"
 HOMEPAGE="http://edbrowse.org;
@@ -15,24 +16,30 @@ IUSE="odbc"
 
 RDEPEND="
app-text/tidy-html5
-   >=net-misc/curl-7.36.0
-   >=dev-libs/libpcre-7.8
-   >=sys-libs/readline-6.0
dev-lang/duktape:=
+   dev-libs/libpcre
+   net-misc/curl
+   sys-libs/readline:=
odbc? ( dev-db/unixODBC )"
 DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
+BDEPEND="
dev-lang/perl
virtual/pkgconfig"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-fno-common.patch
+   "${FILESDIR}"/${P}-manpage.patch
+)
+
 src_prepare() {
-   sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${P}:" 
CMakeLists.txt
-   cmake-utils_src_prepare
+   cmake_src_prepare
+
+   sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${PF}:" 
CMakeLists.txt || die
 }
 
 src_configure() {
local mycmakeargs=(
-DBUILD_EDBR_ODBC=$(usex odbc)
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }

diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
new file mode 100644
index 000..bf9fa08245d
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/eb.h
 b/src/eb.h
+@@ -287,7 +287,7 @@ extern char *sslCerts; /* ssl certificates to 
validate the secure server */
+ extern int verifyCertificates;/* is a certificate required for the 
ssl connection? */
+ extern int displayLength; // when printing a line
+ extern int formatLineLength;  // when formatting html
+-bool formatOverflow;
++extern bool formatOverflow;
+ extern int webTimeout, mailTimeout;
+ extern uchar browseLocal;
+ extern bool sqlPresent;   /* Was edbrowse compiled with SQL built 
in? */

diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
new file mode 100644
index 000..f0d66766911
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -249,19 +249,7 @@ if (UNIX)
+ endif()
+ # copy to build dir
+ configure_file( ${UnixManFile} ${CMAKE_BINARY_DIR}/edbrowse.1 )
+-# find 'gzip' - warn if not...
+-find_program(GZIP_EXE gzip PATHS /bin )
+-if (GZIP_EXE)
+-# gzip it in place
+-execute_process(COMMAND ${GZIP_EXE} -f "edbrowse.1"
+-WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-INPUT_FILE edbrowse.1
+-OUTPUT_FILE edbrowse.1.gz )
+-# install it
+-  install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1.gz DESTINATION 
${UnixManDir})
+-else ()
+-message(WARNING "Unable to locate 'gzip'! No man page...")
+-endif ()
++install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1 DESTINATION ${UnixManDir})
+ # install user guide
+ install(FILES doc/usersguide.html doc/usersguide_fr.html doc/sample.ebrc 
doc/sample_fr.ebrc doc/sample_it.ebrc DESTINATION ${UnixDocDir})
+ endif ()

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2020-11-13 Thread Sam James 
commit: 52780a4126eb29c167121c7f6151e03c5af23229
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 13 16:57:13 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 13 16:57:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52780a41

app-accessibility/edbrowse: subscribe to dev-lang/duktape subslot

Bug: https://bugs.gentoo.org/730188
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 .../edbrowse/{edbrowse-3.7.5.1.ebuild => edbrowse-3.7.5.1-r1.ebuild}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
similarity index 97%
rename from app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild
rename to app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
index f2a61e23958..1f0f66a9bb1 100644
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
>=net-misc/curl-7.36.0
>=dev-libs/libpcre-7.8
>=sys-libs/readline-6.0
-   dev-lang/duktape
+   dev-lang/duktape:=
odbc? ( dev-db/unixODBC )"
 DEPEND="${RDEPEND}"
 BDEPEND="${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2020-01-21 Thread Mart Raudsepp 
commit: a99c30b5dc9a9c4eb10667796ba9c6c23669d72f
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Jan 21 22:25:26 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Jan 21 22:25:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a99c30b5

app-accessibility/edbrowse: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-accessibility/edbrowse/Manifest  |  1 -
 app-accessibility/edbrowse/edbrowse-3.7.4.ebuild | 38 
 2 files changed, 39 deletions(-)

diff --git a/app-accessibility/edbrowse/Manifest 
b/app-accessibility/edbrowse/Manifest
index 69aa7a81dfe..383cdd368c2 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,2 +1 @@
-DIST edbrowse-3.7.4.tar.gz 765794 BLAKE2B 
5d428ca3923e26d5b3f204d5aba37a08bbfc50345b18718e5a281521361da4920ea12d68a5013bb688e95f178be8903bede1bef5b3cd626a0e6084141188d878
 SHA512 
79b2b450b6f54f3d74b7c722f223b3340b3ddfa1cbff2d69adcd1cd4ffb76b78a812a35a053cf224a74543020ef8423cd68eafa9a277451245d383065fb1595d
 DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 
7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e
 SHA512 
ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.4.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.4.ebuild
deleted file mode 100644
index 91fd4cd8a6e..000
--- a/app-accessibility/edbrowse/edbrowse-3.7.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils
-
-DESCRIPTION="Combination editor, browser, and mail client that is 100% text 
based"
-HOMEPAGE="http://edbrowse.org;
-SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="odbc"
-
-RDEPEND="
-   app-text/tidy-html5
-   >=net-misc/curl-7.36.0
-   >=dev-libs/libpcre-7.8
-   >=sys-libs/readline-6.0
-   dev-lang/duktape
-   odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
-   dev-lang/perl
-   virtual/pkgconfig"
-
-src_prepare() {
-   sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${P}:" 
CMakeLists.txt
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_EDBR_ODBC=$(usex odbc)
-   )
-   cmake-utils_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2020-01-21 Thread Mart Raudsepp 
commit: 334107a0961fc051dc38b4c28e69d8354129a03c
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Jan 21 22:24:47 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Jan 21 22:25:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=334107a0

app-accessibility/edbrowse: bump to 3.7.5.1

Fixes compilation against newer curl's API break

Closes: https://bugs.gentoo.org/683168
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-accessibility/edbrowse/Manifest|  1 +
 app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild | 38 ++
 2 files changed, 39 insertions(+)

diff --git a/app-accessibility/edbrowse/Manifest 
b/app-accessibility/edbrowse/Manifest
index 7e87a04dc80..69aa7a81dfe 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1 +1,2 @@
 DIST edbrowse-3.7.4.tar.gz 765794 BLAKE2B 
5d428ca3923e26d5b3f204d5aba37a08bbfc50345b18718e5a281521361da4920ea12d68a5013bb688e95f178be8903bede1bef5b3cd626a0e6084141188d878
 SHA512 
79b2b450b6f54f3d74b7c722f223b3340b3ddfa1cbff2d69adcd1cd4ffb76b78a812a35a053cf224a74543020ef8423cd68eafa9a277451245d383065fb1595d
+DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 
7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e
 SHA512 
ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild
new file mode 100644
index 000..f2a61e23958
--- /dev/null
+++ b/app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils
+
+DESCRIPTION="Combination editor, browser, and mail client that is 100% text 
based"
+HOMEPAGE="http://edbrowse.org;
+SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="odbc"
+
+RDEPEND="
+   app-text/tidy-html5
+   >=net-misc/curl-7.36.0
+   >=dev-libs/libpcre-7.8
+   >=sys-libs/readline-6.0
+   dev-lang/duktape
+   odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+   dev-lang/perl
+   virtual/pkgconfig"
+
+src_prepare() {
+   sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${P}:" 
CMakeLists.txt
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_EDBR_ODBC=$(usex odbc)
+   )
+   cmake-utils_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/files/, app-accessibility/edbrowse/

2019-05-01 Thread Mart Raudsepp 
commit: 828fa8d35abaafd811ed5f8508d781975d2327e1
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed May  1 22:42:11 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed May  1 22:42:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=828fa8d3

app-accessibility/edbrowse: remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-accessibility/edbrowse/Manifest|  1 -
 app-accessibility/edbrowse/edbrowse-3.5.1.ebuild   | 60 --
 .../files/edbrowse-3.5.1-implicit-decl.patch   | 22 
 3 files changed, 83 deletions(-)

diff --git a/app-accessibility/edbrowse/Manifest 
b/app-accessibility/edbrowse/Manifest
index ab7c37f33f7..7e87a04dc80 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,2 +1 @@
-DIST edbrowse-3.5.1.zip 745277 BLAKE2B 
2256faf58de68ab2d19d3137ddaaa92dbfdfff581d83c9f2b58e0e161c10aaa5c867dbf8b81da77f21abdd5c1a07d882abafff4bcfc0706fc33a73b7ba6bc087
 SHA512 
83bdb1d49afa04a41a84b71e86969880b518d8d6c1e448380d70710ad2373ed57cb3699d3ad50226ea4d5776f511ff50b9510655b27d26948213113699512fc2
 DIST edbrowse-3.7.4.tar.gz 765794 BLAKE2B 
5d428ca3923e26d5b3f204d5aba37a08bbfc50345b18718e5a281521361da4920ea12d68a5013bb688e95f178be8903bede1bef5b3cd626a0e6084141188d878
 SHA512 
79b2b450b6f54f3d74b7c722f223b3340b3ddfa1cbff2d69adcd1cd4ffb76b78a812a35a053cf224a74543020ef8423cd68eafa9a277451245d383065fb1595d

diff --git a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
deleted file mode 100644
index c8e5ad5fdf8..000
--- a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils
-
-DESCRIPTION="editor, browser, and mail client using the /bin/ed interface"
-HOMEPAGE="http://the-brannons.com/edbrowse/;
-SRC_URI="http://the-brannons.com/${PN}/${P}.zip;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl odbc l10n_fr"
-
-COMMON_DEPEND=">=dev-lang/spidermonkey-24.0:24
-   >=sys-libs/readline-6.0
-   >=net-misc/curl-7.36.0
-   >=dev-libs/libpcre-7.8
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   odbc? ( dev-db/unixODBC )"
-DEPEND="${COMMON_DEPEND}
-   virtual/pkgconfig
-   app-arch/unzip"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-   epatch "${FILESDIR}/${P}-implicit-decl.patch"
-}
-
-src_compile() {
-   jscppflags=$(pkg-config --cflags mozjs-24)
-   jslib=$(pkg-config --libs mozjs-24)
-   emake prefix=/usr JSLIB="${jslib}" JS_CXXFLAGS="${jscppflags}" STRIP=''
-   if use odbc; then
-   # Top-level makefile doesn't have this target.
-   cd src
-   emake prefix=/usr JSLIB="${jslib}" JS_CXXFLAGS="${jscppflags}" STRIP=''
-   cd ..
-   fi
-}
-
-src_install() {
-   cd src
-   emake prefix=/usr DESTDIR="${D}" install
-   if use odbc; then
-   dobin edbrowseodbc
-   fi
-   cd ..
-   dodoc CHANGES README todo
-   cd doc
-   dobin setup.ebrc
-   dohtml usersguide.html philosophy.html
-   dodoc sample.ebrc
-   if use l10n_fr; then
-   dohtml usersguide_fr.html philosophy_fr.html
-   dodoc sample_fr.ebrc
-   fi
-}

diff --git 
a/app-accessibility/edbrowse/files/edbrowse-3.5.1-implicit-decl.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.5.1-implicit-decl.patch
deleted file mode 100644
index 1880d2b3bfe..000
--- a/app-accessibility/edbrowse/files/edbrowse-3.5.1-implicit-decl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur edbrowse-3.5.1/src/fetchmail.c edbrowse-3.5.1.new/src/fetchmail.c
 edbrowse-3.5.1/src/fetchmail.c 2014-09-23 21:50:37.0 -0700
-+++ edbrowse-3.5.1.new/src/fetchmail.c 2014-09-29 02:29:46.193856866 -0700
-@@ -6,6 +6,7 @@
-  * This file is part of the edbrowse project, released under GPL.
-  */
- 
-+#define _GNU_SOURCE
- #include "eb.h"
- 
- #define MHLINE 200/* length of a mail header line */
-diff -Naur edbrowse-3.5.1/src/sendmail.c edbrowse-3.5.1.new/src/sendmail.c
 edbrowse-3.5.1/src/sendmail.c  2014-09-23 21:50:37.0 -0700
-+++ edbrowse-3.5.1.new/src/sendmail.c  2014-09-29 02:29:37.105874233 -0700
-@@ -5,6 +5,7 @@
-  * This file is part of the edbrowse project, released under GPL.
-  */
- 
-+#define _GNU_SOURCE
- #include "eb.h"
- 
- #include

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2019-05-01 Thread Mart Raudsepp 
commit: 44f25e22e07a4b11a185ed086f51872bd9febe19
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed May  1 22:41:32 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed May  1 22:42:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f25e22

app-accessibility/edbrowse: bump to 3.7.4

Uses duktape instead of old mozjs/spidermonkey version.
Ported to use new cmake system. Hopefully fixing the two
edbrowseodbc bugs along the way (not tested).

Closes: https://bugs.gentoo.org/632632
Closes: https://bugs.gentoo.org/638722
Closes: https://bugs.gentoo.org/556924
Closes: https://bugs.gentoo.org/625334
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-accessibility/edbrowse/Manifest  |  1 +
 app-accessibility/edbrowse/edbrowse-3.7.4.ebuild | 38 
 2 files changed, 39 insertions(+)

diff --git a/app-accessibility/edbrowse/Manifest 
b/app-accessibility/edbrowse/Manifest
index 1405c487735..ab7c37f33f7 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1 +1,2 @@
 DIST edbrowse-3.5.1.zip 745277 BLAKE2B 
2256faf58de68ab2d19d3137ddaaa92dbfdfff581d83c9f2b58e0e161c10aaa5c867dbf8b81da77f21abdd5c1a07d882abafff4bcfc0706fc33a73b7ba6bc087
 SHA512 
83bdb1d49afa04a41a84b71e86969880b518d8d6c1e448380d70710ad2373ed57cb3699d3ad50226ea4d5776f511ff50b9510655b27d26948213113699512fc2
+DIST edbrowse-3.7.4.tar.gz 765794 BLAKE2B 
5d428ca3923e26d5b3f204d5aba37a08bbfc50345b18718e5a281521361da4920ea12d68a5013bb688e95f178be8903bede1bef5b3cd626a0e6084141188d878
 SHA512 
79b2b450b6f54f3d74b7c722f223b3340b3ddfa1cbff2d69adcd1cd4ffb76b78a812a35a053cf224a74543020ef8423cd68eafa9a277451245d383065fb1595d

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.4.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.4.ebuild
new file mode 100644
index 000..91fd4cd8a6e
--- /dev/null
+++ b/app-accessibility/edbrowse/edbrowse-3.7.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils
+
+DESCRIPTION="Combination editor, browser, and mail client that is 100% text 
based"
+HOMEPAGE="http://edbrowse.org;
+SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="odbc"
+
+RDEPEND="
+   app-text/tidy-html5
+   >=net-misc/curl-7.36.0
+   >=dev-libs/libpcre-7.8
+   >=sys-libs/readline-6.0
+   dev-lang/duktape
+   odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+   dev-lang/perl
+   virtual/pkgconfig"
+
+src_prepare() {
+   sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${P}:" 
CMakeLists.txt
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_EDBR_ODBC=$(usex odbc)
+   )
+   cmake-utils_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2016-07-03 Thread Ulrich Müller 
commit: 50972cd3e8ebb2dccb938140445b3c9044105f09
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jul  3 16:29:23 2016 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul  3 16:39:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50972cd3

app-accessibility/edbrowse: Migrate from LINGUAS to L10N.

Package-Manager: portage-2.3.0

 app-accessibility/edbrowse/edbrowse-3.5.1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
index c26fb87..4239a3a 100644
--- a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
@@ -8,10 +8,12 @@ inherit eutils
 DESCRIPTION="editor, browser, and mail client using the /bin/ed interface"
 HOMEPAGE="http://the-brannons.com/edbrowse/;
 SRC_URI="http://the-brannons.com/${PN}/${P}.zip;
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl linguas_fr odbc"
+IUSE="libressl odbc l10n_fr"
+
 COMMON_DEPEND=">=dev-lang/spidermonkey-24.0:24
>=sys-libs/readline-6.0
>=net-misc/curl-7.36.0
@@ -52,7 +54,7 @@ src_install() {
dobin setup.ebrc
dohtml usersguide.html philosophy.html
dodoc sample.ebrc
-   if use linguas_fr; then
+   if use l10n_fr; then
dohtml usersguide_fr.html philosophy_fr.html
dodoc sample_fr.ebrc
fi

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2016-03-21 Thread Anthony G. Basile 
commit: 4f7c9faa26a969cedaadeb8368731d1760e18e36
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Mar 21 21:18:29 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Mar 21 21:19:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f7c9faa

app-accessibility/edbrowse: fix openssl and libressl slots

Package-Manager: portage-2.2.26

 app-accessibility/edbrowse/edbrowse-3.5.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
index 853813e..c26fb87 100644
--- a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,8 +16,8 @@ COMMON_DEPEND=">=dev-lang/spidermonkey-24.0:24
>=sys-libs/readline-6.0
>=net-misc/curl-7.36.0
>=dev-libs/libpcre-7.8
-   !libressl? ( dev-libs/openssl:0 )
-   libressl? ( dev-libs/libressl )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
odbc? ( dev-db/unixODBC )"
 DEPEND="${COMMON_DEPEND}
virtual/pkgconfig

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/

2015-12-15 Thread Anthony G. Basile 
commit: 4fdb03b4cced904517520a04aa98b6916d66fe42
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Dec 15 20:43:47 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Dec 15 20:44:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fdb03b4

app-accessibility/edbrowse: bump to EAPI=5 and add libressl support

Package-Manager: portage-2.2.24

 app-accessibility/edbrowse/edbrowse-3.5.1.ebuild | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
index 1c2a80b..853813e 100644
--- a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 inherit eutils
 
 DESCRIPTION="editor, browser, and mail client using the /bin/ed interface"
@@ -11,12 +11,13 @@ SRC_URI="http://the-brannons.com/${PN}/${P}.zip;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="linguas_fr odbc"
+IUSE="libressl linguas_fr odbc"
 COMMON_DEPEND=">=dev-lang/spidermonkey-24.0:24
>=sys-libs/readline-6.0
>=net-misc/curl-7.36.0
>=dev-libs/libpcre-7.8
-   >=dev-libs/openssl-0.9.8j
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
odbc? ( dev-db/unixODBC )"
 DEPEND="${COMMON_DEPEND}
virtual/pkgconfig