Also add bootstrap logic to glibc-9999.

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

3 files changed, 33 insertions, 28 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 93f42f74e7b1..5e7edd4c8f64 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.989 2014/03/29 05:31:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.990 2014/03/29 06:11:19 vapier Exp $
 
   29 Mar 2014; Mike Frysinger <vapier@gentoo.org>
   files/eblits/src_compile.eblit, files/eblits/src_unpack.eblit,
-  glibc-2.17.ebuild, glibc-2.18-r1.ebuild, glibc-2.19.ebuild:
+  glibc-2.17.ebuild, glibc-2.18-r1.ebuild, glibc-2.19.ebuild, glibc-9999.ebuild:
   Add support for in-place bootstrapping between ABIs (on x86 for now).
 
   25 Mar 2014; Mike Frysinger <vapier@gentoo.org>
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 4e66765cfc55..7f80ee0a8a82 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -91,24 +91,24 @@ EBUILD glibc-2.17.ebuild 6940 SHA256 5860dc0a90835741af8be19fcd83d4d6d81b79e0e69
 EBUILD glibc-2.18-r1.ebuild 7003 SHA256 5b224a0b8f3e6df46c5712e676b05c88dafce3dbbb24cc46e8533fad39d712e5 SHA512 c041f954f03e7324591be5dee55909fb291cbb4a154e32a15237a7d4987a9bf232345ae19e0f2b143b449b1b8c58b48b028ffb651223ec4b7d4dbdece9ac1531 WHIRLPOOL c2a3cde5dcdd35bf4b37d8c49f49055b2ed1c3944e6bbb0657ddcd5c28b559ef14e3ac8b3391c10c68998165c5177d256d6bb9dd8cadd9f27a2cdd84dceba374
 EBUILD glibc-2.19.ebuild 6895 SHA256 ed56af849caa055835244779f9cb6bdb5165c230ff841b7528dbdc7045c06b97 SHA512 08c76998e9c486c98d2f816876857233e26a37f7f7396c76770e986482d68a54054cd0962cf4f1b0bde9a948bee11096ecb154dfdebfc7bd432ea7d35e51be5e WHIRLPOOL f868e82ac1a4f2aa75f1999150d822aa8896a06553a9e79d89197358fb831826fbb3c30dde82026b84c646ac09d81997c2de1dac3d52c5a68b4f0c3ebf6974ab
 EBUILD glibc-2.9_p20081201-r3.ebuild 6787 SHA256 3d9ff2b86df088b8e8cc082c5ddef164b48cffcccfa2ea001306e79a6d52a52c SHA512 7070020105a777bbf6d846fab291b238d7861472c737031e8c52b6d5c2a0524e228b724751325448ce94a42ee39112088b91d0597cd2cdbcc68c51248d2d5a11 WHIRLPOOL aa0e2d11377c3a30478afbef0fa3daa12aa9711d68dc92ab08fca999e599c613648644da2e6f81c38dc98192ed26934c4a35418a97d3146650cd4c82e39a7fed
