Fix deprecation warnings.

(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

5 files changed, 63 insertions, 40 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index eb03c0e7e5e8..325bd95369ae 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.121 2011/01/08 19:06:15 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.122 2011/01/08 19:21:44 arfrever Exp $
+
+  08 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  rpm-4.4.6-r7.ebuild, rpm-4.4.7-r6.ebuild, rpm-4.8.1-r1.ebuild,
+  rpm-5.1.6.ebuild:
+  Fix deprecation warnings.
 
   08 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -rpm-4.4.7-r4.ebuild, -rpm-4.4.7-r5.ebuild:
diff --git a/app-arch/rpm/rpm-4.4.6-r7.ebuild b/app-arch/rpm/rpm-4.4.6-r7.ebuild
index 2f9cd1800af5..14fadd486336 100644
--- a/app-arch/rpm/rpm-4.4.6-r7.ebuild
+++ b/app-arch/rpm/rpm-4.4.6-r7.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r7.ebuild,v 1.4 2010/06/22 19:59:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r7.ebuild,v 1.5 2011/01/08 19:21:44 arfrever Exp $
 
-inherit eutils autotools distutils perl-module flag-o-matic
+EAPI="3"
+
+inherit eutils autotools perl-module flag-o-matic python
 
 DESCRIPTION="Red Hat Package Management Utils"
 HOMEPAGE="http://www.rpm5.org/"
@@ -30,9 +32,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-with-sqlite.patch
 	epatch "${FILESDIR}"/${P}-stupidness.patch
 	epatch "${FILESDIR}"/${P}-autotools.patch
@@ -57,7 +57,7 @@ src_unpack() {
 	# TODO Get rid of internal copies of lua, db and db3
 }
 
-src_compile() {
+src_configure() {
 	# Until strict aliasing is porperly fixed...
 	filter-flags -fstrict-aliasing
 	append-flags -fno-strict-aliasing
@@ -69,9 +69,11 @@ src_compile() {
 		$(use_with doc apidocs) \
 		$(use_with perl) \
 		$(use_with sqlite) \
-		$(use_enable nls) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable nls)
+}
+
+src_compile() {
+	default
 }
 
 src_install() {
@@ -104,5 +106,9 @@ pkg_postinst() {
 		"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
 	fi
 
-	distutils_pkg_postinst
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
 }
diff --git a/app-arch/rpm/rpm-4.4.7-r6.ebuild b/app-arch/rpm/rpm-4.4.7-r6.ebuild
index 9e222c2a3bf5..7afa721869f4 100644
--- a/app-arch/rpm/rpm-4.4.7-r6.ebuild
+++ b/app-arch/rpm/rpm-4.4.7-r6.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r6.ebuild,v 1.3 2010/12/14 02:04:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r6.ebuild,v 1.4 2011/01/08 19:21:44 arfrever Exp $
 
-inherit eutils autotools distutils perl-module flag-o-matic
+EAPI="3"
+
+inherit eutils autotools perl-module flag-o-matic python
 
 DESCRIPTION="Red Hat Package Management Utils"
 HOMEPAGE="http://www.rpm5.org/"
@@ -30,9 +32,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/rpm-4.4.6-with-sqlite.patch
 	epatch "${FILESDIR}"/rpm-4.4.7-stupidness.patch
 	epatch "${FILESDIR}"/rpm-4.4.6-autotools.patch
@@ -58,7 +58,7 @@ src_unpack() {
 	# TODO Get rid of internal copies of lua, db and db3
 }
 
-src_compile() {
+src_configure() {
 	# Until strict aliasing is porperly fixed...
 	filter-flags -fstrict-aliasing
 	append-flags -fno-strict-aliasing
@@ -70,8 +70,10 @@ src_compile() {
 		$(use_with doc apidocs) \
 		$(use_with perl) \
 		$(use_with sqlite) \
-		$(use_enable nls) \
-		|| die "econf failed"
+		$(use_enable nls)
+}
+
+src_compile() {
 	emake -j1 || die "emake failed"
 }
 
@@ -92,7 +94,7 @@ src_install() {
 	use perl && fixlocalpod
 
 	#remove .la file. Bug #300096
-	rm "${D}"/$(python_get_sitedir)/${PN}/_rpmmodule.la
+	use python && python_clean_installation_image
 }
 
 pkg_postinst() {
@@ -104,5 +106,9 @@ pkg_postinst() {
 		"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
 	fi
 
-	distutils_pkg_postinst
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
 }
diff --git a/app-arch/rpm/rpm-4.8.1-r1.ebuild b/app-arch/rpm/rpm-4.8.1-r1.ebuild
index b061a7288b2b..eb9f87bdacf4 100644
--- a/app-arch/rpm/rpm-4.8.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.8.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.8.1-r1.ebuild,v 1.1 2010/12/27 18:55:45 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.8.1-r1.ebuild,v 1.2 2011/01/08 19:21:44 arfrever Exp $
 
-EAPI=2
+EAPI="3"
 
-inherit eutils autotools flag-o-matic perl-module distutils
+inherit eutils autotools flag-o-matic perl-module python
 
 DESCRIPTION="Red Hat Package Management Utils"
 HOMEPAGE="http://www.rpm.org"
@@ -48,7 +48,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	default
 }
 
 src_configure() {
@@ -95,5 +95,9 @@ pkg_postinst() {
 		"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
 	fi
 
-	distutils_pkg_postinst
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
 }
diff --git a/app-arch/rpm/rpm-5.1.6.ebuild b/app-arch/rpm/rpm-5.1.6.ebuild
index df9ab4b9e5ec..4aa6fc32de82 100644
--- a/app-arch/rpm/rpm-5.1.6.ebuild
+++ b/app-arch/rpm/rpm-5.1.6.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-5.1.6.ebuild,v 1.8 2010/12/14 02:04:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-5.1.6.ebuild,v 1.9 2011/01/08 19:21:44 arfrever Exp $
 
-inherit eutils multilib distutils python
+EAPI="3"
+
+inherit eutils multilib python
 
 MY_P=${P/_alpha/a}
 MY_P=${P/_beta/b}
@@ -46,16 +48,14 @@ pkg_setup () {
 	ewarn "    rpm --initdb"
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	rm -rf file xar #db
 	sed -i \
 		-e '/^pkgconfigdir/s:=.*:=$(libdir)/pkgconfig:' \
 		scripts/Makefile.in || die
 }
 
-src_compile() {
+src_configure() {
 #		$(use_with dmalloc) \
 #		$(use_with efence) \
 #		$(use_with keyutils) \
@@ -76,9 +76,7 @@ src_compile() {
 		$(use_with sqlite) \
 		$(use berkdb || use sqlite || echo --with-db) \
 		--with-path-lib="/usr/$(get_libdir)/rpm" \
-		--with-python-lib-dir="$(python_get_libdir)" \
-		|| die "econf failed"
-	emake || die "emake failed"
+		--with-python-lib-dir="$(python_get_libdir)"
 }
 
 src_install() {
@@ -106,5 +104,9 @@ pkg_postinst() {
 	fi
 	chown rpm:rpm "${ROOT}"/var/lib/rpm/*
 
-	distutils_pkg_postinst
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
 }