summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron W. Swenson <titanofold@gentoo.org>2012-04-10 14:01:19 +0000
committerAaron W. Swenson <titanofold@gentoo.org>2012-04-10 14:01:19 +0000
commitad5abf0daf771b249a7d460f7452d932581f950d (patch)
tree845ad2c953149bacf43fa4685ef5149ae700e633
parentFixing SRC_URI at request of iksaif (diff)
downloadgentoo-2-ad5abf0daf771b249a7d460f7452d932581f950d.tar.gz
gentoo-2-ad5abf0daf771b249a7d460f7452d932581f950d.tar.bz2
gentoo-2-ad5abf0daf771b249a7d460f7452d932581f950d.zip
Fixed dependencies. Fixes bug 411277.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
-rw-r--r--dev-db/postgis/ChangeLog5
-rw-r--r--dev-db/postgis/postgis-2.0.0.ebuild25
2 files changed, 16 insertions, 14 deletions
diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 1e3f73920731..d811715a4e14 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-db/postgis
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.63 2012/04/04 07:42:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.64 2012/04/10 14:01:19 titanofold Exp $
+
+ 10 Apr 2012; Aaron W. Swenson <titanofold@gentoo.org> postgis-2.0.0.ebuild:
+ Fixed dependencies. Fixes bug 411277.
*postgis-2.0.0 (04 Apr 2012)
diff --git a/dev-db/postgis/postgis-2.0.0.ebuild b/dev-db/postgis/postgis-2.0.0.ebuild
index 8cb5fe554903..c5ad25c01086 100644
--- a/dev-db/postgis/postgis-2.0.0.ebuild
+++ b/dev-db/postgis/postgis-2.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.0.ebuild,v 1.1 2012/04/04 07:42:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.0.ebuild,v 1.2 2012/04/10 14:01:19 titanofold Exp $
EAPI="4"
@@ -16,13 +16,12 @@ IUSE="doc gtk"
RDEPEND="
|| (
+ dev-db/postgresql-server:9.1
dev-db/postgresql-server:9.0
dev-db/postgresql-server:8.4
- dev-db/postgresql-server:8.3
- dev-db/postgresql-server:9.1
)
dev-libs/libxml2:2
- >=sci-libs/geos-3.2
+ >=sci-libs/geos-3.3.2
>=sci-libs/proj-4.6.0
sci-libs/gdal
gtk? ( x11-libs/gtk+:2 )
@@ -49,18 +48,18 @@ MAKEOPTS+=" -j1"
pkg_setup() {
export PGSLOT="$(postgresql-config show)"
- if [[ ${PGSLOT//.} < 83 ]] ; then
- eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.3 or higher."
+ if [[ ${PGSLOT//.} < 84 ]] ; then
+ eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.4 or higher."
eerror "Set an appropriate slot with postgresql-config."
- die "postgresql-config not set to 8.3 or higher."
+ die "postgresql-config not set to 8.4 or higher."
fi
- if [[ ${PGSLOT//.} > 90 ]] ; then
- ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than 9.0."
- ewarn "This is neither supported here nor upstream."
- ewarn "However, all indicators show that this should work."
- ewarn "Any bugs you encounter should be reported upstream."
- fi
+# if [[ ${PGSLOT//.} > 90 ]] ; then
+# ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than 9.0."
+# ewarn "This is neither supported here nor upstream."
+# ewarn "However, all indicators show that this should work."
+# ewarn "Any bugs you encounter should be reported upstream."
+# fi
}
src_configure() {