cleanup

4 files changed, 5 insertions, 590 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 8d35a990a33a..eb4c714341b3 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.245 2004/08/27 17:03:35 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.246 2004/08/27 17:06:10 lv Exp $
+
+  27 Aug 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.4.20040605.ebuild:
+  removed old ebuild
 
   27 Aug 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040619-r1.ebuild,
   glibc-2.3.4.20040808.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 515c46fc012d..e5c55cb3268e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -2,10 +2,9 @@ MD5 3361d9253913ec03c5201373eb12c115 glibc-2.3.4.20040808.ebuild 21044
 MD5 e929e89d8a94ba13805c79afef1a23e7 glibc-2.3.2-r11.ebuild 20307
 MD5 cdff0e2d789aa0bda20dbe3771c107c3 glibc-2.3.3.20040420-r1.ebuild 21481
 MD5 d76c190c324bd78acdd50153b087d0aa glibc-2.3.2-r10.ebuild 20217
-MD5 1d6c38dbd7ccc25b49a5b3c835d7542a glibc-2.3.4.20040605.ebuild 17579
 MD5 268ba3daca8dd48227a8433667ba6499 glibc-2.3.4.20040619-r1.ebuild 20673
 MD5 b7f41b64d13ebb13463afe77a0fab815 glibc-2.3.2-r2.ebuild 18863
-MD5 23245b9bb15cc2d04b302061f687bd69 ChangeLog 50386
+MD5 b2013d991c28310b8cc1ee0fffb3b147 ChangeLog 50483
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 8413392cd26f51d0d0be2ac3493c0687 glibc-2.2.5-r9.ebuild 10874
 MD5 a286fb7deff9b927e5bb9e6e69f98663 glibc-2.3.2-r9.ebuild 19572
@@ -17,7 +16,6 @@ MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 de6744f3ba45c52573febfa91a3d1d1d files/digest-glibc-2.3.2-r2 296
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r9 312
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
-MD5 e6e5134e81215f7c200930cf04f10b50 files/digest-glibc-2.3.4.20040605 150
 MD5 96c4c915e773ca312b14a53ae6ce91cf files/digest-glibc-2.3.4.20040808 382
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
 MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20040605 b/sys-libs/glibc/files/digest-glibc-2.3.4.20040605
