Delete calls to deprecated python_version().

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

diff --git a/app-text/bibus/ChangeLog b/app-text/bibus/ChangeLog
index cfb7ff0bf94dd2da548ad35ee2c7c20e9c7b1b6b..eb61d3f1aa8ea477599ccce8293fa6253b54b905 100644 (file)
--- a/app-text/bibus/ChangeLog
+++ b/app-text/bibus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/bibus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.18 2010/02/19 04:53:36 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/ChangeLog,v 1.19 2010/06/04 20:56:53 arfrever Exp $
+
+  04 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  bibus-1.4.3.2-r1.ebuild, bibus-1.5.0.ebuild:
+  Delete calls to deprecated python_version().
 
   19 Feb 2010; Markus Dittrich <markusle@gentoo.org> bibus-1.5.0.ebuild:
   Changed required version of wxPython to >2.8 (fixes bug #304661).

diff --git a/app-text/bibus/bibus-1.4.3.2-r1.ebuild b/app-text/bibus/bibus-1.4.3.2-r1.ebuild
index a416a90d6f3a68659a980f9a2556fdae9042fb79..e0d11800c07b0c024baab75da68025d12c2c9981 100644 (file)
--- a/app-text/bibus/bibus-1.4.3.2-r1.ebuild
+++ b/app-text/bibus/bibus-1.4.3.2-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/app-text/bibus/bibus-1.4.3.2-r1.ebuild,v 1.1 2009/09/01 03:16:54 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.4.3.2-r1.ebuild,v 1.2 2010/06/04 20:56:53 arfrever Exp $
 
 EAPI="2"
 
@@ -39,9 +39,8 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}-${MY_VERSION}"
 
 src_prepare() {
-       python_version
        epatch "${FILESDIR}"/${P}-install.1.patch
-       sed -e "s:gentoo-python:python${PYVER}:g" \
+       sed -e "s:gentoo-python:python$(python_get_version):g" \
                -i Makefile Setup/Makefile Setup/bibus.cfg Setup/bibus.sh \
                || die "Failed to adjust python paths"
 }
@@ -62,9 +61,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       python_mod_optimize /usr/lib/python${PYVER}/site-packages/bibus
+       python_mod_optimize $(python_get_sitedir)/bibus
 }
 
 pkg_postrm() {
-       python_mod_cleanup /usr/lib/python${PYVER}/site-packages/bibus
+       python_mod_cleanup $(python_get_sitedir)/bibus
 }

diff --git a/app-text/bibus/bibus-1.5.0.ebuild b/app-text/bibus/bibus-1.5.0.ebuild
index ab43033817096e249d295c656f4c3dbb5f203c86..2c22eacd1474b51ee5d94b88e99035c308300679 100644 (file)
--- a/app-text/bibus/bibus-1.5.0.ebuild
+++ b/app-text/bibus/bibus-1.5.0.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-text/bibus/bibus-1.5.0.ebuild,v 1.2 2010/02/19 04:53:36 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibus/bibus-1.5.0.ebuild,v 1.3 2010/06/04 20:56:53 arfrever Exp $
 
 EAPI="2"
 
@@ -27,10 +27,9 @@ RDEPEND="virtual/ooo
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-       python_version
        epatch "${FILESDIR}"/${P}-install.patch
        epatch "${FILESDIR}"/${P}-pysqlite.patch
-       sed -e "s:gentoo-python:python${PYVER}:g" \
+       sed -e "s:gentoo-python:python$(python_get_version):g" \
                -i Makefile Setup/Makefile Setup/bibus.cfg Setup/bibus.sh \
                || die "Failed to adjust python paths"
 }
@@ -51,9 +50,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       python_mod_optimize /usr/lib/python${PYVER}/site-packages/bibus
+       python_mod_optimize $(python_get_sitedir)/bibus
 }
 
 pkg_postrm() {
-       python_mod_cleanup /usr/lib/python${PYVER}/site-packages/bibus
+       python_mod_cleanup $(python_get_sitedir)/bibus
 }