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

Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64

5 files changed, 29 insertions, 15 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/Manifest b/sci-geosciences/mapnik/Manifest
index 34ecb0797316..2f08271d87d1 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mapnik-0.7.1-libagg.patch 1961 RMD160 b2d7199280bdf032cd0a220e686d518a41239f8c SHA1 3adaf5c646ff2b72642bdc29d232489bfb573d17 SHA256 f7114127b1aae227d9ef854ec64c7ac5962a8428d687159604b7e6ff1146f4ff
 AUX mapnik-0.7.1-libpng1.5.4.patch 412 RMD160 82ad05f96b30e0e1c1af1a0740120a7cf9b4420a SHA1 38399f536929320bd3fc5807e35da90a147a9514 SHA256 9a79debf5624adea141428a1d359f47d843e72ec9820ff4d8b3ba892553dd425
 AUX mapnik-2.0.0-gentoo.patch 3611 RMD160 ee914209a60f8340a45be4a28ac545e3b0efd3ef SHA1 350c2a93eb31222ba68bbe70b9f62f06b252de6a SHA256 0681e078ef0854c470f3f1393ff20d1fb31666cb8a6ba9a1c74e016632b4afa4
 DIST mapnik-0.7.1.tar.bz2 10021260 RMD160 9e4180e901dfaf255091843869e9441d7a08209f SHA1 a1961f6dfe5d591d5a892bef05d58e66537440c4 SHA256 0d04e8cbc2a060ce09ba13ccdcd7bf8bd02bed77a84a3dd1191e4d75fba95b8d
 DIST mapnik-2.0.0.tar.bz2 12302295 RMD160 73cf94c7fb417567ee43bc9215db6e5b752a0528 SHA1 afa49fc80ea38c7d58c940ae5b9a549ce20f5685 SHA256 036477761e56a4e0ccad58d9426bbde39566aecdb9cb845469c1221292fab6bc
-EBUILD mapnik-0.7.1-r1.ebuild 4628 RMD160 494c43d5e02a1037b4d2e5f0f2b9237e85ad3b5e SHA1 e5edb3e30776f645451c7180a59d463347086a94 SHA256 ebd40f033f4924388286c3cc450e7907535b035ac72e6f4c9575ae5b04c21e8b
-EBUILD mapnik-2.0.0.ebuild 3072 RMD160 6865b69628836579d380f37f80bbb92fbfb8b471 SHA1 c75431b46c3b747623519a6733f788d064f6f25e SHA256 54f9d338eb25b7c32d7480ff6cfb6dd19f32f9d775ccbedd108d31d0ac088941
-MISC ChangeLog 6434 RMD160 bdd9f2acaba77976a58630a342d03c225045a18f SHA1 1f3ea7effad1ee61d3d47b902506590e451b71e6 SHA256 aac2fd847ee7f62ee2a6dd515c2320bac27a230b6b38b7754e89860bc1464917
-MISC metadata.xml 617 RMD160 242b737ff0f1e6437733df5987e9c24d05aa998b SHA1 875ec89b4850985588e4ca425d2868bab3551e17 SHA256 4426a564f232e5b024489ba87a5583418068e7a9dbc47eccc784196509813ac8
+EBUILD mapnik-0.7.1-r1.ebuild 4604 RMD160 6f88f1eeb4db596a5f5b3fcf03efc3a55f4a3b9e SHA1 74f3a50d662c14913e1af163228f696e6a87a1de SHA256 04381566ac5244f78b05155874f50fd0186ad24a531f3fd00ba2b6e3b7bc13e4
+EBUILD mapnik-2.0.0.ebuild 3114 RMD160 f4b83803a0d9370f3d977a3454969263dcc35836 SHA1 15c20adc841c08d25bdb6a1b13cd6d251b8ca5f3 SHA256 4aa0a58a9a059c5abb6f2f47d719ca98cbfb7784dc0c7d3ebdd5cccb3bc81633
+MISC ChangeLog 6645 RMD160 6bbd8faaa5a80c487cecdb463847ddc5220fc3e1 SHA1 726a4a1afcd9c521efb2903f858d969b0d1ff9df SHA256 c0eba9ac9b88f708cea599f39a7e6d670e766c11c79885a44081bfd76f211952
+MISC metadata.xml 692 RMD160 db02f65a9a58b396ba8e1b020e882a6135b400b1 SHA1 289ca86f6cb506d9e910e37973c4639c6505b918 SHA256 ff1c44d692e6a6e0d79c1bbf1e797ab247dc04a34624b5bcd283c7720b5cd68e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk7SX7wACgkQI1lqEGTUzySz9gCfeSswqXH6AFSJnbej56v21l/g
+y9EAoLahkTWwRo0sYJEOiR4JR+y6VSGH
+=+Qym
+-----END PGP SIGNATURE-----
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>