patched the swig stuff so python works correctly

Package-Manager: portage-2.1.1_pre2-r2

5 files changed, 143 insertions, 40 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index e842cf52d3c3..365684b12da0 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.13 2006/05/25 23:33:35 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.14 2006/07/03 23:49:22 nerdboy Exp $
+
+  03 Jul 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/geos-2.2.2-swig.patch, +files/python.i, geos-2.2.2.ebuild:
+  Patched the swig stuff so python works correctly; the 3.0 release should
+  fix it (and add ruby support).  Note that the python wrapper implies static.
 
   25 May 2006; Steve Arnold <nerdboy@gentoo.org> geos-2.2.1.ebuild:
   Should have picked this one up earlier (inadvertantly omitted ppc).
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index deeaf38f93fb..72be44b70aa6 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,32 +1,40 @@
-AUX geos-2.2.1-gcc-41.patch 2888 RMD160 579e1c58ed74c66c75fbb01de9e397d277804cd8 SHA1 9ccd6b1a5485ce710b499c4eb40c5a8e3c131001 SHA256 f43992b255f32ec816e84684cf4d9c0d1381dd51a4dee87b756fc2bca193c030 size 2888
+AUX geos-2.2.1-gcc-41.patch 2888 RMD160 579e1c58ed74c66c75fbb01de9e397d277804cd8 SHA1 9ccd6b1a5485ce710b499c4eb40c5a8e3c131001 SHA256 f43992b255f32ec816e84684cf4d9c0d1381dd51a4dee87b756fc2bca193c030
 MD5 02aa9da6a542bbc1d1f69beee9fbd377 files/geos-2.2.1-gcc-41.patch 2888
 RMD160 579e1c58ed74c66c75fbb01de9e397d277804cd8 files/geos-2.2.1-gcc-41.patch 2888
 SHA256 f43992b255f32ec816e84684cf4d9c0d1381dd51a4dee87b756fc2bca193c030 files/geos-2.2.1-gcc-41.patch 2888
