summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-10-23 10:08:17 +0000
committerRoy Marples <uberlord@gentoo.org>2007-10-23 10:08:17 +0000
commit9385ab60c66e97f44238d8f9f7f269474d289751 (patch)
treed0facbcbc4eeb47a8b1f83bea864658b1928565c /sys-apps/baselayout
parentalpha/ia64 stable (diff)
downloadhistorical-9385ab60c66e97f44238d8f9f7f269474d289751.tar.gz
historical-9385ab60c66e97f44238d8f9f7f269474d289751.tar.bz2
historical-9385ab60c66e97f44238d8f9f7f269474d289751.zip
Fix upgrade downgrade cycle
Package-Manager: portage-2.1.3.15
Diffstat (limited to 'sys-apps/baselayout')
-rw-r--r--sys-apps/baselayout/Manifest8
-rw-r--r--sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild15
2 files changed, 12 insertions, 11 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index bc9ca9655fd1..5d23616364f3 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -59,10 +59,10 @@ 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 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
+EBUILD baselayout-2.0.0_rc5.ebuild 10472 RMD160 fab13ff6c4f678110d322c8999c98dc9bd930389 SHA1 82dc4eacf0e020380f4d9fdc818d1ffc2f42372f SHA256 1846205cbf094b7a4e4b85dc537c737a26938006eec5db35b9bf00a8d07733d6
+MD5 67c8c0e173a4cf65348a381577833f68 baselayout-2.0.0_rc5.ebuild 10472
+RMD160 fab13ff6c4f678110d322c8999c98dc9bd930389 baselayout-2.0.0_rc5.ebuild 10472
+SHA256 1846205cbf094b7a4e4b85dc537c737a26938006eec5db35b9bf00a8d07733d6 baselayout-2.0.0_rc5.ebuild 10472
MISC ChangeLog 97129 RMD160 a6563387b572bce039790ff42080718f3eaf6189 SHA1 82a2e035a382a1647e3a1c2a7bbbeb66cc0a8378 SHA256 6e1631d48dfa7ee5fdedc96b4af4fe54c4ba3052caa647e355db0022882f28d9
MD5 6b4caa883a11a2f68648570ef05ed198 ChangeLog 97129
RMD160 a6563387b572bce039790ff42080718f3eaf6189 ChangeLog 97129
diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild
index 42fe86e14b12..6e7f0677c7ce 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.3 2007/10/22 20:45:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc5.ebuild,v 1.4 2007/10/23 10:08:17 uberlord Exp $
inherit flag-o-matic eutils toolchain-funcs multilib
@@ -171,7 +171,7 @@ 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"
+ einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rc/init.d"
cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rc/init.d
rm -rf "${ROOT}"lib/rc/init.d/daemons \
"${ROOT}"lib/rc/init.d/console
@@ -279,12 +279,13 @@ pkg_postrm() {
(
. "${ROOT}etc/conf.d/rc"
svcdir="${svcdir:-/var/lib/init.d}"
- einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
+ einfo "Moving state from ${ROOT}lib/rc/init.d to ${ROOT}${svcdir}"
mkdir -p "${ROOT}${svcdir}"
- cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
+ cp -RPp "${ROOT}lib/rc/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"
+ umount "${ROOT}lib/rc/init.d" 2>/dev/null
+ rm -rf "${ROOT}lib/rc/init.d" "${ROOT}lib/rc/console"
+ rmdir "${ROOT}lib/rc" 2>/dev/null
)
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"
@@ -292,7 +293,7 @@ pkg_postrm() {
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
- [ -d "${ROPT}"/lib/rc/console ] && \
+ [ -d "${ROOT}"/lib/rc/console ] && \
mv "${ROOT}"lib/rc/console "${ROOT}"lib/rcscripts
rmdir "${ROOT}"lib/rc 2>/dev/null
fi