- version bump and some cleanup

Package-Manager: portage-2.1.4.5

5 files changed, 19 insertions, 944 deletions

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index e507d500359c..0fd2f0b7907f 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/uclibc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.40 2008/11/09 19:42:01 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.41 2008/11/28 20:09:45 solar Exp $
+
+*uclibc-0.9.30 (28 Nov 2008)
+
+  28 Nov 2008; <solar@gentoo.org> -uclibc-0.9.28.3-r6.ebuild,
+  -uclibc-0.9.30_rc1.ebuild, -uclibc-0.9.30_rc3.ebuild,
+  +uclibc-0.9.30.ebuild:
+  - version bump and some cleanup
 
   09 Nov 2008; <solar@gentoo.org> uclibc-0.9.30_rc3.ebuild:
   - psm reports headers need -j1 flag
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 11bfee285a04..626706cbac33 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -3,19 +3,14 @@ DIST uClibc-0.9.27-patches-1.6.tar.bz2 24001 RMD160 eca81853e00e5144c165b2eb4733
 DIST uClibc-0.9.27.tar.bz2 1693895 RMD160 4c580c0c468bcd7e77a6b4223847f17b6ad241cc SHA1 e0de53949998253e25e6b946b564062babb723b4 SHA256 d43098b9d1cac5cc983672f885d82b59459c3abcb12ef8141653581c77cd0d9c
 DIST uClibc-0.9.28.3-patches-1.0.tar.bz2 16079 RMD160 2224a7b826932fcd5c96a0bddb30fcfa4173de35 SHA1 098f90da4879bc3a14afe662f19163c969bde431 SHA256 c432d869fc3e8a4e2137541e8a1ab93e7d634387d9ca5131842721f4b080b72e
 DIST uClibc-0.9.28.3-patches-1.3.tar.bz2 21241 RMD160 c78dda0bdbc751721559d91bdd60a29e5260007b SHA1 f89a0bd18fbda1101ad419c3abc06068dd237776 SHA256 b3a3a98798861e38525082884b4a5be1ab42d281c2680db3ddc0085d031aa397
-DIST uClibc-0.9.28.3-patches-1.7.tar.bz2 22796 RMD160 73c13613f93115533b5b2065ab65ef8d18cf67a2 SHA1 8f072be977039725a080438ce13e8ed7e23337e5 SHA256 936f744539787ee0537ca733efbee6323cb48ad9e11d52aba2971e6cfe89b915
 DIST uClibc-0.9.28.3-patches-1.8.tar.bz2 27909 RMD160 7c936749075162939c76489aa5a88278f235b48f SHA1 5bb582cb8f95407bd9fa938a9dd09027dcf0db0b SHA256 9496394de9de241551497c496b7fb8ece32b23536485bd81bd20128c2e104790
 DIST uClibc-0.9.28.3.tar.bz2 1795383 RMD160 61591281f4193d4dcd0fa3252fb3286028d4cb63 SHA1 77c5220697a1772d0d9da4bda0d866e4f4b68540 SHA256 1d86d5dad6060e7057cfe023ffc7b7661bdc7fe95112b37447851c0a75b547a1
