Version bump.

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

7 files changed, 306 insertions, 32 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 18c0860a39d4..f19cd53c24cf 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,12 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.862 2012/06/19 22:06:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.863 2012/07/03 20:07:34 vapier Exp $
+
+*glibc-2.16.0 (03 Jul 2012)
+
+  03 Jul 2012; Mike Frysinger <vapier@gentoo.org> +glibc-2.16.0.ebuild,
+  files/eblits/src_compile.eblit, files/eblits/src_install.eblit,
+  glibc-9999.ebuild, metadata.xml:
+  Version bump.
 
   19 Jun 2012; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
   Handle gold version strings too.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index aaafa41618cd..913d72afe0c3 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -19,8 +19,8 @@ AUX eblits/common.eblit 9323 RMD160 f9f104033f4911989297e78b02e746b4c8f0e4c8 SHA
 AUX eblits/pkg_postinst.eblit 1081 RMD160 fd49b7dcb451c853ea0132daac49825b74221cf1 SHA1 986d3ccf545f7a066a0cfae30728cd397ef62893 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180
 AUX eblits/pkg_preinst.eblit 3469 RMD160 a8f0831802ea5b5bec02b6379f08cd5f4f0ad27a SHA1 31a9a0815f11bd186c27d3cc44a394e4aee754be SHA256 7f947a83488dccd4c5169508d7c125d09fdd30ddd07d98b528ad12d83b9e2730
 AUX eblits/pkg_setup.eblit 3886 RMD160 d2f86a2f404941bc7b6f6dabc29dd293dc2e9972 SHA1 b931c6dbc784f94f80f8ced2d2d0e1f0da4711af SHA256 be9c3dcef8315e52163b98631ea2c170c805f9accbaf5268df292574978c8e71
-AUX eblits/src_compile.eblit 6204 RMD160 fb68729f51b7ac30aef56fae626ff8fa5f3d1fe4 SHA1 d879f39965ce213450ce9285436a76d0e993a4d5 SHA256 a7acb69e59c9e7b46e57e52dc1eb5653aeaa09f0c81e281a99f885a62945f933
-AUX eblits/src_install.eblit 7443 RMD160 c71c4eba644a8a0e1d6b15c6c8811edc4423f91d SHA1 bf9d8c72eed6d86d42bf55bd13578833a4bc9fab SHA256 11a0e26c5280dcbc5b4b1bb7f3da4a7d040f3a02d340f959b8ad85ab8759da2e
+AUX eblits/src_compile.eblit 6275 RMD160 db0491ce59e2bb821d8a49f49b42d295121b81d8 SHA1 318185f95b8d04bf7cd26eaadfdb5ace590d619c SHA256 7001e458cc781a72b0012906529736e2337e3657da26cfe69357048d86cfdefd
+AUX eblits/src_install.eblit 7487 RMD160 82f78d0347899de56a3b41de172caebaaa9fc1ae SHA1 dfd1b6c7c2c7e0eed5a7eaf1d5a2f49218baee4f SHA256 676f840ca3c056eba08ffee9765b74e2e2434eaf3d4e560cb4642e51b861e93d
 AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727
 AUX eblits/src_unpack.eblit 5365 RMD160 2fe0b47df144f297682ca71e0f470fe0721ef39e SHA1 654dbad14c725a434c7244124fb257f13c6a1b62 SHA256 325450d632d373cbc03a7b8a0d07042ada5b94d573cf799fed88ad6d3915d1d6
 AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8
@@ -44,6 +44,8 @@ DIST glibc-2.14.tar.bz2 15630590 RMD160 f2ba450342f353c7b0a9001ad375ff0adf3f86fc
 DIST glibc-2.15-patches-13.tar.bz2 154658 RMD160 bd1f45c349e4021ea00cd9de4c3f3212a50f01d9 SHA1 fbc45542d46790860d671497fec690c2c11578a9 SHA256 59c11d8b70bc406f6bc7dd87509f1c5fa05998fb0dde8e1be530064e9dd24a53
 DIST glibc-2.15-patches-18.tar.bz2 173777 RMD160 405ec8cfa29810800fbc2cd768586c177735edc6 SHA1 9534adcc57fe8f3298fdd4fadc213afa30a809af SHA256 1945d4dfbf3be4fc445391f6cedfca6e3f305e277493ddd0ccee020e37a05c28
 DIST glibc-2.15.tar.xz 10280176 RMD160 29afafcb61f5842b6b458e322a004aac06dbf6df SHA1 0a7936be3bd0562b076b95dacb7c9daa3dbc83fc SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50
