python_mod_{cleanup,optimize} are ROOT aware.

Package-Manager: portage-2.1.5.2

7 files changed, 49 insertions, 19 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 65aef3de50b0..2eb9b11eed81 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.142 2008/05/13 11:40:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.143 2008/05/29 17:36:48 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> avahi-0.6.19-r2.ebuild,
+  avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild, avahi-0.6.22.ebuild,
+  avahi-0.6.22-r1.ebuild:
+  python_mod_{cleanup,optimize} are ROOT aware.
 
   13 May 2008; Raúl Porcel <armin76@gentoo.org> avahi-0.6.22-r1.ebuild:
   alpha/ia64/sparc stable wrt #220803
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index dfe496fc6a69..712356ad05e9 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX autoipd-openrc.sh 690 RMD160 d229d9909b40d7620798471ad99ff7392656eed1 SHA1 f3bf533d7267477b4d23446c98e3b1b15dafc569 SHA256 dd440a708fdaa286662b23e477ccb9544fbbff4dd1d2fb401d2fd9dd801000f4
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 AUX avahi-0.6.1-no-ipv6.patch 362 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 SHA1 97126f8035616821e9dc937c9b741316e7222fe2 SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4
@@ -21,10 +24,17 @@ DIST avahi-0.6.19.tar.gz 973381 RMD160 15ae4baaa55f0020422552994a8d1ef33935b065
 DIST avahi-0.6.20.tar.gz 974209 RMD160 da413b25675184d1514953bfd308d544ca5f0556 SHA1 451a095440fba9bec2effa0730bb4ec29593d1b1 SHA256 89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9
 DIST avahi-0.6.21.tar.gz 976841 RMD160 0f33afed44112a57c5353bf373a307c9c551abdb SHA1 3675f83b294b87a5cfa947d2f68518f0da8ed7b9 SHA256 d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561
 DIST avahi-0.6.22.tar.gz 1199901 RMD160 fad35f473a9109c8648e43b0f6f547c32b18e32f SHA1 2863bae55a991facc93138ca4660d5b55c846bd1 SHA256 9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52
