digest

6 files changed, 2 insertions, 997 deletions

diff --git a/sys-apps/baselayout/baselayout-1.5-r3.ebuild b/sys-apps/baselayout/baselayout-1.5-r3.ebuild
deleted file mode 100644
index 715623872cfe..000000000000
--- a/sys-apps/baselayout/baselayout-1.5-r3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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-r3.ebuild,v 1.22 2001/10/06 17:04:49 drobbins Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts)"
-SRC_URI=""
-HOMEPAGE="http://www.gentoo.org"
-
-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 /boot /home
-	dodir /usr/include /usr/src /usr/portage /usr/X11R6/include/GL
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym /usr/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
-
-	dodir /usr/lib
-	dodir /usr/sbin
-	dosbin ${FILESDIR}/MAKEDEV ${FILESDIR}/run-crons
-	dodir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc /usr/bin/
-
-#FHS 2.1 stuff
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-#end FHS 2.1 stuff
-	dosym /var/tmp /usr/tmp
-	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
-	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
-
-#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 /root /opt /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
-        for foo in hourly daily weekly monthly
-	do
-		dodir /etc/cron.$foo
-	done
-	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 *
-	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/baselayout-1.5-r4.ebuild b/sys-apps/baselayout/baselayout-1.5-r4.ebuild
deleted file mode 100644
index 0a3ed8c7be1f..000000000000
--- a/sys-apps/baselayout/baselayout-1.5-r4.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# 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.3 2001/10/06 17:04:49 drobbins Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
-
-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/lock/subsys
-	if [ -z "`use bootcd`" ]
-	then
-		dodir /var/log/news
-	fi
-	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
-	
-	if [ -z "`use bootcd`" ]
-	then
-		dodir /etc/pam.d
-		cd ${FILESDIR}/pam.d
-		insinto /etc/pam.d
-		doins *
-	fi
-	
-	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/baselayout-1.6.1.ebuild b/sys-apps/baselayout/baselayout-1.6.1.ebuild
deleted file mode 100644
index 7447ede8e303..000000000000
--- a/sys-apps/baselayout/baselayout-1.6.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.1.ebuild,v 1.3 2001/10/06 17:22:52 azarah Exp $
-
-SV=1.1.4
-S=${WORKDIR}/rc-scripts-${SV}
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts)"
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/rc-scripts-${SV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
-
-src_compile() {
-	cp ${S}/init.d/runscript.c ${T}
-	cd ${T}
-	gcc ${CFLAGS} runscript.c -o runscript
-}
-
-#adds ".keep" files so that dirs aren't auto-cleaned
-keepdir() {
-	dodir $*
-	local x
-	for x in $*
-	do
-		touch ${D}/${x}/.keep
-	done
-}
-
-src_install()
-{
-	local foo
-	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
-	keepdir /sbin
-	exeinto /sbin
-	doexe ${T}/runscript
-
-	keepdir /usr
-	keepdir /usr/bin
-	keepdir /usr/lib
-	keepdir /usr/sbin
-	dosbin ${S}/sbin/MAKEDEV ${S}/sbin/run-crons ${S}/sbin/update-modules
-	keepdir /var /var/run /var/lock/subsys
-	dosym ../var/tmp /usr/tmp
-	
-	if [ -z "`use bootcd`" ]
-	then
-		keepdir /boot
-		dosym . /boot/boot
-		keepdir /home
-		keepdir /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
-		#Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-		#We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-		#the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-		#/usr/include/asm.  This is the recommended approach so that kernel includes can remain
-		#constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-		keepdir /usr/include/linux /usr/include/asm
-		keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-		for foo in games lib sbin share bin share/doc share/man src
-		do
-		  keepdir /usr/local/${foo}
-		done
-		#local FHS compat symlinks
-		dosym share/man /usr/local/man	
-		dosym share/doc	/usr/local/doc	
-
-		#FHS compatibility symlinks stuff
-		dosym share/man /usr/man
-		dosym share/doc /usr/doc
-		dosym share/info /usr/info
-		keepdir /usr/X11R6/share
-		dosym ../../share/info	/usr/X11R6/share/info
-		#end FHS compatibility symlinks stuff
-		
-		doman ${FILESDIR}/MAKEDEV.8
-		dodoc ${FILESDIR}/copyright ${FILESDIR}/changelog.Debian
-		keepdir /usr/X11R6/lib /usr/X11R6/man
-		keepdir /var/log/news
-		
-		#supervise stuff depreciated
-		#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
-	
-# Drobbins or Hallski please check this!	
-		keepdir /opt
-#		keepdir /opt/gnome/man
-#		keepdir /opt/gnome/share
-#		dosym ../man /opt/gnome/share/man
-#		It makes sense to move these to the PAM package.
-#		dodir /etc/pam.d
-#		cd ${FILESDIR}/pam.d
-#		insinto /etc/pam.d
-#		doins *
-	fi
-	
-	touch ${D}/var/log/lastlog
-	touch ${D}/var/run/utmp
-	touch ${D}/var/log/wtmp
-	#the .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg 
-	keepdir /var/spool /var/tmp /var/lib/misc
-	chmod 1777 ${D}/var/tmp
-	keepdir /root
-	
-	#/proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc	
-	
-	chmod go-rx ${D}/root
-	keepdir /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
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		#install files, not dirs
-		[ -f $foo ] && doins $foo
-	done
-	touch ${D}/etc/mtab	
-	#mtab is needed for the first boot to go flawlessly
-	chmod go-rwx ${D}/etc/shadow
-	keepdir /lib /mnt/floppy /mnt/cdrom
-	chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom
-
-#	dosbin rc-update 
-#	insinto /usr/bin
-#	insopts -m0755
-#	doins colors
-  	keepdir /dev
-	keepdir /dev-state
-	keepdir /dev/pts /dev/shm
-	dosym /usr/sbin/MAKEDEV /dev/MAKEDEV
-	cd ${D}/dev
-	#These devices are also needed by many people and should be included
-	echo "Making device nodes... (this could take a minute or so...)"
-	${S}/sbin/MAKEDEV generic-i386
-	${S}/sbin/MAKEDEV sg
-	${S}/sbin/MAKEDEV scd
-	${S}/sbin/MAKEDEV rtc 
-	${S}/sbin/MAKEDEV audio
-	${S}/sbin/MAKEDEV hde
-	${S}/sbin/MAKEDEV hdf
-	${S}/sbin/MAKEDEV hdg
-	${S}/sbin/MAKEDEV hdh
-
-	cd ${S}/sbin
-	into /
-	dosbin init rc
-
-	#env-update stuff
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-	
-	dodir /etc/modutils
-	insinto /etc/modutils
-	doins ${S}/etc/modutils/aliases ${S}/etc/modutils/i386
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f $foo ] && doexe $foo
-	done
-	#not the greatest location for this file; should move it at some point
-	rm ${S}/etc/init.d/runscript.c
-
-	#set up default runlevel symlinks
-	local bar
-	for foo in default boot nonetwork single
-	do
-		dodir /etc/runlevels/${foo}
-		for bar in `cat ${S}/rc-lists/${foo}`
-		do
-			[ -e ${S}/init.d/${bar} ] && dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-}
diff --git a/sys-apps/baselayout/baselayout-1.6.2.ebuild b/sys-apps/baselayout/baselayout-1.6.2.ebuild
deleted file mode 100644
index 2f10a08f1208..000000000000
--- a/sys-apps/baselayout/baselayout-1.6.2.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.2.ebuild,v 1.8 2001/10/06 17:22:52 azarah Exp $
-
-SV=1.1.5
-S=${WORKDIR}/rc-scripts-${SV}
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts)"
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/rc-scripts-${SV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
-
-#This ebuild needs to be merged "live".  You can't simply make a package of it and merge it later.
-
-src_compile() {
-	cp ${S}/init.d/runscript.c ${T}
-	cd ${T}
-	gcc ${CFLAGS} runscript.c -o runscript
-	echo ${ROOT} > ${T}/ROOT
-}
-
-#adds ".keep" files so that dirs aren't auto-cleaned
-keepdir() {
-	dodir $*
-	local x
-	for x in $*
-	do
-		touch ${D}/${x}/.keep
-	done
-}
-
-src_install()
-{
-	local foo
-	local altmerge
-	altmerge=0
-	#special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	#(because it conflicts with some makefiles)
-	local ROOT
-	ROOT="`cat ${T}/ROOT`"
-	#if we are bootstrapping, we want to merge to /dev.
-	if [ -z "`use build`" ]
-	then
-		if [ "$ROOT" = "/" ] && [ "`cat /proc/mounts | grep '/dev devfs'`" ]
-		then
-			#we're installing to our current system and have devfs enabled.  We'll need to
-			#make adjustments
-			altmerge=1
-		fi
-	fi
-	keepdir /sbin
-	exeinto /sbin
-	doexe ${T}/runscript
-
-	keepdir /usr
-	keepdir /usr/bin
-	keepdir /usr/lib
-	keepdir /usr/sbin
-	dosbin ${S}/sbin/MAKEDEV ${S}/sbin/run-crons ${S}/sbin/update-modules
-	keepdir /var /var/run /var/lock/subsys
-	dosym ../var/tmp /usr/tmp
-	
-	if [ -z "`use bootcd`" ]
-	then
-		keepdir /boot
-		dosym . /boot/boot
-		keepdir /home
-		keepdir /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
-		#Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-		#We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-		#the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-		#/usr/include/asm.  This is the recommended approach so that kernel includes can remain
-		#constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-		keepdir /usr/include/linux /usr/include/asm
-		keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-		for foo in games lib sbin share bin share/doc share/man src
-		do
-		  keepdir /usr/local/${foo}
-		done
-		#local FHS compat symlinks
-		dosym share/man /usr/local/man	
-		dosym share/doc	/usr/local/doc	
-
-		#FHS compatibility symlinks stuff
-		dosym share/man /usr/man
-		dosym share/doc /usr/doc
-		dosym share/info /usr/info
-		keepdir /usr/X11R6/share
-		dosym ../../share/info	/usr/X11R6/share/info
-		#end FHS compatibility symlinks stuff
-		
-		doman ${FILESDIR}/MAKEDEV.8
-		dodoc ${FILESDIR}/copyright ${FILESDIR}/changelog.Debian
-		keepdir /usr/X11R6/lib /usr/X11R6/man
-		keepdir /var/log/news
-		
-		#supervise stuff depreciated
-		#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
-	
-# Drobbins or Hallski please check this!
-		keepdir /opt
-#		keepdir /opt/gnome/man
-#		keepdir /opt/gnome/share
-#		dosym ../man /opt/gnome/share/man
-	fi
-
-#the .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg 
-	keepdir /var/spool /var/tmp /var/lib/misc
-	chmod 1777 ${D}/var/tmp
-	keepdir /root
-	
-	#/proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc	
-	
-	chmod go-rx ${D}/root
-	keepdir /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
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		#install files, not dirs
-		[ -f $foo ] && doins $foo
-	done
-	#going back to symlink mtab; it just plain works better
-	dosym ../proc/mounts /etc/mtab
-	chmod go-rwx ${D}/etc/shadow
-	keepdir /lib /mnt/floppy /mnt/cdrom
-	chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom
-
-#	dosbin rc-update 
-#	insinto /usr/bin
-#	insopts -m0755
-#	doins colors
-	if [ $altmerge -eq 1 ]
-	then
-		#rootfs and devfs
-		keepdir /dev-state
-		dosym /usr/sbin/MAKEDEV /dev-state/MAKEDEV
-		keepdir /dev-state/pts /dev-state/shm
-		cd ${D}/dev-state
-	else
-		#normal
-		keepdir /dev
-		keepdir /dev-state
-		keepdir /dev/pts /dev/shm
-		dosym /usr/sbin/MAKEDEV /dev/MAKEDEV
-		cd ${D}/dev
-	fi	
-	#These devices are also needed by many people and should be included
-	echo "Making device nodes... (this could take a minute or so...)"
-	${S}/sbin/MAKEDEV generic-i386
-	${S}/sbin/MAKEDEV sg
-	${S}/sbin/MAKEDEV scd
-	${S}/sbin/MAKEDEV rtc 
-	${S}/sbin/MAKEDEV audio
-	${S}/sbin/MAKEDEV hde
-	${S}/sbin/MAKEDEV hdf
-	${S}/sbin/MAKEDEV hdg
-	${S}/sbin/MAKEDEV hdh
-
-	cd ${S}/sbin
-	into /
-	dosbin init rc rc-update
-
-	#env-update stuff
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-	
-	dodir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f $foo ] && doexe $foo
-	done
-	#not the greatest location for this file; should move it on cvs at some point
-	rm ${S}/init.d/runscript.c
-
-	#skip this if we are merging to ROOT
-	[ "$ROOT" = "/" ] && return
-	
-	#set up default runlevel symlinks
-	local bar
-	for foo in default boot nonetwork single
-	do
-		dodir /etc/runlevels/${foo}
-		for bar in `cat ${S}/rc-lists/${foo}`
-		do
-			[ -e ${S}/init.d/${bar} ] && dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-}
-
-pkg_postinst() {
-	#we should only install empty files if these files don't already exist.
-	local x
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}var/${x} ] || touch ${ROOT}var/${x}
-	done
-}
diff --git a/sys-apps/baselayout/baselayout-1.6.3.ebuild b/sys-apps/baselayout/baselayout-1.6.3.ebuild
deleted file mode 100644
index f9229a26770d..000000000000
--- a/sys-apps/baselayout/baselayout-1.6.3.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.3.ebuild,v 1.3 2001/10/06 17:22:52 azarah Exp $
-
-SV=1.1.6
-S=${WORKDIR}/rc-scripts-${SV}
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts)"
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/rc-scripts-${SV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
-
-#This ebuild needs to be merged "live".  You can't simply make a package of it and merge it later.
-
-src_compile() {
-	cp ${S}/init.d/runscript.c ${T}
-	cd ${T}
-	gcc ${CFLAGS} runscript.c -o runscript
-	echo ${ROOT} > ${T}/ROOT
-}
-
-#adds ".keep" files so that dirs aren't auto-cleaned
-keepdir() {
-	dodir $*
-	local x
-	for x in $*
-	do
-		touch ${D}/${x}/.keep
-	done
-}
-
-src_install()
-{
-	local foo
-	local altmerge
-	altmerge=0
-	#special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	#(because it conflicts with some makefiles)
-	local ROOT
-	ROOT="`cat ${T}/ROOT`"
-	#if we are bootstrapping, we want to merge to /dev.
-	if [ -z "`use build`" ]
-	then
-		if [ "$ROOT" = "/" ] && [ "`cat /proc/mounts | grep '/dev devfs'`" ]
-		then
-			#we're installing to our current system and have devfs enabled.  We'll need to
-			#make adjustments
-			altmerge=1
-		fi
-	fi
-	keepdir /sbin
-	exeinto /sbin
-	doexe ${T}/runscript
-
-	keepdir /usr
-	keepdir /usr/bin
-	keepdir /usr/lib
-	keepdir /usr/sbin
-	dosbin ${S}/sbin/MAKEDEV ${S}/sbin/run-crons ${S}/sbin/update-modules
-	keepdir /var /var/run /var/lock/subsys
-	dosym ../var/tmp /usr/tmp
-	
-	if [ -z "`use bootcd`" ]
-	then
-		keepdir /boot
-		dosym . /boot/boot
-		keepdir /home
-		keepdir /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
-		#Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-		#We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-		#the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-		#/usr/include/asm.  This is the recommended approach so that kernel includes can remain
-		#constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-		keepdir /usr/include/linux /usr/include/asm
-		keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-		for foo in games lib sbin share bin share/doc share/man src
-		do
-		  keepdir /usr/local/${foo}
-		done
-		#local FHS compat symlinks
-		dosym share/man /usr/local/man	
-		dosym share/doc	/usr/local/doc	
-
-		#FHS compatibility symlinks stuff
-		dosym share/man /usr/man
-		dosym share/doc /usr/doc
-		dosym share/info /usr/info
-		keepdir /usr/X11R6/share
-		dosym ../../share/info	/usr/X11R6/share/info
-		#end FHS compatibility symlinks stuff
-		
-		doman ${FILESDIR}/MAKEDEV.8
-		dodoc ${FILESDIR}/copyright ${FILESDIR}/changelog.Debian
-		keepdir /usr/X11R6/lib /usr/X11R6/man
-		keepdir /var/log/news
-		
-		#supervise stuff depreciated
-		#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
-	
-# Drobbins or Hallski please check this!
-		keepdir /opt
-#		keepdir /opt/gnome/man
-#		keepdir /opt/gnome/share
-#		dosym ../man /opt/gnome/share/man
-	fi
-
-#the .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg 
-	keepdir /var/spool /var/tmp /var/lib/misc
-	chmod 1777 ${D}/var/tmp
-	keepdir /root
-	
-	#/proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc	
-	
-	chmod go-rx ${D}/root
-	keepdir /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
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		#install files, not dirs
-		[ -f $foo ] && doins $foo
-	done
-	#going back to symlink mtab; it just plain works better
-	dosym ../proc/mounts /etc/mtab
-	chmod go-rwx ${D}/etc/shadow
-	keepdir /lib /mnt/floppy /mnt/cdrom
-	chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom
-
-#	dosbin rc-update 
-#	insinto /usr/bin
-#	insopts -m0755
-#	doins colors
-	if [ $altmerge -eq 1 ]
-	then
-		#rootfs and devfs
-		keepdir /dev-state
-		dosym /usr/sbin/MAKEDEV /dev-state/MAKEDEV
-		keepdir /dev-state/pts /dev-state/shm
-		cd ${D}/dev-state
-	else
-		#normal
-		keepdir /dev
-		keepdir /dev-state
-		keepdir /dev/pts /dev/shm
-		dosym /usr/sbin/MAKEDEV /dev/MAKEDEV
-		cd ${D}/dev
-	fi	
-	#These devices are also needed by many people and should be included
-	echo "Making device nodes... (this could take a minute or so...)"
-	${S}/sbin/MAKEDEV generic-i386
-	${S}/sbin/MAKEDEV sg
-	${S}/sbin/MAKEDEV scd
-	${S}/sbin/MAKEDEV rtc 
-	${S}/sbin/MAKEDEV audio
-	${S}/sbin/MAKEDEV hde
-	${S}/sbin/MAKEDEV hdf
-	${S}/sbin/MAKEDEV hdg
-	${S}/sbin/MAKEDEV hdh
-
-	cd ${S}/sbin
-	into /
-	dosbin init rc rc-update
-
-	#env-update stuff
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-	
-	dodir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f $foo ] && doexe $foo
-	done
-	#not the greatest location for this file; should move it on cvs at some point
-	rm ${S}/init.d/runscript.c
-
-	#skip this if we are merging to ROOT
-	[ "$ROOT" = "/" ] && return
-	
-	#set up default runlevel symlinks
-	local bar
-	for foo in default boot nonetwork single
-	do
-		dodir /etc/runlevels/${foo}
-		for bar in `cat ${S}/rc-lists/${foo}`
-		do
-			[ -e ${S}/init.d/${bar} ] && dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-
-	cat << EOF >> ${D}/etc/hosts
-127.0.0.1	localhost
-EOF
-}
-
-pkg_postinst() {
-	#we should only install empty files if these files don't already exist.
-	local x
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}var/${x} ] || touch ${ROOT}var/${x}
-	done
-}
diff --git a/sys-apps/baselayout/baselayout-1.6.4.ebuild b/sys-apps/baselayout/baselayout-1.6.5.ebuild
index ad1ae61521a5..0e9694067bca 100644
--- a/sys-apps/baselayout/baselayout-1.6.4.ebuild
+++ b/sys-apps/baselayout/baselayout-1.6.5.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.4.ebuild,v 1.2 2001/10/18 18:45:30 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.6.5.ebuild,v 1.1 2001/10/30 05:55:12 drobbins Exp $
 
-SV=1.1.7
+SV=1.1.8
 S=${WORKDIR}/rc-scripts-${SV}
 DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts)"
 SRC_URI="http://www.ibiblio.org/gentoo/distfiles/rc-scripts-${SV}.tar.bz2"