Delete calls to deprecated python_version().

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

5 files changed, 18 insertions, 23 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 5a178e2fa4a4..b4b3d40a8a0d 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.105 2010/02/08 09:01:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.106 2010/04/04 21:48:31 arfrever Exp $
+
+  04 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  rpm-4.4.6-r6.ebuild, rpm-4.4.7-r4.ebuild, rpm-5.1.6.ebuild:
+  Delete calls to deprecated python_version().
 
   08 Feb 2010; Peter Volkov <pva@gentoo.org> rpm-5.0.0.ebuild,
   rpm-5.0.3.ebuild, rpm-5.1.6.ebuild:
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index f7c35cf3909f..52a65e6d4eb1 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -9,15 +9,9 @@ AUX rpm-4.4.7-qa-implicit-function-to-pointer.patch 604 RMD160 f87086379c28fa878
 AUX rpm-4.4.7-stupidness.patch 5268 RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c7c9 SHA1 e957a9a549fa1ec52b449b1e8fc3ea14af7b7a09 SHA256 e563657e648e9b5ecfc0a653d7515f93db7785ec6867c81591663213965c0850
 DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 SHA1 33221f95189671d1a083b4f140bcf9a88ecd4374 SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595
 DIST rpm-4.4.7.tar.gz 14125623 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c SHA1 b119fb0f10fd5e2eb330ba547b6a89e40f3c0e68 SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5
-DIST rpm-5.0.0.tar.gz 8990824 RMD160 a10793c9a776dd1478b0675914a71f46eb5e2999 SHA1 df5fbaf2e729a0d3ea101a17c86b6a7fc3d00a05 SHA256 d3424770f3db6c79dda76e01155134065f28c046ea8a18a173e74070ec6e3b17
-DIST rpm-5.0.3.tar.gz 9337992 RMD160 d26cdfef5a3bf18442e1825d810afb32bcfa2161 SHA1 d3461710de17a8f7dc3e49371d7edf620b10c27e SHA256 224d15c52511b453b2a63e6447b279a622c03af5fe373a67757979f4d00cd042
 DIST rpm-5.1.6.tar.gz 8305612 RMD160 88645f4a7c2e25fffaa5628d267e86eaac137b35 SHA1 3ab7d1edf333102c748c22e9144ab90d9719ab0b SHA256 82ee1a737bd77ddd90b0fe1e9a2f478c46033e451fac3881d00ab9e166951799
-EBUILD rpm-4.4.6-r6.ebuild 3114 RMD160 6b8bc05c1ccb71dd62da4898813f26165cb16966 SHA1 5de1cd945dfdee36bed6ed729b069967a6e4c395 SHA256 ffdd7b4a7d43501ff7ed6bbf03cb785cd4084b2864a49c07e9fa619c8fd5a72c
-EBUILD rpm-4.4.7-r1.ebuild 2771 RMD160 13b5d51d0f6ef0956156e05cd129f672d3b468bb SHA1 652d476d9949e542579bdc2169c3321696f9deb6 SHA256 1ad3a80d20b6808f5555e8dfbbf9c7af38077958a91d4a663bdfda53090397de
-EBUILD rpm-4.4.7-r2.ebuild 3012 RMD160 92749f8a200cbb41c46db769b839e2c1636cdca7 SHA1 75b4d1a2c17f6a43ed84ed9b2a64ec876d8baf73 SHA256 968bbc1d4b9fbc879d0c572e235cb9a5ff95068b0ce3f18ce91fff084f298d2a
-EBUILD rpm-4.4.7-r4.ebuild 3072 RMD160 707199dea3fbe0e39d93d400e68b5939f45aab2b SHA1 7826f87d63c96a48b445c56322a73309339ceb9e SHA256 4ac5246429eab579ee5cc690aedd58978a87747ed0061a6e44b7a0f5e7c31739
-EBUILD rpm-5.0.0.ebuild 2762 RMD160 918738d15b1d514109f52b9c7995276433f2b50e SHA1 bfc05b0efa3b1235311821e32c899ac9609308fa SHA256 f88e4cb71e47f9999a41d383e7c99839561bcb8c6a3327c68f693756c2f85e62
-EBUILD rpm-5.0.3.ebuild 2772 RMD160 95eced3a5edc2a05f2450a99bc3334f53f0b7bab SHA1 29882796dc56b0d19d5b7bb306175d07630575be SHA256 58ede1aad5106e5978c3851d09a0bd773f33a1e4ba738b7da6a2f5267dd021c1
-EBUILD rpm-5.1.6.ebuild 2984 RMD160 71e4e79b62bbe76eed0975d44b6732f7b4b27298 SHA1 fe18eef922139522c6fde00f6154ff36f977d99f SHA256 14de795a1d7d714de8346856fd4a3f9a163fa5b18f1557e41d7e721eaab1fb53
-MISC ChangeLog 16222 RMD160 01f302ab5071b9f7698b8b166c96b88be79be1cd SHA1 fecef9d7cb35a740230d9292af7a4b1b7a01660a SHA256 ec079a01dafe3ee92a952586e106a5f355e1c821750be3ff825f9009cb20d8b5
+EBUILD rpm-4.4.6-r6.ebuild 3114 RMD160 cbc807cb63ae226264ccb9c510e8bcb5d3b03a9e SHA1 5e84cf6271557816c7413d1c08a866ab2deece27 SHA256 6202075986b80ce56b95001968fe4182bc9c4b149d0df453791c2bc88efcdbd6
+EBUILD rpm-4.4.7-r4.ebuild 3083 RMD160 c5c835de374335f3cd2847aaf1a72d07e1fba37a SHA1 b183ebe5f6ffa6979045b2f406772a76de13cc43 SHA256 f0204575b60ef2e97963d1951f43869e4c7814a99b64ac1980453ead7e737022
+EBUILD rpm-5.1.6.ebuild 2946 RMD160 ceba21a3805e60ac63e12046eeaa58d4961f21a6 SHA1 e9d8c000729f4fca443904a9859864a13546acfe SHA256 c5dfd0023beffbedd16248aa27a439bc53ff22abc9f89d804480a0fe6b5a372f
+MISC ChangeLog 16410 RMD160 69cea9c1a08abd01aa76dc7053aaae8670539597 SHA1 52787dc8cfa155e65e3733939fab5d4dd1e94efc SHA256 4ca8a123cd2f1c322c9016bfb1c98e98e7fd0bca46b82d19d66daf9e08ba35aa
 MISC metadata.xml 396 RMD160 5370081b5c621536cf1043f44c0b6d45051dc895 SHA1 b5dbf8427940398fef39ed6ecf44fc40ab79a261 SHA256 c202b9189a05829f811129efd19db92cdc3ea04161472e4bb1011be344b4935d
