Delete calls to deprecated python_version(). Properly call python_mod_cleanup().

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

7 files changed, 35 insertions, 37 deletions

diff --git a/app-pda/libplist/ChangeLog b/app-pda/libplist/ChangeLog
index 79704161c1d7..ff8ca8a2f0db 100644
--- a/app-pda/libplist/ChangeLog
+++ b/app-pda/libplist/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-pda/libplist
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/ChangeLog,v 1.7 2010/05/28 15:48:28 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/ChangeLog,v 1.8 2010/06/02 17:36:22 arfrever Exp $
+
+  02 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  libplist-0.12.ebuild, libplist-0.13.ebuild, libplist-1.1.ebuild,
+  libplist-1.2.ebuild, libplist-1.3.ebuild:
+  Delete calls to deprecated python_version(). Properly call
+  python_mod_cleanup().
 
 *libplist-1.3 (28 May 2010)
 
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 6326d6a3e3aa..5dc7494bd211 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -3,10 +3,10 @@ DIST libplist-0.13.tar.bz2 59498 RMD160 15014c8fff632f45900b40ffd1abae0a4aa8a3f6
 DIST libplist-1.1.tar.bz2 66869 RMD160 ff62a28b72a953c953a6a394f9333a2ae0fbfcc3 SHA1 3ccf72bcfbde7d2d05c60938bce93b4193f3102a SHA256 30c619331cd6ffa38e672746729e8cc916e83fa0f76036fb1e41d92fe160bc71
 DIST libplist-1.2.tar.bz2 67230 RMD160 3c2440ff96c33e1a9fe4e72746ba9e4aa8220884 SHA1 4cb84394e52f47d49acb3f680edd7be249a98b69 SHA256 e8223809af55283188e8a1adfe97a59655c788f6d3048a7624f648d007f87558
 DIST libplist-1.3.tar.bz2 67642 RMD160 ad93e5a0530adf804340462de509304dbf74cc92 SHA1 068980142aede5f7adb208246e035dfe4994ea8c SHA256 982c8aac59cdc3fafc925a407a29b6cf367c5ec9bad6ad509fe5ea25d3e5b6b0
