summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-03-11 01:56:15 +0000
committerRoy Marples <uberlord@gentoo.org>2007-03-11 01:56:15 +0000
commit690285fbe401a1c38652524ca25dcec7ed893f36 (patch)
treee8bf9a2e821e40fd298afdad89a25f6217d88366 /sys-apps
parentPunt old versions (diff)
downloadgentoo-2-690285fbe401a1c38652524ca25dcec7ed893f36.tar.gz
gentoo-2-690285fbe401a1c38652524ca25dcec7ed893f36.tar.bz2
gentoo-2-690285fbe401a1c38652524ca25dcec7ed893f36.zip
Don't copy the daemons directory across when upgrading as it just won't work
anymore. (Portage version: 2.1.2.2)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/baselayout/ChangeLog7
-rw-r--r--sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild4
-rw-r--r--sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha126
3 files changed, 12 insertions, 5 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 9de8ed0b598f..efb6e3d4a193 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.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/baselayout-1.13.0_alpha12.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha12.ebuild
index c76b6e195125..ba572f0481b0 100644
--- 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 d4f6ab3b89ac..22b86e38be6c 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 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