Update to rc-scripts-1.4.15, which contains fixes for bug 51570 (typo/error on line 161 of /sbin/livecd-functions.sh) and bug 51626 (wrong var declaration in get_bootparam in /sbin/functions.sh). Fix pkg_postinst to write to ${ROOT}/etc/gentoo-release instead of ${D}/etc/gentoo-release (D'oh!)

5 files changed, 20 insertions, 7 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index aa9568b2db58..f94b3ab44cf6 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,21 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.143 2004/05/17 22:02:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.144 2004/05/21 15:41:38 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.9.4 (21 May 2004)
+
+  21 May 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.9.3.ebuild,
+  +baselayout-1.9.4.ebuild:
+  Update to rc-scripts-1.4.15, which contains fixes for bug 51570 (typo/error on
+  line 161 of /sbin/livecd-functions.sh) and bug 51626 (wrong var declaration in
+  get_bootparam in /sbin/functions.sh).
+
+  Fix pkg_postinst to write to ${ROOT}/etc/gentoo-release instead of
+  ${D}/etc/gentoo-release (D'oh!)
+
 *baselayout-1.9.3 (17 May 2004)
 
   17 May 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.9.2.ebuild,
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index c9615c984dea..ba628fc3d171 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,13 +1,14 @@
 MD5 ff4c40861f7c8e1ed8cbb945721f23b4 baselayout-1.9.1.ebuild 16087
 MD5 50d26849ef24fb476a6d92d2cd270199 baselayout-1.8.12.ebuild 15958
-MD5 6d0dcc35f7560eb805e819916d1ce6e8 baselayout-1.9.3.ebuild 16133
 MD5 bd19fc0fd92d71e639f0367cbdaa1acd baselayout-1.8.6.13.ebuild 20631
 MD5 790c2386d65a7dcf35ccf97bd0ddc69f baselayout-1.8.11.ebuild 15446
 MD5 b1731a58a05164f101ce08637f040b48 baselayout-1.8.6.13-r1.ebuild 16907
+MD5 2a49daa063974cc13b626a07bc848084 baselayout-1.9.4.ebuild 16133
 MD5 15fcf41e553eef5ec5c9e8fb4d5d8c55 ChangeLog 30537
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
 MD5 f009d33103504c1e9efa2afca08bfbff files/digest-baselayout-1.9.1 134
 MD5 3a85e6ae1b2396f090cbb4d4753e99e9 files/digest-baselayout-1.9.3 134
+MD5 9555eb10db9b34b7221ad0a9193d43f1 files/digest-baselayout-1.9.4 134
 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
 MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
 MD5 b552d9eff99e33451f2378fa95534fa9 files/digest-baselayout-1.8.11 133
diff --git a/sys-apps/baselayout/baselayout-1.9.3.ebuild b/sys-apps/baselayout/baselayout-1.9.4.ebuild
index 8e6bab597134..b371b579a606 100644
--- a/sys-apps/baselayout/baselayout-1.9.3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.9.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.3.ebuild,v 1.1 2004/05/17 22:02:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4.ebuild,v 1.1 2004/05/21 15:41:38 agriffis Exp $
 
 inherit flag-o-matic eutils
 
-SV=1.4.14		# rc-scripts version
+SV=1.4.15		# rc-scripts version
 SVREV=			# rc-scripts rev
 SVIV=2.84		# sysvinit version
 
@@ -555,7 +555,8 @@ pkg_postinst() {
 	# This is also written in src_install (so it's in CONTENTS), but
 	# write it here so that the new version is immediately in the file
 	# (without waiting for the user to do etc-update)
-	echo "Gentoo Base System version ${SV}" > ${D}/etc/gentoo-release
+	rm -f ${ROOT}/etc/._cfg????_gentoo-release
+	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
 
 	echo
 	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.9.3 b/sys-apps/baselayout/files/digest-baselayout-1.9.3
deleted file mode 100644
index e4bd8be5b3ca..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.9.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 642048ec1457dd8e9bb4b204d8ccd6e4 rc-scripts-1.4.14.tar.bz2 114940
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.9.4 b/sys-apps/baselayout/files/digest-baselayout-1.9.4
new file mode 100644
index 000000000000..5822957739e6
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.9.4
@@ -0,0 +1,2 @@
+MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
+MD5 fa35a7a6531a901233abc02ff8e991a7 rc-scripts-1.4.15.tar.bz2 110413