diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-11 13:43:29 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-11 13:43:29 +0000 |
| commit | 1e62f2c5fbb7f030d6014b6d026abb69961f35c7 (patch) | |
| tree | 973ed0160177f798bb33b24e8da3d448d0251657 | |
| parent | Update to eapi4. Punt .la file. (diff) | |
| download | historical-1e62f2c5fbb7f030d6014b6d026abb69961f35c7.tar.gz historical-1e62f2c5fbb7f030d6014b6d026abb69961f35c7.tar.bz2 historical-1e62f2c5fbb7f030d6014b6d026abb69961f35c7.zip | |
Make static libs optional. Punt .la files.
| -rw-r--r-- | sci-libs/geos/Manifest | 12 | ||||
| -rw-r--r-- | sci-libs/geos/geos-3.2.2.ebuild | 24 |
2 files changed, 13 insertions, 23 deletions
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index a9d45acb332d..02ae0c72ddf4 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,6 +1,3 @@ ------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 @@ -8,13 +5,6 @@ AUX 3.2.0-swig2.0.patch 1056 RMD160 40f4b89cec57d1db7907679ff28b967c5702b7c4 SHA AUX 3.2.2-disable_static_modules.patch 1171 RMD160 96175e5f23e26b36c935ca6b64084012c4dbb162 SHA1 02f6c861f0cfe4765c8be890237cbf28fdbc18ee SHA256 06a05800709b1daf67952cbe7c69aaf67bb66199e2e08b11c9568b1b894f8acd AUX 3.2.2-gcc46.patch 6922 RMD160 48a25930dc1745be106699c69868cec3204a700d SHA1 ca68cadc11397e74a5acd11ead28702e69f7e44a SHA256 ee2f1cc05f8c734f0dee64d0f36623be28ac39ac734914fc323b841c559387dd DIST geos-3.2.2.tar.bz2 1664073 RMD160 95342be083175f38c8c87b5682271253320f3d60 SHA1 6917d6d1d4e79f58d9f931bf351024709fabbc5a SHA256 24df7c2119936fe0bcaa66e0b05aa28a875e373095cc05ee7eff404330e3211c -EBUILD geos-3.2.2.ebuild 2537 RMD160 fb0639fe2e20de2befd66f23870f93c42c007611 SHA1 03d64cfd71807690501ba1cb9f11355642022875 SHA256 a941292d3ee6f8e64dbfe1d0f7612176439f10acbce5d21cdd98be9f4e1c6651 +EBUILD geos-3.2.2.ebuild 2604 RMD160 467a436d7d386f1d1fae1a99800dcb3bbdd2adf3 SHA1 25463dd3bfc34d0b8cb2ea534795d7d9fc1196a3 SHA256 e10aa03896fe32a411069316985a794991e306b3ba7d813d8e42f8e3ef1a3df4 MISC ChangeLog 9802 RMD160 bbb30056136be8420f8f3be512426319cee006da SHA1 64aa847dfe5803b7ab90d38978bf63a2d05b787f SHA256 84824482d72289f4442df1679fe3b7795544bfb0964fbf2c49ec011d03bd8a6f MISC metadata.xml 715 RMD160 eda84d8b69d36778b897e2ca30b650b36982cc8e SHA1 bb28beda5dd745138094f4f1275734e12c4c9c03 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (SunOS) - -iEYEARECAAYFAk2/5IkACgkQX3X2B8XHTom/EgCfclKDt6Qtj7Ss4N1wVY7qYg81 -2WUAn2nBEvkeVZcyHllWr7cMleCiEZsK -=od93 ------END PGP SIGNATURE----- diff --git a/sci-libs/geos/geos-3.2.2.ebuild b/sci-libs/geos/geos-3.2.2.ebuild index 25c2e68935a1..8ccec5dc2159 100644 --- a/sci-libs/geos/geos-3.2.2.ebuild +++ b/sci-libs/geos/geos-3.2.2.ebuild @@ -1,6 +1,6 @@ # 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.10 2011/05/03 11:18:28 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.2.ebuild,v 1.11 2011/06/11 13:43:29 scarabeus Exp $ EAPI="3" @@ -17,7 +17,7 @@ SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" -IUSE="doc python ruby" +IUSE="doc python ruby static-libs" RDEPEND="ruby? ( dev-lang/ruby:1.8 )" DEPEND="${RDEPEND} @@ -26,9 +26,7 @@ DEPEND="${RDEPEND} python? ( dev-lang/swig )" pkg_setup() { - if use python; then - python_pkg_setup - fi + use python && python_pkg_setup } src_prepare() { @@ -44,7 +42,10 @@ src_prepare() { } src_configure() { - econf $(use_enable python) $(use_enable ruby) + econf \ + $(use_enable python) \ + $(use_enable ruby) \ + $(use_enable static-libs static) } src_compile() { @@ -81,21 +82,20 @@ src_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 + + find "${ED}" -name '*.la' -exec rm -f {} + } pkg_postinst() { - if use python; then - python_mod_optimize geos/geos.py - fi + use python && python_mod_optimize geos/geos.py } pkg_postrm() { - if use python; then - python_mod_cleanup geos/geos.py - fi + use python && python_mod_cleanup geos/geos.py } |