[gentoo-commits] dev/heroxbd:master commit in: sys-devel/binutils-config/patches/, sys-libs/glibc/files/eblits/, ...

[Benda XU]

commit:     87ebf237bbdca2c6caf835514b4e9be33b2e14cf
Author:     XU Benda <heroxbd <AT> gmail <DOT> com>
AuthorDate: Mon Sep  2 17:05:58 2013 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 17:05:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/heroxbd.git;a=commit;h=87ebf237

delete backup files

---
 sys-devel/binutils-config/a.out                    | Bin 482872 -> 0 bytes
 .../patches/binutils-config-prefix.patch~          | 212 ---------------
 sys-libs/glibc/files/eblits/common.eblit~          | 287 ---------------------
 sys-libs/glibc/files/eblits/src_compile.eblit~     | 208 ---------------
 sys-libs/glibc/files/eblits/src_install.eblit~     | 252 ------------------
 5 files changed, 959 deletions(-)

diff --git a/sys-devel/binutils-config/a.out b/sys-devel/binutils-config/a.out
deleted file mode 100755
index 6f77b45..0000000
Binary files a/sys-devel/binutils-config/a.out and /dev/null differ

diff --git a/sys-devel/binutils-config/patches/binutils-config-prefix.patch~ b/sys-devel/binutils-config/patches/binutils-config-prefix.patch~
deleted file mode 100644
index 62bab09..0000000
--- a/sys-devel/binutils-config/patches/binutils-config-prefix.patch~
+++ /dev/null
@@ -1,212 +0,0 @@
-Index: binutils-config/files/binutils-config-3
-===================================================================
---- binutils-config.orig/files/binutils-config-3	2013-06-30 23:57:22.650003585 +0900
-+++ binutils-config/files/binutils-config-3	2013-06-30 23:59:48.426725571 +0900
-@@ -7,17 +7,23 @@
- #  config-TARGET:	CURRENT=version for TARGET
- #  TARGET-VER:		has a TARGET and VER variable
- 
-+EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-+if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then
-+       EPREFIX=""
-+fi
-+
- : ${ROOT:=/}
- [[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
- [[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}"
-+EROOT="${ROOT%/}${EPREFIX}/"
- 
--cd /
-+cd "${EPREFIX}"
- 
- trap ":" INT QUIT TSTP
- 
- argv0=${0##*/}
--source /etc/init.d/functions.sh || {
--	echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
-+source "${EPREFIX}"/etc/init.d/functions.sh || {
-+	echo "${argv0}: Could not source ${EPREFIX}/etc/init.d/functions.sh!" 1>&2
- 	exit 1
- }
- esyslog() { :; }
-@@ -123,14 +129,14 @@
- 		# Newer paths: /usr/${HOST}/${TARGET}/...
- 		# Older paths: /usr/${TARGET}/...
- 		#
--		if [[ -d ${ROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then
--			BINPATH=/usr/${HOST}/${TARGET}/binutils-bin/${VER}
--			BINPATH_LINKS=/usr/libexec/gcc/${TARGET}
-+		if [[ -d ${EROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then
-+			BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER}
-+			BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET}
- 		fi
- 	fi
- 	if [[ -z ${BINPATH} ]] ; then
--		BINPATH=/usr/${TARGET}/binutils-bin/${VER}
--		BINPATH_LINKS=/usr/${TARGET}/bin
-+		BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER}
-+		BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin
- 	fi
- }
- 
-@@ -139,17 +145,17 @@
- 
- 	setup_env || return 1
- 
--	cd "${ROOT}/${BINPATH}" || exit 1
--	mkdir -p "${ROOT}/${BINPATH_LINKS}" "${ROOT}/usr/bin"
-+	cd "${EROOT}/${BINPATH}" || exit 1
-+	mkdir -p "${EROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin"
- 	for x in * ; do
--		atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}"
--		atomic_ln "${BINPATH_LINKS}/${x}" "${ROOT}/usr/bin/" "${TARGET}-${x}"
-+		atomic_ln "${EROOT}/${BINPATH}/${x}" "${EROOT}/${BINPATH_LINKS}" "${x}"
-+		atomic_ln "${EROOT}/${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin/" "${TARGET}-${x}"
- 		for fake in ${FAKE_TARGETS} ; do
- 			[[ -f ${ENV_D}/config-${fake} ]] && continue
--			atomic_ln "${BINPATH_LINKS}/${x}" "${ROOT}/usr/bin" "${fake}-${x}"
-+			atomic_ln "${EPREFIX}/${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin" "${fake}-${x}"
- 		done
- 		if [[ ${TARGET} == ${HOST} ]] ; then
--			atomic_ln "${TARGET}-${x}" "${ROOT}/usr/bin" "${x}"
-+			atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}"
- 		fi
- 	done
- 
-@@ -157,38 +163,39 @@
- 	# Generate library / ldscripts symlinks
- 	#
- 	: ${LIBPATH:=/usr/lib/binutils/${TARGET}/${VER}}
--	cd "${ROOT}/${LIBPATH}" || exit 1
-+	LIBPATH=${LIBPATH#${EPREFIX}}
-+	cd "${EROOT}/${LIBPATH}" || exit 1
- 	if [[ ${TARGET} == ${HOST} ]] ; then
--		dstlib=${ROOT}/usr/${HOST}/lib
-+		dstlib=${EROOT}/usr/${HOST}/lib
- 	else
--		dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib
-+		dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
- 	fi
- 	# When upgrading, we need to clean up ldscripts and libs
- 	mkdir -p "${dstlib}"
--	rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
--	atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"
-+	rm -rf "${EROOT}/${BINPATH_LINKS}"/ldscripts
-+	atomic_ln "${EROOT}/${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"
- 	find -L "${dstlib}" -type l -exec rm -v {} +
- 	for x in lib* ; do
--		atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}"
-+		atomic_ln "${EPREFIX}/${LIBPATH}/${x}" "${dstlib}" "${x}"
- 	done
- 
- 	#
- 	# Generate include symlinks
- 	#
- 	INCPATH=${LIBPATH}/include
--	if [[ -d ${ROOT}/${INCPATH} ]] ; then
--		cd "${ROOT}/${INCPATH}" || exit 1
-+	if [[ -d ${EROOT}/${INCPATH} ]] ; then
-+		cd "${EROOT}/${INCPATH}" || exit 1
- 		if [[ ${HOST} == ${TARGET} ]] ; then
--			mkdir -p "${ROOT}/usr/include"
-+			mkdir -p "${EROOT}/usr/include"
- 			for x in * ; do
--				atomic_ln "${INCPATH}/${x}" "${ROOT}/usr/include" "${x}"
-+				atomic_ln "${EPREFIX}/${INCPATH}/${x}" "${EROOT}/usr/include" "${x}"
- 			done
- 		else
- 			# Clean out old path -- cannot use '-exec {} +' syntax here
--			find . -type f -exec rm -f "${ROOT}/usr/${TARGET}/usr/include/{}" \;
--			rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null
--			rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null
--			rmdir "${ROOT}/usr/${TARGET}" >& /dev/null
-+			find . -type f -exec rm -f "${EROOT}/usr/${TARGET}/usr/include/{}" \;
-+			rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null
-+			rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null
-+			rmdir "${EROOT}/usr/${TARGET}" >& /dev/null
- 		fi
- 	fi
- 
-@@ -197,14 +204,14 @@
- 	#
- 	if [[ ${TARGET} == ${HOST} ]] ; then
- 		DATAPATH=/usr/share/binutils-data/${TARGET}/${VER}
--		local e="${ROOT}"/etc/env.d/05binutils
-+		local e="${EROOT}"/etc/env.d/05binutils
- 		local ee="${e}.tmp"
- 		rm -f "${ee}"
- 		[[ -d ${DATAPATH}/man  ]] && echo "MANPATH=${DATAPATH}/man"   >> "${ee}"
- 		[[ -d ${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}"
- 		# hmm, `ld` has this in SEARCH_DIR(), but ld.so does not ...
--		if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then
--			local l="${ROOT}"/etc/ld.so.conf.d/05binutils.conf
-+		if [[ -d ${EROOT}/etc/ld.so.conf.d ]] ; then
-+			local l="${EROOT}"/etc/ld.so.conf.d/05binutils.conf
- 			local ll="${l}.tmp"
- 			echo "/usr/${TARGET}/lib" > "${ll}"
- 			mv_if_diff "${ll}" "${l}"
-@@ -254,7 +261,7 @@
- 		die "no profiles exist for '${TARGET}'"
- 	fi
- 
--	rm -f "${ENV_D}"/config-${TARGET} "${ROOT}"/etc/ld.so.conf.d/05binutils.conf
-+	rm -f "${ENV_D}"/config-${TARGET} "${EROOT}"/etc/ld.so.conf.d/05binutils.conf
- 
- 	# XXX: we still leave behind FAKE_TARGETS in /usr/bin ...
- 	local x
-@@ -264,28 +271,28 @@
- 		nm objcopy objdump ranlib readelf size strings strip
- 	do
- 		x=(
--			"${ROOT}"/usr/bin/${TARGET}-${x}
--			"${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
--			"${ROOT}"/usr/libexec/gcc/${TARGET}/${x}
-+			"${EROOT}"/usr/bin/${TARGET}-${x}
-+			"${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
-+			"${EROOT}"/usr/libexec/gcc/${TARGET}/${x}
- 		)
- 		rm -f "${x[@]}"
- 	done
- 	for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
--		rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
-+		rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
- 	done
- 	for x in bfd iberty opcodes ; do
--		rm -f "${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
-+		rm -f "${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
- 	done
- 	# Delete broken symlinks
--	local destdir="${ROOT}/usr/${HOST}/${TARGET}"
-+	local destdir="${EROOT}/usr/${HOST}/${TARGET}"
- 	rm -f "${destdir}"/lib/ldscripts
- 	find -L "${destdir}"/lib -type l -exec rm {} +
- 	rmdir \
- 		"${destdir}"/{bin,include,lib,usr} \
- 		"${destdir}" \
--		"${ROOT}"/var/db/pkg/cross-${TARGET} \
--		"${ROOT}"/usr/{${HOST}/,}${TARGET}/bin \
--		"${ROOT}"/usr/libexec/gcc/${TARGET} \
-+		"${EROOT}"/var/db/pkg/cross-${TARGET} \
-+		"${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \
-+		"${EROOT}"/usr/libexec/gcc/${TARGET} \
- 		2>/dev/null
- 
- 	rm -f "${ENV_D}"/${TARGET}-*
-@@ -366,7 +373,7 @@
- 	esac
- 
- 	setup_env || return 1
--	bpath="${ROOT}/${BINPATH}"
-+	bpath="${EROOT}/${BINPATH}"
- 
- 	# does this binutils even support the requested linker ?
- 	if [[ ! -e ${bpath}/${ld} ]] ; then
-@@ -384,7 +391,7 @@
- 	: ${HOST:=${CHOST:-$(portageq envvar CHOST)}}
- }
- 
--ENV_D="${ROOT}etc/env.d/binutils"
-+ENV_D="${EROOT}etc/env.d/binutils"
- 
- DEBUG="no"
- NEED_ACTION="yes"

diff --git a/sys-libs/glibc/files/eblits/common.eblit~ b/sys-libs/glibc/files/eblits/common.eblit~
deleted file mode 100644
index db4c5f3..0000000
--- a/sys-libs/glibc/files/eblits/common.eblit~
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.11 2010/06/16 01:43:37 zorry Exp $
-
-# We need to be able to set alternative headers for
-# compiling for non-native platform
-# Will also become useful for testing kernel-headers without screwing up
-# the whole system.
-# note: intentionally undocumented.
-alt_headers() {
-	if [[ -z ${ALT_HEADERS} ]] ; then
-		if is_crosscompile ; then
-			ALT_HEADERS="${EPREFIX}/usr/${CTARGET}/usr/include"
-		else
-			ALT_HEADERS="${EPREFIX}/usr/include"
-		fi
-	fi
-	echo "${ALT_HEADERS}"
-}
-alt_build_headers() {
-	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
-		ALT_BUILD_HEADERS=$(alt_headers)
-		if tc-is-cross-compiler ; then
-			ALT_BUILD_HEADERS=${ROOT}$(alt_headers)
-			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
-				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
-				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
-			fi
-		fi
-	fi
-	echo "${ALT_BUILD_HEADERS}"
-}
-
-alt_usrlibdir() {
-	if is_crosscompile ; then
-		echo /usr/${CTARGET}/usr/$(get_libdir)
-	else
-		echo /usr/$(get_libdir)
-	fi
-}
-
-setup_flags() {
-	# Make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-
-	# Store our CFLAGS because it's changed depending on which CTARGET
-	# we are building when pulling glibc on a multilib profile
-	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
-	CFLAGS=${CFLAGS_BASE}
-	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
-	CXXFLAGS=${CXXFLAGS_BASE}
-	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
-	ASFLAGS=${ASFLAGS_BASE}
-
-	# Over-zealous CFLAGS can often cause problems.  What may work for one
-	# person may not work for another.  To avoid a large influx of bugs
-	# relating to failed builds, we strip most CFLAGS out to ensure as few
-	# problems as possible.
-	strip-flags
-	strip-unsupported-flags
-	filter-flags -m32 -m64 -mabi=*
-
-	unset CBUILD_OPT CTARGET_OPT
-	if has_multilib_profile ; then
-		CTARGET_OPT=$(get_abi_CTARGET)
-		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
-	fi
-
-	case $(tc-arch) in
-		x86)
-			# -march needed for #185404
-			local t=${CTARGET_OPT:-${CTARGET}}
-			t=${t%%-*}
-			if ! echo "" | $(tc-getCC) ${CFLAGS} -E -dD - | grep -qs __${t}__ ; then
-				filter-flags '-march=*'
-				export CFLAGS="-march=${t} ${CFLAGS}"
-			fi
-		;;
-		amd64)
-			# Punt this when amd64's 2004.3 is removed
-			CFLAGS_x86="-m32"
-
-			# -march needed for #185404
-			local t=${CTARGET_OPT:-${CTARGET}}
-			t=${t%%-*}
-			if ! echo "" | $(tc-getCC) ${CFLAGS} ${CFLAGS_x86} -m32 -E -dD - | grep -qs __${t}__ ; then
-				filter-flags '-march=*'
-				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
-			fi
-		;;
-		ppc)
-			append-flags "-freorder-blocks"
-		;;
-		sparc)
-			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-			filter-flags "-fcall-used-g7"
-			append-flags "-fcall-used-g6"
-			filter-flags "-mvis"
-
-			GLIBCMAJOR=$(get_version_component_range 1 ${PV})
-			GLIBCMINOR=$(get_version_component_range 2 ${PV})
-
-			# set CTARGET_OPT so glibc can use cpu-specific .S files for better performance
-			# - UltraSPARC T1 (niagara) support requires >= glibc 2.8
-			# - UltraSPARC T2 (niagara2) support requires >= glibc 2.7
-
-			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
-				case ${ABI} in
-					sparc64)
-						filter-flags -Wa,-xarch -Wa,-A
-
-						if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then
-							CTARGET_OPT="sparc64v2-unknown-linux-gnu"
-							append-flags "-Wa,-xarch=v9b"
-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"
-						elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then
-							CTARGET_OPT="sparc64v-unknown-linux-gnu"
-							append-flags "-Wa,-xarch=v9b"
-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"
-						elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then
-							CTARGET_OPT="sparc64b-unknown-linux-gnu"
-							append-flags "-Wa,-xarch=v9b"
-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"
-						else
-							CTARGET_OPT="sparc64-unknown-linux-gnu"
-							append-flags "-Wa,-xarch=v9a"
-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a"
-						fi
-					;;
-					*)
-						if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then
-							CTARGET_OPT="sparcv9v2-unknown-linux-gnu"
-						elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then
-							CTARGET_OPT="sparcv9v-unknown-linux-gnu"
-						elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then
-							CTARGET_OPT="sparcv9b-unknown-linux-gnu"
-						else
-							CTARGET_OPT="sparcv9-unknown-linux-gnu"
-						fi
-					;;
-				esac
-			else
-				if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then
-					CTARGET_OPT="sparcv9v2-unknown-linux-gnu"
-				elif { is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2" ; } && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.6 ]] ; then
-					CTARGET_OPT="sparcv9v-unknown-linux-gnu"
-				elif is-flagq "-mcpu=ultrasparc3" || is-flagq "-mcpu=niagara" || is-flagq "-mcpu=niagara2"; then
-					CTARGET_OPT="sparcv9b-unknown-linux-gnu"
-				elif { is_crosscompile && want_nptl; } || is-flagq "-mcpu=ultrasparc2" || is-flagq "-mcpu=ultrasparc"; then
-					CTARGET_OPT="sparcv9-unknown-linux-gnu"
-				fi
-			fi
-		;;
-	esac
-
-	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
-		CBUILD_OPT=${CTARGET_OPT}
-	fi
-
-	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
-	# conservative here.  -fno-strict-aliasing is to work around #155906
-	filter-flags -O?
-	append-flags -O2 -fno-strict-aliasing
-
-	# Cant build glibc itself with fortify code
-	append-cppflags -U_FORTIFY_SOURCE
-
-	# building glibc with SSP is fraught with difficulty, especially
-	# due to __stack_chk_fail_local which would mean significant changes
-	# to the glibc build process. See bug #94325 #293721
-	use hardened && gcc-specs-ssp && append-cflags $(test-flags-CC -fno-stack-protector)
-
-	if use hardened && gcc-specs-pie ; then
-		# Force PIC macro definition for all compilations since they're all
-		# either -fPIC or -fPIE with the default-PIE compiler.
-		append-cppflags -DPIC
-	else
-		# Don't build -fPIE without the default-PIE compiler and the
-		# hardened-pie patch
-		filter-flags -fPIE
-	fi
-}
-
-want_nptl() {
-	[[ -z ${LT_VER} ]] && return 0
-	want_tls || return 1
-	use nptl || return 1
-
-	# Only list the arches that cannot do NPTL
-	case $(tc-arch) in
-		m68k) return 1;;
-		sparc)
-			# >= v9 is needed for nptl.
-			[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
-		;;
-	esac
-
-	return 0
-}
-
-want_linuxthreads() {
-	[[ -z ${LT_VER} ]] && return 1
-	! use nptlonly && return 0
-	want_nptl || return 0
-	return 1
-}
-
-want_tls() {
-	# Archs that can use TLS (Thread Local Storage)
-	case $(tc-arch) in
-		sparc)
-			# 2.3.6 should have tls support on sparc64
-			# when using newer binutils
-			case ${CTARGET/-*} in
-				sparc64*) return 1 ;;
-				*) return 0 ;;
-			esac
-		;;
-		x86)
-			# requires i486 or better #106556
-			[[ ${CTARGET} == i[4567]86* ]] && return 0
-			return 1
-		;;
-	esac
-
-	return 0
-}
-
-want__thread() {
-	want_tls || return 1
-
-	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
-	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
-
-	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
-
-	# only test gcc -- cant test linking yet
-	tc-has-tls -c ${CTARGET}
-	WANT__THREAD=$?
-
-	return ${WANT__THREAD}
-}
-
-use_multilib() {
-	case ${CTARGET} in
-		sparc*|mips64*|x86_64*|powerpc64*|s390x*)
-			has_multilib_profile || use multilib ;;
-		*)  false ;;
-	esac
-}
-
-# Setup toolchain variables that would be defined in the profiles for these archs.
-setup_env() {
-	# silly users
-	unset LD_RUN_PATH
-
-	if is_crosscompile || tc-is-cross-compiler ; then
-		multilib_env ${CTARGET}
-		if ! use multilib ; then
-			MULTILIB_ABIS=${DEFAULT_ABI}
-		else
-			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
-		fi
-
-		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
-		# and fall back on CFLAGS.
-		local VAR=CFLAGS_${CTARGET//[-.]/_}
-		CFLAGS=${!VAR-${CFLAGS}}
-	fi
-
-	setup_flags
-
-	export ABI=${ABI:-${DEFAULT_ABI:-default}}
-
-	if is_crosscompile || tc-is-cross-compiler ; then
-		local VAR=CFLAGS_${ABI}
-		# We need to export CFLAGS with abi information in them because
-		# glibc's configure script checks CFLAGS for some targets (like mips)
-		export CFLAGS="${!VAR} ${CFLAGS}"
-	fi
-}
-
-just_headers() {
-	is_crosscompile && use crosscompile_opts_headers-only
-}

diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit~ b/sys-libs/glibc/files/eblits/src_compile.eblit~
deleted file mode 100644
index 9f2b597..0000000
--- a/sys-libs/glibc/files/eblits/src_compile.eblit~
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2007 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.10 2009/11/06 00:33:03 vapier Exp $
-
-glibc_do_configure() {
-	local myconf
-
-	# set addons
-	pushd "${S}" > /dev/null
-	local ADDONS=$(echo */configure | sed \
-		-e 's:/configure::g' \
-		-e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \
-		-e 's: \+$::' \
-		-e 's! !,!g' \
-		-e 's!^!,!' \
-		-e '/^,\*$/d')
-	[[ -d ports ]] && ADDONS="${ADDONS},ports"
-	popd > /dev/null
-
-	use nls || myconf="${myconf} --disable-nls"
-	myconf="${myconf} $(use_enable hardened stackguard-randomization)"
-	if [[ $(<"${T}"/.ssp.compat) == "yes" ]] ; then
-		myconf="${myconf} --enable-old-ssp-compat"
-	else
-		myconf="${myconf} --disable-old-ssp-compat"
-	fi
-
-	use glibc-omitfp && myconf="${myconf} --enable-omitfp"
-
-	[[ ${CTARGET//_/-} == *-softfloat-* ]] && myconf="${myconf} --without-fp"
-
-	if [[ $1 == "linuxthreads" ]] ; then
-		if want_tls ; then
-			myconf="${myconf} --with-tls"
-
-			if ! want__thread || use glibc-compat20 || [[ ${LT_KER_VER} == 2.[02].* ]] ; then
-				myconf="${myconf} --without-__thread"
-			else
-				myconf="${myconf} --with-__thread"
-			fi
-		else
-			myconf="${myconf} --without-tls --without-__thread"
-		fi
-
-		myconf="${myconf} --disable-sanity-checks"
-		myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}"
-		myconf="${myconf} --enable-kernel=${LT_KER_VER}"
-	elif [[ $1 == "nptl" ]] ; then
-		myconf="${myconf} --enable-add-ons=nptl${ADDONS}"
-		myconf="${myconf} --enable-kernel=${NPTL_KERN_VER}"
-	else
-		die "invalid pthread option"
-	fi
-
-	# Since SELinux support is only required for nscd, only enable it if:
-	# 1. USE selinux
-	# 2. only for the primary ABI on multilib systems
-	# 3. Not a crosscompile
-	if ! is_crosscompile && use selinux ; then
-		if use multilib || has_multilib_profile ; then
-			if is_final_abi ; then
-				myconf="${myconf} --with-selinux"
-			else
-				myconf="${myconf} --without-selinux"
-			fi
-		else
-			myconf="${myconf} --with-selinux"
-		fi
-	else
-		myconf="${myconf} --without-selinux"
-	fi
-
-	myconf="${myconf}
-		--without-cvs
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		$(use_with gd)
-		--with-headers=$(alt_build_headers)
-		--prefix=${EPREFIX}/usr
-		--libdir=${EPREFIX}/usr/$(get_libdir)
-		--mandir=${EPREFIX}/usr/share/man
-		--infodir=${EPREFIX}/usr/share/info
-		--libexecdir=${EPREFIX}/usr/$(get_libdir)/misc/glibc
-		${EXTRA_ECONF}"
-
-	# There is no configure option for this and we need to export it
-	# since the glibc build will re-run configure on itself
-	export libc_cv_slibdir=/$(get_libdir)
-
-	has_version app-admin/eselect-compiler || export CC=$(tc-getCC ${CTARGET})
-
-	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
-	mkdir -p "${GBUILDDIR}"
-	cd "${GBUILDDIR}"
-	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
-	"${S}"/configure ${myconf} || die "failed to configure glibc"
-
-	# since we'll be punting them for cross-compilers, and they can cause
-	# problems (ia64+static), we'll just skip building altogether
-	is_crosscompile && sed -i '1ibuild-programs = no' config.make
-}
-
-toolchain-glibc_src_compile() {
-	echo
-	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-	echo
-
-	if want_linuxthreads ; then
-		glibc_do_configure linuxthreads
-		einfo "Building GLIBC with linuxthreads..."
-		make PARALLELMFLAGS="${MAKEOPTS}" || die "make for ${ABI} failed"
-	fi
-	if want_nptl ; then
-		# ... and then do the optional nptl build
-		unset LD_ASSUME_KERNEL
-		glibc_do_configure nptl
-		einfo "Building GLIBC with NPTL..."
-		make PARALLELMFLAGS="${MAKEOPTS}" || die "make for ${ABI} failed"
-	fi
-}
-
-toolchain-glibc_headers_compile() {
-	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
-	mkdir -p "${GBUILDDIR}"
-	cd "${GBUILDDIR}"
-
-	# if we don't have a compiler yet, we cant really test it now ...
-	# hopefully they don't affect header geneation, so let's hope for
-	# the best here ...
-	export \
-		libc_cv_386_tls=yes \
-		libc_cv_asm_cfi_directives=yes \
-		libc_cv_broken_visibility_attribute=no \
-		libc_cv_gcc___thread=yes \
-		libc_cv_mlong_double_128=yes \
-		libc_cv_mlong_double_128ibm=yes \
-		libc_cv_ppc_machine=yes \
-		libc_cv_visibility_attribute=yes \
-		libc_cv_z_combreloc=yes \
-		libc_cv_z_execstack=yes \
-		libc_cv_z_initfirst=yes \
-		libc_cv_z_nodelete=yes \
-		libc_cv_z_nodlopen=yes \
-		libc_cv_z_relro=yes
-
-	# Pick out the correct location for build headers
-	local ports="" myconf="--disable-sanity-checks --enable-hacker-mode"
-	[[ -d ${S}/ports ]] && ports=",ports"
-	myconf="${myconf}
-		--enable-add-ons=nptl${ports}
-		--without-cvs
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(alt_build_headers)
-		--prefix=${EPREFIX}/usr
-		${EXTRA_ECONF}"
-
-	# Nothing is compiled here which would affect the headers for the target.
-	# so forcing CC/CFLAGS is sane.  unless you dont have `gcc`.  then i
-	# dont care :p.
-	einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}"
-	CC=gcc \
-	CFLAGS="-O1 -pipe" \
-	"${S}"/configure ${myconf} || die "failed to configure glibc"
-}
-
-eblit-glibc-src_compile() {
-	if is_crosscompile ; then
-		export \
-			libc_cv_c_cleanup=yes \
-			libc_cv_forced_unwind=yes
-	fi
-
-	if just_headers ; then
-		toolchain-glibc_headers_compile
-		return
-	fi
-
-	setup_env
-
-	if [[ -z ${OABI} ]] ; then
-		local abilist=""
-		if has_multilib_profile ; then
-			abilist=$(get_install_abis)
-			einfo "Building multilib glibc for ABIs: ${abilist}"
-		elif is_crosscompile || tc-is-cross-compiler ; then
-			abilist=${DEFAULT_ABI}
-		fi
-		if [[ -n ${abilist} ]] ; then
-			OABI=${ABI}
-			for ABI in ${abilist} ; do
-				export ABI
-				src_compile
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-	fi
-
-	toolchain-glibc_src_compile
-}

diff --git a/sys-libs/glibc/files/eblits/src_install.eblit~ b/sys-libs/glibc/files/eblits/src_install.eblit~
deleted file mode 100644
index 28034f4..0000000
--- a/sys-libs/glibc/files/eblits/src_install.eblit~
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2007 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.9 2009/12/19 23:44:54 vapier Exp $
-
-toolchain-glibc_src_install() {
-	local GBUILDDIR
-	if want_linuxthreads ; then
-		GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads
-	else
-		GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-nptl
-	fi
-
-	local install_root=${ED}
-	is_crosscompile && install_root="${install_root}/usr/${CTARGET}"
-	if want_linuxthreads ; then
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
-	else # nptlonly
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		einfo "Installing GLIBC ${ABI} with NPTL ..."
-	fi
-	make PARALLELMFLAGS="${MAKEOPTS}" \
-		install_root="${install_root}" \
-		install || die
-
-	if is_crosscompile ; then
-		# punt all the junk not needed by a cross-compiler
-		cd "${D}"/usr/${CTARGET} || die
-		rm -rf ./{,usr/}{bin,etc,sbin,share} ./{,usr/}*/{gconv,misc}
-	fi
-
-	if want_linuxthreads && want_nptl ; then
-		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		dodir $(alt_libdir)/tls $(alt_usrlibdir)/nptl
-
-		local l src_lib
-		for l in libc libm librt libpthread libthread_db ; do
-			# take care of shared lib first ...
-			l=${l}.so
-			if [[ -e ${l} ]] ; then
-				src_lib=${l}
-			else
-				src_lib=$(eval echo */${l})
-			fi
-			cp -a ${src_lib} "${D}"$(alt_libdir)/tls/${l} || die "copying nptl ${l}"
-			fperms a+rx $(alt_libdir)/tls/${l}
-			dosym ${l} $(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib})
-
-			# then grab the linker script or the symlink ...
-			if [[ -L ${D}$(alt_usrlibdir)/${l} ]] ; then
-				dosym $(alt_libdir)/tls/${l} $(alt_usrlibdir)/nptl/${l}
-			else
-				sed \
-					-e "s:/${l}:/tls/${l}:g" \
-					-e "s:/${l/%.so/_nonshared.a}:/nptl/${l/%.so/_nonshared.a}:g" \
-					"${D}"$(alt_usrlibdir)/${l} > "${D}"$(alt_usrlibdir)/nptl/${l}
-			fi
-
-			# then grab the static lib ...
-			src_lib=${src_lib/%.so/.a}
-			[[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a}
-			cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"
-			src_lib=${src_lib/%.a/_nonshared.a}
-			if [[ -e ${src_lib} ]] ; then
-				cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}"
-			fi
-		done
-
-		# use the nptl linker instead of the linuxthreads one as the linuxthreads
-		# one may lack TLS support and that can be really bad for business
-		cp -a elf/ld.so "${D}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp"
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f "${D}"/etc/ld.so.cache
-
-	# Some things want this, notably ash.
-	dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a
-
-	# Handle includes for different ABIs if glibc itself doesn't do it
-	# XXX: curr glibc should finally handle all of them correctly
-	#case $(tc-arch) in
-	#	amd64|mips|ppc|s390) ;;
-	#	*) prep_ml_includes $(alt_headers) ;;
-	#esac
-
-	# When cross-compiling for a non-multilib setup, make sure we have
-	# lib and a proper symlink setup
-	if is_crosscompile && ! use multilib && ! has_multilib_profile && [[ $(get_libdir) != "lib" ]] ; then
-		cd "${D}"$(alt_libdir)/..
-		mv $(get_libdir) lib || die
-		ln -s lib $(get_libdir) || die
-		cd "${D}"$(alt_usrlibdir)/..
-		mv $(get_libdir) lib || die
-		ln -s lib $(get_libdir) || die
-	fi
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install some symlink hacks so that when we build
-	# a 2nd stage cross-compiler, gcc finds the target system
-	# headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		dosym usr/include ${EPREFIX}/usr/${CTARGET}/sys-include
-		return 0
-	fi
-
-	# Everything past this point just needs to be done once ...
-	is_final_abi || return 0
-
-	# Make sure the non-native interp can be found on multilib systems
-	if has_multilib_profile ; then
-		case $(tc-arch) in
-			amd64)
-				[[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR amd64) /lib
-				dosym ../$(get_abi_LIBDIR x86)/ld-linux.so.2 /lib/ld-linux.so.2
-				;;
-			ppc64)
-				[[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR ppc64) /lib
-				dosym ../$(get_abi_LIBDIR ppc)/ld.so.1 /lib/ld.so.1
-				;;
-		esac
-	fi
-
-	# Files for Debian-style locale updating
-	dodir /usr/share/i18n
-	sed \
-		-e "/^#/d" \
-		-e "/SUPPORTED-LOCALES=/d" \
-		-e "s: \\\\::g" -e "s:/: :g" \
-		"${S}"/localedata/SUPPORTED > "${D}"/usr/share/i18n/SUPPORTED \
-		|| die "generating /usr/share/i18n/SUPPORTED failed"
-	cd "${WORKDIR}"/extra/locale
-	dosbin locale-gen || die
-	doman *.[0-8]
-	insinto /etc
-	doins locale.gen || die
-
-	# Make sure all the ABI's can find the locales and so we only
-	# have to generate one set
-	local a
-	keepdir /usr/$(get_libdir)/locale
-	for a in $(get_install_abis) ; do
-		if [[ ! -e ${D}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
-			dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
-		fi
-	done
-
-	if ! has noinfo ${FEATURES} && [[ -n ${INFOPAGE_VER} ]] ; then
-		einfo "Installing info pages..."
-
-		make \
-			-C "${GBUILDDIR}" \
-			PARALLELMFLAGS="${MAKEOPTS}" \
-			install_root="${install_root}" \
-			info -i || die
-	fi
-
-	if [[ -n ${MANPAGE_VER} ]] ; then
-		einfo "Installing man pages..."
-
-		# Install linuxthreads man pages even if nptl is enabled
-		cd "${WORKDIR}"/man
-		doman *.3thr
-	fi
-
-	cd "${S}"
-
-	# Install misc network config files
-	insinto /etc
-	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf || die
-	doins "${WORKDIR}"/extra/etc/*.conf || die
-	doinitd "${WORKDIR}"/extra/etc/nscd || die
-
-	sed -i -e "s:@PIDFILE@:$(strings "${D}"/usr/sbin/nscd | grep nscd.pid):" "${D}"/etc/init.d/nscd
-
-	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
-	doenvd "${T}"/00glibc || die
-
-	dodoc BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README*
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f "${D}"/etc/localtime
-}
-
-toolchain-glibc_headers_install() {
-	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers
-	cd "${GBUILDDIR}"
-	make install_root="${ED}/usr/${CTARGET}" install-headers || die "install-headers failed"
-	# Copy over headers that are not part of install-headers ... these
-	# are pretty much taken verbatim from crosstool, see it for more details
-	insinto $(alt_headers)/bits
-	doins misc/syscall-list.h bits/stdio_lim.h || die "doins include bits"
-	insinto $(alt_headers)/gnu
-	doins "${S}"/include/gnu/stubs.h || die "doins include gnu"
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	dosym usr/include /usr/${CTARGET}/sys-include
-}
-
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(hasq splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! hasq nostrip ${FEATURES} && ! hasq splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${D}"/*/libpthread-*.so
-	fi
-}
-
-eblit-glibc-src_install() {
-	if just_headers ; then
-		toolchain-glibc_headers_install
-		return
-	fi
-
-	setup_env
-
-	if [[ -z ${OABI} ]] ; then
-		local abilist=""
-		if has_multilib_profile ; then
-			abilist=$(get_install_abis)
-			einfo "Installing multilib glibc for ABIs: ${abilist}"
-		elif is_crosscompile || tc-is-cross-compiler ; then
-			abilist=${DEFAULT_ABI}
-		fi
-		if [[ -n ${abilist} ]] ; then
-			OABI=${ABI}
-			for ABI in ${abilist} ; do
-				export ABI
-				eblit-glibc-src_install
-			done
-			ABI=${OABI}
-			unset OABI
-			src_strip
-			return 0
-		fi
-	fi
-
-	toolchain-glibc_src_install
-	[[ -z ${OABI} ]] && src_strip
-}