Version bump #315477.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 271 insertions, 9 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index bdb294ec24a6..2ff2b5c925af 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.680 2010/04/19 17:48:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.681 2010/04/25 17:17:55 vapier Exp $
+
+*glibc-2.11.1 (25 Apr 2010)
+
+  25 Apr 2010; Mike Frysinger <vapier@gentoo.org> +glibc-2.11.1.ebuild,
+  files/eblits/src_unpack.eblit:
+  Version bump #315477.
 
   19 Apr 2010; Raúl Porcel <armin76@gentoo.org> glibc-2.10.1-r1.ebuild:
   sh stable
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 93994ea8f968..809fa602181e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.10/glibc-2.10-gentoo-chk_fail.c 9407 RMD160 230701dfacfe2481eb49e5384fe4ebb508bd3af2 SHA1 0e9330d57de714dd1ecd7040d3eabf4723cdee7c SHA256 7745c0f5d37b37959b43b41e39762fc35b877161bc5740d9d3e9a83021acbc0e
 AUX 2.10/glibc-2.10-hardened-configure-picdefault.patch 865 RMD160 744bdbfb73f1dbced4cb33cb5aa92f3b41d3b4fb SHA1 21e0f83598f5342032a794315f0e3dac07f647da SHA256 b50b29f85d88011555bbcbe6046e6600be9344f2d78412b14aebdea515420774
 AUX 2.10/glibc-2.10-hardened-inittls-nosysenter.patch 8823 RMD160 163e53f0f4f0bd003ef1c50a4eaaa8f4a82695fe SHA1 df23c6756114e1451e6f120723af1b621037c28e SHA256 dcf78c6524c222dbee907200a8878aff727e29d43a4962b977a16d85752e5c10
@@ -19,14 +22,14 @@ AUX eblits/src_compile.eblit 5843 RMD160 2fffbc9b3cd5a5b5c21de778ea2614927fcbf54
 AUX eblits/src_install-2.6.eblit 7946 RMD160 6cc258a316b78212777ab328a3c0cb73de1616d4 SHA1 94895689b56fd712156e8ac84a2a639d8475da03 SHA256 54081c34217c230d0ff43c5df378897a37576e727fe41ee4d681767110667f3e
 AUX eblits/src_install.eblit 8084 RMD160 ce93214a4180a4ed15fa4e18bc5ae126d9d1065e SHA1 4dade5c8e7d041fe967e687ed69b32c2b4736f14 SHA256 009b5ed1f53cddfb3cd7d1ce63d75cff3bdb0d059ae52a6ffd188c731c8bd1ee
 AUX eblits/src_test.eblit 1162 RMD160 349db09c5f2c2e412a108b8c5371adf946e1a3f0 SHA1 357ef650e1dce62d5d688133426bc62b9085009d SHA256 bac1db2da478f6e6709275c36cc1f9a98fac7fcc2e80bd8831f2077207754962
-AUX eblits/src_unpack.eblit 5148 RMD160 59fe45ab19ab005b9ad1fe1d5fcfa41cf3f3fdde SHA1 c8b0099903b1bc861bab0b9bf43cda2e4b5148e2 SHA256 28d475d0154ee2eb54eda4c0711accccbae80ce3c537470d076006734705e7dd
+AUX eblits/src_unpack.eblit 5206 RMD160 eee95669ac0b611dba050f18b914a4869fdbae3c SHA1 bc7d98ee2a2bdcdba452c0834352b646c97d5a48 SHA256 c33279efa0ba50bda50f8dd1b7c06b557f90882c5aa1cf8a0515ff2172c5eccd
 AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8
 AUX nsswitch.conf 503 RMD160 f375f92f6b41029c93382c39cef896261b140cfc SHA1 42f7f5cc3de75c69bf60d806ac8490106ea63326 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d
