remove old clock init script forcibly during the upgrade since it appears to cause problems. bug #252380

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64

4 files changed, 21 insertions, 9 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 14d107f4c5f4..dc136516722a 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.53 2008/12/29 22:57:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.54 2008/12/30 17:24:46 cardoe Exp $
+
+  30 Dec 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.4.1-r1.ebuild,
+  openrc-9999.ebuild:
+  remove old clock init script forcibly during the upgrade since it appears
+  to cause problems. bug #252380
 
 *openrc-0.4.1-r1 (29 Dec 2008)
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 7ef24b1e9b3a..467138a25201 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -9,14 +9,15 @@ AUX 9999/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269d
 AUX 9999/0002-useful-functions.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475
 AUX 9999/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539
 DIST openrc-0.4.1.tar.bz2 144429 RMD160 86510cb298eaa8f5f8cef4569e4df903650935de SHA1 1e56096b02a91ae7f455765f3334dfa8cc887f97 SHA256 0b6de456b1f5398089f8d4f805dcee427dced4d6245dfe1427b1994c2d2fa16b
-EBUILD openrc-0.4.1-r1.ebuild 10173 RMD160 257de99294729786810a209998545bb1303c8ba0 SHA1 b30976a406bb35147e10ce8768d6ce5b8d9d0dd6 SHA256 ccf5c36b76eabb70bff6c1bbd2727172021b788895fe54ab97e148aed60211ae
-EBUILD openrc-9999.ebuild 9937 RMD160 177a1210df9c10de3336c0da2d354b8a85b520d1 SHA1 7b5e417804bd164e914563c31c75b2dda0996221 SHA256 3b00f23035e19d2d191507e0828947b0d15e33f7af1337505201973276929603
-MISC ChangeLog 10905 RMD160 306cf5161f9a366fba42b615c41d9c8e64b26f02 SHA1 59e8085bd5edbba1cd90d19df11d52a702fddabe SHA256 a5809a665e6b1f0c3e4d2a2a97173fa84d8edc2f06df53e785574f601e9e4dc5
+EBUILD openrc-0.4.1-r1.ebuild 10257 RMD160 801ea2bb434f1b9b2f155b7962c413169ec9efde SHA1 d368a844d24038f8490c3b571b018a8b0a41e7e6 SHA256 2197560ef863071d2f2b93d05c19526a7c1e87702e3f016ca550c55399fd3306
+EBUILD openrc-9999.ebuild 10023 RMD160 4db74dfd68136df02a60415e2162d56e32a388e3 SHA1 cf669be20a68e84377e38bce0cf2c045d059b5ec SHA256 d3d810a28088b6d3bc64add6ab68b9f8646a055670b6a474e42f301448af3371
+MISC ChangeLog 11111 RMD160 d728f4023ce08058e8cac38ba0844d20f35b29be SHA1 826d7d1b87b9859484c156a12f3466124aabf46a SHA256 8c35f96a9298bdd7a5087b60347cc1c93acf1df259d56997e3df4539c72494fc
 MISC metadata.xml 231 RMD160 c39b780fbbb9eb38f1ba1a0ee134231ca8e7449c SHA1 d5a4c0d0c7641c862b43e742f832bab6c69482d8 SHA256 02e8fa3806efbc7cea8bc78653397b8d59b398faca8bcfd3aabb216103cd8f4f
+MISC openrc-9999.ebuild.orig 9937 RMD160 177a1210df9c10de3336c0da2d354b8a85b520d1 SHA1 7b5e417804bd164e914563c31c75b2dda0996221 SHA256 3b00f23035e19d2d191507e0828947b0d15e33f7af1337505201973276929603
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklZVfoACgkQoeSe8B0zEfwVuwCcCnVgMaIZdR90RhSViir+EYM2
-ts8An3k1cwNbHQAz2hUuVNXEFzODQGsR
-=FZL9
+iEYEARECAAYFAklaWX4ACgkQoeSe8B0zEfwlWwCeM+9ya2yfDTf7539Kdgg55n4k
+0mQAnizCDLHBD1W8DXQYfLptLeRfzU+m
+=xVzz
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.4.1-r1.ebuild b/sys-apps/openrc/openrc-0.4.1-r1.ebuild
index dfbb10b863a8..9a8f2097c2ad 100644
--- a/sys-apps/openrc/openrc-0.4.1-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.1-r1.ebuild,v 1.1 2008/12/29 22:57:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.1-r1.ebuild,v 1.2 2008/12/30 17:24:46 cardoe Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -142,6 +142,9 @@ pkg_preinst() {
 	if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then
 		mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock}
 	fi
+	if [[ -e ${ROOT}/etc/init.d/clock ]] ; then
+		rm -f "${ROOT}"/etc/init.d/clock
+	fi
 	if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then
 		rm -f "${ROOT}"/etc/runlevels/boot/clock
 		ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock}
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 6533b932242b..c2a32bdaa41b 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.41 2008/12/19 22:19:24 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.42 2008/12/30 17:24:46 cardoe Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -141,6 +141,9 @@ pkg_preinst() {
 	if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then
 		mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock}
 	fi
+	if [[ -e ${ROOT}/etc/init.d/clock ]] ; then
+		rm -f "${ROOT}"/etc/init.d/clock
+	fi
 	if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then
 		rm -f "${ROOT}"/etc/runlevels/boot/clock
 		ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock}