Delete calls to deprecated distutils_python_version().

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

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index e1458696b0c949da8e94c74338f6d4e41c1d5d5b..1efc93530765fa51128fd6961dbb9496d4c2b544 100644 (file)
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.83 2010/05/30 17:29:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.84 2010/06/15 13:08:19 arfrever Exp $
+
+  15 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  gdal-1.5.2.ebuild, gdal-1.5.3.ebuild, gdal-1.6.0-r1.ebuild,
+  gdal-1.6.1.ebuild, gdal-1.6.2.ebuild, gdal-1.6.3.ebuild:
+  Delete calls to deprecated distutils_python_version().
 
   30 May 2010; Markos Chandras <hwoarang@gentoo.org> gdal-1.6.3-r1.ebuild:
   Stable on amd64 wrt bug #315659

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 70285091eb20db3fd1b6586ccc0d7b598354edf5..3fb2f167a36eb43be9e678a5f69cf78b0b839fae 100644 (file)
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -15,13 +15,13 @@ DIST gdal-1.6.1.tar.gz 6999411 RMD160 64955b4940675475bfaf0cc8fd5f0b264b56b0bb S
 DIST gdal-1.6.2.tar.gz 7002816 RMD160 e445680953f25047a280f36cedba0597094e0562 SHA1 1d9e1d8f01f06bca99e7335d7e86dff784eee819 SHA256 60c49a58e8641e6bf640b08306f4a0434915026fd3e0af0b53f0dcd5f5e3f74d
 DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
 DIST gdal-1.7.1.tar.gz 7709157 RMD160 337502e12e0eb4b5ff5fad806545752e677a4ab8 SHA1 1ff42b51f416da966ee25c42631a3faa3cca5d4d SHA256 c32c379811c203aa4af23683171547a947f1308bbb746ec70839965b2db4ad66
-EBUILD gdal-1.5.2.ebuild 6420 RMD160 0619a3660937eda53d501235d3b95de7f492e13f SHA1 3d0a948f9959ad3b0e232476fe77345db6d727b8 SHA256 c09aabaa7019c25adf18763d16bfde2d5b4e801dc2a4747cc22155e1f5767fce
-EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SHA1 b810791d98d84867812cd6700558b00cf32ce03d SHA256 995c6f2b68fd78234580d7612f720ad6d3dc398dec707c65236c17cfcd1b322f
-EBUILD gdal-1.6.0-r1.ebuild 6653 RMD160 271dc8fb8ac3b8941a008f5459fe5c9264060f51 SHA1 5f5d5179d95a9c69e888641276d5202f0061782c SHA256 ca12c8f828064b7a6a5340a97a495799d767df095a3fbe9db39e4e656ebf2142
-EBUILD gdal-1.6.1.ebuild 6261 RMD160 6b4d7360e237785bfcefa449ea9d25d14c2787cf SHA1 fb1333c67f56a6f5a12c549ed18bdc502d3cd9f0 SHA256 5b9e0280223437d8dbcfc3fba4a40e74635d59e329fc579717393972a15f66a3
-EBUILD gdal-1.6.2.ebuild 6258 RMD160 5a856ad8e38455c0a7acca0806f402b29720f5d1 SHA1 a749df11026604e81d3061f3be0e19e39895d4a0 SHA256 2e51a26f67ae3e1ace3911b3461586e5a95fd0b7f442b514d89ffa6619cd5aab
+EBUILD gdal-1.5.2.ebuild 6368 RMD160 7059b91b5ed14b6d08f0dc17aae798431e8b445f SHA1 ba6542abb639696cef848e357093bb4e293aae5b SHA256 6dd4af664369a2a5f500894d9ec8b3f4128f50ee00a731c8676d9fe6ed1864c8
+EBUILD gdal-1.5.3.ebuild 6457 RMD160 39b0c9d4c3a76fa740463623894fee833fe0f929 SHA1 97466f781097d97a736d94d8eeec5e3e4b9e8e79 SHA256 4d4bc1126344700b5e788ed0e791a052a1f710e4eabdeebd880edfa246861d30
+EBUILD gdal-1.6.0-r1.ebuild 6600 RMD160 fe70af41e857260b430d788bf328018ac810cac7 SHA1 00797cfafecaf097e5ac5c47137d0edac86388f5 SHA256 6ba2c67fb7cac549c0f0486f7c1494ddac0e32c96888c09c19579f73284f13e1
+EBUILD gdal-1.6.1.ebuild 6209 RMD160 15e31fb17c549d79ee1a1056e9fc9672f6fb2c7e SHA1 88f5a6912c25c4b4c2683cf528aa5ae6b4be367b SHA256 f1a2164d2fc5f5ece76ff2fce916f8a369d44d2f391a78f88b143cb3e9fa8b41
+EBUILD gdal-1.6.2.ebuild 6205 RMD160 8a855901f3709c2e49fc1ccc0f055aa646abddfd SHA1 327f3b9c046f791a7b61bf7f7c72f4dcf0bd9c8a SHA256 805b2a25d403913745c9e64a38352a3b3d8b5e2a6672168ec15f31dacd8cbca4
 EBUILD gdal-1.6.3-r1.ebuild 6725 RMD160 9228de596a1bd46dce6c55846fc8b06d8814512f SHA1 b2d4f8e6479fd749ff0e3dfa600021a958dc7c29 SHA256 c93496c50517073038bc8f642a772a2d52ac85d82eb001096869020838a27422
