python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.

Package-Manager: portage-2.1.5.2

4 files changed, 22 insertions, 19 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index df10bbd141c8..38ce9c58f7eb 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.69 2008/05/26 15:03:39 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.70 2008/05/29 17:58:30 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org>
+  policycoreutils-1.34.15.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
 
   26 May 2008; Chris PeBenito <pebenito@gentoo.org>
   policycoreutils-1.34.15.ebuild:
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 59e091b1b744..e8f4be9fc393 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 DIST policycoreutils-1.34.15.tgz 317142 RMD160 5ba97a754773a31740521d00fd84779c47f6f29a SHA1 dcedba4cd50c57ad3ff321a3ac91282026a2e967 SHA256 bdeda76caeb7ea2b8950b47991c85c9429d092e19f8be06d62366780548a3606
 DIST policycoreutils-extra-1.18.tar.bz2 17109 RMD160 150a443b3942808ab3ef2a1fec8da789776861f5 SHA1 71174bb943b0c0dcdde2781ad8cf45b5e574d9d0 SHA256 0835baaef5ad93e130cf399048752f0821a545cf33ce53760ae46d43c043e8eb
-EBUILD policycoreutils-1.34.15.ebuild 2556 RMD160 0e802c7f1c845ffb84b9727f2ad1b634e9934ca1 SHA1 190de86cf0f58afb8d00c561140a344ea9fbb072 SHA256 a6bb70cbb7f114fd463094b1fd4f97268c93057302eb1db54374ecb108948281
-MISC ChangeLog 10861 RMD160 4636cbcc64afcb4162409c413122c04c03cd2811 SHA1 35b0ea19937be2f343fdd68e56b0eac2ab98d9a4 SHA256 d29432a628520968d7bbab3aaef417a456799e3def9561b1039847814b436a8a
+EBUILD policycoreutils-1.34.15.ebuild 2504 RMD160 677f8f6ff4a7c87ba95eff2f1454c8e42fc8614f SHA1 6a1f1e6e461fcff0a13d8e1b6f86c8946149f91f SHA256 ca32f22b03f0b8352f3a0cb44c94c9a44973cddb0b6677c0dc0756bec13b70b4
+MISC ChangeLog 11006 RMD160 fbe8b14cefcfdbd5cc1898cda97d3de42e596e20 SHA1 6624a7ed989c625e49b339cc69470a7144fc1b97 SHA256 fba4c6271853c5f23033b9bd8bd0344f99d747c8d9a07a961036b7bd20358cbb
 MISC metadata.xml 836 RMD160 421e492e89112f8436f8c5535aa2340cc8795929 SHA1 91c830f5358b9786f2b61e1967214f49212c4e3a SHA256 1d14250f52ecf63b67bed2289833d6f1ff2eba3cad9a80794b356e747917cdb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg60VEACgkQ1wYvhvBeaEbuDQCg5JHxvOt2qVA4BKcOqdqSzoYs
-UugAoKCEzVt1wJITBpA72cPfSYXl4anN
-=sqsR
+iEYEARECAAYFAkg+7skACgkQQU4yORhF8iCOIACfcYI9iVyuzeW+qrl4wlEguoNy
+fgsAoMWdSyvJIGIc8yxH9zNIUdabhSUt
+=M1Fl
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild b/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild
index 219b731de537..40e45c3057ee 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild,v 1.3 2008/05/26 15:03:39 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild,v 1.4 2008/05/29 17:58:30 hawking Exp $
 
 IUSE="nls"
 
-inherit eutils python
+inherit eutils python multilib
 
 EXTRAS_VER="1.18"
 SEMNG_VER="1.10.9"
@@ -94,10 +94,9 @@ src_install() {
 
 pkg_postinst() {
 	python_version
-	python_mod_optimize "${ROOT}usr/lib/python${PYVER}/site-packages"
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
 }
 
 pkg_postrm() {
-	python_version
-	python_mod_cleanup "${ROOT}usr/lib/python${PYVER}/site-packages"
+	python_mod_cleanup
 }
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 91e0946b2ecf..7d92cd901585 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -23,16 +23,16 @@ EBUILD portage-2.0.51.22-r3.ebuild 5693 RMD160 85e119fa96f372b25ae327c8e49fb3f7d
 EBUILD portage-2.1.1-r2.ebuild 7170 RMD160 9a9ea70cce0cc5c21ccf67faee9c9d75065d6f57 SHA1 33ca63714b9e013a4d6a2cf1e52fb9b62f1cc6bf SHA256 3c3c6eb2c2fabeb84f58ebd71b39148899d529b4fc0a95ba5cb31d9dbf239f44
 EBUILD portage-2.1.4.4.ebuild 8116 RMD160 ac80146c73a0024c6634e4f0e0e29171e4c23a74 SHA1 0b3a9d88a7cdeed816cd35198d7e0240f5a8929f SHA256 3d9683bdcfb75c83d0f028d3a9f4f3e4ad7fc65b26dab56859c6143795bc8ce3
 EBUILD portage-2.1.5.2.ebuild 8164 RMD160 bcc614b83ac4b0801149a1100bbeb19a071682c6 SHA1 dffd0ad6169894d058bc0d4c9c576613497e838f SHA256 f1bc52bf582b4f96e1e7918027ba74838db9e83a75d68c2e2eeed1d0245d7c2e
-EBUILD portage-2.2_pre3.ebuild 7506 RMD160 4892f48df138d7ad4f599527d4f9bf0e8abc19d1 SHA1 f12a0012a67e3da0f980f92042272b6a56b5d023 SHA256 4fd8f24692fd5d716eb8693791aa1efd8d72a0be6e48616e90476555bddb9752
-EBUILD portage-2.2_pre5.ebuild 7506 RMD160 a5b223038e3db886c4f63fbe133f187305a22530 SHA1 d1edde63f9970ba4325ed0c7f86bf38cc7082072 SHA256 c6978213ee018cf5efbe99226ecea73d8aa9623fe8366d52bc16a27a723cc271
-EBUILD portage-2.2_pre6.ebuild 8155 RMD160 fa9b0323663f65239c7b6ad4342ff0046450798e SHA1 4cd538f36aaf0f544f8d7c4fb33643f4714270c1 SHA256 ea41a10e9938d547f2fd8a26a020e64c00a4666df38439fafa134bbc146d742f
-EBUILD portage-2.2_pre7.ebuild 7962 RMD160 b2b6157a6572fc1c0e4ec6f7a4e1ec2c37b83365 SHA1 da4ad8771d09eaba597f9d4951dd2e4883a2d9f3 SHA256 9e9af3ecd191de4b4576d19870fafce1f757f1ef3be9e651adccddb67c1ab257
-MISC ChangeLog 7696 RMD160 cd72722be74242e143d950365a6d234e58bfc52b SHA1 335ef6a5617472ecea57f5a8ac191cbfd970600d SHA256 eded9358d9ce6d7d8e724bd3767c62f456b1b0d5a6f8abeda0909080bfe860aa
+EBUILD portage-2.2_pre3.ebuild 7491 RMD160 bd097774df3370e64b5b5e2d23e1294a4b07cd0a SHA1 eeaa78440e2696df964b850715f9a37589218514 SHA256 50689ab89fc69b25959fb957422f6ae3ead83b344250bb999a5949ba43a3e3dc
+EBUILD portage-2.2_pre5.ebuild 7491 RMD160 5c03122f260d5e71b912568a6dcd38f3b4c12222 SHA1 4f0040a9e1d569d20dec21b2feac2e5e4fdb9e1b SHA256 93025f91854f01dd9f53200900775b206c9ab23bf088cee8819e925cddc5a720
+EBUILD portage-2.2_pre6.ebuild 8140 RMD160 55d18a4ff98551758f37276d80978e8a8b5950f6 SHA1 ad286a54420ccf9a94b37c918bffd67ef29ce40b SHA256 27b49a9852a1c953cb3f06d3dbe8179fbc83d1b06891d6ca5c0907b0276451c6
+EBUILD portage-2.2_pre7.ebuild 7946 RMD160 58991e9ea9b0ebbb41bc421553ee8a14387e0050 SHA1 faff7a6e8adca3eecabd09ba831fa51236ceebec SHA256 7d6115afbfb541039e11121ca467ff79ea371d3da73e381f9660f841789d4f81
+MISC ChangeLog 7895 RMD160 c68d3705028ce09d8ba79c33c3da9caabf6ddfbf SHA1 d6e8f23a84befe227ff695020d6f46f102c26509 SHA256 09bcd45c69654cb2b221d79b908e92185971b4283df6fb4f241e04501eb7d353
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg2jw8ACgkQ/ejvha5XGaP5sgCgtCb+I6rSbtO9eTqdDw/w5D1s
-SzMAnAmZQ4cbetTZvSH0X+J7ZJAPnllm
-=VdRk
+iEYEARECAAYFAkg+75IACgkQQU4yORhF8iBQ7QCfWWKfZx7YcpAE7uo9o4p7evJg
+/6kAoIhKyONUaAJ+asctusyR5vXx7CNA
+=L3BY
 -----END PGP SIGNATURE-----