-DIST glibc-2.10.1-patches-5.tar.bz2 103325 RMD160 f823d0bc02c73d03dce4e7492c9e64bf0e7bb945 SHA1 d5b54772cc7379c282aa3087ff970753d5923308 SHA256 8e591e0e40fc3fba5e95ca87cdb8a25b3136412d4286e977b3cdf9ea9a2e05e9
 DIST glibc-2.10.1-patches-6.tar.bz2 113352 RMD160 6874a93e993bb082fc4fd23582b5f6bd1044ec28 SHA1 2448fa11229deeaf7a2135510d35bbdbfe9f31e0 SHA256 36a838d5be4fb96f0471d288f172443df28867c301e7790667e1cb57615e6c04
 DIST glibc-2.10.1.tar.bz2 16106243 RMD160 ca102519ab32714e788a0db5dd43c2f9962c86e9 SHA1 cb478cf9d6e2c905a1a4f4a2cae44a320b8dc50b SHA256 cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667
-DIST glibc-2.11-patches-3.tar.bz2 83308 RMD160 e4e32c4e83a4fd14ecf9180d1669d171284d4988 SHA1 a79078569efb7f0d130759025c590aad2df9e877 SHA256 cb4055c76e820934927138b2a21d4c3f3afdeadc219f377bbe95bedaacd6feb7
 DIST glibc-2.11-patches-5.tar.bz2 106033 RMD160 57fc0ebbe7e7abf82af90dd8085a0a61a7c3ac8f SHA1 a03b9071d80a094acafbafa621c0033a100a6b87 SHA256 b628984de9123a33d03180ec53472e2f0209dabeadef9561eceee32f4cd9ecbe
+DIST glibc-2.11.1-patches-1.tar.bz2 101293 RMD160 eb05b62c4226729375b963fffa3b13d23afe9de9 SHA1 bbf416a73a4b78b22d136fd6fcd1f7c35f219042 SHA256 815ce16eb71136e962b2efd979e2c2d03b781023387fe1603a667ad58a37744f
+DIST glibc-2.11.1.tar.bz2 15669361 RMD160 f89cce2685d000602d6417b08e27b05efc82a553 SHA1 29f492ae56fd4ef79f32b45c29c0edb6aa8a35a7 SHA256 64e01d0cfc964a8d8a8c74b5d36bd655e800c12d22b756dd84d867148a595fa1
 DIST glibc-2.11.tar.bz2 15684114 RMD160 817ed8febe8876602d6fe37983505908046d0925 SHA1 f89c0651ca25423523c872a27b0ccf70f5670b6e SHA256 9ef10e498fac4acc458029898fd8fa76c3cedee1f63d23fedf0c579c505ed62c
 DIST glibc-2.2.5-manpages.tar.bz2 14667 RMD160 4f6e1fde042c19aca4718c8e06e19dc2786a1334 SHA1 7bb5615af98a8b5fb2ef91a47148fedef227c544 SHA256 03850134bd0c670d8b5fe5e3bad0dac2efdb7078ddf69e0dbcdba380f4d5697c
 DIST glibc-2.2.5-patches-1.0.tar.bz2 21176 RMD160 4575e4355a919b7865829d22ab86cbdcd53253ee SHA1 f8fa215694673c5ee69f00b3986bcd34d48c7d85 SHA256 39e20bbd032db00c3b0781a0055ed092e9ebcbc2f71e4c1930fd93cd67d374fd
@@ -59,9 +62,8 @@ DIST glibc-ports-2.5.tar.bz2 409372 RMD160 e7e29df135a5f0f72760d10e5ad46de038e40
 DIST glibc-ports-2.6.1.tar.bz2 431292 RMD160 aa6ba7bc58932c81416c3407a8dd0b5e61f5454a SHA1 f620103c8b02ced80a425c79691573f949bf5d6b SHA256 d094028bc6d6691f56b4efeff7cd7e1c7ca10733e0cb5efc36e8fb08d8324bf1
 DIST glibc-ports-2.7.tar.bz2 435392 RMD160 b9b96b357a394f29d5617aaa26a2c000bcf88874 SHA1 2186eac2248f1dd604f20a9dc8215ce12319d273 SHA256 3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
 EBUILD glibc-2.10.1-r1.ebuild 8160 RMD160 402ae08d5d31979d36cc042a33fa9d328569b65d SHA1 f01fa2a652bb1dc5bd4f90c087910d6bab833b4c SHA256 f8b08bb52be96fff92cbef2c1157b4d2026be966881d6f97e220029f5beadc3f