-DIST uClibc-0.9.30-rc1-patches-0.1.tar.bz2 15953 RMD160 f23788f547924f69ed0a0cb962ee721e8413610c SHA1 de5f5263605aa3187214508e3c24e3d4e35a0cbc SHA256 5e3cabc7f51a0bc4feb6ef9803b62e77e419461718c81a07877f19a5610bced9
-DIST uClibc-0.9.30-rc1.tar.bz2 2304763 RMD160 e4503b4df92e6849966ad6822860a0bf1dd854df SHA1 2249f6cb1f561417daed8fa6d58d7c4be8f786d7 SHA256 494ce5d3c0ae09eaf17fccc7954e3698a8347d13d7d1c290a85618a40e82c779
-DIST uClibc-0.9.30-rc3.tar.bz2 2295161 RMD160 c865dcd704a95f7b454ef03bcc360bf467cad4e0 SHA1 0cec04645e4fe677af5940af965b35f779c80d41 SHA256 6de33cd7eb30432b514c4f0e32f63f88f119646f66cb272ec8bf3bb288657989
+DIST uClibc-0.9.30.tar.bz2 2291882 RMD160 08270ef742a2167ae660c5440bc5f78775a10ab0 SHA1 e96665237968fb2e4aa027bde9d56c4fe599eb1b SHA256 67e7e6b983cd2caa163f177d5196282434ae1e18b7270495cd6c65f5c1549555
 DIST uClibc-locale-030818.tgz 236073 RMD160 8e3f4b20b94e07e535cbbbe81287186014c5f151 SHA1 78f901e6ed228ed84106bd034c1b97eee1eecb50 SHA256 c4362be318a38f18d98dccf462d22d95bab92f05548bb93f65298fe9afaebd57
 EBUILD uclibc-0.9.27-r1.ebuild 12349 RMD160 1907241e5b159e8e6dfe5758254e78529508da5c SHA1 6ccc353679842a15cec02e67370a53468b813c25 SHA256 ef45378f6dfbe838b5985c727e09f751dc099f8d61d22abdb347131cf51afc2e
 EBUILD uclibc-0.9.28.3-r3.ebuild 14519 RMD160 196cf32e0f8d9af1b8a4590ddce8a80fd847a709 SHA1 9e11b057d9bf475eabc1dc0bb9fded4eaf7d0ae7 SHA256 582e5eb25110ad74638a1ad0fa70f865e2668e127695a46a8fdbf2909a49073b
-EBUILD uclibc-0.9.28.3-r6.ebuild 14522 RMD160 34fb9b4cb94899aa70fa287c8b6def2e8148201c SHA1 da977552a3e520288e2cc7cbdd293cabb7d13874 SHA256 0c6b9319283e94bf4916c44d19876a58fa059151db266b29636d3b495b0dde96
 EBUILD uclibc-0.9.28.3-r7.ebuild 14522 RMD160 c951654646c8d3d6ec5559d70678092d256c1257 SHA1 d6ee1ff5ead3f338c5d6b3a0378ce82c471811b4 SHA256 6dfaa8c2fa10ffe2f0a93737e9045829a4922b12f0c70cfd7457e124a9e9d9a7
 EBUILD uclibc-0.9.28.3.ebuild 14513 RMD160 f0b09ee89ca6ab4255b06fb4a5d89d8363cde623 SHA1 11a32313695999f0d0b874e90a13add4cbb911a1 SHA256 cd1defc5347cf8bdadd6a04c1742c877b69f745afb7941f87621ee53a0763c69
-EBUILD uclibc-0.9.30_rc1.ebuild 14408 RMD160 60c6a0095fba847a039ef208e130b2fd8530d47e SHA1 699266bf848f61648763daf132e57aeb3f69e3ac SHA256 43994a8b66c3ff823aea4ad458d69008eb428fd207f33d121c08d66bae2e4343
-EBUILD uclibc-0.9.30_rc3.ebuild 14412 RMD160 7d0c75909992a32ca9149d58eb136fffeea7af65 SHA1 979ceeb51c13e93e5d9c7e1e94e33c137f8d19af SHA256 c0dc4f6c8c15d7eccf403357a4a4828725ecedf8f3e25bae6997e54958ff7813
-MISC ChangeLog 14669 RMD160 6d363bb9f8725feaa62cdd6091f89982124dac02 SHA1 6aa83ba6fbf6248b71e812e9b27ed42bbd9de9ed SHA256 fae8f80c9994872b890763970cfd73ebeae77bc1d333b5b4e33feebddd6a3922
+EBUILD uclibc-0.9.30.ebuild 14437 RMD160 dfe03f05625ac0da2903ccf318af0ca01f93b1b6 SHA1 bc35f7524f46c840bf9ebf2db2f8c98448dfe633 SHA256 6a8f734e42ee0d970e729f883d4b2cdd33532b9bdf0d1919b24a685fad8f04a7
+MISC ChangeLog 14877 RMD160 8b4ee423260b30a8abd30b533b20ff3bdcf7dc63 SHA1 3c97075de67a04233bdc8e96969f4562239a8aca SHA256 3082a9e26bc107865449e6ea64b4483672d6f44291f40a2cb4fa445f2c9db548
 MISC metadata.xml 1382 RMD160 aec15535239f8395eb53ba3f0d1730f9e02693e3 SHA1 1ade2f09631f7c0bfe424dc775f6787928e21e5a SHA256 503af91d433a322b80e8ed4c9c1606c7be47dd5feecd46a07fd57eb5e5a3813f
