From 3b0e25d4783638b310e47b0809866260d05ac8fe Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Fri, 4 Jun 2010 20:56:53 +0000 Subject: [PATCH] Delete calls to deprecated python_version(). Package-Manager: portage-HEAD/cvs/Linux x86_64 --- app-text/bibus/ChangeLog | 6 +++++- app-text/bibus/bibus-1.4.3.2-r1.ebuild | 11 +++++------ app-text/bibus/bibus-1.5.0.ebuild | 9 ++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app-text/bibus/ChangeLog b/app-text/bibus/ChangeLog index cfb7ff0bf94d..eb61d3f1aa8e 100644 --- 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 + bibus-1.4.3.2-r1.ebuild, bibus-1.5.0.ebuild: + Delete calls to deprecated python_version(). 19 Feb 2010; Markus Dittrich 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 a416a90d6f3a..e0d11800c07b 100644 --- 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 ab4303381709..2c22eacd1474 100644 --- 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 } -- 2.26.2