Fix for Python ABIs, #316221; corrected HOMEPAGE

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

6 files changed, 110 insertions, 12 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 685adf6b8099..e22acb819e6a 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,12 @@
 # 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.42 2010/01/12 20:09:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.43 2010/06/26 11:50:13 jlec Exp $
+
+*geos-3.2.0-r1 (26 Jun 2010)
+
+  26 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/3.2.0-multipy.patch,
+  geos-3.1.1.ebuild, geos-3.2.0.ebuild, +geos-3.2.0-r1.ebuild:
+  Fix for Python ABIs, #316221; corrected HOMEPAGE
 
   12 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> geos-3.2.0.ebuild:
   Fixed for strict amd64
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 5b8c5adee94d..18fcd595603e 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 3.2.0-multipy.patch 276 RMD160 a0cff4e5b14c1ed84d70860fd1a7c41efeea6e72 SHA1 55e25a3a89bbbaf8eaf1814f10f13b36597e1d94 SHA256 b2f1d11f953c456cad975afcb78a27005eb025e1beae2621c92cb139b44fef8c
 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 1285 RMD160 dae933bcdf4703c05760f470dcd3773b37747e4e SHA1 286f4d6eb880921df067cfce7fca32852880e674 SHA256 7968ad63d78169161ee447dd985099734e8e3a7f0efbd58188b1d1c91254163f
-EBUILD geos-3.2.0.ebuild 1385 RMD160 3159341b59ffee4fd3dadad857d63e0557c64aeb SHA1 51493cf04f5bde51a079be406a72df61cd804dae SHA256 c15a0d270349b164226e24594ce90dd94fc6c2ab726694366f1dd2fe16cf510c
-MISC ChangeLog 7331 RMD160 b9ba37f90f550e1768f486cb7e2940e2938cd49f SHA1 5aad7e32c5d0c0ce7c490032972f8aa361f213dc SHA256 9aab3d1e32fd0b066b4cda9346a4af5b4145cd139da2239885086684580b444c
+EBUILD geos-3.1.1.ebuild 1281 RMD160 cb393f3abdab15786ab4d5798ac4298182dfa6bd SHA1 aeefa9f0a16c37caac8b9db7332489b1c54b6d45 SHA256 298aaee394248b3f62640e9217ae13cd446455afea94fca977f4292029c7b044
+EBUILD geos-3.2.0-r1.ebuild 2029 RMD160 37e984ce4754b2d02caf3c97cdec368cd0f88644 SHA1 1d097a5e88748bb8314919ff807b0cb40a2e3b33 SHA256 5eefd9ef002a7fc72cd1f07bd35bcfc7a63c3447a20527b07c486bfca2243b7c
+EBUILD geos-3.2.0.ebuild 1381 RMD160 68ab7367728165f713b182c272d962adc2f51042 SHA1 9671347677898b648d80dfca3d8387f89e90f975 SHA256 d8ca2b913d9a0d4eed724e583dbdfea15703f247b67e72d29861e2a152a127c2
+MISC ChangeLog 7547 RMD160 b6ae45e23a6a3947c6c702bb04819aa54bde7d7e SHA1 e5a910f28baf5167e0b26c9879a7c5360517d1d3 SHA256 e73a9af2b22429f547601765bb95dd63cda8b0ee50792bb3a0f405927e3d23e5
 MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktM34gACgkQ1ycZbhPLE2CI2wCgtEP3bczaPrxUTK0rdCPTkqfD
-VDIAnR9DSglzC9Ci5tEmxZ6q3XwzoUn5
-=fbGE
+iEYEARECAAYFAkwl6XwACgkQgAnW8HDreRZFCACgoxW9jgEPtVqv6oyfy0fUgNnJ
+MwEAn202e824ZOIew20jAUBkjdr7zalV
+=Crvv
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/geos/files/3.2.0-multipy.patch b/sci-libs/geos/files/3.2.0-multipy.patch
new file mode 100644
index 000000000000..652b0f64d871
--- /dev/null
+++ b/sci-libs/geos/files/3.2.0-multipy.patch
@@ -0,0 +1,13 @@
+diff --git a/swig/Makefile.am b/swig/Makefile.am
+index 765744d..ed40831 100644
+--- a/swig/Makefile.am
++++ b/swig/Makefile.am
+@@ -6,7 +6,7 @@ if ENABLE_RUBY
+   MAYBERUBY = ruby
+ endif
+ 
+-SUBDIRS = $(MAYBEPYTHON) $(MAYBERUBY)
++SUBDIRS = $(MAYBERUBY)
+ 
+ EXTRA_DIST = \
+ 	geos.i 
diff --git a/sci-libs/geos/geos-3.1.1.ebuild b/sci-libs/geos/geos-3.1.1.ebuild
index 841892fa98b2..f514f9916b57 100644
--- a/sci-libs/geos/geos-3.1.1.ebuild
+++ b/sci-libs/geos/geos-3.1.1.ebuild
@@ -1,12 +1,12 @@
 # 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.1.1.ebuild,v 1.8 2010/01/07 02:50:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.1.1.ebuild,v 1.9 2010/06/26 11:50:13 jlec Exp $
 
 EAPI=2
 inherit eutils
 
 DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://geos.refractions.net"
+HOMEPAGE="http://trac.osgeo.org/geos/"
 SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/sci-libs/geos/geos-3.2.0-r1.ebuild b/sci-libs/geos/geos-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..407c60901acb
--- /dev/null
+++ b/sci-libs/geos/geos-3.2.0-r1.ebuild
@@ -0,0 +1,77 @@
+# 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.1 2010/06/26 11:50:13 jlec Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit autotools eutils python
+
+DESCRIPTION="Geometry engine library for Geographic Information Systems"
+HOMEPAGE="http://trac.osgeo.org/geos/"
+SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc python ruby"
+
+RDEPEND="ruby? ( virtual/ruby )
+	python? ( virtual/python )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	ruby?  ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-multipy.patch
+	eautoreconf
+	echo "#!/${EPREFIX}/bin/bash" > py-compile
+}
+
+src_configure() {
+	econf $(use_enable python) $(use_enable ruby)
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use python; then
+		python_copy_sources swig/python
+		building() {
+			emake \
+				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				PYTHON_LDFLAGS="$(python_get_library -l)" \
+				SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir swig/python building
+	fi
+	if use doc; then
+		cd "${S}/doc"
+		emake doxygen-html || die "doc generation failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if use python; then
+		python_copy_sources swig/python
+		installation() {
+			emake \
+			DESTDIR="${D}" \
+			pythondir="$(python_get_sitedir)" \
+			pyexecdir="$(python_get_sitedir)" \
+			install
+		}
+		python_execute_function -s --source-dir swig/python installation
+		python_clean_installation_image
+	fi
+	dodoc AUTHORS NEWS README TODO || die
+	if use doc; then
+		cd "${S}/doc"
+		dohtml -r doxygen_docs/html/* || die
+	fi
+}
diff --git a/sci-libs/geos/geos-3.2.0.ebuild b/sci-libs/geos/geos-3.2.0.ebuild
index 833545c41f68..29d0fa5d984a 100644
--- a/sci-libs/geos/geos-3.2.0.ebuild
+++ b/sci-libs/geos/geos-3.2.0.ebuild
@@ -1,11 +1,11 @@
 # 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.ebuild,v 1.2 2010/01/12 20:09:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.0.ebuild,v 1.3 2010/06/26 11:50:14 jlec Exp $
 
 EAPI=2
 
 DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://geos.refractions.net"
+HOMEPAGE="http://trac.osgeo.org/geos/"
 SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"