Build geos input plugin with USE=\"geos\", only build postgis input plugin with USE=\"postgres\".

(Portage version: 2.2.0_alpha78/cvs/Linux x86_64)

4 files changed, 15 insertions, 11 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index d00ee3969a70..84b9e5d08074 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/mapnik
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.28 2011/11/13 02:19:47 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.29 2011/11/27 16:05:08 swegener Exp $
+
+  27 Nov 2011; Sven Wegener <swegener@gentoo.org> mapnik-0.7.1-r1.ebuild,
+  mapnik-2.0.0.ebuild, metadata.xml:
+  Build geos input plugin with USE="geos", only build postgis input plugin with
+  USE="postgres".
 
 *mapnik-2.0.0 (13 Nov 2011)
 
diff --git a/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild b/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
index 4c0d24df8543..2d737f8809aa 100644
--- a/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.7.1-r1.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-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.8 2011/09/26 07:45:56 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.9 2011/11/27 16:05:08 swegener Exp $
 
 EAPI=3
 
@@ -35,7 +35,6 @@ RDEPEND="dev-libs/boost
 	gdal? ( sci-libs/gdal )
 	postgres? (
 		>=dev-db/postgresql-base-8.3
-		>=dev-db/postgis-1.5.2
 	)
 	python? ( dev-libs/boost[python] )
 	sqlite? ( dev-db/sqlite:3 )"
diff --git a/sci-geosciences/mapnik/mapnik-2.0.0.ebuild b/sci-geosciences/mapnik/mapnik-2.0.0.ebuild
index 9814f6f3098e..fc63cda12045 100644
--- a/sci-geosciences/mapnik/mapnik-2.0.0.ebuild
+++ b/sci-geosciences/mapnik/mapnik-2.0.0.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-geosciences/mapnik/mapnik-2.0.0.ebuild,v 1.1 2011/11/13 02:19:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.0.0.ebuild,v 1.2 2011/11/27 16:05:07 swegener Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bidi cairo debug doc gdal nobfonts postgres python sqlite"
+IUSE="bidi cairo debug doc gdal geos nobfonts postgres python sqlite"
 
 RDEPEND="dev-libs/boost
 	net-misc/curl
@@ -28,13 +28,10 @@ RDEPEND="dev-libs/boost
 	dev-libs/libxml2
 	dev-libs/icu
 	x11-libs/agg[truetype]
-	postgres? (
-		>=dev-db/postgresql-base-8.3
-		>=dev-db/postgis-1.5.2
-		sci-libs/geos
-	)
+	postgres? ( >=dev-db/postgresql-base-8.3 )
 	python? ( dev-libs/boost[python] )
 	gdal? ( sci-libs/gdal )
+	geos? ( sci-libs/geos )
 	python? ( dev-lang/python )
 	bidi? ( dev-libs/fribidi )
 	cairo? (
@@ -56,7 +53,9 @@ src_prepare() {
 }
 
 src_configure() {
-	local PLUGINS=shape,raster,postgis,osm
+	local PLUGINS=shape,raster,osm
+	use geos && PLUGINS+=,geos
+	use postgres && PLUGINS+=,postgis
 	use sqlite && PLUGINS+=,sqlite
 
 	SCONOPTS="
diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
index c7936c18745b..9ff54521135b 100644
--- a/sci-geosciences/mapnik/metadata.xml
+++ b/sci-geosciences/mapnik/metadata.xml
@@ -12,6 +12,7 @@
 </longdescription>
 <use>
   <flag name='gdal'>Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+  <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
   <flag name='nobfonts'>Enable Dejavu fonts instead of built-in fonts</flag>
 </use>
 </pkgmetadata>