Remove all older versions susceptible to bug #539226.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

16 files changed, 12 insertions, 5258 deletions

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index c8fdb0349306..97a0ce82e2c2 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-libs/uclibc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.101 2015/06/18 12:29:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.102 2015/06/18 12:32:46 blueness Exp $
+
+  18 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
+  -uclibc-0.9.33.2-r1.ebuild, -uclibc-0.9.33.2-r10.ebuild,
+  -uclibc-0.9.33.2-r11.ebuild, -uclibc-0.9.33.2-r12.ebuild,
+  -uclibc-0.9.33.2-r13.ebuild, -uclibc-0.9.33.2-r14.ebuild,
+  -uclibc-0.9.33.2-r2.ebuild, -uclibc-0.9.33.2-r3.ebuild,
+  -uclibc-0.9.33.2-r4.ebuild, -uclibc-0.9.33.2-r5.ebuild,
+  -uclibc-0.9.33.2-r6.ebuild, -uclibc-0.9.33.2-r7.ebuild,
+  -uclibc-0.9.33.2-r8.ebuild, -uclibc-0.9.33.2-r9.ebuild,
+  -uclibc-0.9.33.2.ebuild:
+  Remove all older versions susceptible to bug #539226.
 
   18 Jun 2015; Anthony G. Basile <blueness@gentoo.org>
   uclibc-0.9.33.2-r15.ebuild:
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r1.ebuild
deleted file mode 100644
index c2f28f420f57..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r1.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r1.ebuild,v 1.2 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="2"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-# XXX: We should kill these off.
-CPU_ALPHA=""
-CPU_AMD64=""
-CPU_ARM="GENERIC_ARM ARM{610,710,7TDMI,720T,920T,922T,926T,10T,1136JF_S,1176JZ{_,F_}S,_{SA110,SA1100,XSCALE,IWMMXT},_CORTEX_{M3,M1}}"
-CPU_IA64=""
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32{,R2},64}} MIPS_{N64,O32,N32}_ABI"
-CPU_PPC=""
-CPU_SH="SH{2,2A,3,4,5}"
-CPU_SPARC="SPARC_V{7,8,9,9B}"
-CPU_X86="GENERIC_386 {3,4,5,6}86 586MMX PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH"
-IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPARC} ${CPU_X86}"
-
-check_cpu_opts() {
-	local cpu_var="CPU_$(echo $(tc-arch) | tr [a-z] [A-Z])"
-	[[ -z ${!cpu_var} ]] && return 0
-
-	if [[ -z ${UCLIBC_CPU} ]] ; then
-		ewarn "You really should consider setting UCLIBC_CPU"
-		ewarn "Otherwise, the build will be generic (read: slow)."
-		ewarn "Available CPU options:"
-		UCLIBC_CPU=$(eval echo ${!cpu_var})
-		echo ${UCLIBC_CPU}
-		case ${CTARGET} in
-			mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-			sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-			i[456]86*)   export UCLIBC_CPU="${CTARGET:1:1}86";;
-			*)           export UCLIBC_CPU=${UCLIBC_CPU%% *};;
-		esac
-	else
-		local cpu found=0
-		for cpu in $(eval echo ${!cpu_var}) ; do
-			[[ ${UCLIBC_CPU} == "${cpu}" ]] && found=1 && break
-		done
-		if [[ ${found} -eq 0 ]] ; then
-			ewarn "UCLIBC_CPU choice '${UCLIBC_CPU}' not supported"
-			ewarn "Valid choices:"
-			eval echo ${!cpu_var}
-			die "pick a supported cpu type"
-		fi
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target config_target
-	case $(tc-arch) in
-		alpha) target="alpha";   config_target="no cpu-specific options";;
-		amd64) target="x86_64";  config_target="no cpu-specific options";;
-		arm)   target="arm";     config_target="GENERIC_ARM";;
-		avr)   target="avr32";   config_target="no cpu-specific options";;
-		ia64)  target="ia64";    config_target="no cpu-specific options";;
-		m68k)  target="m68k";    config_target="no cpu-specific options";;
-		mips)  target="mips";    config_target="MIPS_ISA_1";;
-		ppc)   target="powerpc"; config_target="no cpu-specific options";;
-		sh)    target="sh";      config_target="SH4";;
-		sparc) target="sparc";   config_target="no cpu-specific options";;
-		x86)   target="i386";    config_target="GENERIC_386";;
-		*)     die "$(tc-arch) lists no defaults :/";;
-	esac
-	sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r10.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r10.ebuild
deleted file mode 100644
index cf9c6322af23..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r10.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r10.ebuild,v 1.3 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="12"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r11.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r11.ebuild
deleted file mode 100644
index e3d434e2cf24..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r11.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r11.ebuild,v 1.3 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="13"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r12.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r12.ebuild
deleted file mode 100644
index 2424c2a805f8..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r12.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r12.ebuild,v 1.3 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="14"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-
-	if use nptl ; then
-		case ${CTARGET} in
-		i386*)
-			die "Your target has no support for NPTL"
-			;;
-		esac
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild
deleted file mode 100644
index c90da230acdd..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild,v 1.3 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="15"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-
-	if use nptl ; then
-		case ${CTARGET} in
-		i386*)
-			die "Your target has no support for NPTL"
-			;;
-		esac
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r14.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r14.ebuild
deleted file mode 100644
index 68f4e951d3f7..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r14.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r14.ebuild,v 1.3 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="16"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm ~m68k ~mips ppc ~sh ~sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-
-	if use nptl ; then
-		case ${CTARGET} in
-		i386*)
-			die "Your target has no support for NPTL"
-			;;
-		esac
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r2.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r2.ebuild
deleted file mode 100644
index 0d6fd6a37f26..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r2.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r2.ebuild,v 1.3 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="3"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-# XXX: We should kill these off.
-CPU_ALPHA=""
-CPU_AMD64=""
-CPU_ARM="GENERIC_ARM ARM{610,710,7TDMI,720T,920T,922T,926T,10T,1136JF_S,1176JZ{_,F_}S,_{SA110,SA1100,XSCALE,IWMMXT},_CORTEX_{M3,M1}}"
-CPU_IA64=""
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32{,R2},64}} MIPS_{N64,O32,N32}_ABI"
-CPU_PPC=""
-CPU_SH="SH{2,2A,3,4,5}"
-CPU_SPARC="SPARC_V{7,8,9,9B}"
-CPU_X86="GENERIC_386 {3,4,5,6}86 586MMX PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH"
-IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPARC} ${CPU_X86}"
-
-check_cpu_opts() {
-	local cpu_var="CPU_$(echo $(tc-arch) | tr [a-z] [A-Z])"
-	[[ -z ${!cpu_var} ]] && return 0
-
-	if [[ -z ${UCLIBC_CPU} ]] ; then
-		ewarn "You really should consider setting UCLIBC_CPU"
-		ewarn "Otherwise, the build will be generic (read: slow)."
-		ewarn "Available CPU options:"
-		UCLIBC_CPU=$(eval echo ${!cpu_var})
-		echo ${UCLIBC_CPU}
-		case ${CTARGET} in
-			mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-			sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-			i[456]86*)   export UCLIBC_CPU="${CTARGET:1:1}86";;
-			*)           export UCLIBC_CPU=${UCLIBC_CPU%% *};;
-		esac
-	else
-		local cpu found=0
-		for cpu in $(eval echo ${!cpu_var}) ; do
-			[[ ${UCLIBC_CPU} == "${cpu}" ]] && found=1 && break
-		done
-		if [[ ${found} -eq 0 ]] ; then
-			ewarn "UCLIBC_CPU choice '${UCLIBC_CPU}' not supported"
-			ewarn "Valid choices:"
-			eval echo ${!cpu_var}
-			die "pick a supported cpu type"
-		fi
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target config_target
-	case $(tc-arch) in
-		alpha) target="alpha";   config_target="no cpu-specific options";;
-		amd64) target="x86_64";  config_target="no cpu-specific options";;
-		arm)   target="arm";     config_target="GENERIC_ARM";;
-		avr)   target="avr32";   config_target="no cpu-specific options";;
-		ia64)  target="ia64";    config_target="no cpu-specific options";;
-		m68k)  target="m68k";    config_target="no cpu-specific options";;
-		mips)  target="mips";    config_target="MIPS_ISA_1";;
-		ppc)   target="powerpc"; config_target="no cpu-specific options";;
-		sh)    target="sh";      config_target="SH4";;
-		sparc) target="sparc";   config_target="no cpu-specific options";;
-		x86)   target="i386";    config_target="GENERIC_386";;
-		*)     die "$(tc-arch) lists no defaults :/";;
-	esac
-	sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r3.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r3.ebuild
deleted file mode 100644
index ce9f5eb5e7e8..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r3.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r3.ebuild,v 1.6 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="5"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-# XXX: We should kill these off.
-CPU_ALPHA=""
-CPU_AMD64=""
-CPU_ARM="GENERIC_ARM ARM{610,710,7TDMI,720T,920T,922T,926T,10T,1136JF_S,1176JZ{_,F_}S,_{SA110,SA1100,XSCALE,IWMMXT},_CORTEX_{M3,M1}}"
-CPU_IA64=""
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32{,R2},64}} MIPS_{N64,O32,N32}_ABI"
-CPU_PPC=""
-CPU_SH="SH{2,2A,3,4,5}"
-CPU_SPARC="SPARC_V{7,8,9,9B}"
-CPU_X86="GENERIC_386 {3,4,5,6}86 586MMX PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH"
-IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPARC} ${CPU_X86}"
-
-check_cpu_opts() {
-	local cpu_var="CPU_$(echo $(tc-arch) | tr [a-z] [A-Z])"
-	[[ -z ${!cpu_var} ]] && return 0
-
-	if [[ -z ${UCLIBC_CPU} ]] ; then
-		ewarn "You really should consider setting UCLIBC_CPU"
-		ewarn "Otherwise, the build will be generic (read: slow)."
-		ewarn "Available CPU options:"
-		UCLIBC_CPU=$(eval echo ${!cpu_var})
-		echo ${UCLIBC_CPU}
-		case ${CTARGET} in
-			mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-			sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-			i[456]86*)   export UCLIBC_CPU="${CTARGET:1:1}86";;
-			*)           export UCLIBC_CPU=${UCLIBC_CPU%% *};;
-		esac
-	else
-		local cpu found=0
-		for cpu in $(eval echo ${!cpu_var}) ; do
-			[[ ${UCLIBC_CPU} == "${cpu}" ]] && found=1 && break
-		done
-		if [[ ${found} -eq 0 ]] ; then
-			ewarn "UCLIBC_CPU choice '${UCLIBC_CPU}' not supported"
-			ewarn "Valid choices:"
-			eval echo ${!cpu_var}
-			die "pick a supported cpu type"
-		fi
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target config_target
-	case $(tc-arch) in
-		alpha) target="alpha";   config_target="no cpu-specific options";;
-		amd64) target="x86_64";  config_target="no cpu-specific options";;
-		arm)   target="arm";     config_target="GENERIC_ARM";;
-		avr)   target="avr32";   config_target="no cpu-specific options";;
-		bfin)  target="bfin";    config_target="no cpu-specific options";;
-		ia64)  target="ia64";    config_target="no cpu-specific options";;
-		m68k)  target="m68k";    config_target="no cpu-specific options";;
-		mips)  target="mips";    config_target="MIPS_ISA_1";;
-		ppc)   target="powerpc"; config_target="no cpu-specific options";;
-		sh)    target="sh";      config_target="SH4";;
-		sparc) target="sparc";   config_target="no cpu-specific options";;
-		x86)   target="i386";    config_target="GENERIC_386";;
-		*)     die "$(tc-arch) lists no defaults :/";;
-	esac
-	sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r4.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r4.ebuild
deleted file mode 100644
index bd3ed97926e4..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r4.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r4.ebuild,v 1.3 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="6"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r5.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r5.ebuild
deleted file mode 100644
index f7d4c093051d..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r5.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r5.ebuild,v 1.2 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="7"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r6.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r6.ebuild
deleted file mode 100644
index 835cc44a2a09..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r6.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r6.ebuild,v 1.3 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="8"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r7.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r7.ebuild
deleted file mode 100644
index 8655ca8143e2..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r7.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r7.ebuild,v 1.2 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="9"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r8.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r8.ebuild
deleted file mode 100644
index cabe8a79637e..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r8.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r8.ebuild,v 1.3 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="10"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r9.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r9.ebuild
deleted file mode 100644
index 016aa2c0187d..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r9.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r9.ebuild,v 1.2 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="11"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2.ebuild
deleted file mode 100644
index f23aefe67351..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2.ebuild,v 1.5 2015/02/27 08:05:56 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="1"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm ~m68k ~mips ppc ~sh sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-# XXX: We should kill these off.
-CPU_ALPHA=""
-CPU_AMD64=""
-CPU_ARM="GENERIC_ARM ARM{610,710,7TDMI,720T,920T,922T,926T,10T,1136JF_S,1176JZ{_,F_}S,_{SA110,SA1100,XSCALE,IWMMXT},_CORTEX_{M3,M1}}"
-CPU_IA64=""
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32{,R2},64}} MIPS_{N64,O32,N32}_ABI"
-CPU_PPC=""
-CPU_SH="SH{2,2A,3,4,5}"
-CPU_SPARC="SPARC_V{7,8,9,9B}"
-CPU_X86="GENERIC_386 {3,4,5,6}86 586MMX PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH"
-IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPARC} ${CPU_X86}"
-
-check_cpu_opts() {
-	local cpu_var="CPU_$(echo $(tc-arch) | tr [a-z] [A-Z])"
-	[[ -z ${!cpu_var} ]] && return 0
-
-	if [[ -z ${UCLIBC_CPU} ]] ; then
-		ewarn "You really should consider setting UCLIBC_CPU"
-		ewarn "Otherwise, the build will be generic (read: slow)."
-		ewarn "Available CPU options:"
-		UCLIBC_CPU=$(eval echo ${!cpu_var})
-		echo ${UCLIBC_CPU}
-		case ${CTARGET} in
-			mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-			sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-			i[456]86*)   export UCLIBC_CPU="${CTARGET:1:1}86";;
-			*)           export UCLIBC_CPU=${UCLIBC_CPU%% *};;
-		esac
-	else
-		local cpu found=0
-		for cpu in $(eval echo ${!cpu_var}) ; do
-			[[ ${UCLIBC_CPU} == "${cpu}" ]] && found=1 && break
-		done
-		if [[ ${found} -eq 0 ]] ; then
-			ewarn "UCLIBC_CPU choice '${UCLIBC_CPU}' not supported"
-			ewarn "Valid choices:"
-			eval echo ${!cpu_var}
-			die "pick a supported cpu type"
-		fi
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target config_target
-	case $(tc-arch) in
-		alpha) target="alpha";   config_target="no cpu-specific options";;
-		amd64) target="x86_64";  config_target="no cpu-specific options";;
-		arm)   target="arm";     config_target="GENERIC_ARM";;
-		avr)   target="avr32";   config_target="no cpu-specific options";;
-		ia64)  target="ia64";    config_target="no cpu-specific options";;
-		m68k)  target="m68k";    config_target="no cpu-specific options";;
-		mips)  target="mips";    config_target="MIPS_ISA_1";;
-		ppc)   target="powerpc"; config_target="no cpu-specific options";;
-		sh)    target="sh";      config_target="SH4";;
-		sparc) target="sparc";   config_target="no cpu-specific options";;
-		x86)   target="i386";    config_target="GENERIC_386";;
-		*)     die "$(tc-arch) lists no defaults :/";;
-	esac
-	sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# 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
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}