diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2009-08-22 23:18:09 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2009-08-22 23:18:09 +0000 |
| commit | d78cf9844b4db87e5ab81ec2a71c3c28714f3c0c (patch) | |
| tree | b47f947fb3f2da1296ebe4025a11eedb045ed4c0 /sci-geosciences/mapnik | |
| parent | Use shared libmilter library (#245950). (diff) | |
| download | gentoo-2-d78cf9844b4db87e5ab81ec2a71c3c28714f3c0c.tar.gz gentoo-2-d78cf9844b4db87e5ab81ec2a71c3c28714f3c0c.tar.bz2 gentoo-2-d78cf9844b4db87e5ab81ec2a71c3c28714f3c0c.zip | |
Reverting back to the virtual for postgresql.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/mapnik')
| -rw-r--r-- | sci-geosciences/mapnik/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-geosciences/mapnik/mapnik-0.5.1.ebuild | 10 | ||||
| -rw-r--r-- | sci-geosciences/mapnik/mapnik-0.6.0.ebuild | 12 |
3 files changed, 13 insertions, 16 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/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() { |