dropped optimizations so build system will respect cflags, bug 444126, thanks to hasufell for patches; removed old :24 ebuild

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

4 files changed, 21 insertions, 146 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index 4216d337a792..4a6fcd6bb12e 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.150 2014/05/23 21:13:46 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.151 2014/06/02 11:46:35 axs Exp $
+
+  02 Jun 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  -spidermonkey-24.2.0-r1.ebuild, spidermonkey-24.2.0-r2.ebuild:
+  dropped optimizations so build system will respect cflags, bug 444126, thanks
+  to hasufell for patches; removed old :24 ebuild
 
 *spidermonkey-24.2.0-r2 (23 May 2014)
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index c1d3bca8766c..de32ef61c1e4 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -40,14 +40,13 @@ EBUILD spidermonkey-1.8.2.15-r2.ebuild 1935 SHA256 0692bfde440a59188c6fe480e082b
 EBUILD spidermonkey-1.8.5-r4.ebuild 4010 SHA256 92127da6b4a5a2efb8dcfed7cbcfc52b3f026963409ed770a35ffc2b365d20d4 SHA512 e4e276f4b2895dd2babbd99659b34082936a1c788eb0640598c77bbbc03cefa310f7bbaf66bdbb18b404de884e4f83946e1dcb2ea6613787cb628f7d57a89af8 WHIRLPOOL d1b8c7719143a0c91093d875088d00b0fe249d12c29af53c8ba8d50adab460a5cc8496dbfb3259eebfd04de8390675c916c259ed8099dbf5e3662ee2c2bb2bb7
 EBUILD spidermonkey-1.8.7-r3.ebuild 3807 SHA256 85cfb138eab9d0dbf13b240d7f6972a7b4bd71266c6e68de4d9bbde0b11d384f SHA512 f4e6d27283f4c0052e3c88cafc237a802062ab5e945cbd9f82b7491f9120dab3eba670889d6cb2f1ad13debed3daec6c2752e29ab5d41499149dcdfd2a660195 WHIRLPOOL 13316f248ea613dc05b07994e026f8aa9752e47cb18261f80b44d483d9900bfe4efaffcded1c6806618fb3bfa49b5e28c16a1b7092b0f223ed144e17639392b6
 EBUILD spidermonkey-17.0.0-r3.ebuild 3541 SHA256 69644bf5a10849eb400cd1ce55eba99095cffb9fce88dc32b226400586b209dc SHA512 7a869e451e27522b361087eaa1390fc24ff06d711ec535359a4c6b9d17b420bc791c1baa0c6d122ca3ac27c2d8ab102ce6ca45ff00967497f4bf2a28c89b6db6 WHIRLPOOL 3447bfe0111b6b44fc5752f6bfbf2057a714d635c27ab9493a14035471d0d135aa7da960f698819f446eb4af6fb3ffadb64ddfa4902967b274620806ed169afa
-EBUILD spidermonkey-24.2.0-r1.ebuild 3667 SHA256 1c47910db636c6676d6e58e975955f78311a6ed8d1ab067ff57513f5e0fd64be SHA512 af7517dfb5ccf0e9a29c26f83f0ffc605487c46ad53f308d0eb2000a66e9f986c55ddeae98128600060cf835e5440ed994c1bc6d19d600f5720c80d3e6d2d08f WHIRLPOOL f9dfedee0bf4bea5fc46b02ff02769e80d66d765a6df20166826ad016d73090c3be4a6cfa7fc411367eab40511d60fc658fcbdf22b3954d48506e15dfef4878a
-EBUILD spidermonkey-24.2.0-r2.ebuild 3639 SHA256 1b5be26fd4b8e8a6cc45c49f98c4cf91588199a2ab1e38350e28fb60bf05036b SHA512 bf1da3b683cfaf21efb3b4c9eabdaa27b902094f6a9f24c735ed3d9083c26eb65793354f9616dd7761f3616d404804f945c26f139f4385e24f390b9e0942a510 WHIRLPOOL 3082bfd32a400fc6dc139ddbfd87c36a7049caf578b87078265ac04e1e021f84e7c398d54fda6716719567afdcba3f7d887224a849408f17e23d3e008f211e31
-MISC ChangeLog 24030 SHA256 201a54c67cb1472acf45ca966eafa650c8f0572c3ee35b5300e1786fcf5253cd SHA512 19273cca8c8ecde05ea0a42832fee4bdbe57793875b4a484b62af29bee150616a784eb63b014e45454617cb61cce544db144c97a28a32bcac4f0738572703dba WHIRLPOOL 110ab7579f354be1a71b2132be98c8cc5617bf99ca2e055ef0cb3daacee00daa8ac2e398a67f6a122df6f3ead2ed89caeed5cc69b9307922418717b3030c241b
+EBUILD spidermonkey-24.2.0-r2.ebuild 3988 SHA256 297e47625b20d36a2d0b1f14dbc2214c5548f63de7550c02c531bc2448d91752 SHA512 5cd760042acfed63b3a07dec58896ed0316e2ae9aa7765c9481a4e0c4d428d5266d3945f0b6372abfd36dd7d4d72ea8588746d07adbf455b80d0c7b39bf2d772 WHIRLPOOL 52f020f8421818750fff6d9fbcd932bac7704f7a7fec610599fb50c54002c91c3f2ca75810fe6088535a00040ad5864de9ad09284c6a04d29d701f8bae6443cc
+MISC ChangeLog 24283 SHA256 c146360adf6cb2351262a6468de74b46038e49f6661745e17556a17f424514c9 SHA512 9ace2d3bb90300e0d6569adadf792d5178d3a3b24bd0397c54c81361648ea90f2a37416f820be7f818cb67a8ca072f4c139d9df9dc6c2d62f144f3c135c83714 WHIRLPOOL 918fcd9f1d2ab09614b452e6f96653ddc8e49abc320987fac6f9ee81090d48e11b4f5f3c2a1c066f3d7caca940f59bb8ad20413def42156e9e634002fea7f41e
 MISC metadata.xml 666 SHA256 c7c78c882b67a3f4c72a6cefcd83abe58f8fcecd9e5dfdec7ddb133b64a85f8f SHA512 3a94dc13bf8f417d2f760a18765a58e7d8118ceb52b90ef3ae646830d745d10e5e09d7b60828b27381d16c8008c0c1dd00fa0a88e9a447d45cf76312b780f12e WHIRLPOOL 34e73fb374d36c0e29d6ea472c3e9751b42bc1cd061b795b56efd9df3021cc27d7f00beb971adfee8785016b9d24575228bc8d2de985fbc49c36596962bbb2de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlN/uhAACgkQ2ugaI38ACPCPxQD/biNx7+AoJlJOp8SY7fzryV86
