python_mod_{cleanup,optimize} are ROOT aware.

(Portage version: 2.1.5.2)

6 files changed, 33 insertions, 13 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/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