Updated postgres deps to explicitly exclude libpq.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 29 insertions, 10 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index 8a563a64668a..f872ff357f7b 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/mapnik
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.9 2009/06/17 07:05:44 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.10 2009/08/19 02:59:58 nerdboy Exp $
+
+  19 Aug 2009; Steve Arnold <nerdboy@gentoo.org> mapnik-0.5.1.ebuild,
+  mapnik-0.6.0.ebuild:
+  Updated postgres deps to explicitly exclude libpq (which will not work).
+  The virtual is currently not an option, and none of the new postgresql
+  packages have been stablized yet, so this is the only way mapnik (and a
+  few other packages) can go stable.
 
   17 Jun 2009; Alfredo Tupone <tupone@gentoo.org> mapnik-0.6.0.ebuild:
   Selecting boost version that has python IUSE. Bug #274358 by Arjen Robbemond
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 82ca114fc3bb..c3e9c0348705 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -2,7 +2,7 @@ AUX mapnik-0.5.1-include-fix.patch 328 RMD160 2396fdfe4dd7630e0a8866a3676c42e4c6
 AUX mapnik-0.6.0-gentoo.patch 3075 RMD160 4d3c38ecbed33880d0b90cdd15bcd3cec140abff SHA1 44f173dfdf37c530cf41e52a2afe23a3f9544a24 SHA256 759ec1e6a5fa59c9c80b549a6449c3e292220e41256a6a341acab48e14266026
 DIST mapnik-0.6.0.tar.bz2 7469100 RMD160 aa1cbe18a9d0ce96b5c826ea3c8546e1fdf0cc86 SHA1 4a092f27fe66b8a9f9800a3944a50c6f5b97473a SHA256 c5b04c75a21620882d50c8d7abe9ba86deea814b8a0ecc9efca69f15ad04f286
 DIST mapnik_src-0.5.1.tar.gz 6517825 RMD160 6ac8830863883c654fd5b3676efc4a0642997157 SHA1 cad0d33ee16c0abf4903a6693e871c9ace19be94 SHA256 7682bba5f578dbb5dd5103d72876e0745e3f2da2eba8fd268cd81f400625812d
-EBUILD mapnik-0.5.1.ebuild 2683 RMD160 ad1d7e1fe929199a7f871636a68fc2ee2a521554 SHA1 466393f1b32212b92c58e6aa56541cacd3059759 SHA256 215f0a03a7f36be2b36dd7b0aa0f404d45116352764b0876d15697080cb8ded2
-EBUILD mapnik-0.6.0.ebuild 2527 RMD160 54ab6cbe7cceb241357020bf0444245a41c46199 SHA1 4e70ba295970ec37f7e0b35789de6158a5b265b1 SHA256 8b661c6fd6e032e5545a468fd607c2f9a446eb7c4111c6a9e1b33ebd37c6e420
-MISC ChangeLog 1877 RMD160 3fa3066c341ac8693054393f1c546839e5e96f75 SHA1 62310c2eb95f39760225a0983302e807880109c0 SHA256 3fde135ee08adf3ee676f9bb714b77e6fc7cd2ffbe8a8f72190ea8057ec0cd95
+EBUILD mapnik-0.5.1.ebuild 2771 RMD160 b65f77dbe37edc6086c1e48549b6eb0fe7f49566 SHA1 82ba562c4aa0feeeb00913d39f42894cc2ad80bd SHA256 3f34b0a6fb7a7bddee92d861856fef1239fc479747edcb31ed62232276607f4d
+EBUILD mapnik-0.6.0.ebuild 2618 RMD160 e535fcc73065585d91f467d96202c3a0d06599c8 SHA1 a9f7d8eda422a1f6ad1e95ade3e935cfe9f10228 SHA256 6c3bd434ec547890dac638c5a42f85b6bad7d26e353564755883d9e95b49c9f2
+MISC ChangeLog 2232 RMD160 776390566e2cff0c346ed9dceacfa0e2db1a119a SHA1 e432587ca7eb1380926b5ae597c54d45e1a2e71b SHA256 e6070bd9e751d79d1bfaf315c027ae0700abb24f70b706e487e622bc0546465e
 MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
diff --git a/sci-geosciences/mapnik/mapnik-0.5.1.ebuild b/sci-geosciences/mapnik/mapnik-0.5.1.ebuild
index 6f23f22fa476..48190aeb1e66 100644
--- a/sci-geosciences/mapnik/mapnik-0.5.1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.5.1.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-geosciences/mapnik/mapnik-0.5.1.ebuild,v 1.7 2009/01/04 19:48:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v 1.8 2009/08/19 02:59:58 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -22,8 +22,14 @@ RDEPEND=">=dev-libs/boost-1.33.0
 	>=sci-libs/proj-4.4.9
 	sci-libs/gdal
 	xml? ( dev-libs/libxml2 )
-	postgres? ( >=dev-db/postgresql-base-8.3
-		>=dev-db/postgis-1.1.2 )
+	postgres? ( || (
+			>=dev-db/postgresql-8.0
+			>=dev-db/postgresql-base-8.0
+			>=dev-db/postgresql-server-8.0
+		)
+		!dev-db/libpq
+		>=dev-db/postgis-1.1.2
+	)
 	python? ( >=dev-lang/python-2.4 )
 	bidi? ( dev-libs/fribidi )"
 
diff --git a/sci-geosciences/mapnik/mapnik-0.6.0.ebuild b/sci-geosciences/mapnik/mapnik-0.6.0.ebuild
index a6ad02fe7eae..57c8c3812d8f 100644
--- a/sci-geosciences/mapnik/mapnik-0.6.0.ebuild
+++ b/sci-geosciences/mapnik/mapnik-0.6.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-geosciences/mapnik/mapnik-0.6.0.ebuild,v 1.3 2009/06/17 07:05:44 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.0.ebuild,v 1.4 2009/08/19 02:59:58 nerdboy Exp $
 EAPI=2
 
 inherit eutils toolchain-funcs
@@ -26,8 +26,14 @@ RDEPEND="dev-libs/boost
 	python? ( >=dev-libs/boost-1.35.0-r5[python] )
 	cairo? ( x11-libs/cairo
 		dev-cpp/cairomm )
-	postgres? ( >=dev-db/postgresql-base-8.3
-		>=dev-db/postgis-1.1.2 )
+	postgres? ( || (
+			>=dev-db/postgresql-base-8.0
+			>=dev-db/postgresql-server-8.0
+			>=dev-db/postgresql-8.0
+		)
+		!dev-db/libpq
+		>=dev-db/postgis-1.1.2
+	)
 	gdal? ( sci-libs/gdal )
 	sqlite? ( dev-db/sqlite:3 )
 	curl? ( net-misc/curl )"