removing old glibc ebuilds and doing repoman fix-ups

19 files changed, 4 insertions, 1327 deletions

diff --git a/sys-libs/glibc/files/digest-glibc-2.2.4-r4 b/sys-libs/glibc/files/digest-glibc-2.2.4-r4
deleted file mode 100644
index 51e4c6fa07f6..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.2.4-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3a41315c8e571ae4b196dbe834738d95 glibc-2.2.4.tar.bz2 12218861
-MD5 08939bf73423d03b901fd61228127752 glibc-linuxthreads-2.2.4.tar.bz2 165385
diff --git a/sys-libs/glibc/files/digest-glibc-2.2.4-r5 b/sys-libs/glibc/files/digest-glibc-2.2.4-r5
deleted file mode 100644
index 1c578e011e72..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.2.4-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a41315c8e571ae4b196dbe834738d95 glibc-2.2.4.tar.bz2 12218861
-MD5 08939bf73423d03b901fd61228127752 glibc-linuxthreads-2.2.4.tar.bz2 165385
-MD5 c40895f13d7d06fc8435410971568c5b glibc-manpages-2.2.4.tar.bz2 14629
diff --git a/sys-libs/glibc/files/digest-glibc-2.2.4-r6 b/sys-libs/glibc/files/digest-glibc-2.2.4-r6
deleted file mode 100644
index 1c578e011e72..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.2.4-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a41315c8e571ae4b196dbe834738d95 glibc-2.2.4.tar.bz2 12218861
-MD5 08939bf73423d03b901fd61228127752 glibc-linuxthreads-2.2.4.tar.bz2 165385
-MD5 c40895f13d7d06fc8435410971568c5b glibc-manpages-2.2.4.tar.bz2 14629
diff --git a/sys-libs/glibc/files/digest-glibc-2.2.4-r7 b/sys-libs/glibc/files/digest-glibc-2.2.4-r7
deleted file mode 100644
index 1c578e011e72..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.2.4-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a41315c8e571ae4b196dbe834738d95 glibc-2.2.4.tar.bz2 12218861
-MD5 08939bf73423d03b901fd61228127752 glibc-linuxthreads-2.2.4.tar.bz2 165385
-MD5 c40895f13d7d06fc8435410971568c5b glibc-manpages-2.2.4.tar.bz2 14629
diff --git a/sys-libs/glibc/files/digest-glibc-2.2.4-r8 b/sys-libs/glibc/files/digest-glibc-2.2.4-r8
deleted file mode 100644
index 1c578e011e72..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.2.4-r8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a41315c8e571ae4b196dbe834738d95 glibc-2.2.4.tar.bz2 12218861
-MD5 08939bf73423d03b901fd61228127752 glibc-linuxthreads-2.2.4.tar.bz2 165385
-MD5 c40895f13d7d06fc8435410971568c5b glibc-manpages-2.2.4.tar.bz2 14629
diff --git a/sys-libs/glibc/files/digest-glibc-2.2.4-r9 b/sys-libs/glibc/files/digest-glibc-2.2.4-r9
deleted file mode 100644
index 1c578e011e72..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.2.4-r9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a41315c8e571ae4b196dbe834738d95 glibc-2.2.4.tar.bz2 12218861
-MD5 08939bf73423d03b901fd61228127752 glibc-linuxthreads-2.2.4.tar.bz2 165385
-MD5 c40895f13d7d06fc8435410971568c5b glibc-manpages-2.2.4.tar.bz2 14629
diff --git a/sys-libs/glibc/files/digest-glibc-2.2.5-r1 b/sys-libs/glibc/files/digest-glibc-2.2.5-r1
deleted file mode 100644
index acc05c85ba28..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.2.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5be613d02b934d8e305dd2f93062fa6c glibc-2.2.5.tar.bz2 12404613
-MD5 33b9ae01d51263867d338adfba105278 glibc-linuxthreads-2.2.5.tar.bz2 168269
diff --git a/sys-libs/glibc/files/digest-glibc-2.2.5-r2 b/sys-libs/glibc/files/digest-glibc-2.2.5-r2
deleted file mode 100644
index acc05c85ba28..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.2.5-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5be613d02b934d8e305dd2f93062fa6c glibc-2.2.5.tar.bz2 12404613
-MD5 33b9ae01d51263867d338adfba105278 glibc-linuxthreads-2.2.5.tar.bz2 168269
diff --git a/sys-libs/glibc/files/digest-glibc-2.2.5-r3 b/sys-libs/glibc/files/digest-glibc-2.2.5-r3
deleted file mode 100644
index acc05c85ba28..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.2.5-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5be613d02b934d8e305dd2f93062fa6c glibc-2.2.5.tar.bz2 12404613
-MD5 33b9ae01d51263867d338adfba105278 glibc-linuxthreads-2.2.5.tar.bz2 168269
diff --git a/sys-libs/glibc/glibc-2.2.4-r4.ebuild b/sys-libs/glibc/glibc-2.2.4-r4.ebuild
deleted file mode 100644
index 7139d680435e..000000000000
--- a/sys-libs/glibc/glibc-2.2.4-r4.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.4-r4.ebuild,v 1.6 2001/12/09 01:21:06 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
-	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2
-	 ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2
-	 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-#Specific Linux headers are now required so that we build from a stable "base"
-#We need gcc-2.95.3-r2 because it includes a special fix for this glibc version (2.2.4)
-LHV=2.4.16
-DEPEND="~sys-kernel/linux-headers-${LHV} nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
-RDEPEND="~sys-kernel/linux-headers-${LHV}"
-
-if [ -z "`use build`" ]
-then
-	RDEPEND="$RDEPEND gd? ( sys-libs/zlib media-libs/libpng ) sys-apps/baselayout"
-else
-	RDEPEND="$RDEPEND sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-src_unpack() {
-	unpack glibc-${PV}.tar.bz2
-	cd ${S}
-	unpack glibc-linuxthreads-${PV}.tar.bz2
-	for i in mtrace-intl-perl
-	do
-		echo "Applying $i patch..."
-		patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff || die
-	done
-	#For information about the string2 patch, see: http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
-	patch -p0 < ${FILESDIR}/glibc-2.2.3-string2.diff || die
-	cd io
-	#To my knowledge, this next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-	patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-	#now we need to fix a problem where glibc doesn't compile with absolutely no -O optimizations.
-	#we'll need to keep our eyes on this one to see how things are in later versions of linuxthreads:
-	#for more info, see:
-	# http://gcc.gnu.org/ml/gcc-prs/2001-06/msg00044.html
-	# http://www.mail-archive.com/bug-glibc@gnu.org/msg01820.html
-	cd ${S}/linuxthreads
-	cp spinlock.c spinlock.c.orig
-	sed -e 's/ : "0" (lock->__status)//g' spinlock.c.orig > spinlock.c
-}
-
-src_compile() {
-	local myconf
-	# If we build for the build system we use the kernel headers from the target
-	[ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
-	if [ "`use gd`" ] && [ -z "`use bootstrap`" ] && [ -z "`use build`" ]
-	then
-		myconf="${myconf} --with-gd=yes"
-	else
-		myconf="${myconf} --with-gd=no"
-	fi
-	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
-	rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	../configure --host=${CHOST} --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
-		--mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
-	
-	#This next option breaks the Sun JDK and the IBM JDK
-	#We should really keep compatibility with older kernels, anyway
-	#--enable-kernel=2.4.0
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-	make check
-}
-
-
-src_install() {
-	export LC_ALL=C
-	make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
-	if [ -z "`use build`" ]
-	then
-		dodir /etc/rc.d/init.d
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
-
-		# I commented out linuxthreads man pages because I don't want glibc to build depend on perl, but we really
-		# should fix this.
-		# dodir /usr/share/man/man3
-		# make MANDIR=${D}/usr/share/man/man3 install -C linuxthreads/man || die
-		# cd ${D}/usr/share/man/man3
-		# for i in *.3thr
-		# do
-		# mv ${i} ${i%.3thr}.3
-		# done
-		
-		install -m 644 nscd/nscd.conf ${D}/etc
-		install -m 755 ${FILESDIR}/nscd ${D}/etc/rc.d/init.d/nscd
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-	fi
-	if [ "`use pic`" ] 
-	then
-		find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
-		for i in ${D}/lib/*.map
-		do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-	rm ${D}/lib/ld-linux.so.2
-	rm ${D}/lib/libc.so.6
-	rm ${D}/lib/libpthread.so.0
-	#is this next line actually needed or does the makefile get it right.  It previously has 0755 perms which was
-	#killing things.
-	chmod 4755 ${D}/usr/lib/misc/pt_chown
-	rm -f ${D}/etc/ld.so.cache
-
-	#prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	#creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-}
-
-pkg_preinst()
-{
-	local mytarget	
-	echo "Backing up existing critical libraries..."
-	[ ! -d ${ROOT}lib/old ] && mkdir ${ROOT}lib/old
-	for file in ld-linux.so.2 libc.so.6 libpthread.so.0
-	do
-		if [ -f ${ROOT}lib/${file} ]
-		then
-			#all this "mytarget" stuff allows us to create a backup
-			#library in /lib/old with the *real* version name
-			#rather than the *generic* version name.
-	
-			mytarget="`readlink ${ROOT}lib/${file}`"
-			mytarget="`basename $mytarget`"
-			/bin/cp ${ROOT}lib/${file} ${ROOT}lib/old/${mytarget}
-			/sbin/sln ${ROOT}lib/old/${mytarget} ${ROOT}lib/${file}
-		fi
-	done
-	return 0
-}
-
-pkg_postinst()
-{
-	/sbin/sln ld-${PV}.so ${ROOT}lib/ld-linux.so.2
-	/sbin/sln libc-${PV}.so ${ROOT}lib/libc.so.6
-	/sbin/sln libpthread-0.9.so ${ROOT}lib/libpthread.so.0
-	#we used to delete the backup libraries; we don't do this anymore.
-	#other apps may still have them mapped into their address space,
-	#but this shouldn't be a problem.  The main reason is if something
-	#goes wrong with the new lib install.	It's just a nicer way of
-	#handling things, imho.
-	/sbin/ldconfig -r ${ROOT}
-	#we do the localtime symlink here so that we don't overwrite any
-	#existing one during merge.
-	if [ ! -e ${ROOT}etc/localtime ]
-	then
-		echo "Please remember to set your timezone using the zic command."
-		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime	
-	fi	
-	return 0
-}
diff --git a/sys-libs/glibc/glibc-2.2.4-r5.ebuild b/sys-libs/glibc/glibc-2.2.4-r5.ebuild
deleted file mode 100644
index 29924ebc3210..000000000000
--- a/sys-libs/glibc/glibc-2.2.4-r5.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.4-r5.ebuild,v 1.2 2001/12/21 06:13:34 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
-	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2
-	 http://www.ibiblio.org/glibc-manpages-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-#Specific Linux headers are now required so that we build from a stable "base"
-#portage-1.7.8 needed for smart library merging feature (avoids segfaults on glibc upgrade)
-LHV=2.4.16
-DEPEND=">=sys-apps/portage-1.7.8 ~sys-kernel/linux-headers-${LHV} nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
-RDEPEND="~sys-kernel/linux-headers-${LHV}"
-
-if [ -z "`use build`" ]
-then
-	RDEPEND="$RDEPEND gd? ( sys-libs/zlib media-libs/libpng ) sys-apps/baselayout"
-else
-	RDEPEND="$RDEPEND sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-src_unpack() {
-	unpack glibc-${PV}.tar.bz2
-	cd ${S}
-	#extract pre-made man pages.  Otherwise we need perl, which is a no-no.
-	mkdir man; cd man
-	tar xjf ${DISTDIR}/glibc-manpages-${PV}.tar.bz2
-	cd ${S}
-	unpack glibc-linuxthreads-${PV}.tar.bz2
-	for i in mtrace-intl-perl
-	do
-		echo "Applying $i patch..."
-		patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff || die
-	done
-	#For information about the string2 patch, see: http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
-	patch -p0 < ${FILESDIR}/glibc-2.2.3-string2.diff || die
-	cd io
-	#To my knowledge, this next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-	patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-	#now we need to fix a problem where glibc doesn't compile with absolutely no -O optimizations.
-	#we'll need to keep our eyes on this one to see how things are in later versions of linuxthreads:
-	#for more info, see:
-	# http://gcc.gnu.org/ml/gcc-prs/2001-06/msg00044.html
-	# http://www.mail-archive.com/bug-glibc@gnu.org/msg01820.html
-	cd ${S}/linuxthreads
-	cp spinlock.c spinlock.c.orig
-	sed -e 's/ : "0" (lock->__status)//g' spinlock.c.orig > spinlock.c
-}
-
-src_compile() {
-	local myconf
-	# If we build for the build system we use the kernel headers from the target
-	[ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
-	if [ "`use gd`" ] && [ -z "`use bootstrap`" ] && [ -z "`use build`" ]
-	then
-		myconf="${myconf} --with-gd=yes"
-	else
-		myconf="${myconf} --with-gd=no"
-	fi
-	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
-	rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	../configure --host=${CHOST} --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
-		--mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
-	
-	#This next option breaks the Sun JDK and the IBM JDK
-	#We should really keep compatibility with older kernels, anyway
-	#--enable-kernel=2.4.0
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-	make check
-}
-
-
-src_install() {
-	export LC_ALL=C
-	make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
-	if [ -z "`use build`" ]
-	then
-		dodir /etc/rc.d/init.d
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
-		#install linuxthreads man pages
-		dodir /usr/share/man/man3
-		doman ${S}/man/*.3thr	
-		install -m 644 nscd/nscd.conf ${D}/etc
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-	fi
-	if [ "`use pic`" ] 
-	then
-		find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
-		for i in ${D}/lib/*.map
-		do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-	rm ${D}/lib/ld-linux.so.2
-	rm ${D}/lib/libc.so.6
-	rm ${D}/lib/libpthread.so.0
-	#is this next line actually needed or does the makefile get it right.  It previously has 0755 perms which was
-	#killing things.
-	chmod 4755 ${D}/usr/lib/misc/pt_chown
-	rm -f ${D}/etc/ld.so.cache
-
-	#prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	#creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-}
-
-pkg_postinst()
-{
-	#we do the localtime symlink here so that we don't overwrite any
-	#existing one during merge.
-	if [ ! -e ${ROOT}etc/localtime ]
-	then
-		echo "Please remember to set your timezone using the zic command."
-		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime	
-	fi	
-}
diff --git a/sys-libs/glibc/glibc-2.2.4-r6.ebuild b/sys-libs/glibc/glibc-2.2.4-r6.ebuild
deleted file mode 100644
index 30596a3435ca..000000000000
--- a/sys-libs/glibc/glibc-2.2.4-r6.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.4-r6.ebuild,v 1.1 2001/12/21 15:39:30 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
-	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2
-	 http://www.ibiblio.org/glibc-manpages-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-#Specific Linux headers are now required so that we build from a stable "base"
-#portage-1.7.8 needed for smart library merging feature (avoids segfaults on glibc upgrade)
-LHV=2.4.16
-DEPEND=">=sys-apps/portage-1.7.8 ~sys-kernel/linux-headers-${LHV} nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
-RDEPEND="~sys-kernel/linux-headers-${LHV}"
-
-if [ -z "`use build`" ]
-then
-	RDEPEND="$RDEPEND gd? ( sys-libs/zlib media-libs/libpng ) sys-apps/baselayout"
-else
-	RDEPEND="$RDEPEND sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-src_unpack() {
-	unpack glibc-${PV}.tar.bz2
-	cd ${S}
-	#extract pre-made man pages.  Otherwise we need perl, which is a no-no.
-	mkdir man; cd man
-	tar xjf ${DISTDIR}/glibc-manpages-${PV}.tar.bz2
-	cd ${S}
-	unpack glibc-linuxthreads-${PV}.tar.bz2
-	for i in mtrace-intl-perl
-	do
-		echo "Applying $i patch..."
-		patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff || die
-	done
-	#For information about the string2 patch, see: http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
-	patch -p0 < ${FILESDIR}/glibc-2.2.3-string2.diff || die
-	cd io
-	#To my knowledge, this next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-	patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-	#now we need to fix a problem where glibc doesn't compile with absolutely no -O optimizations.
-	#we'll need to keep our eyes on this one to see how things are in later versions of linuxthreads:
-	#for more info, see:
-	# http://gcc.gnu.org/ml/gcc-prs/2001-06/msg00044.html
-	# http://www.mail-archive.com/bug-glibc@gnu.org/msg01820.html
-	cd ${S}/linuxthreads
-	cp spinlock.c spinlock.c.orig
-	sed -e 's/ : "0" (lock->__status)//g' spinlock.c.orig > spinlock.c
-}
-
-src_compile() {
-	local myconf
-	# If we build for the build system we use the kernel headers from the target
-	[ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
-	if [ "`use gd`" ] && [ -z "`use bootstrap`" ] && [ -z "`use build`" ]
-	then
-		myconf="${myconf} --with-gd=yes"
-	else
-		myconf="${myconf} --with-gd=no"
-	fi
-	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
-	rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	../configure --host=${CHOST} --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
-		--mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
-	
-	#This next option breaks the Sun JDK and the IBM JDK
-	#We should really keep compatibility with older kernels, anyway
-	#--enable-kernel=2.4.0
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-	make check
-}
-
-
-src_install() {
-	export LC_ALL=C
-	make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
-	if [ -z "`use build`" ]
-	then
-		dodir /etc/rc.d/init.d
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
-		#install linuxthreads man pages
-		dodir /usr/share/man/man3
-		doman ${S}/man/*.3thr	
-		install -m 644 nscd/nscd.conf ${D}/etc
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-	fi
-	if [ "`use pic`" ] 
-	then
-		find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
-		for i in ${D}/lib/*.map
-		do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-	rm ${D}/lib/ld-linux.so.2
-	rm ${D}/lib/libc.so.6
-	rm ${D}/lib/libpthread.so.0
-	#is this next line actually needed or does the makefile get it right.  It previously has 0755 perms which was
-	#killing things.
-	chmod 4755 ${D}/usr/lib/misc/pt_chown
-	rm -f ${D}/etc/ld.so.cache
-
-	#prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	#creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-}
-
-pkg_preinst()
-{
-	local mytarget	
-	echo "Backing up existing critical libraries..."
-	[ ! -d ${ROOT}lib/old ] && mkdir ${ROOT}lib/old
-	for file in ld-linux.so.2 libc.so.6 libpthread.so.0
-	do
-		if [ -f ${ROOT}lib/${file} ]
-		then
-			#all this "mytarget" stuff allows us to create a backup
-			#library in /lib/old with the *real* version name
-			#rather than the *generic* version name.
-	
-			mytarget="`readlink ${ROOT}lib/${file}`"
-			mytarget="`basename $mytarget`"
-			/bin/cp ${ROOT}lib/${file} ${ROOT}lib/old/${mytarget}
-			/sbin/sln ${ROOT}lib/old/${mytarget} ${ROOT}lib/${file}
-		fi
-	done
-	return 0
-}
-
-pkg_postinst()
-{
-	/sbin/sln ld-${PV}.so ${ROOT}lib/ld-linux.so.2
-	/sbin/sln libc-${PV}.so ${ROOT}lib/libc.so.6
-	/sbin/sln libpthread-0.9.so ${ROOT}lib/libpthread.so.0
-	/sbin/ldconfig -r ${ROOT}
-	#we do the localtime symlink here so that we don't overwrite any
-	#existing one during merge.
-	if [ ! -e ${ROOT}etc/localtime ]
-	then
-		echo "Please remember to set your timezone using the zic command."
-		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime	
-	fi	
-}
diff --git a/sys-libs/glibc/glibc-2.2.4-r7.ebuild b/sys-libs/glibc/glibc-2.2.4-r7.ebuild
deleted file mode 100644
index 443373e0eedd..000000000000
--- a/sys-libs/glibc/glibc-2.2.4-r7.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.4-r7.ebuild,v 1.1 2001/12/21 23:15:57 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
-	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2
-	 http://www.ibiblio.org/glibc-manpages-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-#Specific Linux headers are now required so that we build from a stable "base"
-#portage-1.7.8 needed for smart library merging feature (avoids segfaults on glibc upgrade)
-LHV=2.4.16
-DEPEND=">=sys-apps/portage-1.7.8 ~sys-kernel/linux-headers-${LHV} nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
-RDEPEND="~sys-kernel/linux-headers-${LHV}"
-
-if [ -z "`use build`" ]
-then
-	RDEPEND="$RDEPEND gd? ( sys-libs/zlib media-libs/libpng ) sys-apps/baselayout"
-else
-	RDEPEND="$RDEPEND sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-src_unpack() {
-	unpack glibc-${PV}.tar.bz2
-	cd ${S}
-	#extract pre-made man pages.  Otherwise we need perl, which is a no-no.
-	mkdir man; cd man
-	tar xjf ${DISTDIR}/glibc-manpages-${PV}.tar.bz2
-	cd ${S}
-	unpack glibc-linuxthreads-${PV}.tar.bz2
-	for i in mtrace-intl-perl
-	do
-		echo "Applying $i patch..."
-		patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff || die
-	done
-	#For information about the string2 patch, see: http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
-	patch -p0 < ${FILESDIR}/glibc-2.2.3-string2.diff || die
-	cd io
-	#To my knowledge, this next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-	patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-	#now we need to fix a problem where glibc doesn't compile with absolutely no -O optimizations.
-	#we'll need to keep our eyes on this one to see how things are in later versions of linuxthreads:
-	#for more info, see:
-	# http://gcc.gnu.org/ml/gcc-prs/2001-06/msg00044.html
-	# http://www.mail-archive.com/bug-glibc@gnu.org/msg01820.html
-	cd ${S}/linuxthreads
-	cp spinlock.c spinlock.c.orig
-	sed -e 's/ : "0" (lock->__status)//g' spinlock.c.orig > spinlock.c
-	#This patch addresses a nasty buffer overflow in glob(), remotely exploitable too. See:
-	#http://lwn.net/2001/1220/a/glibc-vulnerability.php3
-	cd ${S}
-	patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
-}
-
-src_compile() {
-	local myconf
-	# If we build for the build system we use the kernel headers from the target
-	[ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
-	if [ "`use gd`" ] && [ -z "`use bootstrap`" ] && [ -z "`use build`" ]
-	then
-		myconf="${myconf} --with-gd=yes"
-	else
-		myconf="${myconf} --with-gd=no"
-	fi
-	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
-	rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	../configure --host=${CHOST} --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
-		--mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
-	
-	#This next option breaks the Sun JDK and the IBM JDK
-	#We should really keep compatibility with older kernels, anyway
-	#--enable-kernel=2.4.0
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-	make check
-}
-
-
-src_install() {
-	export LC_ALL=C
-	make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
-	if [ -z "`use build`" ]
-	then
-		dodir /etc/rc.d/init.d
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
-		#install linuxthreads man pages
-		dodir /usr/share/man/man3
-		doman ${S}/man/*.3thr	
-		install -m 644 nscd/nscd.conf ${D}/etc
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-	fi
-	if [ "`use pic`" ] 
-	then
-		find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
-		for i in ${D}/lib/*.map
-		do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-	rm ${D}/lib/ld-linux.so.2
-	rm ${D}/lib/libc.so.6
-	rm ${D}/lib/libpthread.so.0
-	#is this next line actually needed or does the makefile get it right.  It previously has 0755 perms which was
-	#killing things.
-	chmod 4755 ${D}/usr/lib/misc/pt_chown
-	rm -f ${D}/etc/ld.so.cache
-
-	#prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	#creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-}
-
-pkg_preinst()
-{
-	local mytarget	
-	echo "Backing up existing critical libraries..."
-	[ ! -d ${ROOT}lib/old ] && mkdir ${ROOT}lib/old
-	for file in ld-linux.so.2 libc.so.6 libpthread.so.0
-	do
-		if [ -f ${ROOT}lib/${file} ]
-		then
-			#all this "mytarget" stuff allows us to create a backup
-			#library in /lib/old with the *real* version name
-			#rather than the *generic* version name.
-	
-			mytarget="`readlink ${ROOT}lib/${file}`"
-			mytarget="`basename $mytarget`"
-			/bin/cp ${ROOT}lib/${file} ${ROOT}lib/old/${mytarget}
-			/sbin/sln ${ROOT}lib/old/${mytarget} ${ROOT}lib/${file}
-		fi
-	done
-	return 0
-}
-
-pkg_postinst()
-{
-	/sbin/sln ld-${PV}.so ${ROOT}lib/ld-linux.so.2
-	/sbin/sln libc-${PV}.so ${ROOT}lib/libc.so.6
-	/sbin/sln libpthread-0.9.so ${ROOT}lib/libpthread.so.0
-	/sbin/ldconfig -r ${ROOT}
-	#we do the localtime symlink here so that we don't overwrite any
-	#existing one during merge.
-	if [ ! -e ${ROOT}etc/localtime ]
-	then
-		echo "Please remember to set your timezone using the zic command."
-		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime	
-	fi	
-}
diff --git a/sys-libs/glibc/glibc-2.2.4-r8.ebuild b/sys-libs/glibc/glibc-2.2.4-r8.ebuild
deleted file mode 100644
index 5847a41dc7d7..000000000000
--- a/sys-libs/glibc/glibc-2.2.4-r8.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.4-r8.ebuild,v 1.3 2001/12/27 02:55:03 karltk Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
-	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2
-	 http://www.ibiblio.org/gentoo/distfiles/glibc-manpages-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-#Specific Linux headers are now required so that we build from a stable "base"
-#portage-1.8 needed for smart library merging feature (avoids segfaults on glibc upgrade)
-LHV=2.4.16
-DEPEND=">=sys-apps/portage-1.8 ~sys-kernel/linux-headers-${LHV} nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
-RDEPEND="~sys-kernel/linux-headers-${LHV}"
-
-if [ -z "`use build`" ]
-then
-	RDEPEND="$RDEPEND gd? ( sys-libs/zlib media-libs/libpng ) sys-apps/baselayout"
-else
-	RDEPEND="$RDEPEND sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-src_unpack() {
-	unpack glibc-${PV}.tar.bz2
-	cd ${S}
-	#extract pre-made man pages.  Otherwise we need perl, which is a no-no.
-	mkdir man; cd man
-	tar xjf ${DISTDIR}/glibc-manpages-${PV}.tar.bz2
-	cd ${S}
-	unpack glibc-linuxthreads-${PV}.tar.bz2
-	for i in mtrace-intl-perl
-	do
-		echo "Applying $i patch..."
-		patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff || die
-	done
-	#For information about the string2 patch, see: http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
-	patch -p0 < ${FILESDIR}/glibc-2.2.3-string2.diff || die
-	cd io
-	#To my knowledge, this next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-	patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-	#now we need to fix a problem where glibc doesn't compile with absolutely no -O optimizations.
-	#we'll need to keep our eyes on this one to see how things are in later versions of linuxthreads:
-	#for more info, see:
-	# http://gcc.gnu.org/ml/gcc-prs/2001-06/msg00044.html
-	# http://www.mail-archive.com/bug-glibc@gnu.org/msg01820.html
-	cd ${S}/linuxthreads
-	cp spinlock.c spinlock.c.orig
-	sed -e 's/"=m" (lock->__status) : "0" (lock->__status/"+m" (lock->__status/g' spinlock.c.orig > spinlock.c
-	#This patch addresses a nasty buffer overflow in glob(), remotely exploitable too. See:
-	#http://lwn.net/2001/1220/a/glibc-vulnerability.php3
-	cd ${S}
-	patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
-}
-
-src_compile() {
-	local myconf
-	# If we build for the build system we use the kernel headers from the target
-	[ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
-	if [ "`use gd`" ] && [ -z "`use bootstrap`" ] && [ -z "`use build`" ]
-	then
-		myconf="${myconf} --with-gd=yes"
-	else
-		myconf="${myconf} --with-gd=no"
-	fi
-	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
-	rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	../configure --host=${CHOST} --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
-		--mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
-	
-	#This next option breaks the Sun JDK and the IBM JDK
-	#We should really keep compatibility with older kernels, anyway
-	#--enable-kernel=2.4.0
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-	make check
-}
-
-
-src_install() {
-	export LC_ALL=C
-	make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
-	if [ -z "`use build`" ]
-	then
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
-		#install linuxthreads man pages
-		dodir /usr/share/man/man3
-		doman ${S}/man/*.3thr	
-		install -m 644 nscd/nscd.conf ${D}/etc
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-	fi
-	if [ "`use pic`" ] 
-	then
-		find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
-		for i in ${D}/lib/*.map
-		do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-	rm ${D}/lib/ld-linux.so.2
-	rm ${D}/lib/libc.so.6
-	rm ${D}/lib/libpthread.so.0
-	#is this next line actually needed or does the makefile get it right.  It previously has 0755 perms which was
-	#killing things.
-	chmod 4755 ${D}/usr/lib/misc/pt_chown
-	rm -f ${D}/etc/ld.so.cache
-
-	#prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	#creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-}
-
-pkg_postinst()
-{
-	if [ ! -e ${ROOT}etc/localtime ]
-	then
-		echo "Please remember to set your timezone using the zic command."
-		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime	
-	fi	
-}
diff --git a/sys-libs/glibc/glibc-2.2.4-r9.ebuild b/sys-libs/glibc/glibc-2.2.4-r9.ebuild
deleted file mode 100644
index 2d42b64e67f1..000000000000
--- a/sys-libs/glibc/glibc-2.2.4-r9.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.4-r9.ebuild,v 1.2 2002/02/01 01:26:08 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
-	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2
-	 http://www.ibiblio.org/gentoo/distfiles/glibc-manpages-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-#Specific Linux headers are now required so that we build from a stable "base"
-#portage-1.8 needed for smart library merging feature (avoids segfaults on glibc upgrade)
-LHV=2.4.16
-DEPEND=">=sys-apps/portage-1.8 ~sys-kernel/linux-headers-${LHV} nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
-RDEPEND="~sys-kernel/linux-headers-${LHV}"
-
-if [ -z "`use build`" ]
-then
-	RDEPEND="$RDEPEND gd? ( sys-libs/zlib media-libs/libpng ) sys-apps/baselayout"
-else
-	RDEPEND="$RDEPEND sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-src_unpack() {
-	unpack glibc-${PV}.tar.bz2
-	cd ${S}
-	#extract pre-made man pages.  Otherwise we need perl, which is a no-no.
-	mkdir man; cd man
-	tar xjf ${DISTDIR}/glibc-manpages-${PV}.tar.bz2
-	cd ${S}
-	unpack glibc-linuxthreads-${PV}.tar.bz2
-	for i in mtrace-intl-perl
-	do
-		echo "Applying $i patch..."
-		patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff || die
-	done
-	#For information about the string2 patch, see: http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
-	patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff || die
-	cd io
-	#To my knowledge, this next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-	patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-	#now we need to fix a problem where glibc doesn't compile with absolutely no -O optimizations.
-	#we'll need to keep our eyes on this one to see how things are in later versions of linuxthreads:
-	#for more info, see:
-	# http://gcc.gnu.org/ml/gcc-prs/2001-06/msg00044.html
-	# http://www.mail-archive.com/bug-glibc@gnu.org/msg01820.html
-	cd ${S}/linuxthreads
-	cp spinlock.c spinlock.c.orig
-	sed -e 's/"=m" (lock->__status) : "0" (lock->__status/"+m" (lock->__status/g' spinlock.c.orig > spinlock.c
-	#This patch addresses a nasty buffer overflow in glob(), remotely exploitable too. See:
-	#http://lwn.net/2001/1220/a/glibc-vulnerability.php3
-	cd ${S}
-	patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
-}
-
-src_compile() {
-	local myconf
-	# If we build for the build system we use the kernel headers from the target
-	[ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
-	if [ "`use gd`" ] && [ -z "`use bootstrap`" ] && [ -z "`use build`" ]
-	then
-		myconf="${myconf} --with-gd=yes"
-	else
-		myconf="${myconf} --with-gd=no"
-	fi
-	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
-	rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	../configure --host=${CHOST} --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
-		--mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
-	
-	#This next option breaks the Sun JDK and the IBM JDK
-	#We should really keep compatibility with older kernels, anyway
-	#--enable-kernel=2.4.0
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-	make check
-}
-
-
-src_install() {
-	export LC_ALL=C
-	make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
-	if [ -z "`use build`" ]
-	then
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
-		#install linuxthreads man pages
-		dodir /usr/share/man/man3
-		doman ${S}/man/*.3thr	
-		install -m 644 nscd/nscd.conf ${D}/etc
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-	fi
-	if [ "`use pic`" ] 
-	then
-		find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
-		for i in ${D}/lib/*.map
-		do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-	rm ${D}/lib/ld-linux.so.2
-	rm ${D}/lib/libc.so.6
-	rm ${D}/lib/libpthread.so.0
-	#is this next line actually needed or does the makefile get it right.
-	#It previously has 0755 perms which was killing things.
-	chmod 4755 ${D}/usr/lib/misc/pt_chown
-	rm -f ${D}/etc/ld.so.cache
-
-	#prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	#creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-
-	#some things want this, notably ash.
-	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
-}
-
-pkg_postinst()
-{
-	if [ ! -e ${ROOT}etc/localtime ]
-	then
-		echo "Please remember to set your timezone using the zic command."
-		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime	
-	fi	
-}
diff --git a/sys-libs/glibc/glibc-2.2.5-r1.ebuild b/sys-libs/glibc/glibc-2.2.5-r1.ebuild
deleted file mode 100644
index 26b1dab453d4..000000000000
--- a/sys-libs/glibc/glibc-2.2.5-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r1.ebuild,v 1.1 2002/02/16 00:47:43 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
-	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-#Specific Linux headers are now required so that we build from a stable "base"
-#portage-1.8 needed for smart library merging feature (avoids segfaults on glibc upgrade)
-LHV=2.4.17
-DEPEND=">=sys-apps/portage-1.8 ~sys-kernel/linux-headers-${LHV} nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
-RDEPEND="~sys-kernel/linux-headers-${LHV}"
-
-if [ -z "`use build`" ]
-then
-	RDEPEND="$RDEPEND gd? ( sys-libs/zlib media-libs/libpng ) sys-apps/baselayout"
-else
-	RDEPEND="$RDEPEND sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-#lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
-export CFLAGS="$CFLAGS -O2"
-export CXXFLAGS="$CFLAGS"
-
-src_unpack() {
-	unpack glibc-${PV}.tar.bz2 || die
-	cd ${S}
-	#extract pre-made man pages.  Otherwise we need perl, which is a no-no.
-	mkdir man; cd man
-	tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die
-	cd ${S}
-	unpack glibc-linuxthreads-${PV}.tar.bz2 || die
-	
-	# This patch apparently eliminates compiler warnings for some versions of gcc.
-	# For information about the string2 patch, see: 
-	# http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
-	patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff || die
-
-	# This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-	cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-
-	# The following spinlock error should only bite if you compile without any -O in CFLAGS, so a tweak
-	# shouldn't be necessary.  The solution is to add -O2.  According to Andreas Jaeger of SuSE, "glibc
-	# *needs* to be compiled with optimization" (emphasis mine).  So let's fix the optimization settings,
-	# not tweak glibc.
-	# (drobbins, 10 Feb 2002)
-	# http://sources.redhat.com/ml/bug-glibc/2001-09/msg00041.html
-	# http://sources.redhat.com/ml/bug-glibc/2001-09/msg00042.html
-	# cd ${S}/linuxthreads
-	# cp spinlock.c spinlock.c.orig
-	# sed -e 's/"=m" (lock->__status) : "0" (lock->__status/"+m" (lock->__status/g' spinlock.c.orig > spinlock.c
-	
-	# The glob() buffer overflow in glibc 2.2.4 was fixed in 2.2.5; commenting out.
-	# http://lwn.net/2001/1220/a/glibc-vulnerability.php3
-	# cd ${S}
-	# patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
-}
-
-src_compile() {
-	local myconf
-	# If we build for the build system we use the kernel headers from the target
-	[ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
-	if [ "`use gd`" ] && [ -z "`use bootstrap`" ] && [ -z "`use build`" ]
-	then
-		myconf="${myconf} --with-gd=yes"
-	else
-		myconf="${myconf} --with-gd=no"
-	fi
-	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
-	rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	../configure --host=${CHOST} --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
-		--mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
-	
-	#This next option breaks the Sun JDK and the IBM JDK
-	#We should really keep compatibility with older kernels, anyway
-	#--enable-kernel=2.4.0
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-	make check
-}
-
-
-src_install() {
-	export LC_ALL=C
-	make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
-	if [ -z "`use build`" ]
-	then
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
-		#install linuxthreads man pages
-		dodir /usr/share/man/man3
-		doman ${S}/man/*.3thr	
-		install -m 644 nscd/nscd.conf ${D}/etc
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-	fi
-	if [ "`use pic`" ] 
-	then
-		find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/buildhere -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.
-	chmod 4755 ${D}/usr/lib/misc/pt_chown
-	rm -f ${D}/etc/ld.so.cache
-
-	#prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	#creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-
-	#some things want this, notably ash.
-	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
-}
-
-pkg_preinst() {
-	#we need to ensure that symlinks are installed *after* the real libraries; otherwise we can get symlink death.
-	#This needs to be generalized into Portage to it automatically works for other packages too.
-	mkdir -f ${T}/symlinks
-	cd ${D}/lib
-	local x
-	for x in *
-	do
-		if [ -L $x ]
-		then
-			mv $x ${T}/symlinks
-		fi
-	done
-}
-
-pkg_postinst()
-{
-	#restore symlinks
-	mv -f ${T}/symlinks/* ${ROOT}/lib
-	if [ ! -e ${ROOT}etc/localtime ]
-	then
-		echo "Please remember to set your timezone using the zic command."
-		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime	
-	fi	
-}
diff --git a/sys-libs/glibc/glibc-2.2.5-r2.ebuild b/sys-libs/glibc/glibc-2.2.5-r2.ebuild
deleted file mode 100644
index d29a0a12543f..000000000000
--- a/sys-libs/glibc/glibc-2.2.5-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r2.ebuild,v 1.8 2002/05/04 22:50:18 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
-	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-#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-kernel/linux-headers nls? ( sys-devel/gettext )"
-RDEPEND="sys-kernel/linux-headers"
-
-if [ -z "`use build`" ]
-then
-	RDEPEND="$RDEPEND sys-apps/baselayout"
-else
-	RDEPEND="$RDEPEND >=sys-apps/portage-1.8.9_pre1 sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-#lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
-export CFLAGS="$CFLAGS -O2"
-export CXXFLAGS="$CFLAGS"
-
-src_unpack() {
-	unpack glibc-${PV}.tar.bz2 || die
-	cd ${S}
-	#extract pre-made man pages.  Otherwise we need perl, which is a no-no.
-	mkdir man; cd man
-	tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die
-	cd ${S}
-	unpack glibc-linuxthreads-${PV}.tar.bz2 || die
-	
-	# This patch apparently eliminates compiler warnings for some versions of gcc.
-	# For information about the string2 patch, see: 
-	# http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
-	patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff || die
-
-	# This next one is a new patch to fix thread signal handling.  See:
-	# http://sources.redhat.com/ml/libc-hacker/2002-02/msg00120.html
-	# (Added by drobbins on 05 Mar 2002)
-	patch -p0 < ${FILESDIR}/glibc-2.2.5-threadsig.diff || die
-
-	# This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-	cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-
-	# The following spinlock error should only bite if you compile without any -O in CFLAGS, so a tweak
-	# shouldn't be necessary.  The solution is to add -O2.  According to Andreas Jaeger of SuSE, "glibc
-	# *needs* to be compiled with optimization" (emphasis mine).  So let's fix the optimization settings,
-	# not tweak glibc.
-	# (drobbins, 10 Feb 2002)
-	# http://sources.redhat.com/ml/bug-glibc/2001-09/msg00041.html
-	# http://sources.redhat.com/ml/bug-glibc/2001-09/msg00042.html
-	# cd ${S}/linuxthreads
-	# cp spinlock.c spinlock.c.orig
-	# sed -e 's/"=m" (lock->__status) : "0" (lock->__status/"+m" (lock->__status/g' spinlock.c.orig > spinlock.c
-	
-	# The glob() buffer overflow in glibc 2.2.4 was fixed in 2.2.5; commenting out.
-	# http://lwn.net/2001/1220/a/glibc-vulnerability.php3
-	# cd ${S}
-	# patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
-}
-
-src_compile() {
-	local myconf
-	# If we build for the build system we use the kernel headers from the target
-	[ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
-	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
-	rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	../configure --host=${CHOST} --with-gd=no --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
-		--mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
-	
-	#This next option breaks the Sun JDK and the IBM JDK
-	#We should really keep compatibility with older kernels, anyway
-	#--enable-kernel=2.4.0
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-	make check
-}
-
-
-src_install() {
-	export LC_ALL=C
-	make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
-	if [ -z "`use build`" ]
-	then
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
-		#install linuxthreads man pages
-		dodir /usr/share/man/man3
-		doman ${S}/man/*.3thr	
-		install -m 644 nscd/nscd.conf ${D}/etc
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-	fi
-	if [ "`use pic`" ] 
-	then
-		find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/buildhere -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.
-	chmod 4755 ${D}/usr/lib/misc/pt_chown
-	rm -f ${D}/etc/ld.so.cache
-
-	#prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	#creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-
-	#some things want this, notably ash.
-	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
-}
-
-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
-}
diff --git a/sys-libs/glibc/glibc-2.2.5-r3.ebuild b/sys-libs/glibc/glibc-2.2.5-r3.ebuild
deleted file mode 100644
index e05f5c37d246..000000000000
--- a/sys-libs/glibc/glibc-2.2.5-r3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r3.ebuild,v 1.3 2002/05/04 22:50:18 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
-	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-#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-kernel/linux-headers nls? ( sys-devel/gettext )"
-RDEPEND="sys-kernel/linux-headers"
-
-if [ -z "`use build`" ]
-then
-	RDEPEND="$RDEPEND sys-apps/baselayout"
-else
-	RDEPEND="$RDEPEND >=sys-apps/portage-1.8.9_pre1 sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-#lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
-export CFLAGS="$CFLAGS -O2"
-export CXXFLAGS="$CFLAGS"
-
-src_unpack() {
-	unpack glibc-${PV}.tar.bz2 || die
-	cd ${S}
-	#extract pre-made man pages.  Otherwise we need perl, which is a no-no.
-	mkdir man; cd man
-	tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die
-	cd ${S}
-	unpack glibc-linuxthreads-${PV}.tar.bz2 || die
-	
-	# This patch apparently eliminates compiler warnings for some versions of gcc.
-	# For information about the string2 patch, see: 
-	# http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
-	patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff || die
-
-	# This next one is a new patch to fix thread signal handling.  See:
-	# http://sources.redhat.com/ml/libc-hacker/2002-02/msg00120.html
-	# (Added by drobbins on 05 Mar 2002)
-	patch -p0 < ${FILESDIR}/glibc-2.2.5-threadsig.diff || die
-
-	# patch to fix a bug in the ld_preload handling
-	patch -p1 < ${FILESDIR}/glibc-2.2.5-sandbox.diff || die
-
-	# This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-	cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch || die
-
-	# The following spinlock error should only bite if you compile without any -O in CFLAGS, so a tweak
-	# shouldn't be necessary.  The solution is to add -O2.  According to Andreas Jaeger of SuSE, "glibc
-	# *needs* to be compiled with optimization" (emphasis mine).  So let's fix the optimization settings,
-	# not tweak glibc.
-	# (drobbins, 10 Feb 2002)
-	# http://sources.redhat.com/ml/bug-glibc/2001-09/msg00041.html
-	# http://sources.redhat.com/ml/bug-glibc/2001-09/msg00042.html
-	# cd ${S}/linuxthreads
-	# cp spinlock.c spinlock.c.orig
-	# sed -e 's/"=m" (lock->__status) : "0" (lock->__status/"+m" (lock->__status/g' spinlock.c.orig > spinlock.c
-	
-	# The glob() buffer overflow in glibc 2.2.4 was fixed in 2.2.5; commenting out.
-	# http://lwn.net/2001/1220/a/glibc-vulnerability.php3
-	# cd ${S}
-	# patch -p1 < ${FILESDIR}/glibc-2.2.4-glob-overflow.diff || die
-}
-
-src_compile() {
-	local myconf
-	# If we build for the build system we use the kernel headers from the target
-	[ "`use build`" ] && myconf="--with-header=${ROOT}usr/include"
-	[ -z "`use nls`" ] && myconf="${myconf} --disable-nls"
-	rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	../configure --host=${CHOST} --with-gd=no --without-cvs --enable-add-ons=linuxthreads --disable-profile --prefix=/usr \
-		--mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/misc ${myconf} || die
-	
-	#This next option breaks the Sun JDK and the IBM JDK
-	#We should really keep compatibility with older kernels, anyway
-	#--enable-kernel=2.4.0
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-	make check
-}
-
-
-src_install() {
-	export LC_ALL=C
-	make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} install -C buildhere || die
-	if [ -z "`use build`" ]
-	then
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} info -C buildhere || die
-		make PARALLELMFLAGS="${MAKEOPTS}" install_root=${D} localedata/install-locales -C buildhere || die
-		#install linuxthreads man pages
-		dodir /usr/share/man/man3
-		doman ${S}/man/*.3thr	
-		install -m 644 nscd/nscd.conf ${D}/etc
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-	fi
-	if [ "`use pic`" ] 
-	then
-		find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/buildhere -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.
-	chmod 4755 ${D}/usr/lib/misc/pt_chown
-	rm -f ${D}/etc/ld.so.cache
-
-	#prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	#creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-
-	#some things want this, notably ash.
-	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
-}
-
-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
-}
diff --git a/sys-libs/glibc/glibc-2.2.5-r4.ebuild b/sys-libs/glibc/glibc-2.2.5-r4.ebuild
index d2995175138d..e6b14c6f6248 100644
--- a/sys-libs/glibc/glibc-2.2.5-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.2.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r4.ebuild,v 1.5 2002/07/01 10:47:52 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r4.ebuild,v 1.6 2002/07/06 15:30:02 drobbins Exp $
 inherit flag-o-matic
 
 filter-flags "-fomit-frame-pointer -malign-double"
@@ -10,6 +10,9 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
 	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+KEYWORDS="*"
+LICENSE="GPL-2"
+SLOT="2.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