+DIST glibc-2.16.0-patches-1.tar.bz2 88810 RMD160 2840da906c3136959f4ba9c338464b6f3a711054 SHA1 2adae9d9b66fe26cbe71b4182fc8f0b6d8580fa7 SHA256 420294dd335fe4a1b518c285f7034f4e154449fa41a7054377e23076c18e7dc6
+DIST glibc-2.16.0.tar.xz 9990512 RMD160 a45c308cd08f14904e7b7720c3e29ede38bf1a87 SHA1 9d4fffc9c4ac93e7919e124fa38bb51dcaff5216 SHA256 1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924
 DIST glibc-2.9-20081201.tar.bz2 16430489 RMD160 1e1feb4ee9c0892a0544c05adb6dd249544621cf SHA1 5756ca3b543a370c4ec9ffc8038b72bf0aa61c71 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6
 DIST glibc-2.9-patches-8.tar.bz2 106638 RMD160 dbf343c0f2254674c6096fd65fe5dd33ad119248 SHA1 106452700e7a1a525266f79e77a49b443a8ed411 SHA256 5f1f8b569ac02c2f538bebd64d137bccb442ddfcb28b3ef17b86134edd8e3f6c
 DIST glibc-2.9-ports-20081201.tar.bz2 487663 RMD160 80eb0035ed2e021e79755d4151ccd6d73cd78d8d SHA1 90a6ecbce37aabe6093c4dd0c8817cbf86321627 SHA256 19bb6e89855171d7ae01aef92054dfe4524521fbc13c67bfaa3ee81944210744
@@ -55,6 +57,7 @@ DIST glibc-ports-2.13.tar.bz2 625945 RMD160 676406e35c8e4fdceb4fcfa83bfbdb1ef3a3
 DIST glibc-ports-2.14.1.tar.bz2 630641 RMD160 aebb9e53aaa98cd6a76b2a278685cda03049c7d3 SHA1 f649bd5c0191315c92f6a4f46aaf7aa1bf82445d SHA256 1c830afb6d4aa166edaa09ec539580377ecbb16ba655d0aad6f5cb5a9a269aa9
 DIST glibc-ports-2.14.tar.bz2 631253 RMD160 e15f35b9e3bd6acb1a0608be15056bfe7a94c207 SHA1 47da0ab038ea7cc28bc82ff558ad2f6779c79995 SHA256 580a656a55a17ba3db80ab0a9321332cd1f0aaddd7fad76004b524303fb6632d
 DIST glibc-ports-2.15.tar.xz 421820 RMD160 0088edef892e53147940ecaa9694d0c4e266899b SHA1 65c4c239f703cc63a1fa65aa7b32ab13f833d99e SHA256 fcc271fcc3a808bf0f3aa1d144bc39b8d0d5f730aed6e206b883961515f0d1b9
+DIST glibc-ports-2.16.0.tar.xz 925916 RMD160 580436b097f35f981ae187491a57a999c67858b6 SHA1 429b979b697a97befb56cce49b96ee47d708f20a SHA256 93a10ac3b9ab70ccc59dfe50a4747d48a7e92f9481656f8a37558a2767ac02f3
 EBUILD glibc-2.10.1-r1.ebuild 7877 RMD160 b0075824ceb2029ff757d63b8c29ac677bb05faa SHA1 ef83d64e6748c80ff9ebe9c83385713689112e1b SHA256 ebabdda3207af4fafa47cd8ce907ee0e1ad0171ebebc092c682805376ddf1b60
 EBUILD glibc-2.11.3.ebuild 8091 RMD160 5fc23e9c9dc05d4d4de8b1bd23de37f232623218 SHA1 586ddee4daf2337f6d3075f0fe6960ccc081ce26 SHA256 7d6d0938dc30b6eb9cc56c6e2ad45a8147350e9557f9098ad32401e82f80f362
 EBUILD glibc-2.12.1-r3.ebuild 8463 RMD160 edda97101aa973d5f08c45cd658176d5a80ee284 SHA1 01d308fcbafd29b3357de469c1b44a601c5ff911 SHA256 e81371638c04587ff6610aa9d7c1bd3009f31361f0edce33ccfaf109332205a1