-DIST geos-2.1.2.tar.bz2 523477 RMD160 7688b319c122c38e2090bf0591a0230cdc593e12 SHA256 b7a0dc49f4197750afd5e6b21c8cedf6d0fab2201f5fd9ea41a6a422a11a9755 size 523477
-DIST geos-2.1.4.tar.bz2 506683 RMD160 913f5ead995fd4daebf7be5bd71fbd7ddc8a5346 SHA256 887f504cccc321a56e3cbb380643755100ef5d7af629ea63aaa2964583842e88 size 506683
-DIST geos-2.2.1.tar.bz2 533286 RMD160 f3ea1cbf3cf6c107acc9e0b43d77a0dbf0b65b25 SHA256 c6f3e555897457d9f7e8dc26535fabbf393777689e897b7e365d71f22ee8d378 size 533286
-DIST geos-2.2.2.tar.bz2 554476 RMD160 52ccecf31aacd7d7fe1522ad7a608e2580525c17 SHA256 17a4cde96b159261cab40f25ee0215676ff98b48fd28a32e0663a07c4af0e69a size 554476
-EBUILD geos-2.1.2.ebuild 876 RMD160 62800c8b4b7f91701e6f49ce719ca469db5a1cbf SHA1 29999cb7cdfe5d00166e18b6326560f15e462bb3 SHA256 6164ee3d3057bf9a1bc348c1ce0ed252c1937777c05a497c91d6f7c9fbcda637 size 876
+AUX geos-2.2.2-swig.patch 1505 RMD160 56801a93aaf6ddedfd97efb2eeadb04361a5adfd SHA1 9138909c61943ac00a7c89ee2e999f544f137866 SHA256 871e86801a64bbb6b5fbafa8bed23e6f9fa513f0a5d88f919aaedb64219961ce
+MD5 70b92502580bd51021add3b462a19628 files/geos-2.2.2-swig.patch 1505
+RMD160 56801a93aaf6ddedfd97efb2eeadb04361a5adfd files/geos-2.2.2-swig.patch 1505
+SHA256 871e86801a64bbb6b5fbafa8bed23e6f9fa513f0a5d88f919aaedb64219961ce files/geos-2.2.2-swig.patch 1505
+AUX python.i 179 RMD160 b64f637b8d475f94f1e1319c700d6571dea7d410 SHA1 d0a92c5cbd888da380d1db847aa0004e46bfebb1 SHA256 ca71e5951088ffa7d571183eb0a9c0309b16305f451dc7a19fce91e91bca3a09
+MD5 fd33fc304cf7a479a5ea9c7362472489 files/python.i 179
+RMD160 b64f637b8d475f94f1e1319c700d6571dea7d410 files/python.i 179
+SHA256 ca71e5951088ffa7d571183eb0a9c0309b16305f451dc7a19fce91e91bca3a09 files/python.i 179
+DIST geos-2.1.2.tar.bz2 523477 RMD160 7688b319c122c38e2090bf0591a0230cdc593e12 SHA1 428742a202542b0d7989bcea14c669f3ed25bf88 SHA256 b7a0dc49f4197750afd5e6b21c8cedf6d0fab2201f5fd9ea41a6a422a11a9755
+DIST geos-2.1.4.tar.bz2 506683 RMD160 913f5ead995fd4daebf7be5bd71fbd7ddc8a5346 SHA1 9fe811851a57d3eeb3cc900b11f4f813e4680928 SHA256 887f504cccc321a56e3cbb380643755100ef5d7af629ea63aaa2964583842e88
+DIST geos-2.2.1.tar.bz2 533286 RMD160 f3ea1cbf3cf6c107acc9e0b43d77a0dbf0b65b25 SHA1 756aed7cb5b6b4e49e2d137e33d67637c4503ea5 SHA256 c6f3e555897457d9f7e8dc26535fabbf393777689e897b7e365d71f22ee8d378
+DIST geos-2.2.2.tar.bz2 554476 RMD160 52ccecf31aacd7d7fe1522ad7a608e2580525c17 SHA1 e74144c046560ee345cab19825eec1c2fff94d7a SHA256 17a4cde96b159261cab40f25ee0215676ff98b48fd28a32e0663a07c4af0e69a
+EBUILD geos-2.1.2.ebuild 876 RMD160 62800c8b4b7f91701e6f49ce719ca469db5a1cbf SHA1 29999cb7cdfe5d00166e18b6326560f15e462bb3 SHA256 6164ee3d3057bf9a1bc348c1ce0ed252c1937777c05a497c91d6f7c9fbcda637
 MD5 0987b0966732b5d0b15016c140e8d2e4 geos-2.1.2.ebuild 876
 RMD160 62800c8b4b7f91701e6f49ce719ca469db5a1cbf geos-2.1.2.ebuild 876
 SHA256 6164ee3d3057bf9a1bc348c1ce0ed252c1937777c05a497c91d6f7c9fbcda637 geos-2.1.2.ebuild 876
-EBUILD geos-2.1.4.ebuild 1593 RMD160 19c51f69a1886e1dd30cd608e4d816f0365aab54 SHA1 746508bb65d5ba7c1915e9a4be0318daca5b5dfb SHA256 71697cae01080775f4eac1a8b5bc7be18ba4385c5bb9da7e9c89ce0d9e9f2533 size 1593
+EBUILD geos-2.1.4.ebuild 1593 RMD160 19c51f69a1886e1dd30cd608e4d816f0365aab54 SHA1 746508bb65d5ba7c1915e9a4be0318daca5b5dfb SHA256 71697cae01080775f4eac1a8b5bc7be18ba4385c5bb9da7e9c89ce0d9e9f2533
 MD5 62caddd7251a98d882dbc0e266cd7ab3 geos-2.1.4.ebuild 1593
 RMD160 19c51f69a1886e1dd30cd608e4d816f0365aab54 geos-2.1.4.ebuild 1593
 SHA256 71697cae01080775f4eac1a8b5bc7be18ba4385c5bb9da7e9c89ce0d9e9f2533 geos-2.1.4.ebuild 1593
