Delete call to deprecated distutils_python_version() (bug #311661).

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

diff --git a/app-mobilephone/bitpim/ChangeLog b/app-mobilephone/bitpim/ChangeLog
index d149467ac590a55c1625f24c91e60ee4690eafd4..80331cc5cb8d703f89740ec4689532090a2e34c4 100644 (file)
--- 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/Manifest b/app-mobilephone/bitpim/Manifest
index 185f9150bf196b2eb278f6392eb26ea606aa6d8d..c95c158dec3e45f9c8042a483a0a20c0385659f6 100644 (file)
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@@ -3,6 +3,6 @@ AUX bitpim-1.0.6-gcc43.patch 836 RMD160 aaac3af0d3bebeab2d062a2cab18585f3607caf3
 AUX bitpim-1.0.6-gentoo.patch 3342 RMD160 c819de9c04f0e450e761145278db66f2ce4621de SHA1 ebc1e1ee0be32333edb4cabfd671de69420562b2 SHA256 4b0e0d59da000a0450a1e7fc0124e8cdf58f1b7caebc193c0a4dbc3719ba55e3
 AUX maketarball 916 RMD160 9b8c3bbf63f14d8270c70ca72a61ebe7f82519d8 SHA1 7e17e9dc31281a227967816bf986e744164ac1c5 SHA256 74e267ea8ca9d5375f52b5c47515a46bfea43d04ec309f4c4ff794c7cc20c800
 DIST bitpim-1.0.6.tar.bz2 4595216 RMD160 8b532bc412a6953196ea184f8a55911747b33943 SHA1 6975f456f80e5b4ff3173cf1893ef9f9af71b280 SHA256 9a46b965e505d5a25bb613cef887bf23871f7b1c20493786cd0b880e3ef6855d
-EBUILD bitpim-1.0.6-r1.ebuild 3649 RMD160 7d8485b47fb1dc76c3ec2a68728cdd4f3b7b853e SHA1 decd2b68fe188621ede8f9a6c156dcf985d00b26 SHA256 f160061ed1ba8b934b0622d8c79500c0eb54a50da83569c9b44cf1e9ec4f7ed1
-MISC ChangeLog 6382 RMD160 bfe5f75725ab4153708d0049b4bd66b87f7ce399 SHA1 8c5a325acd025ccec5f41cdf926e50203ddb3788 SHA256 adbbf5beffc70b1e992dc005a50131f78ea1f6010f28a011159007d3188e2152
+EBUILD bitpim-1.0.6-r1.ebuild 3493 RMD160 198e14c1f88f88fe1c65672d67c9262259272ba2 SHA1 f93a174a898b8e86b26ece60728e1435e80d9520 SHA256 4a21d3e8e88ce154077e4971373502fa63ee3532e36ca5ca4adb2c0478b15b3e
+MISC ChangeLog 6557 RMD160 cbe7177aa0b87a159af261e14567cc7fd11b9df3 SHA1 482e84729a571c6d91c8a510c28c241857787de6 SHA256 54133b3c0f313882685c1844b15687d3b970587e45bd4e11423ebb28ea33d97b
 MISC metadata.xml 493 RMD160 758546fe05ba3b5b9baa62ab57daa9f91e186c4e SHA1 cb5fd4b63457236da8393aed4c04f390b5058bcc SHA256 916482535ef05b666d05b74cdec20cbeb764688ee0d31abd4b40ecc06bd530a2

diff --git a/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild b/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild
index b0a8ba90177ca0532d92cc0ac698b4c627292e96..3c043f7341831c77c14846c275ba695c3600f0b5 100644 (file)
--- 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