More inteligent search in configure for python stuff

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 54 insertions, 10 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 8220fba452e9..ca3fad54a421 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.45 2010/06/26 18:11:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.46 2010/06/27 18:28:03 jlec Exp $
+
+  27 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/3.2.0-python.patch,
+  geos-3.2.0-r1.ebuild:
+  More inteligent search in configure for python stuff
 
   26 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
   +files/3.2.0-swig2.0.patch, geos-3.2.0-r1.ebuild:
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index c9168af4b11a..e6347d957c27 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -2,21 +2,20 @@
 Hash: SHA1
 
 AUX 3.2.0-multipy.patch 276 RMD160 a0cff4e5b14c1ed84d70860fd1a7c41efeea6e72 SHA1 55e25a3a89bbbaf8eaf1814f10f13b36597e1d94 SHA256 b2f1d11f953c456cad975afcb78a27005eb025e1beae2621c92cb139b44fef8c
+AUX 3.2.0-python.patch 2121 RMD160 30628f797473067ad5feb25bd6e603bc39675e94 SHA1 adf6a6ed4398925bbaf9c401f0941f4de6a6adb0 SHA256 f8f82605f85de7a189b2272db26c6b78d78eaafccb8a3ed2662d3dce922b1235
 AUX 3.2.0-swig2.0.patch 1056 RMD160 40f4b89cec57d1db7907679ff28b967c5702b7c4 SHA1 419117b2af0759af9bf9041e76d83ad6e6f6fee7 SHA256 b322b53240760a120fb813e263c9358adc11682d99ea13c502309282fff4eb49
 AUX geos-3.1.1-missing-includes.patch 662 RMD160 8675c18376128d77c4a3c567bac38445f9e2fa5f SHA1 7a5077c737045aeff9ff5d4768284c103bd97615 SHA256 89f31ac87cc1d610317338c0eea1746f05ae9a98e88c8994dcb4ee7c81c2c61e
 DIST geos-3.1.1.tar.bz2 1170244 RMD160 a3254a7a8cdfccaefaa2f438577f4ebd0c8929ac SHA1 cafb76a3e5fbcd7d9588d3fdcec8fa4fcd8b9fa4 SHA256 e93f6f3cf10af33bff2289046c66d8569ca4afc26e64c16ff067b70899cbc5d5
 DIST geos-3.2.0.tar.bz2 1627924 RMD160 cdbd10d524164cd11b73a3af39ce15d021dfcaef SHA1 e6925763fb06fa6a7f358ede49bb89f96535b3ef SHA256 0a43b76429fd94fd572d79869f3ca5acdf44a9fa73844aa655016f09aaa1e6c7
 EBUILD geos-3.1.1.ebuild 1281 RMD160 cb393f3abdab15786ab4d5798ac4298182dfa6bd SHA1 aeefa9f0a16c37caac8b9db7332489b1c54b6d45 SHA256 298aaee394248b3f62640e9217ae13cd446455afea94fca977f4292029c7b044
-EBUILD geos-3.2.0-r1.ebuild 2130 RMD160 72829998c2307a1b1911bdce18e96b8647591808 SHA1 809f8751d8bf6036b7cca2fb1126523c9a11e471 SHA256 06ca4e63fff1511701f1df3143db599fcba93dd1e0e0ba7757978e6592a2a467
+EBUILD geos-3.2.0-r1.ebuild 2161 RMD160 f77f1ad0236fdef3a68495e70665cdcee4dd55af SHA1 536f8420baf2daa7624198a3d324112366446ab1 SHA256 1964b4a704ca7628f1fc357b6aa9cf6658f4ff73e927f9610450e9e0338ced39
 EBUILD geos-3.2.0.ebuild 1381 RMD160 68ab7367728165f713b182c272d962adc2f51042 SHA1 9671347677898b648d80dfca3d8387f89e90f975 SHA256 d8ca2b913d9a0d4eed724e583dbdfea15703f247b67e72d29861e2a152a127c2
