Restrict Jython ABIs. Don't install .a files in Python and Ruby directories. Call python_mod_optimize() and python_mod_cleanup().

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

4 files changed, 55 insertions, 18 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 8d5ec36d3c1b..cc2cdffeac66 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.49 2011/01/07 10:11:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.50 2011/02/10 18:02:03 arfrever Exp $
+
+  10 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +files/3.2.2-disable_static_modules.patch, geos-3.2.2.ebuild:
+  Restrict Jython ABIs. Don't install .a files in Python and Ruby directories.
+  Call python_mod_optimize() and python_mod_cleanup().
 
   07 Jan 2011; Hans de Graaff <graaff@gentoo.org> geos-3.1.1.ebuild,
   geos-3.2.0.ebuild, geos-3.2.0-r1.ebuild, geos-3.2.2.ebuild:
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 41646000349b..859a95b46246 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
+AUX 3.2.2-disable_static_modules.patch 1171 RMD160 96175e5f23e26b36c935ca6b64084012c4dbb162 SHA1 02f6c861f0cfe4765c8be890237cbf28fdbc18ee SHA256 06a05800709b1daf67952cbe7c69aaf67bb66199e2e08b11c9568b1b894f8acd
 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
@@ -12,13 +10,6 @@ DIST geos-3.2.2.tar.bz2 1664073 RMD160 95342be083175f38c8c87b5682271253320f3d60
 EBUILD geos-3.1.1.ebuild 1291 RMD160 07e5ce910c67b94124c86d86fbe45c53a8baab04 SHA1 dfe67411e075113187bee5b63b95780714bec7c9 SHA256 6b9e817b6ecf2d5e31bd4ef442f3e15c02c64cf7184d2145889a7593f3123358
 EBUILD geos-3.2.0-r1.ebuild 2277 RMD160 ee04bc72079bc83429816c3ded1b42be7ab6460a SHA1 39b68a1a34a6714388b5304d4fe3116cc6c1bb89 SHA256 fe2a9fb936e07ddd86232df889654313f69dd31d4ea175c2e51a2e877e8d6f3f
 EBUILD geos-3.2.0.ebuild 1390 RMD160 c7ca79ce8a7af4b6189b354b921710389747050c SHA1 27b2a7354d36f38c7c954f1b4b3b2aa7f98412bc SHA256 a7514ab4f8aaddb8888f47dd918a5fa10c5ea7a0e6dd39e7253fa500e88df996
-EBUILD geos-3.2.2.ebuild 2272 RMD160 1c207a2d2d51c5629542e5b7ea3945e36d061f62 SHA1 79330441a7f33bd1bf6604964de25b87d824bf46 SHA256 2bca54bffb67c0f13ef7612e0e2ea7a9af6bd0886c37c8d78d9c7870ce96cc40
-MISC ChangeLog 8565 RMD160 fd9e0c7dd4e4195f56fc556c9a0275e00df0bc33 SHA1 1136e213ac9c522da9edd4e930b88d69e7850385 SHA256 d4d377ce2cc3e0e7d2644bd7b32347f6b7d4a9f95cd07d28d6806c959d619b5e
+EBUILD geos-3.2.2.ebuild 2494 RMD160 59514417dfdbbbd8e037aae0d210d0af685c2fda SHA1 6f90f2d81ef0323b8bf7b1d6d64a9b36f86e7607 SHA256 d3bbf0fde640151b574745ca39a5a0572d5a6f146ed9c2358c7e2a1b51d3481a
+MISC ChangeLog 8839 RMD160 b597837048cc4fd1b8096e24755497826a29c1e9 SHA1 7556e43802f9a72ce081396f8d429b2fcbfcc230 SHA256 0ae64cae9362cd7d5281e55e97e7f617167e9773ebad7778bb0a44e7ab21c943
 MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iF4EAREIAAYFAk0m5vMACgkQrnu0mw69JkoK+QD8DTxG/AbxP/cbvXGVCsODoVa3
-3/eLL7hP2IiFPBXy0UUA/1UPiuTXCI/Qbe/chrUMtzIuIshSqQcPBQHrX8BoaQhN
-=HuL0
------END PGP SIGNATURE-----
diff --git a/sci-libs/geos/files/3.2.2-disable_static_modules.patch b/sci-libs/geos/files/3.2.2-disable_static_modules.patch
new file mode 100644
index 000000000000..6df8da74bad5
--- /dev/null
+++ b/sci-libs/geos/files/3.2.2-disable_static_modules.patch
@@ -0,0 +1,29 @@
+--- swig/python/Makefile.am
++++ swig/python/Makefile.am
+@@ -18,9 +18,9 @@
+ _geos_la_SOURCES = geos_wrap.cxx 
+ 
+ # Only need to grab the capi header files
+-_geos_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_builddir)/capi
++_geos_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_builddir)/capi -shared
+ # Specify -module and -avoid-version so we can create a file called geos.dll/so which is what Python wants
+-_geos_la_LDFLAGS = -no-undefined -module -avoid-version
++_geos_la_LDFLAGS = -no-undefined -module -avoid-version -shared
+ _geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la $(PYTHON_LDFLAGS)
+ 
+ 
+--- swig/ruby/Makefile.am
++++ swig/ruby/Makefile.am
+@@ -22,10 +22,10 @@
+ geos_la_LIBADD =  $(top_builddir)/capi/libgeos_c.la -l$(RUBY_SO_NAME)
+ 
+ # Only need to grab the capi header files
+-geos_la_CPPFLAGS = -I$(top_builddir)/capi
++geos_la_CPPFLAGS = -I$(top_builddir)/capi -shared
+ 
+ # Specify -module and -avoid-version so we can create a file called geos.dll/so which is what Ruby wants
+-geos_la_LDFLAGS = -no-undefined  -module -avoid-version -L$(RUBY_LIB_DIR)
++geos_la_LDFLAGS = -no-undefined  -module -avoid-version -shared -L$(RUBY_LIB_DIR)
+ 
+ if ENABLE_SWIG
+ 
diff --git a/sci-libs/geos/geos-3.2.2.ebuild b/sci-libs/geos/geos-3.2.2.ebuild
index d05782b022b5..065f3bfc23c0 100644
--- a/sci-libs/geos/geos-3.2.2.ebuild
+++ b/sci-libs/geos/geos-3.2.2.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.2.ebuild,v 1.2 2011/01/07 10:11:57 graaff Exp $
-
-EAPI=3
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.2.ebuild,v 1.3 2011/02/10 18:02:03 arfrever Exp $
 
+EAPI="3"
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit autotools eutils python
 
@@ -35,7 +34,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/3.2.0-multipy.patch \
 		"${FILESDIR}"/3.2.0-swig2.0.patch \
 		"${FILESDIR}"/3.2.0-python.patch \
-		"${FILESDIR}"/3.2.0-darwin.patch
+		"${FILESDIR}"/3.2.0-darwin.patch \
+		"${FILESDIR}"/3.2.2-disable_static_modules.patch
 	eautoreconf
 	echo "#!${EPREFIX}/bin/bash" > py-compile
 }
@@ -84,3 +84,15 @@ src_install() {
 		dohtml -r doxygen_docs/html/* || die
 	fi
 }
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize geos/geos.py
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup geos/geos.py
+	fi
+}