new snapshot, masked -*, with fedora-branch patches. made nptl-enabled glibc behave like the glibc in most other distributions, with nptl libs in lib/tls and a fallback linuxthreads version in lib. If the linuxthreads fallback isnt needed/wanted, you can revert to the old behavior by adding nptlonly to USE to save yourself some compile time.

6 files changed, 1047 insertions, 17 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 80ac218463f1..1c015a3039f8 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,17 @@
 # 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.258 2004/09/22 02:00:43 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.259 2004/09/28 13:23:37 lv Exp $
+
+*glibc-2.3.4.20040928 (28 Sep 2004)
+
+  28 Sep 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch,
+  +files/2.3.4/glibc-sec-hotfix-20040916.patch, +glibc-2.3.4.20040928.ebuild:
+  new snapshot, masked -*, with fedora-branch patches. made nptl-enabled glibc
+  behave like the glibc in most other distributions, with nptl libs in lib/tls
+  and a fallback linuxthreads version in lib. If the linuxthreads fallback isnt
+  needed/wanted, you can revert to the old behavior by adding nptlonly to USE to
+  save yourself some compile time.
 
   21 Sep 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040808.ebuild:
   stable on amd64
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 890910f4ada8..5fc9a65792d6 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,13 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 96b0201d40858ae1163d8c57905917de ChangeLog 52830
+MD5 84381a70d9488836104f9c813bd559cd ChangeLog 53404
 MD5 f3cfb768f888ac432bddfa481c2febce glibc-2.2.5-r9.ebuild 10877
 MD5 470fe80b952dee95e699e5b0d268040f glibc-2.3.2-r11.ebuild 20395
 MD5 c3e722bbae2f66c4ce6ad6a7ca8689b3 glibc-2.3.3.20040420-r1.ebuild 21628
 MD5 bab5970ce8decc290de6ba2079d202cf glibc-2.3.4.20040619-r1.ebuild 20861
 MD5 688557b7029a7af97cc67a51ebcab4c9 glibc-2.3.4.20040808.ebuild 21309
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 519d5b5035e56b02f122865027ff27d1 glibc-2.3.4.20040928.ebuild 25474
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r11 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r1 312
@@ -19,13 +17,14 @@ MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
 MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
 MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
 MD5 13701e6cc0de584680502c0cd958f2cf files/glibc-sec-hotfix-20040804.patch 4319
+MD5 bbe355d94c5a36e11f543d12b70b5702 files/glibc-sec-hotfix-20040916.patch 3080
 MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
 MD5 c4300e2f8808cb38a308745ed8b77367 files/locales.build 602
 MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
-MD5 bbe355d94c5a36e11f543d12b70b5702 files/glibc-sec-hotfix-20040916.patch 3080
+MD5 e62388bbadcb815956d5889a3509a8c8 files/digest-glibc-2.3.4.20040928 382
 MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
 MD5 843eaa26ae2c49e894aa365b6f463546 files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
 MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
@@ -107,19 +106,14 @@ MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/mips-syscall.h.diff 1199
 MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/mips-sysify.diff 2138
 MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/semtimedop.diff 602
 MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
+MD5 89a6d0d924c8b05c4e06bdffb7c69b41 files/2.3.4/glibc-2.3.4-arm-ioperm.patch 4037
 MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
 MD5 659a9d64935d67a5938d0cb4e5fe4899 files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch 2310
+MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
 MD5 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
-MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402
+MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304
 MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff 4203
-MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
 MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
