7 files changed, 60 insertions, 152 deletions
diff --git a/app-accessibility/edbrowse/ChangeLog b/app-accessibility/edbrowse/ChangeLog
index 6d264913d2ec..656e9eceb896 100644
--- a/app-accessibility/edbrowse/ChangeLog
+++ b/app-accessibility/edbrowse/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/edbrowse
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/ChangeLog,v 1.11 2013/08/11 01:31:58 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/ChangeLog,v 1.12 2014/09/29 10:20:27 teiresias Exp $
+
+*edbrowse-3.5.1 (29 Sep 2014)
+
+  29 Sep 2014; Christopher Brannon <teiresias@gentoo.org>
+  -edbrowse-3.4.7.ebuild, -edbrowse-3.4.8.ebuild, -edbrowse-3.4.9.ebuild,
+  +edbrowse-3.5.1.ebuild, -files/edbrowse-3.4.7-fix-makefile.patch,
+  +files/edbrowse-3.5.1-implicit-decl.patch:
+  New upstream version, 3.5.1. Also, remove old versions.
 
 *edbrowse-3.4.9 (11 Aug 2013)
 
diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index dd4c9d4ff583..c97c047844a9 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,9 +1,19 @@
-AUX edbrowse-3.4.7-fix-makefile.patch 406 SHA256 0f3976650537658b81a8302346fa225fd6e5e13a126e5324fb6cc4062ffcd7e0 SHA512 e984ea26f2ec2e18855df71a327638adae9d6a466ae51d39d31ac7c413e3ad6a0e2e6cca7070ef6a2002d04e6c7a4ff0d947ce523a32e8eaf8e969d3834f75ed WHIRLPOOL b7795e3a37778b1d2d8e3571796cc51401b2678f173f4e988ec3e08d4d7e0d5438434def859f3993af75f6515938231aeb8ec80d575bbd7db3450f4c79025361
-DIST edbrowse-3.4.7.zip 719586 SHA256 488d8a02b4480f1474686dfa99058b7f2f36c1d4eb1942ee79471aa8327328fe SHA512 b7b7da68bc059b12222624d2a99f25bddf9d0a19883d97091618147cca1e3dd7f089a7db98ee4d71f30b6bfbc8ba1926d0098929750c9cebb3e3c66e206dc656 WHIRLPOOL f20a2697154f087dbdf41d4a95fdf9ad2ccf3e5ee775dd05c972752e92d669d29653be2117c37836edf0fcb08f4f22238538a6d4ba8f31cceb9b01a441e93f0b
-DIST edbrowse-3.4.8.zip 725791 SHA256 b138381a134e8b00a183305ff227bb7fc97d55a2ee5a787499e191445f2d8977 SHA512 5c323f69debddad30da859513041391181f27f62390897b0b101107b42db72473e9e1f4afd95d2bd72289cf2bbb6a23d7c5258869c0333245552029c5c05d820 WHIRLPOOL c1e0f8a5ad070ad4595c1474ce46385b5957ada830d6e94416c077edbc1b667bb8cf15c41d560b145dd2c00a4bb8593aebc2349e3abdbc10e2c3c301842185a1
-DIST edbrowse-3.4.9.zip 727372 SHA256 ef4690e0f695bddf97194e3be5a4b7b999b8af07639e8c6cc02539b6296f3813 SHA512 90baf70ef0f88b1fac382462c73e39f33c824c90f8f28e549c582ac5f322439b66f8bd70619639fdf12a0d9869eb4204a1ff6b79cb9fc5afb80c9172c7a98fc5 WHIRLPOOL 465381a6b3fef9cda7a2444d6af6eff61c329d863627f742def3ae698cf4aacda558702a475d63b6c6db316faf7ae0da5fe01aa7948ca0a1cd273c2e0c9d830b
-EBUILD edbrowse-3.4.7.ebuild 1419 SHA256 df2a96484aba871be62ed084f74dd87208811ea9e46b33ba91554cbc73db2107 SHA512 12c704f07d787d70d9cd9d3c2837befab457a877df6ddbf4f8bc29abc80bac86cb8b498fadf0f3c1d14bda310d561119d895a5192eb4c4b0afbcbbde0b26aec7 WHIRLPOOL c050fd8a53fcceb6b5ab2b5ead6800cf1bc5922e12205cb4d4b35daf295a9563dee28befd07ac4f453d1997a4bf3f3da576cd02df1ea52cc6cbf79cf4506c0f8
-EBUILD edbrowse-3.4.8.ebuild 1547 SHA256 deac22506b7ad75818c36c690563b35f221cb3f389ce6e21ffb5ba856cc8b87c SHA512 ff785272192dfd866d7ba85ed95027073214119bb7f1a2868d626c410edf577fd611312ef5ebc0b57535b8e0586ec4981cf5e825a69460f25268660fb323fe47 WHIRLPOOL ac05eb37e53155ce49411c65f8402723a45fddb2251e88a64c6b6656c73be7ad8fa28b22a20d7a422e0300f54eadbc02667090475562a06c15be89a0af34c609
-EBUILD edbrowse-3.4.9.ebuild 1551 SHA256 9ff8489f96ae6963c71b43a31473990832274058f9bc23954a2cfdc06c632b63 SHA512 821a1f78eb008261f3dfb546b27436b856fefc4cde0013ff6b6b123f3e7b4055f71df8024b2f694cc21b0ff5c22754222339c0f1ae2043624d96b6204746c166 WHIRLPOOL c992186dad5ba91d9cdf75f66c2c2b84dc3ec44aafadfa7a781cc3111e2bef3c21f06c744cc18f7503d1db4139184a75cbe3cf75afed232795af3f73bfdf0324
-MISC ChangeLog 2652 SHA256 f34cdc3155414158672088f98aa07b04245a72e1bacbfb829224ac57b115a431 SHA512 8d9f4ab205197ac930dcd90173a30b569d58fd94cd09e35c3243c900614b2d22558e91331224293ac18350ec3d8e2cdba227a0e54fb1c98f44f1d58a91ab12c9 WHIRLPOOL 4eca3e910a4fee4839e2eb5c9788bc1b3b5a26186aa1d82812bc40feb6a44ef4ed28d9ed15c571b1bc140d87574c732c4629e34d35dc2a2e10e913e6b8b1aa33
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX edbrowse-3.5.1-implicit-decl.patch 777 SHA256 f84099bc491733c042b066a41345f53577febe485cd7f77dee55a59cc9fa81ef SHA512 f8fc77759b14480ddef08b8f893eaf6791cfcced347b2cc8d5356c8ae4e3ee381d5eb3685a8bef529cc4dae3bc615f6a5b47a35bf829c6a204553c6545acdcd8 WHIRLPOOL 39088c65981c678d3738da10b7dda841c6e3b994cd48daefc565a42360efebe8b2f1e70198678f4273117233778df4705952be30f13144d0cc74cdf34c032ab5
+DIST edbrowse-3.5.1.zip 745277 SHA256 e379cffb1098cfedf56ceedaaa7e20064551a0737ad6cd8ad5124fdfb18d9a5f SHA512 83bdb1d49afa04a41a84b71e86969880b518d8d6c1e448380d70710ad2373ed57cb3699d3ad50226ea4d5776f511ff50b9510655b27d26948213113699512fc2 WHIRLPOOL e7517c5ae60a438d6d651fbfdbfd7f625c2369f43bb2ba92c1c974e34a7d8ddbb6d441cb1ef79c4354cf88e2796f05110bb0e5ff1b1699cb55b23221c2bd000b
+EBUILD edbrowse-3.5.1.ebuild 1496 SHA256 ade75013d2d77af66058a44eb30ad1f8b47edfb4b94706180eb4112d6205bd75 SHA512 a239f417dfff82dca536f547c798579cd5b03379152bac2f386084111b5b0ca67f04c82f164f82077efcc877d7ed87ca0752924ce1cda5235b53005d8e876bf7 WHIRLPOOL 95e4cde6fd9476ce04b049352e2e374dacc0ae2ac5a8ee1fde8123c9e0d5aee6e35c0dc55e6f5345face1127dbea2bc4b75ed09ba4f5f5d0086a8aeb188de3d9
+MISC ChangeLog 2989 SHA256 bd4a7dd75b2c4857d35bb36f601248e4b9a7729d4ca08d889224bd6151b02942 SHA512 2496889b3736774aa96555d54e9a049699e1e2cc8a966f252b04bebfcd138586db8449839f4e29b6b28ca6db5788b8e20fe8d1c320b7837d426519286a441828 WHIRLPOOL b958b78a67657c2fd3680f9bbbab318395aa33782a72c24cddedd47a7ffac8c0851460459b86072d5be415a133ba07c72759b89eb5d53b6af32cb14c569f9a60
 MISC metadata.xml 295 SHA256 20ab62eb1ca3b77142f2e3d833521693654f3bcc91eed756233c131afec727ab SHA512 9379f3309cb2243305941a996509845f36933780eaada46822fe469d2006fbdcdf8c8d40f1cf2d113f1fb42a81103644f4c44dbf1cb3a31771aded6558888501 WHIRLPOOL a193939b1065f43274bc4396d74626f4c4a5ae39c4cde569e9d4cede65c84a86374cf4b41bb43078f1ffdbdc73a62fb3266901a8204864b3b8562c54027bfaaf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJUKTJtAAoJEH8qFnJlIeBt4u8H/1YndRBR41pdS8Pg3A00eqP2
