*** empty log message ***

14 files changed, 368 insertions, 19 deletions

diff --git a/files/bootstrap-20010804.packages b/files/bootstrap-20010804.packages
new file mode 100644
index 000000000000..a749fdd29c27
--- /dev/null
+++ b/files/bootstrap-20010804.packages
@@ -0,0 +1,4 @@
+./sys-libs/glibc/glibc-2.2.3-r4.ebuild
+./sys-devel/binutils/binutils-2.11.90.0.7.ebuild
+./sys-devel/gcc/gcc-2.95.3-r1.ebuild
+./sys-devel/gettext/gettext-0.10.39.ebuild
diff --git a/files/build-20010513.packages b/files/build-20010513.packages
index 8c5c3b0fb4c7..bd1b41976089 100644
--- a/files/build-20010513.packages
+++ b/files/build-20010513.packages
@@ -23,4 +23,4 @@
 ./sys-devel/patch/patch-2.5.4-r3.ebuild
 ./sys-devel/spython/spython-2.0-r4.ebuild
 ./net-misc/wget/wget-1.5.3-r2.ebuild
-./net-misc/rsync/rsync-2.4.6-r2.ebuild
\ No newline at end of file
+./net-misc/rsync/rsync-2.4.6-r2.ebuild
diff --git a/files/build-20010804.packages b/files/build-20010804.packages
new file mode 100644
index 000000000000..2cd2ef876e59
--- /dev/null
+++ b/files/build-20010804.packages
@@ -0,0 +1,26 @@
+./sys-apps/baselayout/baselayout-1.5-r4.ebuild
+./sys-libs/glibc/glibc-2.2.3-r4.ebuild
+./sys-apps/bash/bash-2.04-r4.ebuild
+./sys-apps/bzip2/bzip2-1.0.1-r4.ebuild
+./sys-apps/debianutils/debianutils-1.13.3-r4.ebuild
+./sys-apps/diffutils/diffutils-2.7-r4.ebuild
+./sys-apps/file/file-3.33-r3.ebuild
+./sys-apps/fileutils/fileutils-4.1-r2.ebuild
+./sys-apps/findutils/findutils-4.1-r6.ebuild
+./sys-apps/gawk/gawk-3.0.6-r4.ebuild
+./sys-apps/grep/grep-2.4.2-r4.ebuild
+./sys-apps/gzip/gzip-1.2.4a-r5.ebuild
+./sys-apps/portage/portage-1.5.3.ebuild
+./sys-apps/sed/sed-3.02.80-r3.ebuild
+./sys-apps/sh-utils/sh-utils-2.0j-r4.ebuild
+./sys-apps/tar/tar-1.13.19-r1.ebuild
+./sys-apps/textutils/textutils-2.0.10-r3.ebuild
+./sys-devel/binutils/binutils-2.11.90.0.7.ebuild
+./sys-devel/bison/bison-1.28-r3.ebuild
+./sys-devel/flex/flex-2.5.4a-r4.ebuild
+./sys-devel/gcc/gcc-2.95.3-r1.ebuild
+./sys-devel/make/make-3.79.1-r3.ebuild
+./sys-devel/patch/patch-2.5.4-r3.ebuild
+./sys-devel/spython/spython-2.0-r7.ebuild
+./net-misc/wget/wget-1.7-r1.ebuild
+./net-misc/rsync/rsync-2.4.6-r4.ebuild
diff --git a/files/isoinitrd-20010726.packages b/files/isoinitrd-20010726.packages
index db0f1a620dc9..17e9bda54fd7 100644
--- a/files/isoinitrd-20010726.packages
+++ b/files/isoinitrd-20010726.packages
@@ -1,4 +1,4 @@
-sys-apps/baselayout/baselayout-1.5-r3.ebuild
+sys-apps/baselayout/baselayout-1.5-r4.ebuild
 sys-libs/glibc/glibc-2.2.3-r4.ebuild
 sys-apps/bash/bash-2.04-r4.ebuild
 sys-apps/bzip2/bzip2-1.0.1-r4.ebuild
