Delete calls to deprecated python_version().

(Portage version: HEAD/cvs/Linux x86_64)

4 files changed, 28 insertions, 35 deletions

diff --git a/sys-libs/libsemanage/ChangeLog b/sys-libs/libsemanage/ChangeLog
index 384550e5f6c6..a819786ed118 100644
--- a/sys-libs/libsemanage/ChangeLog
+++ b/sys-libs/libsemanage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libsemanage
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.28 2009/08/24 18:36:16 pebenito Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.29 2010/04/16 19:36:39 arfrever Exp $
+
+  16 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  libsemanage-2.0.27.ebuild, libsemanage-2.0.33.ebuild,
+  libsemanage-2.0.33-r1.ebuild:
+  Delete calls to deprecated python_version().
 
 *libsemanage-2.0.33-r1 (24 Aug 2009)
 
diff --git a/sys-libs/libsemanage/libsemanage-2.0.27.ebuild b/sys-libs/libsemanage/libsemanage-2.0.27.ebuild
index 5a25449e88d8..4212c42da81c 100644
--- a/sys-libs/libsemanage/libsemanage-2.0.27.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.0.27.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-libs/libsemanage/libsemanage-2.0.27.ebuild,v 1.3 2009/08/02 01:54:26 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.0.27.ebuild,v 1.4 2010/04/16 19:36:39 arfrever Exp $
 
 IUSE=""
 
@@ -51,23 +51,19 @@ src_unpack() {
 }
 
 src_compile() {
-	python_version
-	emake PYLIBVER="python${PYVER}" all || die
-	emake PYLIBVER="python${PYVER}" pywrap || die
+	emake PYLIBVER="python$(python_get_version)" all || die
+	emake PYLIBVER="python$(python_get_version)" pywrap || die
 }
 
 src_install() {
-	python_version
 	python_need_rebuild
-	make DESTDIR="${D}" PYLIBVER="python${PYVER}" install install-pywrap
+	make DESTDIR="${D}" PYLIBVER="python$(python_get_version)" install install-pywrap
 }
 
 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-libs/libsemanage/libsemanage-2.0.33-r1.ebuild b/sys-libs/libsemanage/libsemanage-2.0.33-r1.ebuild
index 7341e7259f5d..97cfee294c6a 100644
--- a/sys-libs/libsemanage/libsemanage-2.0.33-r1.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.0.33-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-libs/libsemanage/libsemanage-2.0.33-r1.ebuild,v 1.1 2009/08/24 18:36:16 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.0.33-r1.ebuild,v 1.2 2010/04/16 19:36:39 arfrever Exp $
 
 IUSE=""
 
@@ -57,25 +57,21 @@ src_unpack() {
 }
 
 src_compile() {
-	python_version
-	emake PYLIBVER="python${PYVER}" all || die
-	emake PYLIBVER="python${PYVER}" pywrap || die
+	emake PYLIBVER="python$(python_get_version)" all || die
+	emake PYLIBVER="python$(python_get_version)" pywrap || die
 }
 
 src_install() {
-	python_version
 	python_need_rebuild
-	make DESTDIR="${D}" PYLIBVER="python${PYVER}" \
+	make DESTDIR="${D}" PYLIBVER="python$(python_get_version)" \
 		LIBDIR="${D}/usr/$(get_libdir)/" \
 		SHLIBDIR="${D}/$(get_libdir)/" install install-pywrap
 }
 
 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-libs/libsemanage/libsemanage-2.0.33.ebuild b/sys-libs/libsemanage/libsemanage-2.0.33.ebuild
index ead025f6f526..5dfbd666bc4b 100644
--- a/sys-libs/libsemanage/libsemanage-2.0.33.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.0.33.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-libs/libsemanage/libsemanage-2.0.33.ebuild,v 1.3 2009/08/03 13:30:03 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.0.33.ebuild,v 1.4 2010/04/16 19:36:39 arfrever Exp $
 
 IUSE=""
 
@@ -51,23 +51,19 @@ src_unpack() {
 }
 
 src_compile() {
-	python_version
-	emake PYLIBVER="python${PYVER}" all || die
-	emake PYLIBVER="python${PYVER}" pywrap || die
+	emake PYLIBVER="python$(python_get_version)" all || die
+	emake PYLIBVER="python$(python_get_version)" pywrap || die
 }
 
 src_install() {
-	python_version
 	python_need_rebuild
-	make DESTDIR="${D}" PYLIBVER="python${PYVER}" install install-pywrap
+	make DESTDIR="${D}" PYLIBVER="python$(python_get_version)" install install-pywrap
 }
 
 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)
 }