++fYeXCEeXGxDsUQiGRksYRo+lfNVNY2nxH8hwsuZ8hjQOuDfvW93SyJGOKmzPniG
+lVsKB4JSYepgjJGQrMl06qu7dqxGCmn0HmlEdJ0XHp54dHAOP5apMS4NN3LS87jy
+lpgYkMhCnvVMDBmfLRSxnI1aRzk8p5MwOHc1nLSZYx9mfNouhceg4IzBbyLigm7T
+E11Jjz7X/+Yn9J/h7qfe9yeXSAQ4wslK5384A52tIEu8mG4eUO6CzOUb26uKtt1H
+D/ODhqnnlemGrUNLjvcAmFmKVz76ROClckbtQeK16L1OJF6bsL2AbaEgIouobaU=
+=T9jw
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/edbrowse/edbrowse-3.4.8.ebuild b/app-accessibility/edbrowse/edbrowse-3.4.8.ebuild
deleted file mode 100644
index e7caef91db51..000000000000
--- a/app-accessibility/edbrowse/edbrowse-3.4.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/edbrowse-3.4.8.ebuild,v 1.3 2013/08/09 13:41:24 axs Exp $
-
-EAPI="4"
-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="linguas_fr odbc"
-COMMON_DEPEND=">=dev-lang/spidermonkey-1.8.5:0
-	>=sys-libs/readline-6.0
-	>=net-misc/curl-7.17.0
-	>=dev-libs/libpcre-7.8
-	>=dev-libs/openssl-0.9.8j
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
-RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	local jslib="-lmozjs185"
-	local jscppflags="-DXP_UNIX -DX86_LINUX -I/usr/include/js"
-	if has_version ~dev-lang/spidermonkey-1.8.7 ; then
-		jscppflags=$(pkg-config --cflags mozjs187)
-		jslib=$(pkg-config --libs mozjs187)
-	fi
-	emake -j1 prefix=/usr JSLIB="${jslib}" JS_CPPFLAGS="${jscppflags}" STRIP=''
-	if use odbc; then
-		# Top-level makefile doesn't have this target.
-		cd src
-		emake -j1 prefix=/usr STRIP='' edbrowseodbc
-		cd ..
-	fi
-}
-
-src_install() {
-	cd src
-	emake -j1 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 linguas_fr; then
-		dohtml usersguide_fr.html philosophy_fr.html
-		dodoc sample_fr.ebrc
-	fi
-}
diff --git a/app-accessibility/edbrowse/edbrowse-3.4.9.ebuild b/app-accessibility/edbrowse/edbrowse-3.4.9.ebuild
deleted file mode 100644
index 0fbcaefe25b9..000000000000
--- a/app-accessibility/edbrowse/edbrowse-3.4.9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/edbrowse-3.4.9.ebuild,v 1.1 2013/08/11 01:31:58 patrick Exp $
-
-EAPI="4"
-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="linguas_fr odbc"
-COMMON_DEPEND=">=dev-lang/spidermonkey-1.8.5:0
-	>=sys-libs/readline-6.0
-	>=net-misc/curl-7.17.0
-	>=dev-libs/libpcre-7.8
-	>=dev-libs/openssl-0.9.8j
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
-RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	local jslib="-lmozjs185"
-	local jscppflags="-DXP_UNIX -DX86_LINUX -I/usr/include/js"
-	if has_version ~dev-lang/spidermonkey-1.8.7 ; then
-		jscppflags=$(pkg-config --cflags mozjs187)
-		jslib=$(pkg-config --libs mozjs187)
-	fi
-	emake -j1 prefix=/usr JSLIB="${jslib}" JS_CPPFLAGS="${jscppflags}" STRIP=''
-	if use odbc; then
-		# Top-level makefile doesn't have this target.
-		cd src
-		emake -j1 prefix=/usr STRIP='' edbrowseodbc
-		cd ..
-	fi
-}
-
-src_install() {
-	cd src
-	emake -j1 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 linguas_fr; then
-		dohtml usersguide_fr.html philosophy_fr.html
-		dodoc sample_fr.ebrc
-	fi
-}
diff --git a/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
index 62e0d323f95b..51b92e8352c9 100644
--- a/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild,v 1.3 2011/11/15 16:35:58 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild,v 1.1 2014/09/29 10:20:27 teiresias Exp $
 
 EAPI="4"
 inherit eutils
