Update to rc-scripts-1.6.2 with net-scripts changes and lots of bug fixes (see rc-scripts ChangeLog)

5 files changed, 35 insertions, 34 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index b94a44a3fd4d..e7d6710c9e6b 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.174 2004/10/06 04:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.175 2004/10/13 18:24:15 agriffis Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+*baselayout-1.11.2 (13 Oct 2004)
+
+  13 Oct 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.11.1.ebuild,
+  +baselayout-1.11.2.ebuild:
+  Update to rc-scripts-1.6.2 with net-scripts changes and lots of bug fixes
+  (see rc-scripts ChangeLog)
+
   06 Oct 2004; Mike Frysinger <vapier@gentoo.org> baselayout-1.10.3.ebuild,
   baselayout-1.10.4.ebuild, baselayout-1.11.1.ebuild,
   baselayout-1.9.4-r3.ebuild, baselayout-1.9.4-r4.ebuild:
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index f9740a7631f7..a1d4b1c6635d 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 612dcd4f110d9579d970e978e503ec45 ChangeLog 39633
-MD5 0290b2f759547f9abaf4e118331bdbf3 baselayout-1.9.4-r3.ebuild 17770
 MD5 428bfcde4eedd130836f6f796f105211 baselayout-1.10.3.ebuild 15557
-MD5 abccbd0a4dce1e37a26e490597a9fcc6 baselayout-1.10.4.ebuild 15557
+MD5 0290b2f759547f9abaf4e118331bdbf3 baselayout-1.9.4-r3.ebuild 17770
+MD5 781c9e58f7549de33bf099463f1c64ad ChangeLog 39881
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+MD5 abccbd0a4dce1e37a26e490597a9fcc6 baselayout-1.10.4.ebuild 15557
 MD5 b4e1da008c01a399d29352fecb50c138 baselayout-1.9.4-r4.ebuild 16555
-MD5 b2ec2250558d3f122f4a34aec1e41d88 baselayout-1.11.1.ebuild 15752
-MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r3 134
+MD5 bb1ac02825b9ffd94b6c746f715de23f baselayout-1.11.2.ebuild 15965
+MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
+MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
 MD5 ab3b5bbd5ce8a8b1386c834ff4a118b4 files/digest-baselayout-1.10.3 69
 MD5 2a99e8726f3939af8e637269f4fd4818 files/digest-baselayout-1.10.4 69
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r4 134
-MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
-MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
+MD5 9e63fdc2b39bbe5ce72630dcc7e1f65b files/digest-baselayout-1.11.2 69
 MD5 adc667ea815b256d6f39259f4134f6df files/sysvinit-2.84-selinux1.patch 3556
-MD5 5610331ea31b164a8eb9c45ddc9adbbf files/digest-baselayout-1.11.1 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBY3eTHTu7gpaalycRAtjwAKDNlduGW9jTYw/ubqxWkyCgkBNzDACeL2K3
-PMAlQ0pPt5OHiUx+to9ymuw=
-=kU70
------END PGP SIGNATURE-----
+MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r3 134
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r4 134
diff --git a/sys-apps/baselayout/baselayout-1.11.1.ebuild b/sys-apps/baselayout/baselayout-1.11.2.ebuild
index 436b99506367..38af9e5f95e3 100644
--- a/sys-apps/baselayout/baselayout-1.11.1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.1.ebuild,v 1.3 2004/10/06 04:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.2.ebuild,v 1.1 2004/10/13 18:24:16 agriffis Exp $
 
 inherit flag-o-matic eutils
 
-SV=1.6.1 		# rc-scripts version
+SV=1.6.2		# rc-scripts version
 SVREV=			# rc-scripts rev
 
 S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
@@ -125,6 +125,7 @@ src_install() {
 	kdir /etc/cron.weekly
 	kdir /etc/devfs.d
 	kdir /etc/env.d
+	dodir /etc/init.d			# .keep file might mess up init.d stuff
 	kdir /etc/modules.autoload.d
 	kdir /etc/modules.d
 	kdir /etc/opt
@@ -139,11 +140,14 @@ src_install() {
 		kdir /lib/dev-state
 		kdir /lib/udev-state
 	fi
+	kdir /lib/rcscripts/awk
+	kdir /lib/rcscripts/sh
+	dodir /lib/rcscripts/net.modules.d	# .keep file messes up net.lo
 	kdir /mnt
 	kdir -m 0700 /mnt/cdrom
 	kdir -m 0700 /mnt/floppy
 	kdir /opt
-	kdir -o root -g uucp -m0775 /var/lock
+	kdir -o root -g uucp -m0755 /var/lock
 	kdir /proc
 	kdir -m 0700 /root
 	kdir /sbin
@@ -185,6 +189,7 @@ src_install() {
 	kdir /usr/X11R6/share
 	kdir -m 1777 /tmp
 	kdir /var
+	dodir /var/db/pkg			# .keep file messes up Portage
 	kdir /var/lib/misc
 	kdir /var/lock/subsys
 	kdir /var/log/news
@@ -193,10 +198,6 @@ src_install() {
 	kdir /var/state
 	kdir -m 1777 /var/tmp
 
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-	dodir /etc/net.modules.d	# .keep file messes up net.lo
-	dodir /var/db/pkg			# .keep file messes up Portage
-
 	# Symlinks so that LSB compliant apps work
 	# /lib64 is especially required since its the default place for ld.so
 	if [[ ${ARCH} == ppc64 ]]; then
@@ -252,8 +253,6 @@ src_install() {
 
 	exeinto /etc/init.d
 	doexe ${S}/init.d/*
-	insinto /etc/net.modules.d
-	doins ${S}/etc/net.modules.d/*
 	insinto /etc/conf.d
 	doins ${S}/etc/conf.d/*
 	insinto /etc/env.d
@@ -265,8 +264,6 @@ src_install() {
 	insinto /etc/skel
 	find ${S}/etc/skel -type f -maxdepth 1 -print0 | xargs --null doins
 
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*	# now ships with net-dialup/ppp
-
 	# As of baselayout-1.10-1-r1, sysvinit is its own package again, and
 	# provides the inittab itself
 	rm -f ${D}/etc/inittab
@@ -321,7 +318,9 @@ src_install() {
 	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
 
 	#
-	# Setup files in /lib/rcsripts/sh
+	# Setup files in /lib/rcscripts
+	# These are support files for other things in baselayout that needn't be
+	# under CONFIG_PROTECTed /etc
 	#
 	cd ${S}/sbin
 	exeinto /lib/rcscripts/sh
@@ -342,6 +341,11 @@ src_install() {
 		doins ${S}/src/awk/*.awk
 	fi
 
+	# Original design had these in /etc/net.modules.d but that is too
+	# problematic with CONFIG_PROTECT
+	insinto /lib/rcscripts/net.modules.d
+	doins ${S}/lib/rcscripts/net.modules.d/*
+
 	#
 	# Install baselayout documentation
 	#
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.1 b/sys-apps/baselayout/files/digest-baselayout-1.11.1
deleted file mode 100644
index c3c263b249f1..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.11.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d49a76949f996f0d2ef00608ec8a0de0 rc-scripts-1.6.1.tar.bz2 134752
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.2 b/sys-apps/baselayout/files/digest-baselayout-1.11.2
new file mode 100644
index 000000000000..c782936275c4
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.11.2
@@ -0,0 +1 @@
+MD5 6d501ed1d401e0dc314a37ab7ee97a77 rc-scripts-1.6.2.tar.bz2 140334