-EBUILD geos-2.2.1.ebuild 1652 RMD160 5a60becf27a2bf50da9a219d5e7d5f4d538c657a SHA1 5822ef6a25bdee2b705921053b9eb1fb6c44393e SHA256 27d1eb2f4b4dbc3719c4e50c7ade740afd9e4d1d76ec8d9ede2da6547c21ea82 size 1652
+EBUILD geos-2.2.1.ebuild 1652 RMD160 5a60becf27a2bf50da9a219d5e7d5f4d538c657a SHA1 5822ef6a25bdee2b705921053b9eb1fb6c44393e SHA256 27d1eb2f4b4dbc3719c4e50c7ade740afd9e4d1d76ec8d9ede2da6547c21ea82
 MD5 fb80952b114f449db1c31e5ec2b30c8d geos-2.2.1.ebuild 1652
 RMD160 5a60becf27a2bf50da9a219d5e7d5f4d538c657a geos-2.2.1.ebuild 1652
 SHA256 27d1eb2f4b4dbc3719c4e50c7ade740afd9e4d1d76ec8d9ede2da6547c21ea82 geos-2.2.1.ebuild 1652
-EBUILD geos-2.2.2.ebuild 1625 RMD160 85003e1d4c529952fee5ba021fbf448f556ab3c6 SHA1 1e24fe901ce484f512a762fc0fe696674857dfdb SHA256 7a4131330730c037bbbc35fef6c1d85b210d67c9a05073dc972448836a11835a size 1625
-MD5 cfd3cc4d164327f2824da79bc0d452ad geos-2.2.2.ebuild 1625
-RMD160 85003e1d4c529952fee5ba021fbf448f556ab3c6 geos-2.2.2.ebuild 1625
-SHA256 7a4131330730c037bbbc35fef6c1d85b210d67c9a05073dc972448836a11835a geos-2.2.2.ebuild 1625
-MISC ChangeLog 2392 RMD160 d241bfc83c118cb75dd16ab3926608803144a401 SHA1 30c4d11803df9e3bcd8dd3445578ace89ea2d091 SHA256 200af16e1a58ac85c053ae2d24f7949802a99b299665e136c429b86af55ea8bf size 2392
-MD5 264beb3b77c602f77e1c9c2aa728385d ChangeLog 2392
-RMD160 d241bfc83c118cb75dd16ab3926608803144a401 ChangeLog 2392
-SHA256 200af16e1a58ac85c053ae2d24f7949802a99b299665e136c429b86af55ea8bf ChangeLog 2392
-MISC metadata.xml 180 RMD160 b794acbc3e99d1c695e2851d3991709ff2ec0910 SHA1 85b29c4e7f43cfb580cca0535fcdcf42fe4d8867 SHA256 5baf5e15e90a096c52238fc2e896074db1940cf64120309895a1133ff4065bdb size 180
+EBUILD geos-2.2.2.ebuild 2201 RMD160 85d26f40ef0da8ad28fe40e31cda0b3ce2d20566 SHA1 c243345d3028637a340b7c1726282e26c82a65f9 SHA256 8493e40310f9ec1d1c3abaa91c3046f6f65e99a9fee1607de5eaa1d329199bc3
+MD5 9cc7a297e801d714584728924d5a2796 geos-2.2.2.ebuild 2201
+RMD160 85d26f40ef0da8ad28fe40e31cda0b3ce2d20566 geos-2.2.2.ebuild 2201
+SHA256 8493e40310f9ec1d1c3abaa91c3046f6f65e99a9fee1607de5eaa1d329199bc3 geos-2.2.2.ebuild 2201
+MISC ChangeLog 2664 RMD160 66c8246cb22dd429dadcd34118af863c5a95718e SHA1 64c108e1e675b37c96d5d52d2b6c23fb17e2490d SHA256 192e1359156b27172adfd7d3d2f8daff3cbcc962fd94d0edc33590b87aee6b5b
+MD5 f913e847213078cd56d1e81e1fbd240e ChangeLog 2664
+RMD160 66c8246cb22dd429dadcd34118af863c5a95718e ChangeLog 2664
+SHA256 192e1359156b27172adfd7d3d2f8daff3cbcc962fd94d0edc33590b87aee6b5b ChangeLog 2664
+MISC metadata.xml 180 RMD160 b794acbc3e99d1c695e2851d3991709ff2ec0910 SHA1 85b29c4e7f43cfb580cca0535fcdcf42fe4d8867 SHA256 5baf5e15e90a096c52238fc2e896074db1940cf64120309895a1133ff4065bdb
 MD5 4b491a816a154aafb3877b71ae44bda2 metadata.xml 180
 RMD160 b794acbc3e99d1c695e2851d3991709ff2ec0910 metadata.xml 180
 SHA256 5baf5e15e90a096c52238fc2e896074db1940cf64120309895a1133ff4065bdb metadata.xml 180
