python_mod_{cleanup,optimize} are ROOT aware.

Package-Manager: portage-2.1.5.2

6 files changed, 30 insertions, 16 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 8a7fdd4f366c..82db225e0baf 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.520 2008/05/23 09:31:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.521 2008/05/29 18:01:52 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> portage-2.2_pre3.ebuild,
+  portage-2.2_pre5.ebuild, portage-2.2_pre6.ebuild, portage-2.2_pre7.ebuild:
+  python_mod_{cleanup,optimize} are ROOT aware.
 
   23 May 2008; Zac Medico <zmedico@gentoo.org> portage-2.2_pre7.ebuild:
   Stop building and installing tbz2tool for Bug #220701.
diff --git a/sys-apps/portage/portage-2.2_pre3.ebuild b/sys-apps/portage/portage-2.2_pre3.ebuild
index 6928783b37fa..3628602d70c2 100644
--- a/sys-apps/portage/portage-2.2_pre3.ebuild
+++ b/sys-apps/portage/portage-2.2_pre3.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/portage/portage-2.2_pre3.ebuild,v 1.1 2008/02/28 13:22:29 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_pre3.ebuild,v 1.2 2008/05/29 18:01:52 hawking Exp $
 
 inherit toolchain-funcs eutils flag-o-matic multilib python
 
@@ -223,7 +223,7 @@ pkg_postinst() {
 
 	# Compile all source files recursively. Any orphans
 	# will be identified and removed in postrm.
-	python_mod_optimize "${ROOT}usr/$(get_libdir)/portage/pym"
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
 
 	elog
 	elog "For help with using portage please consult the Gentoo Handbook"
@@ -246,5 +246,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup "${ROOT}usr/$(get_libdir)/portage/pym"
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
 }
diff --git a/sys-apps/portage/portage-2.2_pre5.ebuild b/sys-apps/portage/portage-2.2_pre5.ebuild
index eddd83a4ce85..6bf876b9730b 100644
--- a/sys-apps/portage/portage-2.2_pre5.ebuild
+++ b/sys-apps/portage/portage-2.2_pre5.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/portage/portage-2.2_pre5.ebuild,v 1.1 2008/03/19 22:07:53 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_pre5.ebuild,v 1.2 2008/05/29 18:01:52 hawking Exp $
 
 inherit toolchain-funcs eutils flag-o-matic multilib python
 
@@ -223,7 +223,7 @@ pkg_postinst() {
 
 	# Compile all source files recursively. Any orphans
 	# will be identified and removed in postrm.
-	python_mod_optimize "${ROOT}usr/$(get_libdir)/portage/pym"
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
 
 	elog
 	elog "For help with using portage please consult the Gentoo Handbook"
@@ -246,5 +246,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup "${ROOT}usr/$(get_libdir)/portage/pym"
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
 }
diff --git a/sys-apps/portage/portage-2.2_pre6.ebuild b/sys-apps/portage/portage-2.2_pre6.ebuild
index 3764e5be9ec0..7fff136beeb6 100644
--- a/sys-apps/portage/portage-2.2_pre6.ebuild
+++ b/sys-apps/portage/portage-2.2_pre6.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/portage/portage-2.2_pre6.ebuild,v 1.1 2008/05/05 11:27:41 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_pre6.ebuild,v 1.2 2008/05/29 18:01:52 hawking Exp $
 
 inherit toolchain-funcs eutils flag-o-matic multilib python
 