-EBUILD glibc-9999.ebuild 6642 SHA256 3b491a44e39827796c4001d3627a332f8826807f3711f61d930a9cb48518c1d7 SHA512 083d0e295de87a72b1f3169f5a0ba1ef21a7d61b86b363568940157f4e8abba5ec65414847851ac39c14e94444fced48de8f2757c9a24d4885eb43da76ec1c0a WHIRLPOOL 20580e19f7e838a61d134e64a452f00dac010345367caff5d9a650e41d58338e0b7c304c2a7b8748101b51621755185b6ea5ef1c3d3f54e6e7220dce2b3ce1f1
-MISC ChangeLog 65802 SHA256 ced783c70e172a8c01d69142a4cf4c309b62a6cc20b87761436f1d6d8f9e8e73 SHA512 f91e689ec642dc88d7d7cd0732bdc2b1dcad3b838761f2a28746f39cd0d9fa75d4c0723c712610bb4541b80c3808ed2da3fad773102e3af979a75b07ede7b903 WHIRLPOOL e116ed71e959922e678e1cc2e0543d5c24f43f1dd3c33178f96237f7dab4c909a7efef7ee242f9a3f29f72d6cf071243dd5e58ca31bd11b9d58bd3c94b61e1c1
+EBUILD glibc-9999.ebuild 6896 SHA256 b752b36f2f1139de2c0b3f9a3064d9bd57f52201a5b3c4f23468202b1bbf194d SHA512 eb64b7b84b671eb189b2c17781e54ceecf0c519ca6b417bbd7ceebf2b300bea383a64cab7385e539e85eaefc168702508207d356d5db2da17ffeac227176eb90 WHIRLPOOL 60f168da5452219b272aa7cd783c43d8744ac32788702afc4ee0c2aee7918baaeb4a7cee601979169394aec98aeda11e7eed8c377bc71d72a34fd0dda8c3e713
+MISC ChangeLog 65821 SHA256 b6babf1ad837d11f1fb84cbca01fc0a9fa2cb1289f80256651211cc0a2332397 SHA512 e5bbf586cc4e6d527d38bcb3d064c433c41888d2142bc4a95824644c63cb67b93683e0343281ed32bdc097e09db359962a03f5261b2f005ec5a60713f6d31dc3 WHIRLPOOL 783ea4caa7ef0aff5fff9f5ae24e05361bd2e79c30ec42793cadc499c78e868274651cd0ce98b2c96ee7347670d121f8759fb3072d48edc59cb6a3b680104caf
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 521 SHA256 e89c6157189c7a76823ea61ad88e85d6c5e497855abfa03d4e044b09bd0d0955 SHA512 46d36653c75257e1091d88eed54dda553a81a246407f7ae37864e3a9f1c359560bf3d08f5946a725624804e74b1684414a729a1a3b961220dc76cdedd9a4d0ce WHIRLPOOL eb3695d1ce708f3668dc85332b4ad9de6e021b3a98c1b48c4b874d7254168ee5aff2ac6b51866b1df29f1689085ab07e97a7b39708bcffbafedb21288e01f42e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTNlrYAAoJEPGu1DbS6WIARX8P/R+9Q2UW6NQ90fENfvZQQyNW
-c00ImdzDiYGm3roe8isASeXbghWmkcI/V6v6eVfQW6juk2ldUl5gd+2bweAS7WO9
-LVaF79y6RxgJchZVEIl1nLsDHMkAzYVWThpI8Ia9I5bkScTFKSL7R3GkJARWnSrP
-plPDI5UqonETQ+obhitl8dU3SGVs1PTikzA1slD0dQOhI5xYPHYNMeCt8uqU/MyW
-un6ECgtHl46W8kyTZ4dfvsGhS/0y2mRJW/fL5UMZmBmWxKDYiT8PORE3AIJffBKM
-As0K10I1VUIR+JKSQSwi9FVuY62bWNyrC9mOmbAWO7TWCmSpFqvBB2hrtDWvRvWl
-+uZL2PgssyD3ScvZoRLPDbsM1kOEbUU7qoFEp5hMKewEgwAqNP1+B5Vx/Jvw8qe/
-jB0xT5gTTdQvr/cCFOtTkBqCxhQz2STCapvopEjiRnC30kHNqetU8Zeex2ls6ux1
-cAo2CcpjE3LskneycN5CAeMYJaulvVpOby8dHny/9RKqDBhY8zed8K22QKCJKE1Y
-NV9gslAJwjmZVFEIL5aPqzjlJ1uES0vGMnroEYeJe/v7nOvaWZUa3oob0sypJ8Xc
-wjG2F1RGTcRmGLYYPEgQEruFo0ASLBHoraaWNNKmaTIYkXyXhEZNx+zi1qnPVML+
-clAAA0GqLhVoAd93xdbN
-=bPzf
+iQIcBAEBCAAGBQJTNmQPAAoJEPGu1DbS6WIAptUP/1lRq+knppcdX1HgslatOuhD
+NDSFQiDeu+AmvkDw5n5WsVGXO4rNVTzw8G/QZjMeoUhh8DS/fYpr0UpqFCp2FrPJ
+8+leJPW2KQv0sOKBl0eb6WGQvW2OFePa5bNZ9nm/zGQA+pA5WzVe9CdFjZGHhLYh
+xNI3adX2wrwPzok1XlubEScASLzVpq9Aegr2CHUUuCE+3mXV/Px4CcpOyhxkGOD0
+Eb4mOcZAzLk2PwAIVgowAGG4XsSanasKR2kPcYlhhtky4QrqTBi0hj8ytDl/EXbm
+gzv68QTCWeNLyV3VbY4+aHUKKS5jIDBfyIZVKl2rgd4RDqRhMPQZJ9dHhFnMqTXF
+1v/d2+OE7zcR9oOHPr3QH9F5/75hu+d4A3VAjXIICcCztU77Ujab8vcEDKyiYKWV
+an4KKcHl4dQSx/xND9xthy0G39MuY3YmTsZgVukx6ZoGvkzy4go3IdgMpTKRBahq
+HhCB1j3rTkXWSRFO2API61mQ+a2ntWv0URKl8L6gnBnSqZsn1QQIgBV9SN3zc8lJ
+y05p/yktdakVl0YiUOdWZs2K/GRZ8dEiFaQmkU8iuv7T23/v7tJ8fzCIlbHBWAqm
+gelv7OUCON/E9SSAUPVx4WuDMwbyvCs9cb/Upf5JLGlIg2CfZ5/r0yT0RFgQ4gCI
+SKrDvt6nNfvk+z7+nwZa
+=nCzW
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index e393645aad15..f2bdf97bf862 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.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/sys-libs/glibc/glibc-9999.ebuild,v 1.22 2014/03/12 13:35:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.23 2014/03/29 06:11:19 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
@@ -24,6 +24,7 @@ case ${PV} in
 	RELEASE_VER=${PV}
 	;;
 esac
+GCC_BOOTSTRAP_VER="4.7.3"
 PATCH_VER=""                                   # Gentoo patchset
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
@@ -88,19 +89,19 @@ else
 		!vanilla? ( sys-libs/timezone-data )"
 fi
 
+upstream_uris() {
+	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+}
+gentoo_uris() {
+	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+	devspace=${devspace//HTTP/http://dev.gentoo.org/}
+	echo mirror://gentoo/$1 ${devspace//URI/$1}
+}
 SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/http://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
 	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
 	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
 )
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
 
 # eblit-include [--skip] <function> [version]
 eblit-include() {
@@ -151,6 +152,10 @@ for x in setup {pre,post}inst ; do
 	fi
 done
 
+eblit-src_unpack-pre() {
+	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-4.7.3-multilib-bootstrap.tar.bz2
+}
+
 eblit-src_unpack-post() {
 	if use hardened ; then
 		cd "${S}"