-EBUILD avahi-0.6.19-r2.ebuild 4679 RMD160 6353c0d01dcdb3c7fea99af8259a888cabbfaf3a SHA1 2e342bfb958e14eb1c0abd8b52635363c129db04 SHA256 0c0b61c0fbeb5de1246f2fca60139b9124785ee05cdb37332d08d57d8b7e271d
-EBUILD avahi-0.6.20-r2.ebuild 4784 RMD160 414d81c2beb243d340d609796817a14f74c0222a SHA1 b026f14c83b8e010b8f64a3d0d4b71c463f479d5 SHA256 7cc52e92b4fae48f17c7165ae44a18896fb5ad103c5d5995233f6b145dbe3d71
-EBUILD avahi-0.6.21.ebuild 4853 RMD160 634fc563469f1d45e23b7d9b33789228e2308b3c SHA1 5a5816d6d68219e9caebca4ec080aa303e39eabb SHA256 4a2f8af72bc7d21e006aa01b9ecfd5fd405e00ac1dd82af6c97313cc8244ee48
-EBUILD avahi-0.6.22-r1.ebuild 5136 RMD160 c233e44142d681636d88bb3d03ba25b62d97a186 SHA1 d8279ea7c880d7642f63380f267cb8194bf09501 SHA256 d8fd190a96544a1c077139e1013307a62ed0238a9c7f8ab40d950a2b10eb19e9
-EBUILD avahi-0.6.22.ebuild 4805 RMD160 d675d0957241c578924c5d73f06e5f5786ae71ed SHA1 642cfaec7bed6b1b80c635aef1287cb972589250 SHA256 5cbad204a69d9c740b019c24e61e4c305b447764143e74f97679d93c4682f0ab
-MISC ChangeLog 20864 RMD160 ed551292f0eca248b5fd0b323d595ae270a6da1f SHA1 8aa588bfcc3a8e566b634770ba17e5607b7c1d3f SHA256 8f920757074c29c84cd2d239b15370e99b75f8c6b7ea0ff7af59765d413381af
+EBUILD avahi-0.6.19-r2.ebuild 4716 RMD160 75f369b613e5aaf68eb68249a2e2776365a10313 SHA1 0249ee22a402782ba226028a6eb1c95911460c79 SHA256 1df38998b5013e1b8e91870f2f9ae9ecd2103a02b4b05b2f942148df1105f14f
+EBUILD avahi-0.6.20-r2.ebuild 4822 RMD160 834aacb3ae2c98a13eb595071af4ae209b251adc SHA1 4e0c6929e41768a443fbb4be27c53d460112a1b2 SHA256 f8596d623427802701a3795f9662d3cfdb1b5aaa4a1774416e6e30c9bfb2ba3d
+EBUILD avahi-0.6.21.ebuild 4888 RMD160 1698629dfa07969d64cadf3e879d718a0270e3c1 SHA1 8b297ec7d2969e5761461b13971deddeea54d7d5 SHA256 19087eb6d601fc545f7c66d2b782f08ebf1a6d6510e3d462c3ee798ef483134b
+EBUILD avahi-0.6.22-r1.ebuild 5172 RMD160 47524eed8456081bb1284a5065d7c8d06f130111 SHA1 39596ce06a1e3f90e312fd696cda52e6447b9a72 SHA256 d8b98e0cd49866b50ead45da32844c7f08ff5eb1f0bcf9b14b81e65539b807aa
+EBUILD avahi-0.6.22.ebuild 4840 RMD160 0f4892954d1d3a6ef3f1da01ceb62d8017a9b434 SHA1 17543b0bc819caf8c42bba09cd6e82b76c98ec89 SHA256 84afb0094869193a9c3805bc4c180f490618159474ac5d42d90556f493a19314
+MISC ChangeLog 21079 RMD160 f61794bdb01e6e48e9887c887155068e97baecfc SHA1 386d86140f177024c440d00d612c1f69fdaee512 SHA256 41c9f77a8745d9c2fc3052c54fdd88004a1ae2b13d9d0bfa8f23a2c44194f950
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkg+6bUACgkQQU4yORhF8iCQOQCgsMeNgej9GQM+XlgAbUFFtwfW
+lkkAniugbHCvyE4wduduULSNtVUfbY1c
+=XFkN
+-----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.19-r2.ebuild b/net-dns/avahi/avahi-0.6.19-r2.ebuild
index 7b4d346a85b0..a843e9733575 100644
--- a/net-dns/avahi/avahi-0.6.19-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.19-r2.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/net-dns/avahi/avahi-0.6.19-r2.ebuild,v 1.7 2008/01/03 17:53:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v 1.8 2008/05/29 17:36:48 hawking Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="none"
@@ -170,11 +170,14 @@ src_install() {
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
+	use python && python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/avahi
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
+	if use python; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
+	fi
 
 	if use autoipd
 	then
diff --git a/net-dns/avahi/avahi-0.6.20-r2.ebuild b/net-dns/avahi/avahi-0.6.20-r2.ebuild
index e63f2c679154..1880ab1ec4c2 100644
--- a/net-dns/avahi/avahi-0.6.20-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.20-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.8 2008/02/21 14:13:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.9 2008/05/29 17:36:48 hawking Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="none"
@@ -172,11 +172,14 @@ src_install() {
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
+	use python && python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/avahi
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
+	if use python; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
+	fi
 
 	if use autoipd
 	then
diff --git a/net-dns/avahi/avahi-0.6.21.ebuild b/net-dns/avahi/avahi-0.6.21.ebuild
index c2e065bda759..075ffa37b9b6 100644
--- a/net-dns/avahi/avahi-0.6.21.ebuild
+++ b/net-dns/avahi/avahi-0.6.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.11 2008/01/03 17:53:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.12 2008/05/29 17:36:48 hawking Exp $
 
 inherit eutils mono python qt3 qt4 multilib
 
@@ -171,7 +171,10 @@ pkg_postrm() {
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize "${ROOT}"/usr/lib*/python*/site-packages/avahi
+	if use python; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
+	fi
 
 	if use autoipd
 	then
diff --git a/net-dns/avahi/avahi-0.6.22-r1.ebuild b/net-dns/avahi/avahi-0.6.22-r1.ebuild
index fb564cc158fd..a2338a4e051f 100644
--- a/net-dns/avahi/avahi-0.6.22-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.22-r1.ebuild,v 1.8 2008/05/13 11:40:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.22-r1.ebuild,v 1.9 2008/05/29 17:36:48 hawking Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="none"
@@ -196,7 +196,10 @@ pkg_postrm() {
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize "${ROOT}"/usr/lib*/python*/site-packages/avahi
+	if use python; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
+	fi
 
 	if use autoipd
 	then
diff --git a/net-dns/avahi/avahi-0.6.22.ebuild b/net-dns/avahi/avahi-0.6.22.ebuild
index a6ac75c5e4b3..7fbb0da6ad44 100644
--- a/net-dns/avahi/avahi-0.6.22.ebuild
+++ b/net-dns/avahi/avahi-0.6.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.22.ebuild,v 1.3 2008/01/03 17:53:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.22.ebuild,v 1.4 2008/05/29 17:36:48 hawking Exp $
 
 inherit eutils mono python qt3 qt4 multilib
 
@@ -176,7 +176,10 @@ pkg_postrm() {
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize "${ROOT}"/usr/lib*/python*/site-packages/avahi
+	if use python; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
+	fi
 
 	if use autoipd
 	then