Reverting back to the virtual for postgresql.

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

5 files changed, 18 insertions, 21 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index f872ff357f7b..a2d3927b686b 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2009/08/19 02:59:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.11 2009/08/22 23:18:09 nerdboy Exp $
+
+  22 Aug 2009; Steve Arnold <nerdboy@gentoo.org> mapnik-0.5.1.ebuild,
+  mapnik-0.6.0.ebuild:
+  Reverting back to the virtual, in the hopes that postgresql will get 
+  something >=8.0 stable soon.  Newer libpq works now...
 
   19 Aug 2009; Steve Arnold <nerdboy@gentoo.org> mapnik-0.5.1.ebuild,
   mapnik-0.6.0.ebuild:
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index c3e9c0348705..335c23c91ff7 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 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
+EBUILD mapnik-0.5.1.ebuild 2685 RMD160 0e6e24e1c1b63e2ecfdc7c244fac6aaa97fe814e SHA1 a918075360effc558b35373738a5d610f06b70ce SHA256 2a33e52b42138f8ff7fe4a9e9fff507e0480c6d7014a0755a4506067b8a5d51f
+EBUILD mapnik-0.6.0.ebuild 2532 RMD160 23d6c30515a6ad35724b437df143ca9281d5be1c SHA1 94d9a50011e458d37caa8616e41c56dad010eec7 SHA256 6d4bb6ed2f223dc54286fb5b7bbfd8b91d345e7bd79f54c5c6a46d02674be937
+MISC ChangeLog 2455 RMD160 9322ca7c78027a61d0de86292bd5692b85d3c915 SHA1 6cf2482a04f3520557704a761098db0e0fe1acda SHA256 ca94021b004efcd2394142524fd1d60fd468602110203fe5247160bceacedcc9
 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 48190aeb1e66..9956b39d595a 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.8 2009/08/19 02:59:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v 1.9 2009/08/22 23:18:09 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -22,12 +22,8 @@ RDEPEND=">=dev-libs/boost-1.33.0
 	>=sci-libs/proj-4.4.9
 	sci-libs/gdal
 	xml? ( dev-libs/libxml2 )
-	postgres? ( || (
-			>=dev-db/postgresql-8.0
-			>=dev-db/postgresql-base-8.0
-			>=dev-db/postgresql-server-8.0
-		)
-		!dev-db/libpq
+	postgres? (
+		>=virtual/postgresql-base-8.0
 		>=dev-db/postgis-1.1.2
 	)
 	python? ( >=dev-lang/python-2.4 )
diff --git a/sci-geosciences/mapnik/mapnik-0.6.0.ebuild b/sci-geosciences/mapnik/mapnik-0.6.0.ebuild
index 57c8c3812d8f..fc0f7a0cde55 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.4 2009/08/19 02:59:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.0.ebuild,v 1.5 2009/08/22 23:18:09 nerdboy Exp $
 EAPI=2
 
 inherit eutils toolchain-funcs
@@ -26,12 +26,8 @@ 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.0
-			>=dev-db/postgresql-server-8.0
-			>=dev-db/postgresql-8.0
-		)
-		!dev-db/libpq
+	postgres? (
+		>=virtual/postgresql-base-8.0
 		>=dev-db/postgis-1.1.2
 	)
 	gdal? ( sci-libs/gdal )
@@ -49,7 +45,7 @@ src_prepare() {
 
 	sed -i -e "s:libraries \= \[:libraries \= \[\'mapnik\',:g" \
 	    plugins/input/{gdal,postgis,shape,raster}/SConscript \
-	    || die "sed 4 failed"
+	    || die "sed 2 failed"
 }
 
 src_configure() {
diff --git a/sci-geosciences/openstreetmap-icons/Manifest b/sci-geosciences/openstreetmap-icons/Manifest
index 93522bbb6d17..fa49f326ec51 100644
--- a/sci-geosciences/openstreetmap-icons/Manifest
+++ b/sci-geosciences/openstreetmap-icons/Manifest
@@ -1,4 +1,4 @@
 DIST openstreetmap-icons-20090616.tar.bz2 2207156 RMD160 5a7ad79db1d0ca326cd51119a06361540bd9cfc7 SHA1 706a7881f274969baf4c3bf9212daf8c9c3fb686 SHA256 e1397d7ecb04335eaaa6160f61d84078840a3e13eeaa3de090fe26de8e09f3ff
-EBUILD openstreetmap-icons-20090616.ebuild 1110 RMD160 ee668a53ec3913d808cfe5cedec22dc6e23b55ba SHA1 b36a4c1212de760454276721cb43e91ff46b7847 SHA256 08133bc3c5f7a76ebf9276981f42ddb21f17e5489cbe160bf36e805058eadcee
-MISC ChangeLog 1064 RMD160 b3070fd8871fb918db85d32be9253fb48c242f87 SHA1 91c5f9f5e115e888c9a3c175056a294c6c8097a2 SHA256 5b88fe58e2d83833d5e4765a3030c8271d2393782620b05ff14759abed82ed26
+EBUILD openstreetmap-icons-20090616.ebuild 1774 RMD160 e760eb55558dc7c5332c12a82fdbbf3d4b894230 SHA1 2adc7a42d76e89caacbb7d77e8298613592d6485 SHA256 2d0a909490e35c98ea6faf9ba0d73a3c06d10662debf0e5edaf52274cd1b92df
+MISC ChangeLog 1270 RMD160 1924017961f2dd64448840568cc6e3ff9428505d SHA1 9b7a6f8278106cfa3a4b4576f43d23d99f1e1ade SHA256 3ed352ad4c72afb365d0cae1315b7af0c61d993510e3c719ff9ce369f9ccca9b
 MISC metadata.xml 328 RMD160 adf0588ea8641b51c6b9ee17491bdb0f9695ae12 SHA1 3fd8c69098a42e95fc226d3ad536bb4055fa46a4 SHA256 e7c7bf7d172251192430b7435291c86d294819f7b48af5fb3e5e880eac08331b