Slotted spidermonkey-17, all newer versions of spidermonkey will now be slotted; converted most ebuilds to python-any-r1; dropped old versions of 1.8.5 and 1.8.7

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

11 files changed, 47 insertions, 693 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index d4e08a4411c5..7445a407aa2a 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.118 2013/08/02 17:16:22 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.119 2013/08/08 20:49:55 axs Exp $
+
+  08 Aug 2013; Ian Stakenvicius <axs@gentoo.org> -spidermonkey-1.8.5-r1.ebuild,
+  -spidermonkey-1.8.5-r2.ebuild, -spidermonkey-1.8.5-r3.ebuild,
+  -spidermonkey-1.8.7-r2.ebuild, -spidermonkey-1.8.7.ebuild,
+  spidermonkey-1.8.2.15-r2.ebuild, spidermonkey-1.8.5-r4.ebuild,
+  spidermonkey-1.8.7-r3.ebuild, spidermonkey-17.0.0.ebuild:
+  Slotted spidermonkey-17, all newer versions of spidermonkey will now be
+  slotted; converted most ebuilds to python-any-r1; dropped old versions of
+  1.8.5 and 1.8.7
 
 *spidermonkey-17.0.0 (02 Aug 2013)
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index adc1a98bc3d4..7e60d6832168 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -30,22 +30,17 @@ EBUILD spidermonkey-1.7.0-r2.ebuild 1664 SHA256 907e253f2519790d2ac48779637a557b
 EBUILD spidermonkey-1.7.0-r3.ebuild 1572 SHA256 de1569ec5891c4cee4826a71d5429a0bde31c92c15d4775fa97423f4a3da2c3d SHA512 5de735e964235a926173d7107deefd2872cbde2baa05055c9342a6f53b629494fc814d209574d90a76eb7f847002102fa1406d4e48a01e07cc7a812bd1f01c48 WHIRLPOOL e4ccf5cf6c69649b36c9fad11ebffc6fd743376c3f8ad8d6296acab0255171973536e9b41835e2c47def04dd8456904d0d2ee237a5a03dfc93651a80776b73fe
 EBUILD spidermonkey-1.7.0.ebuild 1432 SHA256 5df2e8917fce96363d2128a2fdafc623aa159e60682591b347201b062778a99e SHA512 54a1c28611b0c528bcf81fe7c1bd2022eb82e65643a7d7860351303e0bdabc037fcaa61dcd7aea34336c866d81f1e41f5cae2d22f8beb43a69c4838b38061d42 WHIRLPOOL fc36e8de029c989a56cf928ca9c2e448fca4fc21bcb4d5f72ba95f5a47ee71da37b1bf1b9fa33f2cd81b4ec041abc29b6d6b9ae21435123fa7921358f174412e
 EBUILD spidermonkey-1.8.2.15-r1.ebuild 1938 SHA256 b1fc8c11374df02de4ae2136127958f3d5b7d4c9dca349e396f5127769e9c0f2 SHA512 c5c10a981e7adfc1e04f19f28137b0d227136b1b05bbd8e7bf1f49e5efa9d871ef266ec0542afddb3ab7c2437213caac61fffc81bc08b2878fa2b39c54bd843e WHIRLPOOL e5f6e72e97089cd752753d0dec44074a5cc46b1e3e31601e7dd20267578ef33d2ee9b50f93d4138dcac2a372ed32046f84b58309eb93fa08231413ef04a22560
-EBUILD spidermonkey-1.8.2.15-r2.ebuild 1974 SHA256 b775d4626cdadad8d82be3e629db078d469c0c5d111773c820acaf602c016f86 SHA512 710d35fd28a153653418168ce75f2f7f4298f6a28931a0e2262bf3c64b890faababa495d3383dbf0b26652a1b043b3679091841a5ebed5ac847ef233d42cde2b WHIRLPOOL 60b6f896570b2000610aa397d9b71e5be81da51b36845ca008e2367e46a18262c7ad7376c767bfbf617c046dede261918b81972e597b8f3d15dd7b0ed2d14066
+EBUILD spidermonkey-1.8.2.15-r2.ebuild 1942 SHA256 2c992d6d203034d96467245b9e960d1ce6f6e6e57105695c2be6b2a8152e86d1 SHA512 afa0622a795c328039494303b6a168db1d0826271f476520d4fbb26f270f67aba9d53361c4f6d8dfcf8022dd0990d7f6e0dab2a526fe5ad1cea1c18ed8fe9fca WHIRLPOOL 2d440db163a99a7a834a6e3c3afbff358c994e71188543dcf02dc1021846d46a317c07bb00d2ef6a312ee663b7cd91397accef568ec54156a3fe27ea906d0f07
 EBUILD spidermonkey-1.8.2.15.ebuild 1907 SHA256 e03a07403e86e8a20c7efefc59dc5e84853cb8eb459e9685de79d7d90f46de19 SHA512 a684bc61faabcd69492a40c0cad6403605397c46b53e92e3b78df07dea2295fb07f0c9370e0c033fa2a20b7ec35f90ab85e942dddeb693e3afe1d481cfad9268 WHIRLPOOL da7b06b7bda65e2835c467916e496243231303ec7dd94f41c532cb7f6f3a8c264b25d5f39ca178c0300d1c94fd1d9ded64ffe06a6c0f5b58139eeace54b02ba5
