Add check for SSP from glibc head. Remove old glibc-2.3.5 (glibc-2.4) snapshots.

(Portage version: 2.1_pre3-r1)

11 files changed, 272 insertions, 2646 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index f6a66d08ca0f..130c70063623 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.423 2006/01/15 23:36:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.424 2006/01/18 21:09:10 halcy0n Exp $
+
+  18 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+  files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch,
+  +files/2.3.6/glibc-2.3.6-propolice-guard-functions.patch,
+  -glibc-2.3.5.20050421.ebuild, -glibc-2.3.5.20050722.ebuild,
+  glibc-2.3.6.ebuild, glibc-2.3.6-r1.ebuild, glibc-2.3.6-r2.ebuild:
+  Add check for SSP from glibc head. Remove old glibc-2.3.5 (glibc-2.4)
+  snapshots.
 
   15 Jan 2006; Joseph Jezak <josejx@gentoo.org> glibc-2.3.5-r3.ebuild,
   glibc-2.3.6-r2.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 1f5df2ad57a5..a67ea9af79ca 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 48c04a6419a0be1f5266152c6d4ebce3 ChangeLog 88347
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
@@ -92,9 +89,13 @@ MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch
 MD5 ee692cfc6e7c810a2785093948638bbc files/2.3.4/glibc234-alpha-xstat.patch 7653
 MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 MD5 76185820806d5641f0314281ceb4790b files/2.3.4/hppa-no-pie.patch 1265
+MD5 4b57423ea9714e066d67ed40511d6030 files/2.3.5.20050421/glibc-2.4-propolice-guard-functions.patch 8082
+MD5 dc33fefb4323367bcc0f4b6f9be388f2 files/2.3.5.20050722/glibc-2.4-propolice-guard-functions.patch 2041
 MD5 04bcec718f2883f28bf862b7e390d1b0 files/2.3.5/glibc-2.3.5-frandom-detect.patch 3080
-MD5 13dd059e6383c7cac94d1bda126af21d files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch 1302
+MD5 b51ca15b4264b21efbc9c134a700b0dc files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch 8188
 MD5 b3ce53b86060b6209a182366c501a0f1 files/2.3.5/ssp.c 4297
+MD5 ccdfcf351e42517c51e6bfa05fc9fb16 files/2.3.6/blah.patch 747
+MD5 cd9f2d49e38173b00a890e8c390e2ff6 files/2.3.6/glibc-2.3.6-propolice-guard-functions.patch 8218
 MD5 bed7cbcac1e8582deda43664e5b3f19c files/digest-glibc-2.2.5-r10 290
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
@@ -107,8 +108,8 @@ MD5 6a7b14ffb6320bc8c7fc73e86f6bb973 files/digest-glibc-2.3.5 518
 MD5 433ac29a7eb82cc504288c72af4de3fb files/digest-glibc-2.3.5-r1 516
 MD5 a839a12be46a8fa315fd6244a60e1886 files/digest-glibc-2.3.5-r2 516
 MD5 b91f86f93c20eea8553de49ce7db0614 files/digest-glibc-2.3.5-r3 516
-MD5 7a909f8df7cc20f37fb7553c8dcb47b4 files/digest-glibc-2.3.5.20050421 604
-MD5 e8833674518301b1dc7798d5f856aad4 files/digest-glibc-2.3.5.20050722 604
+MD5 914c6bee43f6288758cb03290fb04c49 files/digest-glibc-2.3.5.20050421 604
+MD5 e648cc412cc57be615620294f4f3ff8c files/digest-glibc-2.3.5.20050722 604
 MD5 ad9e56a2eed9290c3dbf504897220dce files/digest-glibc-2.3.6 517
 MD5 15dbb1ab3cff425b75d116a0202cf34a files/digest-glibc-2.3.6-r1 517
 MD5 dceca9a720556f97d4c0576f08b379d1 files/digest-glibc-2.3.6-r2 517
@@ -135,17 +136,10 @@ MD5 dcc9e5194707e88476804f3a43d65517 glibc-2.3.4.20050125-r1.ebuild 39583
 MD5 44f39e42f8ba51393ae4a1d9fc439732 glibc-2.3.5-r1.ebuild 40989
 MD5 8f1d6087f92a4a68c8b619349383b813 glibc-2.3.5-r2.ebuild 39315
 MD5 16f4e4474f9155a287345ec32a83f817 glibc-2.3.5-r3.ebuild 39393
-MD5 702c30c61eb97343e09dfde1033342b6 glibc-2.3.5.20050421.ebuild 40128
-MD5 7b8266a1773efaae98829ae076e68fe4 glibc-2.3.5.20050722.ebuild 39275
+MD5 707186df7a983c6c700392d6128a99ed glibc-2.3.5.20050421.ebuild 40135
+MD5 7dfe100691d12c344f05ebce348b6f2e glibc-2.3.5.20050722.ebuild 39282
 MD5 23af2c26bf05b7b899e05875ebc22af5 glibc-2.3.5.ebuild 40252