deleted file mode 100644
index 0dce5380fd56..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.3.4.20040605
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b88086b30c6df8dafb983efed80f5a22 glibc-2.3.4.20040605.tar.bz2 13728433
-MD5 eabe1f4779fc27cde985b0713f930827 glibc-infopages-2.3.4.tar.bz2 1175502
diff --git a/sys-libs/glibc/glibc-2.3.4.20040605.ebuild b/sys-libs/glibc/glibc-2.3.4.20040605.ebuild
deleted file mode 100644
index 64a3a883f171..000000000000
--- a/sys-libs/glibc/glibc-2.3.4.20040605.ebuild
+++ /dev/null
@@ -1,584 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040605.ebuild,v 1.26 2004/08/05 23:59:53 vapier Exp $
-
-IUSE="nls pic build nptl erandom hardened makecheck multilib debug"
-
-inherit eutils flag-o-matic gcc
-
-# make check will fail if sandbox is enabled
-export SANDBOX_DISABLED="1"
-
-# Recently there has been a lot of stability problem in Gentoo-land.  Many
-# things can be the cause to this, but I believe that it is due to gcc3
-# still having issues with optimizations, or with it not filtering bad
-# combinations (protecting the user maybe from himeself) yet.
-#
-# This can clearly be seen in large builds like glibc, where too aggressive
-# CFLAGS cause the tests to fail miserbly.
-#
-# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
-# knows what he is talking about:
-#
-#   People really shouldn't force code-specific options on... It's a
-#   bad idea. The -march options aren't just to look pretty. They enable
-#   options that are sensible (and include sse,mmx,3dnow when apropriate).
-#
-# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
-# you do not like it, comment it, but do not bugreport if you run into
-# problems.
-#
-# <azarah@gentoo.org> (13 Oct 2002)
-strip-flags
-strip-unsupported-flags
-
-# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
-export CFLAGS="${CFLAGS//-O?} -O2"
-export CXXFLAGS="${CFLAGS}"
-export LDFLAGS="${LDFLAGS//-Wl,--relax}"
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="http://dev.gentoo.org/~lv/${P}.tar.bz2
-		 http://dev.gentoo.org/~lv/glibc-infopages-2.3.4.tar.bz2"
-HOMEPAGE="http://sources.redhat.com/glibc/"
-
-#KEYWORDS="~x86 ~mips ~sparc ~amd64 -hppa ~ia64 ~ppc" # breaks on ~alpha
-#KEYWORDS="-* ~amd64 ppc64"
-# yanking ~amd64 due to repoman bugs.. plz add back later.
-KEYWORDS="-* ppc64 amd64"
-
-SLOT="2.2"
-LICENSE="LGPL-2"
-
-# We need new cleanup attribute support from gcc for NPTL among things ...
-# We also need linux-headers-2.6.6 if using NPTL. Including kernel headers is
-# incredibly unreliable, and this new linux-headers release from plasmaroo
-# should work with userspace apps, at least on amd64 and ppc64.
-DEPEND=">=sys-devel/gcc-3.2.3-r1
-	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	virtual/os-headers
-	nptl? ( =sys-kernel/linux26-headers-2.6* )
-	nls? ( sys-devel/gettext )"
-RDEPEND="virtual/os-headers
-	sys-apps/baselayout
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/glibc virtual/libc"
-
-# theoretical x-compiler support
-[ -z "${CCHOST}" ] && CCHOST="${CHOST}"
-
-# We need to be able to set alternative headers for
-# compiling for non-native platform
-# Will also come useful for testing kernel-headers without screwing up
-# whole system
-[ -z "${ALT_HEADERS}" ] && ALT_HEADERS="/usr/include"
-
-setup_flags() {
-	# -freorder-blocks for all but ia64 s390 s390x
-	use ppc || append-flags "-freorder-blocks"
-
-	# Sparc/Sparc64 support
-	if use sparc
-	then
-
-		# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-		replace-flags "-fcall-used-g7" ""
-		append-flags "-fcall-used-g6"
-
-		# Sparc64 Only support...
-		if [ "${PROFILE_ARCH}" = "sparc64" ]
-		then
-
-			# Get rid of -mcpu options, the CHOST will fix this up
-			replace-flags "-mcpu=ultrasparc" ""
-			replace-flags "-mcpu=v9" ""
-
-			# Get rid of flags known to fail
-			replace-flags "-mvis" ""
-
-			# Setup the CHOST properly to insure "sparcv9"
-			# This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler
-			if [ "${CHOST}" = "sparc-unknown-linux-gnu" ]; then
-				export CHOST="sparcv9-unknown-linux-gnu"
-				export CCHOST="sparcv9-unknown-linux-gnu"
-			fi
-		fi
-	fi
-
-	# temporary fix for a few gcc 3.4 related problems
-	# note: the problem this fixes should no longer exist as of gcc
-	# 3.4.0-r6. i'll keep this around for a short time longer since not
-	# everyone recompiles their compiler at every upgrade...
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		filter-flags -funit-at-a-time
-		append-flags -fno-unit-at-a-time
-	fi
-
-}
-
-want_nptl() {
-	(use amd64 || use ppc || use ppc64 || use sparc || use s390 || \
-		use ia64 || use alpha) && return 0
-	use x86 && if [ "${CHOST/-*}" = "i486" -o "${CHOST/-*}" = "i586" -o \
-		"${CHOST/-*}" = "i686" ] ; then return 0 ; fi
-	return 1
-}
-
-want_tls() {
-	(use amd64 || use ia64 || use s390 || use alpha || use sparc || \
-		use ppc || use ppc64 || use x86) && return 0
-	return 1
-}
-
-do_makecheck() {
-	ATIME=`mount | awk '{ print $3,$6 }' | grep ^\/\  | grep noatime`
-	if [ "$ATIME" = "" ]
-	then
-		cd ${WORKDIR}/build
-		make check || die
-	else
-		ewarn "remounting / without noatime option so that make check"
-		ewarn "does not fail!"
-		sleep 2
-		mount / -o remount,atime
-		cd ${WORKDIR}/build
-		make check || die
-		einfo "remounting / with noatime"
-		mount / -o remount,noatime
-	fi
-}
-
-install_locales() {
-	unset LANGUAGE LANG LC_ALL
-	cd ${WORKDIR}/build
-	make PARALLELMFLAGS="${MAKEOPTS}" \
-		install_root=${D} localedata/install-locales || die
-	keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
-}
-
-setup_locales() {
-	if (use nls || use makecheck)
-	then
-		einfo "nls or makecheck in USE, installing -ALL- locales..."
-		install_locales
-	elif [ -e /etc/locales.build ]
-	then
-		einfo "Installing locales in /etc/locales.build..."
-		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
-		cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
-			>> SUPPORTED.locales
-		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
-		install_locales || die
-	elif [ -e ${FILESDIR}/locales.build ]
-	then
-		einfo "Installing locales in ${FILESDIR}/locales.build..."
-		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
-		cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
-			>> SUPPORTED.locales
-		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
-		install_locales || die
-	else
-		einfo "Installing -ALL- locales..."
-		install_locales || die
-	fi
-}
-
-pkg_setup() {
-	# Check if we are going to downgrade, we don't like that
-	local old_version
-
-	old_version="`best_version glibc`"
-	old_version="${old_version/sys-libs\/glibc-/}"
-
-	if [ "$old_version" ]; then
-		if [ `python -c "import portage; print int(portage.vercmp(\"${PV}\",\"$old_version\"))"` -lt 0 ]; then
-			if [ "${FORCE_DOWNGRADE}" ]; then
-				ewarn "downgrading glibc, still not recommended, but we'll do as you wish"
-			else
-				eerror "Downgrading glibc is not supported and we strongly recommend that"
-				eerror "you don't do it as it WILL break all applications compiled against"
-				eerror "the new version (most likely including python and portage)."
-				eerror "If you are REALLY sure that you want to do it set "
-				eerror "     FORCE_DOWNGRADE=1"
-				eerror "when you try it again."
-				die "glibc downgrade"
-			fi
-		fi
-	fi
-
-	# We need gcc 3.2 or later ...
-	if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ]
-	then
-		echo
-		eerror "As of glibc-2.3, gcc-3.2 or later is needed"
-		eerror "for the build to succeed."
-		die "GCC too old"
-	fi
-
-	echo
-
-	if want_nptl
-	then
-		einfon "Checking gcc for __thread support ... "
-		if ! gcc -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null
-		then
-			echo "no"
-			echo
-			eerror "Could not find a gcc that supports the __thread directive!"
-			eerror "please update to gcc-3.2.2-r1 or later, and try again."
-			die "No __thread support in gcc!"
-		else
-			echo "yes"
-		fi
-
-	elif use nptl &> /dev/null
-	then
-		echo
-		# Just tell the user not to expect too much ...
-		ewarn "You have \"nptl\" in your USE, but your kernel version or"
-		ewarn "architecture does not support it!"
-	fi
-
-	echo
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# version patch
-	cd ${S}
-	einfo "patching version to display snapshot date"
-	sed -i -e "s/stable/2004-06-05/" -e "s/2\.3\.3/2.3.4/" version.h
-
-	# Extract pre-made man pages.  Otherwise we need perl, which is a no-no.
-	mkdir -p ${S}/man; cd ${S}/man
-	tar xjf ${FILESDIR}/glibc-manpages-2.3.2.tar.bz2
-	cd ${S} ; unpack glibc-infopages-2.3.4.tar.bz2
-
-	cd ${S}
-
-	# To circumvent problems with propolice __guard and
-	# __guard_setup__stack_smash_handler
-	#
-	#  http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch
-		cp ${FILESDIR}/2.3.3/ssp.c ${S}/sysdeps/unix/sysv/linux || \
-			die "failed to copy ssp.c to ${S}/sysdeps/unix/sysv/linux/"
-	fi
-
-	# patch this regardless of architecture, although it's ssp-related
-	epatch ${FILESDIR}/2.3.3/glibc-2.3.3-frandom-detect.patch
-
-	#
-	# *** PaX related patches starts here ***
-	#
-
-	# localedef contains nested function trampolines, which trigger
-	# segfaults under PaX -solar
-	# Debian Bug (#231438, #198099)
-	epatch ${FILESDIR}/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch
-
-
-	# With latest versions of glibc, a lot of apps failed on a PaX enabled
-	# system with:
-	#
-	#  cannot enable executable stack as shared object requires: Permission denied
-	#
-	# This is due to PaX 'exec-protecting' the stack, and ld.so then trying
-	# to make the stack executable due to some libraries not containing the
-	# PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
-	use mips || ( cd ${S}; epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-dl_execstack-PaX-support.patch )
-
-	# Program header support for PaX.
-	cd ${S}; epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040117-pt_pax.diff
-
-	# Suppress unresolvable relocation against symbol `main' in Scrt1.o
-	# can be reproduced with compiling net-dns/bind-9.2.2-r3 using -pie
-	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040117-got-fix.diff
-
-	#
-	# *** PaX related patches ends here ***
-	#
-
-	# Sanity check the forward and backward chunk pointers in the
-	# unlink() macro used by Doug Lea's implementation of malloc(3).
-	cd ${S}; epatch ${FILESDIR}/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff
-
-	# We do not want name_insert() in iconvconfig.c to be defined inside
-	# write_output() as it causes issues with trampolines/PaX.
-	#cd ${S}; epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-iconvconfig-name_insert.patch
-
-	# A few patches only for the MIPS platform.  Descriptions of what they
-	# do can be found in the patch headers.
-	# <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003)
-	# <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches
-	# <iluxa@gentoo.org> add n32/n64 patches, remove pread patch
-	if [ "${ARCH}" = "mips" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-fpu-cw-mips.patch
-		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-librt-mips.patch
-		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-dl-machine-calls.diff
-		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-incl-sgidefs.diff
-		epatch ${FILESDIR}/2.3.3/mips-addabi.diff
-		epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff
-		epatch ${FILESDIR}/2.3.3/semtimedop.diff
-		epatch ${FILESDIR}/2.3.3/mips-sysify.diff
-		epatch ${FILESDIR}/2.3.4/mips-sysdep-cancel.diff
-		# Need to install into /lib for n32-only userland for now.
-		# Propper solution is to make all userland /lib{32|64}-aware.
-		use multilib || epatch ${FILESDIR}/2.3.3/mips-nolib3264.diff
-	fi
-
-	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/2.3.4/glibc-2.3.4-nptl-altivec.patch
-	fi
-
-	if [ "${ARCH}" = "alpha" ]
-	then
-		cd ${S}
-		# Fix compatability with compaq compilers by ifdef'ing out some
-		# 2.3.2 additions.
-		# <taviso@gentoo.org> (14 Jun 2003).
-		epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-decc-compaq.patch
-
-		# Fix compilation with >=gcc-3.2.3 (01 Nov 2003 agriffis)
-#		epatch ${FILESDIR}/2.3.2/${LOCAL_P}-alpha-pwrite.patch
-	fi
-
-	if [ "${ARCH}" = "amd64" ]
-	then
-		cd ${S}; epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-amd64-nomultilib.patch
-	fi
-
-	if [ "${ARCH}" = "ia64" ]
-	then
-		# The basically problem is glibc doesn't store information about
-		# what the kernel interface is so that it can't efficiently set up
-		# parameters for system calls.  This patch from H.J. Lu fixes it:
-		#
-		#   http://sources.redhat.com/ml/libc-alpha/2003-09/msg00165.html
-		#
-		#cd ${S}; epatch ${FILESDIR}/2.3.2/${LOCAL_P}-ia64-LOAD_ARGS-fixup.patch
-		:
-	fi
-
-	cd ${S}
-
-	# Fix permissions on some of the scripts
-	chmod u+x ${S}/scripts/*.sh
-
-	# disable binutils -as-needed
-	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
-	# mandatory, if binutils supports relro and the kernel is pax/grsecurity enabled
-	# solves almost all segfaults building the locale files on grsecurity enabled kernels
-	use build && sed -e 's/^LDFLAGS-rtld += $(relro.*/LDFLAGS-rtld += -Wl,-z,norelro/' -i ${S}/Makeconfig
-	use build || (use hardened && sed -e 's/^LDFLAGS-rtld += $(relro.*/LDFLAGS-rtld += -Wl,-z,norelro/' -i ${S}/Makeconfig)
-}
-
-src_compile() {
-	setup_flags
-	filter-flags "-fomit-frame-pointer -malign-double"
-	filter-ldflags "-pie"
-
-
-	# These should not be set, else the
-	# zoneinfo do not always get installed ...
-	unset LANGUAGE LANG LC_ALL
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	use erandom || myconf="${myconf} --disable-dev-erandom"
-
-	use hardened && myconf="${myconf} --enable-bind-now"
-
-	if (use nptl && want_nptl && want_tls)
-	then
-		myconf="${myconf} \
-		--enable-add-ons=nptl \
-		--with-tls --with-__thread \
-		--enable-kernel=2.6.0"
-	else
-		myconf="${myconf} --enable-add-ons=linuxthreads --without-__thread"
-	fi
-
-	# we dont want to enable tls ourselves, as this can cause catalyst to fail
-	# for some people on some archs.
-	want_tls || myconf="${myconf} --without-tls"
-
-	# some silly people set LD_RUN_PATH and that breaks things.
-	# see bug 19043
-	unset LD_RUN_PATH
-
-	rm -rf ${WORKDIR}/build
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-	${S}/configure \
-		--build=${CHOST} \
-		--host=${CCHOST} \
-		--disable-profile \
-		--without-gd \
-		--without-cvs \
-		--with-headers=${ALT_HEADERS} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--libexecdir=/usr/lib/misc \
-		${myconf} || die
-
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-}
-
-src_install() {
-	setup_flags
-
-	# These should not be set, else the
-	# zoneinfo do not always get installed ...
-	unset LANGUAGE LANG LC_ALL
-
-	cd ${WORKDIR}/build
-
-	einfo "Installing GLIBC..."
-	make PARALLELMFLAGS="${MAKEOPTS}" \
-		install_root=${D} \
-		install || die
-
-	# If librt.so is a symlink, change it into linker script (Redhat)
-	if [ -L "${D}/usr/lib/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]
-	then
-		local LIBRTSO="`cd ${D}/lib; echo librt.so.*`"
-		local LIBPTHREADSO="`cd ${D}/lib; echo libpthread.so.*`"
-
-		rm -f ${D}/usr/lib/librt.so
-		cat > ${D}/usr/lib/librt.so <<EOF
-/* GNU ld script
-	librt.so.1 needs libpthread.so.0 to come before libc.so.6*
-	in search scope.  */
-EOF
-		grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so
-		echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \
-			>> ${D}/usr/lib/librt.so
-
-		for x in ${D}/usr/lib/librt.so.[1-9]
-		do
-			[ -L "${x}" ] && rm -f ${x}
-		done
-	fi
-
-	if ! use build
-	then
-		cd ${WORKDIR}/build
-
-		einfo "Installing Info pages..."
-		make PARALLELMFLAGS="${MAKEOPTS}" \
-			install_root=${D} \
-			info -i
-
-		setup_locales
-
-		einfo "Installing man pages and docs..."
-		# Install linuxthreads man pages
-		want_nptl || {
-			dodir /usr/share/man/man3
-			doman ${S}/man/*.3thr
-		}
-
-		# Install nscd config file
-		insinto /etc
-		doins ${FILESDIR}/nscd.conf
-
-		cd ${S}
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
-			NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-
-		einfo "Installing Timezone data..."
-		make PARALLELMFLAGS="${MAKEOPTS}" \
-			install_root=${D} \
-			timezone/install-others -C ${WORKDIR}/build || die
-	fi
-
-	if (use pic && use !amd64)
-	then
-		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \;
-		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \;
-		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/lib \;
-		for i in ${D}/lib/*.map
-		do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-
-	# Is this next line actually needed or does the makefile get it right?
-	# It previously has 0755 perms which was killing things.
-	fperms 4711 /usr/lib/misc/pt_chown
-
-	# Currently libraries in  /usr/lib/gconv do not get loaded if not
-	# in search path ...
-#	insinto /etc/env.d
-#	doins ${FILESDIR}/03glibc
-
-	rm -f ${D}/etc/ld.so.cache
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-
-	# Some things want this, notably ash.
-	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
-
-	# This is our new config file for building locales
-	insinto /etc
-	doins ${FILESDIR}/locales.build
-
-	use makecheck && do_makecheck
-}
-
-pkg_postinst() {
-	# Correct me if I am wrong here, but my /etc/localtime is a file
-	# created by zic ....
-	# I am thinking that it should only be recreated if no /etc/localtime
-	# exists, or if it is an invalid symlink.
-	#
-	# For invalid symlink:
-	#   -f && -e  will fail
-	#   -L will succeed
-	#
-	if [ ! -e ${ROOT}/etc/localtime ]
-	then
-		echo "Please remember to set your timezone using the zic command."
-		rm -f ${ROOT}/etc/localtime
-		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
-	fi
-
-	if [ -x ${ROOT}/usr/sbin/iconvconfig ]
-	then
-		# Generate fastloading iconv module configuration file.
-		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
-	fi
-
-	if [ ! -e "${ROOT}/ld.so.1" ] && use ppc64
-	then
-		pushd ${ROOT}
-		cd ${ROOT}/lib
-		ln -s ld64.so.1 ld.so.1
-		popd
-	fi
-
-	# Reload init ...
-	if [ "${ROOT}" = "/" ]
-	then
-		/sbin/init U &> /dev/null
-	fi
-}
-