diff --git a/app-arch/rpm/rpm-4.4.6-r6.ebuild b/app-arch/rpm/rpm-4.4.6-r6.ebuild
index b902ce7b2eb2..2f09e9773380 100644
--- a/app-arch/rpm/rpm-4.4.6-r6.ebuild
+++ b/app-arch/rpm/rpm-4.4.6-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r6.ebuild,v 1.10 2009/09/06 19:27:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r6.ebuild,v 1.11 2010/04/04 21:48:31 arfrever Exp $
 
 inherit eutils autotools distutils perl-module flag-o-matic
 
@@ -60,12 +60,11 @@ src_compile() {
 	# Until strict aliasing is porperly fixed...
 	filter-flags -fstrict-aliasing
 	append-flags -fno-strict-aliasing
-	python_version
 	econf \
 		--enable-posixmutexes \
 		--without-javaglue \
 		--without-selinux \
-		$(use_with python python ${PYVER}) \
+		$(use_with python python $(python_get_version)) \
 		$(use_with doc apidocs) \
 		$(use_with perl) \
 		$(use_with sqlite) \
diff --git a/app-arch/rpm/rpm-4.4.7-r4.ebuild b/app-arch/rpm/rpm-4.4.7-r4.ebuild
index d0514ab4230d..1c26d32317d8 100644
--- a/app-arch/rpm/rpm-4.4.7-r4.ebuild
+++ b/app-arch/rpm/rpm-4.4.7-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r4.ebuild,v 1.3 2009/09/06 19:27:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r4.ebuild,v 1.4 2010/04/04 21:48:31 arfrever Exp $
 
 inherit eutils autotools distutils perl-module flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://wraptastic.org/pub/rpm-4.4.x/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nls python perl doc sqlite"
 
 RDEPEND="=sys-libs/db-3.2*
@@ -61,12 +61,11 @@ src_compile() {
 	# Until strict aliasing is porperly fixed...
 	filter-flags -fstrict-aliasing
 	append-flags -fno-strict-aliasing
-	python_version
 	econf \
 		--enable-posixmutexes \
 		--without-javaglue \
 		--without-selinux \
-		$(use_with python python ${PYVER}) \
+		$(use_with python python $(python_get_version)) \
 		$(use_with doc apidocs) \
 		$(use_with perl) \
 		$(use_with sqlite) \
diff --git a/app-arch/rpm/rpm-5.1.6.ebuild b/app-arch/rpm/rpm-5.1.6.ebuild
index ebf6458c73dd..6fcbdf08438c 100644
--- a/app-arch/rpm/rpm-5.1.6.ebuild
+++ b/app-arch/rpm/rpm-5.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4 2010/02/08 09:01:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-5.1.6.ebuild,v 1.5 2010/04/04 21:48:31 arfrever Exp $
 
 inherit eutils multilib distutils python
 
@@ -61,7 +61,6 @@ src_compile() {
 #		$(use_with keyutils) \
 #		$(use_with xar) \
 	# --with-libelf
-	use python && python_version
 	econf \
 		$(use_with berkdb db) \
 		$(use_with bzip2) \
@@ -77,7 +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="/usr/$(get_libdir)/python${PYVER}" \
+		--with-python-lib-dir="$(python_get_libdir)" \
 		|| die "econf failed"
 	emake || die "emake failed"
 }