@@ -66,25 +69,26 @@ EBUILD glibc-2.14.1-r3.ebuild 9258 RMD160 a77b359cbb3303695c2f321b65329166b3832e
 EBUILD glibc-2.14.ebuild 9155 RMD160 455f9053123657a7b8c3506025352f75cc987886 SHA1 78bf65d8ddde97b68de0d78a4907ae6d2a4fbbe2 SHA256 2b518e375bbb0ce54764458c1ec91d1557a511946dfe1e3027a5fe1f608002d9
 EBUILD glibc-2.15-r1.ebuild 8890 RMD160 40c87dfa2719b8c7702eccbea3dec658ae72e793 SHA1 f086cd97ac04f683b7452e7d982b8449fab784c7 SHA256 9c357f2e1ddd8b54688f81987add167193cd0ac6d23a719a5961579b392eb4a3
 EBUILD glibc-2.15-r2.ebuild 8682 RMD160 7eeec233d82e8c040a939319d00b0f4446bcba6d SHA1 4c60deb242b0e07e65553a91413001c833c2c032 SHA256 95452de783feb941050f256e186c497aadb3ccff28d07fe96a289671f565b63c
+EBUILD glibc-2.16.0.ebuild 8416 RMD160 7b21df50581901eaaf166f2ca3eb8a4869640378 SHA1 6040b57bd5b1f86e8459dd5712193254e546bccb SHA256 d67cf8d244ae0d46c9cf6da8847f5e87295e4014ae5c9018c2710b1bd18d7259
 EBUILD glibc-2.9_p20081201-r3.ebuild 7523 RMD160 25f8ef82e0b54582d4037bf530f2f59c9b54980c SHA1 55c9b9157b9af96d37c762e70f7d4f70247550d7 SHA256 11c36a4100ed536bc8573eafcce69cded11e2f5c93b9d88fcb6371049101ffee
-EBUILD glibc-9999.ebuild 8200 RMD160 cefcd5fbd913aff677777ac890f56b3bd8d2b72d SHA1 20e9a1251d010ad8ee327f0b8fb4dd6bdd172f67 SHA256 292103d9f13581893e36eeb61a45e8b22d2d33896541afabf6a48da70ca6116d
-MISC ChangeLog 45622 RMD160 f387967ff87bed82169cded418b46418b1abac2b SHA1 ac78e1636e3548331e239936b3c61a4591c5aa28 SHA256 20e30d718f474cb34507846aa7fbfbab8f1146a389ae4377b9e7049aa558cd4c
+EBUILD glibc-9999.ebuild 8415 RMD160 e5990e910254f9107912240bc1748e52f117c300 SHA1 d9e3c5c0ab21a8efcc93d62d7541736276211b00 SHA256 bcac25508d8e980613ef4e4c42fbc2ba72e88619a82958b3e82213fe7eabd2ff
+MISC ChangeLog 45841 RMD160 c19bb355d327efd549c8ca0d031a37c4c9e2fac4 SHA1 d9db72a0ea3a7efb3bb5687c5265ff58cb96f17c SHA256 4dd109ece8a15cd8dcbfcb09c3dec70a673afef40c920ec73e107d580a06c7fd
 MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
