Fix for Prefix and Darwin, bug #335811 and bug #335814

Package-Manager: portage-2.2.01.15553-prefix/cvs/Darwin powerpc

4 files changed, 32 insertions, 23 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index ca3fad54a421..df9266d1d249 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.46 2010/06/27 18:28:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.47 2010/09/03 18:03:12 grobian Exp $
+
+  03 Sep 2010; Fabian Groffen <grobian@gentoo.org>
+  +files/3.2.0-darwin.patch, geos-3.2.0-r1.ebuild:
+  Fix for Prefix and Darwin, bug #335811 and bug #335814
 
   27 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/3.2.0-python.patch,
   geos-3.2.0-r1.ebuild:
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index e6347d957c27..64f99ddcc2d1 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 3.2.0-darwin.patch 645 RMD160 71b22283eb9d95c41f2e05c9a390dbbca217d73d SHA1 5aca4d9caeb6e4927667b562c6d43a65ea79b977 SHA256 e8c48222af03a8e029ecfa8ceb4634c9baeee13a628d64ba7cb5dc7b1b1dfa9f
 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
@@ -8,14 +6,7 @@ AUX geos-3.1.1-missing-includes.patch 662 RMD160 8675c18376128d77c4a3c567bac3844
 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 2161 RMD160 f77f1ad0236fdef3a68495e70665cdcee4dd55af SHA1 536f8420baf2daa7624198a3d324112366446ab1 SHA256 1964b4a704ca7628f1fc357b6aa9cf6658f4ff73e927f9610450e9e0338ced39
+EBUILD geos-3.2.0-r1.ebuild 2271 RMD160 d7375bba247980cf70a6323199ca9fe9795cc23d SHA1 d7c6b0157c785c58cc39b1aaa582a3665f8a3a93 SHA256 92e21517e5ba32efbe9eaa5f72cf5c9d673baebbd30b77c83e05ba0ec2d76694
 EBUILD geos-3.2.0.ebuild 1381 RMD160 68ab7367728165f713b182c272d962adc2f51042 SHA1 9671347677898b648d80dfca3d8387f89e90f975 SHA256 d8ca2b913d9a0d4eed724e583dbdfea15703f247b67e72d29861e2a152a127c2
-MISC ChangeLog 8102 RMD160 162ac9c73d24038a60be8cfa4c7871c11841efd5 SHA1 bfb58f6eac1b08f3f4e56d0b18b70839e97db457 SHA256 6c2ea3ed599133ed610c11af44746ecde248c9e6542bce7785fcb104dea4ea6b
+MISC ChangeLog 8265 RMD160 5ad97c9ca9e13036fb70437a80e918068d3ffc02 SHA1 faa511527419ed717c06d9ffd7d229a7911cb35e SHA256 931300fc1ba0a31a718d9c529a044a85b8f64cd0f9a9e1f64a1ff5a7a93c674a
 MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwnmDgACgkQgAnW8HDreRYpjQCgqsj3D92aLRJh5TFk06OEdBNT
-JusAoLp742/PvnhpYv4ehUflbov+DnxT
-=5evO
------END PGP SIGNATURE-----
diff --git a/sci-libs/geos/files/3.2.0-darwin.patch b/sci-libs/geos/files/3.2.0-darwin.patch
new file mode 100644
index 000000000000..2701b5906a7b
--- /dev/null
+++ b/sci-libs/geos/files/3.2.0-darwin.patch
@@ -0,0 +1,13 @@
+Also check for dylib before giving up, bug #335811
+
+--- macros/ac_python_devel.m4
++++ macros/ac_python_devel.m4
+@@ -42,7 +42,7 @@
+         # Check for Python library path
+         AC_MSG_CHECKING([for Python library path])
+         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
++        if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so && test ! -f "${python_path}"/libpython$PYTHON_VERSION.dylib ; then
+                 python_path=""
+         fi
+         AC_MSG_RESULT([$python_path])
diff --git a/sci-libs/geos/geos-3.2.0-r1.ebuild b/sci-libs/geos/geos-3.2.0-r1.ebuild
index fc29ea6fa9fa..9330669b841b 100644
--- a/sci-libs/geos/geos-3.2.0-r1.ebuild
+++ b/sci-libs/geos/geos-3.2.0-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.4 2010/06/27 18:28:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0-r1.ebuild,v 1.5 2010/09/03 18:03:12 grobian Exp $
 
-EAPI=2
+EAPI=3
 
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
@@ -34,9 +34,10 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-multipy.patch \
 		"${FILESDIR}"/${PV}-swig2.0.patch \
-		"${FILESDIR}"/${PV}-python.patch
+		"${FILESDIR}"/${PV}-python.patch \
+		"${FILESDIR}"/${PV}-darwin.patch
 	eautoreconf
-	echo "#!/bin/bash" > py-compile
+	echo "#!${EPREFIX}/bin/bash" > py-compile
 }
 
 src_configure() {
@@ -49,11 +50,11 @@ src_compile() {
 		python_copy_sources swig/python
 		building() {
 			emake \
-				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
 				PYTHON_LDFLAGS="$(python_get_library -l)" \
-				SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)"
+				SWIG_PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
+				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
+				pythondir="${EPREFIX}$(python_get_sitedir)"
 		}
 		python_execute_function -s --source-dir swig/python building
 	fi
@@ -70,8 +71,8 @@ src_install() {
 		installation() {
 			emake \
 			DESTDIR="${D}" \
-			pythondir="$(python_get_sitedir)" \
-			pyexecdir="$(python_get_sitedir)" \
+			pythondir="${EPREFIX}$(python_get_sitedir)" \
+			pyexecdir="${EPREFIX}$(python_get_sitedir)" \
 			install
 		}
 		python_execute_function -s --source-dir swig/python installation