Don't copy the daemons directory across when upgrading as it just won't work

  anymore.
Package-Manager: portage-2.1.2.2

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 9de8ed0b598f960d827249c51ce38aa65c0a767a..efb6e3d4a19319aa48d2cec1b15659514a303ed7 100644 (file)
--- 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.406 2007/02/15 18:53:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.407 2007/03/11 01:56:14 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  11 Mar 2007; Roy Marples <uberlord@gentoo.org>
+  baselayout-1.13.0_alpha12.ebuild:
+  Don't copy the daemons directory across when upgrading as it just won't work
+  anymore.
+
   15 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   baselayout-1.12.9.ebuild, baselayout-1.13.0_alpha12.ebuild:
   Default to us keymap for sparc (2.6)

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 157298814400cdbfac007a48ef98800bc12db239..d19ffddb871f1b462147c7a32d8ee69bdd1a44cf 100644 (file)
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -71,7 +71,7 @@ DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052
 DIST baselayout-1.12.6.tar.bz2 221279 RMD160 4a9b6a0b3855e36a4b0214615d578e8d17dcabae SHA1 8164fe1923ccdf9d9e38ac0884e2bdd2061681e7 SHA256 c244469fa582c7733d2cf1b51865fac818beb8b2af60ec452ad147cb50eb8862
 DIST baselayout-1.12.8.tar.bz2 218298 RMD160 2a47bf00db9c1e15ad2dd90e02dc55a896e3e01f SHA1 5d7274e64b8d17a77519e73303390f4d63f958ee SHA256 c05e126ee1b5bd63462db133c4e39ca45b0a999696f637f2a80d9c7b616eeeea
 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 132853 RMD160 67a21f94b015c08494704147a0956765a352277e SHA1 bffca7592d340c4fe1f4d0f2d2cb7d8343761211 SHA256 ed3eab409d5390b0ef4f3c48ccdb965b730312fcb4f84731c74d06b8f1031e36
 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a
 EBUILD baselayout-1.11.15-r3.ebuild 18810 RMD160 c2d9d4fc7aee7a26615f37b370871ab3accdf43d SHA1 9821697e7473e1e1f6d54d56237c3546310dc898 SHA256 7b98c19332ebbf4e23ca9800d3bdbbee4e03aeb92663ec4c21b7270a8ddb1c0f
 MD5 363cb680de3467f3bd044dcd85279974 baselayout-1.11.15-r3.ebuild 18810
@@ -105,14 +105,14 @@ EBUILD baselayout-1.12.9.ebuild 18553 RMD160 e4b14d6340994f8557f846935876805a83e
 MD5 ed3bda6690bbf16c5be4f4e5d1097f7d baselayout-1.12.9.ebuild 18553
 RMD160 e4b14d6340994f8557f846935876805a83ece731 baselayout-1.12.9.ebuild 18553
 SHA256 2a22054ec998969544d2629b4f33aef9560bbf60053719fb9cc5375fd5f44631 baselayout-1.12.9.ebuild 18553
