Fix deprecation warnings.

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

6 files changed, 68 insertions, 45 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/Manifest b/app-arch/rpm/Manifest
index 891d3dec645b..cbe1b9e32648 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -15,9 +15,9 @@ DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 S
 DIST rpm-4.4.7.tar.gz 14125623 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c SHA1 b119fb0f10fd5e2eb330ba547b6a89e40f3c0e68 SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5
 DIST rpm-4.8.1.tar.bz2 3714502 RMD160 9326931bb34f4919ee0366f6aa288e41b37cba30 SHA1 5811168721f6caa3fb883ebd491c8c5416d9bf57 SHA256 43ca026dd2b80e339066d12422f67d213dde9f1869a56b0b95aa0091a834c8fa
 DIST rpm-5.1.6.tar.gz 8305612 RMD160 88645f4a7c2e25fffaa5628d267e86eaac137b35 SHA1 3ab7d1edf333102c748c22e9144ab90d9719ab0b SHA256 82ee1a737bd77ddd90b0fe1e9a2f478c46033e451fac3881d00ab9e166951799
-EBUILD rpm-4.4.6-r7.ebuild 3161 RMD160 3d7c39878d2efe7e907b15fb5ebb166fbaa95c1a SHA1 c7ea4f4bcae49989f16929497e4544385521101b SHA256 448531ddb2a3416fb2b22ba4ea48ea2c705f31567ebb2063969e358dd6ae0da1
-EBUILD rpm-4.4.7-r6.ebuild 3206 RMD160 698da66f8b0642e58841009388dc4f6e7028ba78 SHA1 5c19e81212b69a38e7ae3fc867d45240e0f58b65 SHA256 55885980d8b2edd4fed54f5b487b3196fa20bcdf63f5a6ba9ccb7c72777ce11b
-EBUILD rpm-4.8.1-r1.ebuild 2397 RMD160 33d091b4afe1fc55ce8fd60c256dc5e5f07accad SHA1 c02e8f42506bfdcce1b699549a822e58456e1156 SHA256 c9832016a8ca6eaf2d1404dd24c6b24b75614b23276cac1f5e6159a16295333f
-EBUILD rpm-5.1.6.ebuild 2966 RMD160 93a46162bdfc29e7b4441c94cb7d7fb379795c86 SHA1 a7888cea50c5e65c9cfdaeaf7486f702707d04a2 SHA256 7f07f2c6b0f936a47e5ee7d8b23d0282714419f6a06b63ac261385839d112767
-MISC ChangeLog 19013 RMD160 07cfd13767ecf1bbf314441cd59cc4c6176df30f SHA1 36e567b0595c7f41fb43b3812451c523d287e20f SHA256 31942c17d23d7f29f073177876d445ff9129ed4ec27e1cfd7e5a2f437c9c4940
+EBUILD rpm-4.4.6-r7.ebuild 3191 RMD160 5ca2a16ac107c914edbccccdf0d0b2ebeb96c4e2 SHA1 0b69289cf1bc48a453c0c7117e01dd1e4021005c SHA256 1c168326b03609d81932272281226a607db66a62f7ef3114a4baf07cca3f4676
+EBUILD rpm-4.4.7-r6.ebuild 3250 RMD160 2c00c3042d9dda857903372084e386671811ad79 SHA1 7ffba60598cb1b4a88434316791e91ad17226e45 SHA256 8c58fe71a4a054848bd7304fe894d7c1b435a59a588b674dc4414b4d971deb4a
+EBUILD rpm-4.8.1-r1.ebuild 2444 RMD160 36e43f3ce10b9c57264e5043a4b57fab3a83ecaa SHA1 3259c1a0ecc6dd243e5435c389b0b628b67fd8e7 SHA256 4db28369cfe61899f4c4b7fa4b0b5d160177098fd95065d61b656af9eea858bb
+EBUILD rpm-5.1.6.ebuild 2961 RMD160 af3d9eb849538de04e7ce81d58db72fc677cfa15 SHA1 ef6f5cbd788e174d6db219aef15fd45d9b139557 SHA256 af7970970ffcfb2d986e1aa53b4aba38bb5795d1d1c0ab7246d8e2c9e0a2f0f3
+MISC ChangeLog 19200 RMD160 3b3758c3b03c13561bb5b3c3e4f1fd8a3d24dd48 SHA1 fb39d3287e299c7efc889e4fabbb4ca89981a0ce SHA256 677ff82aa924daacc4465b0c7ab015f91306a527824e7665d1e90e132b3ecd87
 MISC metadata.xml 433 RMD160 a9e016d167fe73783ef50feedc00a09a2a84ac0c SHA1 8bdca4e6a26bc1d49efd244a93d8dab7c8c9ea94 SHA256 9cfbc2d47795431299888f776524d37950ff3bbd083940d5560a2f5eb958ef4f
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
 }