python_mod_{cleanup,optimize} is ROOT aware. Remove redundant python_version in pkg_*. Quoting.

(Portage version: 2.1.5.2)

3 files changed, 21 insertions, 15 deletions

diff --git a/sys-apps/yum/ChangeLog b/sys-apps/yum/ChangeLog
index 67e76fa8f132..e13ecc0ef2bd 100644
--- a/sys-apps/yum/ChangeLog
+++ b/sys-apps/yum/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/yum
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/ChangeLog,v 1.5 2008/01/06 18:38:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/ChangeLog,v 1.6 2008/05/29 18:04:58 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> yum-2.6.1.ebuild,
+  yum-3.2.8.ebuild:
+  python_mod_{cleanup,optimize} is ROOT aware. Remove redundant
+  python_version in pkg_*. Quoting.
 
   06 Jan 2008; Mike Frysinger <vapier@gentoo.org> yum-3.2.8.ebuild:
   Force python-2.5 as we need the sqlite stuff #204634.
diff --git a/sys-apps/yum/yum-2.6.1.ebuild b/sys-apps/yum/yum-2.6.1.ebuild
index 57eec05c6733..fc1a5ed511d5 100644
--- a/sys-apps/yum/yum-2.6.1.ebuild
+++ b/sys-apps/yum/yum-2.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-2.6.1.ebuild,v 1.3 2007/07/12 05:10:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-2.6.1.ebuild,v 1.4 2008/05/29 18:04:58 hawking Exp $
 
 inherit python distutils eutils
 
@@ -44,28 +44,26 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 
 	dodoc README AUTHORS ChangeLog TODO
 	useq doc && dodoc PLUGINS
 
 	# Makefile explicitly compiles python files
-	find ${D}/usr/ -name *.py[co] -exec rm {} \;
+	find "${D}"/usr/ -name *.py[co] -exec rm {} \;
 
 	# yum's auto-update functionality doesn't make
 	# sense for a system managed by portage
-	rm -rf ${D}/etc/cron.{daily,weekly}
-	rm -rf ${D}/etc/{rc.d,yum}
+	rm -rf "${D}"/etc/cron.{daily,weekly}
+	rm -rf "${D}"/etc/{rc.d,yum}
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize ${ROOT}usr/share/${PN}-cli
+	python_mod_optimize /usr/share/${PN}-cli
 	distutils_pkg_postinst
 }
 
 pkg_postrm() {
-	python_version
-	python_mod_cleanup ${ROOT}usr/share/${PN}-cli
+	python_mod_cleanup /usr/share/${PN}-cli
 	distutils_pkg_postrm
 }
diff --git a/sys-apps/yum/yum-3.2.8.ebuild b/sys-apps/yum/yum-3.2.8.ebuild
index da93a23eb0c1..ba48c78a6fed 100644
--- a/sys-apps/yum/yum-3.2.8.ebuild
+++ b/sys-apps/yum/yum-3.2.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-3.2.8.ebuild,v 1.4 2008/01/06 18:39:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-3.2.8.ebuild,v 1.5 2008/05/29 18:04:58 hawking Exp $
 
 NEED_PYTHON=1
-inherit python eutils
+inherit python eutils multilib
 
 DESCRIPTION="automatic updater and package installer/remover for rpm systems"
 HOMEPAGE="http://linux.duke.edu/projects/yum/"
@@ -42,9 +42,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/{yum,rpmUtils} "${ROOT}"/usr/share/yum-cli
+	python_version
+	python_mod_optimize \
+		/usr/$(get_libdir)/python${PYVER}/site-packages/{yum,rpmUtils} \
+		/usr/share/yum-cli
 }
 
 pkg_postrm() {
-	python_mod_cleanup "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/{yum,rpmUtils} "${ROOT}"/usr/share/yum-cli
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/{yum,rpmUtils} /usr/share/yum-cli
 }