-EBUILD gdal-1.6.3.ebuild 6422 RMD160 cf47cde7626034a9b12f5edda669bb49b2640ca0 SHA1 e311209140f40a9ab70df9783c44fcd998045c55 SHA256 1a02068a8c9ba47f2bed2c17a2db4e846a599ae176ee34d8dc14535a9e1b519c
+EBUILD gdal-1.6.3.ebuild 6369 RMD160 5b1677db3a2e8533f9a37d463e09a0f45e8cb764 SHA1 22fc0491c4cc1cf25df57d8da7e7a73704c86f14 SHA256 6309a2f55c57398f544217ccaff2ca3cd1f8a4ebe5fb017c8af734465d887bec
 EBUILD gdal-1.7.1-r1.ebuild 7477 RMD160 edde99c990e30af5a9ec0b2c12ff76c207d914b2 SHA1 1d3c107bb1f30d091937e2f8b63b00c1409e2e66 SHA256 b6ea940dbe223fb4481b19a095ed4dbfa1179773507a9fbb08707153ae8b1e64
-MISC ChangeLog 16063 RMD160 98f92e328e16ed19b3ba899bef2243720e239289 SHA1 ba36f2ade4784277e74a81c43986029ad0e37b4b SHA256 1aaa27e381713482b4b8190d04cb598cc5be8bc51ab02f7c35e0cab7df5bddf8
+MISC ChangeLog 16315 RMD160 ae680cd86ed4f6aa6e179180bb8215463f02f3be SHA1 1d93356016a51023f0d1b112b232f30b05a355bd SHA256 f73a37db213e8381db05ec58982ee2499811bcab80294624fdf11f49b0ed51dc
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3