@@ -12,32 +12,29 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="linguas_fr odbc"
-COMMON_DEPEND="<dev-lang/spidermonkey-1.8.5
+COMMON_DEPEND=">=dev-lang/spidermonkey-24.0:24
 	>=sys-libs/readline-6.0
-	>=net-misc/curl-7.17.0
+	>=net-misc/curl-7.36.0
 	>=dev-libs/libpcre-7.8
 	>=dev-libs/openssl-0.9.8j
 	odbc? ( dev-db/unixODBC )"
 DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
 	app-arch/unzip"
 RDEPEND="${COMMON_DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-makefile.patch
+	epatch "${FILESDIR}/${P}-implicit-decl.patch"
 }
 
 src_compile() {
-	local JSLIB=-ljs
-
-	if has_version "=dev-lang/spidermonkey-1.8.2*"; then
-		JSLIB=-lmozjs
-	fi
-
-	emake prefix=/usr JSLIB="${JSLIB}" STRIP=''
+		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 STRIP='' edbrowseodbc
+	emake prefix=/usr JSLIB="${jslib}" JS_CXXFLAGS="${jscppflags}" STRIP=''
 		cd ..
 	fi
 }
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.4.7-fix-makefile.patch b/app-accessibility/edbrowse/files/edbrowse-3.4.7-fix-makefile.patch
deleted file mode 100644
index 142c6ab33b85..000000000000
--- a/app-accessibility/edbrowse/files/edbrowse-3.4.7-fix-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/makefile b/src/makefile
-index 900c425..af1250e 100644
---- a/src/makefile
-+++ b/src/makefile
-@@ -59,7 +59,7 @@ edbrowse: $(EBOBJS) tcp.o dbstubs.o
- 
- #  You probably need to be root to do this.
- install:
--	install -Dm755 edbrowse $(bindir)/edbrowse
-+	install -Dm755 edbrowse $(DESTDIR)$(bindir)/edbrowse
- 
- #  If you had to build the javascript library yourself,
- #  link it into /usr/lib.
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
new file mode 100644
index 000000000000..1880d2b3bfe0
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.5.1-implicit-decl.patch
@@ -0,0 +1,22 @@
+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>