-MD5 cb57fb7f5c1539a9e483f18969f24285 glibc-2.3.6-r1.ebuild 42255
-MD5 03bc241338238032870ba22914817740 glibc-2.3.6-r2.ebuild 42763
-MD5 fdddacb97eda345a5ddb2fa326f70d15 glibc-2.3.6.ebuild 40583
+MD5 260cb5d295044683df3640637ed3459e glibc-2.3.6-r1.ebuild 42255
+MD5 f407e41866c52f49784ee24d28dc941e glibc-2.3.6-r2.ebuild 42763
+MD5 793f156d3703d9759593c9d125231c0d glibc-2.3.6.ebuild 40583
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDy2wf2+ySkm8kpY0RAibAAJ4p3XOH9qHNfwzr23PcxhIAmX8NJQCeKZUc
-K8rJPPLNaqtLrXN9Z4iEwxU=
-=Rsb3
------END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch b/sys-libs/glibc/files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
index 9b05ed65fc67..3a75cf1298af 100644
--- a/sys-libs/glibc/files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
+++ b/sys-libs/glibc/files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
@@ -1,5 +1,98 @@
---- glibc-2.3.5/sysdeps/generic/libc-start.c
-+++ glibc-2.3.5/sysdeps/generic/libc-start.c
+The configure check for SSP is taken from glibc HEAD.
+
+diff -ur glibc-2.3.5-orig/config.make.in glibc-2.3.5/config.make.in
+--- glibc-2.3.5-orig/config.make.in	2006-01-18 00:31:17.000000000 -0500
++++ glibc-2.3.5/config.make.in	2006-01-18 00:33:25.000000000 -0500
+@@ -61,6 +61,7 @@
+ have-selinux = @have_selinux@
+ have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
+ fno-unit-at-a-time = @fno_unit_at_a_time@
++have-ssp = @libc_cv_ssp@
+ bind-now = @bindnow@
+ 
+ static-libgcc = @libc_cv_gcc_static_libgcc@
+diff -ur glibc-2.3.5-orig/configure glibc-2.3.5/configure
+--- glibc-2.3.5-orig/configure	2006-01-18 00:31:17.000000000 -0500
++++ glibc-2.3.5/configure	2006-01-18 00:35:54.000000000 -0500
+@@ -313,7 +313,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie fno_unit_at_a_time libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie fno_unit_at_a_time libc_cv_ssp libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -5785,6 +5785,33 @@
+ fi
+ 
+ 
++echo "$as_me:$LINENO: checking for -fstack-protector" >&5
++echo $ECHO_N "checking for -fstack-protector... $ECHO_C" >&6
++if test "${libc_cv_ssp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat > conftest.c <<EOF
++int foo;
++main () { return 0;}
++EOF
++if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fstack-protector
++			    -o conftest conftest.c 1>&5'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }
++then
++  libc_cv_ssp=yes
++else
++  libc_cv_ssp=no
++fi
++rm -f conftest*
++fi
++echo "$as_me:$LINENO: result: $libc_cv_ssp" >&5
++echo "${ECHO_T}$libc_cv_ssp" >&6
++
++
+ if test $elf != yes; then
+   echo "$as_me:$LINENO: checking for .init and .fini sections" >&5
+ echo $ECHO_N "checking for .init and .fini sections... $ECHO_C" >&6
+@@ -8424,6 +8451,7 @@
+ s,@libc_cv_z_execstack@,$libc_cv_z_execstack,;t t
+ s,@libc_cv_fpie@,$libc_cv_fpie,;t t
+ s,@fno_unit_at_a_time@,$fno_unit_at_a_time,;t t
++s,@libc_cv_ssp@,$libc_cv_ssp,;t t
+ s,@libc_cv_have_initfini@,$libc_cv_have_initfini,;t t
+ s,@libc_cv_cpp_asm_debuginfo@,$libc_cv_cpp_asm_debuginfo,;t t
+ s,@no_whole_archive@,$no_whole_archive,;t t
+diff -ur glibc-2.3.5-orig/configure.in glibc-2.3.5/configure.in
+--- glibc-2.3.5-orig/configure.in	2006-01-18 00:31:17.000000000 -0500
++++ glibc-2.3.5/configure.in	2006-01-18 00:35:50.000000000 -0500
+@@ -1500,6 +1500,21 @@
+ fi
+ AC_SUBST(fno_unit_at_a_time)
+ 
++AC_CACHE_CHECK(for -fstack-protector, libc_cv_ssp, [dnl
++cat > conftest.c <<EOF
++int foo;
++main () { return 0;}
++EOF
++if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fstack-protector
++			    -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD])
++then
++  libc_cv_ssp=yes
++else
++  libc_cv_ssp=no
++fi
++rm -f conftest*])
++AC_SUBST(libc_cv_ssp)
++
+ if test $elf != yes; then
+   AC_CACHE_CHECK(for .init and .fini sections, libc_cv_have_initfini,
+ 		 [AC_TRY_COMPILE(, [asm (".section .init");
+diff -ur glibc-2.3.5-orig/sysdeps/generic/libc-start.c glibc-2.3.5/sysdeps/generic/libc-start.c
+--- glibc-2.3.5-orig/sysdeps/generic/libc-start.c	2006-01-18 00:31:35.000000000 -0500
++++ glibc-2.3.5/sysdeps/generic/libc-start.c	2006-01-18 00:30:39.000000000 -0500
 @@ -188,6 +188,9 @@
      GLRO(dl_debug_printf) ("\ntransferring control: %s\n\n", argv[0]);
  #endif
@@ -10,25 +103,30 @@
  #ifdef HAVE_CLEANUP_JMP_BUF
    /* Memory for the cancellation buffer.  */
    struct pthread_unwind_buf unwind_buf;
---- glibc-2.3.5/sysdeps/unix/sysv/linux/Dist
-+++ glibc-2.3.5/sysdeps/unix/sysv/linux/Dist
+diff -ur glibc-2.3.5-orig/sysdeps/unix/sysv/linux/Dist glibc-2.3.5/sysdeps/unix/sysv/linux/Dist
+--- glibc-2.3.5-orig/sysdeps/unix/sysv/linux/Dist	2006-01-18 00:31:35.000000000 -0500
++++ glibc-2.3.5/sysdeps/unix/sysv/linux/Dist	2006-01-18 00:30:39.000000000 -0500
 @@ -1,3 +1,4 @@
 +ssp.c
  bits/initspin.h
  cmsg_nxthdr.c
  dl-brk.c
---- glibc-2.3.5/sysdeps/unix/sysv/linux/Makefile
-+++ glibc-2.3.5/sysdeps/unix/sysv/linux/Makefile
-@@ -1,5 +1,6 @@
+diff -ur glibc-2.3.5-orig/sysdeps/unix/sysv/linux/Makefile glibc-2.3.5/sysdeps/unix/sysv/linux/Makefile
+--- glibc-2.3.5-orig/sysdeps/unix/sysv/linux/Makefile	2006-01-18 00:31:35.000000000 -0500
++++ glibc-2.3.5/sysdeps/unix/sysv/linux/Makefile	2006-01-18 00:33:03.000000000 -0500
+@@ -1,5 +1,8 @@
  ifeq ($(subdir),csu)
 -sysdep_routines += errno-loc
 +sysdep_routines += errno-loc ssp
++ifeq (yes,$(have-ssp))
 +CFLAGS-ssp.c += -fno-stack-protector
++endif
  endif
  
  ifeq ($(subdir),assert)
---- glibc-2.3.5/sysdeps/unix/sysv/linux/Versions
-+++ glibc-2.3.5/sysdeps/unix/sysv/linux/Versions
+diff -ur glibc-2.3.5-orig/sysdeps/unix/sysv/linux/Versions glibc-2.3.5/sysdeps/unix/sysv/linux/Versions
+--- glibc-2.3.5-orig/sysdeps/unix/sysv/linux/Versions	2006-01-18 00:31:35.000000000 -0500
++++ glibc-2.3.5/sysdeps/unix/sysv/linux/Versions	2006-01-18 00:30:39.000000000 -0500
 @@ -108,6 +108,8 @@
    GLIBC_2.3.2 {
      # New kernel interfaces.
diff --git a/sys-libs/glibc/files/2.3.6/glibc-2.3.6-propolice-guard-functions.patch b/sys-libs/glibc/files/2.3.6/glibc-2.3.6-propolice-guard-functions.patch
new file mode 100644
index 000000000000..8779a2c0f91e
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.6/glibc-2.3.6-propolice-guard-functions.patch
@@ -0,0 +1,138 @@
+The configure check for SSP was taken from glibc HEAD
+
+diff -ur glibc-2.3.6-orig/config.make.in glibc-2.3.6/config.make.in
+--- glibc-2.3.6-orig/config.make.in	2006-01-17 14:22:02.000000000 -0500
++++ glibc-2.3.6/config.make.in	2006-01-17 14:22:39.000000000 -0500
+@@ -62,6 +62,7 @@
+ have-libaudit = @have_libaudit@
+ have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
+ fno-unit-at-a-time = @fno_unit_at_a_time@
++have-ssp = @libc_cv_ssp@
+ bind-now = @bindnow@
+ 
+ static-libgcc = @libc_cv_gcc_static_libgcc@
+diff -ur glibc-2.3.6-orig/configure glibc-2.3.6/configure
+--- glibc-2.3.6-orig/configure	2006-01-17 14:22:17.000000000 -0500
++++ glibc-2.3.6/configure	2006-01-17 14:18:24.000000000 -0500
+@@ -313,7 +313,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie fno_unit_at_a_time libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD have_libaudit have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie fno_unit_at_a_time libc_cv_ssp libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD have_libaudit have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -5785,6 +5785,33 @@
+ fi
+ 
+ 
++echo "$as_me:$LINENO: checking for -fstack-protector" >&5
++echo $ECHO_N "checking for -fstack-protector... $ECHO_C" >&6
++if test "${libc_cv_ssp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat > conftest.c <<EOF
++int foo;
++main () { return 0;}
++EOF
++if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fstack-protector
++			    -o conftest conftest.c 1>&5'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }
++then
++  libc_cv_ssp=yes
++else
++  libc_cv_ssp=no
++fi
++rm -f conftest*
++fi
++echo "$as_me:$LINENO: result: $libc_cv_ssp" >&5
++echo "${ECHO_T}$libc_cv_ssp" >&6
++
++
+ if test $elf != yes; then
+   echo "$as_me:$LINENO: checking for .init and .fini sections" >&5
+ echo $ECHO_N "checking for .init and .fini sections... $ECHO_C" >&6
+@@ -8504,6 +8531,7 @@
+ s,@libc_cv_z_execstack@,$libc_cv_z_execstack,;t t
+ s,@libc_cv_fpie@,$libc_cv_fpie,;t t
+ s,@fno_unit_at_a_time@,$fno_unit_at_a_time,;t t
++s,@libc_cv_ssp@,$libc_cv_ssp,;t t
+ s,@libc_cv_have_initfini@,$libc_cv_have_initfini,;t t
+ s,@libc_cv_cpp_asm_debuginfo@,$libc_cv_cpp_asm_debuginfo,;t t
+ s,@no_whole_archive@,$no_whole_archive,;t t
+diff -ur glibc-2.3.6-orig/configure.in glibc-2.3.6/configure.in
+--- glibc-2.3.6-orig/configure.in	2006-01-17 14:22:17.000000000 -0500
++++ glibc-2.3.6/configure.in	2006-01-17 14:18:24.000000000 -0500
+@@ -1500,6 +1500,21 @@
+ fi
+ AC_SUBST(fno_unit_at_a_time)
+ 
++AC_CACHE_CHECK(for -fstack-protector, libc_cv_ssp, [dnl
++cat > conftest.c <<EOF
++int foo;
++main () { return 0;}
++EOF
++if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fstack-protector
++			    -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD])
++then
++  libc_cv_ssp=yes
++else
++  libc_cv_ssp=no
++fi
++rm -f conftest*])
++AC_SUBST(libc_cv_ssp)
++
+ if test $elf != yes; then
+   AC_CACHE_CHECK(for .init and .fini sections, libc_cv_have_initfini,
+ 		 [AC_TRY_COMPILE(, [asm (".section .init");
+diff -ur glibc-2.3.6-orig/sysdeps/generic/libc-start.c glibc-2.3.6/sysdeps/generic/libc-start.c
+--- glibc-2.3.6-orig/sysdeps/generic/libc-start.c	2006-01-17 14:22:17.000000000 -0500
++++ glibc-2.3.6/sysdeps/generic/libc-start.c	2006-01-17 14:18:24.000000000 -0500
+@@ -188,6 +188,9 @@
+     GLRO(dl_debug_printf) ("\ntransferring control: %s\n\n", argv[0]);
+ #endif
+ 
++  /* call the __guard_setup to set up the random __guard value */
++  __guard_setup ();	/* pappy@gentoo.org (pappy rules) */
++
+ #ifdef HAVE_CLEANUP_JMP_BUF
+   /* Memory for the cancellation buffer.  */
+   struct pthread_unwind_buf unwind_buf;
+diff -ur glibc-2.3.6-orig/sysdeps/unix/sysv/linux/Dist glibc-2.3.6/sysdeps/unix/sysv/linux/Dist
+--- glibc-2.3.6-orig/sysdeps/unix/sysv/linux/Dist	2006-01-17 14:22:17.000000000 -0500
++++ glibc-2.3.6/sysdeps/unix/sysv/linux/Dist	2006-01-17 14:18:24.000000000 -0500
+@@ -1,3 +1,4 @@
++ssp.c
+ bits/initspin.h
+ cmsg_nxthdr.c
+ dl-brk.c
+diff -ur glibc-2.3.6-orig/sysdeps/unix/sysv/linux/Makefile glibc-2.3.6/sysdeps/unix/sysv/linux/Makefile
+--- glibc-2.3.6-orig/sysdeps/unix/sysv/linux/Makefile	2006-01-17 14:22:17.000000000 -0500
++++ glibc-2.3.6/sysdeps/unix/sysv/linux/Makefile	2006-01-17 14:18:24.000000000 -0500
+@@ -1,5 +1,8 @@
+ ifeq ($(subdir),csu)
+-sysdep_routines += errno-loc
++sysdep_routines += errno-loc ssp
++ifeq (yes,$(have-ssp))
++CFLAGS-ssp.c += -fno-stack-protector
++endif
+ endif
+ 
+ ifeq ($(subdir),assert)
+diff -ur glibc-2.3.6-orig/sysdeps/unix/sysv/linux/Versions glibc-2.3.6/sysdeps/unix/sysv/linux/Versions
+--- glibc-2.3.6-orig/sysdeps/unix/sysv/linux/Versions	2006-01-17 14:22:17.000000000 -0500
++++ glibc-2.3.6/sysdeps/unix/sysv/linux/Versions	2006-01-17 14:18:24.000000000 -0500
+@@ -108,6 +108,8 @@
+   GLIBC_2.3.2 {
+     # New kernel interfaces.
+     epoll_create; epoll_ctl; epoll_wait;
++    # global objects and functions for the propolice patch in gcc - moved from libgcc by pappy@gentoo.org
++    __guard; __guard_setup; __stack_smash_handler;
+   }
+   GLIBC_2.3.3 {
+     gnu_dev_major; gnu_dev_minor; gnu_dev_makedev;
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5.20050421 b/sys-libs/glibc/files/digest-glibc-2.3.5.20050421
deleted file mode 100644
index dd2df6d8c79d..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.3.5.20050421
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139
-MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946
-MD5 86ae1273e22af8766297ec21c0232743 glibc-libidn-2.3.5.tar.bz2 101118
-MD5 9e5f724bedff000b31ed230b4308511c glibc-2.3.5-branch-update-20050421.patch.bz2 368850
-MD5 55eef42667ef347b8f89cf19a8a78504 glibc-2.3.5-patches-2.2.tar.bz2 17011
-MD5 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148
-MD5 893b344ace4f554f5c31b614ec7ab003 glibc-infopages-2.3.5.tar.bz2 1273846
-MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5.20050722 b/sys-libs/glibc/files/digest-glibc-2.3.5.20050722
deleted file mode 100644
index 458081ff773b..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.3.5.20050722
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139
-MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946
-MD5 86ae1273e22af8766297ec21c0232743 glibc-libidn-2.3.5.tar.bz2 101118
-MD5 b841c7e4fab70adfbaa0f83085e1a5c3 glibc-2.3.5-branch-update-20050722.patch.bz2 568100
-MD5 03012349e3abd321495e0828196a1f73 glibc-2.3.5-patches-2.3.tar.bz2 16938
-MD5 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148
-MD5 893b344ace4f554f5c31b614ec7ab003 glibc-infopages-2.3.5.tar.bz2 1273846
-MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
deleted file mode 100644
index eca109e6e3dd..000000000000
--- a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
+++ /dev/null
@@ -1,1315 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.40 2005/12/03 00:55:14 vapier Exp $
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-KEYWORDS="-* ~ppc64"
-
-# Versionator crap do not work here - not in the mood for hassle.
-BRANCH_UPDATE="20050421"
-
-# From linuxthreads/man
-GLIBC_MANPAGE_VERSION="2.3.5"
-
-# From manual
-GLIBC_INFOPAGE_VERSION="2.3.5"
-
-# Gentoo patchset
-PATCH_VER="2.2"
-
-# C Stubbs addon (contained in fedora, so ignoring)
-#CSTUBS_VER="2.1.2"
-#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
-#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
-
-# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
-FEDORA_VER="20041219T2331"
-FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
-
-GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~azarah/glibc"
-
-### PUNT OUT TO ECLASS?? ###
-inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-LICENSE="LGPL-2"
-
-IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	PROVIDE="virtual/libc"
-fi
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-GLIBC_RELEASE_VER=$(get_version_component_range 1-3)
-
-# Don't set this to :-, - allows BRANCH_UPDATE=""
-BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)}
-
-# (Recent snapshots fails with 2.6.5 and earlier with NPTL)
-NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.6"}
-LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"}
-
-### SRC_URI ###
-
-# This function handles the basics of setting the SRC_URI for a glibc ebuild.
-# To use, set SRC_URI with:
-#
-#	SRC_URI="$(get_glibc_src_uri)"
-#
-# Other than the variables normally set by portage, this function's behavior
-# can be altered by setting the following:
-#
-#	GENTOO_TOOLCHAIN_BASE_URI
-#			This sets the base URI for all gentoo-specific patch files. Note
-#			that this variable is only important for a brief period of time,
-#			before your source files get picked up by mirrors. However, it is
-#			still highly suggested that you keep files in this location
-#			available.
-#
-#	BRANCH_UPDATE
-#			If set, this variable signals that we should be using the main
-#			release tarball (determined by ebuild version) and applying a
-#			CVS branch update patch against it. The location of this branch
-#			update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}.
-#			Just like with SNAPSHOT, this variable is ignored if the ebuild
-#			has a _pre suffix.
-#
-#	PATCH_VER
-#	PATCH_GLIBC_VER
-#			This should be set to the version of the gentoo patch tarball.
-#			The resulting filename of this tarball will be:
-#			${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
-#
-#	GLIBC_MANPAGE_VERSION
-#	GLIBC_INFOPAGE_VERSION
-#			The version of glibc for which we will download pages. This will
-#			default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages
-#			for prerelease test ebuilds for example. This allows you to
-#			continue using pre-generated manpages from the last stable release.
-#			If set to "none", this will prevent the downloading of manpages,
-#			which is useful for individual library targets.
-#
-get_glibc_src_uri() {
-	# This variable should be set to the devspace of whoever is currently
-	# maintaining GLIBC. Please dont set this to mirror, that would just
-	# make the files unavailable until they get mirrored.
-	local devspace_uri="mirror://gentoo/"
-	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}}
-
-#	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-#	               http://ftp.gnu.org/gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-#	               http://ftp.gnu.org/gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
-	GLIBC_SRC_URI="mirror://gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-	               mirror://gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-	               mirror://gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2"
-
-	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2"
-	fi
-
-	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
-	fi
-
-	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
-	fi
-
-	if [[ -n ${CSTUBS_URI} ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}"
-	fi
-
-	if [[ -n ${FEDORA_URI} ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
-	fi
-
-	echo "${GLIBC_SRC_URI}"
-}
-
-SRC_URI=$(get_glibc_src_uri)
-S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}
-
-### EXPORTED FUNCTIONS ###
-toolchain-glibc_src_unpack() {
-	# Check NPTL support _before_ we unpack things to save some time
-	want_nptl && check_nptl_support
-
-	unpack ${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-
-	cd "${S}"
-	unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-	unpack ${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
-
-	[[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL}
-	[[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL}
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		cd "${WORKDIR}"
-		unpack ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
-	fi
-
-	# XXX: We should do the branchupdate, before extracting the manpages and
-	# infopages else it does not help much (mtimes change if there is a change
-	# to them with branchupdate)
-	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		cd "${S}"
-		epatch "${DISTDIR}"/${PN}-${GLIBC_RELEASE_VER}-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
-
-	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
-		cd "${WORKDIR}"
-		unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
-	fi
-
-	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
-		cd "${S}"
-		unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		cd "${S}"
-		EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \
-		EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \
-		EPATCH_SUFFIX="patch" \
-		ARCH=$(tc-arch) \
-		epatch "${WORKDIR}"/patches
-	fi
-}
-
-toolchain-glibc_src_compile() {
-	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
-	local MAKEFLAGS=""
-	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
-
-	echo
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-	echo
-
-	if want_linuxthreads ; then
-		glibc_do_configure linuxthreads
-		einfo "Building GLIBC with linuxthreads..."
-		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || 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}" ${MAKEFLAGS} || die
-	fi
-}
-
-toolchain-glibc_src_test() {
-	# This is wrong, but glibc's tests fail bad when screwing
-	# around with sandbox, so lets just punt it
-	unset LD_PRELOAD
-
-	# do the linuxthreads build unless we're using nptlonly
-	if want_linuxthreads ; then
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Checking GLIBC with linuxthreads..."
-		make check || die "linuxthreads glibc did not pass make check"
-	fi
-	if want_nptl ; then
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		unset LD_ASSUME_KERNEL || :
-		einfo "Checking GLIBC with NPTL..."
-		make check || die "nptl glibc did not pass make check"
-	fi
-}
-
-toolchain-glibc_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).
-
-	# amd64's 2005.0 is the first amd64 profile to not need this code.
-	# 2005.0 is setup properly, and this is executed as part of the
-	# 2004.3 -> 2005.0 upgrade script.
-	# It can be removed after 2004.3 has been purged from portage.
-	{ use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
-
-	# it appears that /lib/tls is sometimes not removed. See bug
-	# 69258 for more info.
-	if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && ! { want_nptl && want_linuxthreads; }; then
-		addwrite "${ROOT}"/$(alt_libdir)/
-		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."
-		rm -r "${ROOT}"/$(alt_libdir)/tls || die
-	fi
-
-	# Shouldnt need to keep this updated
-	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
-}
-
-toolchain-glibc_src_install() {
-	setup_flags
-
-	# Need to dodir first because it might not exist (bad amd64 profiles)
-	dodir $(alt_usrlibdir)
-
-	# These should not be set, else the
-	# zoneinfo do not always get installed ...
-	unset LANGUAGE LANG LC_ALL
-
-	if want_linuxthreads ; then
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
-		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root="${D}" \
-			install || die
-	else # nptlonly
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		einfo "Installing GLIBC ${ABI} with NPTL ..."
-		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root="${D}" \
-			install || die
-	fi
-
-	if is_crosscompile ; then
-		# Glibc doesn't setup multilib crosscompiled dirs right, but it
-		# sets up native multilib dirs right, so just do this when we
-		# crosscompile.
-		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then
-			dodir $(alt_libdir)
-			mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir)
-		fi
-
-		# punt all the junk not needed by a cross-compiler
-		rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/gconv,sbin,share}
-	fi
-
-	if want_linuxthreads && want_nptl ; then
-		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		mkdir -p "${D}"$(alt_libdir)/tls/
-
-		libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so)
-		cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die
-		dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*)
-
-		libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so)
-		pushd math > /dev/null
-		cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die
-		dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*)
-		popd > /dev/null
-
-		librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so)
-		pushd rt > /dev/null
-		cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die
-		dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*)
-		popd > /dev/null
-
-		libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so)
-		pushd nptl_db > /dev/null
-		cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die
-		dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*)
-		popd > /dev/null
-
-		libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so
-		cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die
-		dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0
-
-		# and now for the static libs
-		mkdir -p "${D}"$(alt_usrlibdir)/nptl
-		cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \
-			"${D}"$(alt_usrlibdir)/nptl
-
-		# linker script crap
-		for lib in libc libpthread; do
-			sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \
-			    -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \
-			          "${D}"$(alt_usrlibdir)/${lib}.so \
-				> "${D}"$(alt_usrlibdir)/nptl/${lib}.so
-
-			chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so
-		done
-
-		dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so
-
-		# last but not least... headers.
-		mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl
-		make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
-		pushd "${D}"/nptl/$(alt_headers) > /dev/null
-		for i in $(find . -type f) ; do
-			if ! [[ -f ${D}$(alt_headers)/$i ]] \
-			   || ! cmp -s $i ${D}$(alt_headers)/$i; then
-				mkdir -p ${D}$(alt_headers)/nptl/`dirname $i`
-				cp -a $i ${D}$(alt_headers)/nptl/$i
-			fi
-		done
-		popd > /dev/null
-		rm -rf ${D}/nptl
-	fi
-
-	# Now, strip everything but the thread libs #46186, as well as the dynamic
-	# linker, else we cannot set breakpoints in shared libraries.
-	# Fix for ld-* by Lonnie Princehouse.
-	mkdir -p ${T}/thread-backup
-	for x in ${D}$(alt_libdir)/lib{pthread,thread_db}* \
-	         ${D}$(alt_libdir)/ld-* ; do
-		[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/
-	done
-	if want_linuxthreads && want_nptl ; then
-		mkdir -p ${T}/thread-backup/tls
-		for x in ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ; do
-			[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/tls
-		done
-	fi
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	cp -a -- ${T}/thread-backup/* ${D}$(alt_libdir)/ || die
-
-	if use pic && [[ $(tc-arch) != "amd64" ]] ; then
-		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \;
-		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \;
-		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \;
-		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \;
-
-		for i in ${D}$(alt_libdir)/*.map; do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f ${D}/etc/ld.so.cache
-
-	# Some things want this, notably ash.
-	dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a
-
-	# Handle includes for different ABIs
-	prep_ml_includes $(alt_headers)
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install the sys-include symlink so that when 
-	# we build a 2nd stage cross-compiler, gcc finds the target 
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		dosym include $(alt_prefix)/sys-include
-		dosym . $(alt_prefix)/usr
-		return 0
-	fi
-
-	# Everything past this point just needs to be done once... don't waste time building locale files twice...
-	is_final_abi || return 0
-
-	if want_linuxthreads ; then
-		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads
-	else
-		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl
-	fi
-	cd "${WORKDIR}"/${MYMAINBUILDDIR}
-	if ! use build ; then
-		if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
-			einfo "Installing info pages..."
-
-			make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-				install_root=${D} \
-				info -i
-		fi
-
-		setup_locales
-
-		if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
-			einfo "Installing man pages..."
-
-			# Install linuxthreads man pages even if nptl is enabled
-			cd "${WORKDIR}"/man
-			doman *.3thr
-		fi
-
-		# Install nscd config file
-		insinto /etc
-		doins ${FILESDIR}/nscd.conf
-		doins "${FILESDIR}"/nsswitch.conf
-
-		doinitd "${FILESDIR}"/nscd
-
-		cd ${S}
-		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share
-		for dir in $(get_all_libdirs); do
-			rm -rf ${D}/usr/${dir}/gconv &> /dev/null
-		done
-
-		einfo "Installing Timezone data..."
-		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
-			timezone/install-others || die
-	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 $(alt_prefix)/lib/misc/glibc/pt_chown
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-
-	insinto /etc
-	# This is our new config file for building locales
-	doins ${FILESDIR}/locales.build
-	# example host.conf with multicast dns disabled by default
-	doins ${FILESDIR}/2.3.4/host.conf
-
-	# simple test to make sure our new glibc isnt completely broken.
-	# for now, skip the multilib scenario.  also make sure we don't
-	# test with statically built binaries since they will fail.
-	[[ ${CBUILD} != ${CHOST} ]] && return 0
-	[[ $(get_libdir) != "lib" ]] && return 0
-	for x in date env ls true uname ; do
-		x=$(type -p ${x})
-		[[ -z ${x} ]] && continue
-		striptest=$(file -L ${x} 2>/dev/null)
-		[[ -z ${striptest} ]] && continue
-		[[ ${striptest/statically linked} != "${striptest}" ]] && continue
-		"${D}"/$(get_libdir)/ld-*.so \
-			--library-path "${D}"/$(get_libdir) \
-			${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-	done
-}
-
-toolchain-glibc_pkg_postinst() {
-	# Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread
-	# isn't removed in unmerge which happens sometimes.  See bug #87671
-	if ! is_crosscompile && want_linuxthreads ; then
-		for libdir in $(get_all_libdirs) ; do
-			for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do
-				if [[ -f ${f} ]] ; then
-					rm -f ${f}
-					ldconfig
-				fi
-			done
-		done
-	fi
-
-	# 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 ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then
-		# Generate fastloading iconv module configuration file.
-		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
-	fi
-
-	if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then
-		## SHOULDN'T THIS BE lib64??
-		ln -s ld64.so.1 ${ROOT}/lib/ld.so.1
-	fi
-
-	# Reload init ...
-	if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then
-		/sbin/init U &> /dev/null
-	fi
-
-	# warn the few multicast-dns-by-default users we've had about the change
-	# in behavior...
-	echo
-	einfo "Gentoo's glibc now disables multicast dns by default in our"
-	einfo "example host.conf. To re-enable this functionality, simply"
-	einfo "remove the line that disables it (mdns off)."
-	echo
-
-	if want_nptl && want_linuxthreads ; then
-		einfo "The default behavior of glibc on your system is to use NPTL.  If"
-		einfo "you want to use linuxthreads for a particular program, start it"
-		einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} <program> [<options>]'"
-		echo
-	fi
-}
-
-### SUPPORT FUNCTIONS ###
-# We need to be able to set alternative headers for
-# compiling for non-native platform
-# Will also become useful for testing kernel-headers without screwing up
-# the whole system.
-# note: intentionally undocumented.
-alt_headers() {
-	if [[ -z ${ALT_HEADERS} ]] ; then
-		if is_crosscompile ; then
-			ALT_HEADERS="/usr/${CTARGET}/include"
-		else
-			ALT_HEADERS="/usr/include"
-		fi
-	fi
-	echo "${ALT_HEADERS}"
-}
-
-alt_prefix() {
-	if is_crosscompile ; then
-		echo /usr/${CTARGET}
-	else
-		echo /usr
-	fi
-}
-
-alt_libdir() {
-	if is_crosscompile ; then
-		echo /usr/${CTARGET}/$(get_libdir)
-	else
-		echo /$(get_libdir)
-	fi
-}
-
-alt_usrlibdir() {
-	if is_crosscompile ; then
-		echo /usr/${CTARGET}/$(get_libdir)
-	else
-		echo /usr/$(get_libdir)
-	fi
-}
-
-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
-	filter-flags -m32 -m64 -mabi=*
-
-	has_multilib_profile && CTARGET_OPT=$(get_abi_CHOST)
-
-	case $(tc-arch) in
-		ppc)
-			append-flags "-freorder-blocks"
-		;;
-		sparc)
-			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-			filter-flags "-fcall-used-g7"
-			append-flags "-fcall-used-g6"
-			filter-flags "-mvis"
-
-			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
-				case ${ABI} in
-					sparc64)
-						if is-flag "-mcpu=ultrasparc3"; then
-							CTARGET_OPT="sparc64b-unknown-linux-gnu"
-							CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9b"
-						else
-							CTARGET_OPT="sparc64-unknown-linux-gnu"
-							CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9a"
-						fi
-
-						filter-flags -Wa,-xarch -Wa,-A
-					;;
-					*)
-						if is-flag "-mcpu=ultrasparc3"; then
-							CTARGET_OPT="sparcv9b-unknown-linux-gnu"
-						else
-							CTARGET_OPT="sparcv9-unknown-linux-gnu"
-						fi
-					;;
-				esac
-			else
-				if is-flag "-mcpu=ultrasparc3"; then
-					CTARGET_OPT="sparcv9b-unknown-linux-gnu"
-				elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then
-					CTARGET_OPT="sparcv9-unknown-linux-gnu"
-				fi
-			fi
-		;;
-	esac
-
-	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
-		CBUILD_OPT=${CTARGET_OPT}
-	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 $(tc-getCC ${CTARGET}) -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-ldflags -pie
-
-	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
-	# conservative here
-	filter-flags -O?
-	append-flags -O2
-}
-
-check_kheader_version() {
-	local header="${ROOT}$(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 "${NPTL_KERNEL_VERSION}")"
-
-	echo
-
-	einfon "Checking gcc for __thread support ... "
-	if want__thread ; then
-		echo "yes"
-	else
-		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!"
-	fi
-
-	# Building fails on an non-supporting kernel
-	einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... "
-	if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then
-		echo "no"
-		echo
-		eerror "You need a kernel of at least version ${NPTL_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 (>=${NPTL_KERNEL_VERSION}) ... "
-	if ! check_kheader_version "${min_kernel_version}"; then
-		echo "no"
-		echo
-		eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}"
-		eerror "for NPTL support!"
-		die "linux-headers version too low!"
-	else
-		echo "yes"
-	fi
-
-	echo
-}
-
-want_nptl() {
-	want_tls || return 1
-	use nptl || return 1
-
-	# Archs that can use NPTL
-	case $(tc-arch) in
-		alpha|amd64|ia64|ppc|ppc64|s390|x86)
-			return 0;
-		;;
-		sparc)
-			# >= v9 is needed for nptl.
-			[[ "${PROFILE_ARCH}" == "sparc" ]] && return 1
-			return 0;
-		;;
-	esac
-
-	return 1
-}
-
-want_linuxthreads() {
-	! use nptlonly && return 0
-	want_nptl || return 0
-	return 1
-}
-
-want_tls() {
-	# Archs that can use TLS (Thread Local Storage)
-	case $(tc-arch) in
-		alpha|amd64|ia64|ppc|ppc64|s390)
-			return 0;
-		;;
-		sparc)
-			# 2.3.6 should have tls support on sparc64
-			# when using newer binutils
-			case ${CTARGET/-*} in
-				sparc64*) return 1 ;;
-				*) return 0 ;;
-			esac
-		;;
-		x86)
-			# requires i486 or better #106556
-			[[ ${CTARGET} == i[4567]86* ]] && return 0
-		;;
-	esac
-
-	return 1
-}
-
-want__thread() {
-	want_tls || return 1
-
-	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
-	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
-
-	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
-
-	$(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null
-	WANT__THREAD=$?
-
-	return ${WANT__THREAD}
-}
-
-install_locales() {
-	unset LANGUAGE LANG LC_ALL
-	cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
-	make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-		install_root=${D} localedata/install-locales || die
-}
-
-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
-}
-
-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\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d')
-	use glibc-compat20 && [[ -d glibc-compat ]] && ADDONS="${ADDONS},glibc-compat"
-	popd > /dev/null
-
-	use nls || myconf="${myconf} --disable-nls"
-	use erandom || myconf="${myconf} --disable-dev-erandom"
-
-	use glibc-omitfp && myconf="${myconf} --enable-omitfp"
-
-	if [ "$1" == "linuxthreads" ] ; then
-		if want_tls ; then
-			myconf="${myconf} --with-tls"
-
-			if want__thread && use linuxthreads-tls ; then
-				myconf="${myconf} --with-__thread"
-			else
-				myconf="${myconf} --without-__thread"
-			fi
-		else
-			myconf="${myconf} --without-tls --without-__thread"
-		fi
-
-		myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}"
-		myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}"
-	elif [ "$1" == "nptl" ] ; then
-		myconf="${myconf} --with-tls --with-__thread"
-		myconf="${myconf} --enable-add-ons=nptl${ADDONS}"
-		myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}"
-	else
-		die "invalid pthread option"
-	fi
-
-	if ! use build && use selinux; then
-		myconf="${myconf} --with-selinux"
-	else
-		myconf="${myconf} --without-selinux"
-	fi
-
-	myconf="${myconf}
-		--without-cvs
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		--without-gd
-		--with-headers=${ROOT}$(alt_headers)
-		--prefix=$(alt_prefix)
-		--mandir=$(alt_prefix)/share/man
-		--infodir=$(alt_prefix)/share/info
-		--libexecdir=$(alt_prefix)/lib/misc/glibc
-		${EXTRA_ECONF}"
-
-	has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
-
-	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
-	mkdir -p ${GBUILDDIR}
-	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
-	${S}/configure ${myconf} || die "failed to configure glibc"
-}
-
-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
-		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
-		use ppc64 && /lib/ld64.so.1 /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
-}
-
-use_multilib() {
-	case ${CTARGET} in
-		sparc64*|mips64*|amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib ;;
-		*)  false ;;
-	esac
-}
-
-# Setup toolchain variables that would be defined in the profiles for these archs.
-crosscompile_setup() {
-	if is_crosscompile || tc-is-cross-compiler; then
-		# CFLAGS are used by ${CTARGET}-gcc
-		local VAR="CFLAGS_"${CTARGET//-/_}
-		CFLAGS=${!VAR-"-O2"}
-
-		case ${CTARGET} in
-			x86_64*)
-				export CFLAGS_x86=${CFLAGS_x86--m32}
-				export CHOST_x86=${CTARGET/x86_64/i686}
-				export CDEFINE_x86="__i386__"
-				export LIBDIR_x86="lib"
-
-				export CFLAGS_amd64=${CFLAGS_amd64--m64}
-				export CHOST_amd64=${CTARGET}
-				export CDEFINE_amd64="__x86_64__"
-				export LIBDIR_amd64="lib64"
-
-				export MULTILIB_ABIS="amd64"
-				export DEFAULT_ABI="amd64"
-			;;
-			mips64*)
-				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
-				export CHOST_o32=${CTARGET/mips64/mips}
-				export CDEFINE_o32="_ABIO32"
-				export LIBDIR_o32="lib"
-
-				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
-				export CHOST_n32=${CTARGET}
-				export CDEFINE_n32="_ABIN32"
-				export LIBDIR_n32="lib32"
-
-				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
-				export CHOST_n64=${CTARGET}
-				export CDEFINE_n64="_ABI64"
-				export LIBDIR_n64="lib64"
-
-				export MULTILIB_ABIS="n64 n32"
-				export DEFAULT_ABI="n32"
-			;;
-			powerpc64*)
-				export CFLAGS_ppc=${CFLAGS_ppc--m32}
-				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
-				export CDEFINE_ppc="!__powerpc64__"
-				export LIBDIR_ppc="lib"
-
-				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
-				export CHOST_ppc64=${CTARGET}
-				export CDEFINE_ppc64="__powerpc64__"
-				export LIBDIR_ppc64="lib64"
-
-				export MULTILIB_ABIS="ppc64"
-				export DEFAULT_ABI="ppc64"
-			;;
-			sparc64*)
-				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
-				export CHOST_sparc32=${CTARGET/sparc64/sparc}
-				export CDEFINE_sparc32="!__arch64__"
-				export LIBDIR_sparc32="lib"
-
-				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
-				export CHOST_sparc64=${CTARGET}
-				export CDEFINE_sparc64="__arch64__"
-				export LIBDIR_sparc64="lib64"
-
-				export MULTILIB_ABIS="sparc64"
-				export DEFAULT_ABI="sparc64"
-			;;
-			*)
-				export MULTILIB_ABIS="default"
-				export DEFAULT_ABI="default"
-		esac
-
-		ABI=${DEFAULT_ABI}
-	fi
-}
-
-### /ECLASS PUNTAGE ###
-
-if is_crosscompile ; then
-	SLOT="${CTARGET}-2.2"
-else
-	SLOT="2.2"
-fi
-
-# we'll handle stripping ourself #46186
-RESTRICT="nostrip multilib-pkg-force"
-
-# 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.
-#
-# The gcc-config dep is for the cross-compile multilib stuff
-DEPEND=">=sys-devel/gcc-3.4
-	nptl? ( >=sys-kernel/linux-headers-2.6.5 )
-	>=sys-devel/binutils-2.15.90
-	>=sys-devel/gcc-config-1.3.9
-	virtual/os-headers
-	nls? ( sys-devel/gettext )
-	selinux? ( !build? ( sys-libs/libselinux ) )"
-RDEPEND="nls? ( sys-devel/gettext )
-	selinux? ( !build? ( sys-libs/libselinux ) )"
-
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND} ${CATEGORY}/gcc"
-
-	if [[ ${CATEGORY} == *-linux* ]] ; then
-		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
-		else
-			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
-		fi
-	fi
-fi
-
-pkg_setup() {
-	if use nptlonly && ! use nptl ; then
-		eerror "If you want nptlonly, add nptl to your USE too ;p"
-		die "nptlonly without nptl"
-	fi
-
-	# give some sort of warning about the nptl logic changes...
-	if want_nptl && want_linuxthreads ; 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 5
-	fi
-
-	echo
-	ewarn "WARNING: This is a very alpha ebuild, and are mostly provided for"
-	ewarn "those brave souls that want to test gcc-4.0.0.  Please note that"
-	ewarn "these are the packages I used to get it working on x86:"
-	ewarn
-	ewarn "  sys-devel/binutils-2.15.97"
-	ewarn "  sys-devel/gcc-4.0.0"
-	ewarn "  sys-libs/glibc-2.3.5.20050421"
-	ewarn
-	ewarn "Over here at least gcc-4.0.0 can build glibc-2.3.5.20050421, and"
-	ewarn "do a 'emerge system'."
-	ewarn "One more thing to note, is that you SHOULD NOT use binutils"
-	ewarn "version 2.16.90.0.1!!!"
-	echo
-
-	ebeep
-	epause 10
-}
-
-src_unpack() {
-	crosscompile_setup
-	export ABI="${DEFAULT_ABI}"
-
-	case $(tc-arch) in
-		hppa)
-			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 2000-all-2.3.2-propolice-guard-functions-v3.patch"
-			use hardened || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6490_hppa_hardened-disable__init_arrays.patch"
-		;;
-		mips)
-			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch"
-			use_multilib && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch"
-		;;
-	esac
-
-	toolchain-glibc_src_unpack
-
-	# XXX: do not package ssp up into tarballs, leave it in FILESDIR
-	cd "${S}"
-	cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c"
-	rm -f "${WORKDIR}"/patches/2*
-	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
-	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
-
-	case $(tc-arch) in
-		alpha)
-			# Is this still needed?
-			rm -f sysdeps/alpha/alphaev6/memcpy.S
-		;;
-		amd64)
-			if ! has_multilib_profile && ! is_crosscompile; then
-				# 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
-			fi
-		;;
-		ppc64)
-			# setup lib -- seems like a good place to set this up
-			has_multilib_profile || get_libdir_override lib64
-		;;
-	esac
-
-	GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch"
-
-	# disable binutils -as-needed
-	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
-
-	# Glibc is stupid sometimes, and doesn't realize that with a
-	# static C-Only gcc, -lgcc_eh doesn't exist.
-	# http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html
-	# http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html
-	echo 'int main(){}' > ${T}/gcc_eh_test.c
-	if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
-		sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh"
-	fi
-
-	# Some configure checks fail on the first emerge through because they
-	# try to link.  This doesn't work well if we don't have a libc yet.
-	# http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html
-	if is_crosscompile && use build; then
-		rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in}
-		rm ${S}/nptl/sysdeps/pthread/configure{,.in}
-	fi
-
-	find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \;
-	find . -name configure -exec touch {} \;
-
-	# Fix permissions on some of the scripts
-	chmod u+x ${S}/scripts/*.sh
-}
-
-src_compile() {
-	crosscompile_setup
-
-	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
-			OABI=${ABI}
-			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
-				export ABI=${ABI}
-				src_compile
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-		unset MLTEST
-	fi
-
-	ABI=${ABI:-default}
-	toolchain-glibc_src_compile
-}
-
-src_test() {
-	crosscompile_setup
-
-	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
-			OABI=${ABI}
-			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
-				export ABI
-				einfo "   Testing ${ABI} glibc"
-				src_test
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-		unset MLTEST
-	fi
-
-	ABI=${ABI:-default}
-	toolchain-glibc_src_test
-}
-
-src_install() {
-	crosscompile_setup
-
-	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
-			OABI=${ABI}
-			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
-				export ABI
-				src_install
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-		unset MLTEST
-	fi
-
-	ABI=${ABI:-default}
-
-	# Handle stupid lib32 BS
-	unset OLD_LIBDIR
-	if ! is_crosscompile ; then
-		if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then
-			OLD_LIBDIR=$(get_libdir)
-			LIBDIR_x86="lib"
-		fi
-
-		if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then
-			OLD_LIBDIR=$(get_libdir)
-			LIBDIR_ppc="lib"
-		fi
-	fi
-
-	toolchain-glibc_src_install
-
-	# Handle stupid lib32 BS on amd64 and ppc64
-	if [[ -n ${OLD_LIBDIR} ]] ; then
-		cd "${S}"
-		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR}
-		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR}
-		unset OLD_LIBDIR
-
-		mv "${D}"/lib "${D}"/$(get_libdir)
-		mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
-		dodir /lib
-		dodir /usr/lib
-		mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib
-		[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
-		[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
-
-		for f in "${D}"/usr/$(get_libdir)/*.so; do
-			local basef=$(basename "${f}")
-			if [[ -L ${f} ]] ; then
-				local target=$(readlink "${f}")
-				target=${target/\/lib\//\/$(get_libdir)\/}
-				rm "${f}"
-				dosym "${target}" /usr/$(get_libdir)/"${basef}"
-			fi
-		done
-
-		dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so
-
-		if want_nptl && want_linuxthreads ; then
-			dosed  "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so
-		fi
-	fi
-}
-
-pkg_preinst() {
-	toolchain-glibc_pkg_preinst
-}
-
-pkg_postinst() {
-	toolchain-glibc_pkg_postinst
-}
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
deleted file mode 100644
index 6bbc5b732a31..000000000000
--- a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
+++ /dev/null
@@ -1,1281 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.25 2005/12/03 00:55:14 vapier Exp $
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-KEYWORDS="-*"
-
-# This is taken from ${PV}
-# BRANCH_UPDATE=""
-
-# From linuxthreads/man
-GLIBC_MANPAGE_VERSION="2.3.5"
-
-# From manual
-GLIBC_INFOPAGE_VERSION="2.3.5"
-
-# Gentoo patchset
-PATCH_VER="2.3"
-
-# C Stubbs addon (contained in fedora, so ignoring)
-#CSTUBS_VER="2.1.2"
-#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
-#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
-
-# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
-FEDORA_VER="20041219T2331"
-FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
-
-GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~azarah/glibc"
-
-### PUNT OUT TO ECLASS?? ###
-inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-LICENSE="LGPL-2"
-
-IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile"
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	PROVIDE="virtual/libc"
-fi
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-GLIBC_RELEASE_VER=$(get_version_component_range 1-3)
-
-# Don't set this to :-, - allows BRANCH_UPDATE=""
-BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)}
-
-# (Recent snapshots fails with 2.6.5 and earlier with NPTL)
-NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.6"}
-LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"}
-
-### SRC_URI ###
-
-# This function handles the basics of setting the SRC_URI for a glibc ebuild.
-# To use, set SRC_URI with:
-#
-#	SRC_URI="$(get_glibc_src_uri)"
-#
-# Other than the variables normally set by portage, this function's behavior
-# can be altered by setting the following:
-#
-#	GENTOO_TOOLCHAIN_BASE_URI
-#			This sets the base URI for all gentoo-specific patch files. Note
-#			that this variable is only important for a brief period of time,
-#			before your source files get picked up by mirrors. However, it is
-#			still highly suggested that you keep files in this location
-#			available.
-#
-#	BRANCH_UPDATE
-#			If set, this variable signals that we should be using the main
-#			release tarball (determined by ebuild version) and applying a
-#			CVS branch update patch against it. The location of this branch
-#			update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}.
-#			Just like with SNAPSHOT, this variable is ignored if the ebuild
-#			has a _pre suffix.
-#
-#	PATCH_VER
-#	PATCH_GLIBC_VER
-#			This should be set to the version of the gentoo patch tarball.
-#			The resulting filename of this tarball will be:
-#			${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
-#
-#	GLIBC_MANPAGE_VERSION
-#	GLIBC_INFOPAGE_VERSION
-#			The version of glibc for which we will download pages. This will
-#			default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages
-#			for prerelease test ebuilds for example. This allows you to
-#			continue using pre-generated manpages from the last stable release.
-#			If set to "none", this will prevent the downloading of manpages,
-#			which is useful for individual library targets.
-#
-get_glibc_src_uri() {
-	# This variable should be set to the devspace of whoever is currently
-	# maintaining GLIBC. Please dont set this to mirror, that would just
-	# make the files unavailable until they get mirrored.
-	local devspace_uri="mirror://gentoo/"
-	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}}
-
-#	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-#	               http://ftp.gnu.org/gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-#	               http://ftp.gnu.org/gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
-	GLIBC_SRC_URI="mirror://gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-	               mirror://gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-	               mirror://gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2"
-
-	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2"
-	fi
-
-	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
-	fi
-
-	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
-	fi
-
-	if [[ -n ${CSTUBS_URI} ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}"
-	fi
-
-	if [[ -n ${FEDORA_URI} ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
-	fi
-
-	echo "${GLIBC_SRC_URI}"
-}
-
-SRC_URI=$(get_glibc_src_uri)
-S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER}
-
-### EXPORTED FUNCTIONS ###
-toolchain-glibc_src_unpack() {
-	# Check NPTL support _before_ we unpack things to save some time
-	want_nptl && check_nptl_support
-
-	unpack ${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-
-	cd "${S}"
-	unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-	unpack ${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
-
-	[[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL}
-	[[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL}
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		cd "${WORKDIR}"
-		unpack ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
-	fi
-
-	# XXX: We should do the branchupdate, before extracting the manpages and
-	# infopages else it does not help much (mtimes change if there is a change
-	# to them with branchupdate)
-	if [[ -n ${BRANCH_UPDATE} ]] ; then
-		cd "${S}"
-		epatch "${DISTDIR}"/${PN}-${GLIBC_RELEASE_VER}-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
-
-	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
-		cd "${WORKDIR}"
-		unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
-	fi
-
-	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
-		cd "${S}"
-		unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		cd "${S}"
-		EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \
-		EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \
-		EPATCH_SUFFIX="patch" \
-		ARCH=$(tc-arch) \
-		epatch "${WORKDIR}"/patches
-	fi
-}
-
-toolchain-glibc_src_compile() {
-	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
-	local MAKEFLAGS=""
-	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
-
-	echo
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-	echo
-
-	if want_linuxthreads ; then
-		glibc_do_configure linuxthreads
-		einfo "Building GLIBC with linuxthreads..."
-		make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || 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}" ${MAKEFLAGS} || die
-	fi
-}
-
-toolchain-glibc_src_test() {
-	# This is wrong, but glibc's tests fail bad when screwing
-	# around with sandbox, so lets just punt it
-	unset LD_PRELOAD
-
-	# do the linuxthreads build unless we're using nptlonly
-	if want_linuxthreads ; then
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Checking GLIBC with linuxthreads..."
-		make check || die "linuxthreads glibc did not pass make check"
-	fi
-	if want_nptl ; then
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		unset LD_ASSUME_KERNEL || :
-		einfo "Checking GLIBC with NPTL..."
-		make check || die "nptl glibc did not pass make check"
-	fi
-}
-
-toolchain-glibc_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).
-
-	# amd64's 2005.0 is the first amd64 profile to not need this code.
-	# 2005.0 is setup properly, and this is executed as part of the
-	# 2004.3 -> 2005.0 upgrade script.
-	# It can be removed after 2004.3 has been purged from portage.
-	{ use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
-
-	# it appears that /lib/tls is sometimes not removed. See bug
-	# 69258 for more info.
-	if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && ! { want_nptl && want_linuxthreads; }; then
-		addwrite "${ROOT}"/$(alt_libdir)/
-		ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..."
-		rm -r "${ROOT}"/$(alt_libdir)/tls || die
-	fi
-
-	# Shouldnt need to keep this updated
-	[[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build
-}
-
-toolchain-glibc_src_install() {
-	setup_env
-
-	# Need to dodir first because it might not exist (bad amd64 profiles)
-	dodir $(alt_usrlibdir)
-
-	# These should not be set, else the
-	# zoneinfo do not always get installed ...
-	unset LANGUAGE LANG LC_ALL
-
-	if want_linuxthreads ; then
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
-		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root="${D}" \
-			install || die
-	else # nptlonly
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		einfo "Installing GLIBC ${ABI} with NPTL ..."
-		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root="${D}" \
-			install || die
-	fi
-
-	if is_crosscompile ; then
-		# Glibc doesn't setup multilib crosscompiled dirs right, but it
-		# sets up native multilib dirs right, so just do this when we
-		# crosscompile.
-		if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then
-			dodir $(alt_libdir)
-			mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir)
-		fi
-
-		# punt all the junk not needed by a cross-compiler
-		rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/gconv,sbin,share}
-	fi
-
-	if want_linuxthreads && want_nptl ; then
-		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		mkdir -p "${D}"$(alt_libdir)/tls/
-
-		libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so)
-		cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die
-		dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*)
-
-		libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so)
-		pushd math > /dev/null
-		cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die
-		dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*)
-		popd > /dev/null
-
-		librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so)
-		pushd rt > /dev/null
-		cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die
-		dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*)
-		popd > /dev/null
-
-		libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so)
-		pushd nptl_db > /dev/null
-		cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die
-		dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*)
-		popd > /dev/null
-
-		libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so
-		cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die
-		dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0
-
-		# and now for the static libs
-		mkdir -p "${D}"$(alt_usrlibdir)/nptl
-		cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \
-			"${D}"$(alt_usrlibdir)/nptl
-
-		# linker script crap
-		for lib in libc libpthread; do
-			sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \
-			    -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \
-			          "${D}"$(alt_usrlibdir)/${lib}.so \
-				> "${D}"$(alt_usrlibdir)/nptl/${lib}.so
-
-			chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so
-		done
-
-		dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so
-
-		# last but not least... headers.
-		mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl
-		make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1"
-		pushd "${D}"/nptl/$(alt_headers) > /dev/null
-		for i in $(find . -type f) ; do
-			if ! [[ -f ${D}$(alt_headers)/$i ]] \
-			   || ! cmp -s $i ${D}$(alt_headers)/$i; then
-				mkdir -p ${D}$(alt_headers)/nptl/`dirname $i`
-				cp -a $i ${D}$(alt_headers)/nptl/$i
-			fi
-		done
-		popd > /dev/null
-		rm -rf ${D}/nptl
-	fi
-
-	# Now, strip everything but the thread libs #46186, as well as the dynamic
-	# linker, else we cannot set breakpoints in shared libraries.
-	# Fix for ld-* by Lonnie Princehouse.
-	mkdir -p ${T}/thread-backup
-	for x in ${D}$(alt_libdir)/lib{pthread,thread_db}* \
-	         ${D}$(alt_libdir)/ld-* ; do
-		[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/
-	done
-	if want_linuxthreads && want_nptl ; then
-		mkdir -p ${T}/thread-backup/tls
-		for x in ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ; do
-			[[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/tls
-		done
-	fi
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	cp -a -- ${T}/thread-backup/* ${D}$(alt_libdir)/ || die
-
-	if use pic && [[ $(tc-arch) != "amd64" ]] ; then
-		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \;
-		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \;
-		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \;
-		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \;
-
-		for i in ${D}$(alt_libdir)/*.map; do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f ${D}/etc/ld.so.cache
-
-	# Some things want this, notably ash.
-	dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a
-
-	# Handle includes for different ABIs
-	prep_ml_includes $(alt_headers)
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install the sys-include symlink so that when 
-	# we build a 2nd stage cross-compiler, gcc finds the target 
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		dosym include $(alt_prefix)/sys-include
-		dosym . $(alt_prefix)/usr
-		return 0
-	fi
-
-	# Everything past this point just needs to be done once... don't waste time building locale files twice...
-	is_final_abi || return 0
-
-	if want_linuxthreads ; then
-		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads
-	else
-		MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl
-	fi
-	cd "${WORKDIR}"/${MYMAINBUILDDIR}
-	if ! use build ; then
-		if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
-			einfo "Installing info pages..."
-
-			make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-				install_root=${D} \
-				info -i
-		fi
-
-		setup_locales
-
-		if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
-			einfo "Installing man pages..."
-
-			# Install linuxthreads man pages even if nptl is enabled
-			cd "${WORKDIR}"/man
-			doman *.3thr
-		fi
-
-		# Install nscd config file
-		insinto /etc
-		doins ${FILESDIR}/nscd.conf
-		doins "${FILESDIR}"/nsswitch.conf
-
-		doinitd "${FILESDIR}"/nscd
-
-		cd ${S}
-		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share
-		for dir in $(get_all_libdirs); do
-			rm -rf ${D}/usr/${dir}/gconv &> /dev/null
-		done
-
-		einfo "Installing Timezone data..."
-		make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-			install_root=${D} \
-			timezone/install-others || die
-	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 $(alt_prefix)/lib/misc/glibc/pt_chown
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-
-	insinto /etc
-	# This is our new config file for building locales
-	doins ${FILESDIR}/locales.build
-	# example host.conf with multicast dns disabled by default
-	doins ${FILESDIR}/2.3.4/host.conf
-
-	# simple test to make sure our new glibc isnt completely broken.
-	# for now, skip the multilib scenario.  also make sure we don't
-	# test with statically built binaries since they will fail.
-	[[ ${CBUILD} != ${CHOST} ]] && return 0
-	[[ $(get_libdir) != "lib" ]] && return 0
-	for x in date env ls true uname ; do
-		x=$(type -p ${x})
-		[[ -z ${x} ]] && continue
-		striptest=$(file -L ${x} 2>/dev/null)
-		[[ -z ${striptest} ]] && continue
-		[[ ${striptest/statically linked} != "${striptest}" ]] && continue
-		"${D}"/$(get_libdir)/ld-*.so \
-			--library-path "${D}"/$(get_libdir) \
-			${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-	done
-}
-
-toolchain-glibc_pkg_postinst() {
-	# Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread
-	# isn't removed in unmerge which happens sometimes.  See bug #87671
-	if ! is_crosscompile && want_linuxthreads ; then
-		for libdir in $(get_all_libdirs) ; do
-			for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do
-				if [[ -f ${f} ]] ; then
-					rm -f ${f}
-					ldconfig
-				fi
-			done
-		done
-	fi
-
-	# 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 ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then
-		# Generate fastloading iconv module configuration file.
-		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
-	fi
-
-	if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then
-		## SHOULDN'T THIS BE lib64??
-		ln -s ld64.so.1 ${ROOT}/lib/ld.so.1
-	fi
-
-	# Reload init ...
-	if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then
-		/sbin/init U &> /dev/null
-	fi
-
-	# warn the few multicast-dns-by-default users we've had about the change
-	# in behavior...
-	echo
-	einfo "Gentoo's glibc now disables multicast dns by default in our"
-	einfo "example host.conf. To re-enable this functionality, simply"
-	einfo "remove the line that disables it (mdns off)."
-	echo
-
-	if want_nptl && want_linuxthreads ; then
-		einfo "The default behavior of glibc on your system is to use NPTL.  If"
-		einfo "you want to use linuxthreads for a particular program, start it"
-		einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} <program> [<options>]'"
-		echo
-	fi
-}
-
-### SUPPORT FUNCTIONS ###
-# We need to be able to set alternative headers for
-# compiling for non-native platform
-# Will also become useful for testing kernel-headers without screwing up
-# the whole system.
-# note: intentionally undocumented.
-alt_headers() {
-	if [[ -z ${ALT_HEADERS} ]] ; then
-		if is_crosscompile ; then
-			ALT_HEADERS="/usr/${CTARGET}/include"
-		else
-			ALT_HEADERS="/usr/include"
-		fi
-	fi
-	echo "${ALT_HEADERS}"
-}
-
-alt_prefix() {
-	if is_crosscompile ; then
-		echo /usr/${CTARGET}
-	else
-		echo /usr
-	fi
-}
-
-alt_libdir() {
-	if is_crosscompile ; then
-		case ${CTARGET} in
-			mips64*) echo /usr/${CTARGET}/$(get_libdir) ;;
-			*)	 echo /usr/${CTARGET}/lib ;;
-		esac
-	else
-		echo /$(get_libdir)
-	fi
-}
-
-alt_usrlibdir() {
-	if is_crosscompile ; then
-		case ${CTARGET} in
-			mips64*) echo /usr/${CTARGET}/$(get_libdir) ;;
-			*)	 echo /usr/${CTARGET}/lib ;;
-		esac
-	else
-		echo /usr/$(get_libdir)
-	fi
-}
-
-setup_flags() {
-	# Store our CFLAGS because it's changed depending on which CTARGET
-	# we are building when pulling glibc on a multilib profile
-	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
-	CFLAGS=${CFLAGS_BASE}
-	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
-	ASFLAGS=${ASFLAGS_BASE}
-
-	# 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
-	filter-flags -m32 -m64 -mabi=*
-
-	unset CBUILD_OPT CTARGET_OPT
-	if has_multilib_profile ; then
-		CTARGET_OPT=$(get_abi_CTARGET)
-		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
-	fi
-
-	case $(tc-arch) in
-		ppc)
-			append-flags "-freorder-blocks"
-		;;
-		sparc)
-			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-			filter-flags "-fcall-used-g7"
-			append-flags "-fcall-used-g6"
-			filter-flags "-mvis"
-
-			if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
-				case ${ABI} in
-					sparc64)
-						filter-flags -Wa,-xarch -Wa,-A
-
-						if is-flag "-mcpu=ultrasparc3"; then
-							CTARGET_OPT="sparc64b-unknown-linux-gnu"
-							append-flags "-Wa,-xarch=v9b"
-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b"
-						else
-							CTARGET_OPT="sparc64-unknown-linux-gnu"
-							append-flags "-Wa,-xarch=v9a"
-							export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a"
-						fi
-					;;
-					*)
-						if is-flag "-mcpu=ultrasparc3"; then
-							CTARGET_OPT="sparcv9b-unknown-linux-gnu"
-						else
-							CTARGET_OPT="sparcv9-unknown-linux-gnu"
-						fi
-					;;
-				esac
-			else
-				if is-flag "-mcpu=ultrasparc3"; then
-					CTARGET_OPT="sparcv9b-unknown-linux-gnu"
-				elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then
-					CTARGET_OPT="sparcv9-unknown-linux-gnu"
-				fi
-			fi
-		;;
-	esac
-
-	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
-		CBUILD_OPT=${CTARGET_OPT}
-	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 $(tc-getCC ${CTARGET}) -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-ldflags -pie
-
-	# Lock glibc at -O2 -- linuxthreads needs it and we want to be
-	# conservative here
-	filter-flags -O?
-	append-flags -O2
-}
-
-check_kheader_version() {
-	local header="${ROOT}$(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 "${NPTL_KERNEL_VERSION}")"
-
-	echo
-
-	einfon "Checking gcc for __thread support ... "
-	if want__thread ; then
-		echo "yes"
-	else
-		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!"
-	fi
-
-	# Building fails on an non-supporting kernel
-	einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... "
-	if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then
-		echo "no"
-		echo
-		eerror "You need a kernel of at least version ${NPTL_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 (>=${NPTL_KERNEL_VERSION}) ... "
-	if ! check_kheader_version "${min_kernel_version}"; then
-		echo "no"
-		echo
-		eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}"
-		eerror "for NPTL support!"
-		die "linux-headers version too low!"
-	else
-		echo "yes"
-	fi
-
-	echo
-}
-
-want_nptl() {
-	want_tls || return 1
-	use nptl || return 1
-
-	# Archs that can use NPTL
-	case $(tc-arch) in
-		alpha|amd64|ia64|ppc|ppc64|s390|x86)
-			return 0;
-		;;
-		sparc)
-			# >= v9 is needed for nptl.
-			[[ "${PROFILE_ARCH}" == "sparc" ]] && return 1
-			return 0;
-		;;
-	esac
-
-	return 1
-}
-
-want_linuxthreads() {
-	! use nptlonly && return 0
-	want_nptl || return 0
-	return 1
-}
-
-want_tls() {
-	# Archs that can use TLS (Thread Local Storage)
-	case $(tc-arch) in
-		alpha|amd64|ia64|ppc|ppc64|s390)
-			return 0;
-		;;
-		sparc)
-			# 2.3.6 should have tls support on sparc64
-			# when using newer binutils
-			case ${CTARGET/-*} in
-				sparc64*) return 1 ;;
-				*) return 0 ;;
-			esac
-		;;
-		x86)
-			# requires i486 or better #106556
-			[[ ${CTARGET} == i[4567]86* ]] && return 0
-		;;
-	esac
-
-	return 1
-}
-
-want__thread() {
-	want_tls || return 1
-
-	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
-	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
-
-	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
-
-	$(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null
-	WANT__THREAD=$?
-
-	return ${WANT__THREAD}
-}
-
-install_locales() {
-	unset LANGUAGE LANG LC_ALL
-	cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
-	make PARALLELMFLAGS="${MAKEOPTS} -j1" \
-		install_root=${D} localedata/install-locales || die
-}
-
-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
-}
-
-glibc_do_configure() {
-	local myconf
-
-	setup_env
-
-	# 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\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d')
-	use glibc-compat20 && [[ -d glibc-compat ]] && ADDONS="${ADDONS},glibc-compat"
-	popd > /dev/null
-
-	use nls || myconf="${myconf} --disable-nls"
-	use erandom || myconf="${myconf} --disable-dev-erandom"
-
-	use glibc-omitfp && myconf="${myconf} --enable-omitfp"
-
-	if [ "$1" == "linuxthreads" ] ; then
-		if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then
-			myconf="${myconf} --with-tls"
-
-			if want__thread && use linuxthreads-tls ; then
-				myconf="${myconf} --with-__thread"
-			else
-				myconf="${myconf} --without-__thread"
-			fi
-		else
-			myconf="${myconf} --without-tls --without-__thread"
-		fi
-
-		myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}"
-		myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}"
-	elif [ "$1" == "nptl" ] ; then
-		myconf="${myconf} --with-tls --with-__thread"
-		myconf="${myconf} --enable-add-ons=nptl${ADDONS}"
-		myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}"
-	else
-		die "invalid pthread option"
-	fi
-
-	if ! use build && use selinux; then
-		myconf="${myconf} --with-selinux"
-	else
-		myconf="${myconf} --without-selinux"
-	fi
-
-	myconf="${myconf}
-		--without-cvs
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		--without-gd
-		--with-headers=${ROOT}$(alt_headers)
-		--prefix=$(alt_prefix)
-		--mandir=$(alt_prefix)/share/man
-		--infodir=$(alt_prefix)/share/info
-		--libexecdir=$(alt_prefix)/lib/misc/glibc
-		${EXTRA_ECONF}"
-
-	has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})"
-
-	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
-	mkdir -p ${GBUILDDIR}
-	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
-	${S}/configure ${myconf} || die "failed to configure glibc"
-}
-
-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
-		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
-		use ppc64 && /lib/ld64.so.1 /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
-}
-
-use_multilib() {
-	case ${CTARGET} in
-		sparc64*|mips64*|amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib ;;
-		*)  false ;;
-	esac
-}
-
-# Setup toolchain variables that would be defined in the profiles for these archs.
-setup_env() {
-	if is_crosscompile || tc-is-cross-compiler; then
-		multilib_env ${CTARGET}
-
-		# We only install for this CTARGET on crosscompilers
-		MULTILIB_ABIS=${DEFAULT_ABI}
-		ABI=${DEFAULT_ABI}
-
-		# We need to export CFLAGS with abi information in them because
-		# glibc's configure script checks CFLAGS for some targets (like mips)
-		local VAR="CFLAGS_"${CTARGET//[-.]/_}
-		CFLAGS=${!VAR-"-O2 -pipe"}
-	fi
-
-	export ABI=${ABI:-${DEFAULT_ABI:-default}}
-
-	setup_flags
-}
-
-### /ECLASS PUNTAGE ###
-
-if is_crosscompile ; then
-	SLOT="${CTARGET}-2.2"
-else
-	SLOT="2.2"
-fi
-
-# we'll handle stripping ourself #46186
-RESTRICT="nostrip multilib-pkg-force"
-
-# 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.
-#
-# The gcc-config dep is for the cross-compile multilib stuff
-DEPEND=">=sys-devel/gcc-3.4
-	nptl? ( >=sys-kernel/linux-headers-2.6.5 )
-	>=sys-devel/binutils-2.15.90
-	>=sys-devel/gcc-config-1.3.9
-	virtual/os-headers
-	nls? ( sys-devel/gettext )
-	selinux? ( !build? ( sys-libs/libselinux ) )"
-RDEPEND="nls? ( sys-devel/gettext )
-	selinux? ( !build? ( sys-libs/libselinux ) )"
-
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-	DEPEND="${DEPEND} ${CATEGORY}/gcc"
-
-	if [[ ${CATEGORY} == *-linux* ]] ; then
-		if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then
-			DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10"
-		else
-			DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
-		fi
-	fi
-fi
-
-pkg_setup() {
-	if use nptlonly && ! use nptl ; then
-		eerror "If you want nptlonly, add nptl to your USE too ;p"
-		die "nptlonly without nptl"
-	fi
-
-
-	# give some sort of warning about the nptl logic changes...
-	if want_nptl && want_linuxthreads ; then
-
-		if use ppc ; then
-			eerror "glibc doesn't currently work with nptl and linuxthreads"
-			eerror "please select either nptlonly or -nptl"
-			die "nptlonly not set on ppc"
-		fi
-		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 5
-	fi
-
-	echo
-	ewarn "WARNING: This is a very alpha ebuild, and are mostly provided for"
-	ewarn "those brave souls that want to test gcc-4.0.0.  Please note that"
-	ewarn "these are the packages I used to get it working on x86:"
-	ewarn
-	ewarn "  sys-devel/binutils-2.15.97"
-	ewarn "  sys-devel/gcc-4.0.0"
-	ewarn "  sys-libs/glibc-2.3.5.20050421"
-	ewarn
-	ewarn "Over here at least gcc-4.0.0 can build glibc-2.3.5.20050421, and"
-	ewarn "do a 'emerge system'."
-	ewarn "One more thing to note, is that you SHOULD NOT use binutils"
-	ewarn "version 2.16.90.0.1!!!"
-	echo
-
-	ebeep
-	epause 10
-}
-
-src_unpack() {
-	setup_env
-
-	case $(tc-arch) in
-		hppa)
-			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 2000-all-2.3.2-propolice-guard-functions-v3.patch"
-			use hardened || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6490_hppa_hardened-disable__init_arrays.patch"
-		;;
-		mips)
-			GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch 6600_mips_librt-mips.patch 6640_mips_unistd_h-fixes.patch"
-			use_multilib && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch"
-		;;
-	esac
-
-	GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch"
-
-	toolchain-glibc_src_unpack
-
-	# XXX: do not package ssp up into tarballs, leave it in FILESDIR
-	cd "${S}"
-	cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c"
-	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
-	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
-
-	case $(tc-arch) in
-		alpha)
-			# Is this still needed?
-			rm -f sysdeps/alpha/alphaev6/memcpy.S
-		;;
-		amd64)
-			if ! has_multilib_profile && ! is_crosscompile; then
-				# 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
-			fi
-		;;
-		ppc64)
-			# setup lib -- seems like a good place to set this up
-			has_multilib_profile || get_libdir_override lib64
-		;;
-	esac
-
-	# disable binutils -as-needed
-	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
-
-	# Glibc is stupid sometimes, and doesn't realize that with a
-	# static C-Only gcc, -lgcc_eh doesn't exist.
-	# http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html
-	# http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html
-	echo 'int main(){}' > ${T}/gcc_eh_test.c
-	if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
-		sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh"
-	fi
-
-	# Some configure checks fail on the first emerge through because they
-	# try to link.  This doesn't work well if we don't have a libc yet.
-	# http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html
-	if is_crosscompile && use build; then
-		rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in}
-		rm ${S}/nptl/sysdeps/pthread/configure{,.in}
-	fi
-
-	find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \;
-	find . -name configure -exec touch {} \;
-
-	# Fix permissions on some of the scripts
-	chmod u+x ${S}/scripts/*.sh
-}
-
-src_compile() {
-	setup_env
-
-	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
-			OABI=${ABI}
-			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
-				export ABI=${ABI}
-				src_compile
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-		unset MLTEST
-	fi
-
-	ABI=${ABI:-default}
-	toolchain-glibc_src_compile
-}
-
-src_test() {
-	setup_env
-
-	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
-			OABI=${ABI}
-			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
-				export ABI
-				einfo "   Testing ${ABI} glibc"
-				src_test
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-		unset MLTEST
-	fi
-
-	ABI=${ABI:-default}
-	toolchain-glibc_src_test
-}
-
-src_install() {
-	setup_env
-
-	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-		local MLTEST=$(type dyn_unpack)
-		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
-			OABI=${ABI}
-			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
-			for ABI in $(get_install_abis) ; do
-				export ABI
-				src_install
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-		unset MLTEST
-	fi
-
-	ABI=${ABI:-default}
-
-	# Handle stupid lib32 BS
-	unset OLD_LIBDIR
-	if ! is_crosscompile ; then
-		if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then
-			OLD_LIBDIR=$(get_libdir)
-			LIBDIR_x86="lib"
-		fi
-
-		if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then
-			OLD_LIBDIR=$(get_libdir)
-			LIBDIR_ppc="lib"
-		fi
-	fi
-
-	toolchain-glibc_src_install
-
-	# Handle stupid lib32 BS on amd64 and ppc64
-	if [[ -n ${OLD_LIBDIR} ]] ; then
-		cd "${S}"
-		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR}
-		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR}
-		unset OLD_LIBDIR
-
-		mv "${D}"/lib "${D}"/$(get_libdir)
-		mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
-		dodir /lib
-		dodir /usr/lib
-		mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib
-		[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
-		[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
-
-		for f in "${D}"/usr/$(get_libdir)/*.so; do
-			local basef=$(basename "${f}")
-			if [[ -L ${f} ]] ; then
-				local target=$(readlink "${f}")
-				target=${target/\/lib\//\/$(get_libdir)\/}
-				rm "${f}"
-				dosym "${target}" /usr/$(get_libdir)/"${basef}"
-			fi
-		done
-
-		dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so
-
-		if want_nptl && want_linuxthreads ; then
-			dosed  "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so
-		fi
-	fi
-}
-
-pkg_preinst() {
-	toolchain-glibc_pkg_preinst
-}
-
-pkg_postinst() {
-	toolchain-glibc_pkg_postinst
-}
diff --git a/sys-libs/glibc/glibc-2.3.6-r1.ebuild b/sys-libs/glibc/glibc-2.3.6-r1.ebuild
index 9e67e1dde299..ef0b27d63b42 100644
--- a/sys-libs/glibc/glibc-2.3.6-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r1.ebuild,v 1.12 2006/01/14 20:12:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r1.ebuild,v 1.13 2006/01/18 21:09:11 halcy0n Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1161,7 +1161,7 @@ src_unpack() {
 	cd "${S}"
 	cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c"
 	rm -f "${WORKDIR}"/patches/2*
-	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
+	epatch "${FILESDIR}"/2.3.6/glibc-2.3.6-propolice-guard-functions.patch
 	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
 
 	case $(tc-arch) in
diff --git a/sys-libs/glibc/glibc-2.3.6-r2.ebuild b/sys-libs/glibc/glibc-2.3.6-r2.ebuild
index 0aa19dc90616..059a7f101660 100644
--- a/sys-libs/glibc/glibc-2.3.6-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r2.ebuild,v 1.9 2006/01/16 09:47:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r2.ebuild,v 1.10 2006/01/18 21:09:11 halcy0n Exp $
 
 # TODO:
 #  - fix warning from glibc build system:
@@ -1164,7 +1164,7 @@ src_unpack() {
 	cd "${S}"
 	cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c"
 	rm -f "${WORKDIR}"/patches/2*
-	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
+	epatch "${FILESDIR}"/2.3.6/glibc-2.3.6-propolice-guard-functions.patch
 	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
 
 	case $(tc-arch) in
diff --git a/sys-libs/glibc/glibc-2.3.6.ebuild b/sys-libs/glibc/glibc-2.3.6.ebuild
index 24dc4a946234..9752af37c910 100644
--- a/sys-libs/glibc/glibc-2.3.6.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.13 2006/01/14 20:12:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.14 2006/01/18 21:09:11 halcy0n Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1118,7 +1118,7 @@ src_unpack() {
 	cd "${S}"
 	cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c"
 	rm -f "${WORKDIR}"/patches/2*
-	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
+	epatch "${FILESDIR}"/2.3.6/glibc-2.3.6-propolice-guard-functions.patch
 	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
 
 	case $(tc-arch) in