diff --git a/sci-libs/gdal/gdal-1.5.2.ebuild b/sci-libs/gdal/gdal-1.5.2.ebuild
index 9e54ada5914159443a6890ae23a1ed459ec58a6e..f11237ba62dbac4258ce45986891ceb0b89625b8 100644 (file)
--- a/sci-libs/gdal/gdal-1.5.2.ebuild
+++ b/sci-libs/gdal/gdal-1.5.2.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/sci-libs/gdal/gdal-1.5.2.ebuild,v 1.9 2009/06/17 04:45:59 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild,v 1.10 2010/06/15 13:08:19 arfrever Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -92,9 +92,6 @@ src_unpack() {
 }
 
 src_compile() {
-
-       distutils_python_version
-
        local pkg_conf="${GDAL_CONFIGURE_OPTS}"
        local use_conf=""
 
@@ -125,7 +122,7 @@ src_compile() {
        fi
 
        if useq python ; then
-           use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
+           use_conf="--with-pymoddir=$(python_get_sitedir) \
                ${use_conf}"
        fi
 

diff --git a/sci-libs/gdal/gdal-1.5.3.ebuild b/sci-libs/gdal/gdal-1.5.3.ebuild
index bbbb67e05b53fdd67e2e2d3e403db65807ee67db..42846aeef0f14711e589c96986732c2214186552 100644 (file)
--- a/sci-libs/gdal/gdal-1.5.3.ebuild
+++ b/sci-libs/gdal/gdal-1.5.3.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/sci-libs/gdal/gdal-1.5.3.ebuild,v 1.4 2009/04/11 17:07:01 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild,v 1.5 2010/06/15 13:08:19 arfrever Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -96,9 +96,6 @@ src_unpack() {
 }
 
 src_compile() {
-
-       distutils_python_version
-
        local pkg_conf="${GDAL_CONFIGURE_OPTS}"
        local use_conf=""
 
@@ -129,7 +126,7 @@ src_compile() {
        fi
 
        if useq python ; then
-           use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
+           use_conf="--with-pymoddir=$(python_get_sitedir) \
                ${use_conf}"
        fi
 

diff --git a/sci-libs/gdal/gdal-1.6.0-r1.ebuild b/sci-libs/gdal/gdal-1.6.0-r1.ebuild
index 3b46372e950a0475d209da08df0a97cfafe58430..38cd3a4e4262b458f43bcda5fb769e68c6690f3a 100644 (file)
--- a/sci-libs/gdal/gdal-1.6.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.0-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/sci-libs/gdal/gdal-1.6.0-r1.ebuild,v 1.4 2009/10/18 23:06:27 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.0-r1.ebuild,v 1.5 2010/06/15 13:08:19 arfrever Exp $
 
 WANT_AUTOCONF="2.5"
 RUBY_OPTIONAL="yes"
@@ -101,9 +101,6 @@ src_unpack() {
 }
 
 src_compile() {
-
-       distutils_python_version
-
        local pkg_conf="${GDAL_CONFIGURE_OPTS}"
        local use_conf=""
 
@@ -134,7 +131,7 @@ src_compile() {
        fi
 
        if useq python ; then
-           use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
+           use_conf="--with-pymoddir=$(python_get_sitedir) \
                ${use_conf}"
        fi
 

diff --git a/sci-libs/gdal/gdal-1.6.1.ebuild b/sci-libs/gdal/gdal-1.6.1.ebuild
index a68d59901e8a7a38b3087ca94767d2ac6e2494bc..1a1fe6d0165436ab170f153e166f85995ed4db44 100644 (file)
--- a/sci-libs/gdal/gdal-1.6.1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.1.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/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.9 2010/02/23 05:29:53 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.10 2010/06/15 13:08:19 arfrever Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.5"
@@ -88,9 +88,6 @@ src_prepare() {
 }
 
 src_configure() {
-
-       distutils_python_version
-
        local pkg_conf="${GDAL_CONFIGURE_OPTS}"
        local use_conf=""
 
@@ -121,7 +118,7 @@ src_configure() {
        fi
 
        if useq python ; then
-           use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
+           use_conf="--with-pymoddir=$(python_get_sitedir) \
                ${use_conf}"
        fi
 

diff --git a/sci-libs/gdal/gdal-1.6.2.ebuild b/sci-libs/gdal/gdal-1.6.2.ebuild
index e08621ab61ff36763026ab509876080bc4879b15..bd4c8cd07cef373e36bb84fba5906f6e7dcf4466 100644 (file)
--- a/sci-libs/gdal/gdal-1.6.2.ebuild
+++ b/sci-libs/gdal/gdal-1.6.2.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/sci-libs/gdal/gdal-1.6.2.ebuild,v 1.4 2010/02/23 05:29:53 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild,v 1.5 2010/06/15 13:08:19 arfrever Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.5"
@@ -88,9 +88,6 @@ src_prepare() {
 }
 
 src_configure() {
-
-       distutils_python_version
-
        local pkg_conf="${GDAL_CONFIGURE_OPTS}"
        local use_conf=""
 
@@ -121,7 +118,7 @@ src_configure() {
        fi
 
        if useq python ; then
-           use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
+           use_conf="--with-pymoddir=$(python_get_sitedir) \
                ${use_conf}"
        fi
 

diff --git a/sci-libs/gdal/gdal-1.6.3.ebuild b/sci-libs/gdal/gdal-1.6.3.ebuild
index a68577537393a472ea8ffc1f948a404bbbeb9a62..d172e6813065a8485d580b120fd33e8ddf4e2b04 100644 (file)
--- a/sci-libs/gdal/gdal-1.6.3.ebuild
+++ b/sci-libs/gdal/gdal-1.6.3.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/sci-libs/gdal/gdal-1.6.3.ebuild,v 1.2 2010/02/23 05:29:53 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3.ebuild,v 1.3 2010/06/15 13:08:19 arfrever Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.5"
@@ -87,9 +87,6 @@ src_prepare() {
 }
 
 src_configure() {
-
-       distutils_python_version
-
        local pkg_conf="${GDAL_CONFIGURE_OPTS}"
        local use_conf=""
 
@@ -120,7 +117,7 @@ src_configure() {
        fi
 
        if useq python ; then
-           use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
+           use_conf="--with-pymoddir=$(python_get_sitedir) \
                ${use_conf}"
        fi