-EBUILD glibc-2.10.1.ebuild 8154 RMD160 c472e03f438a3a3978596c93af0754bec0cd1f1f SHA1 45ced2ece1e6a9be74557d88d866baa61db42d31 SHA256 251ad9eb32579f172d17f7413f5c329e0b6eead6130eef4960bc52ca0e333d04
 EBUILD glibc-2.11-r1.ebuild 8315 RMD160 079965a8213ce98eb1d530f4a60b987e74d495f9 SHA1 2f2e67c26fccd1e3e42096cf35bd12b43342f9d4 SHA256 0521f82b133cedfbb6f64bcbfb54cdd71a424f682debfc30677269a96b1d0d92
-EBUILD glibc-2.11.ebuild 8284 RMD160 3efce41369d5a6091749a688449cb6988032bafa SHA1 52878745ad467b6dac9a26119a28100bbbc230e2 SHA256 eaca0fcca2a5999eb3bf3ca7868fe37c37a86f1e2daec8cd0076d23487d64904
+EBUILD glibc-2.11.1.ebuild 8314 RMD160 7ff033a49d502abbe32631f4f4d6a9cf9ad52020 SHA1 2a3b4c1e72de27eaf8b04a83769417690e0e30fa SHA256 fb03ff78d5e24c5b690bcb2c5090bf49c13a278d464624c82a935256c108dd76
 EBUILD glibc-2.2.5-r10.ebuild 4847 RMD160 829dc6d11434ff2d8d202277595b0817b1a9ab28 SHA1 19523459701cabf750a777b17cbe0af34d4688dd SHA256 454a2b5d6201ab615f00c50987c7ac0328d22cc66db582851fcd27e2a967b17f
 EBUILD glibc-2.5-r4.ebuild 38681 RMD160 a41458b91a4f3af1d05dccf6d8025666ba87cc26 SHA1 bccdbb4e7e382844f6ffbf4228b389ebb11f9b23 SHA256 65123c476e732daf32917578c078ca1e89ed64b2891ff5270fbd6bce2899f3d0
 EBUILD glibc-2.5.1.ebuild 38757 RMD160 5d6b25977ab8998b2135babb8194a21bd553bfa8 SHA1 c3662dfbab1a9dbb3c3107d61328ca8abc97f71d SHA256 56033b5927da0715158b1bce5769da9ac0ff00ce76d7de0a08bd8a60ac74a775
@@ -70,5 +72,12 @@ EBUILD glibc-2.7-r2.ebuild 12942 RMD160 0b451bf4a43264029c663f309af95d5a0f34d41f
 EBUILD glibc-2.8_p20080602-r1.ebuild 13485 RMD160 ea0806247d4ae3107b2d544dca55c164cb5271aa SHA1 20e6d2aa522e0421c4f5488d5f24ea34ce02d8b4 SHA256 532211b5b7a177bbcb8ba5a8b01523a9aae8d631a50f4dd7b1a5722a8e375f24
 EBUILD glibc-2.9_p20081201-r2.ebuild 7770 RMD160 a9868f607882672f0fd1a3442a2ee00ce8e31af2 SHA1 1cd7acf0fdc8246ab22d465387895552572319fd SHA256 b4aa1b5a66ac8de93f9b8e5bb6a32cca5de3d1550d3f8a8732c6e16bd08a1202
 EBUILD glibc-2.9_p20081201-r3.ebuild 7803 RMD160 0ace363c7469985ef16fead41d6de975f221eda4 SHA1 3ea87286571e84036d7c231dd08a6836beece136 SHA256 55dd46fb4003aa70a554a0072f7550effef28f0ac13a12fefcbb26989465ca4c
