do not call python helpers when merging a binary package, bug 446910

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

4 files changed, 287 insertions, 5 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index 243f04889383..2444853aed71 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.95 2012/12/06 21:39:23 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.96 2012/12/11 21:26:41 axs Exp $
+
+*spidermonkey-1.8.7-r3 (11 Dec 2012)
+*spidermonkey-1.8.5-r4 (11 Dec 2012)
+
+  11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> +spidermonkey-1.8.5-r4.ebuild,
+  +spidermonkey-1.8.7-r3.ebuild:
+  do not call python helpers when merging a binary package, bug 446910
 
 *spidermonkey-1.8.7-r2 (06 Dec 2012)
 *spidermonkey-1.8.5-r3 (06 Dec 2012)
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 29495b61b888..d2ee6dc77c5e 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -31,14 +31,16 @@ EBUILD spidermonkey-1.8.2.15.ebuild 1907 SHA256 e03a07403e86e8a20c7efefc59dc5e84
 EBUILD spidermonkey-1.8.5-r1.ebuild 3392 SHA256 ad3897813399160cec05f9c25b323b5431b4623864c6a05002d31bdcfcef56b0 SHA512 1b689af7af8a4c1886ea6cc76a3408f68befec4d5df1f45be6bb278e666f4292210cdd6347bfdd3d34a0335933e147f428a0d024e51688ff458e11ba276fe685 WHIRLPOOL b3039de45057673dd1998aefee40182ee80c4ef7b10352c5c11d49216d4cf03f5a4205e7af92b7feb7b1746e8786b410877506f3fef66c6ab7cfa82bd77fb820
 EBUILD spidermonkey-1.8.5-r2.ebuild 3724 SHA256 5f6b29df406f650109de8f40759c196eab2c6074cd176731fbcca5078d4c5c20 SHA512 c0cc30af57109ae893eed1f333f2585a06b93d156ea86d91ea8b0ec1c73c52564725c3a9e319a047d6a6225096f8c3cc83376c7fa9e072c1c7d4465bcd76655e WHIRLPOOL 6cd01f05388f48cb0526189e510ceb3749b006d3bce638e85320d4c897176765ba93cb17429f0ec2c284f2bbe6a3b45575a0e684868a72e4d8977da365ea3ad8
 EBUILD spidermonkey-1.8.5-r3.ebuild 3820 SHA256 0bb0fd48912006c7478148ad82ea7fff9ad3128ae6cdf5e4ae5e1718ab071db5 SHA512 782a49ef74b99410d189e580e60e8e12ecc0e48f78fa0351ed1ae06d038681442e4653ab638688a3a740c5bd8e4583cdf2075d6a53d6813a0db46a86dce743ad WHIRLPOOL 6d9468378a0410207e77e152d5038cdf731a42880e1a359d687f6a4f040299e370c9d4eceab80a0284b82b367eff42541436a5eeb04245b4ba0ca4aed751c040
+EBUILD spidermonkey-1.8.5-r4.ebuild 3869 SHA256 a36484e6b41dbe4a33669913e3752196a3dd9d8f60de62a6f562f7158bcc6456 SHA512 1029b24d9e6dee0e7fbb463171ded6233b4f8a02b4d40cd617acbe1b6c5eb0269fd64a502861ac35c94fb9d438c6f0c93bdb1e783f29b86c610db410ebd440c3 WHIRLPOOL 9e80bd2cc7a19f3624c49eb4dd00f1b6a662c8385bfb5c5cfeee452ea8380a47c81f9416e6b21d60b548c2062a7ba7d7e7514abab0a5a136454935bb5e00a7a8
 EBUILD spidermonkey-1.8.7-r2.ebuild 3953 SHA256 0064ff0cd89005d9fda0e42a34bab38cf08576f3005ab9f76cb415c2af1b250d SHA512 60e073e2baf4c285036bc699d0b2046cee736250bae8e163dd931738bdcc4fd37b7fdf5e74cf294a12ea4bb171617a9fff7b72c717703c1497b8dba80f775c31 WHIRLPOOL b421c800f4f4aece6ce8f0101177a5b006204af5022ea28d8e021add646db10375bf3308367951147b2433ccf53f85edc6bd2e22306ff31a2be830872630519f