diff --git a/sci-libs/geos/files/geos-2.2.2-swig.patch b/sci-libs/geos/files/geos-2.2.2-swig.patch
new file mode 100644
index 000000000000..ee7121970493
--- /dev/null
+++ b/sci-libs/geos/files/geos-2.2.2-swig.patch
@@ -0,0 +1,56 @@
+--- swig/geos.i.orig	2006-07-03 14:06:23.000000000 -0700
++++ swig/geos.i	2006-07-03 14:11:37.000000000 -0700
+@@ -163,7 +163,6 @@
+ %newobject GeometricShapeFactory::getEnvelope;
+ 
+ %newobject WKBReader::read;
+-%newobject WKBReader::readHEX;
+ %newobject WKTReader::read;
+ }
+ 
+@@ -183,12 +182,6 @@
+ 				 geos::MultiPoint, geos::MultiLineString,
+ 				 geos::MultiPolygon, geos::GeometryCollection);
+ 
+-%factory(geos::Geometry * geos::WKBReader::readHEX, geos::Point, 
+-				 geos::LinearRing, geos::LineString,
+-				 geos::Polygon, 
+-				 geos::MultiPoint, geos::MultiLineString,
+-				 geos::MultiPolygon, geos::GeometryCollection);
+-
+ %factory(geos::Geometry * geos::Geometry::downcast, geos::Point, 
+ 				 geos::LinearRing, geos::LineString,
+ 				 geos::Polygon, 
+@@ -294,32 +287,3 @@
+ 	 objects.  So create a global factory.*/
+ 
+ /* Add some helper methods to geometries */
+-%extend geos::Geometry {
+-	static geos::GeometryFactory& factory()
+-	{
+-		static geos::GeometryFactory factory;
+-		return factory;
+-	}
+-
+-	static geos::WKBReader& reader()
+-	{
+-		#if GEOS_VERSION_MAJOR == 2
+-		static geos::WKBReader reader(geos_Geometry_factory());
+-		#else
+-		static geos::io::WKBReader reader(geos_Geometry_factory());
+-		#endif
+-		return reader;
+-	}
+-
+-	static Geometry* fromWKT(std::string wkt)
+-	{
+-		std::stringstream in(wkt);
+-		return geos_Geometry_reader().read(in);
+-	}
+-	
+-	static Geometry* fromHEX(std::string hex)
+-	{
+-		std::stringstream in(hex);
+-		return geos_Geometry_reader().readHEX(in);
+-	}
+-};
diff --git a/sci-libs/geos/files/python.i b/sci-libs/geos/files/python.i
new file mode 100644
index 000000000000..8218e3ee72b0
--- /dev/null
+++ b/sci-libs/geos/files/python.i
@@ -0,0 +1,3 @@
+%template(vector_GeometryP) std::vector<geos::Geometry *>;
+%template(vector_LineStringP) std::vector<geos::LineString *>;
+%template(vector_PolygonP) std::vector<geos::Polygon *>;
diff --git a/sci-libs/geos/geos-2.2.2.ebuild b/sci-libs/geos/geos-2.2.2.ebuild
index 6681406d89ce..6e34c0573ce2 100644
--- a/sci-libs/geos/geos-2.2.2.ebuild
+++ b/sci-libs/geos/geos-2.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.2.2.ebuild,v 1.1 2006/05/25 19:18:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.2.2.ebuild,v 1.2 2006/07/03 23:49:22 nerdboy Exp $
 
-inherit eutils
+inherit eutils distutils autotools kde-functions
 
 DESCRIPTION="Geometry Engine - Open Source"
 HOMEPAGE="http://geos.refractions.net"
@@ -15,55 +15,86 @@ IUSE="static doc python"
 
 RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
-		doc? ( app-doc/doxygen )\
-		python? ( dev-lang/python dev-lang/swig )"
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/python
+		  >=dev-lang/swig-1.3.29 )"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
 	cd ${S}
