new version; gcc-3.3 fixes

13 files changed, 760 insertions, 17 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index c4a78574449b..d7e36fe6fc77 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.58 2003/05/14 20:30:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.59 2003/05/18 22:22:50 azarah Exp $
+
+  18 May 2003; Martin Schlemmer <azarah@gentoo.org> :
+  Fix LICENSE to be LGPL-2, bug #19074.  Fix glibc-2.3* < 2.3.2-r2 to depend
+  on <gcc-3.3.
+
+  18 May 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r1.ebuild,
+  glibc-2.3.2-gcc33-sscanf.patch :
+  Downgrade nptl to version 0.28 and add glibc-2.3.2-gcc33-sscanf.patch to
+  fix compile errors with gcc-3.3:
+
+    http://sources.redhat.com/ml/libc-alpha/2003-03/msg00052.html
+
+*glibc-2.3.2-r2 (18 May 2003)
+
+  18 May 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r2.ebuild :
+  New version.  Update to cvs 20030517 to fix problems with gcc-3.3.  Also
+  closes bug #18744 as it adds the en_US.utf8 locale.  Also enable NPTL
+  support for i[45]86, ppc and mips, as it should in theory work now.
 
   14 May 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r{0,1}.ebuild :
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 89282cfb14a4..5d001d260fa1 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,9 +1,8 @@
-MD5 636ab22b0b4f3bee1bee63d961580733 .glibc-2.3.2-r1.ebuild.swp 32768
-MD5 369f64a13921975516d836132e5f949e ChangeLog 12552
-MD5 402bdbe74414b729e266c9489b784f25 glibc-2.3.2-r1.ebuild 15955
-MD5 e4ba90597ace87bc3970ef337ed5bfea glibc-2.3.2-r2.ebuild 15960
-MD5 4ccb4ab7841e7925b79b5b960d8a633a glibc-2.3.1-r4.ebuild 10470
-MD5 0c9864f6844d4a0b3e5fc14327e77f28 glibc-2.2.5-r8.ebuild 9703
+MD5 1e259b1c53f268d11df95b9224822923 ChangeLog 12928
+MD5 c2b34d673ba6efe7f41350479cbde230 glibc-2.3.2-r1.ebuild 15955
+MD5 ef66c8513c94dd10421859c56c00159a glibc-2.3.2-r2.ebuild 16254
+MD5 98af215a05c4f3370ad16ea017e723ff glibc-2.3.1-r4.ebuild 10470
+MD5 34a3b5f68966b3e9c7c94cce512e0cab glibc-2.2.5-r8.ebuild 9704
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
 MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch
new file mode 100644
index 000000000000..523b036d9a7d
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch
@@ -0,0 +1,21 @@
+--- stdio-common/sscanf.c.~1.8.~	2003-01-16 11:25:20.000000000 +0100
++++ stdio-common/sscanf.c	2003-03-05 12:07:34.000000000 +0100
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1991,95,96,98,2002 Free Software Foundation, Inc.
++/* Copyright (C) 1991,95,96,98,2002, 2003 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -27,9 +27,7 @@
+ /* Read formatted input from S, according to the format string FORMAT.  */
+ /* VARARGS2 */
+ int
+-sscanf (s, format)
+-     const char *s;
+-     const char *format;
++sscanf (const char *s, const char *format, ...)
+ {
+   va_list arg;
+   int done;
+
+
diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-nptl-fix-include.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-nptl-fix-include.patch
new file mode 100644
index 000000000000..19c143a252a1
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-nptl-fix-include.patch
@@ -0,0 +1,10 @@
+--- glibc-2.3.2/nptl/unwind.c.orig	2003-05-17 22:11:05.000000000 +0200
++++ glibc-2.3.2/nptl/unwind.c	2003-05-17 22:08:30.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include <setjmp.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include "pthreadP.h"
+ 
+ 
diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch
new file mode 100644
index 000000000000..dd9f1436c384
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch
@@ -0,0 +1,58 @@
+--- glibc-2.3.2-net/linuxthreads/Makefile   13 May 2003 19:51:57 -0000  1.1.1.46
++++ glibc-2.3.2-redhat/linuxthreads/Makefile    13 May 2003 20:07:01 -0000  1.25
+@@ -217,15 +217,18 @@ $(addprefix $(objpfx), \
+   $(filter-out $(tests-static) $(tests-reverse) unload, \
+     $(tests) $(test-srcs))): $(objpfx)libpthread.so \
+			     $(objpfx)libpthread_nonshared.a
+-# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
++# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
+ # since otherwise libpthread.so comes before libc.so when linking.
+ $(addprefix $(objpfx), $(tests-reverse)): \
+-  $(objpfx)../libc.so $(objpfx)libpthread.so \
++  $(objpfx)linklibc.so $(objpfx)libpthread.so \
+   $(objpfx)libpthread_nonshared.a
+ $(objpfx)../libc.so: $(common-objpfx)libc.so ;
+ $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.so
+ $(objpfx)unload: $(common-objpfx)dlfcn/libdl.so
+ $(objpfx)unload.out: $(objpfx)libpthread.so $(objpfx)libpthread_nonshared.a
++$(objpfx)linklibc.so: $(common-objpfx)libc.so
++	ln -s ../libc.so $@
++generated += libclink.so
+ else
+ $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
+ $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a
+--- glibc-2.3.2-net/linuxthreads/cancel.c   22 Feb 2003 16:58:54 -0000  1.1.1.15
++++ glibc-2.3.2-redhat/linuxthreads/cancel.c    23 Feb 2003 21:15:06 -0000  1.10
+@@ -230,5 +230,6 @@ void __pthread_perform_cleanup(char *cur
+     }
+
+   /* And the TSD which needs special help.  */
++  THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE);
+   __libc_thread_freeres ();
+ }
+--- glibc-2.3.2-net/linuxthreads/lockfile.c 18 Dec 2002 12:43:50 -0000  1.1.1.7
++++ glibc-2.3.2-redhat/linuxthreads/lockfile.c  18 Dec 2002 12:48:17 -0000  1.8
+@@ -74,7 +74,11 @@ __fresetlockfiles (void)
+   __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP);
+
+   for (i = _IO_iter_begin(); i != _IO_iter_end(); i = _IO_iter_next(i))
+-    __pthread_mutex_init (_IO_iter_file(i)->_lock, &attr);
++    {
++      _IO_lock_t *_lock = _IO_iter_file(i)->_lock;
++      if (_lock)
++   __pthread_mutex_init (_lock, &attr);
++    }
+
+   __pthread_mutexattr_destroy (&attr);
+
+--- glibc-2.3.2-net/linuxthreads/semaphore.h    25 Jun 2001 11:31:17 -0000  1.1.1.6
++++ glibc-2.3.2-redhat/linuxthreads/semaphore.h 5 Apr 2002 10:02:50 -0000   1.2
+@@ -21,6 +21,7 @@
+ # define __need_timespec
+ # include <time.h>
+ #endif
++#include <bits/pthreadtypes.h>
+
+ #ifndef _PTHREAD_DESCR_DEFINED
+ /* Thread descriptors.  Needed for `sem_t' definition.  */
+
diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch
new file mode 100644
index 000000000000..c25a834b55dc
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch
@@ -0,0 +1,25 @@
+--- glibc-2.3.2-net/nptl/Makefile   15 May 2003 13:07:24 -0000  1.1.1.45
++++ glibc-2.3.2-redhat/nptl/Makefile    15 May 2003 13:28:12 -0000  1.50 
+@@ -330,15 +330,19 @@ $(addprefix $(objpfx), \
+     $(tests) $(test-srcs))): $(objpfx)libpthread.so \
+                 $(objpfx)libpthread_nonshared.a
+ $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so
+-# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
++# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
+ # since otherwise libpthread.so comes before libc.so when linking.
+ $(addprefix $(objpfx), $(tests-reverse)): \
+-  $(objpfx)../libc.so $(objpfx)libpthread.so \
++  $(objpfx)linklibc.so $(objpfx)libpthread.so \
+   $(objpfx)libpthread_nonshared.a
+ $(objpfx)../libc.so: $(common-objpfx)libc.so ;
+ $(addprefix $(objpfx),$(tests-static)): $(objpfx)libpthread.a
+
+ $(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so
++
++$(objpfx)linklibc.so: $(common-objpfx)libc.so
++	ln -s ../libc.so $@
++generated += libclink.so
+ else
+ $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
+ endif
+
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.2-r1 b/sys-libs/glibc/files/digest-glibc-2.3.2-r1
index 5347377ed3c8..7fb46fc2407d 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.2-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.3.2-r1
@@ -1,3 +1,3 @@
 MD5 ede969aad568f48083e413384f20753c glibc-2.3.2.tar.bz2 13377170
 MD5 894b8969cfbdf787c73e139782167607 glibc-linuxthreads-2.3.2.tar.bz2 216310
-MD5 d1f6f3b48ab60c753b6bdeec9208d393 nptl-0.29.tar.bz2 152937
+MD5 befedad981599e1a673e19c3e63d6dce nptl-0.28.tar.bz2 145910
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.2-r2 b/sys-libs/glibc/files/digest-glibc-2.3.2-r2
new file mode 100644
index 000000000000..8cd071e13fa8
--- /dev/null
+++ b/sys-libs/glibc/files/digest-glibc-2.3.2-r2
@@ -0,0 +1,4 @@
+MD5 ede969aad568f48083e413384f20753c glibc-2.3.2.tar.bz2 13377170
+MD5 894b8969cfbdf787c73e139782167607 glibc-linuxthreads-2.3.2.tar.bz2 216310
+MD5 b87f2ce534e2b933c861e651dd58d5ec nptl-0.39.tar.bz2 179601
+MD5 75f1469e9a1db4a5f5cd0e9fa6d5dfcc glibc-2.3.2-branch-update-20030517-1.patch.bz2 647903
diff --git a/sys-libs/glibc/files/nscd.conf b/sys-libs/glibc/files/nscd.conf
new file mode 100644
index 000000000000..226dda377f6d
--- /dev/null
+++ b/sys-libs/glibc/files/nscd.conf
@@ -0,0 +1,45 @@
+#
+# /etc/nscd.conf
+#
+# An example Name Service Cache config file.  This file is needed by nscd.
+#
+# Legal entries are:
+#
+#	logfile			<file>
+#	debug-level		<level>
+#	threads			<#threads to use>
+#	server-user             <user to run server as instead of root>
+#		server-user is ignored if nscd is started with -S parameters
+#
+#       enable-cache		<service> <yes|no>
+#	positive-time-to-live	<service> <time in seconds>
+#	negative-time-to-live   <service> <time in seconds>
+#       suggested-size		<service> <prime number>
+#	check-files		<service> <yes|no>
+#
+# Currently supported cache names (services): passwd, group, hosts
+#
+
+
+#	logfile			/var/log/nscd.log
+#	threads			6
+#	server-user		nobody
+	debug-level		0
+
+	enable-cache		passwd		yes
+	positive-time-to-live	passwd		600
+	negative-time-to-live	passwd		20
+	suggested-size		passwd		211
+	check-files		passwd		yes
+
+	enable-cache		group		yes
+	positive-time-to-live	group		3600
+	negative-time-to-live	group		60
+	suggested-size		group		211
+	check-files		group		yes
+
+	enable-cache		hosts		yes
+	positive-time-to-live	hosts		3600
+	negative-time-to-live	hosts		20
+	suggested-size		hosts		211
+	check-files		hosts		yes
diff --git a/sys-libs/glibc/glibc-2.2.5-r8.ebuild b/sys-libs/glibc/glibc-2.2.5-r8.ebuild
index 9170b9830be3..7bb41fc318ba 100644
--- a/sys-libs/glibc/glibc-2.2.5-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.2.5-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r8.ebuild,v 1.7 2003/04/06 03:11:16 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r8.ebuild,v 1.8 2003/05/18 22:22:50 azarah Exp $
 
 IUSE="nls pic build"
 
@@ -42,7 +42,7 @@ HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
 KEYWORDS="x86 ppc sparc alpha arm"
 SLOT="2.2"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 
 # Portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade)
 # drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
diff --git a/sys-libs/glibc/glibc-2.3.1-r4.ebuild b/sys-libs/glibc/glibc-2.3.1-r4.ebuild
index c88d26c8382c..5473bfc684d3 100644
--- a/sys-libs/glibc/glibc-2.3.1-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.3.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r4.ebuild,v 1.8 2003/04/20 20:59:25 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r4.ebuild,v 1.9 2003/05/18 22:22:50 azarah Exp $
 
 IUSE="nls pic build"
 
@@ -47,11 +47,11 @@ HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 KEYWORDS="x86 ppc sparc alpha mips hppa arm"
 # Is 99% compadible, just some .a's bork
 SLOT="2.2"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 
 # Portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade)
 # Drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
-DEPEND=">=sys-devel/gcc-3.2-r1
+DEPEND="=sys-devel/gcc-3.2*
 	>=sys-devel/binutils-2.13.90.0.16
 	virtual/os-headers
 	nls? ( sys-devel/gettext )"
diff --git a/sys-libs/glibc/glibc-2.3.2-r1.ebuild b/sys-libs/glibc/glibc-2.3.2-r1.ebuild
index 3995b119cd0a..c042983f439e 100644
--- a/sys-libs/glibc/glibc-2.3.2-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r1.ebuild,v 1.5 2003/05/14 20:30:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r1.ebuild,v 1.6 2003/05/18 22:22:50 azarah Exp $
 
 IUSE="nls pic build nptl"
 
@@ -34,7 +34,7 @@ strip-flags
 export CFLAGS="${CFLAGS//-O?} -O2"
 export CXXFLAGS="${CFLAGS}"
 
-NPTL_VER="0.29"
+NPTL_VER="0.28"
 
 # Minimum kernel version for --enable-kernel
 export MIN_KV="2.4.1"
@@ -56,11 +56,11 @@ HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 KEYWORDS="~x86 ~ppc -sparc ~alpha ~hppa ~arm"
 # Is 99% compadible, just some .a's bork
 SLOT="2.2"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 
 # Portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade)
 # Drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
-DEPEND=">=sys-devel/gcc-3.2.2
+DEPEND="=sys-devel/gcc-3.2*
 	nptl? ( >=sys-devel/gcc-3.2.2-r1 )
 	mips? >=sys-devel/binutils-2.13.90.0.16 : >=sys-devel/binutils-2.13.90.0.18
 	virtual/os-headers
@@ -294,6 +294,13 @@ src_unpack() {
 	# <azarah@gentoo.org> (6 Apr 2003).
 	cd ${S}; epatch ${FILESDIR}/${PV}/${P}-dl-reloc-calc-fix.patch
 
+	# Fix compilation with gcc-3.3
+	#
+	#   http://sources.redhat.com/ml/libc-alpha/2003-03/msg00052.html
+	#
+	# <azarah@gentoo.org> (18 May 2003).
+	cd ${S}; epatch ${FILESDIR}/${PV}/${P}-gcc33-sscanf.patch
+
 	# A few patches only for the MIPS platform.  Descriptions of what they
 	# do can be found in the patch headers.
 	# <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003)
diff --git a/sys-libs/glibc/glibc-2.3.2-r2.ebuild b/sys-libs/glibc/glibc-2.3.2-r2.ebuild
new file mode 100644
index 000000000000..891611f592c8
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.3.2-r2.ebuild
@@ -0,0 +1,556 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r2.ebuild,v 1.1 2003/05/18 22:22:50 azarah Exp $
+
+IUSE="nls pic build nptl"
+
+inherit eutils flag-o-matic gcc
+
+filter-flags "-fomit-frame-pointer -malign-double"
+
+# Recently there has been a lot of stability problem in Gentoo-land.  Many
+# things can be the cause to this, but I believe that it is due to gcc3
+# still having issues with optimizations, or with it not filtering bad
+# combinations (protecting the user maybe from himeself) yet.
+#
+# This can clearly be seen in large builds like glibc, where too aggressive
+# CFLAGS cause the tests to fail miserbly.
+#
+# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
+# knows what he is talking about:
+#
+#   People really shouldn't force code-specific options on... It's a
+#   bad idea. The -march options aren't just to look pretty. They enable
+#   options that are sensible (and include sse,mmx,3dnow when apropriate).
+#
+# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
+# you do not like it, comment it, but do not bugreport if you run into
+# problems.
+#
+# <azarah@gentoo.org> (13 Oct 2002)
+strip-flags
+
+# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
+export CFLAGS="${CFLAGS//-O?} -O2"
+export CXXFLAGS="${CFLAGS}"
+
+NPTL_VER="0.39"
+
+BRANCH_UPDATE="20030517-1"
+
+# Minimum kernel version for --enable-kernel
+export MIN_KV="2.4.1"
+# Minimum kernel version for enabling TLS and NPTL ...
+# NOTE: do not change this if you do not know what
+#       you are doing !
+export MIN_NPTL_KV="2.5.50"
+
+MY_PV="${PV/_}"
+S="${WORKDIR}/${P%_*}"
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${MY_PV}.tar.bz2
+	ftp://sources.redhat.com/pub/glibc/snapshots/glibc-${MY_PV}.tar.bz2
+	http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${MY_PV}.tar.bz2
+	ftp://sources.redhat.com/pub/glibc/snapshots/glibc-linuxthreads-${MY_PV}.tar.bz2
+	nptl? ( http://people.redhat.com/drepper/nptl/nptl-${NPTL_VER}.tar.bz2 )
+	mirror://gentoo/${P}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm"
+# Is 99% compadible, just some .a's bork
+SLOT="2.2"
+LICENSE="LGPL-2"
+
+# Portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade)
+# Drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
+DEPEND=">=sys-devel/gcc-3.3
+	nptl? ( >=sys-devel/gcc-3.3 )
+	mips? >=sys-devel/binutils-2.13.90.0.16 : >=sys-devel/binutils-2.13.90.0.18
+	virtual/os-headers
+	nls? ( sys-devel/gettext )"
+
+RDEPEND="virtual/os-headers
+	sys-apps/baselayout
+	nls? ( sys-devel/gettext )
+	build? ( >=sys-apps/portage-1.9.0 )"
+
+PROVIDE="virtual/glibc"
+
+
+# Convert a string type kernel version (2.4.0) to an int (132096)
+# for easy compairing or versions ...
+KV_to_int() {
+	[ -z "$1" ] && return 1
+	
+	local KV="`echo $1 | \
+		awk '{ tmp = $0; gsub(/^[0-9\.]*/, "", tmp); sub(tmp, ""); print }'`"
+	local KV_MAJOR="`echo "${KV}" | cut -d. -f1`"
+	local KV_MINOR="`echo "${KV}" | cut -d. -f2`"
+	local KV_MICRO="`echo "${KV}" | cut -d. -f3`"
+	local KV_int="$((KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO))"
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [ "${KV_int}" -ge "131584" ]
+	then
+		echo "${KV_int}"
+
+		return 0
+	else
+		return 1
+	fi
+}
+
+get_KV() {
+	local KV="`uname -r`"
+
+	echo "`KV_to_int ${KV}`"
+
+	return $?
+}
+
+# Try to get a kernel source tree with version equal or greater
+# than $1.  We basically just try a few default locations.  The
+# version need to be that which KV_to_int() returns ...
+get_KHV() {
+	local headers=""
+	
+	[ -z "$1" ] && return 1
+	
+	# - First check if linux-headers are installed (or symlink
+	#   to current kernel ...)
+	# - Ok, do we have access to the current kernel's headers ?
+	# - Last option ... maybe its a weird bootstrap with /lib
+	#   binded to the chroot ...
+
+	# We do not really support more than 2 arguments ...
+	if [ -n "$2" ]
+	then
+		headers="$2"
+	else
+		# We try to find the current kernel's headers first,
+		# as we would rather build against linux 2.5 headers ...
+		headers="/lib/modules/`uname -r`/build/include \
+		         ${ROOT}/lib/modules/`uname -r`/build/include \
+				 /usr/src/linux/include \
+				 ${ROOT}/usr/src/linux/include \
+		         ${ROOT}/usr/include"
+	fi
+
+	for x in ${headers}
+	do
+		local header="${x}/linux/version.h"
+		
+		if [ -f ${header} ]
+		then
+		
+			local version="`grep 'LINUX_VERSION_CODE' ${header} | \
+				sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::'`"
+
+			if [ "${version}" -ge "$1" ]
+			then
+				echo "${x}"
+			
+				return 0
+			fi
+		fi
+	done
+
+	return 1
+}
+
+use_nptl() {
+	# Enable NPTL support if:
+	# - We have 'nptl' in USE
+	# - We have linux-2.5 or later kernel (should prob check for 2.4.20 ...)
+	if [ -n "`use nptl`" -a "`get_KV`" -ge "`KV_to_int ${MIN_NPTL_KV}`"  ]
+	then
+		# Enable NPTL support if:
+		# - We have 'x86' in USE and:
+		#   - a CHOST of "i486-pc-linux-gnu"
+		#   - a CHOST of "i586-pc-linux-gnu"
+		#   - a CHOST of "i686-pc-linux-gnu"
+		# - Or we have 'ppc' in USE
+		# - Or we have 'mips' in USE
+		if [ "`use x86`" ]
+		then
+			if [ "${CHOST/-*}" = "i486" -o \
+			     "${CHOST/-*}" = "i586" -o \
+				 "${CHOST/-*}" = "i686" ]
+			then
+				return 0
+			fi
+		fi
+		if [ "`use ppc`" -o "`use mips`" ]
+		then
+			return 0
+		fi
+	fi
+
+	return 1
+}
+
+pkg_setup() {
+	# We need gcc 3.2 or later ...
+	if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ]
+	then
+		echo
+		eerror "As of glibc-2.3, gcc-3.2 or later is needed"
+		eerror "for the build to succeed."
+		die "GCC too old"
+	fi
+
+	if [ -n "`is-flag "-fstack-protector"`" -a -n "`has "sandbox" $FEATURES`" ]
+	then
+		eerror "You have both -fstack-protector and sandbox enabled"
+		eerror "glibc will not compile correctly with both of these enabled"
+		eerror "Please disable sandbox by calling emerge with FEATURES=\"-sandbox\""
+		die "Have -fstack-protector and sandbox enabled"
+	fi
+
+	if use_nptl
+	then
+		echo
+
+		# The use_nptl should have already taken care of kernel version,
+		# arch and CHOST, so now just check if we can find suitable kernel
+		# source tree or headers ....
+		einfon "Checking for sufficient version kernel headers ... "
+		if ! get_KHV "`KV_to_int ${MIN_NPTL_KV}`" &> /dev/null
+		then
+			echo "no"
+			echo
+			eerror "Could not find a kernel source tree or headers with"
+			eerror "version ${MIN_NPTL_KV} or later!  Please correct this"
+			eerror "and try again."
+			die "Insufficient kernel headers present!"
+		else
+			echo "yes"
+		fi
+		
+		einfon "Checking gcc for __thread support ... "
+		if ! gcc -c ${FILESDIR}/test-__thread.c -o ${T}/test.o &> /dev/null
+		then
+			echo "no"
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "please update to gcc-3.2.2-r1 or later, and try again."
+			die "No __thread support in gcc!"
+		else
+			echo "yes"
+		fi
+
+		# Default disclaimer ...
+		echo
+		ewarn "Please note that NPTL support is still very experimental,"
+		ewarn "and could break your system!  Press ^C now if you do not know"
+		ewarn "what you are doing, and remove \"nptl\" from your USE ..."
+		echo
+		sleep 5
+	
+	elif use nptl &> /dev/null
+	then
+		# Just tell the user not to expect too much ...
+		ewarn "You have \"nptl\" in your USE, but your kernel version or"
+		ewarn "architecture do not support it!"
+	fi
+}
+
+src_unpack() {
+
+	unpack glibc-${MY_PV}.tar.bz2
+	
+	# Extract pre-made man pages.  Otherwise we need perl, which is a no-no.
+	mkdir -p ${S}/man; cd ${S}/man
+	use_nptl || tar xjf ${FILESDIR}/glibc-manpages-${MY_PV}.tar.bz2
+	
+	cd ${S}
+	# Extract our threads package ...
+	if use_nptl
+	then
+		unpack nptl-${NPTL_VER}.tar.bz2
+		
+	elif [ -z "${BRANCH_UPDATE}" ]
+	then
+		# The branch update have this already included ...
+		unpack glibc-linuxthreads-${MY_PV}.tar.bz2
+	fi
+
+	if [ -n "${BRANCH_UPDATE}" ]
+	then
+		epatch ${DISTDIR}/${P}-branch-update-${BRANCH_UPDATE}.patch.bz2
+	fi
+
+	if use_nptl
+	then
+		epatch ${FILESDIR}/2.3.2/${P}-redhat-nptl-fixes.patch
+	else
+		epatch ${FILESDIR}/2.3.2/${P}-redhat-linuxthreads-fixes.patch
+	fi
+
+	# This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
+#	cd ${S}/io; epatch ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch
+
+	# This add back glibc 2.2 compadibility.  See bug #8766 and #9586 for more info,
+	# and also:
+	#
+	#  http://lists.debian.org/debian-glibc/2002/debian-glibc-200210/msg00093.html
+	#
+	# We should think about remoing it in the future after things have settled.
+	#
+	# Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it.
+	#
+	# <azarah@gentoo.org> (26 Oct 2002).
+	cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-ctype-compat-v3.patch
+
+	# One more compat issue which breaks sun-jdk-1.3.1.  See bug #8766 for more
+	# info, and also:
+	#
+	#   http://sources.redhat.com/ml/libc-alpha/2002-04/msg00143.html
+	#
+	# Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it.
+	#
+	# <azarah@gentoo.org> (30 Oct 2002).
+	cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-libc_wait-compat.patch
+
+	# One more compat issue ... libc_stack_end is missing from ld.so.
+	# Got this one from diffing redhat glibc tarball .. would help if
+	# they used patches and not modified tarball ...
+	#
+	# <azarah@gentoo.org> (7 Nov 2002).
+	cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-stack_end-compat.patch
+
+	# A few patches only for the MIPS platform.  Descriptions of what they
+	# do can be found in the patch headers.
+	# <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003)
+	# <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches
+	if [ "${ARCH}" = "mips" ]
+	then
+		cd ${S}
+		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-elf-machine-rela-mips.patch
+		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-exit-syscall-mips.patch
+		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-fpu-cw-mips.patch
+		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-inline-syscall-mips.patch
+		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-libgcc-compat-mips.patch
+		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-librt-mips.patch
+	fi
+
+	# Fix missing include of unistd.h in nptl/unwind.c
+	# <azarah@gentoo.org> (17 May 2003)
+	if use_nptl
+	then
+		cd ${S}; epatch ${FILESDIR}/2.3.2/${P}-nptl-fix-include.patch
+	fi
+}
+
+setup_flags() {
+	# -freorder-blocks for all but ia64 s390 s390x
+	use ppc || append-flags "-freorder-blocks"
+
+	# Sparc support ...
+	replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc"
+	replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
+
+	# -mvis for sparc64 (should this be always, or only with 64bit userspace ?
+	[ "${PROFILE_ARCH}" = "sparc64" ] && append-flags "-mvis"
+
+	# -fcall-used-g7 for sparc and sparc64
+	use sparc && append-flags "-fcall-used-g7"
+}
+
+src_compile() {
+	local myconf=""
+	local myconf_nptl=""
+
+	setup_flags
+
+	# These should not be set, else the
+	# zoneinfo do not always get installed ...
+	unset LANGUAGE LANG LC_ALL
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	if use_nptl
+	then
+		local kernelheaders="$(get_KHV "`KV_to_int ${MIN_NPTL_KV}`")"
+		
+		# NTPL and Thread Local Storage support.
+		myconf="${myconf} --with-tls --with-__thread \
+		                       --enable-add-ons=nptl \
+		                       --enable-kernel=${MIN_NPTL_KV} \
+		                       --with-headers=${kernelheaders}"
+	else
+		myconf="${myconf} --without-tls --without-__thread \
+		                  --enable-add-ons=linuxthreads"
+
+		# If we build for the build system we use the kernel headers from the target
+		# We also now set it without "build" as well, else it might use the
+		# current kernel's headers, which might just fail (the linux-headers
+		# package is usually well tested...)
+#		( use build || use sparc ) \
+#			&& myconf="${myconf} --with-headers=${ROOT}usr/include"
+		myconf="${myconf} --with-headers=${ROOT}usr/include"
+
+		# If kernel version and headers in ${ROOT}/usr/include are ok,
+		# then enable --enable-kernel=${MIN_KV} ...
+		if [ "`get_KV`" -ge "`KV_to_int ${MIN_KV}`" -a \
+		     -n "$(get_KHV "`KV_to_int ${MIN_KV}`" "${ROOT}/usr/include")" ]
+		then
+			myconf="${myconf} --enable-kernel=${MIN_KV}"
+		else
+			myconf="${myconf} --enable-kernel=2.2.5"
+		fi
+	fi
+
+	einfo "Configuring GLIBC..."
+	rm -rf ${S}/buildhere
+	mkdir -p ${S}/buildhere
+	cd ${S}/buildhere
+	../configure --build=${CHOST} \
+		--host=${CHOST} \
+		--with-gd=no \
+		--without-cvs \
+		--disable-profile \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--libexecdir=/usr/lib/misc \
+		${myconf} || die
+
+	einfo "Building GLIBC..."
+	cd ${S}/buildhere
+	make PARALLELMFLAGS="${MAKEOPTS}" || die
+#	einfo "Doing GLIBC checks..."
+#	make check
+}
+
+src_install() {
+	local buildtarget="buildhere"
+	
+	setup_flags
+	
+	# These should not be set, else the
+	# zoneinfo do not always get installed ...
+	unset LANGUAGE LANG LC_ALL
+
+	einfo "Installing GLIBC..."
+	make PARALLELMFLAGS="${MAKEOPTS}" \
+		install_root=${D} \
+		install -C ${buildtarget} || die
+
+	# If librt.so is a symlink, change it into linker script (Redhat)
+	if [ -L ${D}/usr/lib/librt.so ]
+	then
+		local LIBRTSO="`cd ${D}/lib; echo librt.so.*`"
+		local LIBPTHREADSO="`cd ${D}/lib; echo libpthread.so.*`"
+
+		rm -f ${D}/usr/lib/librt.so
+		cat > ${D}/usr/lib/librt.so <<EOF
+/* GNU ld script
+   librt.so.1 needs libpthread.so.0 to come before libc.so.6*
+   in search scope.  */
+EOF
+		grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so
+		echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \
+			>> ${D}/usr/lib/librt.so
+	fi
+
+	if [ -z "`use build`" ]
+	then
+		einfo "Installing Info pages..."
+		make PARALLELMFLAGS="${MAKEOPTS}" \
+			install_root=${D} \
+			info -C ${buildtarget} || die
+		
+		einfo "Installing Locale data..."
+		make PARALLELMFLAGS="${MAKEOPTS}" \
+			install_root=${D} \
+			localedata/install-locales -C ${buildtarget} || die
+
+		# Compatibility hack: this locale has vanished from glibc,
+		# but some other programs are still using it.
+		keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
+
+		einfo "Installing man pages and docs..."
+		# Install linuxthreads man pages
+		use_nptl || {
+			dodir /usr/share/man/man3
+			doman ${S}/man/*.3thr
+		}
+		
+		# Install nscd config file
+		insinto /etc
+		doins ${FILESDIR}/nscd.conf
+		
+		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
+			NEWS NOTES PROJECTS README*
+	else
+		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
+
+		einfo "Installing Timezone data..."
+		make PARALLELMFLAGS="${MAKEOPTS}" \
+			install_root=${D} \
+			timezone/install-others -C ${buildtarget} || die
+	fi
+	
+	if [ "`use pic`" ] 
+	then
+		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \;
+		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \;
+		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/lib \;
+		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/lib \;
+		for i in ${D}/lib/*.map
+		do
+			mv ${i} ${i%.map}_pic.map
+		done
+	fi
+
+	# Is this next line actually needed or does the makefile get it right?
+	# It previously has 0755 perms which was killing things.
+	fperms 4755 /usr/lib/misc/pt_chown
+
+	# Currently libraries in  /usr/lib/gconv do not get loaded if not
+	# in search path ...
+#	insinto /etc/env.d
+#	doins ${FILESDIR}/03glibc
+	
+	rm -f ${D}/etc/ld.so.cache
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f ${D}/etc/localtime
+
+	# Some things want this, notably ash.
+	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
+}
+
+pkg_postinst() {
+	# Correct me if I am wrong here, but my /etc/localtime is a file
+	# created by zic ....
+	# I am thinking that it should only be recreated if no /etc/localtime
+	# exists, or if it is an invalid symlink.
+	#
+	# For invalid symlink:
+	#   -f && -e  will fail
+	#   -L will succeed
+	#
+	if [ ! -e ${ROOT}/etc/localtime ]
+	then
+		echo "Please remember to set your timezone using the zic command."
+		rm -f ${ROOT}/etc/localtime
+		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
+	fi
+
+	if [ -x ${ROOT}/usr/sbin/iconvconfig ]
+	then
+		# Generate fastloading iconv module configuration file.
+		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
+	fi
+
+	# Reload init ...
+	if [ "${ROOT}" = "/" ]
+	then
+		/sbin/init U &> /dev/null
+	fi
+}
+