overdue stable bumps, added newest version, removed oldest

(Portage version: 2.1_rc1-r3)

8 files changed, 93 insertions, 9 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 010e6f8b3890..180c73108f4b 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,14 @@
 # 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.11 2006/04/14 19:56:06 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.12 2006/05/25 19:18:46 nerdboy Exp $
+
+*geos-2.2.2 (25 May 2006)
+
+  25 May 2006; Steve Arnold <nerdboy@gentoo.org>
+  -files/geos-2.1.1-multilib.patch, -geos-2.1.1.ebuild, geos-2.1.2.ebuild,
+  geos-2.1.4.ebuild, geos-2.2.1.ebuild, +geos-2.2.2.ebuild:
+  Overdue stable bumps, added newest version, removed oldest, added ~ppc64
+  to latest versions (for gdal support).
 
 *geos-2.2.1 (14 Apr 2006)
 
diff --git a/sci-libs/geos/files/digest-geos-2.1.2 b/sci-libs/geos/files/digest-geos-2.1.2
index cf231094f077..ccaa2f4305f0 100644
--- a/sci-libs/geos/files/digest-geos-2.1.2
+++ b/sci-libs/geos/files/digest-geos-2.1.2
@@ -1 +1,3 @@
 MD5 076f1bfb17e13d4075b0345f5ca525ca geos-2.1.2.tar.bz2 523477
+RMD160 7688b319c122c38e2090bf0591a0230cdc593e12 geos-2.1.2.tar.bz2 523477
+SHA256 b7a0dc49f4197750afd5e6b21c8cedf6d0fab2201f5fd9ea41a6a422a11a9755 geos-2.1.2.tar.bz2 523477
diff --git a/sci-libs/geos/files/digest-geos-2.1.4 b/sci-libs/geos/files/digest-geos-2.1.4
index 58b6790b684a..07c8911a3de5 100644
--- a/sci-libs/geos/files/digest-geos-2.1.4
+++ b/sci-libs/geos/files/digest-geos-2.1.4
@@ -1 +1,3 @@
 MD5 e00524abc2cb26c8fb9173b8696be3b7 geos-2.1.4.tar.bz2 506683
+RMD160 913f5ead995fd4daebf7be5bd71fbd7ddc8a5346 geos-2.1.4.tar.bz2 506683
+SHA256 887f504cccc321a56e3cbb380643755100ef5d7af629ea63aaa2964583842e88 geos-2.1.4.tar.bz2 506683
diff --git a/sci-libs/geos/files/digest-geos-2.2.2 b/sci-libs/geos/files/digest-geos-2.2.2
new file mode 100644
index 000000000000..ae660fc73ca9
--- /dev/null
+++ b/sci-libs/geos/files/digest-geos-2.2.2
@@ -0,0 +1,3 @@
+MD5 daf1f2d863103cc08b17747590af2cef geos-2.2.2.tar.bz2 554476
+RMD160 52ccecf31aacd7d7fe1522ad7a608e2580525c17 geos-2.2.2.tar.bz2 554476
+SHA256 17a4cde96b159261cab40f25ee0215676ff98b48fd28a32e0663a07c4af0e69a geos-2.2.2.tar.bz2 554476
diff --git a/sci-libs/geos/geos-2.1.2.ebuild b/sci-libs/geos/geos-2.1.2.ebuild
index f6c32b781ca7..5a7e489c85f9 100644
--- a/sci-libs/geos/geos-2.1.2.ebuild
+++ b/sci-libs/geos/geos-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.1.2.ebuild,v 1.5 2005/11/21 19:36:08 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.1.2.ebuild,v 1.6 2006/05/25 19:18:46 nerdboy Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://geos.refractions.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="static doc"
 
 RDEPEND="virtual/libc"
diff --git a/sci-libs/geos/geos-2.1.4.ebuild b/sci-libs/geos/geos-2.1.4.ebuild
index ecdb8e1ed202..48a36e25362c 100644
--- a/sci-libs/geos/geos-2.1.4.ebuild
+++ b/sci-libs/geos/geos-2.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.1.4.ebuild,v 1.1 2005/08/27 13:35:32 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.1.4.ebuild,v 1.2 2006/05/25 19:18:46 nerdboy Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://geos.refractions.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="static doc python"
 
 RDEPEND="virtual/libc"
diff --git a/sci-libs/geos/geos-2.2.1.ebuild b/sci-libs/geos/geos-2.2.1.ebuild
index f6bf4cb0aec9..15f0bb72c4a6 100644
--- a/sci-libs/geos/geos-2.2.1.ebuild
+++ b/sci-libs/geos/geos-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2006/04/15 04:38:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.2.1.ebuild,v 1.3 2006/05/25 19:18:46 nerdboy Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://geos.refractions.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static doc python"
 
 RDEPEND="virtual/libc"
diff --git a/sci-libs/geos/geos-2.2.2.ebuild b/sci-libs/geos/geos-2.2.2.ebuild
new file mode 100644
index 000000000000..6681406d89ce
--- /dev/null
+++ b/sci-libs/geos/geos-2.2.2.ebuild
@@ -0,0 +1,69 @@
+# 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 $
+
+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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static doc python"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+		doc? ( app-doc/doxygen )\
+		python? ( dev-lang/python dev-lang/swig )"
+
+src_compile() {
+	cd ${S}
+	libtoolize --force
+
+	local myconf
+	myconf=""
+	use static && myconf="$(use_enable static)"
+
+	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
+		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
+}