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

(Portage version: 2.1.10.54/cvs/Linux x86_64)

4 files changed, 14 insertions, 97 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/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}"
 }