Delete calls to deprecated distutils_python_version().

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

7 files changed, 18 insertions, 17 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 4334ed228c03..58df01ad53f3 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.48 2010/02/13 20:04:44 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.49 2010/05/30 20:48:39 arfrever Exp $
+
+  30 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  gpsd-2.32.ebuild, gpsd-2.38.ebuild, gpsd-2.39-r1.ebuild:
+  Delete calls to deprecated distutils_python_version().
 
   13 Feb 2010; Steve Arnold <nerdboy@gentoo.org> files/99-gpsd-usb.rules,
   gpsd-2.39-r1.ebuild:
diff --git a/sci-geosciences/gpsd/gpsd-2.32.ebuild b/sci-geosciences/gpsd/gpsd-2.32.ebuild
index 7383ae527981..7c2bebdbc369 100644
--- a/sci-geosciences/gpsd/gpsd-2.32.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.32.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-geosciences/gpsd/gpsd-2.32.ebuild,v 1.9 2009/07/18 17:47:15 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.32.ebuild,v 1.10 2010/05/30 20:48:39 arfrever Exp $
 
 inherit eutils libtool distutils
 
@@ -46,7 +46,6 @@ src_unpack() {
 RESTRICT="test"
 
 src_compile() {
-	distutils_python_version
 	export MY_ECONF="--with-pic $(use_with X x) $(use_enable dbus)"
 	econf ${MY_ECONF} || die "econf failed"
 	emake || die "emake failed"
@@ -73,7 +72,7 @@ src_install() {
 	fi
 	dobin logextract
 	diropts "-m0644"
-	exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
+	exeinto $(python_get_sitedir)
 	doexe gps.py gpsfake.py
 	dodoc AUTHORS HACKING INSTALL README TODO "${FILESDIR}"/40-usb-serial.rules
 }
diff --git a/sci-geosciences/gpsd/gpsd-2.38.ebuild b/sci-geosciences/gpsd/gpsd-2.38.ebuild
index 01da7ea234d7..b6175a4eda3d 100644
--- a/sci-geosciences/gpsd/gpsd-2.38.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.38.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-geosciences/gpsd/gpsd-2.38.ebuild,v 1.4 2010/01/19 00:50:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.38.ebuild,v 1.5 2010/05/30 20:48:39 arfrever Exp $
 
 inherit autotools eutils distutils flag-o-matic
 
@@ -67,7 +67,6 @@ src_compile() {
 		--disable-fast-install"
 		# --enable-superstar2 is missing a header file
 
-	use python && distutils_python_version
 
 	if use ntp; then
 		my_conf="${my_conf} --enable-ntpshm --enable-pps"
diff --git a/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild
index 1b0a62567779..15c0f054a943 100644
--- a/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.39-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/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild,v 1.3 2010/02/13 20:04:44 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild,v 1.4 2010/05/30 20:48:39 arfrever Exp $
 
 EAPI="2"
 
@@ -79,7 +79,6 @@ src_configure() {
 	# Drop privs to user gpsd, see bug #282130
 	use gpsd_user && my_conf="${my_conf} --enable-gpsd-user=gpsd"
 
-	distutils_python_version
 
 	if ! use ntp; then
 		my_conf="${my_conf} --disable-pps --disable-ntpshm"
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index c134a72135a0..7e9572c6bda7 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.80 2010/05/04 10:53:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.81 2010/05/30 20:45:30 arfrever Exp $
+
+  30 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  grass-6.3.0.ebuild, grass-6.4.0_rc5.ebuild:
+  Delete calls to deprecated distutils_python_version().
 
   04 May 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   grass-6.4.0_rc6.ebuild, metadata.xml:
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
index 0aa7ad99d57d..8f2841289a3e 100644
--- a/sci-geosciences/grass/grass-6.3.0.ebuild
+++ b/sci-geosciences/grass/grass-6.3.0.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-geosciences/grass/grass-6.3.0.ebuild,v 1.13 2010/02/03 20:56:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.14 2010/05/30 20:45:30 arfrever Exp $
 
 inherit eutils distutils fdo-mime versionator wxwidgets
 
@@ -131,8 +131,6 @@ src_unpack() {
 src_compile() {
 	local myconf
 	addpredict /var/cache/fontconfig
-	# wxwindows needs python (see bug #237495)
-	use wxwindows && distutils_python_version
 
 	myconf="--prefix=/usr --with-cxx --enable-shared \
 		--with-gdal=$(type -P gdal-config) --with-curses --with-proj \
@@ -157,7 +155,7 @@ src_compile() {
 		# The following lib should be there, based on the above and the
 		# wxpython dependency (in theory).  I still need a good way to
 		# query for the location...
-		LIBGDI="/usr/$(get_libdir)/python${PYVER}/site-packages/wx-${WX_GTK_VER}-gtk2-unicode/wx/_gdi_.so"
+		LIBGDI="$(python_get_sitedir)/wx-${WX_GTK_VER}-gtk2-unicode/wx/_gdi_.so"
 		myconf="${myconf} --with-python --with-wxwidgets=${WX_CONFIG}"
 	    else
 		# USE=python must be enabled above if wxwindows is enabled
diff --git a/sci-geosciences/grass/grass-6.4.0_rc5.ebuild b/sci-geosciences/grass/grass-6.4.0_rc5.ebuild
index a9be56251109..a4e203c07875 100644
--- a/sci-geosciences/grass/grass-6.4.0_rc5.ebuild
+++ b/sci-geosciences/grass/grass-6.4.0_rc5.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-geosciences/grass/grass-6.4.0_rc5.ebuild,v 1.2 2010/02/17 16:48:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc5.ebuild,v 1.3 2010/05/30 20:45:30 arfrever Exp $
 
 EAPI="2"
 
@@ -134,8 +134,6 @@ src_prepare() {
 src_configure() {
 	local myconf
 	addpredict /var/cache/fontconfig
-	# wxwindows needs python (see bug #237495)
-	use wxwindows && distutils_python_version
 
 	myconf="--prefix=/usr --with-cxx --enable-shared \
 		--with-gdal=$(type -P gdal-config) --with-curses --with-proj \