Version bump also fixed license in previous versions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 23 insertions, 37 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 766f3c6fde52..0f755a0188ff 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.32 2009/03/27 12:30:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.33 2009/07/28 14:45:16 bicatali Exp $
+
+*geos-3.1.1 (28 Jul 2009)
+
+  28 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> geos-2.2.3.ebuild,
+  -geos-3.0.3.ebuild, -files/geos-3.0.3-test.patch, geos-3.1.0.ebuild,
+  +geos-3.1.1.ebuild:
+  Version bump also fixed license in previous versions.
 
 *geos-3.1.0 (27 Mar 2009)
 
diff --git a/sci-libs/geos/files/geos-3.0.3-test.patch b/sci-libs/geos/files/geos-3.0.3-test.patch
deleted file mode 100644
index a6ec0244a0e8..000000000000
--- a/sci-libs/geos/files/geos-3.0.3-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tests/unit/geos_unit.cpp.orig	2008-11-27 11:21:28.000000000 +0000
-+++ tests/unit/geos_unit.cpp	2008-11-27 11:22:12.000000000 +0000
-@@ -8,6 +8,7 @@
- #include <tut.h>
- #include <tut_reporter.h>
- // STL
-+#include <cstdlib>
- #include <iostream>
- #include <iomanip>
- // GEOS
diff --git a/sci-libs/geos/geos-2.2.3.ebuild b/sci-libs/geos/geos-2.2.3.ebuild
index 06b2bdd37c2a..1dee295bd76b 100644
--- a/sci-libs/geos/geos-2.2.3.ebuild
+++ b/sci-libs/geos/geos-2.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.2.3.ebuild,v 1.7 2008/07/02 16:51:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-2.2.3.ebuild,v 1.8 2009/07/28 14:45:16 bicatali Exp $
 
 USE_RUBY="ruby18"
 RUBY_OPTIONAL="yes"
@@ -11,7 +11,7 @@ DESCRIPTION="Geometry engine library for Geographic Information Systems"
 HOMEPAGE="http://geos.refractions.net"
 SRC_URI="http://geos.refractions.net/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 IUSE="doc python ruby"
diff --git a/sci-libs/geos/geos-3.1.0.ebuild b/sci-libs/geos/geos-3.1.0.ebuild
index 254934a40b31..5cff05ef6f91 100644
--- a/sci-libs/geos/geos-3.1.0.ebuild
+++ b/sci-libs/geos/geos-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.1.0.ebuild,v 1.1 2009/03/27 12:30:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.1.0.ebuild,v 1.2 2009/07/28 14:45:16 bicatali Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ DESCRIPTION="Geometry engine library for Geographic Information Systems"
 HOMEPAGE="http://geos.refractions.net"
 SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc python ruby"
diff --git a/sci-libs/geos/geos-3.0.3.ebuild b/sci-libs/geos/geos-3.1.1.ebuild
index f999c036970c..0dade4e33419 100644
--- a/sci-libs/geos/geos-3.0.3.ebuild
+++ b/sci-libs/geos/geos-3.1.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.0.3.ebuild,v 1.1 2008/11/27 11:36:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.1.1.ebuild,v 1.1 2009/07/28 14:45:16 bicatali Exp $
 
-inherit eutils
+EAPI=2
 
 DESCRIPTION="Geometry engine library for Geographic Information Systems"
 HOMEPAGE="http://geos.refractions.net"
 SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc python ruby"
@@ -16,26 +16,15 @@ IUSE="doc python ruby"
 RDEPEND="ruby? ( virtual/ruby )
 	python? ( virtual/python )"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )\
-	ruby?  ( >=dev-lang/swig-1.3.29 )
-	python? ( >=dev-lang/swig-1.3.29 )"
+	doc? ( app-doc/doxygen )
+	ruby?  ( dev-lang/swig )
+	python? ( dev-lang/swig )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-test.patch
+src_configure() {
+	econf $(use_enable python) $(use_enable ruby)
 }
 
 src_compile() {
-	local myconf
-
-	if ! use python && ! use ruby ; then
-		myconf="--disable-swig"
-	fi
-
-	econf ${myconf} \
-		$(use_enable python) \
-		$(use_enable ruby)
 	emake || die "emake failed"
 	if use doc; then
 		cd "${S}/doc"
@@ -45,7 +34,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README TODO || die
+	dodoc AUTHORS NEWS README TODO
 	if use doc; then
 		cd "${S}/doc"
 		dohtml -r doxygen_docs/html/* || die