Update sys-libs/glibc-2.19-r1

2 files changed, 13 insertions, 60 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index bc23705b..c4ed39a4 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -48,7 +48,7 @@ DIST glibc-2.25-patches-13.tar.bz2 71481 BLAKE2B bf5691afabf03b579b8d634da30a2a9
 DIST glibc-2.25-patches-15.tar.bz2 78320 BLAKE2B 70c62cc10db13e2844de4d8a18972e0f4d01ba52fbd40db57c11d7b1c2c0d571b894f01e762bb26632fd696a77c299ef0766e2f129d2eda896f58325a754a13c SHA512 7204218ea82b677e0f278c4752ddb90aa0c08ac2349d061de81ec91dac204b0f10fe223d7b1055b9e0c21dac97c835f913a90c0168a5000d3be00dd20027c185
 DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1b93e557b6c58129bfb50f863c06f8b49425d75fd2df537dd9c4a68bad790cff770c50a6889732d66f507d349 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e
 EBUILD glibc-2.17.ebuild 9868 BLAKE2B db3470af5d94039711e513d63a6b3d583b175be4b021d9f7e5eda2fd8b522b0967e58b133800ca4be77dffb61de37b3bb80c20d7062ec80f8a4ba3799ba7b9d0 SHA512 78cee52cc1d0499afdc889c205d3affe7eb41f8214099abd9a68e37c20692fe52c7172be4c4010cb1ad4f8d92af81a8668972752b49960604109d58cce166841
-EBUILD glibc-2.19-r1.ebuild 9781 BLAKE2B 15ac7bf31c5d268491c2fd99f9b7591b9a128ea1b2d7c67857fafd8f9b1ddd6f1c83c54310ab1793f455e2a576d41a1c27504ab02fed802b921ea22946a36565 SHA512 51f56c39b2401d5d1d464625fd636ca62cfcb1c2410a8177a1a7c9a5439e3c43d4eb5f1db214848500f63b0404a29611a4627f05cd3867d42c0192539d14cfc5
+EBUILD glibc-2.19-r1.ebuild 8339 BLAKE2B 4949598672bdd9fb8b8197fdbd2e1f14d869459958e72eb447b48d87dc809a3a3052f35a81a4ddea39a55a135dd915fae2a5e835ffa75ed040d172373efe1df9 SHA512 17460086d284515985e536d80dc64b42bd1d71f1ba7974cea1ee9a8c540d16306ecffb717295ed7fbfb139d6842cc29eea3a188c3e533af75b83edf4e2d86063
 EBUILD glibc-2.20-r2.ebuild 9344 BLAKE2B e33d4a48f2614b2012db204ab6bf1de7e737280c557e474e16bbdf6ba8bcc4fa42e0aa9cef2e4e2d94343500d68f6ec92b6a8ff814ecab69adb13ead52b6ae9e SHA512 0fa30fd1bf896124541c648ee744e399b3f04f50730986a433ce83a29b33345643615a389d8ff688d915f19eb4c160f3cbcd132cd8d78b0a6b32efbf171c81ad
 EBUILD glibc-2.20.ebuild 8965 BLAKE2B 68be2adb5908a77aae73a5b8b0a72a33c1b1a5b568e82e7fee69f069d5eae2b126b2663ae3423bf134799aaa4c109b0bbc0aa3020c62a815a15a6de9b628461e SHA512 d71d7052484d091b8293f6c6f65a3771ca969bcd67ed35a24e77cb6543dba574a88e053de2a22f93f9dcdb073ee4eccd7b5dd7b817324fa0ceb462dda32151f6
 EBUILD glibc-2.21-r1.ebuild 9312 BLAKE2B 6258d20e3b975382746e0a729a4290a7ebdc18489985444a871f5dc05fb99d75807995e542480d8ab94ecdf2ac663cf0cde178a25032b5fa868029fe2a09a94d SHA512 69616d9eab988347ed3feca4ed9ee33d437cd7fd7902e4b2051e6c8ff71911acfeb8baad7596f7d6f4ad3d28ad1ace0ba101f06b10b049c9a6398ceae55355c3
diff --git a/sys-libs/glibc/glibc-2.19-r1.ebuild b/sys-libs/glibc/glibc-2.19-r1.ebuild
index 0f2f3600..e248ea23 100644
--- a/sys-libs/glibc/glibc-2.19-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 941254771837ecb0f76ba520bc51ce0db31a63c9 $
 
-inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing prefix
+EAPI=0
+
+inherit toolchain-glibc prefix
 
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
@@ -28,7 +29,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1"
 PATCH_VER="3"                                  # Gentoo patchset
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
-IUSE="debug gd hardened multilib nscd selinux systemd systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="debug gd hardened multilib nscd selinux systemd systemtap profile suid vanilla headers-only"
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -73,7 +74,7 @@ RDEPEND="!sys-kernel/ps3-sources
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
+	DEPEND+=" !headers-only? (
 		>=${CATEGORY}/binutils-2.20
 		>=${CATEGORY}/gcc-4.3
 	)"
@@ -103,67 +104,17 @@ SRC_URI=$(
 )
 SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.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-pre() {
+src_unpack() {
 	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-}
+	toolchain-glibc_src_unpack
 
-eblit-src_unpack-post() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
 
 	if use hardened ; then
 		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
+		tc-enables-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
 		epatch "${FILESDIR}"/2.19/glibc-2.19-hardened-configure-picdefault.patch
 		epatch "${FILESDIR}"/2.18/glibc-2.18-hardened-inittls-nosysenter.patch
 
@@ -260,7 +211,9 @@ eblit-src_unpack-post() {
 	fi
 }
 
-eblit-pkg_preinst-post() {
+pkg_preinst() {
+	toolchain-glibc_pkg_preinst
+
 	if [[ ${CTARGET} == arm* ]] ; then
 		# Backwards compat support for renaming hardfp ldsos #417287
 		local oldso='/lib/ld-linux.so.3'