Multiple bug fixes, bug #377025,377291,388217,375685

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 60 insertions, 10 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index a9bd8e3b4998..d98d92b4d931 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.62 2011/09/24 16:57:47 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.63 2011/11/14 21:01:07 anarchy Exp $
+
+*spidermonkey-1.8.5-r1 (14 Nov 2011)
+
+  14 Nov 2011; Jory A. Pratt <anarchy@gentoo.org> -spidermonkey-1.8.5.ebuild,
+  +spidermonkey-1.8.5-r1.ebuild, +files/spidermonkey-1.8.5-fix-ppc64.patch:
+  Multiple bug fixes, bug #377025,377291,388217,375685
 
   24 Sep 2011; Fabian Groffen <grobian@gentoo.org>
   spidermonkey-1.8.2.15.ebuild:
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 883c03a8d7d0..06ec28da0c9b 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -6,6 +6,7 @@ AUX spidermonkey-1.6-header.patch 270 RMD160 ff656884925470695542b2b9412a130c725
 AUX spidermonkey-1.7.0-ldflags.patch 679 RMD160 8526ab33d971a4e6d836ace41d522e63c378d6f3 SHA1 929953bca09960d6f2762749f0cc969a5e58b6ba SHA256 bbea50178ad2569f9fbbf449f1727851cb51a67766568847cc2c208c45d43f29
 AUX spidermonkey-1.7.0-threadsafe.diff 513 RMD160 894fd8791cdf3156031e4cb370a0de40ce53cdf2 SHA1 cd4d61468ca2fdd1f90b6bb207ebf46427261166 SHA256 3e41354e093efce3fe897814bc490aa45e17c9d6d0ca6ae7f9f1550b85be89e9
 AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 RMD160 0a6e799e6b47c0011ba02c877e0d190ae3830c62 SHA1 b0f776c06e956024fb0f0553f8056bbce0830273 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823
+AUX spidermonkey-1.8.5-fix-ppc64.patch 849 RMD160 def597b1b913385b908da7e09683c23bc5e6e61d SHA1 4700b680441e65854e9fb3108218ea9f0f8d264d SHA256 5cfdb6a590e02c83cd15732e417da9fdd26bd65490fe07e21c173d375e3c6abc
 AUX spidermonkey-1.9.2.13-as-needed.patch 623 RMD160 2f77a10c5984d078ed187b1b5f469393f8c7a35d SHA1 367571f1d440e46f87d3edcfafbff0d17cce3cdb SHA256 5163be062d23265cc19e9b1acb441ec42ceb2fd678b03076880869b7b9f92f8f
 DIST firefox-3.6.15.source.tar.bz2 51552828 RMD160 faa15978cc8e492833130910c243a585ff78ee3f SHA1 bfb69ae49b2def7482543d4d982fa58993a458e9 SHA256 405aa411a8ddb456017564522cbb486850e34fe14485b1c31fa93fc5c750870f
 DIST js-1.7.0.tar.gz 1165607 RMD160 6eadf1ac7c10a13b3db3d499856c9e18ddbcdfdb SHA1 1a99e8e10cb6600a03ea98895583a8ed42136d1f SHA256 44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b
@@ -14,13 +15,17 @@ EBUILD spidermonkey-1.7.0-r1.ebuild 1517 RMD160 000f9e4cc2f9aef70323cb6ce4012825
 EBUILD spidermonkey-1.7.0-r2.ebuild 1664 RMD160 2eea40d279729740380fd8eca22d142518805cf3 SHA1 3d0229e52cb2b14899ac5cddf689abdbe064b7a1 SHA256 907e253f2519790d2ac48779637a557b8748bdccbf718cef0991a22dc8c71113
 EBUILD spidermonkey-1.7.0.ebuild 1432 RMD160 9dc3f12649f67fe727f8b327a54bbc91c0522358 SHA1 411aad11f1d1beb4435aa19a43d96447b11e7dac SHA256 5df2e8917fce96363d2128a2fdafc623aa159e60682591b347201b062778a99e
 EBUILD spidermonkey-1.8.2.15.ebuild 1909 RMD160 f023579d5da8abea011f0310ca6d2bc3130d8bcc SHA1 ee017ef05bfc908bbc65ebaebbbbde556e66457b SHA256 fa7ad212b4606e8b2087de34f2d30bfa10cbbcc90a905a43b32b285df3ccc290
