Fixed compilation of python bindings using shared lib (bug #208220)

Package-Manager: portage-2.1.4.3

4 files changed, 31 insertions, 4 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 648367805265..54c47f46011a 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.25 2008/01/04 17:03:22 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.26 2008/02/13 13:52:35 bicatali Exp $
+
+  13 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/geos-2.2.3-python-shared.patch, geos-2.2.3.ebuild:
+  Fixed compilation of python bindings using shared lib (bug #208220)
 
 *geos-3.0.0 (04 Jan 2008)
 
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index def53d46c4ab..4d5f781023b5 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX geos-2.2.1-gcc-41.patch 2888 RMD160 579e1c58ed74c66c75fbb01de9e397d277804cd8 SHA1 9ccd6b1a5485ce710b499c4eb40c5a8e3c131001 SHA256 f43992b255f32ec816e84684cf4d9c0d1381dd51a4dee87b756fc2bca193c030
+AUX geos-2.2.3-python-shared.patch 536 RMD160 3dc56f244988f165898ea76974f4d21218fcdd00 SHA1 c5db575b04bc2d6e35317284ba1f028d8ce5dc4d SHA256 c3a1a71c73975c65686b389333a5e80fb33b119f0e98fe11374c33999ada50df
 AUX geos-2.2.3-swig.patch 1505 RMD160 56801a93aaf6ddedfd97efb2eeadb04361a5adfd SHA1 9138909c61943ac00a7c89ee2e999f544f137866 SHA256 871e86801a64bbb6b5fbafa8bed23e6f9fa513f0a5d88f919aaedb64219961ce
 AUX geos-3.0.0_rc3-amd64.patch 888 RMD160 6958b811bcc28fdce7426baab0791ea3a8e2bb7e SHA1 265f9d1b23a514b3f4a7c7417b8e48f0b31f4226 SHA256 6376b33276e21f2d7acc8d92ddfb82904658dc9a3001363136a91bb16291bba1
 AUX python.i 179 RMD160 b64f637b8d475f94f1e1319c700d6571dea7d410 SHA1 d0a92c5cbd888da380d1db847aa0004e46bfebb1 SHA256 ca71e5951088ffa7d571183eb0a9c0309b16305f451dc7a19fce91e91bca3a09
@@ -7,8 +11,15 @@ DIST geos-2.2.3.tar.bz2 554802 RMD160 968de157f96f41aa71d5ef7c28c7186e8db0939e S
 DIST geos-3.0.0.tar.bz2 1091475 RMD160 195fb24de2f67d515f629f1dcb3dccec7711bdac SHA1 71090220351c8ae7bb147d74145fa5daf83e3c26 SHA256 baa86c5125a349504e3890312e68ab3bf3601489cefe9ceb9f659e34bbe5eb4f
 DIST geos-3.0.0rc3.tar.bz2 1031379 RMD160 36a41024be00613be4e7fe336f715bb25b638197 SHA1 8bf9abf07cd4d0006e88725580de573046e0bbaa SHA256 8ec0a51c48d79dfe1a051bef80a6a8978205321906c5563a8dd85012f3044dd5
 EBUILD geos-2.2.1.ebuild 1424 RMD160 f4710b62cd584037b6743d00fa60286b891f4c0a SHA1 e76cb6ac6222dc33876a975c59f46d3e96399991 SHA256 9bade20c7597d35ba802402c3ee33e216c2c928d7243234a55530dae62797e03
-EBUILD geos-2.2.3.ebuild 2858 RMD160 cb911d0fa618a9b3db0045a7723bce624b26cb2f SHA1 ecb72e20dba55b019ab90ac87d284eafa4434c56 SHA256 864f6c8dcbade882e6ca3dc2db2e6f656c6844c32fc66e5ee9fd1ecc273bd4bd
+EBUILD geos-2.2.3.ebuild 2905 RMD160 6394d794a7aa3da3f157628a09e04f41133cfdc2 SHA1 fcdda3a14ed6e7154b659aa162c525a27cde58ed SHA256 dfec95f72eab332bd2ebf1056a4d4b8693a43d3913908e0050317f608f44d20a
 EBUILD geos-3.0.0.ebuild 1191 RMD160 b0d3e0c8bc72414c6ef63b51d17905f427101977 SHA1 c2cc4b0a28cbd942763fd040e46c8bbd0e80fabb SHA256 2ccecf4423894c6123c97ba537f1a55ab3425cf9c8e9ddacf1ba486bc7d27621
 EBUILD geos-3.0.0_rc3.ebuild 1241 RMD160 b543946d0531ba801c6df14f1bd5daaf1d64ace1 SHA1 d6e3e58bb5854cc4ecb029d6ea61550e616f71d1 SHA256 93c393c75f9bfc0579c78278fc8a4a192e2cf41b8fa5368f47fd2dbb51578c67
-MISC ChangeLog 4638 RMD160 e9818296676144599c92a6f2c1c59f3e3d07b5dd SHA1 a41cdb399826018107efb7cfc98a30925af3d2d7 SHA256 2f279018d322fbbccf27970f312814d209582a9ad593efa0e90bcbce9a901f01
+MISC ChangeLog 4824 RMD160 7c02c0d735d8234facb89d00980db23a6ab1cca9 SHA1 5a7a1dbab0fc336ea8f79fb4bda66f0f9f210234 SHA256 2e4233f35f8867ab7e2af73dc4f868b7114e6b433092693acf0501a25cd90e79
 MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHsvYu1ycZbhPLE2ARAupiAKCl/WO9rjXCyAK3blv+EsTbnkwEcwCgidGD
+mpIMydmljoW85BvHGoarpJc=
+=PMB0
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/geos/files/geos-2.2.3-python-shared.patch b/sci-libs/geos/files/geos-2.2.3-python-shared.patch
new file mode 100644
index 000000000000..a97fac78b8c3
--- /dev/null
+++ b/sci-libs/geos/files/geos-2.2.3-python-shared.patch
@@ -0,0 +1,11 @@
+--- swig/python/setup.py.orig	2008-02-13 10:50:26.530716975 +0000
++++ swig/python/setup.py	2008-02-13 10:50:03.453401874 +0000
+@@ -31,7 +31,7 @@
+                    include_dirs = ["../../source/headers",
+                                    "../../source/headers/geos"],
+                    libraries = ["stdc++"],
+-                   extra_objects = ["../../source/geom/.libs/libgeos.a"])
++                   extra_objects = ["../../source/geom/.libs/libgeos.so"])
+ 
+ # the python module, generated by SWIG from geos.i
+ pymod = "geos"
diff --git a/sci-libs/geos/geos-2.2.3.ebuild b/sci-libs/geos/geos-2.2.3.ebuild
index 5e3a0ab9e18d..0624d28d5e34 100644
--- a/sci-libs/geos/geos-2.2.3.ebuild
+++ b/sci-libs/geos/geos-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.2.3.ebuild,v 1.4 2008/01/04 17:03:22 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.2.3.ebuild,v 1.5 2008/02/13 13:52:35 bicatali Exp $
 
 USE_RUBY="ruby18"
 RUBY_OPTIONAL="yes"
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-swig.patch"
+	epatch "${FILESDIR}/${P}-python-shared.patch"
 }
 
 src_compile() {