Fix dependencies, and various administrivia.

* Make it possible to build with either dev-lang/spidermonkey-1.7.x or
dev-lang/spidermonkey-1.9.x (fixes bug #359035).
* I am now upstream for this package. HOMEPAGE and SRC_URI were changed
accordingly.
* Change maintainer to myself (after discussion with WilliamH).

Package-Manager: portage-2.1.9.45/cvs/Linux i686

5 files changed, 49 insertions, 14 deletions

diff --git a/app-accessibility/edbrowse/ChangeLog b/app-accessibility/edbrowse/ChangeLog
index 6be1f2c0b090..bd12b70e7d56 100644
--- a/app-accessibility/edbrowse/ChangeLog
+++ b/app-accessibility/edbrowse/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/edbrowse
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/ChangeLog,v 1.2 2011/03/16 04:11:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/ChangeLog,v 1.3 2011/03/28 20:05:10 cbrannon Exp $
+
+  28 Mar 2011; Christopher Brannon <cbrannon@gentoo.org>
+  edbrowse-3.4.6.ebuild, files/edbrowse-3.4.6-fix-makefile.patch,
+  metadata.xml:
+  * Make it possible to build with either dev-lang/spidermonkey-1.7.x or
+  dev-lang/spidermonkey-1.9.x (fixes bug #359035).
+  * I am now upstream for this package. HOMEPAGE and SRC_URI were changed
+  accordingly.
+  * Change maintainer to myself (after discussion with WilliamH).
 
   16 Mar 2011; William Hubbs <williamh@gentoo.org> edbrowse-3.4.6.ebuild:
   fix dependency on dev-lang/spidermonkey for #359035.
diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index cd9d9c144811..5ff2728deccc 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,6 +1,16 @@
-AUX edbrowse-3.4.6-fix-makefile.patch 1543 RMD160 2485b133f4f328731b5df21aabf47a00ebe80359 SHA1 8b3b87413a3985863a19b7df54de18d88fb4b533 SHA256 9576bf9b892366bc8eca007ad00697190f5f490c0e95c10be425eaee0fbea07c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX edbrowse-3.4.6-fix-makefile.patch 1861 RMD160 f7aa875120401781754537dd7cd54ce8416ed825 SHA1 d0bc61184d123a753169347ccf8a6ec2f5477c50 SHA256 df1f7e60f44c116b0acfb2ea1bc86ab350039a6f1696bc59701e450e04f8f9af
 AUX edbrowse-3.4.6-fix-off-by-one.patch 448 RMD160 b0f8d5ae3eccb213c73aea9a989704b93cf2bc62 SHA1 60d5493fbafce3c5f95e79283946442dbf761b45 SHA256 2a026a153bf21c4a3f2db7b3c3d6ae0240a4cf4f8e8202e0aabe0a26192bd087
 DIST edbrowse-3.4.6.zip 657900 RMD160 82a33e32ff098ea6982c0656e0570bdef2e58761 SHA1 60fed646240d26c2572c4eb4d885db57d323511f SHA256 d4c340854fd09804b26b765305036e8b891af656a8379090641206e700c96d91
-EBUILD edbrowse-3.4.6.ebuild 1331 RMD160 e531c76246042dcc6e794afd535056bc4628679d SHA1 20cb674324df3aa90eb61b01d387376919709b6f SHA256 3ce23356b0c8c5c0b57c9e38860f9f1bc9a5bcbbc6f6873c822381c53118056a
-MISC ChangeLog 881 RMD160 aee79462944be44de1ca5eb15f8452c35a737102 SHA1 3cfe0bea80104830754f43a5a40929f284284290 SHA256 1af65e9ffb82471879b6c12ba4c10600de8efac86a8d9854583da3f2c366c3bf
-MISC metadata.xml 359 RMD160 45a8562508c566d42ffdb53c97e27219fb1a8427 SHA1 875f840b7a5158a8cb6a11aff2ef139a44283ea1 SHA256 3b14de9dd2cfcb705ee4f761f93a42819a3889c4ed13d1d4e2d93f8de6cfbfd1
+EBUILD edbrowse-3.4.6.ebuild 1438 RMD160 f8dbdfc1ba091e6930f2a19181ec5684094f9941 SHA1 4530e832436e121702f178304bb695c84e255751 SHA256 14b27bd02fb1b0ef117f15f3e32dd383809def32978e8428751386464f89f70f
+MISC ChangeLog 1300 RMD160 a057e6da71e26bc59945837ebd4d6488600dc327 SHA1 6792a6bf7d964cc3650a801b11fb4fdcc6ac0575 SHA256 a1dd75780912c510cb8d9bc20415f653309d602a157e8697f8bd5657fe36d7c9
+MISC metadata.xml 359 RMD160 5b1f3c21cac14d9d3a4cda6f451ab23fe88cc347 SHA1 42baa8cb041fa06923fa2fa5c52ae5ab793a64bf SHA256 7c8587f7b2f7169eb430a9f73d5d471307858fd3ff610b7551a5cb2f34010c3c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2Q6fwACgkQg6Dbfc6NLujTcgCgrHRyjh6OmM9GrXFLF8d3aMgI
++UUAnR/HpT7AbWixGn0SeqlC1bkTSKpG
+=Ud9p
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/edbrowse/edbrowse-3.4.6.ebuild b/app-accessibility/edbrowse/edbrowse-3.4.6.ebuild
index cedbbe52b9ce..0aa9a56725aa 100644
--- a/app-accessibility/edbrowse/edbrowse-3.4.6.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.4.6.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/edbrowse-3.4.6.ebuild,v 1.2 2011/03/16 04:11:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/edbrowse-3.4.6.ebuild,v 1.3 2011/03/28 20:05:10 cbrannon Exp $
 
 EAPI="4"
 inherit eutils
 
 DESCRIPTION="editor, browser, and mail client using the /bin/ed interface"
-HOMEPAGE="http://edbrowse.sourceforge.net/"
-SRC_URI="http://www.eklhad.net/${PN}/${P}.zip"
+HOMEPAGE="http://the-brannons.com/edbrowse/"
+SRC_URI="http://the-brannons.com/${PN}/${P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="linguas_fr odbc"
-COMMON_DEPEND="<dev-lang/spidermonkey-1.9
+COMMON_DEPEND="dev-lang/spidermonkey
 	>=sys-libs/readline-6.0
 	>=net-misc/curl-7.17.0
 	>=dev-libs/libpcre-7.8
@@ -28,7 +28,13 @@ src_prepare() {
 }
 
 src_compile() {
-	emake prefix=/usr
+	local JSLIB=-ljs
+
+	if has_version ">=dev-lang/spidermonkey-1.9"; then
+		JSLIB=-lmozjs
+	fi
+
+	emake prefix=/usr JSLIB="${JSLIB}"
 	if use odbc; then
 		# Top-level makefile doesn't have this target.
 		cd src
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-makefile.patch b/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-makefile.patch
index 4e573474beb4..e44710210645 100644
--- a/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-makefile.patch
+++ b/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-makefile.patch
@@ -1,6 +1,6 @@
 diff -Naur edbrowse-3.4.6/src/makefile edbrowse-3.4.6-new/src/makefile
 --- edbrowse-3.4.6/src/makefile	2011-01-20 10:38:24.000000000 +0000
-+++ edbrowse-3.4.6-new/src/makefile	2011-01-26 13:50:10.000000000 +0000
++++ edbrowse-3.4.6-new/src/makefile	2011-03-28 14:02:25.000000000 +0000
 @@ -23,12 +23,15 @@
  STRIP=-s
  endif
@@ -19,7 +19,17 @@ diff -Naur edbrowse-3.4.6/src/makefile edbrowse-3.4.6-new/src/makefile
  
  #  Normal load flags
  LFLAGS = $(STRIP)
-@@ -59,11 +62,11 @@
+@@ -45,7 +48,8 @@
+ #  Or you can use the target jslink below.
+ #  Some folks need to add -lcrypto to this list.
+ 
+-LIBS = -lpcre -lm -lssl -ljs -lcurl -lreadline
++JSLIB = -ljs
++LIBS = -lpcre -lm -lssl $(JSLIB) -lcurl -lreadline
+ 
+ #  Make the dynamically linked executable program by default.
+ #  Edbrowse executable.
+@@ -59,11 +63,11 @@
  $(EBOBJS) : eb.h eb.p messages.h tcp.h
  
  edbrowse: $(EBOBJS) tcp.o dbstubs.o
@@ -33,7 +43,7 @@ diff -Naur edbrowse-3.4.6/src/makefile edbrowse-3.4.6-new/src/makefile
  
  #  If you had to build the javascript library yourself,
  #  link it into /usr/lib.
-@@ -87,7 +90,7 @@
+@@ -87,7 +91,7 @@
  
  #  odbc access
  edbrowseodbc: $(EBOBJS) tcp.o dbops.o dbodbc.o
diff --git a/app-accessibility/edbrowse/metadata.xml b/app-accessibility/edbrowse/metadata.xml
index c169e3e65062..b48015680a0e 100644
--- a/app-accessibility/edbrowse/metadata.xml
+++ b/app-accessibility/edbrowse/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>accessibility</herd>
 <maintainer>
-  <email>williamh@gentoo.org</email>
+  <email>cbrannon@gentoo.org</email>
 </maintainer>
 <longdescription>
 	edbrowse is a line editor, web browser and email client using the /bin/ed