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

(Portage version: HEAD/cvs/Linux x86_64)

6 files changed, 29 insertions, 31 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/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
 }