Delete calls to deprecated python_version().

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

5 files changed, 29 insertions, 49 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/Manifest b/sys-apps/policycoreutils/Manifest
index fafeebf1f161..b37b6042db77 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST policycoreutils-2.0.55.tar.gz 306314 RMD160 f4f8e5eec52603e4a23424c7d0e419ee088bcad7 SHA1 b2eacc4d0e520749b182945ca7aebe537ac27ffc SHA256 4f1a880f4784bec8a06241438a854e5b438c039193e53d0c3b1b68324418f19f
 DIST policycoreutils-2.0.69.tar.gz 832883 RMD160 f94527fcf5952d477741d62445cd5a2f593f6c58 SHA1 a82eb4b0208531dee65692919c7b4fd77a68e421 SHA256 bdbe0789885363c47c304758545b75b07a475b1f1b94b7007dd0bda2e4ad2b6b
 DIST policycoreutils-extra-1.19.tar.bz2 19139 RMD160 26a696ce304392f3fb2345cf4937420dbd0cdc16 SHA1 8fd3e22bb58c36eabdd9f18d7c55c8a565a71cb1 SHA256 7461733113f273b297c843cd90447d24110650ed6f1bf2ccd4bc94b4807eac5c
 DIST policycoreutils-extra-1.20.tar.bz2 18532 RMD160 f2f837b6759036581453bb51683d3ee9ca7de01b SHA1 44a1eb06a21217da5c4dcdbdb7204771abe81d4e SHA256 2965e81dd39b0c4b0bb29439c0c8e816e0445ec42699b8a78c3361e988c54cc0
-EBUILD policycoreutils-2.0.55.ebuild 2718 RMD160 cb047ece9f61178a5e742654c80cf3705f889e79 SHA1 2852a3f2f217cc6dc12fc83279d713332e118f9b SHA256 a60a447dcd7f3ad9ecbf4b1ecc0138fc32a68dc6cdf1a68f621141409309204a
-EBUILD policycoreutils-2.0.69-r1.ebuild 2786 RMD160 619f081b0a7466da54848ca101088cf4468c8910 SHA1 b92fc9da95a91d15a119bc57709df9e876e50d1c SHA256 4972c06a38af134e4161065b88a02b4dfeda56992671292a33719fbb47fadf19
-EBUILD policycoreutils-2.0.69.ebuild 2725 RMD160 49560b6518be26a98414db833457fd5791c4b621 SHA1 8aab337ba2e68576a3fa52f055da4b36233d2d06 SHA256 5e097816268950078ffde55882c0297db8ce39d29ec8787b40aef37223d91b99
-MISC ChangeLog 11898 RMD160 44138a97719084bf9c5c89b15c3da7561e856e6d SHA1 ba87d2e49fbe010fbe98c253f24bccd6223e3d6e SHA256 1c1189a441c3923ffb704d02b10f2acf291ea99e6533c402f0558088ba5996ba
+EBUILD policycoreutils-2.0.55.ebuild 2627 RMD160 8c982e757ee95e1dd730bc55e57db8a0034844fa SHA1 3904c0b0212eda77e3e79f40183aff94a224f5e8 SHA256 41cba25a3398d2ab36fa17d2db9048e3eee8c8ffd3d4f7f7c58d2ce5a1462f35
+EBUILD policycoreutils-2.0.69-r1.ebuild 2695 RMD160 970ad2a5e6cf2433e5bc07f812be18535645010a SHA1 87fff50967775798304fec77d58d6e080f203ce1 SHA256 c5e8a5df620bd57dd7dd45b40e9b0c967bd5279c539471c05668f778eddf94dd
+EBUILD policycoreutils-2.0.69.ebuild 2634 RMD160 cdeeaa18d33c344b8de6becfb7ec973e6ca4f2a4 SHA1 c0ef52e0620513c5296ee665ac39ede6589ca989 SHA256 aa4d6bb9a3619085d77469747994852c8dd8c260f4079790d0392ac6c3072c87
+MISC ChangeLog 12119 RMD160 9b67a69004e19c8593c3b61a8a62b38c2fbcc9fc SHA1 16e58bc6d80ec8cf4f0f20899c0811dd76503e44 SHA256 27dd028522026a403177b4648d475fc82f60bc70c7c5e1883875e934136bc655
 MISC metadata.xml 836 RMD160 421e492e89112f8436f8c5535aa2340cc8795929 SHA1 91c830f5358b9786f2b61e1967214f49212c4e3a SHA256 1d14250f52ecf63b67bed2289833d6f1ff2eba3cad9a80794b356e747917cdb7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq2udYACgkQWczwbOluxW8kZQCfeRg/qdXQE/JyMGZHZz1wh+/9
-oeYAnicwTPvTDBRBGmfIGR73LgYR/BcD
-=TLgu
------END PGP SIGNATURE-----
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)
 }