Stop installing non existant volume init script and indicate that deprecated

  vars no longer work.
Package-Manager: portage-2.1.2.5

4 files changed, 24 insertions, 24 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 0b4ee24779a4..02223dbf5668 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.414 2007/05/04 15:29:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.415 2007/05/05 11:52:54 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  05 May 2007; Roy Marples <uberlord@gentoo.org>
+  baselayout-2.0.0_alpha2.ebuild:
+  Stop installing non existant volume init script and indicate that deprecated
+  vars no longer work.
+
 *baselayout-2.0.0_alpha2 (04 May 2007)
 
   04 May 2007; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index de8d81d4a1a7..834b5307f896 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -20,7 +20,7 @@ RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099
 DIST baselayout-1.12.10.tar.bz2 218940 RMD160 e499c08af4d73d43c2e354febbf09e48916ac24c SHA1 306090e733eaf059d0849291d6327f7ea9bae5cc SHA256 1d64cdb9cc42bca7a8eec4045ad0e7e8cafba1d6c3f92b377bc7f6f7ee668674
 DIST baselayout-1.12.9.tar.bz2 218939 RMD160 c80a3e4434bd8ce58c89ab1b988b64c012741d00 SHA1 0e5745d95412db3427961c5f796827f7867aa35b SHA256 ab89a131d0a12fa8b411189fb51b15216c3f27a422ff539767eb0d134e40dd94
-DIST baselayout-1.13.0_alpha12.tar.bz2 230982 RMD160 6401629eeb92b13eb2bfbdc7f268d45ee7ed2f51 SHA1 a565b934427e0ba8eb41869fb6b30f294198a2b2 SHA256 3b6214eb02e2549a19f2e40a71eee65981c9c9758a327d6bef128e734c47e054
+DIST baselayout-1.13.0_alpha12.tar.bz2 128921 RMD160 894f7994fd71ce588e8f314825aeedd02badf276 SHA1 4f4dfe6078ee5d71ca1aa107746118cfb64d8a1c SHA256 0f70c7a0e5bc561b76b275c07fa19003d54bced10fd739602c87b258310b6a96
 DIST baselayout-2.0.0_alpha1.tar.bz2 128006 RMD160 71da0cdbc4c870736caba7b3c7b7afe5b413eb54 SHA1 d975c51dfb845926fd450501a15a0c7938bb0d11 SHA256 bb740d967e136e35958a5e64bca777ef16b3f29194a477fc2368aa8b8fab2193
 DIST baselayout-2.0.0_alpha2.tar.bz2 132406 RMD160 259b52abf8d706338ba99fded89c503bfeee807b SHA1 13f42355ce659582e6f23a691f6cf26188987ea0 SHA256 7e0b9df754bf55fffa25a112d328a3a37d43425daf94ee48ce80cab34a3df98c
 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a
@@ -44,14 +44,14 @@ EBUILD baselayout-2.0.0_alpha1.ebuild 9885 RMD160 71826b60c5c4e2d935aaa2ae242243
 MD5 7e688c4c9e7d0f0eca4a807ce48bab87 baselayout-2.0.0_alpha1.ebuild 9885
 RMD160 71826b60c5c4e2d935aaa2ae2422434904334ce7 baselayout-2.0.0_alpha1.ebuild 9885
 SHA256 a34392945db74798fbf33da8218cd93f073d98e86992444f79731c62a67e3a45 baselayout-2.0.0_alpha1.ebuild 9885
-EBUILD baselayout-2.0.0_alpha2.ebuild 9885 RMD160 7c4e50123f2b8d7e80880ef07fc212572460fd3d SHA1 c118f1db0a430a32a06c44b566f85b49572897cd SHA256 d116e3cab69d697dea9bc0e3fda4274a2103e97c00046514e1349e4d3d608c4f
-MD5 3e8dba7e1ad94bb7c7d3bf7b1d8062a2 baselayout-2.0.0_alpha2.ebuild 9885
-RMD160 7c4e50123f2b8d7e80880ef07fc212572460fd3d baselayout-2.0.0_alpha2.ebuild 9885
-SHA256 d116e3cab69d697dea9bc0e3fda4274a2103e97c00046514e1349e4d3d608c4f baselayout-2.0.0_alpha2.ebuild 9885
-MISC ChangeLog 92528 RMD160 76a8d47977d66c9694fa0e040f642fa15141191c SHA1 67d8a7952a386ff58e756fac72b75382f38f8fb9 SHA256 6d28d3b0ef053379db4c142b066d6074c6447539a427418749fe3bc2eca3b473
-MD5 d85b071592c71220b0d73379588e56e5 ChangeLog 92528
-RMD160 76a8d47977d66c9694fa0e040f642fa15141191c ChangeLog 92528
-SHA256 6d28d3b0ef053379db4c142b066d6074c6447539a427418749fe3bc2eca3b473 ChangeLog 92528
+EBUILD baselayout-2.0.0_alpha2.ebuild 9625 RMD160 e22cdc66da8761f7889356d92e28f65aad1f6f8a SHA1 7a62e8cabb45cac1282aa6531d54eb42b6fc90e0 SHA256 91808fa06202319d8eca3353667d4d8f09b44c68d169a656b69277f04b274fd6
+MD5 ea70a675b0488c8c12169ce523f05ba5 baselayout-2.0.0_alpha2.ebuild 9625
+RMD160 e22cdc66da8761f7889356d92e28f65aad1f6f8a baselayout-2.0.0_alpha2.ebuild 9625
+SHA256 91808fa06202319d8eca3353667d4d8f09b44c68d169a656b69277f04b274fd6 baselayout-2.0.0_alpha2.ebuild 9625
+MISC ChangeLog 92714 RMD160 ac2bf3cd12532e7984dfee63fb016efe33da86f6 SHA1 5d84dd90ac2b987f112166a2a65ff23278d27f09 SHA256 574e802ece4e64f451b27175cce291e22abdcb8b8823c0bcd2c3333f33efb5f7
+MD5 afbc7081858ef4b9e89327e3c8f03223 ChangeLog 92714
+RMD160 ac2bf3cd12532e7984dfee63fb016efe33da86f6 ChangeLog 92714
+SHA256 574e802ece4e64f451b27175cce291e22abdcb8b8823c0bcd2c3333f33efb5f7 ChangeLog 92714
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -65,9 +65,9 @@ SHA256 fc42fbfcf2988b6545dc38fd1f31ea5d21da6a25c8bb68ec6cb9c8100a639993 files/di
 MD5 0739a7f44d72e74a1f977dcd81030c18 files/digest-baselayout-1.12.9-r2 256
 RMD160 0aaebaf00ed5d13cb4eaeb420ac7859ccc666503 files/digest-baselayout-1.12.9-r2 256
 SHA256 d975250968cfce2250369add8355bc47cc2e3c8ae2ae5d606c6f69086535f510 files/digest-baselayout-1.12.9-r2 256