-MISC ChangeLog 7954 RMD160 90e36826bc4fc1d04004123259cb1d57a7ec78b8 SHA1 63ef496d57cb99ed5575d4bc15f5722fe8be4a4f SHA256 331f884aa472141f8e0ccdc62c680d081ddeaeff6ae6e7f83ff5347f7e969eec
+MISC ChangeLog 8102 RMD160 162ac9c73d24038a60be8cfa4c7871c11841efd5 SHA1 bfb58f6eac1b08f3f4e56d0b18b70839e97db457 SHA256 6c2ea3ed599133ed610c11af44746ecde248c9e6542bce7785fcb104dea4ea6b
 MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iJwEAQECAAYFAkwmQtsACgkQIiMqcbOVdxQb8AP/aevOAGIW3AtNskNR63K90JF2
-Yun7LwBrSrnIfEheCPXk/e8aJ7aZutV1D5OIJy0bYslEhW34YJSOvtuvQV/3ZnIx
-jatzT7kRCVUefd9Fu2QAlC8qJS0WurV2KekwLG2nfI+nabCiaT8pfMbK14nDP0Ay
-3sC6bBOjxaFW6VfDgbI=
-=cfDp
+iEYEARECAAYFAkwnmDgACgkQgAnW8HDreRYpjQCgqsj3D92aLRJh5TFk06OEdBNT
+JusAoLp742/PvnhpYv4ehUflbov+DnxT
+=5evO
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/geos/files/3.2.0-python.patch b/sci-libs/geos/files/3.2.0-python.patch
new file mode 100644
index 000000000000..b4a85c0410ad
--- /dev/null
+++ b/sci-libs/geos/files/3.2.0-python.patch
@@ -0,0 +1,40 @@
+diff --git a/macros/ac_python_devel.m4 b/macros/ac_python_devel.m4
+index d67842b..f3a3a3b 100644
+--- a/macros/ac_python_devel.m4
++++ b/macros/ac_python_devel.m4
+@@ -29,13 +29,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
+ 
+         # Check for Python include path
+         AC_MSG_CHECKING([for Python include path])
+-        for i in "$base_python_path/include/python$PYTHON_VERSION/" "$base_python_path/include/python/" "$base_python_path/include/" "$base_python_path/" ; do
+-                python_path=`find $i -type f -name Python.h -print 2> /dev/null | sed "1q"`
+-                if test -n "$python_path" ; then
+-                        break
+-                fi
+-        done
+-        python_path=`echo $python_path | sed "s,/Python.h$,,"`
++        python_path="${base_python_path}/include/python$PYTHON_VERSION/"
++        if test ! -f "${python_path}"/Python.h ; then
++                python_path=""
++        fi
+         AC_MSG_RESULT([$python_path])
+         if test -z "$python_path" ; then
+                 AC_MSG_ERROR([cannot find Python include path])
+@@ -44,13 +41,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
+ 
+         # Check for Python library path
+         AC_MSG_CHECKING([for Python library path])
+-        for i in "$base_python_path/lib/python$PYTHON_VERSION/config/" "$base_python_path/lib/python$PYTHON_VERSION/" "$base_python_path/lib/python/config/" "$base_python_path/lib/python/" "$base_python_path/" "$base_python_path/libs/" ; do
+-                python_path=`find $i -name libpython$PYTHON_VERSION.* -print 2> /dev/null | sed "1q"`
+-                if test -n "$python_path" ; then
+-                        break
+-                fi
+-        done
+-        python_path=`echo $python_path | sed "s,/libpython.*$,,"`
++        python_path=`python$PYTHON_VERSION -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("LIBDIR"))'`
++        if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so ; then
++                python_path=""
++        fi
+         AC_MSG_RESULT([$python_path])
+         if test -z "$python_path" ; then
+                 AC_MSG_ERROR([cannot find Python library path])
diff --git a/sci-libs/geos/geos-3.2.0-r1.ebuild b/sci-libs/geos/geos-3.2.0-r1.ebuild
index 386acf97e0f5..fc29ea6fa9fa 100644
--- a/sci-libs/geos/geos-3.2.0-r1.ebuild
+++ b/sci-libs/geos/geos-3.2.0-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-libs/geos/geos-3.2.0-r1.ebuild,v 1.3 2010/06/26 18:11:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v 1.4 2010/06/27 18:28:03 jlec Exp $
 
 EAPI=2
 
@@ -33,7 +33,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-multipy.patch \
-		"${FILESDIR}"/${PV}-swig2.0.patch
+		"${FILESDIR}"/${PV}-swig2.0.patch \
+		"${FILESDIR}"/${PV}-python.patch
 	eautoreconf
 	echo "#!/bin/bash" > py-compile
 }