-MISC metadata.xml 276 RMD160 532073ae23585e45260005f9cb7faff78a2f34d4 SHA1 840d8831dbc1a441fe86d812f874961026b5fd66 SHA256 b6767fa81e801d5bb20ba7c96f91674159dddcdedb23e49fb24e93c3a879fd04
+MISC metadata.xml 344 RMD160 dd100e6257da65d0e0365a60deedda8fe95d20f0 SHA1 ca69b0e72d1c400bca61950ef62edc2d1eb54fbd SHA256 f1fdb44d8452393b3a8b363c6ca59025ada0c85e3e297c2768d77ec96c72afde
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP4Pf7AAoJELEHsLL7fEFWEJoQAIDeSoTdQxvV6ibtoz8DA1VN
-xhRshmMByN4n0WlE2ybRLylY1yHqXDmYYvqi3kAAzJrKkJtaUqiMnWiH0GNe/L9Q
-k/mRFA4XWWVDlx3whkBM2NDIAovkLIFmMzq/tLjl9fYpiWdre36womKFjJkdsT9y
-ZMefRZzssjOGO1BAqwgf3L2m/6W870Nuqb1hc5JrhA0Y4izNmmmTK5qIASkH3fli
-S5AlmfRD7YBXTi56QP4hzESVv6FHe7xPSE/JOMzvQjytXKcZJHWmGSNN2DL7QWKG
-ZgTM8j0TPRQ9KjrBPjJvD05dTyPFeWW65UBQTLe8t04pWJp8oRt5gKGJv6M0V+Mi
-vtAseTj2RENR8jGw79XFyl2+43iVYQJXNYwuXij7PpXoiy53fZiFO3a4RdObo5D8
-NpktF2Y7S+8CehVuBKyix2NU3OSBR6dWaGeK/RHp2nAmrDBJAzEbFeuYBjbbfIgC
-NH5mKBNPyXqI3au9ziZ3EX/bvYXRkcvphYjEFsIApZvUm1dTyIuwRrRxQz19S9ul
-4ggx07jJ9e/4pD1egbWOvAxMC8A0r8P0+/sOmGxiv2Wn5r3fYOup4ND4OFWVGkma
-yVvYeYIs94YjDOxkZHeb8Iyn4fCElluBRI4Qn0oNVVsgy4aTgCfPH06+juE1FoJ9
-OZ0D+9MGADzunZsZf60l
-=M4RL
+iQIcBAEBAgAGBQJP81EOAAoJELEHsLL7fEFW9k4P/05tO3IZA3qoSVOE/Zj5kD2N
+pHJvTFnyljUoz9JlW6BQTsEN5ABU8+pAhO5cAfVjIdSgSF28/8K4MdOLId86HF1u
+OsZw4yOFh5bbhcYK50wUH6/QJwTvaEAd7fVwfWNYOy+SjWmbPdEYXc65Pc6jFst+
+PIESLr5kLllvzROjAFuUOoJKcuCrh3/tS11+wx1/gjeTs8E25g88iQOY6obf2gIY
+RlWAEx9D+Ci4Z2r/HF8hWiOPX+oYWPh7ScC9rZtno9IXeD0yJTmMyoWt47mXI2Ce
+tP/GYKJBcrvA6OA6aXUL/AvVr3L4CuSksJ69c3z7AuD1n6tSuCXJXQvzGWgcNqJj
+V4xSmaQj/hnXaABU1tS1FAZatRYUTd1d/xEDB0wXawcA32+iRRMG/tEAA1GREZ7u
+fApByMssCewYA3XEw/uWPlznWpoddJsy0maPtzWZl0TRtXjvruZbv3qzTFHFvbNS
+3e70p3qXCoEXAOhixR/Pq+1zwwtsbYdsbxyHwYkDuyBvKcqwpkB8d6TXUY9iKKuH
+qVtq+4lV9S/kanJeqYCZFa/j2Fv82nlM748WlCpJpLLaS6GbkLYbXNNLlcgFE0ss
+X96DrhzPPFv/o23vXrThYE2LyE+LWwZzqmqy6U3mCRHsNe5TZ1FgSELy9HqW/thp
+rO+m3a/iGb09cYuthnV5
+=Wnvr
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 13e7c1dd06da..cb4cc0b05eda 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.27 2012/05/10 05:24:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.28 2012/07/03 20:07:34 vapier Exp $
 
 glibc_do_configure() {
 	local myconf
@@ -81,6 +81,8 @@ glibc_do_configure() {
 		--infodir=/usr/share/info
 		--libexecdir=/usr/$(get_libdir)/misc/glibc
 		$(use_multiarch || echo --disable-multi-arch)
+		--enable-obsolete-rpc
+		$(in_iuse systemtap && use_enable systemtap)
 		${EXTRA_ECONF}"
 
 	# There is no configure option for this and we need to export it
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 8044eefc1f9a..9e15b2f25204 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.21 2012/06/01 17:49:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.22 2012/07/03 20:07:34 vapier Exp $
 
 toolchain-glibc_src_install() {
 	local GBUILDDIR
@@ -155,7 +155,9 @@ toolchain-glibc_src_install() {
 	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
 	doenvd "${T}"/00glibc || die
 
-	dodoc BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README*
+	for d in BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
 
 	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
 	# creation of the "factory" symlink in pkg_postinst().
diff --git a/sys-libs/glibc/glibc-2.16.0.ebuild b/sys-libs/glibc/glibc-2.16.0.ebuild
new file mode 100644
index 000000000000..b19a681e0782
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.16.0.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.1 2012/07/03 20:07:34 vapier Exp $
+
+inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+
+LICENSE="LGPL-2"
+#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+RESTRICT="strip" # strip ourself #46186
+EMULTILIB_PKG="true"
+
+# Configuration variables
+RELEASE_VER=""
+BRANCH_UPDATE=""
+SNAP_VER=""
+case ${PV} in
+9999*)
+	EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" )
+	EGIT_SOURCEDIRS=( "${S}" "${S}/ports" )
+	inherit git-2
+	;;
+*_p*)
+	RELEASE_VER=${PV%_p*}
+	SNAP_VER=${PV#*_p}
+	;;
+*)
+	RELEASE_VER=${PV}
+	;;
+esac
+MANPAGE_VER=""                                 # pregenerated manpages
+INFOPAGE_VER=""                                # pregenerated infopages
+LIBIDN_VER=""                                  # it's integrated into the main tarball now
+PATCH_VER="1"                                  # Gentoo patchset
+PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
+NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
+
+IUSE="debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only"
+[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+# Why SLOT 2.2 you ask yourself while sippin your tea ?
+# Everyone knows 2.2 > 0, duh.
+SLOT="2.2"
+
+# General: We need a new-enough binutils for as-needed
+# arch: we need to make sure our binutils/gcc supports TLS
+DEPEND=">=sys-devel/gcc-3.4.4
+	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
+	x86? ( >=sys-devel/gcc-4.3 )
+	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
+	ppc? ( >=sys-devel/gcc-4.1.0 )
+	ppc64? ( >=sys-devel/gcc-4.1.0 )
+	>=sys-devel/binutils-2.15.94
+	>=app-misc/pax-utils-0.1.10
+	virtual/os-headers
+	!<sys-apps/sandbox-1.2.18.1-r2
+	!<sys-apps/portage-2.1.2
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-kernel/ps3-sources
+	selinux? ( sys-libs/libselinux )
+	!sys-libs/nss-db"
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+else
+	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
+	RDEPEND="${RDEPEND}
+		vanilla? ( !sys-libs/timezone-data )
+		!vanilla? ( sys-libs/timezone-data )"
+fi
+
+SRC_URI=$(
+	upstream_uris() {
+		echo mirror://gnu/glibc/$1 ftp://sources.redhat.com/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}
+	}
+
+	TARNAME=${PN}
+	if [[ -n ${SNAP_VER} ]] ; then
+		TARNAME="${PN}-${RELEASE_VER}"
+		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
+		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
+	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
+		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz
+	fi
+	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
+	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz
+	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
+	[[ -n ${MANPAGE_VER}   ]] && gentoo_uris glibc-manpages-${MANPAGE_VER}.tar.bz2
+	[[ -n ${INFOPAGE_VER}  ]] && gentoo_uris glibc-infopages-${INFOPAGE_VER}.tar.bz2
+)
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			source "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+src_unpack()  { eblit-run src_unpack  ; }
+src_compile() { eblit-run src_compile ; }
+src_test()    { eblit-run src_test    ; }
+src_install() { eblit-run src_install ; }
+
+# FILESDIR might not be available during binpkg install
+for x in setup {pre,post}inst ; do
+	e="${FILESDIR}/eblits/pkg_${x}.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
+	fi
+done
+
+eblit-src_unpack-post() {
+	if use hardened ; then
+		cd "${S}"
+		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
+		gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch
+		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
+		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
+
+		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
+		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
+			debug/stack_chk_fail.c || die
+		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
+			debug/chk_fail.c || die
+
+		if use debug ; then
+			# When using Hardened Gentoo stack handler, have smashes dump core for
+			# analysis - debug only, as core could be an information leak
+			# (paranoia).
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile \
+				|| die "Failed to modify debug/Makefile for debug stack handler"
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile \
+				|| die "Failed to modify debug/Makefile for debug fortify handler"
+		fi
+
+		# Build nscd with ssp-all
+		sed -i \
+			-e 's:-fstack-protector$:-fstack-protector-all:' \
+			nscd/Makefile \
+			|| die "Failed to ensure nscd builds with ssp-all"
+	fi
+}
+
+eblit-pkg_preinst-post() {
+	if [[ ${CTARGET} == arm* ]] ; then
+		# Backwards compat support for renaming hardfp ldsos #417287
+		local oldso='/lib/ld-linux.so.3'
+		local nldso='/lib/ld-linux-armhf.so.3'
+		if [[ -e ${D}${nldso} ]] ; then
+			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
+				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
+				ewarn "Please rebuild all packages using this old ldso as compat"
+				ewarn "support will be dropped in the future."
+				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
+			fi
+		fi
+	fi
+}
+
+maint_pkg_create() {
+	local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
+	cd ${base}
+	local stamp=$(date +%Y%m%d)
+	local d
+	for d in libc ports ; do
+		#(cd ${d} && cvs up)
+		case ${d} in
+			libc)  tarball="${P}";;
+			ports) tarball="${PN}-ports-${PV}";;
+		esac
+		rm -f ${tarball}*
+		ln -sf ${d} ${tarball}
+		tar hcf - ${tarball} --exclude-vcs | lzma > "${T}"/${tarball}.tar.lzma
+		du -b "${T}"/${tarball}.tar.lzma
+	done
+}
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 432cdf6ea848..982ecfef9d30 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.9 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.10 2012/07/03 20:07:34 vapier Exp $
 
-inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
+inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
@@ -35,11 +35,9 @@ INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
 PATCH_VER=""                                   # Gentoo patchset
 PORTS_VER=""                                   # version of glibc ports addon
-LT_VER=""                                      # version of linuxthreads addon
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
-#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
+NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
-IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only"
 [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -83,7 +81,6 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	ppc? ( >=sys-devel/gcc-4.1.0 )
 	ppc64? ( >=sys-devel/gcc-4.1.0 )
 	>=sys-devel/binutils-2.15.94
-	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
 	!<sys-apps/sandbox-1.2.18.1-r2
@@ -119,11 +116,10 @@ SRC_URI=$(
 		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
 		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
 	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
-		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.bz2
+		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz
 	fi
 	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
-	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.bz2
-	[[ -n ${LT_VER}        ]] && upstream_uris ${TARNAME}-linuxthreads-${LT_VER}.tar.bz2
+	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz
 	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
 	[[ -n ${MANPAGE_VER}   ]] && gentoo_uris glibc-manpages-${MANPAGE_VER}.tar.bz2
@@ -215,6 +211,22 @@ eblit-src_unpack-post() {
 	fi
 }
 
+eblit-pkg_preinst-post() {
+	if [[ ${CTARGET} == arm* ]] ; then
+		# Backwards compat support for renaming hardfp ldsos #417287
+		local oldso='/lib/ld-linux.so.3'
+		local nldso='/lib/ld-linux-armhf.so.3'
+		if [[ -e ${D}${nldso} ]] ; then
+			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
+				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
+				ewarn "Please rebuild all packages using this old ldso as compat"
+				ewarn "support will be dropped in the future."
+				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
+			fi
+		fi
+	fi
+}
+
 maint_pkg_create() {
 	local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
 	cd ${base}
diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml
index d480fe7ab567..e2eb91db0505 100644
--- a/sys-libs/glibc/metadata.xml
+++ b/sys-libs/glibc/metadata.xml
@@ -4,5 +4,6 @@
 <herd>toolchain</herd>
 <use>
  <flag name='linuxthreads'>Build linuxthreads support (only for kernels older than linux-2.6)</flag>
+ <flag name='systemtap'>enable systemtap static probe points</flag>
 </use>
 </pkgmetadata>