summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron W. Swenson <titanofold@gentoo.org>2011-05-02 11:40:31 +0000
committerAaron W. Swenson <titanofold@gentoo.org>2011-05-02 11:40:31 +0000
commit54c023d66f9b68041b4392ca7e5a965bf2caded0 (patch)
treee782e6742636cb6d1d81ddf4601ba5c4c9770ad9 /dev-db/postgis
parentFix gtk+ slot deps (diff)
downloadgentoo-2-54c023d66f9b68041b4392ca7e5a965bf2caded0.tar.gz
gentoo-2-54c023d66f9b68041b4392ca7e5a965bf2caded0.tar.bz2
gentoo-2-54c023d66f9b68041b4392ca7e5a965bf2caded0.zip
Moved postgresql-config and checks into pkg_setup
(Portage version: 2.1.9.42/cvs/Linux i686)
Diffstat (limited to 'dev-db/postgis')
-rw-r--r--dev-db/postgis/ChangeLog8
-rw-r--r--dev-db/postgis/postgis-1.5.2-r3.ebuild (renamed from dev-db/postgis/postgis-1.5.2-r2.ebuild)6
2 files changed, 10 insertions, 4 deletions
diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index c1c77c53f0ff..6e2b487e04f3 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-db/postgis
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.49 2011/05/02 04:31:33 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.50 2011/05/02 11:40:31 titanofold Exp $
+
+*postgis-1.5.2-r3 (02 May 2011)
+
+ 02 May 2011; Aaron W. Swenson <titanofold@gentoo.org>
+ -postgis-1.5.2-r2.ebuild, +postgis-1.5.2-r3.ebuild:
+ Moved postgresql-config and checks into pkg_setup
*postgis-1.5.2-r2 (02 May 2011)
diff --git a/dev-db/postgis/postgis-1.5.2-r2.ebuild b/dev-db/postgis/postgis-1.5.2-r3.ebuild
index 9571b6194d9c..b89f88949eee 100644
--- a/dev-db/postgis/postgis-1.5.2-r2.ebuild
+++ b/dev-db/postgis/postgis-1.5.2-r3.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/dev-db/postgis/postgis-1.5.2-r2.ebuild,v 1.1 2011/05/02 04:31:33 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.5.2-r3.ebuild,v 1.1 2011/05/02 11:40:31 titanofold Exp $
EAPI="4"
@@ -42,9 +42,9 @@ DEPEND="${RDEPEND}
RESTRICT="test"
PGIS="$(get_version_component_range 1-2)"
-PGSLOT="$(postgresql-config show)"
-pkg_pretend() {
+pkg_setup() {
+ export PGSLOT="$(postgresql-config show)"
if [[ ${PGSLOT//.} < 83 ]] ; then
eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.3 or higher."
eerror "Set an appropriate slot with postgresql-config."