Do not strip the toolchain with a non-NaCl strip, this breaks it (bug #386931 by Kamen Dokov). Big thanks to Victor Khimenko for identifying the issue and the solution. Removed old, broken versions.

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 19 insertions, 112 deletions

diff --git a/dev-lang/nacl-toolchain-newlib/ChangeLog b/dev-lang/nacl-toolchain-newlib/ChangeLog
index 0435bdae8368..22907a533c46 100644
--- a/dev-lang/nacl-toolchain-newlib/ChangeLog
+++ b/dev-lang/nacl-toolchain-newlib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/nacl-toolchain-newlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nacl-toolchain-newlib/ChangeLog,v 1.4 2011/10/11 23:14:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nacl-toolchain-newlib/ChangeLog,v 1.5 2011/10/19 16:28:23 phajdan.jr Exp $
+
+*nacl-toolchain-newlib-0_p6869-r1 (19 Oct 2011)
+
+  19 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -nacl-toolchain-newlib-0_p6852.ebuild, -nacl-toolchain-newlib-0_p6869.ebuild,
+  +nacl-toolchain-newlib-0_p6869-r1.ebuild:
+  Do not strip the toolchain with a non-NaCl strip, this breaks it (bug #386931
+  by Kamen Dokov). Big thanks to Victor Khimenko for identifying the issue and
+  the solution. Removed old, broken versions.
 
   11 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   nacl-toolchain-newlib-0_p6869.ebuild:
diff --git a/dev-lang/nacl-toolchain-newlib/Manifest b/dev-lang/nacl-toolchain-newlib/Manifest
index 1b986d62d778..007256549acd 100644
--- a/dev-lang/nacl-toolchain-newlib/Manifest
+++ b/dev-lang/nacl-toolchain-newlib/Manifest
@@ -2,29 +2,19 @@
 Hash: SHA512
 
 DIST binutils-2.20.1.tar.bz2 17591527 RMD160 aebf86b8ae126fabd52450a81c7d491c40ff851d SHA1 3f0e3746a15f806a95dd079be2a7f43c17b18818 SHA256 71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64
-DIST cloog-ppl-0.15.9.tar.gz 767694 RMD160 659d400c25de6430006346d1f554194db9c3ee06 SHA1 08c9458dbccaa3a7522156580f814dc14399febd SHA256 8c54d4bca186cb66671e07540aec276d5f8ad013ae8867294576b431cbb142a5
 DIST gcc-4.4.3.tar.bz2 62944934 RMD160 b51afac3cb77ee3dc09d29c2f85936482ed82ab2 SHA1 619766282734728539ce58a5c383cb371f1999c7 SHA256 97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040
-DIST gmp-5.0.2.tar.bz2 2024576 RMD160 fce06e3246f067301a54f3457960f1d6d71adfc2 SHA1 2968220e1988eabb61f921d11e5d2db5431e0a35 SHA256 dbc2db76fdd4e99f85d5e35aa378ed62c283e0d586b91bd8703aff75a7804c28
-DIST mpc-0.9.tar.gz 565953 RMD160 63d5fb8ab2725839e7565716c4d20187b606e2c8 SHA1 229722d553030734d49731844abfef7617b64f1a SHA256 fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac
-DIST mpfr-3.0.1.tar.bz2 1154306 RMD160 24c84d762428959ad2db7521df8bc219c81f83b5 SHA1 fbf402fc196724ae60ef01eb6ca8490b1ea4db69 SHA256 e1977099bb494319c0f0c1f85759050c418a56884e9c6cef1c540b9b13e38e7f
-DIST naclbinutils-2.20.1-r6852.patch 116209 RMD160 d1b82268d08f9a458d74226679e36edf6e083a7e SHA1 71c2611688875683626829f08127542636c7b4f6 SHA256 c6ff930b39b9982d49347864e99ba21e611d655e6a5ced4cf9062d3a710c5086
 DIST naclbinutils-2.20.1-r6869.patch.bz2 25819 RMD160 4bf58463368cb169d2154b07f1d5e3d1f9079d8b SHA1 3f4d250e03e1327460bb664d046d6e017abc2e3b SHA256 ec34aff65f715a20ce093e20e70a8a1d94f2733e081383cc472fd37415565eb8
-DIST naclgcc-4.4.3-r6852.patch 155601 RMD160 a7fe43f9e7ef34e11a478ff4147b27a1c62be6d3 SHA1 67c1b9c72fd09abec545282d036e47255a05e2c8 SHA256 657679445010d1877137740ed7638d6a9744cd39fdf13ea566be32c0847aec94
 DIST naclgcc-4.4.3-r6869.patch.bz2 33769 RMD160 11d82b4a4309a881ae1f6e04fa05a5c6e21e7a56 SHA1 bcf14b4947726319449207bfe3227d5b2171ebd4 SHA256 2221586fd07a31015c8e8a8346043faed608f997b5e313c83164e0755019612b
-DIST naclnewlib-1.18.0-r6852.patch 434670 RMD160 1183289426f19f19924adb6322a38def3e104fe1 SHA1 6b9dc1770ec081baa056b0384dca57686987e62d SHA256 37b560a80952b8f55b22d2324616a607ce353b04f994c4db659a47606c76b511
 DIST naclnewlib-1.18.0-r6869.patch.bz2 76563 RMD160 3d54c53616f8c0e04215c2852cf0c81866727b8e SHA1 bf215f10b9978ddd46f58e8e2a9125cef4bfeac4 SHA256 2fb33dedb1e337c49dc6a00a7390c91599f2d93faab0ab65c5843444dd47fc3a
-DIST nacltoolchain-buildscripts-r6852.tar.gz 20027 RMD160 59ec96be92447b9e2eb288f959000e54e4280d9d SHA1 a2f5a604dfc79dec6cd91cc78f14cb9be1a80dbb SHA256 8f5f9588c30294cef28cab9efdd791a5c71b55b771b44b9e3802835f6ed759dd
 DIST nacltoolchain-buildscripts-r6869.tar.gz 20019 RMD160 5e897dbb4e5b629258d47213584619f7768c5fc3 SHA1 1dc71a19ad93eef3edd7bd5bdb18b0a3e1754cbc SHA256 71e48ff983fb4c88075aefcb62d77a033623ab263d766304eb64aa547340b375
 DIST newlib-1.18.0.tar.gz 13598301 RMD160 69d96fd323a23857072f30cb51899040099857cd SHA1 a47d3b8a508304143334b36bdb5b33786a61ce94 SHA256 d608f22b0b2e7725d2fca13cac19f34bc652d9773acadae778db9881746cb071
-DIST ppl-0.11.2.tar.bz2 12348525 RMD160 68dd335f6e94df09ac4e19ccf08f1c1b280efe86 SHA1 915f1d8a7def10e540bf2806babf94dccd15852a SHA256 e3fbd1c19ef44c6f020951807cdb6fc6a8153cd3a5c53b0ab9cf4c4f6e8cbbeb
-EBUILD nacl-toolchain-newlib-0_p6852.ebuild 3217 RMD160 97f94b895443702ad8e82c7fc9f8fc2e8b43f9fc SHA1 eabbb4bcee117fdba480d51a211540bca015f14d SHA256 89004add3c353f5170d8f3e52add704704e5da260102e5458f510431d04a2d6f
-EBUILD nacl-toolchain-newlib-0_p6869.ebuild 2418 RMD160 a4171f73d95f47fe8b522708f5aebad8d88db024 SHA1 a65fabc137f2d63c9f08aa20a5f551148b380dfc SHA256 5d050ec706c2dbca2b142d2f99dde6a7b3c8645e1a15906e2ebc111ef7c07f60
-MISC ChangeLog 930 RMD160 7a6569215e5e8d762dba390e78c9d21a1f1c2d0f SHA1 b24cf69f2314a2a66388e9b9447b992cac2099e5 SHA256 242869bd60ac8d301c479216b14ff9234ad63e88679b9ce5fae59b19453ea64f
+EBUILD nacl-toolchain-newlib-0_p6869-r1.ebuild 2508 RMD160 053537a6caab25fd9c3545b340df79b17447f9dc SHA1 e6bd32849bcc570556a59d053144ca3389211b0a SHA256 af1f1d3c2f7cf435cacf204d14af71010e992d84485df5b706c59f7d63dea9ad
+MISC ChangeLog 1364 RMD160 604a8de7a64383e08781ec547344768fbb3f0c00 SHA1 4611a437c0665aea25e719d72ff3952fa965111f SHA256 4430b07637c313d5f4fd7c468089ae3cd5fb56069d35315c61345fca33b3dd9a
 MISC metadata.xml 162 RMD160 3485b95578a49782c3188a0f963f90c688287fe1 SHA1 46226eeaf4948209a093253f92010abea501daef SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk6UzdsACgkQuUQtlDBCeQJELwCeN7rVtXrRV5JwTYi+WP0NAY1p
-QS0An1u4rYuDIh7lSM361wtd4RMfjQKv
-=j4si
+iEYEAREKAAYFAk6e+rIACgkQuUQtlDBCeQLXTQCeI6v6+SqUBLxt8tA+52e3UqTM
+3vcAnAy4WfRwEFFizwY03mN0fqdfT43+
+=YGPG
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p6852.ebuild b/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p6852.ebuild
deleted file mode 100644
index 567f5ed24438..000000000000
--- a/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p6852.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p6852.ebuild,v 1.1 2011/10/06 18:52:19 phajdan.jr Exp $
-
-EAPI="4"
-
-inherit eutils multilib
-
-BINUTILS_PV="2.20.1"
-NEWLIB_PV="1.18.0"
-GCC_PV="4.4.3"
-GMP_PV="5.0.2"
-MPFR_PV="3.0.1"
-MPC_PV="0.9"
-PPL_PV="0.11.2"
-CLOOG_PPL_PV="0.15.9"
-NACL_REVISION="${PV##*_p}"
-
-DESCRIPTION="Native Client newlib-based toolchain (only for compiling IRT)"
-HOMEPAGE="http://code.google.com/chrome/nativeclient/"
-SRC_URI="mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.bz2
-	ftp://sources.redhat.com/pub/newlib/newlib-${NEWLIB_PV}.tar.gz
-	mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.bz2
-	mirror://gnu/gmp/gmp-${GMP_PV}.tar.bz2
-	http://www.mpfr.org/mpfr-${MPFR_PV}/mpfr-${MPFR_PV}.tar.bz2
-	http://www.multiprecision.org/mpc/download/mpc-${MPC_PV}.tar.gz
-	http://www.cs.unipr.it/ppl/Download/ftp/releases/ppl-${PPL_PV}/ppl-${PPL_PV}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-${CLOOG_PPL_PV}.tar.gz
-	http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/nacltoolchain-buildscripts-r${NACL_REVISION}.tar.gz
-	http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclbinutils-${BINUTILS_PV}-r${NACL_REVISION}.patch
-	http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclnewlib-${NEWLIB_PV}-r${NACL_REVISION}.patch
-	http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclgcc-${GCC_PV}-r${NACL_REVISION}.patch
-"
-
-LICENSE="BSD" # NaCl
-LICENSE+=" || ( GPL-3 LGPL-3 )" # binutils
-LICENSE+=" GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" # gcc
-LICENSE+=" LGPL-3" # gmp
-LICENSE+=" LGPL-2.1" # mpfr, mpc
-LICENSE+=" GPL-3" # ppl
-LICENSE+=" GPL-2" # cloog-ppl
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	app-arch/zip
-	app-arch/unzip
-	>=media-libs/libart_lgpl-2.1
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/binutils-2.15.94
-	>=sys-devel/bison-1.875
-	>=sys-devel/flex-2.5.4
-	sys-devel/gnuconfig
-	sys-devel/m4
-	>=sys-libs/glibc-2.8
-	>=sys-libs/ncurses-5.2-r2
-	>=sys-libs/zlib-1.1.4
-	>=sys-apps/sed-4
-	sys-devel/gettext
-	virtual/libiconv
-	virtual/yacc
-"
-RDEPEND=">=sys-libs/zlib-1.1.4"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	mv binutils-${BINUTILS_PV} naclbinutils-${BINUTILS_PV}-r${NACL_REVISION} || die
-	mv newlib-${NEWLIB_PV} naclnewlib-${NEWLIB_PV}-r${NACL_REVISION} || die
-	mv gcc-${GCC_PV} naclgcc-${GCC_PV}-r${NACL_REVISION} || die
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${DISTDIR}"
-	mkdir SRC || die
-	mv naclbinutils-${BINUTILS_PV}-r${NACL_REVISION} SRC/binutils || die
-	mv naclnewlib-${NEWLIB_PV}-r${NACL_REVISION} SRC/newlib || die
-	mv naclgcc-${GCC_PV}-r${NACL_REVISION} SRC/gcc || die
-
-	mv gmp-${GMP_PV} SRC || die
-	mv mpfr-${MPFR_PV} SRC || die
-	mv mpc-${MPC_PV} SRC || die
-	mv ppl-${PPL_PV} SRC || die
-	mv cloog-ppl-${CLOOG_PPL_PV} SRC || die
-}
-
-src_compile() {
-	emake TOOLCHAINNAME="${PN}" build-with-newlib
-}
-
-src_install() {
-	local TOOLCHAIN_HOME="/usr/$(get_libdir)"
-	dodir "${TOOLCHAIN_HOME}"
-	insinto "${TOOLCHAIN_HOME}"
-	doins -r "${WORKDIR}/out/${PN}"
-}
diff --git a/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p6869.ebuild b/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p6869-r1.ebuild
index 866b17561d4d..ee1d9cbe0023 100644
--- a/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p6869.ebuild
+++ b/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p6869-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p6869.ebuild,v 1.3 2011/10/11 23:14:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p6869-r1.ebuild,v 1.1 2011/10/19 16:28:23 phajdan.jr Exp $
 
 EAPI="4"
 
@@ -31,6 +31,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+# Stripping with a non-NaCl strip breaks the toolchain, bug #386931.
+RESTRICT="strip"
+
 RDEPEND="
 	>=dev-libs/gmp-5.0.2
 	>=dev-libs/mpfr-3.0.1