@@ -20,7 +20,7 @@ net-misc/rsync/rsync-2.4.6-r4.ebuild
 sys-apps/util-linux/util-linux-2.11g-r1.ebuild
 sys-apps/psmisc/psmisc-19-r3.ebuild
 sys-apps/net-tools/net-tools-1.60-r1.ebuild
-sys-apps/ed/ed-0.2-r2.ebuild
+sys-apps/ed/ed-0.2-r3.ebuild
 sys-apps/procps/procps-2.0.7-r4.ebuild
 sys-apps/sysvinit/sysvinit-2.78-r4.ebuild
 sys-apps/shadow/shadow-20001016-r4.ebuild
@@ -32,3 +32,6 @@ net-misc/dhcpcd/dhcpcd-1.3.20_p0-r1.ebuild
 sys-apps/modutils/modutils-2.4.6-r1.ebuild
 sys-apps/reiserfs-utils/reiserfs-utils-3.6.25-r7.ebuild
 sys-apps/e2fsprogs/e2fsprogs-1.22-r1.ebuild
+sys-kernel/linux/linux-2.4.6-r2.ebuild
+sys-apps/grub/grub-0.5.96.1-r4.ebuild
+sys-apps/devfsd/devfsd-1.3.11-r2.ebuild
diff --git a/scripts/autodist.sh b/scripts/autodist.sh
index 68b146c195ef..985b7ecb9997 100644
--- a/scripts/autodist.sh
+++ b/scripts/autodist.sh
@@ -27,6 +27,9 @@ export CFLAGS="-O2 -mcpu=i486 -march=i486"
 [ -z "${SYS_PACKAGES}" ] && SYS_PACKAGES=`ls -1 ${PORTDIR}/files/sys-*.packages | sort | tail -1`
 [ -z "${KERNEL_SRC}" ] && KERNEL_SRC="/usr/src/`readlink /usr/src/linux`"
 [ -z "${KERNEL_VERSION}" ] && KERNEL_VERSION="`echo ${KERNEL_SRC} | sed 's,.*-\([0-9]\.[0-9]\.[0-9]\+\(-ac[0-9]\+\)\?\)$,\1,'`"
+
+[ -z "${INITRD_USE}" ] && INITRD_USE="bootcd lvm ext3"
+
 export PORTDIR
 export DISTRODIR
 export AUTODISTDIR
