Delete calls to deprecated distutils_python_version().

(Portage version: HEAD/cvs/Linux x86_64)

7 files changed, 21 insertions, 34 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index e1458696b0c9..1efc93530765 100644
--- 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/gdal-1.5.2.ebuild b/sci-libs/gdal/gdal-1.5.2.ebuild
index 9e54ada59141..f11237ba62db 100644
--- 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 bbbb67e05b53..42846aeef0f1 100644
--- 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 3b46372e950a..38cd3a4e4262 100644
--- 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 a68d59901e8a..1a1fe6d01654 100644
--- 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 e08621ab61ff..bd4c8cd07cef 100644
--- 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 a68577537393..d172e6813065 100644
--- 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