Fix regex crashes #389881 and missing hppa prlimit64.

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

4 files changed, 26 insertions, 281 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 2216232750a9..ce07c03a7b61 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.828 2012/04/14 01:49:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.829 2012/04/14 01:55:01 vapier Exp $
+
+*glibc-2.14.1-r3 (14 Apr 2012)
+
+  14 Apr 2012; Mike Frysinger <vapier@gentoo.org> -glibc-2.14.1.ebuild,
+  -glibc-2.14.1-r1.ebuild, +glibc-2.14.1-r3.ebuild:
+  Fix regex crashes #389881 and missing hppa prlimit64.
 
   14 Apr 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15.ebuild:
   Fix prlimit64 on hppa and drop some old patches.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index e27616a69dd7..079b60c1cabf 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -37,9 +37,8 @@ DIST glibc-2.13-patches-10.tar.bz2 115710 RMD160 505406b68254ff9881f6df74fa6fada
 DIST glibc-2.13-patches-6.tar.bz2 103372 RMD160 bedadc250a515f57dc7fa23a4743ad3b8ecae9a8 SHA1 a9eccf14fcac6441fc206de4ca23e7b6beb6b3f0 SHA256 86335122c8523bf588b00508f656d5343e44f13001ec4fca088c127417e18846
 DIST glibc-2.13.tar.bz2 15725729 RMD160 cf34e4a06a2602deed709e2ee10cf7446a824989 SHA1 14d83dced873a21a3da6a0bfa0926f40d82ef980 SHA256 0173c92a0545e6d99a46a4fbed2da00ba26556f5c6198e2f9f1631ed5318dbb2
 DIST glibc-2.14-patches-7.tar.bz2 105702 RMD160 9231acbcdc980bdd1723f405b340d352613c0275 SHA1 a5a32f08c8221debf49dcfbcf3b61a039054fa21 SHA256 f213848ae57ca7c3bcd0ac87bf04ef638b9c8191a8124394771d758a861bf009
-DIST glibc-2.14.1-patches-1.tar.bz2 102822 RMD160 bb874c8f2d43c74b0d8bb0e206a8c889765d71b5 SHA1 d88403598c223f832274fb365e26460ff7c95c37 SHA256 cb344a7fa3434413cb1e38271d871d4825e94da04199cc6a67772be3bcab83de
-DIST glibc-2.14.1-patches-2.tar.bz2 152871 RMD160 b5a24969009858e2988b04a46198b64bdef6f758 SHA1 9aa19bcd5514906f56b7fe61162142ca08575d4f SHA256 c82f580b43dc6450274649be2eb88b91064b8e16c39051c32229871880ea4f68
 DIST glibc-2.14.1-patches-5.tar.bz2 159559 RMD160 25b72ae44aab4ec3f7fc516f144353af9e26be0c SHA1 4f6455ccd04608d8e51d64afbf43f273fa6a07e3 SHA256 b185e1742d4e180015f16bd8f641cb369a7ceb3e2ed691fb6c9cfe72e4a0703e
+DIST glibc-2.14.1-patches-6.tar.bz2 160817 RMD160 3b77e187f3b2317520b941aef9c096dfdd2273f9 SHA1 8dbf85b457cd62c3d31f00af2aebc4876dc93ef1 SHA256 a22576bd199d7a2212f2cc0e7b4795ece6fa047b3c73da4e8e11590e4859d07e
 DIST glibc-2.14.1.tar.bz2 15650580 RMD160 f6efab63efdddefd7b868ffcba53885450064996 SHA1 f1945eea78bb30563d33c9e6a5f6f97f374135b4 SHA256 6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b
 DIST glibc-2.14.tar.bz2 15630590 RMD160 f2ba450342f353c7b0a9001ad375ff0adf3f86fc SHA1 2236a3530f83637c4338d81d9ac0f5b4c5e69820 SHA256 8404b54651d42133d9a2ab17d30d698e53c5f250b2ad8e5f3d9a208ea7c75d6c
 DIST glibc-2.15-patches-8.tar.bz2 148999 RMD160 ca2c77d9e2a64ba41516b352833f453f45fc5055 SHA1 2bc4fde9e335b02d34961dab24f48805fa944263 SHA256 bbce2cf397e6aa3defd4c5025116382bd6dcca8ea29277d382a5a9a4d72349ad
