Respect get_libdir variable, bug #255698 by Nathan Phillip Brink (binki). Remove old

Package-Manager: portage-2.1.10.54/cvs/Linux x86_64

5 files changed, 20 insertions, 107 deletions

diff --git a/sys-apps/yum/ChangeLog b/sys-apps/yum/ChangeLog
index 019bb1e47378..43d1db0bf783 100644
--- a/sys-apps/yum/ChangeLog
+++ b/sys-apps/yum/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/yum
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/ChangeLog,v 1.16 2012/03/15 18:18:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/ChangeLog,v 1.17 2012/04/02 19:54:18 pacho Exp $
+
+  02 Apr 2012; Pacho Ramos <pacho@gentoo.org> -yum-3.2.27-r1.ebuild,
+  -yum-3.2.29.ebuild, yum-3.4.3.ebuild:
+  Respect get_libdir variable, bug #255698 by Nathan Phillip Brink (binki).
+  Remove old
 
   15 Mar 2012; Mike Gilbert <floppym@gentoo.org> yum-3.4.3.ebuild:
   Convert python shebangs.
diff --git a/sys-apps/yum/Manifest b/sys-apps/yum/Manifest
index 22587825d157..7f9bfbf09b82 100644
--- a/sys-apps/yum/Manifest
+++ b/sys-apps/yum/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST yum-3.2.27.tar.gz 814721 RMD160 31ab7950ca07df7004584165172982b2ce256450 SHA1 a019be44a4e107e805f8e726910f8fe1cb4fbe41 SHA256 d5bff94d8a4aa4a4085d3f7e5dcfa999245e44ca19588b5a9a4496cd4a99fcd5
-DIST yum-3.2.29.tar.gz 943392 RMD160 ab885fc93875925ae57ceabc8731357221d1fae3 SHA1 30207763c6a6fbf2f5dc32512bd3eb208f7d39d1 SHA256 e7baff5faa51d736d7a340a31eea1f350f0f1258c468a1206fc0458f1a4adeec
 DIST yum-3.4.3.tar.gz 1140370 RMD160 c4d869102503c4c7d98672f9d3bde2bd92f0de3f SHA1 8ec5d339e4518a7908fd4db0721740288a3d8b6c SHA256 0178f97820ced9bfbcc269e6fc3ea35e29e35e2d263d24c7bff8660ee62d37ca
