From: Justin Lecher <jlec@gentoo.org>
Date: Sun, 7 Mar 2010 22:56:28 +0000 (+0000)
Subject: corrected usage of distutils and EPAI=3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6b105c5b5133a94a3d6b7c835b105c843ee69c9f;p=gentoo.git

corrected usage of distutils and EPAI=3
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
---

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 0111c58020b2..0bfd3a25e33a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -20,14 +20,14 @@ EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SH
 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.6.3-r1.ebuild 6554 RMD160 8a3085d2d2210ebf8484b43bf9c67af6c450ab04 SHA1 e999597d50a9af6977041e326fbf444a41385794 SHA256 6c7a1173297812b12f0d9a70408b1a6ca2c42b9bf284479c422df19bf2c11947
+EBUILD gdal-1.6.3-r1.ebuild 6549 RMD160 6ae23c385a19d2010d2a7a7cc44c620aed76564a SHA1 e45b72b13ab9f6ff5a21f6d9d803ac5c991ff6ea SHA256 6ab1030831900d329b14d8ced154429ce20c77dd6e99d08ea47b1e1fa0fad77a
 EBUILD gdal-1.6.3.ebuild 6422 RMD160 cf47cde7626034a9b12f5edda669bb49b2640ca0 SHA1 e311209140f40a9ab70df9783c44fcd998045c55 SHA256 1a02068a8c9ba47f2bed2c17a2db4e846a599ae176ee34d8dc14535a9e1b519c
 MISC ChangeLog 14656 RMD160 3bfb2a7d3a348ef9157fd59090a4740305223764 SHA1 7106d9ccb243343a614a0d91733d4de4dd77c380 SHA256 f3e7f292f710e7a563b7ef83e27d0b0067e5d4c653cb34c01b9090b10f2f6efa
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuT/1QACgkQgAnW8HDreRaQOQCgzS5dGywvvDhE6zVRAFU5fBg2
-VSIAn3WFfYT87X8waBSSFpmhljJJeok1
-=SBNa
+iEYEARECAAYFAkuULyIACgkQgAnW8HDreRauyQCfQy9Cl3GhAN8aDIIhebm7398q
+sH4AnAstxwLTOc0BapLmtb4x6wSTYo64
+=Mo6w
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.6.3-r1.ebuild b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
index 8efe7bfb834f..76bfe4d8ee8f 100644
--- a/sci-libs/gdal/gdal-1.6.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
@@ -1,11 +1,12 @@
 # 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-r1.ebuild,v 1.1 2010/03/07 19:32:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.2 2010/03/07 22:56:28 jlec Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.5"
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby18"
+PYTHON_DEPEND="2"
 
 inherit autotools distutils eutils perl-module ruby toolchain-funcs
 
@@ -67,6 +68,7 @@ pkg_setup() {
 	    elog "User-specified configure options are not set."
 	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
 	fi
+	python_set_active_version 2
 }
 
 src_prepare() {
@@ -88,8 +90,6 @@ src_prepare() {
 
 src_configure() {
 
-	distutils_python_version
-
 	local pkg_conf="${GDAL_CONFIGURE_OPTS}"
 	local use_conf=""
 
@@ -120,7 +120,7 @@ src_configure() {
 	fi
 
 	if useq python ; then
-	    use_conf="--with-pymoddir=${EPREFIX}/usr/$(get_libdir)/python${PYVER}/site-packages \
+	    use_conf="--with-pymoddir=${EPREFIX}/$(python_get_sitedir) \
 		${use_conf}"
 	fi