@@ -65,21 +68,20 @@ mkdir -pv ${ISOROOT}/{doc,gentoo{,/distfiles,/packages{,/All}},isolinux{,/kernel
 
 echo ">>> Building initrd packages..."
 mkdir -p ${INITRDROOT}
-ERRQUIT=yes CHECK=no USE=bootcd ROOT="${INITRDROOT}" STEPS="clean unpack compile install qmerge clean" ${PORTDIR}/scripts/autocompile.sh ${ISOINITRD_PACKAGES}
+ERRQUIT=yes CHECK=no USE="${INITRD_USE}" ROOT="${INITRDROOT}" STEPS="clean unpack compile install qmerge clean" ${PORTDIR}/scripts/autocompile.sh ${ISOINITRD_PACKAGES}
 if [ ${?} != 0 ]
 then
     echo "Error building initrd packages, quitting"
     exit 1
 fi
 echo ">>> Cleaning up ${INITRDROOT}/tmp"
-rm -rf ${INITRDROOT}/tmp/*
+rm -rf ${INITRDROOT}/tmp
+mkdir -p ${INITRDROOT}/tmp
+chown root.root ${INITRDROOT}/tmp
+chmod 1777 ${INITRDROOT}/tmp
 
 echo ">>> Setting up initrd..."
 find ${INITRDROOT}/etc -name "*._cfg_*" exec rm -vf {} \;
-for dir in etc{,/rc.d{,/config,/init.d,/rc{1,2,3,4,5,boot,halt}}.d}
-do
-  cp -v ${PORTDIR}/files/isoinitrd/${dir}/* ${INITRDROOT}/${dir}
-done
 ROOT=${INITRDROOT} rc-update autogen boot force
 ROOT=${INITRDROOT} rc-update autogen normal force
 ROOT=${INITRDROOT} rc-update autogen halt force
diff --git a/sys-apps/baselayout/baselayout-1.5-r4.ebuild b/sys-apps/baselayout/baselayout-1.5-r4.ebuild
new file mode 100644
index 000000000000..629ccc347ce4
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-1.5-r4.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.5-r4.ebuild,v 1.1 2001/08/05 22:58:06 pete Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
+
+A=""
+S=${WORKDIR}/${P}
+DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts)"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org"
+
+if [ -z "`use bootcd`" ]
+then
+	INIT_D_SCRIPTS="bootmisc checkfs checkroot clock halt hostname
+                    inet initscripts-install isapnp keymaps local
+                    modules mountall mountall.test pretty rc reboot
+                    rmnologin sendsigs serial single umountfs urandom
+                    vcron"
+else
+	INIT_D_SCRIPTS="cdboot cdscan"
+fi
+
+
+src_install()
+{
+	if [ "$MAINTAINER" != "yes" ] && [ "$ROOT" = "/" ]
+	then
+	echo '!!! baselayout should only be merged if you know what youre doing.'
+	echo '!!! It will overwrite important system files (passwd/group and others) with their'
+	echo '!!! original versions.  For now, please update your files by hand by'
+	echo '!!! comparing the contents of the files in '${FILESDIR}' to your'
+	echo '!!! installed versions.  We will have an automated update system shortly.'
+	exit 1
+	fi
+	dodir /usr
+	if [ -z "`bootcd`" ]
+	then
+		dodir /boot /home
+		dodir /usr/include /usr/src /usr/portage /usr/X11R6/include/GL
+		dosym ../X11R6/include/X11 /usr/include/X11
+		dosym ../X11R6/include/GL /usr/include/GL
+		dosym ../src/linux/include/linux /usr/include/linux
+		dosym ../src/linux/include/asm-i386 /usr/include/asm
+		local foo
+		for foo in games man lib sbin share bin doc src
+		do
+		  dodir /usr/local/${foo}
+		done
+	fi
+	
+	dodir /usr/bin
+	dodir /usr/lib
+	dodir /usr/sbin
+	dosbin ${FILESDIR}/MAKEDEV ${FILESDIR}/run-crons
+	
+	if [ -z "`use bootcd`" ]
+	then
+		dodir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
+		
+#FHS 2.1 stuff
+		dosym share/man /usr/man
+		dosym share/doc /usr/doc
+		dosym share/info /usr/info
+#end FHS 2.1 stuff
+	fi
+	
+	dosym ../var/tmp /usr/tmp
+	
+	if [ -z "`use bootcd`" ]
+	then
+		doman ${FILESDIR}/MAKEDEV.8
+		dodoc ${FILESDIR}/copyright ${FILESDIR}/changelog.Debian
+		dodir /usr/X11R6/lib /usr/X11R6/share/man
+		ln -s share/man ${D}/usr/X11R6/man
+	fi
+	dodir /var /var/run /var/log/news /var/lock/subsys
+	touch ${D}/var/log/lastlog
+	touch ${D}/var/run/utmp
+	touch ${D}/var/log/wtmp
+	dodir /var/db/pkg /var/spool /var/tmp /var/lib/misc
+	chmod 1777 ${D}/var/tmp
+	
+	if [ -z "`use bootcd`" ]
+	then
+#supervise stuff
+		dodir /var/lib/supervise
+		install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/control
+		install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/services
+#end supervise stuff
+		
+		dodir /opt
+	fi
+	
+	dodir /root /etc/modules /proc
+	
+	chmod go-rx ${D}/root
+	dodir /tmp
+	chmod 1777 ${D}/tmp
+	chmod 1777 ${D}/var/tmp
+	chown root.uucp ${D}/var/lock
+	chmod 775 ${D}/var/lock
+	insopts -m0644
+	insinto /etc
+	ln -s ../proc/filesystems ${D}/etc/filesystems
+	#makes things always up-to-date ^
+	for foo in services passwd shadow nsswitch.conf \
+	           inetd.conf ld.so.conf protocols fstab \
+		   hosts syslog.conf pwdb.conf \
+		   group profile crontab inputrc networks
+	do
+		doins ${FILESDIR}/${foo}
+	done
+	if [ -z "`use bootcd`" ]
+	then
+		for foo in hourly daily weekly monthly
+		  do
+		  dodir /etc/cron.$foo
+		done
+	fi
+	chmod go-rwx ${D}/etc/shadow
+	dodir /lib /proc /mnt/floppy /mnt/cdrom
+	chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom
+
+	for x in boot halt 1 2 3 4 5 
+	do
+	  dodir /etc/rc.d/rc${x}.d
+	done
+	dosym rcboot.d /etc/rc.d/rc0.d
+	dosym rchalt.d /etc/rc.d/rc6.d
+	
+	dodir /etc/pam.d
+	cd ${FILESDIR}/pam.d
+	insinto /etc/pam.d
+	doins *
+	
+	dodir /etc/rc.d/init.d
+	dodir /etc/rc.d/config
+	cd ${FILESDIR}/rc.d/init.d
+	exeinto /etc/rc.d/init.d
+	doexe ${INIT_D_SCRIPTS}
+	
+	insinto /etc/rc.d/init.d/extra_scripts
+	cd ${FILESDIR}/rc.d/config
+	insinto /etc/rc.d/config
+	doins *
+	doins runlevels
+	cd ${FILESDIR}
+	insinto /etc
+	doins inittab
+	into /usr
+	dosbin rc-update 
+	insinto /usr/bin
+	insopts -m0755
+	doins colors
+  	dodir /dev
+	dodir /dev-state
+	#dodir /dev/pts /dev/shm
+	#dosym /usr/sbin/MAKEDEV /dev/MAKEDEV
+	cd ${D}/dev
+	MAKEDEV generic-i386
+	#These devices are also needed by many people and should be included
+	MAKEDEV sg
+	MAKEDEV scd
+	MAKEDEV rtc 
+	MAKEDEV audio
+	MAKEDEV hde
+	MAKEDEV hdf
+	MAKEDEV hdg
+	MAKEDEV hdh
+	cd ${D}/etc/rc.d/config
+	cp runlevels runlevels.orig
+	sed -e 's:##OSNAME##:Gentoo Linux:g' -e "s:##ARCH##:${CHOST%%-*}:g" runlevels.orig > runlevels
+	rm runlevels.orig
+	
+#env-update stuff
+	dodir /etc/env.d
+	insinto /etc/env.d
+	doins ${FILESDIR}/00basic
+#end env-update stuff
+	
+}
diff --git a/sys-apps/baselayout/files/rc.d/init.d/cdboot b/sys-apps/baselayout/files/rc.d/init.d/cdboot
new file mode 100644
index 000000000000..119c9b65d0b2
--- /dev/null
+++ b/sys-apps/baselayout/files/rc.d/init.d/cdboot
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ "$1" != "start" ]
+then
+	exit
+fi
+umask 022
+mount / -o remount,rw
+: > /etc/mtab
+mount /proc
+/bin/hostname cdimage
+
diff --git a/sys-apps/baselayout/files/rc.d/init.d/cdscan b/sys-apps/baselayout/files/rc.d/init.d/cdscan
new file mode 100644
index 000000000000..c0eccdbeec38
--- /dev/null
+++ b/sys-apps/baselayout/files/rc.d/init.d/cdscan
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+#CD Detection
+for x in /dev/cdroms/* 
+do
+	mount $x /mnt/cdrom -o iso9660,ro
+	if [ $? -ne 0 ]
+	then
+		continue
+	fi
+	if [ ! -e /mnt/cdrom/.id-gentoo-linux ]
+	then
+		umount /mnt/cdrom
+		continue
+	fi
+done
+if [ ! -e /mnt/cdrom/.id-gentoo-linux* ]
+then
+	echo "!!! Couldn't find and mount Gentoo Linux CD."
+	echo "!!! You may need to load some SCSI modules."
+fi
+
+#mount compressed loopback fs
+/bin/mknod /dev/cloop b 240 0 
+/sbin/insmod /lib/cloop.o file=/mnt/cdrom/usr.iso /usr
+/bin/mount -o ro /dev/cloop /usr
+if [ -d /mnt/cdrom/gentoo/packages ]
+then
+	mount --bind /mnt/cdrom/gentoo/packages /usr/portage/packages
+fi
+if [ -d /mnt/cdrom/gentoo/distfiles ]
+then
+	mount --bind /mnt/cdrom/gentoo/distfiles /usr/portage/distfiles
+fi
+#LVM init
+/sbin/vgscan
+/sbin/vgchange -ay
+#general init
+/usr/sbin/env-update
+. /etc/profile
diff --git a/sys-apps/devfsd/devfsd-1.3.11-r2.ebuild b/sys-apps/devfsd/devfsd-1.3.11-r2.ebuild
new file mode 100644
index 000000000000..a37d914f25df
--- /dev/null
+++ b/sys-apps/devfsd/devfsd-1.3.11-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Daniel Robbins et al <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.11-r2.ebuild,v 1.1 2001/08/05 22:58:06 pete Exp $
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="Daemon for the Linux Device Filesystem"
+SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
+HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
+DEPEND="virtual/glibc"
+
+src_unpack() {
+  	unpack ${A}
+	cd ${S}
+  	patch -p0 < ${FILESDIR}/${P}-GNUmakefile-gentoo.diff
+}
+
+src_compile() {
+    	try make
+}
+
+src_install () {
+  	try make DESTDIR=${D} install
+ 	exeinto /etc/rc.d/init.d
+	doexe ${FILESDIR}/devfsd
+ 	dodir /etc/devfs/shm
+	dodir /dev-state
+	insinto /etc
+	doins ${FILESDIR}/devfsd.conf
+	if [ -z "`use bootcd`" ]
+	then
+		rm -rf ${D}/usr
+	fi
+}
+
+pkg_postinst () {
+  	rc-update add devfsd
+}
+
diff --git a/sys-apps/ed/files/digest-ed-0.2-r3 b/sys-apps/ed/files/digest-ed-0.2-r3
new file mode 100644
index 000000000000..b5231566a2a0
--- /dev/null
+++ b/sys-apps/ed/files/digest-ed-0.2-r3
@@ -0,0 +1 @@
+MD5 ddd57463774cae9b50e70cd51221281b ed-0.2.tar.gz
diff --git a/sys-apps/grub/grub-0.5.96.1-r4.ebuild b/sys-apps/grub/grub-0.5.96.1-r4.ebuild
new file mode 100644
index 000000000000..33fa9ac1ce0d
--- /dev/null
+++ b/sys-apps/grub/grub-0.5.96.1-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Daniel Robbins <drobbins@gentoo.org>
+# /home/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r2.ebuild,v 1.2 2001/02/07 20:05:43 achim Exp
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="GNU GRUB boot loader"
+SRC_URI="ftp://alpha.gnu.org/gnu/grub/${A}"
+HOMEPAGE="http://www.gnu.org/software/grub"
+
+DEPEND="virtual/glibc
+        >=sys-libs/ncurses-5.2-r2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	try patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
+}
+
+src_compile() {
+
+	try     ./configure --prefix=/usr sbindir=/sbin \
+                --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST}
+
+	try make ${MAKEOPTS} -e  CPPFLAGS=\"-Wall -Wmissing-prototypes -Wunused -Wshadow -malign-jumps=1 -malign-loops=1 -malign-functions=1 -Wundef\"
+}
+
+src_install() {
+	
+	try make prefix=${D}/usr sbindir=${D}/sbin mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
+	
+	if [ -z "`use bootcd`" ]
+	then
+        dodir /boot/boot/grub
+		cd ${D}/usr/share/grub/i386-pc
+		cp stage1 stage2 *stage1_5 ${D}/boot/boot/grub
+		
+        cd ${S}
+		dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
+	else
+		rm -rf ${D}/usr/share/{man,info,doc}
+	fi
+}
diff --git a/sys-apps/parted/parted-1.4.17.ebuild b/sys-apps/parted/parted-1.4.17.ebuild
index 375d9c83044a..4843567a8ddd 100644
--- a/sys-apps/parted/parted-1.4.17.ebuild
+++ b/sys-apps/parted/parted-1.4.17.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Peter Gavin <pete@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.4.17.ebuild,v 1.1 2001/08/04 18:22:45 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.4.17.ebuild,v 1.2 2001/08/05 22:58:06 pete Exp $
 
 #P=
 A=${P}.tar.gz
@@ -52,7 +52,7 @@ src_compile() {
 	else
 		myconf="${myconf}"
 	fi
-    try PYTHON=/usr/bin/python ./configure --prefix=/usr --target=${CHOST} ${myconf}
+    try ./configure --prefix=/usr --target=${CHOST} ${myconf}
 	cd ${S}
     try make
 }
diff --git a/sys-apps/shadow/shadow-20001016-r4.ebuild b/sys-apps/shadow/shadow-20001016-r4.ebuild
index 558b4a392c1c..99c84e94ba1a 100644
--- a/sys-apps/shadow/shadow-20001016-r4.ebuild
+++ b/sys-apps/shadow/shadow-20001016-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-20001016-r4.ebuild,v 1.4 2001/08/04 18:22:45 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-20001016-r4.ebuild,v 1.5 2001/08/05 22:58:06 pete Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -79,6 +79,3 @@ src_install() {
 		rm -rf ${D}/usr/share ${D}/usr/lib/lib*.{a,la}
 	fi
 }
-
-
-
diff --git a/sys-libs/glibc/glibc-2.2.3-r4.ebuild b/sys-libs/glibc/glibc-2.2.3-r4.ebuild
index 131f62f5a897..f32855b92474 100644
--- a/sys-libs/glibc/glibc-2.2.3-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.2.3-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.3-r4.ebuild,v 1.2 2001/08/04 18:22:45 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.3-r4.ebuild,v 1.3 2001/08/05 22:58:06 pete Exp $
 
 A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz"
 S=${WORKDIR}/${P}
@@ -103,13 +103,13 @@ src_install() {
 		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \
 			PROJECTS README*
     else
-		rm -rf ${D}/usr/share/{man,info,zoneinfo}
+		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
 		if [ "`use bootcd`" ]
 		then
 			rm -rf ${D}/usr/include
 			rm -f ${D}/usr/bin/{lddlibc4,iconv,sprof,glibcbug,tzselect,getconf,gencat,getent,locale,mtrace,pcprofiledump,rpcgen,localedef,catchsegv,xtrace}
-			rm -rf ${D}/usr/sbin/{zic,nscd,nscd_nischeck,zdump,rpcinfo}
-			rm -f ${D}/usr/lib/lib*.a
+			rm -rf ${D}/usr/sbin
+			rm -f ${D}/usr/lib/lib*.a ${D}/usr/lib/*.o
 		fi
     fi