@@ -61,30 +60,29 @@ EBUILD glibc-2.12.1-r3.ebuild 8632 RMD160 a660a9c9d7d651781fb55a757124137c368f38
 EBUILD glibc-2.12.2.ebuild 8632 RMD160 d6edafe5297fd625f9fc2828d930d40569e18f8b SHA1 5a4e5d36b2b99509bc0f9e8a32c88ef8d4e4f5d4 SHA256 363fdb68f3f18a0549977b8efa325f78c6b16ae1b57ef80510ac685bee94fdb7
 EBUILD glibc-2.13-r2.ebuild 8558 RMD160 4c0284795ac095d466c245dea773fbbd58ae3658 SHA1 a10398572b706507c370274267b7f8ed2b8d6bec SHA256 53acef5334c74a0c37c0ecd218d92cd42d4a9a224d83e0768f0842e0fb204ea0
 EBUILD glibc-2.13-r4.ebuild 8549 RMD160 e865f806a6c30e23985d72dec2f10c661574b07b SHA1 45bd9d3285dc3b40eb0d8c68385629cd050a7677 SHA256 a721ea5373d025a388c302921bff66ee5525a541402655f76dfb600eaf87e00e
-EBUILD glibc-2.14.1-r1.ebuild 8900 RMD160 c709d275cb82a9d5b32debbe262daaa560e5815f SHA1 fa9f1c68ceb50e2b64d506d2525bd0c8e4fa1ee3 SHA256 221bb9461a297854e92bd138e5d2dee72862b27a176334fdb9983f40c0a82b16
 EBUILD glibc-2.14.1-r2.ebuild 8918 RMD160 ee308b1d48f60646ba2aeaf066818e4a9e661202 SHA1 feb12f039e3c324debfa6aefd6caf013468cf255 SHA256 96c6d9d7cef09d848da5f6adf83b36bbfe716659962f8ac31a499d35f82e6a67
-EBUILD glibc-2.14.1.ebuild 8753 RMD160 43a94456bf81f29ab459a8184eb90e33c0df2b7d SHA1 16835011f75f5f9368a3773cc14ab3ff4b25bb21 SHA256 5cfcec552f246453bb34c4a84b4a173cd6068d8e5d9ea6f76109cd9867078e63
+EBUILD glibc-2.14.1-r3.ebuild 8918 RMD160 ade69ea254a6b2b1d37dab16e8a759e41b358605 SHA1 f4704ab13c0fece6ae54f32d975f1ebb534cd191 SHA256 ff5059f43308c932173d0afda610afe4b6653b007641d40de3cc0f53cece40e7
 EBUILD glibc-2.14.ebuild 8752 RMD160 c3482206a91b6584a53fcff6cee56bad61a4fa12 SHA1 f25ddfac08f9a28716fd749ab066eab45ae8e5b9 SHA256 eb21477c36c3beee53ac8e9089c92c7ca86f1b58dd93bbeee5210539d9035720
 EBUILD glibc-2.15.ebuild 8527 RMD160 94c5f8e3b9410333e4c805349be94aee83e49dce SHA1 8b20c7ed8aafed829b1534de953adbcd5670da8f SHA256 db8dc4a7df484256f09121f6cd5809715624b093d8ceda3a6e89ac3dcc501827
 EBUILD glibc-2.9_p20081201-r3.ebuild 7693 RMD160 d29e97a48c7d73ad524b00ee84ace31482d6cefa SHA1 1d2bc39eab289370c28036e578eb8b1e08558a31 SHA256 48f8eb185d511128b482a84be56d4d3e7bd655ee01d408b09600efd1be5f8397
 EBUILD glibc-9999.ebuild 8352 RMD160 6b856a7d19ecce635402e7a19377c3c773b2ea60 SHA1 50c96ba402f80d6dc7655acf825d393f0839f5cf SHA256 a3dec3020bde78dff2315a72c6557491f2abf26698083b5d1c36c1d85e467905
-MISC ChangeLog 39801 RMD160 fbc785f0b76f1736af87cb5c618c1b27dc8cea2d SHA1 e05f2e55e6e8e57e5f17caa02976969b881b6b94 SHA256 7c38d1ead6bf2b001eb8a6c817f5859e9bfd4f43bcab03480531d71054ae9757
+MISC ChangeLog 40014 RMD160 053464a245b9e36aab1336ad6482ffcbcdae25cb SHA1 5811b5641d6b65a38aba2cdc4adb4e6c6b22d7d9 SHA256 7ab1a62d8ab003a871c5d5a1d7c261e722ddfa43f470ce992f11881b421496d7
 MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
 MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPiNfXAAoJELEHsLL7fEFWtcAQAMGYSRau3UgQhEwp3B3l5GOf
