From 28b2c5fb8575c2c611c9ec76ffe6de1d2d1c07d1 Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Fri, 14 Apr 2006 19:56:06 +0000 Subject: Version bump, thanks to Etienne Dube for the bumped ebuild and Lucas Chiesa for his work on it, closes bug 120479. Thanks to Bret Towe for the GCC 4.1 patch, closes bug 126490. (Portage version: 2.1_pre7-r5) --- sci-libs/geos/ChangeLog | 13 +++- sci-libs/geos/Manifest | 37 ++++++++-- sci-libs/geos/files/digest-geos-2.2.1 | 3 + sci-libs/geos/files/geos-2.2.1-gcc-41.patch | 110 ++++++++++++++++++++++++++++ sci-libs/geos/geos-2.2.1.ebuild | 74 +++++++++++++++++++ 5 files changed, 230 insertions(+), 7 deletions(-) create mode 100644 sci-libs/geos/files/digest-geos-2.2.1 create mode 100644 sci-libs/geos/files/geos-2.2.1-gcc-41.patch create mode 100644 sci-libs/geos/geos-2.2.1.ebuild (limited to 'sci-libs/geos') diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog index 95930365bcef..010e6f8b3890 100644 --- a/sci-libs/geos/ChangeLog +++ b/sci-libs/geos/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sci-libs/geos -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.10 2005/11/21 19:36:08 blubb Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.11 2006/04/14 19:56:06 cryos Exp $ + +*geos-2.2.1 (14 Apr 2006) + + 14 Apr 2006; Marcus D. Hanwell + +files/geos-2.2.1-gcc-41.patch, +geos-2.2.1.ebuild: + Version bump, thanks to Etienne Dube for the + bumped ebuild and Lucas Chiesa for his work on it, + closes bug 120479. Thanks to Bret Towe for the GCC 4.1 + patch, closes bug 126490. 21 Nov 2005; Simon Stelling geos-2.1.2.ebuild: stable on amd64 diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index 3f99c22efc79..3e8098d7536a 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,9 +1,36 @@ MD5 908f92eff383fb8d1ea74cb6da319514 ChangeLog 1533 -MD5 1a2cf0a0af114411fcdef81f0d0d7a1a geos-2.1.1.ebuild 958 -MD5 4b491a816a154aafb3877b71ae44bda2 metadata.xml 180 -MD5 4de704faa5d2869d6c5f04850c589bca geos-2.1.2.ebuild 875 -MD5 1a20c0fed610b39195c9a802e4fb0934 geos-2.1.4.ebuild 1596 +RMD160 bb1f738f895f694973e1d5cb40c23e7bee43341c ChangeLog 1533 +SHA256 eee7bc0589757b36e17fc1bcfdf886d88f09c50aa3b63e91ec50e40f935eac84 ChangeLog 1533 MD5 e64702857a489d4d24706066fb8b9edb files/digest-geos-2.1.1 63 -MD5 ccfdc64d67bd756e8681dbcedf4a7ee4 files/geos-2.1.1-multilib.patch 901 +RMD160 cac3331204631781eb7b92e4b4fbe5175de93481 files/digest-geos-2.1.1 63 +SHA256 1c7bfac04b17f699a29800305fcdac5d50ee692c559ac82748eda479aef349a6 files/digest-geos-2.1.1 63 MD5 10716de046c293dcbc7acead1c63aa13 files/digest-geos-2.1.2 63 +RMD160 e0854437fa0af881d54d5a7112f1491d123799cd files/digest-geos-2.1.2 63 +SHA256 f3741d0aff819ac88315be2e11e953987fa58687989b5242d9b19e7c528f5e28 files/digest-geos-2.1.2 63 MD5 6702e1ce86d53d86b0fb87ef6796a141 files/digest-geos-2.1.4 63 +RMD160 0fc946e4a5f8def28dadde548dbe6ae2a086fd50 files/digest-geos-2.1.4 63 +SHA256 8a78b97221c099e4445f0d0a12ca6193db0b4f7f9ea9dd0288928693afce0224 files/digest-geos-2.1.4 63 +MD5 faa7651b50a08cee639893e0c9c53450 files/digest-geos-2.2.1 235 +RMD160 c6c20740bb2e6cb2f0d616ce84178add5344486e files/digest-geos-2.2.1 235 +SHA256 ecf5ce26ed26092be852d3df9d20506f8481d776be4c1091dfd91fde39f6ecd4 files/digest-geos-2.2.1 235 +MD5 ccfdc64d67bd756e8681dbcedf4a7ee4 files/geos-2.1.1-multilib.patch 901 +RMD160 3a3cf86040c104ae856f59f139b9661351752888 files/geos-2.1.1-multilib.patch 901 +SHA256 36cab3bf09b1f6ee8cd204b1edcc3f316df47098fd07d8bce77ce7760ee8a3ee files/geos-2.1.1-multilib.patch 901 +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 +MD5 1a2cf0a0af114411fcdef81f0d0d7a1a geos-2.1.1.ebuild 958 +RMD160 06967fd6de6ab68043bb222ce9bfd8e734d353d9 geos-2.1.1.ebuild 958 +SHA256 683a0824de88fd493e97f5d9aa1f96233bda9d5824f00b8545f863762900f783 geos-2.1.1.ebuild 958 +MD5 4de704faa5d2869d6c5f04850c589bca geos-2.1.2.ebuild 875 +RMD160 f7ef594ac474bd509ee828b32f89b4cd8e2ddfa7 geos-2.1.2.ebuild 875 +SHA256 67a61bd156a6905bbdd41db31b1f7a92f451c841b31b58a04a5cf616085893fa geos-2.1.2.ebuild 875 +MD5 1a20c0fed610b39195c9a802e4fb0934 geos-2.1.4.ebuild 1596 +RMD160 2cc3b8f2aa0735544a98088bb4baf2368de2214d geos-2.1.4.ebuild 1596 +SHA256 83dca743352a77363eea491391e74c4c7b98190363645bb936a107bb1ab76827 geos-2.1.4.ebuild 1596 +MD5 16de9b75a56ae6d0d64d613e7caba6ac geos-2.2.1.ebuild 1559 +RMD160 49bda5a9096cf9935a4273d18cfca28e911bc017 geos-2.2.1.ebuild 1559 +SHA256 e1c94b555a6cff70f77c7bb723346343b1549842d47e129c6ecea373f9648a79 geos-2.2.1.ebuild 1559 +MD5 4b491a816a154aafb3877b71ae44bda2 metadata.xml 180 +RMD160 b794acbc3e99d1c695e2851d3991709ff2ec0910 metadata.xml 180 +SHA256 5baf5e15e90a096c52238fc2e896074db1940cf64120309895a1133ff4065bdb metadata.xml 180 diff --git a/sci-libs/geos/files/digest-geos-2.2.1 b/sci-libs/geos/files/digest-geos-2.2.1 new file mode 100644 index 000000000000..54edb2110466 --- /dev/null +++ b/sci-libs/geos/files/digest-geos-2.2.1 @@ -0,0 +1,3 @@ +MD5 272132bfb64422915d0f748f5e26932b geos-2.2.1.tar.bz2 533286 +RMD160 f3ea1cbf3cf6c107acc9e0b43d77a0dbf0b65b25 geos-2.2.1.tar.bz2 533286 +SHA256 c6f3e555897457d9f7e8dc26535fabbf393777689e897b7e365d71f22ee8d378 geos-2.2.1.tar.bz2 533286 diff --git a/sci-libs/geos/files/geos-2.2.1-gcc-41.patch b/sci-libs/geos/files/geos-2.2.1-gcc-41.patch new file mode 100644 index 000000000000..abe09534d204 --- /dev/null +++ b/sci-libs/geos/files/geos-2.2.1-gcc-41.patch @@ -0,0 +1,110 @@ +diff -ur geos-2.2.1/source/headers/geos/geom.h ../../geos-works/source/headers/geos/geom.h +--- geos-2.2.1/source/headers/geos/geom.h 2005-11-29 09:52:21.000000000 -0800 ++++ ../../geos-works/source/headers/geos/geom.h 2006-03-16 20:55:14.000000000 -0800 +@@ -358,52 +358,52 @@ + //double distance(Coordinate& p); + static Coordinate nullCoord; + +- void Coordinate::setNull() { ++ void setNull() { + x=DoubleNotANumber; + y=DoubleNotANumber; + z=DoubleNotANumber; + } + +- static Coordinate& Coordinate::getNull() { ++ static Coordinate& getNull() { + return nullCoord; + } + +- Coordinate::Coordinate() { ++ Coordinate() { + x=0.0; + y=0.0; + z=DoubleNotANumber; + } + +- Coordinate::Coordinate(double xNew, double yNew, double zNew) { ++ Coordinate(double xNew, double yNew, double zNew) { + x=xNew; + y=yNew; + z=zNew; + } + + #ifndef PROFILE_COORDINATE_COPIES +- Coordinate::Coordinate(const Coordinate& c){ ++ Coordinate(const Coordinate& c){ + x=c.x; + y=c.y; + z=c.z; + } + #else +- Coordinate::Coordinate(const Coordinate& c); ++ Coordinate(const Coordinate& c); + Coordinate &operator=(const Coordinate &c); + #endif + +- Coordinate::Coordinate(double xNew, double yNew){ ++ Coordinate(double xNew, double yNew){ + x=xNew; + y=yNew; + z=DoubleNotANumber; + } + +- void Coordinate::setCoordinate(const Coordinate& other) { ++ void setCoordinate(const Coordinate& other) { + x = other.x; + y = other.y; + z = other.z; + } + +- bool Coordinate::equals2D(const Coordinate& other) const { ++ bool equals2D(const Coordinate& other) const { + if (x != other.x) { + return false; + } +@@ -413,7 +413,7 @@ + return true; + } + +- int Coordinate::compareTo(const Coordinate& other) const { ++ int compareTo(const Coordinate& other) const { + if (x < other.x) { + return -1; + } +@@ -429,22 +429,22 @@ + return 0; + } + +- bool Coordinate::equals3D(const Coordinate& other) const { ++ bool equals3D(const Coordinate& other) const { + return (x == other.x) && ( y == other.y) && ((z == other.z)||(ISNAN(z) && ISNAN(other.z))); + } + +- void Coordinate::makePrecise(const PrecisionModel *precisionModel) { ++ void makePrecise(const PrecisionModel *precisionModel) { + x = precisionModel->makePrecise(x); + y = precisionModel->makePrecise(y); + } + +- double Coordinate::distance(const Coordinate& p) const { ++ double distance(const Coordinate& p) const { + double dx = x - p.x; + double dy = y - p.y; + return sqrt(dx * dx + dy * dy); + } + +- int Coordinate::hashCode() { ++ int hashCode() { + //Algorithm from Effective Java by Joshua Bloch [Jon Aquino] + int result = 17; + result = 37 * result + hashCode(x); +@@ -456,7 +456,7 @@ + * Returns a hash code for a double value, using the algorithm from + * Joshua Bloch's book Effective Java + */ +- static int Coordinate::hashCode(double x) { ++ static int hashCode(double x) { + int64 f = (int64)(x); + return (int)(f^(f>>32)); + } diff --git a/sci-libs/geos/geos-2.2.1.ebuild b/sci-libs/geos/geos-2.2.1.ebuild new file mode 100644 index 000000000000..c81e6b26552a --- /dev/null +++ b/sci-libs/geos/geos-2.2.1.ebuild @@ -0,0 +1,74 @@ +# 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.1.ebuild,v 1.1 2006/04/14 19:56:06 cryos Exp $ + +inherit eutils + +DESCRIPTION="Geometry Engine - Open Source" +HOMEPAGE="http://geos.refractions.net" +SRC_URI="http://geos.refractions.net/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~ppc ~sparc" +IUSE="static doc python" + +RDEPEND="virtual/libc" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )\ + python? ( dev-lang/python dev-lang/swig )" + +src_unpack() { + unpack ${A} + epatch ${FILESDIR}/${P}-gcc-41.patch +} + +src_compile() { + cd ${S} + libtoolize --force + + local myconf + myconf="" + use static && myconf="$(use_enable static)" + + econf ${myconf} || die "Error: econf failed" + + emake || die "Error: emake failed" + if use python; then + einfo "Compilling PyGEOS" + cd ${S}/swig/python + swig -c++ -python -modern -o geos_wrap.cxx ../geos.i + python setup.py build + 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 +} + +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 + if use python; then + einfo "Intalling PyGEOS" + cd ${S}/swig/python + python setup.py install --prefix="${D}/usr/" + insinto /usr/share/doc/${PF}/python + doins README.txt tests/*.py + insinto /usr/share/doc/${PF}/python/cases + doins tests/cases/* + fi +} + -- cgit v1.2.3-65-gdbad