-4ZJu8Sq7QbBJAejyrnwA/An9tLivpLRX79M75XQzWHpPEGTCCzLlZ7ZYXkAOqzMU
-=XD5v
+iF4EAREIAAYFAlOMZCMACgkQ2ugaI38ACPD2nAD/Zsym9ikJdV5vsKNN+KMMod5p
+rXmTCnlmnePhd6W8e1oA/1BpByk0Iwa06dhLygec40g9+Oe+0u+nwH/kfRiNntZt
+=8l61
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild
deleted file mode 100644
index e72cf71b2cc1..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r1.ebuild,v 1.2 2014/05/05 20:28:23 axs Exp $
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="threads"
-inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
-
-MY_PN="mozjs"
-MY_P="${MY_PN}-${PV/_/.}"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.bz2"
-
-LICENSE="NPL-1.1"
-SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug icu jit minimal static-libs +system-icu test"
-
-RESTRICT="ia64? ( test )"
-
-S="${WORKDIR}/${MY_P%.rc*}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.9.4
-	virtual/libffi
-	>=sys-libs/zlib-1.1.4
-	system-icu? ( >=dev-libs/icu-1.51:= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	virtual/pkgconfig"
-
-pkg_setup(){
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		python-any-r1_pkg_setup
-		export LC_ALL="C"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${SLOT}-system-icu.patch
-	epatch "${FILESDIR}"/${PN}-24.2.0-fix-file-permissions.patch
-	epatch "${FILESDIR}"/${PN}-${SLOT}-upward-growing-stack.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
-
-	local myopts=""
-	if use icu; then # make sure system-icu flag only affects icu-enabled build
-		myopts+="$(use_with system-icu)"
-	else
-		myopts+="--without-system-icu"
-	fi
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		--enable-system-ffi \
-		--enable-jemalloc \
-		$(use_enable icu intl-api) \
-		$(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
-		if use jit; then
-			pax-mark m "${ED}/usr/bin/js${SLOT}"
-		fi
-	else
-		rm -f "${ED}/usr/bin/js${SLOT}"
-	fi
-
-	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-24.2.0-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild
index 2d1647f7c8e4..496c628d0969 100644
--- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild,v 1.1 2014/05/23 21:13:46 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild,v 1.2 2014/06/02 11:46:35 axs Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
@@ -75,6 +75,7 @@ src_configure() {
 		--enable-threadsafe \
 		--with-system-nspr \
 		--enable-system-ffi \
+		--disable-optimize \
 		$(use_enable icu intl-api) \
 		$(use_enable debug) \
 		$(use_enable jit yarr-jit) \
@@ -89,10 +90,14 @@ src_compile() {
 		make CFLAGS="" CXXFLAGS="" \
 			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
 			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \
+			HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \
+			MOZ_PGO_OPTIMIZE_FLAGS="" \
 			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) \
+			MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" HOST_OPTIMIZE_FLAGS="" \
 			-C config nsinstall || die
 		mv {,native-}jscpucfg || die
 		mv {,native-}host_jskwgen || die
@@ -108,7 +113,10 @@ src_compile() {
 			host_jskwgen.o \
 			host_jsoplengen.o || die
 	fi
-	emake
+	emake \
+		MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \
+		HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \
+		MOZ_PGO_OPTIMIZE_FLAGS=""
 }
 
 src_test() {