gentoo resync : 04.05.2019

5 files changed, 40 insertions, 85 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 80b4ee9492d3..d8fd090fdd68 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index c4a9bee0500a..62248b8a6b10 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,4 +1,3 @@
-AUX edbrowse-3.5.1-implicit-decl.patch 777 BLAKE2B 1e619d2ee4ff1e0f1a7690d33d34b2669c59120aca50d8b9cc835a4dbc81ba20e19983d0fc4aa2dfa12a1281e85d489084b31b3dcf15bd684a8be78f819397d2 SHA512 f8fc77759b14480ddef08b8f893eaf6791cfcced347b2cc8d5356c8ae4e3ee381d5eb3685a8bef529cc4dae3bc615f6a5b47a35bf829c6a204553c6545acdcd8
-DIST edbrowse-3.5.1.zip 745277 BLAKE2B 2256faf58de68ab2d19d3137ddaaa92dbfdfff581d83c9f2b58e0e161c10aaa5c867dbf8b81da77f21abdd5c1a07d882abafff4bcfc0706fc33a73b7ba6bc087 SHA512 83bdb1d49afa04a41a84b71e86969880b518d8d6c1e448380d70710ad2373ed57cb3699d3ad50226ea4d5776f511ff50b9510655b27d26948213113699512fc2
-EBUILD edbrowse-3.5.1.ebuild 1420 BLAKE2B 9b41708d77b29db8bece8ec0bd74ca3166bf02551899289ab720de6bd5b57d85cd8538553777014862b66c52c18bde660b6fd606810624a9c76b661e3c906dcf SHA512 d1197dca946b138c64de82fb6e4e2ac6e2268d7d2d335ece41cb5ddafe7006ded0ee70bea1997234bd6bc67d15b5bbb6f7b90207c58034e9264d889cd4ffb28f
+DIST edbrowse-3.7.4.tar.gz 765794 BLAKE2B 5d428ca3923e26d5b3f204d5aba37a08bbfc50345b18718e5a281521361da4920ea12d68a5013bb688e95f178be8903bede1bef5b3cd626a0e6084141188d878 SHA512 79b2b450b6f54f3d74b7c722f223b3340b3ddfa1cbff2d69adcd1cd4ffb76b78a812a35a053cf224a74543020ef8423cd68eafa9a277451245d383065fb1595d
+EBUILD edbrowse-3.7.4.ebuild 837 BLAKE2B df4e7ed881a1696970d42c70681b228c11c1ba1753974618fdf791c0719e3b247c7f97510ca67f9fe71eae20c488bdfb45f1f03402196dadd210d47bc3dbdf91 SHA512 0365d6bac31694e6d5a60609a61021ae1358450574659074f0c8a0e730fb2e3e92606f91656826eedf75e5875261b235c6b4cff5517913f88ec0c002216ccf6d
 MISC metadata.xml 394 BLAKE2B 6e65f68555af92f50c566ca53dffbb5c4a68bf96e7a6a895adf96be6518b83ce4cfe4a1b0fa6dcd7deabdb26afe67376743518154d18fa0c944d4538840e0b53 SHA512 76561a6366dca32455b5bff45b655fd155199b36a7a3243cb900e80382f64be642c64d6ee9095a0857484eaaca98fde8bd370b164d346d13d8744763d4b5e916
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 c8e5ad5fdf8b..000000000000
--- 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/edbrowse-3.7.4.ebuild b/app-accessibility/edbrowse/edbrowse-3.7.4.ebuild
new file mode 100644
index 000000000000..91fd4cd8a6e6
--- /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
+}
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 1880d2b3bfe0..000000000000
--- 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.000000000 -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.000000000 -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 <time.h>