Trim old baselayout-1 dirs in /lib/.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

4 files changed, 23 insertions, 11 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 7b2d3b6baba6..09ac91f96018 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.174 2011/11/18 18:25:24 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.175 2011/11/21 03:11:18 vapier Exp $
+
+  21 Nov 2011; Mike Frysinger <vapier@gentoo.org> openrc-0.9.4.ebuild,
+  openrc-9999.ebuild:
+  Trim old baselayout-1 dirs in /lib/.
 
   18 Nov 2011; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
   Add static-libs use flag for bug #378267
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 731cf05b3c5a..161e78b65b42 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX openrc-0.8.3-ccwgroup.patch 1992 RMD160 7a403f5107b17c200b81e4290292e74ec9f222fe SHA1 228f924991c870e7a9ab227c0b9d99e00dbb3d8a SHA256 5a092cc0ab90507c28f8bd6af34b67fbb3d8a9ddce257195dde55128f87324fc
 AUX openrc-0.8.3-deprecation_warning.patch 1055 RMD160 f91a0ca1aba21c9da5e968ae66f709e1751459d1 SHA1 8a07d6106ce4675087224c5cd22d5c9ce01696fb SHA256 fa95aaa34db3556240031fcfb5e33d85e44da2a2f74562faa97c75f569d4efa0
@@ -15,14 +15,14 @@ EBUILD openrc-0.8.3-r1.ebuild 14183 RMD160 8616014525efc3de34ccb4b780c25f37f2909
 EBUILD openrc-0.9.2.ebuild 14179 RMD160 3775f445228811986554186d2865effd79345344 SHA1 d68704ca240ad67086ee56f9bac9764942ba1358 SHA256 f0f69286e5933a32b896ab0946e2af58b0ad1bf6454bda3ae370eef69abfeb31
 EBUILD openrc-0.9.3-r1.ebuild 14192 RMD160 c897085d00542b34e416bd3e38f46c993edd24e8 SHA1 2c3189ecc608bab0f1c2818f29871970123edcaf SHA256 5d5f2a33188743d2739463693f56f47f0f2782652b61b78b3000afe4738f98b6
 EBUILD openrc-0.9.3.ebuild 14179 RMD160 636683e3572c56c0e69020bbad2a704561596928 SHA1 38167d4fa5efebc8ee98cf475771c4efb4c48be5 SHA256 5104c6daa2bff6b474045d28841635ac8055dd78674c246ab6d594a7bcdb5876
-EBUILD openrc-0.9.4.ebuild 14189 RMD160 9dbe1cd364ba859356de54bb42ec808c229431c8 SHA1 0eb3af0a3fd5ef94a257af85629e5f46cb4a4f52 SHA256 37d4e43fa55ecfd7ab6e330bfd52e0a90c38fc11f487c6204ef9ed86faa099ca
-EBUILD openrc-9999.ebuild 14019 RMD160 122d89f97af57134e4ddb541b7c7cea4981cdb3b SHA1 1916598fc5f13ac8c7e2116cdf23cda8820e6bed SHA256 223fb50166e3f5b1906157851a0ca85e0425d63618d72319c68aa25405fc9bb2
-MISC ChangeLog 31789 RMD160 9cfe47319e8f62dd6c68372fea68d21f4d24fada SHA1 da696515b2d7d8489374a277f70d8485e110eb0c SHA256 ae3a8e2ded06e33454cf8c9b89d008e02243d7e5d96623dddd2d40cbaf819c56
+EBUILD openrc-0.9.4.ebuild 14398 RMD160 b4826c48bcd7656f4820a20a4c7c03f10b0116cb SHA1 ab77cfecac65ef8d3fff416b6a100bd0c3010a3f SHA256 458770c70bb493baf31c8a0cb2752522e854ae20a592db4823e0a243e3f536a7
+EBUILD openrc-9999.ebuild 14228 RMD160 d72b7b3cd19f48eef717b88d88427c2ade0ce11e SHA1 daead15011bf125002d9d5e363395587e8f3dd6d SHA256 ebaca7198a4d65999348db3e8ab05086ebe5abac67def6eed81aeefb737a51cb
+MISC ChangeLog 31920 RMD160 92ff03ae3ed59da0e90ea028fc4c1f028b5d57ed SHA1 6320a8cc771bd68cb080e593bb10c9e1bbaee255 SHA256 6e291f3bf1b5736e7b1ba43c98d6fa79dfd205c836e7bd6a22a1d4d545885df6
 MISC metadata.xml 159 RMD160 b92bb52b0f2ee2c0ee08ac8b32f98c3521f9d480 SHA1 aac3cb897981c4918f5f2244d192b5bcc6727d36 SHA256 ca2e1a5ac106397eca5111140a1b07830e4d5dfacbeadba359fe17896c33a6c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7GoigACgkQblQW9DDEZTgU5ACfeoEnhb3ttcx/SG3ngTAszHLB
-X80An1PCh2/x9FVRRqXLoSnmH+qjrWDr
-=OvNi
+iF4EAREIAAYFAk7JwV4ACgkQaC/OocHi7JaJgQEAl/hpb5Lrq8fFoW8UqQVOLaq/
+ex2yRjqSzn/vU2kk1ugA/jDbyq4dQT6khlQmu1dSbtlUE0OX6irz7iHs4QkHe1mY
+=6YY9
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.9.4.ebuild b/sys-apps/openrc/openrc-0.9.4.ebuild
index 1e618ca4e9f4..4275d3ab2b1f 100644
--- a/sys-apps/openrc/openrc-0.9.4.ebuild
+++ b/sys-apps/openrc/openrc-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.9.4.ebuild,v 1.2 2011/11/07 12:57:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.9.4.ebuild,v 1.3 2011/11/21 03:11:18 vapier Exp $
 
 EAPI=4
 
@@ -419,6 +419,10 @@ pkg_postinst() {
 	# update the dependency tree after touching all files #224171
 	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
 
+	# baselayout leaves behind a lot of .keep files, so let's clean them up
+	find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} +
+	find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
+
 	elog "You should now update all files in /etc, using etc-update"
 	elog "or equivalent before restarting any services or this host."
 	elog
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index e5cf5e4e91f0..ca97c8b5ff39 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.90 2011/11/18 18:25:24 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.91 2011/11/21 03:11:18 vapier Exp $
 
 EAPI=4
 
@@ -415,6 +415,10 @@ pkg_postinst() {
 	# update the dependency tree after touching all files #224171
 	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
 
+	# baselayout leaves behind a lot of .keep files, so let's clean them up
+	find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} +
+	find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
+
 	elog "You should now update all files in /etc, using etc-update"
 	elog "or equivalent before restarting any services or this host."
 	elog