@@ -226,7 +226,7 @@ pkg_preinst() {
 pkg_postinst() {
 	# Compile all source files recursively. Any orphans
 	# will be identified and removed in postrm.
-	python_mod_optimize "${ROOT}usr/$(get_libdir)/portage/pym"
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
 
 	if [ -n "${MIGRATION_UPGRADE}" ]; then
 		einfo "moving set references from the worldfile into world_sets"
@@ -269,5 +269,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup "${ROOT}usr/$(get_libdir)/portage/pym"
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
 }
diff --git a/sys-apps/portage/portage-2.2_pre7.ebuild b/sys-apps/portage/portage-2.2_pre7.ebuild
index 29bbca7bb02d..837282fc705d 100644
--- a/sys-apps/portage/portage-2.2_pre7.ebuild
+++ b/sys-apps/portage/portage-2.2_pre7.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/portage/portage-2.2_pre7.ebuild,v 1.2 2008/05/23 09:31:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_pre7.ebuild,v 1.3 2008/05/29 18:01:52 hawking Exp $
 
 inherit eutils multilib python
 
@@ -220,7 +220,7 @@ pkg_preinst() {
 pkg_postinst() {
 	# Compile all source files recursively. Any orphans
 	# will be identified and removed in postrm.
-	python_mod_optimize "${ROOT}usr/$(get_libdir)/portage/pym"
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
 
 	if [ -n "${MIGRATION_UPGRADE}" ]; then
 		einfo "moving set references from the worldfile into world_sets"
@@ -263,5 +263,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup "${ROOT}usr/$(get_libdir)/portage/pym"
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
 }
diff --git a/sys-apps/yum/Manifest b/sys-apps/yum/Manifest
index e834e1d2283f..59c8156649a4 100644
--- a/sys-apps/yum/Manifest
+++ b/sys-apps/yum/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST yum-2.6.1.tar.gz 236353 RMD160 c6f491e94dfae4019e6a934bdbcce79546bf86ba SHA1 ded1e65c368ff327abc867889656f7aabb1ed6c5 SHA256 c1385090977b3fa3a4db7bd7e277af0846ef1aa3d9511147c0de11f3a681874e
 DIST yum-3.2.8.tar.gz 609017 RMD160 a209ad2680abc0962d112063b6152359797bcafa SHA1 e98fbb4f9823e619ce1d7132e311cb6f9b148e07 SHA256 7b3614038e1ce385664d39a143fdd86af72e1fb7d121f19e8bd1c6f03cd4bc45
-EBUILD yum-2.6.1.ebuild 1855 RMD160 d1d3e0c7ff99d83d430a17713245601a8486e1ea SHA1 3bc3c8fee7754bce722611f14ac6977258ee6335 SHA256 fa9cec01f6e962e035658d25909bf8eaee52481ddfc166ebbc86e665857edc2c
-EBUILD yum-3.2.8.ebuild 1414 RMD160 db7ceafd8254eac6a881d2566c87d165458b44f3 SHA1 e42da5b1636e88043827c334c6a7f7f7f947169f SHA256 2ad3ba91d42eaeb36c1adc3e7cacabd26d7b6e26b0c1b9fd4db5e030db6893c1
-MISC ChangeLog 824 RMD160 0aab353a807469beeac42c1f7cad9d243e32a891 SHA1 99a0f0cd824e759bbf0d8bcbb568a0da2952118f SHA256 7b2591108a4e2bdd85baeee66d1939bf02cf0a8f52c2a4becb299ee13e03bdf4
+EBUILD yum-2.6.1.ebuild 1817 RMD160 401919188a238f1f00a711feac3c4fd7cba2fcf0 SHA1 876502f43578813976a2a071c82ca218376daa58 SHA256 31509e7093b6f91da4ab52b7b74107684362961a1e3e78c095f16243e7e7eea8
+EBUILD yum-3.2.8.ebuild 1405 RMD160 35f3455431a70f894fdb720082f9ea6ce37c0722 SHA1 b51374b31db9847b44326214f7cc9e8898fda320 SHA256 a72f6ead357b32ab75b84e262b433dd4581df56c5e9a768137c617daadde57d9
+MISC ChangeLog 1012 RMD160 d1f20c6b6ceac76806aca5650402d9eae1e1344e SHA1 89ae15d9665c646541987cbccd9e32e4ce821252 SHA256 a6f694c5230c1f74c1ce120c89ec60ae8980fd1dff74a24954206cabdcdc9ca3
 MISC metadata.xml 349 RMD160 475a4c829f0faa68188f97cb6ee9990e9956ab6b SHA1 fb06bc319ff0872d7f11310dcad9436e43700f80 SHA256 270e3dfee6391f3ac45fe8b49875b6308e357e48d7813ac4d639f0c72e7596d5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkg+8E0ACgkQQU4yORhF8iBq6QCfTu81LZavHZZ1uzI5Rth22t6u
+jckAnjiwlhTF8XPD0K4Niaj0buwWlXdL
+=0ypz
+-----END PGP SIGNATURE-----