diff --git a/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild
deleted file mode 100644
index 6992da68367e..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2008 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-r6.ebuild,v 1.3 2008/11/01 07:33:09 vapier 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.7"
-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"
-	PROVIDE="virtual/libc"
-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
-	doman docs/man/*.[1-9]
-}
-
-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_rc1.ebuild b/sys-libs/uclibc/uclibc-0.9.30.ebuild
index 22f4d27aaeb8..faaae0940d02 100644
--- a/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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_rc1.ebuild,v 1.3 2008/11/01 07:33:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild,v 1.1 2008/11/28 20:09:45 solar Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -19,9 +19,9 @@ if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc* ]] ; then
 	export CTARGET=${CHOST%%-*}-pc-linux-uclibc
 fi
 
-MY_P=uClibc-0.9.30-rc1
+MY_P=uClibc-0.9.30
 SVN_VER=""
-PATCH_VER="0.1"
+#PATCH_VER="0.1"
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="http://www.uclibc.org/"
 SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
@@ -41,11 +41,12 @@ IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen userlocal
 RESTRICT="strip"
 
 RDEPEND=""
-if [[ ${CTARGET} == ${CHOST} ]] ; then
+if [[ -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then
+	DEPEND=""
+	PROVIDE=""
+else
 	DEPEND="virtual/os-headers app-misc/pax-utils"
 	PROVIDE="virtual/libc"
-else
-	DEPEND=""
 fi
 
 S=${WORKDIR}/${MY_P}
@@ -67,7 +68,7 @@ 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) "${T}"/endian.s -o "${T}"/endian.o
+	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
 	case $(file "${T}"/endian.o) in
 		*" MSB "*) echo "big";;
 		*" LSB "*) echo "little";;
diff --git a/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild b/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild
deleted file mode 100644
index d04a1df3bb03..000000000000
--- a/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2008 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_rc3.ebuild,v 1.3 2008/11/09 19:42:01 solar Exp $
-
-#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
-#inherit subversion
-inherit eutils flag-o-matic toolchain-funcs savedconfig
-
-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-0.9.30-rc3
-SVN_VER=""
-#PATCH_VER="0.1"
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
-	iconv? ( !userlocales? ( pregen? ( 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 ~amd64"
-IUSE="build uclibc-compat debug hardened iconv 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"
-	PROVIDE="virtual/libc"
-else
-	DEPEND=""
-fi
-
-S=${WORKDIR}/${MY_P}
-
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \
-	   || [[ -n ${UCLIBC_AND_GLIBC} ]]
-	then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	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) "${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 use iconv ; then
-		eerror "iconv - bad idea"
-	fi
-	if use nls ; then
-		eerror "nls - even worse idea"
-	fi
-	if use pregen || use userlocales ; then
-		eerror "pregen, userlocales - meaningless without nls"
-	fi
-	if use iconv || use nls || use pregen || use userlocales ; then
-		eerror "compile without nls/gettext support"
-	fi
-	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,7TDMI,720T,920T,922T,926T,10T,1136JF_S,1176JZ{_,F_}S,_{SA110,SA1100,XSCALE,IWMMXT}}"
-CPU_IA64=""
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32,64}} MIPS_{N64,O32,N32}_ABI"
-CPU_PPC=""
-CPU_SH="SH{2,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
-}
-
-set_opt() {
-	sed -i -e "/^\# $1 is not set/d" -e "/^$1=.*/d" .config
-	echo "$1=$2" >> .config
-}
-
-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
-
-	if [[ -d "${FILESDIR}"/patches-${PV} ]] ; then
-		EPATCH_SUFFIX="patch"
-		epatch "${FILESDIR}"/patches-${PV}
-		if [[ -d "${FILESDIR}"/patches-${PV}/math/libm ]] ; then
-			# math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f)
-			cp "${FILESDIR}"/patches-${PV}/math/libm/* "${S}"/libm/ || die
-			epatch "${FILESDIR}"/patches-${PV}/math
-		fi
-	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 CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	########## CONFIG SETUP ##########
-
-	make ARCH=${target} 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
-		set_opt SUPPORT_LD_DEBUG y
-		set_opt DODEBUG y
-	fi
-
-	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
-	fi
-
-	local moredefs="COMPAT_ATEXIT"
-	local compat_sym=atexit
-
-	# We need todo this for a few months. .29 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 ${compat_sym} symbol"
-			fnames=$(scanelf -pyqs${compat_sym} -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 -Cq $(echo ${fnames}) | sort | uniq"
-				echo
-				ewarn "Leaving on ${moredefs}"
-			fi
-		else
-			moredefs=""
-		fi
-	fi
-	for def in ${moredefs} MALLOC_GLIBC_COMPAT DO_C99_MATH UCLIBC_HAS_{RPC,FULL_RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} UCLIBC_HAS_REENTRANT_RPC  UCLIBC_HAS_GNU_GLOB PTHREADS_DEBUG_SUPPORT UCLIBC_HAS_TZ_FILE_READ_MANY UCLIBC_HAS_FENV UCLIBC_SUSV3_LEGACY UCLIBC_SUSV3_LEGACY_MACROS UCLIBC_HAS_PROGRAM_INVOCATION_NAME ; do
-		set_opt "${def}" y
-	done
-	set_opt UCLIBC_HAS_CTYPE_UNSAFE n
-
-	if use iconv ; then
-		set_opt UCLIBC_HAS_LOCALE y
-		set_opt UCLIBC_HAS_XLOCALE n
-		set_opt UCLIBC_HAS_GLIBC_DIGIT_GROUPING y
-		set_opt UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING y
-
-		if use nls ; then
-			set_opt UCLIBC_HAS_GETTEXT_AWARENESS y
-			set_opt UCLIBC_MJN3_ONLY y
-		else
-			set_opt UCLIBC_HAS_GETTEXT_AWARENESS n
-		fi
-
-		if use pregen ; then
-			set_opt UCLIBC_PREGENERATED_LOCALE_DATA y
-			set_opt UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA y
-			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}"/uClibc-locale-030818.tgz \
-					extra/locale/uClibc-locale-030818.tgz \
-					|| die "could not copy locale"
-			fi
-		else
-			set_opt UCLIBC_PREGENERATED_LOCALE_DATA n
-		fi
-	else
-		set_opt UCLIBC_HAS_LOCALE n
-	fi
-
-	use ipv6 && set_opt UCLIBC_HAS_IPV6 y
-
-	use wordexp && set_opt UCLIBC_HAS_WORDEXP y
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	set_opt UCLIBC_HAS_SSP y
-	set_opt UCLIBC_HAS_SSP_COMPAT y
-	set_opt UCLIBC_HAS_ARC4RANDOM y
-	set_opt PROPOLICE_BLOCK_ABRT n
-	set_opt PROPOLICE_BLOCK_SEGV y
-
-	# 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
-		set_opt UCLIBC_BUILD_NOEXECSTACK y
-	else
-		set_opt UCLIBC_BUILD_NOEXECSTACK n
-	fi
-	set_opt UCLIBC_BUILD_RELRO y
-	if use hardened ; then
-		if has $(tc-arch) ${PIE_STABLE} ; then
-			set_opt UCLIBC_BUILD_PIE y
-		else
-			set_opt UCLIBC_BUILD_PIE n
-		fi
-		set_opt SSP_QUICK_CANARY n
-		set_opt UCLIBC_BUILD_SSP y
-		set_opt UCLIBC_BUILD_NOW y
-	else
-		set_opt UCLIBC_BUILD_PIE n
-		set_opt SSP_QUICK_CANARY y
-		set_opt UCLIBC_BUILD_SSP n
-		set_opt UCLIBC_BUILD_NOW n
-	fi
-
-	restore_config .config
-
-	# 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_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
-
-	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 -j1 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_headers"
-	emake DESTDIR="${sysroot}" ${target} || die "install failed"
-
-	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 [[ ${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
-	doman docs/man/*.[1-9]
-}
-
-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
-}