-EBUILD spidermonkey-1.8.5.ebuild 2013 RMD160 b1023578e90a83405d0575b65363938bda01294a SHA1 ba242f1bd760c9e1cc14a71b87f7404a7ae7704c SHA256 fb018dd3b1b3f01aed82badc3cd1ab40fab8694855ed382a89692ecf92fe3828
-MISC ChangeLog 9809 RMD160 f0313f02f9f19761b300a1981484898c4785af7a SHA1 b01570cd23939c59577433b7f3375d426457c7f1 SHA256 f1f60ac65e25a91713b9795dbf6e8c2afb1a79bccdc5a99020005adc349e2f08
+EBUILD spidermonkey-1.8.5-r1.ebuild 2243 RMD160 1e24c6f320bb07b9ec192f14db3bb4bf06e08753 SHA1 98f90b0d0495c2c639b1d5ceca1eef79d49bb1bd SHA256 8f44beb32a44b2cae432b64b4af7490930245deeab775e8a811fc927538115a9
+MISC ChangeLog 10057 RMD160 c0088757c1837c49f42f0bb39b2f122ec0561f8f SHA1 f8fa9514a9cc64fdbfff98a57e823fb4f746d5dd SHA256 688515f77b714d403bd7fc42d47fbaa2f913a254dfd883aff65783c12a9d4de0
 MISC metadata.xml 523 RMD160 b40a1ffd94bc32fd5045b99160481c2b95d69d30 SHA1 91eb56541e242621c81e38eb9e9f0c4dea6f099f SHA256 876e7996ea990b78088ea8ef1f0445658fea0bb7cf0a1e07cd1db2bae870307f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5+DBAACgkQX3X2B8XHToksgwCeJCpg8fHZIVhfNm3rgmGH/YpH
-hH8AoJCP9h1TY0AwYBE4WniCQ53KoqtO
-=rtPQ
+iQEcBAEBAgAGBQJOwYGfAAoJEIXV9xahDnCoKaUH/jPfrkoNi0byCItiqNHDGRUa
+lsQv2jxwv8rmosEP4M7hA0rfmeYcaqMAr9VyPQ1zd8bWxOmSUu1w0Wr4ooUM6djk
+QdGaq4o6RobmrawkiQMUspVvsB29zueQ57Vlp8A6GZHoGjFxqv4jqjN05QcAxInx
+wLM/V2VgQNc5+z5l3Sh5GBElQEPInGbP1u2b9gNU1i16I2ESM2O+LaXxxRClL1jW
+QfNLhKdXXAAr+uiqDi/DXl2H2QDxsTjzV2SLJCXz2IA42PYl/w+dabXaEgLMaYRR
+kwU13kE+Ug119veSM62pPSZXe3Cx+ngTTHijjEh3H/5bCWj6LLOYZrO+WfGzW+A=
+=MkTz
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
new file mode 100644
index 000000000000..d7a2b9e9af0f
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1303461188 -7200
+# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
+# Parent  c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
+Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -383,17 +383,17 @@ CPPSRCS += 	checks.cc \
+ 		platform.cc \
+ 		utils.cc \
+ 		$(NONE)
+ 
+ #
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
++ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+ 		$(srcdir)/yarr/pcre \
+ 		$(NULL)
+ 
+ CPPSRCS += 	pcre_compile.cpp \
+                 pcre_exec.cpp \
+
+
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
index b19b37a80d4d..e78b8947b577 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 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.ebuild,v 1.2 2011/07/03 05:36:21 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.1 2011/11/14 21:01:07 anarchy Exp $
 
 EAPI="3"
-inherit eutils toolchain-funcs multilib python versionator
+inherit eutils toolchain-funcs multilib python versionator pax-utils
 
 MY_PN="js"
 TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
@@ -16,7 +16,7 @@ SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
 LICENSE="NPL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="static-libs test"
+IUSE="debug static-libs test"
 
 S="${WORKDIR}/${MY_P}"
 BUILDDIR="${S}/js/src"
@@ -29,11 +29,15 @@ DEPEND="${RDEPEND}
 
 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"
 
 	epatch_user
 
@@ -48,10 +52,12 @@ src_configure() {
 
 	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)
 }
@@ -69,6 +75,8 @@ src_test() {
 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