-MD5 73d1269ba801eb1a113e55b5679be37f files/digest-baselayout-1.13.0_alpha12 280
-RMD160 82ba1b5b86ef5f414bf202d8cfd1275e7e21bf97 files/digest-baselayout-1.13.0_alpha12 280
-SHA256 4e5b7e0884373590a6b434976433e8d06a3fb4d52282f416d5a25dc2d265bd8a files/digest-baselayout-1.13.0_alpha12 280
+MD5 1f63c977c284be84db26a09beb294ca6 files/digest-baselayout-1.13.0_alpha12 280
+RMD160 a8f2355afcfba2d47bea3b5ed76d66063dd023ae files/digest-baselayout-1.13.0_alpha12 280
+SHA256 cb5e81576090bd7ad291650b3725cf79b8abd705f87b28fe1e5342bb06e5ed0a files/digest-baselayout-1.13.0_alpha12 280
 MD5 ee4d69b5b955d11ad0682ed5276ce5cb files/digest-baselayout-2.0.0_alpha1 274
 RMD160 1f7fd2f4bec5e35f7d85e905f80a491daa18f179 files/digest-baselayout-2.0.0_alpha1 274
 SHA256 1b8d9bd46ccda9cf47f971c90b3028a54335835083dfca109a7cb5c0d95a621b files/digest-baselayout-2.0.0_alpha1 274
diff --git a/sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild b/sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild
index 41e30ca0b1cf..4355553aacc7 100644
--- a/sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild,v 1.1 2007/05/04 15:29:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_alpha2.ebuild,v 1.2 2007/05/05 11:52:54 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -185,11 +185,6 @@ pkg_postinst() {
 		umount "${ROOT}${svcdir}" 2>/dev/null
 		rm -rf "${ROOT}${svcdir}"
 		)
-		# Install our new init script and mark it started
-		if use kernel_linux ; then
-			ln -snf ../../init.d/volumes "${ROOT}"etc/runlevels/boot
-			ln -snf /etc/init.d/volumes "${ROOT}"lib/rcscripts/init.d/started
-		fi
 	elif has_version "<sys-apps/${PN}-2.0.0_alpha" ; then
 		# The format has changed since 1.13
 		rm -rf "${ROOT}lib/rcscripts/init.d/daemons"
@@ -244,10 +239,10 @@ pkg_postinst() {
 		| egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then
 			echo
 			ewarn "You are using deprecated variables in ${ROOT}etc/conf.d/net"
+			ewarn "that no longer work"
 			ewarn
 			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example as there is no"
-			ewarn "guarantee that they will work in future versions."
+			ewarn "found in ${ROOT}etc/conf.d/net.example"
 	fi
 
 	# Remove old stuff that may cause problems.
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12
index d4f6ab3b89ac..e50ac500b70d 100644
--- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12
+++ b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12
@@ -1,3 +1,3 @@
-MD5 8de97deb8317f58da52c688f06439e4d baselayout-1.13.0_alpha12.tar.bz2 230982
-RMD160 6401629eeb92b13eb2bfbdc7f268d45ee7ed2f51 baselayout-1.13.0_alpha12.tar.bz2 230982
-SHA256 3b6214eb02e2549a19f2e40a71eee65981c9c9758a327d6bef128e734c47e054 baselayout-1.13.0_alpha12.tar.bz2 230982
+MD5 ed1cbd72c654201c9ff7dafcc3f2ba65 baselayout-1.13.0_alpha12.tar.bz2 128921
+RMD160 894f7994fd71ce588e8f314825aeedd02badf276 baselayout-1.13.0_alpha12.tar.bz2 128921
+SHA256 0f70c7a0e5bc561b76b275c07fa19003d54bced10fd739602c87b258310b6a96 baselayout-1.13.0_alpha12.tar.bz2 128921