-MD5 89a6d0d924c8b05c4e06bdffb7c69b41 files/2.3.4/glibc-2.3.4-arm-ioperm.patch 4037
-MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBVBjOHTu7gpaalycRArH0AKDhEySxpmIqdtgJUChAUkjOE3P/JgCgvESX
-hr5oBg6fRWbB8l3xieqePzY=
-=kUHp
------END PGP SIGNATURE-----
+MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402
+MD5 9ee1438ba6ac30363130330c996dbb84 files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch 1443
+MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch
new file mode 100644
index 000000000000..af8bd31306e0
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch
@@ -0,0 +1,50 @@
+diff -Nru glibc-2.3.3.old/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.3.3/sysdeps/unix/sysv/linux/dl-execstack.c
+--- glibc-2.3.3.old/sysdeps/unix/sysv/linux/dl-execstack.c	2004-09-24 01:40:02.663710000 -0400
++++ glibc-2.3.3/sysdeps/unix/sysv/linux/dl-execstack.c	2004-09-24 01:54:55.883919888 -0400
+@@ -56,11 +56,17 @@
+ 					__stack_prot) == 0, 1))
+ 	goto return_success;
+ # if __ASSUME_PROT_GROWSUPDOWN == 0
+-      if (errno == EINVAL)
++      if (errno == EINVAL) {
+ 	no_growsupdown = true;
+-      else
++      } else {
++#  endif
++	if (errno == EACCES)		/* PAX is enabled */
++	  return 0;
++	else
++	  return errno;
++#  if __ASSUME_PROT_GROWSUPDOWN == 0
++      }
+ # endif
+-	return errno;
+     }
+ #endif
+ 
+@@ -84,8 +90,11 @@
+ 	page -= size;
+       else
+ 	{
+-	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
++	  if (errno == EACCES) {	/* PAX is enabled */
++	    return 0;
++	  } else if (errno != ENOMEM) {	/* Unexpected failure mode.  */
+ 	    return errno;
++	  }
+ 
+ 	  if (size == GLRO(dl_pagesize))
+ 	    /* We just tried to mprotect the top hole page and failed.
+@@ -107,8 +116,11 @@
+ 	page += size;
+       else
+ 	{
+-	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
++	  if (errno == EACCES) {	/* PAX is enabled */
++	    return 0;
++	  } else if (errno != ENOMEM) {	/* Unexpected failure mode.  */
+ 	    return errno;
++	  }
+ 
+ 	  if (size == GLRO(dl_pagesize))
+ 	    /* We just tried to mprotect the lowest hole page and failed.
diff --git a/sys-libs/glibc/files/2.3.4/glibc-sec-hotfix-20040916.patch b/sys-libs/glibc/files/2.3.4/glibc-sec-hotfix-20040916.patch
new file mode 100644
index 000000000000..3858a0f9c9d1
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.4/glibc-sec-hotfix-20040916.patch
@@ -0,0 +1,95 @@
+diff -Nru glibc-2.3.3.old/elf/rtld.c glibc-2.3.3/elf/rtld.c
+--- glibc-2.3.3.old/elf/rtld.c	2004-09-16 15:02:16.000000000 -0400
++++ glibc-2.3.3/elf/rtld.c	2004-09-16 15:04:58.000000000 -0400
+@@ -2041,6 +2041,30 @@
+   GLRO(dl_profile_output)
+     = &"/var/tmp\0/var/profile"[INTUSE(__libc_enable_secure) ? 9 : 0];
+ 
++  /* Extra security for SUID binaries.  Remove all dangerous environment
++     variables.  */
++  if (__builtin_expect (INTUSE(__libc_enable_secure), 0))
++    {
++      static const char unsecure_envvars[] =
++#ifdef EXTRA_UNSECURE_ENVVARS
++	EXTRA_UNSECURE_ENVVARS
++#endif
++	UNSECURE_ENVVARS;
++      const char *nextp;
++
++      nextp = unsecure_envvars;
++      do
++	{
++	  unsetenv (nextp);
++	  /* We could use rawmemchr but this need not be fast.  */
++	  nextp = (char *) (strchr) (nextp, '\0') + 1;
++	}
++      while (*nextp != '\0');
++
++      if (__access ("/etc/suid-debug", F_OK) != 0)
++	unsetenv ("MALLOC_CHECK_");
++    }
++
+   while ((envline = _dl_next_ld_env_entry (&runp)) != NULL)
+     {
+       size_t len = 0;
+@@ -2188,33 +2212,10 @@
+   /* The caller wants this information.  */
+   *modep = mode;
+ 
+-  /* Extra security for SUID binaries.  Remove all dangerous environment
+-     variables.  */
+-  if (__builtin_expect (INTUSE(__libc_enable_secure), 0))
+-    {
+-      static const char unsecure_envvars[] =
+-#ifdef EXTRA_UNSECURE_ENVVARS
+-	EXTRA_UNSECURE_ENVVARS
+-#endif
+-	UNSECURE_ENVVARS;
+-      const char *nextp;
+-
+-      nextp = unsecure_envvars;
+-      do
+-	{
+-	  unsetenv (nextp);
+-	  /* We could use rawmemchr but this need not be fast.  */
+-	  nextp = (char *) (strchr) (nextp, '\0') + 1;
+-	}
+-      while (*nextp != '\0');
+-
+-      if (__access ("/etc/suid-debug", F_OK) != 0)
+-	unsetenv ("MALLOC_CHECK_");
+-    }
+   /* If we have to run the dynamic linker in debugging mode and the
+      LD_DEBUG_OUTPUT environment variable is given, we write the debug
+      messages to this file.  */
+-  else if (any_debug && debug_output != NULL)
++  if (any_debug && debug_output != NULL)
+     {
+ #ifdef O_NOFOLLOW
+       const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NOFOLLOW;
+diff -Nru glibc-2.3.3.old/malloc/malloc.c glibc-2.3.3/malloc/malloc.c
+--- glibc-2.3.3.old/malloc/malloc.c	2004-09-16 15:03:22.000000000 -0400
++++ glibc-2.3.3/malloc/malloc.c	2004-09-16 15:04:58.000000000 -0400
+@@ -321,6 +321,10 @@
+ #define assert(x) ((void)0)
+ #endif
+ 
++#include <abort-instr.h>
++#ifndef ABORT_INSTRUCTION
++#define ABORT_INSTRUCTION
++#endif
+ 
+ /*
+   INTERNAL_SIZE_T is the word-size used for internal bookkeeping
+diff -Nru glibc-2.3.3.old/sysdeps/generic/unsecvars.h glibc-2.3.3/sysdeps/generic/unsecvars.h
+--- glibc-2.3.3.old/sysdeps/generic/unsecvars.h	2004-09-16 15:03:11.000000000 -0400
++++ glibc-2.3.3/sysdeps/generic/unsecvars.h	2004-09-16 15:04:58.000000000 -0400
+@@ -3,6 +3,8 @@
+    with a '\0' explicitly.  */
+ #define UNSECURE_ENVVARS \
+   "LD_PRELOAD\0"							      \
++  "LD_DEBUG\0"								      \
++  "LD_TRACE_PRELINKING\0"							      \
+   "LD_LIBRARY_PATH\0"							      \
+   "LD_ORIGIN_PATH\0"							      \
+   "LD_DEBUG_OUTPUT\0"							      \
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20040928 b/sys-libs/glibc/files/digest-glibc-2.3.4.20040928
new file mode 100644
index 000000000000..6699c01bac1d
--- /dev/null
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20040928
@@ -0,0 +1,5 @@
+MD5 84dabbf0b9b5370793a416687d7b5252 glibc-2.3.3.tar.bz2 13298567
+MD5 2a138a32ffdb52fc1be54088d5d49420 glibc-manpages-2.3.4.tar.bz2 14759
+MD5 eabe1f4779fc27cde985b0713f930827 glibc-infopages-2.3.4.tar.bz2 1175502
+MD5 dc09b4c1a29f69232441f7f5abbcc7b9 glibc-hppa-patches-2004-08-24.tar.gz 9739
+MD5 93a175fb22d31dda3001b0d4a8e9b273 glibc-2.3.4-branch-update-20040928.patch.bz2 2696643
diff --git a/sys-libs/glibc/glibc-2.3.4.20040928.ebuild b/sys-libs/glibc/glibc-2.3.4.20040928.ebuild
new file mode 100644
index 000000000000..e49d4edeeafc
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.3.4.20040928.ebuild
@@ -0,0 +1,875 @@
+# 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.20040928.ebuild,v 1.1 2004/09/28 13:23:37 lv Exp $
+
+inherit eutils flag-o-matic gcc
+
+# Branch update support.  Following will disable:
+#  BRANCH_UPDATE=
+BRANCH_UPDATE="20040928"
+
+# Minimum kernel version we support
+# (Recent snapshots fails with 2.6.5 and earlier)
+# also, we do not have a single 2.4 kernel in the tree with backported
+# support required to enable nptl.
+MIN_KERNEL_VERSION="2.6.5"
+
+
+if [ -z "${BRANCH_UPDATE}" ]; then
+	BASE_PV="${NEW_PV}"
+	NEW_PV="${NEW_PV}"
+else
+	BASE_PV="2.3.3"
+	NEW_PV="${PV%.*}"
+fi
+
+
+S="${WORKDIR}/${PN}-${BASE_PV}"
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="http://sources.redhat.com/glibc/"
+
+HPPA_PATCHES=2004-08-24
+
+SRC_URI="http://dev.gentoo.org/~lv/${PN}-${BASE_PV}.tar.bz2
+	http://dev.gentoo.org/~lv/${PN}-manpages-${NEW_PV}.tar.bz2
+	http://dev.gentoo.org/~lv/glibc-infopages-${NEW_PV}.tar.bz2
+	hppa? ( http://parisc-linux.org/~carlos/glibc-work/glibc-hppa-patches-${HPPA_PATCHES}.tar.gz )"
+
+[ ! -z "${BRANCH_UPDATE}" ] && SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~lv/${PN}-${NEW_PV}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2.2"
+#KEYWORDS="-* ~x86 ~amd64 ~hppa ~ppc64 ~ppc"
+KEYWORDS="-*"
+IUSE="nls pic build nptl nptlonly erandom hardened multilib debug userlocales"
+RESTRICT="nostrip" # we'll handle stripping ourself #46186
+
+# We need new cleanup attribute support from gcc for NPTL among things ...
+# We also need linux26-headers 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.5 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="virtual/os-headers
+	sys-apps/baselayout
+	nls? ( sys-devel/gettext )"
+
+PROVIDE="virtual/glibc virtual/libc"
+
+
+# (very) Theoretical cross-compiler support
+[ -z "${CCHOST}" ] && CCHOST="${CHOST}"
+
+# We need to be able to set alternative headers for compiling for non-native
+# platforms.
+# Will also become useful for testing kernel-headers without screwing up
+# the whole system.
+# note: intentionally undocumented.
+[ -z "${ALT_HEADERS}" ] && ALT_HEADERS="${ROOT}/usr/include"
+
+
+setup_flags() {
+	# Over-zealous CFLAGS can often cause problems.  What may work for one person may not
+	# work for another.  To avoid a large influx of bugs relating to failed builds, we
+	# strip most CFLAGS out to ensure as few problems as possible.
+	strip-flags
+	strip-unsupported-flags
+
+	# -freorder-blocks for all but ppc
+	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.
+		filter-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) and flags known to fail
+			filter-flags "-mcpu=ultrasparc -mcpu=v9 -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
+
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+		# broken in 3.4.x
+		replace-flags -march=pentium-m -mtune=pentium3
+	fi
+
+	if gcc -v 2>&1 | grep -q 'gcc version 3.[0123]'; then
+		append-flags -finline-limit=2000
+	fi
+
+	# We don't want these flags for glibc
+	filter-flags -fomit-frame-pointer -malign-double
+	filter-ldflags -pie
+
+	# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
+	append-flags -O2
+	export LDFLAGS="${LDFLAGS//-Wl,--relax}"
+}
+
+
+check_kheader_version() {
+	local header="${ALT_HEADERS}/linux/version.h"
+
+	[ -z "$1" ] && return 1
+
+	if [ -f "${header}" ]; then
+		local version="`grep 'LINUX_VERSION_CODE' ${header} | \
+			sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::'`"
+
+		if [ "${version}" -ge "$1" ]; then
+			return 0
+		fi
+	fi
+
+	return 1
+}
+
+
+check_nptl_support() {
+	local min_kernel_version="$(KV_to_int "${MIN_KERNEL_VERSION}")"
+
+	echo
+
+	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
+
+	# Building fails on an non-supporting kernel
+	einfon "Checking kernel version (>=${MIN_KERNEL_VERSION}) ... "
+	if [ "`get_KV`" -lt "${min_kernel_version}" ]; then
+		echo "no"
+		echo
+		eerror "You need a kernel of at least version ${MIN_KERNEL_VERSION}"
+		eerror "for NPTL support!"
+		die "Kernel version too low!"
+	else
+		echo "yes"
+	fi
+
+	# Building fails with too low linux-headers
+	einfon "Checking linux-headers version (>=${MIN_KERNEL_VERSION}) ... "
+	if ! check_kheader_version "${min_kernel_version}"; then
+		echo "no"
+		echo
+		eerror "You need linux-headers of at least version ${MIN_KERNEL_VERSION}"
+		eerror "for NPTL support!"
+		die "linux-headers version too low!"
+	else
+		echo "yes"
+	fi
+
+	echo
+}
+
+
+want_nptl() {
+	if use nptl || use nptlonly ; then
+		# Archs that can use NPTL
+		if use amd64 || use ia64 || use ppc || \
+		   use ppc64 || use s390 || use sparc; then
+			return 0
+		fi
+
+		# Specific x86 CHOSTS that can use NPTL
+		if use x86; then
+			case "${CHOST/-*}" in
+				i486|i586|i686)	return 0 ;;
+			esac
+		fi
+	fi
+
+	return 1
+}
+
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	if use amd64 || use alpha || use ia64 || use ppc || \
+	   use ppc64 || use s390 || use sparc; then
+		return 0
+	fi
+
+	# Specific x86 CHOSTS that can use TLS
+	if use x86; then
+		case "${CHOST/-*}" in
+			i486|i586|i686)	return 0 ;;
+		esac
+
+	fi
+
+	return 1
+}
+
+
+do_makecheck() {
+	ATIME=`mount | awk '{ print $3,$6 }' | grep ^\/\  | grep noatime`
+	if [ "$ATIME" = "" ]; then
+		cd ${WORKDIR}/${MYMAINBUILDDIR}
+		make check || die
+	else
+		ewarn "remounting / without noatime option so that make check"
+		ewarn "does not fail!"
+		epause 2
+		mount / -o remount,atime
+		cd ${WORKDIR}/${MYMAINBUILDDIR}
+		make check || die
+		einfo "remounting / with noatime"
+		mount / -o remount,noatime
+	fi
+}
+
+
+install_locales() {
+	unset LANGUAGE LANG LC_ALL
+	cd ${WORKDIR}/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
+	make PARALLELMFLAGS="${MAKEOPTS}" \
+		install_root=${D} localedata/install-locales || die
+	keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
+}
+
+
+setup_locales() {
+	if use !userlocales ; then
+		einfo "userlocales not enabled, installing -ALL- locales..."
+		install_locales || die
+	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() {
+	# 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
+
+	# give some sort of warning about the nptl logic changes...
+	if want_nptl && use !nptlonly ; then
+		ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the"
+		ewarn "glibc from almost every other distribution out there. This means"
+		ewarn "that glibc is compiled -twice-, once with linuxthreads and once"
+		ewarn "with nptl. The NPTL version is installed to lib/tls and is still"
+		ewarn "used by default. If you do not need nor want the linuxthreads"
+		ewarn "fallback, you can disable this behavior by adding nptlonly to"
+		ewarn "USE to save yourself some compile time."
+		ebeep
+		epause
+	fi
+}
+
+
+do_arch_amd64_patches() {
+	cd ${S};
+	# CONF_LIBDIR support
+	epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
+	sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
+}
+
+
+do_arch_alpha_patches() {
+	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
+}
+
+
+do_arch_arm_patches() {
+	cd ${S};
+
+	# Any needed patches for arm go here
+	epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-arm-ioperm.patch
+}
+
+
+do_arch_hppa_patches() {
+	einfo "Applying hppa specific path of ${HPPA_PATCHES} ..."
+	cd ${T}
+	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
+	cd ${S}
+	export EPATCH_OPTS=-p1
+	for i in ${T}/glibc-hppa-patches-${HPPA_PATCHES}/*.diff
+	do
+		epatch ${i}
+	done
+
+	use hardened && epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch
+
+}
+
+
+do_arch_ia64_patches() {
+	cd ${S};
+
+	# 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
+
+#	epatch ${FILESDIR}/2.3.2/${LOCAL_P}-ia64-LOAD_ARGS-fixup.patch
+}
+
+
+do_arch_mips_patches() {
+	cd ${S}
+
+	# 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
+	epatch ${FILESDIR}/2.3.3/mips-addabi.diff
+	epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff
+	epatch ${FILESDIR}/2.3.3/mips-sysify.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
+}
+
+
+do_arch_ppc_patches() {
+	cd ${S};
+	# Any needed patches for ppc go here
+}
+
+
+do_arch_ppc64_patches() {
+	cd ${S};
+	# Any needed patches for ppc64 go here
+}
+
+
+do_arch_s390_patches() {
+	cd ${S};
+
+	# Any needed patches for s390 go here
+}
+
+
+do_arch_sparc_patches() {
+	cd ${S};
+
+	# Any needed patches for sparc go here
+}
+
+
+do_arch_x86_patches() {
+	cd ${S};
+	# CONF_LIBDIR support
+	epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
+	sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
+}
+
+
+do_pax_patches() {
+	cd ${S}
+
+	# 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 the redhat patch included, the above is no longer needed.
+
+	# 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 || epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-dl_execstack-PaX-support.patch
+
+	# Program header support for PaX.
+	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.4/glibc-2.3.4.20040808-i386-got-fix.diff
+}
+
+
+do_hardened_fixes() {
+	# this patch is needed to compile nptl with a hardened gcc
+	has_hardened && want_nptl && \
+		epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch
+}
+
+
+do_ssp_patches() {
+	# 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" ] && [ "${ARCH}" != "hppa64" ]; then
+		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
+}
+
+
+do_fedora_patches() {
+	pushd ${S} > /dev/null
+
+	# go team ramdom nptl stuff
+	want_nptl && epatch ${S}/fedora/glibc-nptl-check.patch
+
+	(use x86 || use alpha || use sparc) || rm -rf glibc-compat
+	rm -f sysdeps/alpha/alphaev6/memcpy.S
+	find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \;
+	touch `find . -name configure`
+
+	# If gcc supports __thread, test it even in --with-tls --without-__thread
+	# builds.
+	if echo '__thread int a;' | $GCC -xc - -S -o /dev/null 2>/dev/null; then
+		sed -i -e 's~0 ||~1 ||~' ./elf/tst-tls10.h ./linuxthreads/tst-tls1.h
+	fi
+
+	popd > /dev/null
+}
+
+src_unpack() {
+	# Check NPTL support _before_ we unpack things to save some time
+	want_nptl && check_nptl_support
+
+	unpack ${PN}-${BASE_PV}.tar.bz2
+
+	# Extract pre-made man pages.
+	# Otherwise we need perl, which is bad (especially for stage1 bootstrap)
+	mkdir -p ${S}/man
+	cd ${S}/man
+	unpack ${PN}-manpages-${NEW_PV}.tar.bz2
+	cd ${S}
+
+	if [ -n "${BRANCH_UPDATE}" ]; then
+		epatch ${DISTDIR}/${PN}-${NEW_PV}-branch-update-${BRANCH_UPDATE}.patch.bz2
+
+		# Snapshot date patch
+		einfo "Patching version to display snapshot date ..."
+		sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h
+	fi
+	# Version patch
+	sed -i -e "s:\(#define VERSION\).*:\1 \"${NEW_PV}\":" version.h
+
+	# pre-generated info pages
+	unpack glibc-infopages-2.3.4.tar.bz2
+
+	# redhat stuffs
+	do_fedora_patches
+
+	# SSP support in glibc (where it belongs)
+	do_ssp_patches
+
+	# PaX-related Patches
+	do_pax_patches
+
+	# disable binutils -as-needed
+	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
+
+	# hardened toolchain/relro/nptl/security/etc fixes
+	do_hardened_fixes
+
+
+	# Arch specific patching
+	use amd64	&& do_arch_amd64_patches
+	use alpha	&& do_arch_alpha_patches
+	use arm		&& do_arch_arm_patches
+	use hppa	&& do_arch_hppa_patches
+	use ia64	&& do_arch_ia64_patches
+	use mips	&& do_arch_mips_patches
+	use ppc		&& do_arch_ppc_patches
+	use ppc64	&& do_arch_ppc64_patches
+	use s390	&& do_arch_s390_patches
+	use sparc	&& do_arch_sparc_patches
+	use x86		&& do_arch_x86_patches
+
+
+	# Remaining patches
+	cd ${S}
+	epatch ${FILESDIR}/2.3.4/glibc-sec-hotfix-20040916.patch
+
+	# Fix permissions on some of the scripts
+	chmod u+x ${S}/scripts/*.sh
+}
+
+
+glibc_do_configure() {
+	local myconf
+
+	setup_flags
+
+	# These should not be set, else the
+	# zoneinfo do not always get installed ...
+	unset LANGUAGE LANG LC_ALL
+	# silly users
+	unset LD_RUN_PATH
+
+	# set addons
+	pushd ${S} > /dev/null
+	ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d')
+	popd > /dev/null
+
+	use nls || myconf="${myconf} --disable-nls"
+	use erandom || myconf="${myconf} --disable-dev-erandom"
+
+	if [ "$1" == "linuxthreads" ] ; then
+		want_tls && myconf="${myconf} --with-tls --without-__thread"
+		want_tls || myconf="${myconf} --without-tls --without-__thread"
+		myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}"
+		myconf="${myconf} --enable-kernel=2.4.1"
+	elif [ "$1" == "nptl" ] ; then
+		want_nptl && myconf="${myconf} --with-tls --with-__thread"
+		myconf="${myconf} --enable-add-ons=nptl${ADDONS}"
+		myconf="${myconf} --enable-kernel=${MIN_KERNEL_VERSION}"
+	else
+		die "invalid pthread option"
+	fi
+
+	myconf="${myconf} --without-cvs
+			--enable-bind-now
+			--build=${CHOST}
+			--host=${CCHOST}
+			--disable-profile
+			--without-gd
+			--with-headers=${ALT_HEADERS}
+			--prefix=/usr
+			--mandir=/usr/share/man
+			--infodir=/usr/share/info
+			--libexecdir=/usr/lib/misc"
+
+	GBUILDDIR="${WORKDIR}/build-${CCHOST}-$1"
+	rm -rf ${GBUILDDIR}
+	mkdir -p ${GBUILDDIR}
+	cd ${GBUILDDIR}
+	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	${S}/configure ${myconf} || die "failed to configure glibc"
+}
+
+
+src_compile() {
+	# do the linuxthreads build unless we're using nptlonly
+	if use !nptlonly ; then
+		glibc_do_configure linuxthreads
+		einfo "Building GLIBC with linuxthreads..."
+		make PARALLELMFLAGS="${MAKEOPTS}" || die
+	fi
+	if want_nptl ; then
+		# ...and then do the optional nptl build
+		unset LD_ASSUME_KERNEL || :
+		glibc_do_configure nptl
+		einfo "Building GLIBC with NPTL..."
+		make PARALLELMFLAGS="${MAKEOPTS}" || die
+	fi
+}
+
+src_install() {
+	setup_flags
+
+	# These should not be set, else the
+	# zoneinfo do not always get installed ...
+	unset LANGUAGE LANG LC_ALL
+
+	if use nptlonly ; then
+		MYMAINBUILDDIR=build-${CCHOST}-nptl
+	else
+		MYMAINBUILDDIR=build-${CCHOST}-linuxthreads
+	fi
+
+	if use !nptlonly ; then
+		cd ${WORKDIR}/build-${CCHOST}-linuxthreads
+		einfo "Installing GLIBC with linuxthreads..."
+		make PARALLELMFLAGS="${MAKEOPTS}" \
+			install_root=${D} \
+			install || die
+	elif use nptlonly ; then
+		cd ${WORKDIR}/build-${CCHOST}-nptl
+		einfo "Installing GLIBC with NPTL..."
+		make PARALLELMFLAGS="${MAKEOPTS}" \
+			install_root=${D} \
+			install || die
+	fi
+
+	if use !nptlonly && want_nptl ; then
+		einfo "Installing NPTL to $(get_libdir)/tls/..."
+		cd ${WORKDIR}/build-${CCHOST}-nptl
+		mkdir -p ${D}/$(get_libdir)/tls/
+
+		libcsofile=$(basename ${D}/$(get_libdir)/libc-*.so)
+		cp -a libc.so ${D}/$(get_libdir)/tls/${libcsofile} || die
+		dosym ${libcsofile} /$(get_libdir)/tls/$(ls libc.so.*)
+
+		libmsofile=$(basename ${D}/$(get_libdir)/libm-*.so)
+		pushd math > /dev/null
+		cp -a libm.so ${D}/$(get_libdir)/tls/${libmsofile} || die
+		dosym ${libmsofile} /$(get_libdir)/tls/$(ls libm.so.*)
+		popd > /dev/null
+
+		librtsofile=$(basename ${D}/$(get_libdir)/librt-*.so)
+		pushd rt > /dev/null
+		cp -a librt.so ${D}/$(get_libdir)/tls/${librtsofile} || die
+		dosym ${librtsofile} /$(get_libdir)/tls/$(ls librt.so.*)
+		popd > /dev/null
+
+		libthreaddbsofile=$(basename ${D}/$(get_libdir)/libthread_db-*.so)
+		pushd nptl_db > /dev/null
+		cp -a libthread_db.so ${D}/$(get_libdir)/tls/${libthreaddbsofile} || die
+		dosym ${libthreaddbsofile} /$(get_libdir)/tls/$(ls libthread_db.so.*)
+		popd > /dev/null
+
+		libpthreadsofile=libpthread-${NEW_PV}.so
+		cp -a nptl/libpthread.so ${D}/$(get_libdir)/tls/${libpthreadsofile} || die
+		dosym ${libpthreadsofile} /$(get_libdir)/tls/libpthread.so.0
+
+		# and now for the static libs
+		mkdir -p ${D}/usr/$(get_libdir)/nptl
+		cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \
+			${D}/usr/$(get_libdir)/nptl
+		# linker script crap
+		sed "s~/$(get_libdir)/~/$(get_libdir)/tls/~" ${D}/usr/$(get_libdir)/libc.so \
+			> ${D}/usr/$(get_libdir)/nptl/libc.so
+
+		sed "s~/$(get_libdir)/~/$(get_libdir)/tls/~" ${D}/usr/$(get_libdir)/libpthread.so \
+			> ${D}/usr/$(get_libdir)/nptl/libpthread.so
+		sed -i -e "s~/usr/lib64/~/usr/lib64/nptl/~" ${D}/usr/$(get_libdir)/nptl/libpthread.so
+
+		dosym ../${librtsofile} /usr/$(get_libdir)/nptl/librt.so
+
+		# last but not least... headers.
+		mkdir -p ${D}/nptl ${D}/usr/include/nptl
+		make install_root=${D}/nptl install-headers PARALLELMFLAGS="${MAKEOPTS}"
+		pushd ${D}/nptl/usr/include > /dev/null
+			for i in `find . -type f`; do
+				if ! [ -f ${D}/usr/include/$i ] \
+					|| ! cmp -s $i ${D}/usr/include/$i; then
+				mkdir -p ${D}/usr/include/nptl/`dirname $i`
+				cp -a $i ${D}/usr/include/nptl/$i
+			fi
+		done
+		rm -rf ${D}/nptl
+	fi
+
+	# now, strip everything but the thread libs #46186
+	mkdir -p ${T}/thread-backup
+	mv ${D}/$(get_libdir)/lib{pthread,thread_db}* ${T}/thread-backup/
+	if use !nptlonly && want_nptl ; then
+		mkdir -o ${T}/thread-backup/tls
+		mv ${D}/$(get_libdir)/tls/lib{pthread,thread_db}* ${T}/thread-backup/tls
+	fi
+	env -uRESTRICT prepallstrip
+	cp -R ${T}/thread-backup/* ${D}/lib/
+
+	# If librt.so is a symlink, change it into linker script (Redhat)
+	if [ -L "${D}/usr/$(get_libdir)/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then
+		local LIBRTSO="`cd ${D}/$(get_libdir); echo librt.so.*`"
+		local LIBPTHREADSO="`cd ${D}/$(get_libdir); echo libpthread.so.*`"
+
+		rm -f ${D}/usr/$(get_libdir)/librt.so
+		cat > ${D}/usr/$(get_libdir)/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/$(get_libdir)/libc.so >> ${D}/usr/$(get_libdir)/librt.so
+		echo "GROUP ( /$(get_libdir)/${LIBPTHREADSO} /$(get_libdir)/${LIBRTSO} )" \
+			>> ${D}/usr/$(get_libdir)/librt.so
+
+		for x in ${D}/usr/$(get_libdir)/librt.so.[1-9]; do
+			[ -L "${x}" ] && rm -f ${x}
+		done
+	fi
+
+	if ! use build; then
+		cd ${WORKDIR}/${MYMAINBUILDDIR}
+
+		if ! has noinfo ${FEATURES} ; then
+			einfo "Installing Info pages..."
+			make PARALLELMFLAGS="${MAKEOPTS}" \
+				install_root=${D} \
+				info -i
+		fi
+
+		setup_locales
+
+		einfo "Installing man pages and docs..."
+		# Install linuxthreads man pages even if nptl is enabled
+		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/$(get_libdir)/gconv
+
+		einfo "Installing Timezone data..."
+		cd ${WORKDIR}/${MYMAINBUILDDIR}
+		make PARALLELMFLAGS="${MAKEOPTS}" \
+			install_root=${D} \
+			timezone/install-others -C ${MYMAINBUILDDIR} || 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
+
+	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
+}
+
+fix_lib64_symlinks() {
+	# the original Gentoo/AMD64 devs decided that since 64bit is the native
+	# bitdepth for AMD64, lib should be used for 64bit libraries. however,
+	# this ignores the FHS and breaks multilib horribly... especially
+	# since it wont even work without a lib64 symlink anyways. *rolls eyes*
+	# see bug 59710 for more information.
+	# Travis Tilley <lv@gentoo.org> (08 Aug 2004)
+	if [ -L ${ROOT}/lib64 ] ; then
+		ewarn "removing /lib64 symlink and moving lib to lib64..."
+		ewarn "dont hit ctrl-c until this is done"
+		addwrite ${ROOT}/
+		rm ${ROOT}/lib64
+		# now that lib64 is gone, nothing will run without calling ld.so
+		# directly. luckily the window of brokenness is almost non-existant
+		/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		# all better :)
+		ldconfig
+		ln -s lib64 ${ROOT}/lib
+		einfo "done! :-)"
+		einfo "fixed broken lib64/lib symlink in ${ROOT}"
+	fi
+	if [ -L ${ROOT}/usr/lib64 ] ; then
+		addwrite ${ROOT}/usr
+		rm ${ROOT}/usr/lib64
+		mv ${ROOT}/usr/lib ${ROOT}/usr/lib64
+		ln -s lib64 ${ROOT}/usr/lib
+		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr"
+	fi
+	if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then
+		addwrite ${ROOT}/usr/X11R6
+		rm ${ROOT}/usr/X11R6/lib64
+		mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64
+		ln -s lib64 ${ROOT}/usr/X11R6/lib
+		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6"
+	fi
+}
+
+pkg_preinst() {
+	# PPC64+others may want to eventually be added to this logic if they
+	# decide to be multilib compatible and FHS compliant. note that this 
+	# chunk of FHS compliance only applies to 64bit archs where 32bit
+	# compatibility is a major concern (not IA64, for example).
+	use amd64 && [ "$(get_libdir)" == "lib64" ] && fix_lib64_symlinks
+}
+
+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
+}