+EBUILD spidermonkey-1.8.7-r3.ebuild 4002 SHA256 f50355febb9db9f88f8b773993defc7314b242cb50693e1c958ab2b86533b791 SHA512 6cc438c83862184be262f0526abf41d126bb5f0d87f4ef90bede3b1f3eed8417ed73a4134922b6e58f08a7c85c7e1dfb7c40e2832e2d1bf4a53329c4bcf2c49b WHIRLPOOL 81b308a3ca7698aecf0f89e5206308b5f52492a94bb5ef5370cf0921f53348285085f891fd7ed004124942ecfe7a46cc90243367f6a1ab4939a83dad1be1a1dc
 EBUILD spidermonkey-1.8.7.ebuild 3607 SHA256 a60de62a9845cc56b0fb289ac8ffee9c31d8a6bfb9b7f68aaf37aacf849e8d70 SHA512 62cbf45fa4461057d2d3d8369cb2b8a4e29f68d225d518b89aa37e904e65dc1a79c1587d40e7c40c7f647368fc754f985c31b0a628d0a8bb976aec54bc06a88c WHIRLPOOL 579de256e755939c93d0f7ff8c26edfdd7f85e4fff2af14cb4f9d5e022a1bae2b5aa6b93eec5d6b190c3b0edaae23f804c8e342bb25e7a9f0cc3e0aa348067c2
-MISC ChangeLog 15408 SHA256 e2e723e072e04790dabebfa1249a0e31d0aa5d15f36f3db0a1379dbfc641492e SHA512 fa22275827aea71e71e208771b489db51318bad798277ea16a9981b86264feafb74a7d054ba77d05054f614a6f671fa0fae6a75fa60db360b0109f83d95ddba7 WHIRLPOOL 1406b8c731e2c36f05af475d83f3fd753682d888f1adb88ffc93eafc68550260f6a6634edbcf546d7e1cfee16aae16deb2306642cec249766f5abada8f57e739
+MISC ChangeLog 15668 SHA256 ab2f28ad0412552e62373729b538ee12f5d27b59017dda44134f34bd5198fde1 SHA512 112ee4d9fcbddace2da06c531c0dfd0b43709b7507a5a2b914a211e15378842b41ec22deee0c8863870a2ae454315b384b0d162f19ae232619dbdc2045e1836d WHIRLPOOL ce258037b0591567432368208b51ebabbb7764ccee971599c64a0ab6191540846acd05d1ead62756fd3af1f8691f56c88fbd77756c3ead85c3c3fb2246ad2b8c
 MISC metadata.xml 337 SHA256 198d1a23238f7b069df2def08e41451d40c225f8a93a2005ed83166f8fae7d35 SHA512 8f7d13e732629734cdcf5db9b8d4279820517c68b80f3ab840f1dfa6117d38eae70feb6894f1f51e76b33cfc058a39a3ecb6ec3fa33199c7a1bc64bc1897bf89 WHIRLPOOL 8ea694f3e700dc58c787f1c9c91621ed83cf06785172045bd4d2d436fb8e7153ea2631db9e7113a59d765fc67fa32aba5275809cad1d96ed2154fc65da0c803d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDBEJ0ACgkQ2ugaI38ACPAIwAEAjdvrp/DOb0e8SEsx7pm/XF9d
-xsHKUNdEKXqs34GdKiUA/iQXo4MPy3wJ9QTMB34HVAB2A3hhcmxYGesjVD1Vc32u
-=cLfC
+iF4EAREIAAYFAlDHpSAACgkQ2ugaI38ACPDKAQEAgnjeDN33XQ8U6ZHEcqtFjnYP
+1bHV69pQb/tnFui4KVgA+gMWrz3KvzOalg+5NAJ0NihwhVMYZBGsm+DItoKPrCqi
+=jVI6
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
new file mode 100644
index 000000000000..d48acd6ea0f4
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 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.1 2012/12/11 21:26:41 axs 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 ~mips ~ppc ~ppc64 ~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(){
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		python_set_active_version 2
+		python_pkg_setup
+		export LC_ALL="C"
+	fi
+}
+
+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.7-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild
new file mode 100644
index 000000000000..6b41a01d9371
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2012 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.1 2012/12/11 21:26:41 axs 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 ~mips ~ppc ~ppc64 ~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(){
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		python_set_active_version 2
+		python_pkg_setup
+		export LC_ALL="C"
+	fi
+}
+
+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
+}