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

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

10 files changed, 39 insertions, 680 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/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