From: Roy Marples <uberlord@gentoo.org>
Date: Wed, 11 Apr 2007 13:57:37 +0000 (+0000)
Subject: Fix upgraders from 1.13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e7ff81d9122fcd64456c41d481dde7fe9c21ce7;p=gentoo.git

Fix upgraders from 1.13
Package-Manager: portage-2.1.2.3
---

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 16b3963dec06..0238c74b443e 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -35,10 +35,10 @@ EBUILD baselayout-1.13.0_alpha12.ebuild 9966 RMD160 db7de2961b97237d7b2c2e84c925
 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
-EBUILD baselayout-2.0.0_alpha1.ebuild 9745 RMD160 c67c2e8130d3bc2aa5e7300d4a92d5c806078260 SHA1 a738af7cab0208bafd5f544c0848c3fc63298dcd SHA256 ef8db0c1c46cc612734e49080191ad2258587957bbb0af66499eeba207e15579
-MD5 20708a49b76bc369cb8ca5c6ccd2e4b3 baselayout-2.0.0_alpha1.ebuild 9745
-RMD160 c67c2e8130d3bc2aa5e7300d4a92d5c806078260 baselayout-2.0.0_alpha1.ebuild 9745
-SHA256 ef8db0c1c46cc612734e49080191ad2258587957bbb0af66499eeba207e15579 baselayout-2.0.0_alpha1.ebuild 9745
+EBUILD baselayout-2.0.0_alpha1.ebuild 9885 RMD160 71826b60c5c4e2d935aaa2ae2422434904334ce7 SHA1 bce4405b9f5ceff3d1a0ff0556902287cce74630 SHA256 a34392945db74798fbf33da8218cd93f073d98e86992444f79731c62a67e3a45
+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
 MISC ChangeLog 91663 RMD160 63a503b1e9078ad03a015890bea4b3e1d0f8cdb5 SHA1 d24479249cd45d8f89ed8183a0c3af9c959308c6 SHA256 fd8355b3142c18cf57d0906e1bf8ef2400e225673ca0e1a0dfec5f47cdcf526d
 MD5 999541fe5d62ded99c62155e8a1dad50 ChangeLog 91663
 RMD160 63a503b1e9078ad03a015890bea4b3e1d0f8cdb5 ChangeLog 91663
diff --git a/sys-apps/baselayout/baselayout-2.0.0_alpha1.ebuild b/sys-apps/baselayout/baselayout-2.0.0_alpha1.ebuild
index 845ff1c3101f..222125d6919c 100644
--- a/sys-apps/baselayout/baselayout-2.0.0_alpha1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.0.0_alpha1.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_alpha1.ebuild,v 1.1 2007/04/11 10:54:44 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_alpha1.ebuild,v 1.2 2007/04/11 13:57:37 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -190,6 +190,9 @@ pkg_postinst() {
 			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"
 	fi
 
 	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then