updated to the fedora-branch snap in fedora's 2.3.3-73 src rpm and removed the glibc 2.0 compat (libNoVersion) changes

7 files changed, 1039 insertions, 22 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 1f0f82bb45fe..e9b9aec52d58 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,15 @@
 # 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.280 2004/10/19 19:52:14 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.281 2004/10/27 03:37:23 lv Exp $
+
+*glibc-2.3.4.20041021 (26 Oct 2004)
+
+  26 Oct 2004; Travis Tilley <lv@gentoo.org>
+  +files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch,
+  +files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch,
+  glibc-2.3.4.20041006.ebuild, +glibc-2.3.4.20041021.ebuild:
+  updated to the fedora-branch snap in fedora's 2.3.3-73 src rpm and removed the
+  glibc 2.0 compat (libNoVersion) changes
 
   19 Oct 2004; Tom Gall <tgall@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
   sane fix for problem mentioned below
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 8b1802e97e65..5652bec8009b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,16 +1,14 @@
-MD5 b8432c444e99679da663e310ac65f532 ChangeLog 57977
 MD5 7cf88dee2671dcc30659d07241b8d918 glibc-2.2.5-r9.ebuild 10915
+MD5 3603fa6448052edcf78a329d10746461 glibc-2.3.2-r12.ebuild 20530
 MD5 daf5c4924c0a0ccc6e55f7588b1b4d52 glibc-2.3.3.20040420-r2.ebuild 21765
 MD5 af6f1491a70a6ee80e8d867d8ee0f98f glibc-2.3.4.20040619-r2.ebuild 20997
-MD5 e4c331e4587e12f1ef96914a55da9234 glibc-2.3.4.20041006.ebuild 25990
-MD5 3603fa6448052edcf78a329d10746461 glibc-2.3.2-r12.ebuild 20530
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 ac8cbd194b0e622f368f12f876f732a7 glibc-2.3.4.20040808-r1.ebuild 23089
+MD5 b8432c444e99679da663e310ac65f532 ChangeLog 57977
+MD5 006b0e5f6eacbadd8ed84b4fa7514348 glibc-2.3.4.20041006.ebuild 25751
+MD5 cecb026cb8096238f5647cbdd2262086 .glibc-2.3.4.20041021.ebuild.swp 40960
+MD5 38f6b148588921a25bc942ce943fdd51 glibc-2.3.4.20041021.ebuild 25649
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
-MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
-MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307
-MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382
-MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
 MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
 MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
@@ -24,7 +22,9 @@ MD5 bedcd868a9462009158714238594173c files/nscd 964
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
-MD5 add6c542940ecab2c890d642760d974b files/digest-glibc-2.3.4.20041006 383
+MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
+MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
+MD5 123d66ef523985c88c77af1ab1fc2d56 files/digest-glibc-2.3.4.20041021 383
 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
@@ -112,13 +112,13 @@ MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-sha
 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 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 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
 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 e78cc048b738241cda35941e87da7b66 files/2.3.4/glibc-2.3.3-mdns-resolver.diff 10379
 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
 MD5 7fca8a203196513f13e519903dedbfd5 files/2.3.4/glibc-2.3.4-getcontext.patch 9854
 MD5 d490f38bd9ca9c48a9799f1e48629f6e files/2.3.4/glibc-2.3.4-mips-generate-syscall_h.patch 8230
-MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
+MD5 e78cc048b738241cda35941e87da7b66 files/2.3.4/glibc-2.3.3-mdns-resolver.diff 10379
 MD5 fe21fd44628b90f50e5024462cf4c348 files/2.3.4/glibc-2.3.4-res_init.patch 3417
diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch
new file mode 100644
index 000000000000..ed0c993711f3
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch
@@ -0,0 +1,57 @@
+--- glibc-2.3.3.old/elf/rtld.c	2004-10-26 21:41:41.989117872 -0400
++++ glibc-2.3.3/elf/rtld.c	2004-10-26 21:45:15.015732904 -0400
+@@ -1087,53 +1087,6 @@
+   ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded;
+   ++GL(dl_load_adds);
+ 
+-#if defined(__i386__)
+-  /* Force non-TLS libraries for glibc 2.0 binaries
+-     or if a buggy binary references non-TLS errno or h_errno.  */
+-  if (__builtin_expect (main_map->l_info[DT_NUM + DT_THISPROCNUM
+-                                         + DT_VERSIONTAGIDX (DT_VERNEED)]
+-                        == NULL, 0)
+-      && main_map->l_info[DT_DEBUG])
+-    GLRO(dl_osversion) = 0x20205;
+-  else if ((__builtin_expect (mode, normal) != normal
+-	    || main_map->l_info[ADDRIDX (DT_GNU_LIBLIST)] == NULL)
+-	      /* Only binaries have DT_DEBUG dynamic tags...  */
+-	   && main_map->l_info[DT_DEBUG])
+-    {
+-      /* Workaround for buggy binaries.  This doesn't handle buggy
+-	 libraries.  */
+-      bool buggy = false;
+-      const ElfW(Sym) *symtab = (const void *) D_PTR (main_map,
+-                                                      l_info[DT_SYMTAB]);
+-      const char *strtab = (const void *) D_PTR (main_map,
+-                                                 l_info[DT_STRTAB]);
+-      Elf_Symndx symidx;
+-      for (symidx = main_map->l_buckets[0x6c994f % main_map->l_nbuckets];
+-	   symidx != STN_UNDEF;
+-	   symidx = main_map->l_chain[symidx])
+-	{
+-	  if (__builtin_expect (strcmp (strtab + symtab[symidx].st_name,
+-					"errno") == 0, 0)
+-	      && ELFW(ST_TYPE) (symtab[symidx].st_info) != STT_TLS)
+-	    buggy = true;
+-	}
+-      for (symidx = main_map->l_buckets[0xe5c992f % main_map->l_nbuckets];
+-	   symidx != STN_UNDEF;
+-	   symidx = main_map->l_chain[symidx])
+-	{
+-	  if (__builtin_expect (strcmp (strtab + symtab[symidx].st_name,
+-					"h_errno") == 0, 0)
+-	      && ELFW(ST_TYPE) (symtab[symidx].st_info) != STT_TLS)
+-	    buggy = true;
+-	}
+-      if (__builtin_expect (buggy, false) && GLRO(dl_osversion) > 0x20401)
+-	{
+-	  GLRO(dl_osversion) = 0x20401;
+-	  _dl_error_printf ("Incorrectly built binary which accesses errno or h_errno directly. Needs to be fixed.\n");
+-	}
+-    }
+-#endif
+-
+   /* If LD_USE_LOAD_BIAS env variable has not been seen, default
+      to not using bias for non-prelinked PIEs and libraries
+      and using it for executables or prelinked PIEs or libraries.  */
+
diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch
new file mode 100644
index 000000000000..34aed0fa7f96
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch
@@ -0,0 +1,70 @@
+--- glibc-2.3.3.old/elf/rtld.c	2004-10-26 21:41:41.989117872 -0400
++++ glibc-2.3.3/elf/rtld.c	2004-10-26 21:45:15.015732904 -0400
+@@ -1306,67 +1259,6 @@
+ 	}
+     }
+ 
+-
+-#if defined(__i386__) || defined(__alpha__) || (defined(__sparc__) && !defined(__arch64__))
+-  /*
+-   * Modifications by Red Hat Software
+-   *
+-   * Deal with the broken binaries from the non-versioned ages of glibc.
+-   * If a binary does not have version information enabled, we assume that
+-   * it is a glibc 2.0 binary and we load a compatibility library to try to
+-   * overcome binary incompatibilities.
+-   *			Blame: gafton@redhat.com
+-   */
+-#define LIB_NOVERSION "/lib/libNoVersion.so.1"
+-
+-  if (__builtin_expect (main_map->l_info[DT_NUM + DT_THISPROCNUM
+-                                         + DT_VERSIONTAGIDX (DT_VERNEED)]
+-                        == NULL, 0)
+-      && (main_map->l_info[DT_DEBUG]
+-          || !(GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)))
+-    {
+-      struct stat test_st;
+-      int test_fd;
+-      int can_load;
+-      
+-      HP_TIMING_NOW (start);
+-	   
+-/*       _dl_sysdep_message("Loading compatibility library... ", NULL); */
+-
+-      can_load = 1;
+-      test_fd = __open (LIB_NOVERSION, O_RDONLY);
+-      if (test_fd < 0) {
+-	  can_load = 0;
+-/* 	  _dl_sysdep_message(" Can't find " LIB_NOVERSION "\n",  NULL); */
+-      } else {
+-	  if (__fxstat (_STAT_VER, test_fd, &test_st) < 0 || test_st.st_size == 0) {
+-	      can_load = 0;
+-/* 	      _dl_sysdep_message(" Can't stat " LIB_NOVERSION "\n",  NULL); */
+-	  }
+-      }
+-      
+-      if (test_fd >= 0) /* open did no fail.. */
+-	  __close(test_fd); /* avoid fd leaks */
+-
+-      if (can_load != 0) {
+-	  struct link_map *new_map;
+-	  new_map = _dl_map_object (main_map, LIB_NOVERSION,
+-				    1, lt_library, 0, 0, LM_ID_BASE);
+-	  if (++new_map->l_opencount == 1) {
+-	      /* It is no duplicate.  */
+-	      ++npreloads;
+-/* 	      _dl_sysdep_message(" DONE\n", NULL); */
+-	  } else {
+-/* 	      _dl_sysdep_message(" FAILED\n", NULL); */
+-	  }
+-      }
+-	  
+-      HP_TIMING_NOW (stop);
+-      HP_TIMING_DIFF (diff, start, stop);
+-      HP_TIMING_ACCUM_NT (load_time, diff);
+-    }
+-#endif
+-
+   if (__builtin_expect (npreloads, 0) != 0)
+     {
+       /* Set up PRELOADS with a vector of the preloaded libraries.  */
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20041021 b/sys-libs/glibc/files/digest-glibc-2.3.4.20041021
new file mode 100644
index 000000000000..33f2939c6efa
--- /dev/null
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20041021
@@ -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 20cba284227f9ab99e504a88b3759f3c glibc-hppa-patches-2004-09-30.tar.gz 16407
+MD5 3439e70cd9b10bb25ad3d8f897fe5cf0 glibc-2.3.4-branch-update-20041021.patch.bz2 2778676
diff --git a/sys-libs/glibc/glibc-2.3.4.20041006.ebuild b/sys-libs/glibc/glibc-2.3.4.20041006.ebuild
index 85c7b10accc1..8104933c5e48 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041006.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041006.ebuild
@@ -1,6 +1,6 @@
 # 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.20041006.ebuild,v 1.7 2004/10/16 04:49:56 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041006.ebuild,v 1.8 2004/10/27 03:37:23 lv Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -277,15 +277,6 @@ setup_locales() {
 
 
 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"
diff --git a/sys-libs/glibc/glibc-2.3.4.20041021.ebuild b/sys-libs/glibc/glibc-2.3.4.20041021.ebuild
new file mode 100644
index 000000000000..f1b9ad529c3f
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.3.4.20041021.ebuild
@@ -0,0 +1,885 @@
+# 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.20041021.ebuild,v 1.1 2004/10/27 03:37:23 lv Exp $
+
+inherit eutils flag-o-matic gcc
+
+# Branch update support.  Following will disable:
+#  BRANCH_UPDATE=
+BRANCH_UPDATE="20041021"
+
+# 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-09-30
+
+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 )"
+# until we compile the 32bit glibc here
+PDEPEND="amd64? ( multilib? ( app-emulation/emul-linux-x86-glibc ) )"
+
+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() {
+	# 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
+
+	unset EPATCH_OPTS
+
+	use hardened && epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch
+
+	einfo "Done with hppa patches."
+
+}
+
+
+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
+
+	# remove the fedora-branch glibc 2.0 compat stuff.
+	rm -rf glibc-compat
+	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch
+	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch
+
+	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
+
+	# multicast DNS aka rendezvous support
+	epatch ${FILESDIR}/2.3.4/glibc-2.3.3-mdns-resolver.diff
+
+	# 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 -p ${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}/$(get_libdir)/ || die
+
+	# 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
+		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
+
+		cd ${S}
+		dodoc BUGS ChangeLog* CONFORMANCE 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 || 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
+
+	must_exist /$(get_libdir)/ libpthread.so.0
+}
+
+must_exist() {
+	test -e ${D}/${1}/${2} || die "${1}/${2} was not installed"
+}
+
+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
+}