-	libtoolize --force
+	need-autoconf 2.5
+	elibtoolize
+	use python && epatch ${FILESDIR}/${P}-swig.patch
+}
 
+src_compile() {
+	cd ${S}
 	local myconf
 	myconf=""
-	use static && myconf="$(use_enable static)"
+	if use static; then
+	    myconf="$(use_enable static)"
+	elif use python || use ruby; then
+	    myconf="--with-pic"
+	else
+	    myconf="--with-pic --enable-static=no"
+	fi
 
 	econf ${myconf} || die "Error: econf failed"
 
 	# intermittent build failures with emake
 	make || die "Error: make failed"
+
 	if use python; then
 		einfo "Compilling PyGEOS"
 		cd ${S}/swig/python
+		cp ${FILESDIR}/python.i ${S}/swig/python/
+		rm -f geos_wrap.cxx
 		swig -c++ -python -modern -o geos_wrap.cxx ../geos.i
-		python setup.py build
+		distutils_src_compile
 	fi
 }
 
 src_test() {
 	cd ${S}
 	make check || die "Tring make check without success."
-# I think this test must be made after the PyGEOS installation
-#	if use python; then
-#		cd ${S}/swig/python
-#		python tests/runtests.py -v
-#	fi
+	# I think this test must be made after the PyGEOS installation
+	#export PYTHONPATH=${S}/swig/python
+	if use python; then
+		cd ${S}/swig/python
+		python tests/runtests.py -v
+	fi
 }
 
 src_install(){
-	into /usr
-	einstall
-	dodoc AUTHORS COPYING INSTALL NEWS README TODO
-	if use doc; then
-		cd ${S}/doc
-		make doxygen-html
-		dohtml -r doxygen_docs/html/*
-	fi
+	make install DESTDIR=${D} || die "make install failed"
+
 	if use python; then
 		einfo "Intalling PyGEOS"
 		cd ${S}/swig/python
-		python setup.py install --prefix="${D}/usr/"
+		distutils_src_install
 		insinto /usr/share/doc/${PF}/python
 		doins README.txt tests/*.py
 		insinto /usr/share/doc/${PF}/python/cases
 		doins tests/cases/*
 	fi
+	dodoc AUTHORS COPYING INSTALL NEWS README TODO
+	if use doc; then
+		cd ${S}/doc
+		make doxygen-html
+		dohtml -r doxygen_docs/html/*
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+	    python_version
+	    python_mod_optimize ${ROOT}usr/bin
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+	    python_version
+	    python_mod_cleanup
+	fi
 }