-3LVEkVQRvxZ1a8uzNDT09FJSfKgVcbBA4JCug7ye8K36VUPuOKFj+UHVH+XSFZJg
-SbPiTBabedGzNxzQruIXrbmpv+y6GEL6/132yiubLZZ8FZ5zrdCi/c5uZC0Ur2z2
-rbVb03LtpTLPw4xBsxzY/pMiPwpDpyA0/Ta3bc7xz65Ny0GbK3UEWc7Z7Wc/jcfA
-Its0pQmo0amM8yR2k/JGM59oQ8lsqymJrT/1yVsPKWbBoYQdJt4EUYwTA2RA2x1W
-fz0GwGnt0SjofU58L+Qw3QHtfyCfZ5m+cYlxZc5pVZpYZMmlFsHYy4hXdUSNmCPa
-VTnxLiYe8GriRoW36iNcnqq02z2xAdhA2LLipOuD7IFhkLAB/PYG2GdUiMo1mqEq
-xnDBK3CsQZsq+uw/Ffshd3auqsF1BIj5yxMxhScR+acyS3/Vo63x9ZssPA43P0Z6
-tZseGixIj5doq+5brQ/dy2xeXtjvVpd+Jq47XUHKlVz6ZfgUYiAzj0+aGVgKZ2iN
-V5tCBtFSvyIRbwHO3FuElFNSWrUoP3sqecR0RBXazsDNNJYJFUBXfaAk2uOMszs8
-bdVr2YjST72YDo/rPvOERYIFLEhigsGNf/F6z0KU8SqBjOHdvV7fYFwhPYEvNyjv
-7THuReGoIKY4FfAfvZ8O
-=dy0E
+iQIcBAEBAgAGBQJPiNk2AAoJELEHsLL7fEFWmgcP/1l+BZe9+jacyw69GFE3upO+
+TS/ScSiiH89bvJCZON8Y3Tqf/0Snyjxulzu6aucS6OrITYLWfclrDq96uD7MT86i
+F6hm//wcopwcM5KFQfrv3NcKNrXufQAMeTS8fh/r6qCaQKVqMeQB5WvKrjiL/U8x
+X1SO2u8W3ivayIyZ9L602D6txTMnqK0yOe4Di0syV0D9u/mAXAFoYImCSNLrmG24
+UltR9HvB78Tc9V+rBiAKMTqux6mWeb11JU/UwnqoFjv7VQDa3JQcMbTHMRzWlEWC
+oN0eQ3sKHJ3Y47maPOXcBUiUaBZfh6IdlseA9pKL+/vCV7GL+yG1aY1xKjZr1pvI
+ct5wQPrM0NdPK0K15BLijY2mCjhhOdCshxpkKwZ5KWnddeZy30cpdMZNJxAGUyQC
+ZCKtyAAt4DQhGA8zFy3czTUkmhxYmG/FwBusyXOJz6DFWdnKaleCKHZZ2dlGwsHG
+mSnkv9TcWGTNoUd1eZ/8oqoulVVe6d+IcmZ91HET3z68YVVQjKuLsdC8s0EUM6TO
+TuHgwunMsAjvYuRrG76rC1ubfdAm45cbz6UbPA5H3qCwLHrGX1Juo1MV5K29R+hm
+xZYdyDZswYEbmP6nkSyLnOI9A39JULm4c7l2xlr+XSocjovQGlhhdilTPHRJA3oi
+x6cCdn+M2l73FsYgk/4g
+=18rh
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.14.1-r1.ebuild b/sys-libs/glibc/glibc-2.14.1-r3.ebuild
index 6cfbdd9425f1..7ae4b46fd815 100644
--- a/sys-libs/glibc/glibc-2.14.1-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r3.ebuild
@@ -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/glibc-2.14.1-r1.ebuild,v 1.4 2012/03/23 17:39:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r3.ebuild,v 1.1 2012/04/14 01:55:01 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
@@ -33,7 +33,7 @@ esac
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="2"                                  # Gentoo patchset
+PATCH_VER="6"                                  # 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
diff --git a/sys-libs/glibc/glibc-2.14.1.ebuild b/sys-libs/glibc/glibc-2.14.1.ebuild
deleted file mode 100644
index 0228ea73f756..000000000000
--- a/sys-libs/glibc/glibc-2.14.1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# 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.14.1.ebuild,v 1.5 2012/01/17 23:51:59 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="~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
-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 selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
-[[ -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} ]]
-}
-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"
-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 >=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:+)}
-	>=app-misc/pax-utils-0.1.10
-	virtual/os-headers
-	!<sys-apps/sandbox-1.2.18.1-r2
-	!<sys-apps/portage-2.1.2
-	!<sys-devel/patch-2.6
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	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} !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.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
-
-pkg_setup() {
-	eblit-run pkg_setup
-
-	# Static binary sanity check #332927
-	if [[ ${ROOT} == "/" ]] && \
-	   has_version "<${CATEGORY}/${P}" && \
-	   built_with_use sys-apps/coreutils static
-	then
-		eerror "Please rebuild coreutils with USE=-static, then install"
-		eerror "glibc, then you may rebuild coreutils with USE=static."
-		die "Avoiding system meltdown #332927"
-	fi
-}
-
-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
-}
-
-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
-}