diff options
| -rw-r--r-- | app-mobilephone/bitpim/ChangeLog | 6 | ||||
| -rw-r--r-- | app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog index d149467ac590..80331cc5cb8d 100644 --- a/app-mobilephone/bitpim/ChangeLog +++ b/app-mobilephone/bitpim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-mobilephone/bitpim # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.30 2010/02/08 09:03:06 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/ChangeLog,v 1.31 2010/06/08 16:23:41 arfrever Exp $ + + 08 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + bitpim-1.0.6-r1.ebuild: + Delete call to deprecated distutils_python_version() (bug #311661). 08 Feb 2010; Peter Volkov <pva@gentoo.org> bitpim-1.0.6-r1.ebuild: Add inherit eutils for epatch. diff --git a/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild b/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild index b0a8ba90177c..3c043f734183 100644 --- a/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild +++ b/app-mobilephone/bitpim/bitpim-1.0.6-r1.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-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.3 2010/02/08 09:03:06 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.4 2010/06/08 16:23:41 arfrever Exp $ EAPI="2" @@ -35,7 +35,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-gentoo.patch" epatch "${FILESDIR}/${P}-ffmpeg_quality.patch" epatch "${FILESDIR}/${P}-gcc43.patch" - sed -i "s/^PYTHONVER=.*/PYTHONVER=${python}/" src/native/usb/build.sh + sed -i "s/^PYTHONVER=.*/PYTHONVER=$(PYTHON)/" src/native/usb/build.sh } src_compile() { @@ -47,7 +47,7 @@ src_compile() { # strings cd "${S}/src/native/strings" - ${python} setup.py build || die "compilation of native/strings failed" + distutils_src_compile # bmp2avi cd "${S}/src/native/av/bmp2avi" @@ -62,7 +62,6 @@ src_install() { # Python's site-packages might not be worthwhile. We'll # Put it in its own home, and add the PYTHONPATH in the # wrapper executables below. - distutils_python_version local RLOC=/usr/$(get_libdir)/${P} # Main Python source @@ -89,8 +88,7 @@ src_install() { # strings cd "${S}/src/native/strings" - ${python} setup.py install --root="${D}" --no-compile "$@" \ - || die "install of native/strings failed" + distutils_src_install cd "${S}" insinto $RLOC/native/strings @@ -119,11 +117,11 @@ src_install() { # Creating scripts echo '#!/bin/sh' > "${T}/bitpim" - echo "exec ${python} ${RLOC}/bp.py \"\$@\"" >> "${T}/bitpim" + echo "exec $(PYTHON) ${RLOC}/bp.py \"\$@\"" >> "${T}/bitpim" dobin "${T}/bitpim" if use crypt; then echo '#!/bin/sh' > "${T}/bitfling" - echo "exec ${python} ${RLOC}/bp.py \"\$@\" bitfling" >> "${T}/bitfling" + echo "exec $(PYTHON) ${RLOC}/bp.py \"\$@\" bitfling" >> "${T}/bitfling" dobin "${T}/bitfling" fi |