Trim old baselayout-1 dirs in /lib/.

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

4 files changed, 20 insertions, 13 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 57bd8d62b0de..38b37eabedf9 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.515 2011/10/11 21:06:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.516 2011/11/21 22:36:06 vapier Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  21 Nov 2011; Mike Frysinger <vapier@gentoo.org> baselayout-2.1.ebuild:
+  Trim old baselayout-1 dirs in /lib/.
+
   11 Oct 2011; Mike Frysinger <vapier@gentoo.org> baselayout-2.1.ebuild:
   Make sure we apply the lib32 de-hack to only the arches where said hack was
   put into place #386821 by Jim Faulkner.
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 7038853269cb..5edd404f6a43 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST baselayout-2.0.3.tar.bz2 39969 RMD160 ca4ae235382780cd386c89f0147fbe17bb599414 SHA1 c5dbcc2d131254b2bb14b782101e2318d1dfcd2d SHA256 879308781d845f467eb2b45b9ff006aa799e943f45ddba518f43acae1ec84bdd
 DIST baselayout-2.1.tar.bz2 40398 RMD160 bba874c5d3290848236703125c130107c1244f55 SHA1 84783a773ec050700b3b0ce4c7645ae878f7f7fb SHA256 2ac6f2156513a2820a0eeeecc2cf7e7c0b5e0c750b324f1e21912d5f3cda4956
 EBUILD baselayout-2.0.3.ebuild 7366 RMD160 579ac15844268e72cd9e1f593501e9a5806f4043 SHA1 3dcb7064e613d063fbe2428f7e3f57d92a2d9219 SHA256 e72e760fbc2452212fee89e5f4c00437b11d7973b5c27933c58481e9a656f5a4
-EBUILD baselayout-2.1.ebuild 7636 RMD160 585df9b4cec0f80c055fdb9ef9c9ee2fd98aa766 SHA1 9caec4caefc2cef827b82e44cec89461cfa760c9 SHA256 2bfa82915b55808d0cdadbbdd8bd89cf8b48863cf68c08827f8bad3d756c20eb
-MISC ChangeLog 107961 RMD160 e9b9fb830b36388b0dd48eeb88fb181a19563e88 SHA1 8e2bea7cf34c70e7d60179a1fd46fbf753c8189c SHA256 6e4b5f87906a7cfad3c74892129862f16ef02f5227c80c2baf4790c44072abaf
+EBUILD baselayout-2.1.ebuild 7847 RMD160 5e0d52359ffa1f1dcf213ca88a6b915b6e317649 SHA1 80ef4952ed3b729af0053aa3e3a8289979d59d70 SHA256 22d9f4a282bdaaf5eb71b56168625e5fd50ce3e9b08ef1fca65ceb1ba8c18bbc
+MISC ChangeLog 108074 RMD160 1f24755459b4536737b8f45a6a86e9ac93210e7a SHA1 778c773ca5bf5e28ac775bdb93394efb86f9c43b SHA256 d3e8c7511d492faa1d9dd8a3833f2056caf223be5876b0c63423e9d0199a7784
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6Ur/gACgkQaC/OocHi7JaqpAD/VZAE3SH+Z7VK/JCfvMWPdyyg
-3zF0DPx+e4/B1I+nEMcA/27PMEUO7/Kv5jnHPIWy0zgxVEl4qVFAZ3VVnw+JMs1Q
-=cLXc
+iF4EAREIAAYFAk7K0l0ACgkQaC/OocHi7JYkXwD+JGrgOa4hDnb+Y7ThQexfqqKM
+EBV557ew2Cjopjm2wHgBAIgf9OhpbagsTKEHcp7Z/vR1gqJL8mqwMLuOA/KVvn4f
+=nMxq
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-2.1.ebuild b/sys-apps/baselayout/baselayout-2.1.ebuild
index bf1c865a7785..a81c341353e1 100644
--- a/sys-apps/baselayout/baselayout-2.1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.1.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/baselayout/baselayout-2.1.ebuild,v 1.4 2011/10/11 21:06:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.5 2011/11/21 22:36:06 vapier Exp $
 
 inherit eutils multilib
 
@@ -208,6 +208,10 @@ pkg_postinst() {
 		fi
 	fi
 
+	# 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
+
 	# whine about users with invalid shells #215698
 	if [[ -e ${ROOT}/etc/passwd ]] ; then
 		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' /etc/passwd | sort)
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 161e78b65b42..ca7124244b93 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -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 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
+EBUILD openrc-0.9.4.ebuild 14187 RMD160 6aa94d3f385ecafbb37c9ffa741b1b49c24e2e9e SHA1 6292796a979632cb4357e12ce6e5b75c1dcc3750 SHA256 a6e1310ea2a2756120754a2047d363a8b086fbffa17be8f73a1180ac49c6e908
+EBUILD openrc-9999.ebuild 14017 RMD160 2e8cd739f1f7b9c6541f0b318bf45a738fdfc94d SHA1 7c923e91808ee67b5dada3d6f0c76058943601c7 SHA256 6b7dc4c5fb22bbb110e0aba7e142f8d44cc73a4f2fc13f23be0c5a57ed989a30
+MISC ChangeLog 32090 RMD160 5f2762a0ef3c3665bceca869560a9ef58c63e956 SHA1 898cb61ac51a11f1c72ae4ff6a67862d6db74fa3 SHA256 d01ff1ff0c01cff3e131c81532acc84a7ba18344d621b924a4ca188b923e7494
 MISC metadata.xml 159 RMD160 b92bb52b0f2ee2c0ee08ac8b32f98c3521f9d480 SHA1 aac3cb897981c4918f5f2244d192b5bcc6727d36 SHA256 ca2e1a5ac106397eca5111140a1b07830e4d5dfacbeadba359fe17896c33a6c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7JwV4ACgkQaC/OocHi7JaJgQEAl/hpb5Lrq8fFoW8UqQVOLaq/
-ex2yRjqSzn/vU2kk1ugA/jDbyq4dQT6khlQmu1dSbtlUE0OX6irz7iHs4QkHe1mY
-=6YY9
+iF4EAREIAAYFAk7K0qkACgkQaC/OocHi7JaIeAD7BcPf5apXASnzgD6ItoGQssFp
+u3bHQYqPf/CPAmFTnXEA/1c6iPVCjpwJzp8Zf7xEw7jd6UGRQafJjKr5IyfyWLQy
+=GU6k
 -----END PGP SIGNATURE-----