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

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

3 files changed, 281 insertions, 1 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/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
+}