-MISC ChangeLog 124710 RMD160 0bb42397286a820bebc73166d5df9c175d3e3747 SHA1 011b38823d35b6fe5299577a40d824d133414e19 SHA256 3702a79b8e3b8beca96427f12cadbf20e20e6c70f5bb24663f1eb0eba94465b2
+MISC ChangeLog 124868 RMD160 1456750a381aa74e01bf58f6f5a2a47d41bb0e2e SHA1 0982371fb20236082dd24f115f0f12d6f967d8c6 SHA256 e5817fbd4d01157e719cd70ede4c9151b4534fb177d2e9d7cde02274365ee94e
 MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad589378da193ddc89676f8468c6d1b79521f SHA256 d7cb6dd119c81b5bf12c360af3705ca31a56ffa8bec999b44faa63c183719c31
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkvUea0ACgkQTwhj9JtAlp7GhAEAituMaDtzUDpU0HW0KOF0/Po4
+dwV/U9peMRXbvsXDzdkBALY8wBvPSZi1IYOdXqMGlN8/4nYPctFJq1yvo3/P4hs8
+=ibEn
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_unpack.eblit b/sys-libs/glibc/files/eblits/src_unpack.eblit
index 5cb2a1ebaf61..5de2a7f08fb9 100644
--- a/sys-libs/glibc/files/eblits/src_unpack.eblit
+++ b/sys-libs/glibc/files/eblits/src_unpack.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.9 2009/11/09 22:16:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.10 2010/04/25 17:17:55 vapier Exp $
 
 int_to_KV() {
 	local version=$1 major minor micro
@@ -60,7 +60,13 @@ unpack_pkg() {
 	local a=${PN}
 	[[ -n ${SNAP_VER} ]] && a="${a}-${RELEASE_VER}"
 	[[ -n $1 ]] && a="${a}-$1"
-	[[ -n ${SNAP_VER} ]] && a="${a}-${SNAP_VER}" || a="${a}-${RELEASE_VER}"
+	if [[ -n $2 ]] ; then
+		a="${a}-$2"
+	elif [[ -n ${SNAP_VER} ]] ; then
+		a="${a}-${SNAP_VER}"
+	else
+		a="${a}-${RELEASE_VER}"
+	fi
 	unpack ${a}.tar.bz2
 	[[ -n $1 ]] && mv ${a} $1
 }
diff --git a/sys-libs/glibc/glibc-2.11.1.ebuild b/sys-libs/glibc/glibc-2.11.1.ebuild
new file mode 100644
index 000000000000..46bd42a5eaf4
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.11.1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.1.ebuild,v 1.1 2010/04/25 17:17:55 vapier Exp $
+
+inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+RESTRICT="strip" # strip ourself #46186
+EMULTILIB_PKG="true"
+
+# Configuration variables
+if [[ ${PV} == *_p* ]] ; then
+RELEASE_VER=${PV%_p*}
+BRANCH_UPDATE=""
+SNAP_VER=${PV#*_p}
+else
+RELEASE_VER=${PV}
+BRANCH_UPDATE=""
+SNAP_VER=""
+fi
+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
+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
+
+IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
+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} ]]
+}
+alt_libdir() {
+	if is_crosscompile ; then
+		echo /usr/${CTARGET}/$(get_libdir)
+	else
+		echo /$(get_libdir)
+	fi
+}
+
+if is_crosscompile ; then
+	SLOT="${CTARGET}-2.2"
+else
+	# Why SLOT 2.2 you ask yourself while sippin your tea ?
+	# Everyone knows 2.2 > 0, duh.
+	SLOT="2.2"
+	PROVIDE="virtual/libc"
+fi
+
+# 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 multilib? ( >=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
+	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
+	>=sys-devel/gcc-config-1.3.12
+	>=app-misc/pax-utils-0.1.10
+	virtual/os-headers
+	nls? ( sys-devel/gettext )
+	>=sys-apps/sandbox-1.2.18.1-r2
+	>=sys-apps/portage-2.1.2
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-kernel/ps3-sources
+	nls? ( sys-devel/gettext )
+	selinux? ( sys-libs/libselinux )"
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+else
+	DEPEND="${DEPEND} >=sys-libs/timezone-data-2007c"
+	RDEPEND="${RDEPEND} 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
+	else
+		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.bz2
+	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 ${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.11/glibc-2.11-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 "Patching Glibc to support older SSP __guard"
+		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-ssp-compat.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
+}
+
+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
+}