-EBUILD libplist-0.12.ebuild 1052 RMD160 bf8932d2ca85dae585429c8ce102c8bae796ec78 SHA1 07a423c4c1371b2b9578e9f4363436d4547871ef SHA256 ece8b6c9d21094412a745c507c145f001eb02e93137814bc2895d34506a5b563
-EBUILD libplist-0.13.ebuild 1051 RMD160 341812f4752be1bbbeed52890d0fe7d22bcb4cb9 SHA1 84c43969eed82473d9d36d3f4d42ed51357a141a SHA256 08a4296ec55b5f801d7a4c1f0fb4d24f16885b89b058f006444468fa64018a73
-EBUILD libplist-1.1.ebuild 1076 RMD160 5cd4cdec72d2c1f3956beafc64ef0a5344bbe85e SHA1 b71b2286bd7de3b47cff810ccdfbb776791e7acd SHA256 244a8b9992bc56f3d5cec1dd189650b1e082c4e9d77c6fd8a1dc052fa676f32e
-EBUILD libplist-1.2.ebuild 1079 RMD160 dc4d3636a029783e3ff575af0c15e1292828e1b6 SHA1 d342295bba34099defbef773c74c956e11983ccf SHA256 acded342e435101dcf567e2087e551b4fd553ee9a5458cac3c18494b440e0894
-EBUILD libplist-1.3.ebuild 1098 RMD160 65f79a3ade7febd2d4203d39e33db077716b3fe2 SHA1 c915ab39d884ca223b4593fb6e68fac7f0421494 SHA256 90349c839527122a8d77911c33423a3fc9795f45034654661ca6b668886e564f
-MISC ChangeLog 1322 RMD160 7001024a05a522a5b9108855911d9c08cf31b66e SHA1 1b26cfc07c3fbec8e3669c6f64ff559bcbfcdeb9 SHA256 addd18fcaae708d55acd0f3ed8dfcc54d6674af0497ac555d6b4bd21e9c1d86f
+EBUILD libplist-0.12.ebuild 1034 RMD160 641928712c64c008c0e9606ad43f6fa5b8ca80b4 SHA1 145a44b1edf4e81e60a3e13b92a9e9d6872bf5a4 SHA256 a42d2a3c10001d35ee6af0a5ce1f17fae368b5e4379f9f323608d54f85c62464
+EBUILD libplist-0.13.ebuild 1034 RMD160 eb9cac6eb4e173473b816aa32adeecb81ba5eb9b SHA1 e2605b6471c67301b87bc9d818ba4280f8574ddf SHA256 7a7b6b38d6c57f3f247e832078cccc970cb71b236aa4e7a7b8156e13fb1394d7
+EBUILD libplist-1.1.ebuild 1059 RMD160 e04e1b9bd18cdbaa1fb120072a1d789171a82e31 SHA1 71f3d2fc16d27417452e0e234e30e0969d004a78 SHA256 ef8b8f436804ebe953dcff375b82fa5be6362176d7034e71ff2f553af335a9e3
+EBUILD libplist-1.2.ebuild 1064 RMD160 d53418354bb7a77c8fb581f5b354a37bcbce85dd SHA1 dd3172e9f36ef318ff3ae1ba99db93b531e091c9 SHA256 25ee2865c7ef51febc05c16a8f83eaf0f65dd1f952c0e0306a8777a5b1c28deb
+EBUILD libplist-1.3.ebuild 1021 RMD160 61b9e2d2d522ed3030f4a04068a242deff7d902a SHA1 69510ee89df7b32a1d6d39694d10c5b3c083bed6 SHA256 1a02a757c1e80e2ea533f9bc26be53f0f79fdabde9672bf94986925323d4e279
+MISC ChangeLog 1593 RMD160 8c3762bf04f21c94ae35f652cdfb606cde7e5e69 SHA1 d16d7e4b84fd3749336aa387e8249331cdad2ec6 SHA256 a56a6389b53a12bbfd545042d55d9eecb214fd97b80470caac519bfebffbeec8
 MISC metadata.xml 250 RMD160 9b84b76c4212b2007d665eb817954438bc119f02 SHA1 3f69a31fb93ce89476bce6d689586f611017d8b4 SHA256 771f2b9efd3e845ceaef0f34ed1b40c268916e590445b2ef3dc90f7766d9aa7b
diff --git a/app-pda/libplist/libplist-0.12.ebuild b/app-pda/libplist/libplist-0.12.ebuild
index 3486163a0cc9..35f5f818e25c 100644
--- a/app-pda/libplist/libplist-0.12.ebuild
+++ b/app-pda/libplist/libplist-0.12.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-pda/libplist/libplist-0.12.ebuild,v 1.4 2009/06/09 16:28:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/libplist-0.12.ebuild,v 1.5 2010/06/02 17:36:22 arfrever Exp $
 
 EAPI=2
 inherit cmake-utils eutils multilib python
@@ -25,19 +25,17 @@ src_prepare() {
 }
 
 src_configure() {
-	python_version
 	mycmakeargs="-DCMAKE_SKIP_RPATH=ON
 		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		-DPYTHON_VERSION=${PYVER}
+		-DPYTHON_VERSION=$(python_get_version)
 	"
 	cmake-utils_src_configure
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	python_mod_optimize $(python_get_sitedir)/${PN}
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(python_get_sitedir)/${PN}
 }
