Fix spidermonkey versions for the new versioning scheme

Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64

5 files changed, 29 insertions, 15 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index aaaab102aaea..b93e56e88edf 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/elinks
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.139 2011/06/12 16:20:39 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.140 2011/06/22 02:33:17 nirbheek Exp $
+
+  22 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> elinks-0.11.7.ebuild,
+  elinks-0.12_pre5.ebuild, elinks-0.12_pre5-r1.ebuild:
+  Fix spidermonkey versions for the new versioning scheme
 
   12 Jun 2011; Michał Januszewski <spock@gentoo.org> elinks-0.11.7.ebuild:
   Disable zlib support (bug #365585).
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 3374cb3218f5..2e9b1289253e 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -12,15 +12,25 @@ AUX elinks-0.12pre5-spidermonkey-callback.patch 513 RMD160 50dc290e366e92b3c6235
 DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 SHA1 7f7b009b1b6cb746e90835d2b612f1aa6b5d3a1e SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209
 DIST elinks-0.11.7.tar.bz2 2467915 RMD160 2e6e863d08f9accb71892ba6f236f795c83cba9c SHA1 d13edc1477d0ab32cafe7d3c1f3a23ae1c0a5c54 SHA256 456db6f704c591b1298b0cd80105f459ff8a1fc07a0ec1156a36c4da6f898979
 DIST elinks-0.12pre5.tar.bz2 2783523 RMD160 4983083f21928da78f937b4dea09f8937c3a9cb9 SHA1 15fb38fa938a0eec9d5f22fdd538a6785e2854af SHA256 2d19547831098acff0c5f97f9fbc7912240f122961fd49fb8b76738417dd24d2
-EBUILD elinks-0.11.7.ebuild 4355 RMD160 ecc2b70526a7703e2ab9df73e60cbe2c676d17fd SHA1 8590b360350517b8c4f97b6afdcd7bd3200d5745 SHA256 1ca910f9106c12f975f776d7faf4d388d2613b05e733b51b67e9d52c9f3b5645
-EBUILD elinks-0.12_pre5-r1.ebuild 4681 RMD160 1263e668cddcddc539fe4e35bde3c42b08c00e6a SHA1 c6e7fb913c8d7dba9abe8fe282dd7d70f82d7d1b SHA256 2ec57d04c52f000622ebc5ce6ac6c668f25330910e345279b19cb7150e2cfa93
-EBUILD elinks-0.12_pre5.ebuild 4384 RMD160 ea361e801daf54fd49a3585900a92eb30b76493d SHA1 4302c08c7f04c7eec9a7b2ecd2818f708f044285 SHA256 8c617505804af74ca2d96d5a0f13954dea87a698703d80d7894c95039d06791c
-MISC ChangeLog 26823 RMD160 e14f571ed51a9d9a805bb58223eb29fa9c4089bb SHA1 52f3be231836231918c0de92eb04b8869b8a2b5d SHA256 82aff24a1b49567b8dbf60778404bceef649416f25e4a4df933815da020139e8
+EBUILD elinks-0.11.7.ebuild 4358 RMD160 afd06665d1a437205efb1452ae4a0a00c2ff5e78 SHA1 484b2b315d846c71f4f1f5f1ac4363199104c62a SHA256 2824d95dc5f12044a82a944c506dea477e1db14ed3d370062c23284b8e6a4bd4
+EBUILD elinks-0.12_pre5-r1.ebuild 4687 RMD160 0b127f8e0e38faa2c4b8044347c6704f834bc536 SHA1 e18072693c98f5340a73baf65585d8de3f94493c SHA256 5feb04aa623f796336fac1820e8722bcbd6803ea21b1d428752e70ba3c651388
+EBUILD elinks-0.12_pre5.ebuild 4387 RMD160 b6b27df15cbfbe3740d7d022b36653e73cd6bfd8 SHA1 429c96991f9e3479905f740810e30c86b591a88a SHA256 43cd061d6d44105d87e9883f59ad5eeba2bb3a9a9101c55739df6ed8ca708a3e
+MISC ChangeLog 27016 RMD160 4eba5e038867424d2c31ff76350532a648e5e5d5 SHA1 ce0084f79954c553bfc381694f9c6990252a213c SHA256 d331e40815025be8095b607c16ceafc7c5e5ddac50dd35e26db1287f4f35a47c
 MISC metadata.xml 539 RMD160 a8e2177168d6c229cb25da446572b8af3a636eaa SHA1 f49389e97de1e05ebffad13baa4f5212b44681ff SHA256 08733a76de608d4d9a4139ce6e9c1c9f23f5c1fea86abdce8e369b1bdc6bf0ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3052MACgkQchej4aZK9/fc4wCeJobYT44QVahTnA7T9l58FMCt
-f8YAnReFK7mduIUHud1dpShk/zEc93kh
-=O+Nu
+iQIcBAEBAgAGBQJOAVR0AAoJEO/kOhxWD91kNJkP/2DWYa2tzyoeAdT9py/IDoCV
+ICINHlrEPbSr+Xog12moUHiq+7sqKnC1aTEzL83457HJyb0HJsBC4oQadW+JrWoP
+PuecrR9C3DL4sA0iuZKWHYSeKzWkeHUN+BIvqU4CUD1SSWsvJKmq2p7H3nuh+k5+
+KLNS80oMGZnRqD+9MPDw5xgXG5KuYkjZgvTorMjNedMdMhmhPA9HOQpYPrxwOhNa
+LbSVIVlUj3AkPOtIz0yuFj5g7kAc/g6F+Y6L9haMiG+0wWjgc/6mcSz0l7atUyTv
+CVArzSDAMe8SC/1Lrnl7vdv3GW8WRjiXvYBhKbTJ4wJDSL+Pu1Xxd/tkT+CGZVGe
+UkMWehNKcWmpZuzBctj1cvS2zcAp6w/nyqkk4lr9GWKVUQXjUFA6v1V2coZKGVUB
+06TowSn9qPfxjjVctBApsG16Ztive972A4GRAXDOgCo/Ipc1SW4XKi8dt2KaE7p8
+6CRNbh6HmWikuo4H35XcyUX1om6XJaO1KrhvXDKURSGYM80QlbSooIUdb4BEiNHN
+MslfiJ3w7jdl5GdU+D4kfsOVTFFLFM6wu7885d3Hg/CG5mYZqBcSE4MY8WZalXM0
+izomaEQYgcRR8rfN0XvP0qXijwy7Qm8M6WdBxTEZomUw46VDMRNMSjeHF0PLg2nf
+ehg92dIExWuFhtlHYCBD
+=adKJ
 -----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.11.7.ebuild b/www-client/elinks/elinks-0.11.7.ebuild
index 41f9e53072ae..2124da5df4d9 100644
--- a/www-client/elinks/elinks-0.11.7.ebuild
+++ b/www-client/elinks/elinks-0.11.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.7.ebuild,v 1.16 2011/06/12 16:20:39 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.7.ebuild,v 1.17 2011/06/22 02:33:17 nirbheek Exp $
 
 EAPI="2"
 
@@ -29,7 +29,7 @@ DEPEND=">=dev-libs/expat-1.95.4
 	idn? ( net-dns/libidn )
 	perl? ( sys-devel/libperl )
 	ruby? ( dev-lang/ruby dev-ruby/rubygems )
-	javascript? ( <=dev-lang/spidermonkey-1.9 )"
+	javascript? ( <=dev-lang/spidermonkey-1.8 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/www-client/elinks/elinks-0.12_pre5-r1.ebuild b/www-client/elinks/elinks-0.12_pre5-r1.ebuild
index 02a6a13660b7..ff353177f4f6 100644
--- a/www-client/elinks/elinks-0.12_pre5-r1.ebuild
+++ b/www-client/elinks/elinks-0.12_pre5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5-r1.ebuild,v 1.9 2011/06/12 12:11:05 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5-r1.ebuild,v 1.10 2011/06/22 02:33:17 nirbheek Exp $
 
 EAPI="3"
 
@@ -32,7 +32,7 @@ DEPEND="dev-libs/boehm-gc
 	perl? ( sys-devel/libperl )
 	ruby? ( dev-lang/ruby dev-ruby/rubygems )
 	samba? ( net-fs/samba )
-	javascript? ( <dev-lang/spidermonkey-2.0 )"
+	javascript? ( <dev-lang/spidermonkey-1.8.5 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -54,7 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/elinks-0.11.5-makefile.patch
 	epatch "${FILESDIR}"/elinks-0.12_pre5-compilation-fix.patch
 
-	if use javascript && has_version ">=dev-lang/spidermonkey-1.9"; then
+	if use javascript && has_version ">=dev-lang/spidermonkey-1.8"; then
 		epatch "${FILESDIR}"/elinks-0.12pre5-spidermonkey-callback.patch
 	fi
 
diff --git a/www-client/elinks/elinks-0.12_pre5.ebuild b/www-client/elinks/elinks-0.12_pre5.ebuild
index 5fc7b9d9b770..6f88a35d2e79 100644
--- a/www-client/elinks/elinks-0.12_pre5.ebuild
+++ b/www-client/elinks/elinks-0.12_pre5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5.ebuild,v 1.8 2011/01/06 21:41:15 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5.ebuild,v 1.9 2011/06/22 02:33:17 nirbheek Exp $
 
 EAPI="2"
 
@@ -32,7 +32,7 @@ DEPEND="dev-libs/boehm-gc
 	perl? ( sys-devel/libperl )
 	ruby? ( dev-lang/ruby dev-ruby/rubygems )
 	samba? ( net-fs/samba )
-	javascript? ( <=dev-lang/spidermonkey-1.9 )"
+	javascript? ( <=dev-lang/spidermonkey-1.8 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"