-EBUILD spidermonkey-1.8.5-r1.ebuild 3402 SHA256 703ce84cb2e24886f23dbbb2c59601de6b1e91edd6ea25ced03919cb9872d138 SHA512 0cbb3e3c6b7ee85504494359ca2a093743ec9dd21c897dadcad31bf5550dd5b543fcff96e854fd7205bc511de3c3a276c99d92ee454e5f463827311cb2540aa8 WHIRLPOOL 86e128008258af197767d2360fe1ec1806eed46f6ab8a57d4f98ca2b5b8a56a39fe4557c8430f6e741508376417ce579043e9b3e28b3b9bd4801746366d68895
-EBUILD spidermonkey-1.8.5-r2.ebuild 3735 SHA256 c6e2b88b9d9aaccb1ef7053aa6a26d838ddae2a8ac1e33ebd07d19eb3761d730 SHA512 4f2f7f3995d3d03c4191d7bd38e590bb1d3733b8b5639a052ce13ee0638c50dfbc337e32f2ed62a305cee12275729f3b6178bebc2176d5fec41848625caa14bd WHIRLPOOL a06dca804c1d0e4e7e85682140c2af4d7d2667f5b789520d5aff666a4f83201f535951a406d308b0467781c07df3fe7612be84bf263e1c16e75539d297e52ebb
-EBUILD spidermonkey-1.8.5-r3.ebuild 3835 SHA256 75cca5622d1fb612e1e146868a352b6785ef667425937226e852d09cdb0a7a2a SHA512 89e6a148b1a11432b49c04b3356a6a26319760ff3617e59e9f38b5b598c1f2d2d73eb852b7f0db2080eb167ad24bca70dccdbb1b571cf3b06ec05d4cebe8e441 WHIRLPOOL 9d92f8066ee603a1639be0c1f88939a9819ea7faf74305be60b669dfc60a3acbb3a5bd660cfe7024772a26278eab19f8d078db4e6414d044f4ac57e66ef9523d
-EBUILD spidermonkey-1.8.5-r4.ebuild 3944 SHA256 fff36beb1f1caa02fd0fa7e3a80b126de8ca473a1c5ee57f25d6e59c5a82590d SHA512 d6826fd1556ea510277c2528ce0d8e318d859260217badf63fc2211dc3344a984dbb6abbcfa5003706a604202177b5c0729e634744411cf7ce3ad4482f9384f3 WHIRLPOOL be46195a68b7fdff40a942f52670e6f44560e66060b386e20626804e1a92ece7905c493dd4d9bb6475029d9b5f4f9715b0d6fbed560e2b1c7491c945484228aa
-EBUILD spidermonkey-1.8.7-r2.ebuild 3972 SHA256 798f726298088570fd156b95dc02e81753233c6f2843b1daba85675414fc99a6 SHA512 a8dfeae5add60c957fa08b20ef01f229a6f7d03f0c1a29b665e77267a0e08a8198a61569956d6f8f8d7eeaa3d9c66d409aebc0d1cd1e804f6b8e016d4a31ecc6 WHIRLPOOL de8bd55282f3a4a86522e04bdd761221f8710de387245082cc2fe387baf71816bdfd6df4c01ff4d1ea1ca805353bcea6fe36b212193ac73a18545cf14b6484f6
-EBUILD spidermonkey-1.8.7-r3.ebuild 3828 SHA256 ab4babe1673c9429deff8bdaa8f1edd27217cade5e720299bfd2a3c64114e1d7 SHA512 8813057026e6c7597c2204f3acd1a338bc7d53799fa8f5086074417e3eeaf85cffb667e1bc89bc4f309fb4e047a9a792d2bfaeebc034287890399e3e7ad1a936 WHIRLPOOL 083b3c9c6af9bde965023a00cc345b77c101d39916cbe5a857824926d0b076340f084ca8d41326a1f0d9cb2cb8eb19471b139d874e61067625c7583e411741be
-EBUILD spidermonkey-1.8.7.ebuild 3622 SHA256 3304bd0a2f9a2f59a1ae9ecfea12c870e0d5dbd3b764da92710bd0b498c2f8b8 SHA512 141f705de863818efd726186dd7f5811dac4f651219dcc9452e12008f77d50f78414d20a422e6f60b11d8687e8c276334540a04e9e17a24ade1ba7367c01e1eb WHIRLPOOL 3aae306e20e4a813f1b1d8e117f5dd655fff5bd55029aad627108244f8e916479f209ac5367d72d56e33937d5e325adbdc1aa615c05fda8a75ac96522f6318dc
-EBUILD spidermonkey-17.0.0.ebuild 3148 SHA256 1f902e99472e7b3ea8e03cc48da1f2a0ceeb599fc1c96aee9a7ee8ac5581fd6d SHA512 71ec77952dbea75a0d5aed7de2bf85910032670dae0437bec83f535ad7e191b76a76ff97df0b2003722d096a9e35c5757a5a81ac565b7a1f3fd6f448875beeeb WHIRLPOOL e7b2628048bfac4497603a157eb84fc798ef4e4d88c083058f7ac689b42740e7a1d3b2b87d482885b69be54a711ef3e629f8a5ea541134d4f83c40fcd351186f
-MISC ChangeLog 18856 SHA256 52115a70246d63d9ed212507db97c976a73901c32eac315449abbd00032d4e36 SHA512 7609d1ac6ee210afe434bc05ce95b6ff94c3825a25d2388629e946aaabcc6ad652d6293636a6ac7a0585a60f0761e2ae58e9e94617925a5a9d6853d5177d4e9b WHIRLPOOL 92a9c017c71769a3cdbe9263e3827c7894d62d30ebfe0c25f28c7903aedbceb7c2495eda4f3fdeb02dace238ee9308add06b6c00a9d23101d377f176db9fad88
+EBUILD spidermonkey-1.8.5-r4.ebuild 3922 SHA256 dfbed81f7be6856c0bdd064f4e57f5a939ee3456e2db2d67337772752044d1d4 SHA512 d0a93c7641dc82996308a34b7a444c3da3ea7398e95e6a0c027dd763871158cb61da83696980e724c18a72c947ef62ed20af8cc7f153348cf3c8be5c48fe79cc WHIRLPOOL dd844088c850936ecc0e9e0d17719b6f4db61c5c3fdbb9b4f38a838692106869d00afb259bfdf281222f4831f94239f7b0b63c6b0be96012ca0d5b3928714d98
+EBUILD spidermonkey-1.8.7-r3.ebuild 3807 SHA256 85cfb138eab9d0dbf13b240d7f6972a7b4bd71266c6e68de4d9bbde0b11d384f SHA512 f4e6d27283f4c0052e3c88cafc237a802062ab5e945cbd9f82b7491f9120dab3eba670889d6cb2f1ad13debed3daec6c2752e29ab5d41499149dcdfd2a660195 WHIRLPOOL 13316f248ea613dc05b07994e026f8aa9752e47cb18261f80b44d483d9900bfe4efaffcded1c6806618fb3bfa49b5e28c16a1b7092b0f223ed144e17639392b6
+EBUILD spidermonkey-17.0.0.ebuild 3156 SHA256 91bbdbb98661c4d856dc72c557512bbd1645ac3faf4c1b9fb4e8ee52477b5969 SHA512 072a34ac4c85770af2bcae9c32e9ee5c5299d9b0a346e33b54d560cf8b1eba938fd2da16757f502341f1b55269e84b4f41ee64abf625525ccd637274e4425f3a WHIRLPOOL ec7dc3132659093043df467f731cdba8ba02b56a2589e60837a28558f824a25f54bf33aa2cd5a917855318427c0cafa6485c001ba7d5daa130e8d9f8425f803d
+MISC ChangeLog 19355 SHA256 1241fc554596874f72dbdfe84e118852f8fe21bd7e71edcca8d145209943525c SHA512 694050261976b4e2ecc8a74727bd27ae8469d00f8a5111d11f180a56440b0a00ce88b316bd37aa4e819d400aa58867e829c3c092245ac718a716610ab680b63c WHIRLPOOL ffab3c913939b9899fef378748316eec5844799f4e599e143bfd9145da27442a9ea4f97eb5bb58d3640ccb380ff07aaebe32a52cb4eaabeb9e21f12ff77faf2a
 MISC metadata.xml 518 SHA256 55d779229ca449e86ec0052deffcec1917d7012bf21f4314ed2ee5464d3b2a43 SHA512 7e479e71291031e8abad486fea8258fc6c0e398b42a1c3ee607252e7d3320b196b1e87fe01032c496a668c4c3af497acb3f993e58e53572ef88a8b83f5415706 WHIRLPOOL 5cf758c6d4111effbffd811c15f2380f16f43df86b3f88fad72b56612f2b520a814f4d0a64d04c4102219480ddead7e8539d0ebf63fee13526473edc25e1fa60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlH76XcACgkQ2ugaI38ACPCZvAD+MjtseFE7fHGIsALBvuIkMQEL
