[gentoo-commits] gentoo-x86 commit in sys-apps/yum: yum-3.2.8.ebuild yum-2.6.1.ebuild ChangeLog

[Ali Polatel (hawking)]

hawking     08/05/29 18:04:59

  Modified:             yum-3.2.8.ebuild yum-2.6.1.ebuild ChangeLog
  Log:
  python_mod_{cleanup,optimize} is ROOT aware. Remove redundant python_version in pkg_*. Quoting.
  (Portage version: 2.1.5.2)

Revision  Changes    Path
1.5                  sys-apps/yum/yum-3.2.8.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/yum/yum-3.2.8.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/yum/yum-3.2.8.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/yum/yum-3.2.8.ebuild?r1=1.4&r2=1.5

Index: yum-3.2.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-3.2.8.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-3.2.8.ebuild	6 Jan 2008 18:39:03 -0000	1.4
+++ yum-3.2.8.ebuild	29 May 2008 18:04:58 -0000	1.5
@@ -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 @@
 }
 
 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
 }



1.4                  sys-apps/yum/yum-2.6.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/yum/yum-2.6.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/yum/yum-2.6.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/yum/yum-2.6.1.ebuild?r1=1.3&r2=1.4

Index: yum-2.6.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-2.6.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yum-2.6.1.ebuild	12 Jul 2007 05:10:21 -0000	1.3
+++ yum-2.6.1.ebuild	29 May 2008 18:04:58 -0000	1.4
@@ -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_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
 }



1.6                  sys-apps/yum/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/yum/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/yum/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/yum/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/yum/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	6 Jan 2008 18:38:27 -0000	1.5
+++ ChangeLog	29 May 2008 18:04:58 -0000	1.6
@@ -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@g.o> 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@g.o> yum-3.2.8.ebuild:
   Force python-2.5 as we need the sqlite stuff #204634.



-- 
gentoo-commits@l.g.o mailing list