-EBUILD yum-3.2.27-r1.ebuild 1079 RMD160 d5d808c3672eb67ee35f72188a8d6da144f11b73 SHA1 da3e50535123c368bd17dea028b3a128af43aa0f SHA256 d3a9c52aaf45dd3fc730c9ebe207517df759072e127f0367ec427870ef0e258e
-EBUILD yum-3.2.29.ebuild 1072 RMD160 ce76c75380ead46731c4a03953fac3cc767dff70 SHA1 8d83c92b1fd99c3eeac31483ee2b4d128611b29a SHA256 09832d6b10495e7496bc95feef6989b444f520e7e38b57f735be36888ce3cd4e
-EBUILD yum-3.4.3.ebuild 1130 RMD160 01663eb6ffb9098556f137740f10d6cefa12cb0e SHA1 72d0686ea361ebc72e22cd43c33e1e6c7697a7a7 SHA256 1d9c65a269c4df50aed980aa20f5251772b82f4bf36081828d413abae6314d9f
-MISC ChangeLog 2460 RMD160 ac1b692c158f1428579e7cb884d500450503cdf1 SHA1 9748b0f8f8b4315ad3eff8c694ea63ba4dae8ae2 SHA256 61d95d1585b7a0b7d63190cf47546d6546ee59e40e37e0d6e38f11885a6288fc
+EBUILD yum-3.4.3.ebuild 1206 RMD160 ba09103ea8d769ae554ab5b1f098e90d8cf6a464 SHA1 719f53845ecf2133ac067db07daa2b467e2c1e6f SHA256 c7f33f9039069cb0b9ba36f43102cff00f06d846e03402ab50517753fc894b7b
+MISC ChangeLog 2657 RMD160 def023593bd894f0f72b386a95d088e887b4de17 SHA1 559c4ee32bb9d5550c5cc082a8248e0eea3fb0e7 SHA256 67be305deb0c95367ef8d2e056ff7e27fa7f9b524c9db23fb7408a5b2d5b2351
 MISC metadata.xml 331 RMD160 18cdefe4a8aedbf5a5fddcb1c1f551ffe09a0723 SHA1 40740c3cd7b602bee7118a90f145718fe3498189 SHA256 e7f36fc3aa5e05ebdf547edd3e3e8410de4469877ec46d8bb27bccb7f9586173
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9iMpAACgkQC77qH+pIQ6RR8wD+LqMNY1cyaPMUtvNuETiPEBvY
-EfZlrbh5zhmEikdjD7gA/1fl1efPvnLCF7MGoI5I78g6mCFFaf5tcfTom+wHDs9F
-=alnd
+iEYEARECAAYFAk96A/AACgkQCaWpQKGI+9TqVACfZUyCvb/9YB1JltcGt9KRQ/xC
+TkMAniuV0jazrtT+vQXw9fQbeQYgoBzj
+=ZEdm
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/yum/yum-3.2.27-r1.ebuild b/sys-apps/yum/yum-3.2.27-r1.ebuild
deleted file mode 100644
index bea040bfa686..000000000000
--- a/sys-apps/yum/yum-3.2.27-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-3.2.27-r1.ebuild,v 1.2 2010/06/16 20:39:58 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-
-inherit eutils python
-
-DESCRIPTION="automatic updater and package installer/remover for rpm systems"
-HOMEPAGE="http://yum.baseurl.org/"
-SRC_URI="http://yum.baseurl.org//download/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="dev-util/intltool
-	test? ( dev-python/nose )"
-
-RDEPEND="app-arch/rpm[python]
-	dev-python/sqlitecachec
-	dev-python/celementtree
-	dev-libs/libxml2[python]
-	dev-python/urlgrabber"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	rm -r "${ED}etc/rc.d" || die
-	find "${ED}" -name '*.py[co]' -print0 | xargs -0 rm -f
-}
-
-pkg_postinst() {
-	python_mod_optimize yum rpmUtils /usr/share/yum-cli
-}
-
-pkg_postrm() {
-	python_mod_cleanup yum rpmUtils /usr/share/yum-cli
-}
diff --git a/sys-apps/yum/yum-3.2.29.ebuild b/sys-apps/yum/yum-3.2.29.ebuild
deleted file mode 100644
index f2a6eeeace21..000000000000
--- a/sys-apps/yum/yum-3.2.29.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-3.2.29.ebuild,v 1.1 2011/04/06 23:13:06 xmw Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-
-inherit eutils python
-
-DESCRIPTION="automatic updater and package installer/remover for rpm systems"
-HOMEPAGE="http://yum.baseurl.org/"
-SRC_URI="http://yum.baseurl.org//download/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="dev-util/intltool
-	test? ( dev-python/nose )"
-
-RDEPEND="app-arch/rpm[python]
-	dev-python/sqlitecachec
-	dev-python/celementtree
-	dev-libs/libxml2[python]
-	dev-python/urlgrabber"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	rm -r "${ED}etc/rc.d" || die
-	find "${ED}" -name '*.py[co]' -print0 | xargs -0 rm -f
-}
-
-pkg_postinst() {
-	python_mod_optimize yum rpmUtils /usr/share/yum-cli
-}
-
-pkg_postrm() {
-	python_mod_cleanup yum rpmUtils /usr/share/yum-cli
-}
diff --git a/sys-apps/yum/yum-3.4.3.ebuild b/sys-apps/yum/yum-3.4.3.ebuild
index e6b662073df6..83d91e3e2a3d 100644
--- a/sys-apps/yum/yum-3.4.3.ebuild
+++ b/sys-apps/yum/yum-3.4.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-3.4.3.ebuild,v 1.2 2012/03/15 18:18:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yum/yum-3.4.3.ebuild,v 1.3 2012/04/02 19:54:18 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="sqlite"
 
@@ -31,9 +31,13 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	sed -i -e "s:lib:$(get_libdir):g" rpmUtils/Makefile yum/Makefile || die
+}
+
 src_install() {
-	emake install DESTDIR="${D}" || die
-	rm -r "${ED}etc/rc.d" || die
+	emake install DESTDIR="${D}"
+	rm -r "${ED}etc/rc.d"
 	find "${ED}" -name '*.py[co]' -print0 | xargs -0 rm -f
 	python_convert_shebangs -r -x "${PYTHON_ABI}" "${ED}"
 }