-EBUILD baselayout-1.13.0_alpha12.ebuild 9881 RMD160 2716fce3c6541ea90c4ee1ad498a247220ae8de7 SHA1 ffca27ed1d86488341237bbfc19b70fe0ad25ee8 SHA256 28d57d9b59c9b319a4f8e3908409525caabb3ec81f0283d655c29c692adbbee5
-MD5 dbb85e42b337c2486b5f6a8573516dc4 baselayout-1.13.0_alpha12.ebuild 9881
-RMD160 2716fce3c6541ea90c4ee1ad498a247220ae8de7 baselayout-1.13.0_alpha12.ebuild 9881
-SHA256 28d57d9b59c9b319a4f8e3908409525caabb3ec81f0283d655c29c692adbbee5 baselayout-1.13.0_alpha12.ebuild 9881
-MISC ChangeLog 90861 RMD160 2d95703e61fee5ab10aaf1ebc312814e5efdb814 SHA1 adc30624ba77330b0cee379ee4d6a55b982fdab5 SHA256 4f73804df8d84faf352f42c6bcfde03b88557f8cbc031cbf91419c7d40fd767d
-MD5 ed5f52d4f7dfda516f757274dfbc24a5 ChangeLog 90861
-RMD160 2d95703e61fee5ab10aaf1ebc312814e5efdb814 ChangeLog 90861
-SHA256 4f73804df8d84faf352f42c6bcfde03b88557f8cbc031cbf91419c7d40fd767d ChangeLog 90861
+EBUILD baselayout-1.13.0_alpha12.ebuild 9966 RMD160 db7de2961b97237d7b2c2e84c925d262aeeb3d50 SHA1 6cfb772f17e7f7a4401976b353ed3b804847a74b SHA256 a81b8db088f4ba1de413bcf4955f295d2e2dd6fac919e4bb607ef737973cfef1
+MD5 56dc3d80b5c9847bdb05532fd3fdff71 baselayout-1.13.0_alpha12.ebuild 9966
+RMD160 db7de2961b97237d7b2c2e84c925d262aeeb3d50 baselayout-1.13.0_alpha12.ebuild 9966
+SHA256 a81b8db088f4ba1de413bcf4955f295d2e2dd6fac919e4bb607ef737973cfef1 baselayout-1.13.0_alpha12.ebuild 9966
+MISC ChangeLog 91037 RMD160 b215c0480a69b621ecd754118affbd26a6141633 SHA1 719f022eed1b6285a25000fa9e0f4ea313e50228 SHA256 28f67cdc03c05cb1b6b9c88155d0eeec90c322be8948b779d26c707896fe503e
+MD5 48c2c3ac2ed29d150c26437fc7ff590e ChangeLog 91037
+RMD160 b215c0480a69b621ecd754118affbd26a6141633 ChangeLog 91037
+SHA256 28f67cdc03c05cb1b6b9c88155d0eeec90c322be8948b779d26c707896fe503e ChangeLog 91037
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -141,6 +141,6 @@ SHA256 d5d0b95861bb7a1549bf4ac58d623bc24aa07e6887ecc31d1210c92b66901765 files/di
 MD5 0739a7f44d72e74a1f977dcd81030c18 files/digest-baselayout-1.12.9 256
 RMD160 0aaebaf00ed5d13cb4eaeb420ac7859ccc666503 files/digest-baselayout-1.12.9 256
 SHA256 d975250968cfce2250369add8355bc47cc2e3c8ae2ae5d606c6f69086535f510 files/digest-baselayout-1.12.9 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 e7b59b3fb79f6eaf10ec907fbbcc5859 files/digest-baselayout-1.13.0_alpha12 280
+RMD160 9df5127b8e03b4e4ee271f854e4927beb94d26b6 files/digest-baselayout-1.13.0_alpha12 280
+SHA256 2ca62359d2f2b049325ac9b730a6d04b30a0adde75d20abcd6f2185682e91826 files/digest-baselayout-1.13.0_alpha12 280

diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild
index c76b6e195125085994ff2fd7df032a2f188713ac..ba572f0481b074c611b7bf8efc724660c8898f61 100644 (file)
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild
+++ b/sys-apps/baselayout/baselayout-1.13.0_alpha12.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-1.13.0_alpha12.ebuild,v 1.4 2007/03/10 14:30:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild,v 1.5 2007/03/11 01:56:15 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -186,6 +186,7 @@ pkg_postinst() {
                svcdir="${svcdir:-/var/lib/init.d}"
                einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
                cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
+               rm -rf "${ROOT}"lib/rcscripts/init.d/daemons
                umount "${ROOT}${svcdir}" 2>/dev/null
                rm -rf "${ROOT}${svcdir}"
                )
@@ -276,6 +277,7 @@ pkg_postrm() {
                einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
                mkdir -p "${ROOT}${svcdir}"
                cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
+               rm -rf "${ROOT}${svcdir}"/daemons
                umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
                rm -rf "${ROOT}lib/rcscripts/init.d"
                )

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 d4f6ab3b89acc7c812e04ffdc3da75cb9c47ce76..22b86e38be6c9728ade0e00b6cd7358f5dbf4898 100644 (file)
--- 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 78f129ea7cb3b6ad02cb86c3c73a4012 baselayout-1.13.0_alpha12.tar.bz2 132853
+RMD160 67a21f94b015c08494704147a0956765a352277e baselayout-1.13.0_alpha12.tar.bz2 132853
+SHA256 ed3eab409d5390b0ef4f3c48ccdb965b730312fcb4f84731c74d06b8f1031e36 baselayout-1.13.0_alpha12.tar.bz2 132853