diff --git a/app-pda/libplist/libplist-0.13.ebuild b/app-pda/libplist/libplist-0.13.ebuild
index 929deb5cc261..9fc6e74a243a 100644
--- a/app-pda/libplist/libplist-0.13.ebuild
+++ b/app-pda/libplist/libplist-0.13.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-pda/libplist/libplist-0.13.ebuild,v 1.1 2009/07/18 23:37:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/libplist-0.13.ebuild,v 1.2 2010/06/02 17:36:22 arfrever Exp $
 
 EAPI=2
 inherit cmake-utils eutils multilib python
@@ -25,19 +25,17 @@ src_prepare() {
 }
 
 src_configure() {
-	python_version
 	mycmakeargs="-DCMAKE_SKIP_RPATH=ON
 		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		-DPYTHON_VERSION=${PYVER}
+		-DPYTHON_VERSION=$(python_get_version)
 	"
 	cmake-utils_src_configure
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	python_mod_optimize $(python_get_sitedir)/${PN}
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(python_get_sitedir)/${PN}
 }
diff --git a/app-pda/libplist/libplist-1.1.ebuild b/app-pda/libplist/libplist-1.1.ebuild
index 6855866f5978..34fc25a903c9 100644
--- a/app-pda/libplist/libplist-1.1.ebuild
+++ b/app-pda/libplist/libplist-1.1.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-pda/libplist/libplist-1.1.ebuild,v 1.1 2009/12/14 23:20:45 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/libplist-1.1.ebuild,v 1.2 2010/06/02 17:36:22 arfrever Exp $
 
 EAPI=2
 inherit cmake-utils eutils multilib python
@@ -26,19 +26,17 @@ src_prepare() {
 }
 
 src_configure() {
-	python_version
 	mycmakeargs="-DCMAKE_SKIP_RPATH=ON
 		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		-DPYTHON_VERSION=${PYVER} VERBOSE=1
+		-DPYTHON_VERSION=$(python_get_version) VERBOSE=1
 	"
 	cmake-utils_src_configure
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	python_mod_optimize $(python_get_sitedir)/${PN}
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(python_get_sitedir)/${PN}
 }
diff --git a/app-pda/libplist/libplist-1.2.ebuild b/app-pda/libplist/libplist-1.2.ebuild
index 2cc192c398b8..9f0c39e62194 100644
--- a/app-pda/libplist/libplist-1.2.ebuild
+++ b/app-pda/libplist/libplist-1.2.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-pda/libplist/libplist-1.2.ebuild,v 1.2 2010/05/28 10:08:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/libplist-1.2.ebuild,v 1.3 2010/06/02 17:36:22 arfrever Exp $
 
 EAPI=2
 inherit cmake-utils eutils multilib python
@@ -26,19 +26,17 @@ src_prepare() {
 }
 
 src_configure() {
-	python_version
 	mycmakeargs="-DCMAKE_SKIP_RPATH=ON
 		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		-DPYTHON_VERSION=${PYVER} VERBOSE=1
+		-DPYTHON_VERSION=$(python_get_version) VERBOSE=1
 	"
 	cmake-utils_src_configure
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/plist
+	python_mod_optimize $(python_get_sitedir)/plist
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(python_get_sitedir)/plist
 }
diff --git a/app-pda/libplist/libplist-1.3.ebuild b/app-pda/libplist/libplist-1.3.ebuild
index 50535f182eee..200e280af865 100644
--- a/app-pda/libplist/libplist-1.3.ebuild
+++ b/app-pda/libplist/libplist-1.3.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-pda/libplist/libplist-1.3.ebuild,v 1.1 2010/05/28 15:48:28 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libplist/libplist-1.3.ebuild,v 1.2 2010/06/02 17:36:22 arfrever Exp $
 
 EAPI=2
 inherit cmake-utils eutils multilib python
@@ -34,9 +34,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/python$(python_get_version)/site-packages/plist
+	python_mod_optimize $(python_get_sitedir)/plist
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python$(python_get_version)/site-packages/plist
+	python_mod_cleanup $(python_get_sitedir)/plist
 }