Drop tc-is-softfloat usage as the FPU knob merely controls enabling of libm.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

13 files changed, 22 insertions, 1817 deletions

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index bdc5448df60d..41016bdb9ff1 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/uclibc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.66 2012/06/09 05:27:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.67 2012/06/09 06:47:12 vapier Exp $
+
+  09 Jun 2012; Mike Frysinger <vapier@gentoo.org> -uclibc-0.9.27-r1.ebuild,
+  -uclibc-0.9.28.3-r3.ebuild, -uclibc-0.9.28.3-r7.ebuild,
+  -uclibc-0.9.28.3.ebuild, uclibc-0.9.28.3-r8.ebuild, uclibc-0.9.30.1-r1.ebuild,
+  uclibc-0.9.30.1.ebuild, uclibc-0.9.30.ebuild, uclibc-0.9.33.1-r1.ebuild,
+  uclibc-0.9.33.1.ebuild, uclibc-0.9.33.2.ebuild, uclibc-9999.ebuild:
+  Drop tc-is-softfloat usage as the FPU knob merely controls enabling of libm.
 
   09 Jun 2012; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.33.2.ebuild:
   Mark stable for all.
diff --git a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
deleted file mode 100644
index e54f52f9309b..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.41 2011/04/20 18:10:38 ulm Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-# Handle the case where we want uclibc on glibc ...
-if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc ]] ; then
-	export UCLIBC_AND_GLIBC="sitting in a tree"
-	export CTARGET=${CHOST%%-*}-pc-linux-uclibc
-fi
-
-# To make a new SVN_VER we do.
-# wget -O - http://uclibc.org/downloads/snapshots/uClibc-`date +%Y%m%d`.tar.bz2 | tar jxf -
-# tar jxf /usr/portage/distfiles/uClibc-0.9.27.tar.bz2
-# diff -urN --exclude .svn uClibc-0.9.27 uClibc | bzip2 - > uClibc-0.9.27-svn-update-`date +%Y%m%d`.patch.bz2
-# rm -rf uClibc-0.9.27-svn-update-`date +%Y%m%d`.patch.bz2  uClibc uClibc-0.9.27
-
-MY_P=uClibc-${PV}
-SVN_VER="20050114"
-PATCH_VER="1.6"
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-SRC_URI="mirror://kernel/linux/libs/uclibc/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-cvs-update-${SVN_VER}.patch.bz2
-	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2
-	nls? ( !userlocales? ( pregen? (
-		x86? ( http://www.uclibc.org/downloads/uClibc-locale-030818.tgz )
-	) ) )"
-
-LICENSE="LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
-	&& SLOT="${CTARGET}" \
-	|| SLOT="0"
-KEYWORDS="-* arm m68k ~mips ppc sh sparc x86"
-IUSE="build debug hardened ipv6 minimal nls pregen userlocales wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-RDEPEND=""
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	DEPEND="virtual/os-headers app-misc/pax-utils"
-else
-	DEPEND=""
-fi
-
-S=${WORKDIR}/${MY_P}
-
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \
-	   || [[ -n ${UCLIBC_AND_GLIBC} ]]
-	then
-		echo /usr
-	else
-		echo /usr/${CTARGET}/usr
-	fi
-}
-just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-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() {
-	just_headers && return 0
-	has_version ${CATEGORY}/uclibc || return 0
-	[[ -n ${UCLIBC_AND_GLIBC} ]] && return 0
-	[[ ${ROOT} != "/" ]] && return 0
-
-	if ! built_with_use --missing false ${CATEGORY}/uclibc nls && use nls && ! use pregen ; then
-		eerror "You previously built uclibc with USE=-nls."
-		eerror "You cannot generate locale data with this"
-		eerror "system.  Please rerun emerge with USE=pregen."
-		die "host cannot support locales"
-	elif built_with_use --missing false ${CATEGORY}/uclibc nls && ! use nls ; then
-		eerror "You previously built uclibc with USE=nls."
-		eerror "Rebuilding uClibc with USE=-nls will prob"
-		eerror "destroy your system."
-		die "switching to nls is baaaad"
-	fi
-}
-
-CPU_ARM="GENERIC_ARM ARM{610,710,720T,920T,922T,926T,_{SA110,SA1100,XSCALE}}"
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32,64}}"
-CPU_PPC=""
-CPU_SH="SH{2,3,4,5}"
-CPU_SPARC=""
-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])"
-	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}
-		export UCLIBC_CPU=${UCLIBC_CPU%% *}
-	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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## PATCHES ##########
-
-	[[ -n ${SVN_VER} ]] && \
-		epatch "${WORKDIR}"/${MY_P}-cvs-update-${SVN_VER}.patch
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2
-		EPATCH_SUFFIX="patch"
-		epatch "${WORKDIR}"/patch
-		# math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f)
-		use build || epatch "${WORKDIR}"/patch/math
-	fi
-
-	########## CPU SELECTION ##########
-
-	local target config_target
-	case $(tc-arch) in
-		arm)  target="arm";     config_target="GENERIC_ARM";;
-		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";;
-		x86)  target="i386";    config_target="GENERIC_386";;
-		*)    die "$(tc-arch) lists no defaults :/";;
-	esac
-	sed -i -e "s:default TARGET_i386:default TARGET_${target}:" \
-		extra/Configs/Config.in
-	sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
-
-	########## CONFIG SETUP ##########
-
-	make defconfig >/dev/null || die "could not config"
-
-	for def in UCLIBC_PROFILING DO{DEBUG,ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} ; do
-		sed -i -e "s:${def}=y:# ${def} is not set:" .config
-	done
-	if use debug ; then
-		echo "SUPPORT_LD_DEBUG=y" >> .config
-		echo "DODEBUG=y" >> .config
-	fi
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
-
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		sed -i -e '/^HAS_FPU=y$/d' .config
-		echo 'HAS_FPU=n' >> .config
-	fi
-
-	for def in DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do
-		sed -i -e "s:# ${def} is not set:${def}=y:" .config
-	done
-	echo "UCLIBC_HAS_FULL_RPC=y" >> .config
-	echo "PTHREADS_DEBUG_SUPPORT=y" >> .config
-	echo "UCLIBC_HAS_TZ_FILE_READ_MANY=n" >> .config
-
-	if use nls ; then
-		sed -i -e "s:# UCLIBC_HAS_LOCALE is not set:UCLIBC_HAS_LOCALE=y:" .config
-		echo "UCLIBC_HAS_XLOCALE=n" >> .config
-		echo "UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y" >> .config
-		echo "UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y" >> .config
-		echo "UCLIBC_HAS_GETTEXT_AWARENESS=y" >> .config
-
-		if use pregen ; then
-			echo "UCLIBC_PREGENERATED_LOCALE_DATA=y" >> .config
-			echo "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y" >> .config
-			if use userlocales ; then
-				cp "${DISTDIR}"/${MY_P}-user-locale.tar.gz \
-					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy ${MY_P}-user-locale.tar.gz"
-			else
-				cp "${DISTDIR}"/${MY_P}-$(tc-arch)-full-locale.tar.gz \
-					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy locale"
-			fi
-		else
-			echo "UCLIBC_PREGENERATED_LOCALE_DATA=n" >> .config
-		fi
-	else
-		echo "UCLIBC_HAS_LOCALE=n" >> .config
-	fi
-
-	use ipv6 && sed -i -e "s:# UCLIBC_HAS_IPV6 is not set:UCLIBC_HAS_IPV6=y:" .config
-
-	# uncomment if you miss wordexp (alsa-lib)
-	use wordexp && sed -i -e "s:# UCLIBC_HAS_WORDEXP is not set:UCLIBC_HAS_WORDEXP=y:" .config
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	sed -i -e "s:# UCLIBC_SECURITY.*:UCLIBC_SECURITY=y:" .config
-	echo "UCLIBC_HAS_SSP=y" >> .config
-	echo "PROPOLICE_BLOCK_ABRT=n" >> .config
-	if use debug ; then
-		echo "PROPOLICE_BLOCK_SEGV=y" >> .config
-		echo "PROPOLICE_BLOCK_KILL=n" >> .config
-	else
-		echo "PROPOLICE_BLOCK_SEGV=n" >> .config
-		echo "PROPOLICE_BLOCK_KILL=y" >> .config
-	fi
-
-	if use hardened ; then
-		if has $(tc-arch) mips ppc x86 ; then
-			echo "UCLIBC_BUILD_PIE=y" >> .config
-		else
-			echo "UCLIBC_BUILD_PIE=n" >> .config
-		fi
-		echo "SSP_QUICK_CANARY=n" >> .config
-		echo "UCLIBC_BUILD_SSP=y" >> .config
-		echo "UCLIBC_BUILD_RELRO=y" >> .config
-		echo "UCLIBC_BUILD_NOW=y" >> .config
-		echo "UCLIBC_BUILD_NOEXECSTACK=y" >> .config
-	else
-		echo "UCLIBC_BUILD_PIE=n" >> .config
-		echo "SSP_QUICK_CANARY=y" >> .config
-		echo "UCLIBC_BUILD_SSP=n" >> .config
-		echo "UCLIBC_BUILD_RELRO=n" >> .config
-		echo "UCLIBC_BUILD_NOW=n" >> .config
-		echo "UCLIBC_BUILD_NOEXECSTACK=n" >> .config
-	fi
-
-	# we are building against system installed kernel headers
-	sed -i \
-		-e "/^KERNEL_SOURCE/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		.config
-
-	yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig"
-
-	chmod +x extra/scripts/relative_path.sh
-
-	cp .config myconfig
-
-	emake clean > /dev/null || die "could not clean"
-}
-
-setup_locales() {
-	cd "${S}"/extra/locale
-	if use userlocales && [[ -f ${ROOT}/etc/locales.build ]] ; then
-		:;
-	elif use minimal ; then
-		find ./charmaps -name ASCII.pairs > codesets.txt
-		find ./charmaps -name ISO-8859-1.pairs >> codesets.txt
-		cat <<-EOF > locales.txt
-		@euro e
-		UTF-8 yes
-		8-bit yes
-		en_US ISO-8859-1
-		en_US.UTF-8 UTF-8
-		EOF
-	else
-		find ./charmaps -name '*.pairs' > codesets.txt
-		cp LOCALES locales.txt
-	fi
-	cd -
-}
-
-src_compile() {
-	cp myconfig .config
-
-	# last release doesnt support parallel build,
-	# but the current svn repo does ...
-	export MAKEOPTS="${MAKEOPTS} -j1"
-	type -p ${CTARGET}-ar && export MAKEOPTS="${MAKEOPTS} CROSS=${CTARGET}-"
-
-	emake headers || die "make headers failed"
-	just_headers && return 0
-
-	if use nls && ! use pregen ; then
-		cd extra/locale
-		make clean || die "make locale clean failed"
-		setup_locales
-		emake || die "could not make locales"
-		cd ../..
-	fi
-
-	emake || die "could not make"
-	[[ ${CTARGET} != ${CHOST} ]] && return 0
-
-	if [[ ${CHOST} == *-uclibc ]] ; then
-		emake utils || die "could not make utils"
-	fi
-}
-
-src_test() {
-	return 0
-
-	[[ ${CHOST} != ${CTARGET} ]] && return 0
-	[[ ${CBUILD} != ${CHOST} ]] && return 0
-
-	# running tests require this
-	use build || addwrite /dev/ptmx
-
-	# This is wrong, but uclibc's tests fail bad when screwing
-	# around with sandbox, so lets just punt it
-	unset LD_PRELOAD
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	cd test
-	make || die "test failed"
-}
-
-src_install() {
-	local sysroot=${D}
-	[[ ${CHOST} != ${CTARGET} ]] && sysroot="${sysroot}/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_dev"
-	emake PREFIX="${sysroot}" ${target} || die "install failed"
-
-	# remove files coming from kernel-headers
-	rm -rf "${D}"${sysroot}/usr/include/{asm,linux,asm-generic}
-
-	# clean up misc cruft
-	find "${D}"${sysroot}/usr/include -type d '(' -name CVS -o -name .svn ')' -print0 | xargs -0 rm -r
-	find "${D}"${sysroot}/usr/include -type f -name .cvsignore -print0 | xargs -0 rm -f
-
-	# 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 [[ ${CTARGET} != ${CHOST} ]] ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		return 0
-	fi
-
-	if [[ ${CHOST} == *-uclibc* ]] ; then
-		emake PREFIX="${D}" install_utils || die "install-utils failed"
-		dobin extra/scripts/getent
-	fi
-
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	[[ ${CTARGET} != ${CHOST} ]] && return 0
-	[[ ${CHOST} != *-uclibc* ]] && return 0
-
-	if [[ ! -e ${ROOT}/etc/TZ ]] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		[[ ! -d ${ROOT}/etc ]] && mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-
-	if [[ ${ROOT} == "/" ]] ; then
-		# update cache before reloading init
-		/sbin/ldconfig
-		# reload init ...
-		[[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null
-	fi
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild
deleted file mode 100644
index 068716cab79e..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild,v 1.11 2011/04/20 18:10:38 ulm Exp $
-
-#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
-#inherit subversion
-inherit eutils flag-o-matic toolchain-funcs
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-# Handle the case where we want uclibc on glibc ...
-if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc ]] ; then
-	export UCLIBC_AND_GLIBC="sitting in a tree"
-	export CTARGET=${CHOST%%-*}-pc-linux-uclibc
-fi
-
-MY_P=uClibc-${PV}
-SVN_VER=""
-PATCH_VER="1.3"
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-SRC_URI="mirror://kernel/linux/libs/uclibc/${MY_P}.tar.bz2
-	http://uclibc.org/downloads/${MY_P}.tar.bz2
-	nls? ( !userlocales? ( pregen? (
-		x86? ( http://www.uclibc.org/downloads/uClibc-locale-030818.tgz )
-	) ) )"
-[[ -z ${SVN_VER} ]] || \
-	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-svn-update-${SVN_VER}.patch.bz2"
-[[ -z ${PATCH_VER} ]] || \
-	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
-	&& SLOT="${CTARGET}" \
-	|| SLOT="0"
-KEYWORDS="-* arm ~m68k -mips ppc ~sh ~sparc x86"
-IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen savedconfig userlocales wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-RDEPEND=""
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	DEPEND="virtual/os-headers app-misc/pax-utils"
-else
-	DEPEND=""
-fi
-
-S=${WORKDIR}/${MY_P}
-
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \
-	   || [[ -n ${UCLIBC_AND_GLIBC} ]]
-	then
-		echo /usr
-	else
-		echo /usr/${CTARGET}/usr
-	fi
-}
-just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-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() {
-	just_headers && return 0
-	has_version ${CATEGORY}/uclibc || return 0
-	[[ -n ${UCLIBC_AND_GLIBC} ]] && return 0
-	[[ ${ROOT} != "/" ]] && return 0
-	[[ ${CATEGORY} == cross-* ]] && return 0
-
-	if ! built_with_use --missing false ${CATEGORY}/uclibc nls && use nls && ! use pregen ; then
-		eerror "You previously built uclibc with USE=-nls."
-		eerror "You cannot generate locale data with this"
-		eerror "system.  Please rerun emerge with USE=pregen."
-		die "host cannot support locales"
-	elif built_with_use --missing false ${CATEGORY}/uclibc nls && ! use nls ; then
-		eerror "You previously built uclibc with USE=nls."
-		eerror "Rebuilding uClibc with USE=-nls will prob"
-		eerror "destroy your system."
-		die "switching from nls is baaaad"
-	fi
-}
-
-PIE_STABLE="arm mips ppc x86"
-
-CPU_ALPHA=""
-CPU_AMD64=""
-CPU_ARM="GENERIC_ARM ARM{610,710,720T,920T,922T,926T,_{SA110,SA1100,XSCALE}}"
-CPU_IA64=""
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32,64}}"
-CPU_PPC=""
-CPU_SH="SH{2,3,4,5}"
-CPU_SPARC=""
-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
-}
-
-src_unpack() {
-	[[ -n ${ESVN_REPO_URI} ]] \
-		&& subversion_src_unpack \
-		|| unpack ${A}
-	cd "${S}"
-
-	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
-
-	########## PATCHES ##########
-
-	[[ -n ${SVN_VER} ]] && \
-		epatch "${WORKDIR}"/${MY_P}-cvs-update-${SVN_VER}.patch
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2
-		EPATCH_SUFFIX="patch"
-		epatch "${WORKDIR}"/patch
-		# math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f)
-		cp "${WORKDIR}"/patch/math/libm/* "${S}"/libm/ || die
-		epatch "${WORKDIR}"/patch/math
-	fi
-
-	########## 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";;
-		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 TARGET_i386:default TARGET_${target}:" \
-		extra/Configs/Config.in
-	sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
-
-	########## CONFIG SETUP ##########
-
-	make defconfig >/dev/null || die "could not config"
-
-	for def in DO{DEBUG{,_PT},ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} ; do
-		sed -i -e "s:${def}=y:# ${def} is not set:" .config
-	done
-	if use debug ; then
-		#echo "SUPPORT_LD_DEBUG_EARLY=y" >> .config
-		echo "SUPPORT_LD_DEBUG=y" >> .config
-		echo "DODEBUG=y" >> .config
-		#echo "DODEBUG_PT=y" >> .config
-	fi
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
-
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		sed -i -e '/^HAS_FPU=y$/d' .config
-		echo 'HAS_FPU=n' >> .config
-	fi
-
-	local moredefs="DL_FINI_CRT_COMPAT"
-	# We need todo this for a few months. .28 is a major upgrade.
-	# Don't do it from cross-compiling case though
-	if ! use uclibc-compat ; then
-		if [[ -z ${UCLIBC_AND_GLIBC} ]] && [[ -z ${UCLIBC_SCANNED_COMPAT} ]] && \
-		   ! just_headers && [[ ${CHOST} == ${CTARGET} ]] ; then
-			local fnames=""
-			einfo "Doing a scanelf in paths for bins containing the __uClibc_start_main symbol"
-			fnames=$(scanelf -pyqs__uClibc_start_main -F%F#s)
-			if [[ -z ${fnames} ]] ; then
-				einfo "This system is clean."
-				einfo "To prevent the scanning of files again in the future you can export UCLIBC_SCANNED_COMPAT=1"
-				moredefs=""
-			else
-				ewarn "You need to remerge the packages that contain the following files before you can remerge ${P} without USE=uclibc-compat enabled."
-				ewarn "qfile ${fnames}"
-				echo
-				ewarn "Leaving on ${moredefs}"
-			fi
-		else
-			moredefs=""
-		fi
-	fi
-	for def in ${moredefs} MALLOC_GLIBC_COMPAT DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do
-		sed -i -e "s:# ${def} is not set:${def}=y:" .config
-	done
-	echo "UCLIBC_HAS_FULL_RPC=y" >> .config
-	echo "PTHREADS_DEBUG_SUPPORT=y" >> .config
-	echo "UCLIBC_HAS_TZ_FILE_READ_MANY=n" >> .config
-
-	if use iconv ; then
-		sed -i -e "s:# UCLIBC_HAS_LOCALE is not set:UCLIBC_HAS_LOCALE=y:" .config
-		echo "UCLIBC_HAS_XLOCALE=n" >> .config
-		echo "UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y" >> .config
-		echo "UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y" >> .config
-
-		if use nls ; then
-			echo "UCLIBC_HAS_GETTEXT_AWARENESS=y" >> .config
-		else
-			echo "UCLIBC_HAS_GETTEXT_AWARENESS=n" >> .config
-		fi
-
-		if use pregen ; then
-			echo "UCLIBC_PREGENERATED_LOCALE_DATA=y" >> .config
-			echo "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y" >> .config
-			if use userlocales ; then
-				cp "${DISTDIR}"/${MY_P}-user-locale.tar.gz \
-					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy ${MY_P}-user-locale.tar.gz"
-			else
-				cp "${DISTDIR}"/${MY_P}-$(tc-arch)-full-locale.tar.gz \
-					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy locale"
-			fi
-		else
-			echo "UCLIBC_PREGENERATED_LOCALE_DATA=n" >> .config
-		fi
-	else
-		echo "UCLIBC_HAS_LOCALE=n" >> .config
-	fi
-
-	use ipv6 && sed -i -e "s:# UCLIBC_HAS_IPV6 is not set:UCLIBC_HAS_IPV6=y:" .config
-
-	# uncomment if you miss wordexp (alsa-lib)
-	use wordexp && sed -i -e "s:# UCLIBC_HAS_WORDEXP is not set:UCLIBC_HAS_WORDEXP=y:" .config
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	sed -i -e "s:# UCLIBC_SECURITY.*:UCLIBC_SECURITY=y:" .config
-	echo "UCLIBC_HAS_SSP=y" >> .config
-	echo "SSP_USE_ERANDOM=n" >> .config
-	echo "PROPOLICE_BLOCK_ABRT=n" >> .config
-	if use debug ; then
-		echo "PROPOLICE_BLOCK_SEGV=y" >> .config
-		echo "PROPOLICE_BLOCK_KILL=n" >> .config
-	else
-		echo "PROPOLICE_BLOCK_SEGV=n" >> .config
-		echo "PROPOLICE_BLOCK_KILL=y" >> .config
-	fi
-
-	# 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
-	# relro could be also moved out of hardened
-	if has $(tc-arch) x86 ; then
-		echo "UCLIBC_BUILD_NOEXECSTACK=y" >> .config
-	else
-		echo "UCLIBC_BUILD_NOEXECSTACK=n" >> .config
-	fi
-	echo "UCLIBC_BUILD_RELRO=y" >> .config
-	if use hardened ; then
-		if has $(tc-arch) ${PIE_STABLE} ; then
-			echo "UCLIBC_BUILD_PIE=y" >> .config
-		else
-			echo "UCLIBC_BUILD_PIE=n" >> .config
-		fi
-		echo "SSP_QUICK_CANARY=n" >> .config
-		echo "UCLIBC_BUILD_SSP=y" >> .config
-		echo "UCLIBC_BUILD_NOW=y" >> .config
-	else
-		echo "UCLIBC_BUILD_PIE=n" >> .config
-		echo "SSP_QUICK_CANARY=y" >> .config
-		echo "UCLIBC_BUILD_SSP=n" >> .config
-		echo "UCLIBC_BUILD_NOW=n" >> .config
-	fi
-
-	# Allow users some custom control over the config
-	if use savedconfig ; then
-		for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
-			configfile=${ROOT}/etc/${PN}/${CTARGET}/${conf}.config
-			einfo "Checking existence of ${configfile} ..."
-			[[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config
-			if [[ -r ${configfile} ]] ; then
-				cp "${configfile}" "${S}"/.config
-				einfo "Found your ${configfile} and using it."
-				einfo "Note that this feature is *totally unsupported*."
-				break
-			fi
-		done
-	fi
-
-	# setup build and run paths
-	local cross=${CTARGET}-
-	type -p ${cross}ar > /dev/null || cross=""
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${cross}\":" \
-		-e "/^KERNEL_SOURCE/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		.config || die
-
-	yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig"
-
-	cp .config myconfig
-
-	emake -s clean > /dev/null || die "could not clean"
-}
-
-setup_locales() {
-	cd "${S}"/extra/locale
-	if use userlocales && [[ -f ${ROOT}/etc/locales.build ]] ; then
-		:;
-	elif use minimal ; then
-		find ./charmaps -name ASCII.pairs > codesets.txt
-		find ./charmaps -name ISO-8859-1.pairs >> codesets.txt
-		cat <<-EOF > locales.txt
-		@euro e
-		UTF-8 yes
-		8-bit yes
-		en_US ISO-8859-1
-		en_US.UTF-8 UTF-8
-		EOF
-	else
-		find ./charmaps -name '*.pairs' > codesets.txt
-		cp LOCALES locales.txt
-	fi
-	cd -
-}
-
-src_compile() {
-	cp myconfig .config
-
-	emake headers || die "make headers failed"
-	just_headers && return 0
-
-	if use iconv && ! use pregen ; then
-		cd extra/locale
-		make clean || die "make locale clean failed"
-		setup_locales
-		emake || die "make locales failed"
-		cd ../..
-	fi
-
-	emake || die "make failed"
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		emake -C utils hostutils || die "make hostutils failed"
-	elif [[ ${CHOST} == *-uclibc ]] ; then
-		emake utils || die "make utils failed"
-	fi
-}
-
-src_test() {
-	[[ ${CHOST} != ${CTARGET} ]] && return 0
-	[[ ${CBUILD} != ${CHOST} ]] && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	make UCLIBC_ONLY=1 check || die "test failed"
-}
-
-src_install() {
-	local sysroot=${D}
-	[[ ${CHOST} != ${CTARGET} ]] && sysroot="${sysroot}/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_dev"
-	emake DESTDIR="${sysroot}" ${target} || die "install failed"
-
-	# 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 [[ ${CTARGET} != ${CHOST} ]] ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	if [[ ${CHOST} == *-uclibc* ]] ; then
-		emake DESTDIR="${D}" install_utils || die "install-utils failed"
-		dobin extra/scripts/getent
-	fi
-
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	[[ ${CTARGET} != ${CHOST} ]] && return 0
-	[[ ${CHOST} != *-uclibc* ]] && return 0
-
-	if [[ ! -e ${ROOT}/etc/TZ ]] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		[[ ! -d ${ROOT}/etc ]] && mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-
-	if [[ ${ROOT} == "/" ]] ; then
-		# update cache before reloading init
-		/sbin/ldconfig
-		# reload init ...
-		[[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null
-	fi
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild
deleted file mode 100644
index 1b6657bdb8ce..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild,v 1.11 2011/04/20 18:10:38 ulm Exp $
-
-#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
-#inherit subversion
-inherit eutils flag-o-matic toolchain-funcs
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-# Handle the case where we want uclibc on glibc ...
-if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc ]] ; then
-	export UCLIBC_AND_GLIBC="sitting in a tree"
-	export CTARGET=${CHOST%%-*}-pc-linux-uclibc
-fi
-
-MY_P=uClibc-${PV}
-SVN_VER=""
-PATCH_VER="1.8"
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-SRC_URI="mirror://kernel/linux/libs/uclibc/${MY_P}.tar.bz2
-	http://uclibc.org/downloads/${MY_P}.tar.bz2
-	nls? ( !userlocales? ( pregen? (
-		x86? ( http://www.uclibc.org/downloads/uClibc-locale-030818.tgz )
-	) ) )"
-[[ -z ${SVN_VER} ]] || \
-	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-svn-update-${SVN_VER}.patch.bz2"
-[[ -z ${PATCH_VER} ]] || \
-	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
-	&& SLOT="${CTARGET}" \
-	|| SLOT="0"
-KEYWORDS="-* arm m68k -mips ppc sh ~sparc x86"
-IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen savedconfig userlocales wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-RDEPEND=""
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	DEPEND="virtual/os-headers app-misc/pax-utils"
-else
-	DEPEND=""
-fi
-
-S=${WORKDIR}/${MY_P}
-
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \
-	   || [[ -n ${UCLIBC_AND_GLIBC} ]]
-	then
-		echo /usr
-	else
-		echo /usr/${CTARGET}/usr
-	fi
-}
-just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-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() {
-	just_headers && return 0
-	has_version ${CATEGORY}/uclibc || return 0
-	[[ -n ${UCLIBC_AND_GLIBC} ]] && return 0
-	[[ ${ROOT} != "/" ]] && return 0
-	[[ ${CATEGORY} == cross-* ]] && return 0
-
-	if ! built_with_use --missing false ${CATEGORY}/uclibc nls && use nls && ! use pregen ; then
-		eerror "You previously built uclibc with USE=-nls."
-		eerror "You cannot generate locale data with this"
-		eerror "system.  Please rerun emerge with USE=pregen."
-		die "host cannot support locales"
-	elif built_with_use --missing false ${CATEGORY}/uclibc nls && ! use nls ; then
-		eerror "You previously built uclibc with USE=nls."
-		eerror "Rebuilding uClibc with USE=-nls will prob"
-		eerror "destroy your system."
-		die "switching from nls is baaaad"
-	fi
-}
-
-PIE_STABLE="arm mips ppc x86"
-
-CPU_ALPHA=""
-CPU_AMD64=""
-CPU_ARM="GENERIC_ARM ARM{610,710,720T,920T,922T,926T,_{SA110,SA1100,XSCALE}}"
-CPU_IA64=""
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32,64}}"
-CPU_PPC=""
-CPU_SH="SH{2,3,4,5}"
-CPU_SPARC=""
-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
-}
-
-src_unpack() {
-	[[ -n ${ESVN_REPO_URI} ]] \
-		&& subversion_src_unpack \
-		|| unpack ${A}
-	cd "${S}"
-
-	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
-
-	########## PATCHES ##########
-
-	[[ -n ${SVN_VER} ]] && \
-		epatch "${WORKDIR}"/${MY_P}-cvs-update-${SVN_VER}.patch
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2
-		EPATCH_SUFFIX="patch"
-		epatch "${WORKDIR}"/patch
-		# math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f)
-		cp "${WORKDIR}"/patch/math/libm/* "${S}"/libm/ || die
-		epatch "${WORKDIR}"/patch/math
-	fi
-
-	########## 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";;
-		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 TARGET_i386:default TARGET_${target}:" \
-		extra/Configs/Config.in
-	sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
-
-	########## CONFIG SETUP ##########
-
-	make defconfig >/dev/null || die "could not config"
-
-	for def in DO{DEBUG{,_PT},ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} ; do
-		sed -i -e "s:${def}=y:# ${def} is not set:" .config
-	done
-	if use debug ; then
-		#echo "SUPPORT_LD_DEBUG_EARLY=y" >> .config
-		echo "SUPPORT_LD_DEBUG=y" >> .config
-		echo "DODEBUG=y" >> .config
-		#echo "DODEBUG_PT=y" >> .config
-	fi
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
-
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		sed -i -e '/^HAS_FPU=y$/d' .config
-		echo 'HAS_FPU=n' >> .config
-	fi
-
-	local moredefs="DL_FINI_CRT_COMPAT"
-	# We need todo this for a few months. .28 is a major upgrade.
-	# Don't do it from cross-compiling case though
-	if ! use uclibc-compat ; then
-		if [[ -z ${UCLIBC_AND_GLIBC} ]] && [[ -z ${UCLIBC_SCANNED_COMPAT} ]] && \
-		   ! just_headers && [[ ${CHOST} == ${CTARGET} ]] ; then
-			local fnames=""
-			einfo "Doing a scanelf in paths for bins containing the __uClibc_start_main symbol"
-			fnames=$(scanelf -pyqs__uClibc_start_main -F%F#s)
-			if [[ -z ${fnames} ]] ; then
-				einfo "This system is clean."
-				einfo "To prevent the scanning of files again in the future you can export UCLIBC_SCANNED_COMPAT=1"
-				moredefs=""
-			else
-				ewarn "You need to remerge the packages that contain the following files before you can remerge ${P} without USE=uclibc-compat enabled."
-				ewarn "qfile ${fnames}"
-				echo
-				ewarn "Leaving on ${moredefs}"
-			fi
-		else
-			moredefs=""
-		fi
-	fi
-	for def in ${moredefs} MALLOC_GLIBC_COMPAT DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do
-		sed -i -e "s:# ${def} is not set:${def}=y:" .config
-	done
-	echo "UCLIBC_HAS_FULL_RPC=y" >> .config
-	echo "PTHREADS_DEBUG_SUPPORT=y" >> .config
-	echo "UCLIBC_HAS_TZ_FILE_READ_MANY=n" >> .config
-
-	if use iconv ; then
-		sed -i -e "s:# UCLIBC_HAS_LOCALE is not set:UCLIBC_HAS_LOCALE=y:" .config
-		echo "UCLIBC_HAS_XLOCALE=n" >> .config
-		echo "UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y" >> .config
-		echo "UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y" >> .config
-
-		if use nls ; then
-			echo "UCLIBC_HAS_GETTEXT_AWARENESS=y" >> .config
-		else
-			echo "UCLIBC_HAS_GETTEXT_AWARENESS=n" >> .config
-		fi
-
-		if use pregen ; then
-			echo "UCLIBC_PREGENERATED_LOCALE_DATA=y" >> .config
-			echo "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y" >> .config
-			if use userlocales ; then
-				cp "${DISTDIR}"/${MY_P}-user-locale.tar.gz \
-					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy ${MY_P}-user-locale.tar.gz"
-			else
-				cp "${DISTDIR}"/${MY_P}-$(tc-arch)-full-locale.tar.gz \
-					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy locale"
-			fi
-		else
-			echo "UCLIBC_PREGENERATED_LOCALE_DATA=n" >> .config
-		fi
-	else
-		echo "UCLIBC_HAS_LOCALE=n" >> .config
-	fi
-
-	use ipv6 && sed -i -e "s:# UCLIBC_HAS_IPV6 is not set:UCLIBC_HAS_IPV6=y:" .config
-
-	# uncomment if you miss wordexp (alsa-lib)
-	use wordexp && sed -i -e "s:# UCLIBC_HAS_WORDEXP is not set:UCLIBC_HAS_WORDEXP=y:" .config
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	sed -i -e "s:# UCLIBC_SECURITY.*:UCLIBC_SECURITY=y:" .config
-	echo "UCLIBC_HAS_SSP=y" >> .config
-	echo "SSP_USE_ERANDOM=n" >> .config
-	echo "PROPOLICE_BLOCK_ABRT=n" >> .config
-	if use debug ; then
-		echo "PROPOLICE_BLOCK_SEGV=y" >> .config
-		echo "PROPOLICE_BLOCK_KILL=n" >> .config
-	else
-		echo "PROPOLICE_BLOCK_SEGV=n" >> .config
-		echo "PROPOLICE_BLOCK_KILL=y" >> .config
-	fi
-
-	# 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
-	# relro could be also moved out of hardened
-	if has $(tc-arch) x86 ; then
-		echo "UCLIBC_BUILD_NOEXECSTACK=y" >> .config
-	else
-		echo "UCLIBC_BUILD_NOEXECSTACK=n" >> .config
-	fi
-	echo "UCLIBC_BUILD_RELRO=y" >> .config
-	if use hardened ; then
-		if has $(tc-arch) ${PIE_STABLE} ; then
-			echo "UCLIBC_BUILD_PIE=y" >> .config
-		else
-			echo "UCLIBC_BUILD_PIE=n" >> .config
-		fi
-		echo "SSP_QUICK_CANARY=n" >> .config
-		echo "UCLIBC_BUILD_SSP=y" >> .config
-		echo "UCLIBC_BUILD_NOW=y" >> .config
-	else
-		echo "UCLIBC_BUILD_PIE=n" >> .config
-		echo "SSP_QUICK_CANARY=y" >> .config
-		echo "UCLIBC_BUILD_SSP=n" >> .config
-		echo "UCLIBC_BUILD_NOW=n" >> .config
-	fi
-
-	# Allow users some custom control over the config
-	if use savedconfig ; then
-		for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
-			configfile=${ROOT}/etc/${PN}/${CTARGET}/${conf}.config
-			einfo "Checking existence of ${configfile} ..."
-			[[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config
-			if [[ -r ${configfile} ]] ; then
-				cp "${configfile}" "${S}"/.config
-				einfo "Found your ${configfile} and using it."
-				einfo "Note that this feature is *totally unsupported*."
-				break
-			fi
-		done
-	fi
-
-	# setup build and run paths
-	local cross=${CTARGET}-
-	type -p ${cross}ar > /dev/null || cross=""
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${cross}\":" \
-		-e "/^KERNEL_SOURCE/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		.config || die
-
-	yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig"
-
-	cp .config myconfig
-
-	emake -s clean > /dev/null || die "could not clean"
-}
-
-setup_locales() {
-	cd "${S}"/extra/locale
-	if use userlocales && [[ -f ${ROOT}/etc/locales.build ]] ; then
-		:;
-	elif use minimal ; then
-		find ./charmaps -name ASCII.pairs > codesets.txt
-		find ./charmaps -name ISO-8859-1.pairs >> codesets.txt
-		cat <<-EOF > locales.txt
-		@euro e
-		UTF-8 yes
-		8-bit yes
-		en_US ISO-8859-1
-		en_US.UTF-8 UTF-8
-		EOF
-	else
-		find ./charmaps -name '*.pairs' > codesets.txt
-		cp LOCALES locales.txt
-	fi
-	cd -
-}
-
-src_compile() {
-	cp myconfig .config
-
-	emake headers || die "make headers failed"
-	just_headers && return 0
-
-	if use iconv && ! use pregen ; then
-		cd extra/locale
-		make clean || die "make locale clean failed"
-		setup_locales
-		emake || die "make locales failed"
-		cd ../..
-	fi
-
-	emake || die "make failed"
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		emake -C utils hostutils || die "make hostutils failed"
-	elif [[ ${CHOST} == *-uclibc ]] ; then
-		emake utils || die "make utils failed"
-	fi
-}
-
-src_test() {
-	[[ ${CHOST} != ${CTARGET} ]] && return 0
-	[[ ${CBUILD} != ${CHOST} ]] && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	make UCLIBC_ONLY=1 check || die "test failed"
-}
-
-src_install() {
-	local sysroot=${D}
-	[[ ${CHOST} != ${CTARGET} ]] && sysroot="${sysroot}/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_dev"
-	emake DESTDIR="${sysroot}" ${target} || die "install failed"
-
-	# 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 [[ ${CTARGET} != ${CHOST} ]] ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	if [[ ${CHOST} == *-uclibc* ]] ; then
-		emake DESTDIR="${D}" install_utils || die "install-utils failed"
-		dobin extra/scripts/getent
-	fi
-
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	[[ ${CTARGET} != ${CHOST} ]] && return 0
-	[[ ${CHOST} != *-uclibc* ]] && return 0
-
-	if [[ ! -e ${ROOT}/etc/TZ ]] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		[[ ! -d ${ROOT}/etc ]] && mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-
-	if [[ ${ROOT} == "/" ]] ; then
-		# update cache before reloading init
-		/sbin/ldconfig
-		# reload init ...
-		[[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null
-	fi
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.28.3-r8.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3-r8.ebuild
index 33d8b609ea75..bd953d76b8f4 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.3-r8.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.3-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r8.ebuild,v 1.7 2011/04/20 18:10:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r8.ebuild,v 1.8 2012/06/09 06:47:12 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -212,11 +212,6 @@ src_unpack() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
 
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		sed -i -e '/^HAS_FPU=y$/d' .config
-		echo 'HAS_FPU=n' >> .config
-	fi
-
 	local moredefs="DL_FINI_CRT_COMPAT"
 	# We need todo this for a few months. .28 is a major upgrade.
 	# Don't do it from cross-compiling case though
diff --git a/sys-libs/uclibc/uclibc-0.9.28.3.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3.ebuild
deleted file mode 100644
index 6230a55456ce..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.28.3.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3.ebuild,v 1.16 2011/04/20 18:10:38 ulm Exp $
-
-#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
-#inherit subversion
-inherit eutils flag-o-matic toolchain-funcs
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-# Handle the case where we want uclibc on glibc ...
-if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc ]] ; then
-	export UCLIBC_AND_GLIBC="sitting in a tree"
-	export CTARGET=${CHOST%%-*}-pc-linux-uclibc
-fi
-
-MY_P=uClibc-${PV}
-SVN_VER=""
-PATCH_VER="1.0"
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-SRC_URI="mirror://kernel/linux/libs/uclibc/${MY_P}.tar.bz2
-	http://uclibc.org/downloads/${MY_P}.tar.bz2
-	nls? ( !userlocales? ( pregen? (
-		x86? ( http://www.uclibc.org/downloads/uClibc-locale-030818.tgz )
-	) ) )"
-[[ -z ${SVN_VER} ]] || \
-	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-svn-update-${SVN_VER}.patch.bz2"
-[[ -z ${PATCH_VER} ]] || \
-	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
-	&& SLOT="${CTARGET}" \
-	|| SLOT="0"
-KEYWORDS="-* arm m68k -mips ppc sh sparc x86"
-IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen savedconfig userlocales wordexp crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-RDEPEND=""
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	DEPEND="virtual/os-headers app-misc/pax-utils"
-else
-	DEPEND=""
-fi
-
-S=${WORKDIR}/${MY_P}
-
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \
-	   || [[ -n ${UCLIBC_AND_GLIBC} ]]
-	then
-		echo /usr
-	else
-		echo /usr/${CTARGET}/usr
-	fi
-}
-just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-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() {
-	just_headers && return 0
-	has_version ${CATEGORY}/uclibc || return 0
-	[[ -n ${UCLIBC_AND_GLIBC} ]] && return 0
-	[[ ${ROOT} != "/" ]] && return 0
-	[[ ${CATEGORY} == cross-* ]] && return 0
-
-	if ! built_with_use --missing false ${CATEGORY}/uclibc nls && use nls && ! use pregen ; then
-		eerror "You previously built uclibc with USE=-nls."
-		eerror "You cannot generate locale data with this"
-		eerror "system.  Please rerun emerge with USE=pregen."
-		die "host cannot support locales"
-	elif built_with_use --missing false ${CATEGORY}/uclibc nls && ! use nls ; then
-		eerror "You previously built uclibc with USE=nls."
-		eerror "Rebuilding uClibc with USE=-nls will prob"
-		eerror "destroy your system."
-		die "switching from nls is baaaad"
-	fi
-}
-
-PIE_STABLE="arm mips ppc x86"
-
-CPU_ALPHA=""
-CPU_AMD64=""
-CPU_ARM="GENERIC_ARM ARM{610,710,720T,920T,922T,926T,_{SA110,SA1100,XSCALE}}"
-CPU_IA64=""
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32,64}}"
-CPU_PPC=""
-CPU_SH="SH{2,3,4,5}"
-CPU_SPARC=""
-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
-}
-
-src_unpack() {
-	[[ -n ${ESVN_REPO_URI} ]] \
-		&& subversion_src_unpack \
-		|| unpack ${A}
-	cd "${S}"
-
-	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
-
-	########## PATCHES ##########
-
-	[[ -n ${SVN_VER} ]] && \
-		epatch "${WORKDIR}"/${MY_P}-cvs-update-${SVN_VER}.patch
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2
-		EPATCH_SUFFIX="patch"
-		epatch "${WORKDIR}"/patch
-		# math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f)
-		cp "${WORKDIR}"/patch/math/libm/* "${S}"/libm/ || die
-		epatch "${WORKDIR}"/patch/math
-	fi
-
-	########## 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";;
-		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 TARGET_i386:default TARGET_${target}:" \
-		extra/Configs/Config.in
-	sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
-
-	########## CONFIG SETUP ##########
-
-	make defconfig >/dev/null || die "could not config"
-
-	for def in DO{DEBUG{,_PT},ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} ; do
-		sed -i -e "s:${def}=y:# ${def} is not set:" .config
-	done
-	if use debug ; then
-		#echo "SUPPORT_LD_DEBUG_EARLY=y" >> .config
-		echo "SUPPORT_LD_DEBUG=y" >> .config
-		echo "DODEBUG=y" >> .config
-		#echo "DODEBUG_PT=y" >> .config
-	fi
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
-
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		sed -i -e '/^HAS_FPU=y$/d' .config
-		echo 'HAS_FPU=n' >> .config
-	fi
-
-	local moredefs="DL_FINI_CRT_COMPAT"
-	# We need todo this for a few months. .28 is a major upgrade.
-	# Don't do it from cross-compiling case though
-	if ! use uclibc-compat ; then
-		if [[ -z ${UCLIBC_AND_GLIBC} ]] && [[ -z ${UCLIBC_SCANNED_COMPAT} ]] && \
-		   ! just_headers && [[ ${CHOST} == ${CTARGET} ]] ; then
-			local fnames=""
-			einfo "Doing a scanelf in paths for bins containing the __uClibc_start_main symbol"
-			fnames=$(scanelf -pyqs__uClibc_start_main -F%F#s)
-			if [[ -z ${fnames} ]] ; then
-				einfo "This system is clean."
-				einfo "To prevent the scanning of files again in the future you can export UCLIBC_SCANNED_COMPAT=1"
-				moredefs=""
-			else
-				ewarn "You need to remerge the packages that contain the following files before you can remerge ${P} without USE=uclibc-compat enabled."
-				ewarn "qfile ${fnames}"
-				echo
-				ewarn "Leaving on ${moredefs}"
-			fi
-		else
-			moredefs=""
-		fi
-	fi
-	for def in ${moredefs} MALLOC_GLIBC_COMPAT DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do
-		sed -i -e "s:# ${def} is not set:${def}=y:" .config
-	done
-	echo "UCLIBC_HAS_FULL_RPC=y" >> .config
-	echo "PTHREADS_DEBUG_SUPPORT=y" >> .config
-	echo "UCLIBC_HAS_TZ_FILE_READ_MANY=n" >> .config
-
-	if use iconv ; then
-		sed -i -e "s:# UCLIBC_HAS_LOCALE is not set:UCLIBC_HAS_LOCALE=y:" .config
-		echo "UCLIBC_HAS_XLOCALE=n" >> .config
-		echo "UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y" >> .config
-		echo "UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y" >> .config
-
-		if use nls ; then
-			echo "UCLIBC_HAS_GETTEXT_AWARENESS=y" >> .config
-		else
-			echo "UCLIBC_HAS_GETTEXT_AWARENESS=n" >> .config
-		fi
-
-		if use pregen ; then
-			echo "UCLIBC_PREGENERATED_LOCALE_DATA=y" >> .config
-			echo "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y" >> .config
-			if use userlocales ; then
-				cp "${DISTDIR}"/${MY_P}-user-locale.tar.gz \
-					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy ${MY_P}-user-locale.tar.gz"
-			else
-				cp "${DISTDIR}"/${MY_P}-$(tc-arch)-full-locale.tar.gz \
-					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy locale"
-			fi
-		else
-			echo "UCLIBC_PREGENERATED_LOCALE_DATA=n" >> .config
-		fi
-	else
-		echo "UCLIBC_HAS_LOCALE=n" >> .config
-	fi
-
-	use ipv6 && sed -i -e "s:# UCLIBC_HAS_IPV6 is not set:UCLIBC_HAS_IPV6=y:" .config
-
-	# uncomment if you miss wordexp (alsa-lib)
-	use wordexp && sed -i -e "s:# UCLIBC_HAS_WORDEXP is not set:UCLIBC_HAS_WORDEXP=y:" .config
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	sed -i -e "s:# UCLIBC_SECURITY.*:UCLIBC_SECURITY=y:" .config
-	echo "UCLIBC_HAS_SSP=y" >> .config
-	echo "SSP_USE_ERANDOM=n" >> .config
-	echo "PROPOLICE_BLOCK_ABRT=n" >> .config
-	if use debug ; then
-		echo "PROPOLICE_BLOCK_SEGV=y" >> .config
-		echo "PROPOLICE_BLOCK_KILL=n" >> .config
-	else
-		echo "PROPOLICE_BLOCK_SEGV=n" >> .config
-		echo "PROPOLICE_BLOCK_KILL=y" >> .config
-	fi
-
-	# 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
-	# relro could be also moved out of hardened
-	if has $(tc-arch) x86 ; then
-		echo "UCLIBC_BUILD_NOEXECSTACK=y" >> .config
-	else
-		echo "UCLIBC_BUILD_NOEXECSTACK=n" >> .config
-	fi
-	echo "UCLIBC_BUILD_RELRO=y" >> .config
-	if use hardened ; then
-		if has $(tc-arch) ${PIE_STABLE} ; then
-			echo "UCLIBC_BUILD_PIE=y" >> .config
-		else
-			echo "UCLIBC_BUILD_PIE=n" >> .config
-		fi
-		echo "SSP_QUICK_CANARY=n" >> .config
-		echo "UCLIBC_BUILD_SSP=y" >> .config
-		echo "UCLIBC_BUILD_NOW=y" >> .config
-	else
-		echo "UCLIBC_BUILD_PIE=n" >> .config
-		echo "SSP_QUICK_CANARY=y" >> .config
-		echo "UCLIBC_BUILD_SSP=n" >> .config
-		echo "UCLIBC_BUILD_NOW=n" >> .config
-	fi
-
-	# Allow users some custom control over the config
-	if use savedconfig ; then
-		for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
-			configfile=${ROOT}/etc/${PN}/${CTARGET}/${conf}.config
-			einfo "Checking existence of ${configfile} ..."
-			[[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config
-			if [[ -r ${configfile} ]] ; then
-				cp "${configfile}" "${S}"/.config
-				einfo "Found your ${configfile} and using it."
-				einfo "Note that this feature is *totally unsupported*."
-				break
-			fi
-		done
-	fi
-
-	# setup build and run paths
-	local cross=${CTARGET}-
-	type -p ${cross}ar > /dev/null || cross=""
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${cross}\":" \
-		-e "/^KERNEL_SOURCE/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		.config || die
-
-	yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig"
-
-	cp .config myconfig
-
-	emake -s clean > /dev/null || die "could not clean"
-}
-
-setup_locales() {
-	cd "${S}"/extra/locale
-	if use userlocales && [[ -f ${ROOT}/etc/locales.build ]] ; then
-		:;
-	elif use minimal ; then
-		find ./charmaps -name ASCII.pairs > codesets.txt
-		find ./charmaps -name ISO-8859-1.pairs >> codesets.txt
-		cat <<-EOF > locales.txt
-		@euro e
-		UTF-8 yes
-		8-bit yes
-		en_US ISO-8859-1
-		en_US.UTF-8 UTF-8
-		EOF
-	else
-		find ./charmaps -name '*.pairs' > codesets.txt
-		cp LOCALES locales.txt
-	fi
-	cd -
-}
-
-src_compile() {
-	cp myconfig .config
-
-	emake headers || die "make headers failed"
-	just_headers && return 0
-
-	if use iconv && ! use pregen ; then
-		cd extra/locale
-		make clean || die "make locale clean failed"
-		setup_locales
-		emake || die "make locales failed"
-		cd ../..
-	fi
-
-	emake || die "make failed"
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		emake -C utils hostutils || die "make hostutils failed"
-	elif [[ ${CHOST} == *-uclibc ]] ; then
-		emake utils || die "make utils failed"
-	fi
-}
-
-src_test() {
-	[[ ${CHOST} != ${CTARGET} ]] && return 0
-	[[ ${CBUILD} != ${CHOST} ]] && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	make UCLIBC_ONLY=1 check || die "test failed"
-}
-
-src_install() {
-	local sysroot=${D}
-	[[ ${CHOST} != ${CTARGET} ]] && sysroot="${sysroot}/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_dev"
-	emake DESTDIR="${sysroot}" ${target} || die "install failed"
-
-	# 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 [[ ${CTARGET} != ${CHOST} ]] ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	if [[ ${CHOST} == *-uclibc* ]] ; then
-		emake DESTDIR="${D}" install_utils || die "install-utils failed"
-		dobin extra/scripts/getent
-	fi
-
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	[[ ${CTARGET} != ${CHOST} ]] && return 0
-	[[ ${CHOST} != *-uclibc* ]] && return 0
-
-	if [[ ! -e ${ROOT}/etc/TZ ]] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		[[ ! -d ${ROOT}/etc ]] && mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-
-	if [[ ${ROOT} == "/" ]] ; then
-		# update cache before reloading init
-		/sbin/ldconfig
-		# reload init ...
-		[[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null
-	fi
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild
index ad1e4d3cd45e..768704b5e716 100644
--- a/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.9 2011/04/20 18:10:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.10 2012/06/09 06:47:12 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -208,10 +208,6 @@ src_unpack() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	set_opt "ARCH_WANTS_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN" y
 
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		set_opt UCLIBC_HAS_FPU n
-	fi
-
 	if [[ ${CTARGET/eabi} != ${CTARGET} ]] ; then
 		set_opt CONFIG_ARM_OABI n
 		set_opt CONFIG_ARM_EABI y
diff --git a/sys-libs/uclibc/uclibc-0.9.30.1.ebuild b/sys-libs/uclibc/uclibc-0.9.30.1.ebuild
index 038a5823832d..d234c309b158 100644
--- a/sys-libs/uclibc/uclibc-0.9.30.1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.30.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1.ebuild,v 1.9 2011/04/20 18:10:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1.ebuild,v 1.10 2012/06/09 06:47:12 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -200,10 +200,6 @@ src_unpack() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	set_opt "ARCH_WANTS_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN" y
 
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		set_opt UCLIBC_HAS_FPU n
-	fi
-
 	if [[ ${CTARGET/eabi} != ${CTARGET} ]] ; then
 		set_opt CONFIG_ARM_OABI n
 		set_opt CONFIG_ARM_EABI y
diff --git a/sys-libs/uclibc/uclibc-0.9.30.ebuild b/sys-libs/uclibc/uclibc-0.9.30.ebuild
index c098662e64df..3aadb509d475 100644
--- a/sys-libs/uclibc/uclibc-0.9.30.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild,v 1.9 2011/04/20 18:10:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild,v 1.10 2012/06/09 06:47:12 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -222,10 +222,6 @@ src_unpack() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	set_opt "ARCH_WANTS_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN" y
 
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		set_opt UCLIBC_HAS_FPU n
-	fi
-
 	if [[ ${CTARGET/eabi} != ${CTARGET} ]] ; then
 		set_opt CONFIG_ARM_OABI n
 		set_opt CONFIG_ARM_EABI y
diff --git a/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild
index aae39ff30366..7025da7a0666 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild,v 1.2 2012/06/01 04:22:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.1-r1.ebuild,v 1.3 2012/06/09 06:47:12 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
 if [[ ${PV} == "9999" ]] ; then
@@ -159,10 +159,6 @@ src_config() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
 
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		kconfig_q_opt n UCLIBC_HAS_FPU
-	fi
-
 	if [[ ${CTARGET} == arm* ]] ; then
 		kconfig_q_opt n CONFIG_ARM_OABI
 		kconfig_q_opt y CONFIG_ARM_EABI
diff --git a/sys-libs/uclibc/uclibc-0.9.33.1.ebuild b/sys-libs/uclibc/uclibc-0.9.33.1.ebuild
index d60e1f65bcda..fc01776ff13e 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.1.ebuild,v 1.2 2012/06/01 04:22:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.1.ebuild,v 1.3 2012/06/09 06:47:12 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
 if [[ ${PV} == "9999" ]] ; then
@@ -159,10 +159,6 @@ src_config() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
 
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		kconfig_q_opt n UCLIBC_HAS_FPU
-	fi
-
 	if [[ ${CTARGET} == arm* ]] ; then
 		kconfig_q_opt n CONFIG_ARM_OABI
 		kconfig_q_opt y CONFIG_ARM_EABI
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2.ebuild
index 6b5fc1664fb7..707b1d5bd28b 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2.ebuild,v 1.3 2012/06/09 05:27:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2.ebuild,v 1.4 2012/06/09 06:47:12 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
 if [[ ${PV} == "9999" ]] ; then
@@ -159,10 +159,6 @@ src_config() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
 
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		kconfig_q_opt n UCLIBC_HAS_FPU
-	fi
-
 	if [[ ${CTARGET} == arm* ]] ; then
 		kconfig_q_opt n CONFIG_ARM_OABI
 		kconfig_q_opt y CONFIG_ARM_EABI
diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index b210ce20004d..65eb2d0855dd 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild,v 1.2 2012/06/01 04:22:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild,v 1.3 2012/06/09 06:47:12 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
 if [[ ${PV} == "9999" ]] ; then
@@ -159,10 +159,6 @@ src_config() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
 
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		kconfig_q_opt n UCLIBC_HAS_FPU
-	fi
-
 	if [[ ${CTARGET} == arm* ]] ; then
 		kconfig_q_opt n CONFIG_ARM_OABI
 		kconfig_q_opt y CONFIG_ARM_EABI
@@ -173,12 +169,13 @@ src_config() {
 		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_FTW
+		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