Fix upgrade/downgrade paths.

Package-Manager: portage-2.1.3.15

3 files changed, 18 insertions, 18 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 92b120a7b802..18688650bc43 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
 # 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.439 2007/10/11 15:56:40 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.440 2007/10/22 20:45:13 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  22 Oct 2007; Roy Marples <uberlord@gentoo.org>
+  baselayout-2.0.0_rc5.ebuild:
+  Fix upgrade/downgrade paths.
+
 *baselayout-2.0.0_rc5 (11 Oct 2007)
 
   11 Oct 2007; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index e216f84c72ab..bc9ca9655fd1 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -59,14 +59,14 @@ EBUILD baselayout-2.0.0_rc4.ebuild 9435 RMD160 615f34d09138fcbb1394362615f5ecaf2
 MD5 5a89b33004dd70747f51e4e621a2b801 baselayout-2.0.0_rc4.ebuild 9435
 RMD160 615f34d09138fcbb1394362615f5ecaf2fc63f04 baselayout-2.0.0_rc4.ebuild 9435
 SHA256 520234906a502a1364c819eb9e48b141e92a11ce1a0e9b745aff8a6ab41c688d baselayout-2.0.0_rc4.ebuild 9435
-EBUILD baselayout-2.0.0_rc5.ebuild 10650 RMD160 6a8fad002d245d1a83a938f590a60d0d9eade249 SHA1 830103bbf19865b6b7128689b919d501db8e9d10 SHA256 be1efef6b9a89cafc0a6d23baf55013185b1e8edeb7854c8d0bb4d370f67dde2
-MD5 fe1c99b3ede6d0d0fe4e3fa683cf10e4 baselayout-2.0.0_rc5.ebuild 10650
-RMD160 6a8fad002d245d1a83a938f590a60d0d9eade249 baselayout-2.0.0_rc5.ebuild 10650
-SHA256 be1efef6b9a89cafc0a6d23baf55013185b1e8edeb7854c8d0bb4d370f67dde2 baselayout-2.0.0_rc5.ebuild 10650
-MISC ChangeLog 97017 RMD160 c35c8ff013a20792a0efb9ce6973b2c7bf02fba8 SHA1 1e6a24a554ff9c782802a0f4976479bd6593b397 SHA256 45ff9d85e170c315579ee629b9bc59acd86bcd46ea453fedba3f6134264cddcc
-MD5 92fe2d8aef1aa6617272366f925a4b4a ChangeLog 97017
-RMD160 c35c8ff013a20792a0efb9ce6973b2c7bf02fba8 ChangeLog 97017
-SHA256 45ff9d85e170c315579ee629b9bc59acd86bcd46ea453fedba3f6134264cddcc ChangeLog 97017
+EBUILD baselayout-2.0.0_rc5.ebuild 10447 RMD160 92eaa43c0c179d9b96e4840f5c53d92c60f0a544 SHA1 7aa72f61aa68f17382808dd2ec8ef809fd5b79e8 SHA256 aeb96a3fdce563550f4140c3f4cdf7acf0153a790b496663b1b04e1f5c951b0c
+MD5 0290945c24e098881588318c45489e80 baselayout-2.0.0_rc5.ebuild 10447
+RMD160 92eaa43c0c179d9b96e4840f5c53d92c60f0a544 baselayout-2.0.0_rc5.ebuild 10447
+SHA256 aeb96a3fdce563550f4140c3f4cdf7acf0153a790b496663b1b04e1f5c951b0c baselayout-2.0.0_rc5.ebuild 10447
+MISC ChangeLog 97129 RMD160 a6563387b572bce039790ff42080718f3eaf6189 SHA1 82a2e035a382a1647e3a1c2a7bbbeb66cc0a8378 SHA256 6e1631d48dfa7ee5fdedc96b4af4fe54c4ba3052caa647e355db0022882f28d9
+MD5 6b4caa883a11a2f68648570ef05ed198 ChangeLog 97129
+RMD160 a6563387b572bce039790ff42080718f3eaf6189 ChangeLog 97129
+SHA256 6e1631d48dfa7ee5fdedc96b4af4fe54c4ba3052caa647e355db0022882f28d9 ChangeLog 97129
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild
index 0f96b80d89d4..42fe86e14b12 100644
--- a/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild
+++ b/sys-apps/baselayout/baselayout-2.0.0_rc5.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_rc5.ebuild,v 1.2 2007/10/12 06:46:05 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild,v 1.3 2007/10/22 20:45:13 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -172,16 +172,12 @@ pkg_postinst() {
 		. "${ROOT}etc/conf.d/rc"
 		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 \
-			"${ROOT}"lib/rcscripts/init.d/console
+		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rc/init.d
+		rm -rf "${ROOT}"lib/rc/init.d/daemons \
+			"${ROOT}"lib/rc/init.d/console
 		umount "${ROOT}${svcdir}" 2>/dev/null
 		rm -rf "${ROOT}${svcdir}"
 		)
-	elif has_version "<sys-apps/${PN}-2.0.0_alpha4" ; then
-		# The format has changed since 1.13
-		rm -rf "${ROOT}"lib/rcscripts/init.d/daemons \
-			"${ROOT}"lib/rcscripts/init.d/console
 	elif has_version "<sys-apps/${PN}-2.0.0_rc5" ; then
 		if [ -d "${ROOT}"lib/rcscripts/init.d ] ; then
 			einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}lib/rc/init.d"
@@ -292,7 +288,7 @@ pkg_postrm() {
 		)
 	elif has_version "<sys-apps/${PN}-2.0.0_rc5" ; then
 		einfo "Moving state from ${ROOT}lib/rc/init.d to ${ROOT}lib/rcscripts/init.d"
-		mkdir -p "${ROOT}"lib/scripts/init.d
+		mkdir -p "${ROOT}"lib/rcscripts/init.d
 		cp -RPp "${ROOT}"lib/rc/init.d/* "${ROOT}"lib/rcscripts/init.d
 		umount "${ROOT}"lib/rc/init.d 2>/dev/null
 		rm -rf "${ROOT}"lib/rc/init.d