-U5tZVm42C/5+VsoKrlEA/29u6OnTWjwR1KAQ/9k+umZ/GiJVHHcA78/nolVvdxnt
-=RnKY
+iF4EAREIAAYFAlIEBIUACgkQ2ugaI38ACPAd8wEAlnyJruyFVeiMeZ5OHPVC6VNT
+0W4qaSTLWCQ1/SIsy2YA+wfNYiR/RD+sodUE12M5G/60QyvLVG7JcT4nUHkYEYT9
+=TU8M
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
index c2690f4989fa..f35ea58dbec1 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild,v 1.1 2012/10/23 19:07:07 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild,v 1.2 2013/08/08 20:49:55 axs Exp $
 
 EAPI="5"
-inherit eutils toolchain-funcs multilib python
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads"
+inherit eutils toolchain-funcs multilib python-any-r1
 
 MY_PV="${PV}"
 MY_PV="${MY_PV/1.8.2/3.6}"
@@ -23,15 +25,10 @@ BUILDDIR="${S}/js/src"
 RDEPEND="threadsafe? ( >=dev-libs/nspr-4.8.6 )"
 
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	app-arch/zip
-	=dev-lang/python-2*[threads]
 	virtual/pkgconfig"
 
-pkg_setup(){
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch"
 
@@ -56,7 +53,7 @@ src_configure() {
 
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf \
+	LD="$(tc-getLD)" econf \
 		${myconf}
 }
 
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
deleted file mode 100644
index 252583216809..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.24 2013/03/03 07:47:36 vapier Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
-
-LICENSE="NPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="debug static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	=dev-lang/python-2*[threads]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-
-	export LC_ALL="C"
-}
-
-src_prepare() {
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
-	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
-	# https://bugs.gentoo.org/show_bug.cgi?id=400727
-	# https://bugs.gentoo.org/show_bug.cgi?id=420471
-	epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
-	# https://bugs.gentoo.org/show_bug.cgi?id=438746
-	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=441928
-	epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
-
-	epatch_user
-
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# Don't try to be smart, this does not work in cross-compile anyway
-		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
-	fi
-
-	cd "${S}"/js/src
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}"
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}"
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg
-		mv {,native-}host_jskwgen
-		mv {,native-}host_jsoplengen
-		mv config/{,native-}nsinstall
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk
-		rm config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o
-	fi
-	emake || die
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests"
-	emake check || die
-}
-
-src_install() {
-	cd "${BUILDDIR}"
-	emake DESTDIR="${D}" install || die
-	dobin shell/js ||die
-	pax-mark m "${ED}/usr/bin/js"
-	dodoc ../../README || die
-	dohtml README.html || die
-
-	if ! use static-libs; then
-		# We can't actually disable building of static libraries
-		# They're used by the tests and in a few other places
-		find "${D}" -iname '*.a' -delete || die
-	fi
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
deleted file mode 100644
index 1bce9174c606..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r2.ebuild,v 1.8 2013/03/03 07:47:36 vapier Exp $
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs185"
-KEYWORDS="~alpha ~amd64 arm ~hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug minimal static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	=dev-lang/python-2*[threads]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-	python_pkg_setup
-	export LC_ALL="C"
-}
-
-src_prepare() {
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
-	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
-	# https://bugs.gentoo.org/show_bug.cgi?id=400727
-	# https://bugs.gentoo.org/show_bug.cgi?id=420471
-	epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
-	# https://bugs.gentoo.org/show_bug.cgi?id=438746
-	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=441928
-	epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
-
-	epatch_user
-
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# Don't try to be smart, this does not work in cross-compile anyway
-		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die
-	fi
-
-	cd "${BUILDDIR}" || die
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile || die
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-	# bug 437520 , exclude js shell for small systems
-	if ! use minimal ; then
-		dobin shell/js
-		pax-mark m "${ED}/usr/bin/js"
-	fi
-	dodoc ../../README
-	dohtml README.html
-
-	if ! use static-libs; then
-		# We can't actually disable building of static libraries
-		# They're used by the tests and in a few other places
-		find "${D}" -iname '*.a' -delete || die
-	fi
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild
deleted file mode 100644
index 456a01d64b8b..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r3.ebuild,v 1.3 2013/03/03 07:47:36 vapier Exp $
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs185"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug minimal static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	=dev-lang/python-2*[threads]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-	python_pkg_setup
-	export LC_ALL="C"
-}
-
-src_prepare() {
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
-	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
-	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
-	# https://bugs.gentoo.org/show_bug.cgi?id=400727
-	# https://bugs.gentoo.org/show_bug.cgi?id=420471
-	epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
-	# https://bugs.gentoo.org/show_bug.cgi?id=438746
-	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=441928
-	epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=439260
-	epatch "${FILESDIR}"/${P}-symbol-versions.patch
-
-	epatch_user
-
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# Don't try to be smart, this does not work in cross-compile anyway
-		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die
-	fi
-
-	cd "${BUILDDIR}" || die
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile || die
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-	# bug 437520 , exclude js shell for small systems
-	if ! use minimal ; then
-		dobin shell/js
-		pax-mark m "${ED}/usr/bin/js"
-	fi
-	dodoc ../../README
-	dohtml README.html
-
-	if ! use static-libs; then
-		# We can't actually disable building of static libraries
-		# They're used by the tests and in a few other places
-		find "${D}" -iname '*.a' -delete || die
-	fi
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
index a0c145b4c092..da33fb226c4e 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild,v 1.18 2013/06/08 21:35:23 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild,v 1.19 2013/08/08 20:49:55 axs Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads"
+inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
 
 MY_PN="js"
 TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
@@ -24,14 +26,12 @@ BUILDDIR="${S}/js/src"
 
 RDEPEND=">=dev-libs/nspr-4.7.0"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	app-arch/zip
-	=dev-lang/python-2*[threads]
 	virtual/pkgconfig"
 
 pkg_setup(){
 	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		python_set_active_version 2
-		python_pkg_setup
 		export LC_ALL="C"
 	fi
 }
@@ -67,7 +67,7 @@ src_configure() {
 
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
+	LD="$(tc-getLD)" \
 	econf \
 		${myopts} \
 		--enable-jemalloc \
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild
deleted file mode 100644
index 615d69fb764b..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r2.ebuild,v 1.4 2013/03/03 07:47:36 vapier Exp $
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-SPIDERPV="${PV}-patches-0.1"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="http://people.mozilla.com/~dmandelin/${TARBALL_P}.tar.gz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs187"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug jit minimal static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	=dev-lang/python-2*[threads]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-	python_pkg_setup
-	export LC_ALL="C"
-}
-
-src_prepare() {
-	# Apply patches that are required for misc archs
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/spidermonkey"
-
-	epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=439260
-	epatch "${FILESDIR}"/${P}-symbol-versions.patch
-
-	epatch_user
-
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# Don't try to be smart, this does not work in cross-compile anyway
-		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die
-	fi
-
-	cd "${BUILDDIR}" || die
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		--enable-system-ffi \
-		--enable-jemalloc \
-		$(use_enable debug) \
-		$(use_enable jit tracejit) \
-		$(use_enable jit methodjit) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile || die
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-	if ! use minimal; then
-		dobin shell/js
-		if use jit; then
-			pax-mark m "${ED}/usr/bin/js"
-		fi
-	fi
-	dodoc ../../README
-	dohtml README.html
-	# install header files needed but not part of build system
-	insinto /usr/include/js
-	doins ../public/*.h
-	insinto /usr/include/js/mozilla
-	doins "${S}"/mfbt/*.h
-
-	if ! use static-libs; then
-		# We can't actually disable building of static libraries
-		# They're used by the tests and in a few other places
-		find "${D}" -iname '*.a' -delete || die
-	fi
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild
index e7b638899d6e..2d2129216441 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild,v 1.6 2013/03/03 07:47:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild,v 1.7 2013/08/08 20:49:55 axs Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads"
+inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
 
 MY_PN="js"
 TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
@@ -27,14 +29,12 @@ BUILDDIR="${S}/js/src"
 RDEPEND=">=dev-libs/nspr-4.7.0
 	virtual/libffi"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	app-arch/zip
-	=dev-lang/python-2*[threads]
 	virtual/pkgconfig"
 
 pkg_setup(){
 	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		python_set_active_version 2
-		python_pkg_setup
 		export LC_ALL="C"
 	fi
 }
@@ -63,7 +63,7 @@ src_configure() {
 
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
+	LD="$(tc-getLD)" \
 	econf \
 		${myopts} \
 		--enable-jemalloc \
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
deleted file mode 100644
index 06a68ac0358b..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild,v 1.8 2013/03/03 07:47:36 vapier Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-SPIDERPV="${PV}-patches-0.1"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="http://people.mozilla.com/~dmandelin/${TARBALL_P}.tar.gz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
-
-LICENSE="NPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug jit static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.7.0
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	=dev-lang/python-2*[threads]
-	virtual/pkgconfig"
-
-pkg_setup(){
-	python_set_active_version 2
-
-	export LC_ALL="C"
-}
-
-src_prepare() {
-	# Apply patches that are required for misc archs
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/spidermonkey"
-
-	epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
-	epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
-
-	epatch_user
-
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# Don't try to be smart, this does not work in cross-compile anyway
-		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
-	fi
-
-	cd "${S}"/js/src
-	eautoconf
-}
-
-src_configure() {
-	cd "${BUILDDIR}"
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		--enable-system-ffi \
-		--enable-jemalloc \
-		$(use_enable debug) \
-		$(use_enable jit tracejit) \
-		$(use_enable jit methodjit) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}"
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg
-		mv {,native-}host_jskwgen
-		mv {,native-}host_jsoplengen
-		mv config/{,native-}nsinstall
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk
-		rm config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o
-	fi
-	emake || die
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests"
-	emake check || die
-}
-
-src_install() {
-	cd "${BUILDDIR}"
-	emake DESTDIR="${D}" install || die
-	dobin shell/js ||die
-	if use jit ; then
-		pax-mark m "${ED}/usr/bin/js"
-	fi
-	dodoc ../../README || die
-	dohtml README.html || die
-	# install header files needed but not part of build system
-	insinto /usr/include/js || die
-	doins ../public/*.h || die
-	insinto /usr/include/js/mozilla || die
-	doins "${S}"/mfbt/*.h || die
-
-	if ! use static-libs; then
-		# We can't actually disable building of static libraries
-		# They're used by the tests and in a few other places
-		find "${D}" -iname '*.a' -delete || die
-	fi
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild
index 93f15a6c0940..add7ac493d1c 100644
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild,v 1.1 2013/08/02 17:16:22 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild,v 1.2 2013/08/08 20:49:55 axs Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
-inherit eutils toolchain-funcs multilib python versionator pax-utils
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads"
+inherit eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
 
 MY_PN="mozjs"
 MY_P="${MY_PN}${PV}"
@@ -13,7 +15,7 @@ HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/js/${MY_PN}${PV}.tar.gz"
 
 LICENSE="NPL-1.1"
-SLOT="0/mozjs17.0.0"
+SLOT="17"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug jit minimal static-libs test"
 
@@ -25,14 +27,13 @@ BUILDDIR="${S}/js/src"
 RDEPEND=">=dev-libs/nspr-4.9.4
 	virtual/libffi"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	app-arch/zip
-	=dev-lang/python-2*[threads]
 	virtual/pkgconfig"
 
 pkg_setup(){
 	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		python_set_active_version 2
-		python_pkg_setup
+		python-any-r1_pkg_setup
 		export LC_ALL="C"
 	fi
 }
@@ -51,7 +52,7 @@ src_configure() {
 
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
+	LD="$(tc-getLD)" \
 	econf \
 		${myopts} \
 		--enable-jemalloc \
@@ -106,10 +107,10 @@ src_install() {
 
 	if ! use minimal; then
 		if use jit; then
-			pax-mark m "${ED}/usr/bin/js1*"
+			pax-mark m "${ED}/usr/bin/js${SLOT}*"
 		fi
 	else
-		rm -f "${ED}/usr/bin/js1*"
+		rm -f "${ED}/usr/bin/js${SLOT}"
 	fi
 
 	if ! use static-libs; then