Delete calls to deprecated python_version().

(Portage version: HEAD/cvs/Linux x86_64)

4 files changed, 25 insertions, 35 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index a87d70c809a2..ca02dd767ae4 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/policycoreutils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.76 2009/09/20 23:24:54 pebenito Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.77 2010/04/04 21:56:32 arfrever Exp $
+
+  04 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  policycoreutils-2.0.55.ebuild, policycoreutils-2.0.69.ebuild,
+  policycoreutils-2.0.69-r1.ebuild:
+  Delete calls to deprecated python_version().
 
 *policycoreutils-2.0.69-r1 (20 Sep 2009)
 
diff --git a/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild b/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild
index d65b9eccd7d1..01c36c263a06 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.0.55.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/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild,v 1.3 2009/08/02 01:56:27 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild,v 1.4 2010/04/04 21:56:32 arfrever Exp $
 
 IUSE="nls"
 
@@ -66,20 +66,17 @@ src_unpack() {
 }
 
 src_compile() {
-	python_version
-
 	einfo "Compiling policycoreutils"
-	emake -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y || die
+	emake -C "${S}" PYLIBVER="python$(python_get_version)" AUDIT_LOG_PRIV=y || die
 	einfo "Compiling policycoreutils-extra"
 	emake -C "${S2}" || die
 }
 
 src_install() {
-	python_version
 	python_need_rebuild
 
 	einfo "Installing policycoreutils"
-	make DESTDIR="${D}" -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y install || die
+	make DESTDIR="${D}" -C "${S}" PYLIBVER="python$(python_get_version)" AUDIT_LOG_PRIV=y install || die
 	einfo "Installing policycoreutils-extra"
 	make DESTDIR="${D}" -C "${S2}" install || die
 
@@ -98,11 +95,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_optimize $(python_get_sitedir)
 }
 
 pkg_postrm() {
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_cleanup $(python_get_sitedir)
 }
diff --git a/sys-apps/policycoreutils/policycoreutils-2.0.69-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.0.69-r1.ebuild
index 703cb936e781..15a4226a8600 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.0.69-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.0.69-r1.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/sys-apps/policycoreutils/policycoreutils-2.0.69-r1.ebuild,v 1.1 2009/09/20 23:24:54 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.69-r1.ebuild,v 1.2 2010/04/04 21:56:32 arfrever Exp $
 
 IUSE="nls"
 
@@ -68,20 +68,17 @@ src_unpack() {
 }
 
 src_compile() {
-	python_version
-
 	einfo "Compiling policycoreutils"
-	emake -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y || die
+	emake -C "${S}" PYLIBVER="python$(python_get_version)" AUDIT_LOG_PRIV=y || die
 	einfo "Compiling policycoreutils-extra"
 	emake -C "${S2}" || die
 }
 
 src_install() {
-	python_version
 	python_need_rebuild
 
 	einfo "Installing policycoreutils"
-	make DESTDIR="${D}" -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y install || die
+	make DESTDIR="${D}" -C "${S}" PYLIBVER="python$(python_get_version)" AUDIT_LOG_PRIV=y install || die
 	einfo "Installing policycoreutils-extra"
 	make DESTDIR="${D}" -C "${S2}" install || die
 
@@ -100,11 +97,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_optimize $(python_get_sitedir)
 }
 
 pkg_postrm() {
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_cleanup $(python_get_sitedir)
 }
diff --git a/sys-apps/policycoreutils/policycoreutils-2.0.69.ebuild b/sys-apps/policycoreutils/policycoreutils-2.0.69.ebuild
index 3876cd33da73..a114ead9fb9a 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.0.69.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.0.69.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/sys-apps/policycoreutils/policycoreutils-2.0.69.ebuild,v 1.4 2009/09/14 18:25:54 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.69.ebuild,v 1.5 2010/04/04 21:56:32 arfrever Exp $
 
 IUSE="nls"
 
@@ -66,20 +66,17 @@ src_unpack() {
 }
 
 src_compile() {
-	python_version
-
 	einfo "Compiling policycoreutils"
-	emake -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y || die
+	emake -C "${S}" PYLIBVER="python$(python_get_version)" AUDIT_LOG_PRIV=y || die
 	einfo "Compiling policycoreutils-extra"
 	emake -C "${S2}" || die
 }
 
 src_install() {
-	python_version
 	python_need_rebuild
 
 	einfo "Installing policycoreutils"
-	make DESTDIR="${D}" -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y install || die
+	make DESTDIR="${D}" -C "${S}" PYLIBVER="python$(python_get_version)" AUDIT_LOG_PRIV=y install || die
 	einfo "Installing policycoreutils-extra"
 	make DESTDIR="${D}" -C "${S2}" install || die
 
@@ -98,11 +95,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_optimize $(python_get_sitedir)
 }
 
 pkg_postrm() {
-	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_cleanup $(python_get_sitedir)
 }