Fixes bug 380095 and 380089. Remove files no longer in use.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

6 files changed, 317 insertions, 65 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index b867b0056ac5..b01ebee56f75 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,13 @@
 # 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.55 2011/08/07 03:08:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.56 2011/08/23 22:31:43 titanofold Exp $
+
+*postgis-1.4.2 (23 Aug 2011)
+
+  23 Aug 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  -files/postgis-1.1.1_doc.patch, +files/postgis_dbs-1.4,
+  +postgis-1.4.2.ebuild, -files/postgis_xsl.patch:
+  Fixes bug 380095 and 380089. Remove files no longer in use.
 
   07 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> postgis-1.5.3.ebuild:
   x86 stable wrt bug #376359
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 8d0de2cf0faf..62346ab1236a 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX postgis-1.1.1_doc.patch 711 RMD160 182a5127d83b18b48c5b013b63427d485f770e36 SHA1 00ad7282712c851fc38c852a8d21a70c5ab2b969 SHA256 4c0b50b26bc22e09d60ac14ad4639880e1fca7c92eb55929d6dc10c0ec4ce691
 AUX postgis_dbs 2096 RMD160 64b66e99aed34fb8e9523505851962a547bd41d0 SHA1 68565ab29a22ec08c7a2271f2219d653e11ca393 SHA256 dafde4a1d1d95e18facb3287baddab3c1c116933498c310438c91dbd736833ec
-AUX postgis_xsl.patch 1058 RMD160 052a9578b27edbded5f7885de5efa3595b4c7ac1 SHA1 23e73c1f5eec58e781ba110d04d12bef4093bcee SHA256 ed309baa8aa7e9f10f1006c954f75aa9a4898c820ae46b76d5389c618fb7c08d
+AUX postgis_dbs-1.4 2096 RMD160 ed058a46f1b124832dd85145c99187653a5bbe01 SHA1 cad17c357f165dcd65cde4df304020e3e41fb466 SHA256 287224c16cbd286c75098e786235ad07226217fbcf76071279081e6cb1d1add1
 DIST postgis-1.3.1.tar.gz 2148125 RMD160 f199505dc04bd2caa0400c9235bbf1aecfe14b6f SHA1 db8e954dfc19e73c2331358a396e2064d1333a72 SHA256 5ce999ae638c1c9f75a7cf85d416eac71cc2d6f668132c2b6a3ae6a12075555c
 DIST postgis-1.3.6.tar.gz 2227317 RMD160 1f1797c8063b40653707be404bdebdc2573bbfea SHA1 1d4c34a31994b75ef79cf139543fc80fe0bd4438 SHA256 d3b04d4a3439596a1f6368b0627f21762347cef1e0694d5471ef17c6a3b7d144
 DIST postgis-1.4.0.tar.gz 3143966 RMD160 e5f6cb7ddc78f7c20954b0aa3a3906e31581a1d7 SHA1 454d87021c46c9fa4f657819e31a74b8fc75193a SHA256 71c5ffde54a2ecbb88fbffa12ca18c617ecfe2404fb9049940cd1b7a06a7e38d
+DIST postgis-1.4.2.tar.gz 3276515 RMD160 007af40a83701ba828b2bb6d7e7899d386d3ef23 SHA1 9a3386380b68ef1b15af86789d68b7f420d9ffd4 SHA256 5ce49b83b4c8f62eccb7080157f05299ff0e49c6ba06c3e1fa1ecfa2682c4d4b
 DIST postgis-1.5.0.tar.gz 3752211 RMD160 815c445d7ab628254130d2277648913e945b2af9 SHA1 8addacea2439a52f07735b58268dcef8df46912c SHA256 f79e8f740d48367e5481183c33e09b860c2c4466b196ea99c5601db287e2d324
 DIST postgis-1.5.2.tar.gz 3749293 RMD160 5ba251f6b4138d5a1a85ef26a2d08b6d4f280e0e SHA1 b1368c08f2a0d22bf7adc57ab419f1e30cacbf56 SHA256 0ae2778816b6a86026f38ba1e2a9418247a81c364ad468d6a5be0c77b1065f08
 DIST postgis-1.5.3.tar.gz 3779956 RMD160 e30275890b175cbe1d70d5899cbe45ec34ddbafb SHA1 e8c572e0258ba760a67b7f717bdc8321b9f6cd58 SHA256 a2334f8b229446c0497d48a430a40152a3b71a5da02f414a0340a0a025d416cf
 EBUILD postgis-1.3.1.ebuild 5288 RMD160 3a05746afeca4b09a0d4aa3e0b937518d432eb25 SHA1 77b8b8f7c6a0c1beef4abaa83cb73174f1fcf5e6 SHA256 5cd873726851e1727275d7fe473344951db02892c22de7cb10712ef0a3b3821d
 EBUILD postgis-1.3.6-r1.ebuild 5586 RMD160 d824f89bac4d74bdb2a526ae25ae3ae730c48697 SHA1 09368c82a2ff558bf449dd3454f74b7bc9ccc014 SHA256 3bcb7327811a4324ca9d73021170a525554544d8dc0aa942be06eba1284e563d
 EBUILD postgis-1.4.0.ebuild 5535 RMD160 d88ae3b22c6d56650e8473c33e944121da8e7e14 SHA1 0375209a5e716347818bc9da3300396c91ea4762 SHA256 f1d5082611460dd01e026d79e1e0ba7faa9554a17d1ed9cf4355af9a1a46ac28
+EBUILD postgis-1.4.2.ebuild 6651 RMD160 d4dcc75580c498da44ed9854bdd254528070e712 SHA1 d55e09405358de2f6295e540ee7f29d34d1e0477 SHA256 2e4704720e037e8754ba83fb33b733e88ed52eab7a9b7963c045755ae56beae2
 EBUILD postgis-1.5.0-r1.ebuild 5949 RMD160 616de40fc630f742ce04c2f1d699369c7b7e368c SHA1 2e2242f20ad26b136927af98da14fd2d0c75262a SHA256 a958f14851095d90bd00dab8775ebb5de2a63377ec0fa134b7c8b122a4cbd341
 EBUILD postgis-1.5.0.ebuild 5554 RMD160 009a41a7162c935c7d321e5fb6d2a21d9b066270 SHA1 77c9bf519d40c0e497b9a8a28fbf337d070584fb SHA256 a3a6f2baa1c8deb9c8cc7dd91523e70ff48895e46ce748c521dc227afff8b023
 EBUILD postgis-1.5.2-r3.ebuild 7027 RMD160 794150f429f9c2587ec6dbc7fdccdf50e7ecda34 SHA1 bea14836cb1cb7936a6e65cfd9589108317179a5 SHA256 bcbba85d17e011faf1f0b0d60abac21f814d551c896f07b0d32c3e39756b401b
 EBUILD postgis-1.5.2.ebuild 5946 RMD160 5aa7c66101ba5faf4e309860fd56fb87e2709967 SHA1 b21b24835cce9a8dc7059dca551d161c098089e9 SHA256 3f9fef73adce04ee5f4582cb5c404da482b549230024a4326798b15fd42bbbae
 EBUILD postgis-1.5.3.ebuild 7023 RMD160 4e0cdd32268f8a9da26cfaffacc0749135c79cd7 SHA1 6a20b216440acecbdd801c33e8fc5346bfe4b937 SHA256 6b9d06a69aba974f630821a4fd69c4448e21718e3387378b79398b4ac99c2254
-MISC ChangeLog 7661 RMD160 7738501b2facb0fe91ebb57f9b7668557401b005 SHA1 3f5a22af096dfd8b8a627893077b6f7fedbdaf10 SHA256 fbb6ace16b30e00e817da9fa42164257fccc8fa282777444408e1f0b2a42558a
+MISC ChangeLog 7919 RMD160 be0393847c04e7abd5d3bbadbc6dc980149c4db2 SHA1 4b7637bc4be3987aba82566210b804b1fc5b1282 SHA256 0f639e3d72bc01b08efd05c72f61770e39207bcf76ee167c324198e99d526ac1
 MISC metadata.xml 481 RMD160 09ed331d86c1d68797aaf8a4912539f08f91cbb6 SHA1 a45afb667212035b630d417d2fc9632d99bbd62a SHA256 d0ab8dbe26001259f36c968e1d48ad5fda768227d99319cf4302af804a08d5ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk4+AbwACgkQuUQtlDBCeQJxzgCfXkwXCrMMZVGIk9JjL9ZB/jZl
-eUUAnRY8If+TU01mFnVsglJlnknXolbz
-=T6LX
+iF4EAREIAAYFAk5UKlUACgkQCOhwUhu5AEk+egEAlK+dt9P5xdXztzORIAEjHmYs
+Qqs5GfX7XmNz3r+HhWgBAJsQHj0KPYDOME/nZPgsv5jUe97BeLOOTq0A1QMVVac4
+=kc00
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgis/files/postgis-1.1.1_doc.patch b/dev-db/postgis/files/postgis-1.1.1_doc.patch
deleted file mode 100644
index 3101f1184b65..000000000000
--- a/dev-db/postgis/files/postgis-1.1.1_doc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./doc/Makefile	2005-12-20 10:06:09.000000000 +0100
-+++ ./doc/Makefile	2006-01-19 16:29:50.000000000 +0100
-@@ -69,13 +69,11 @@
- 	@mkdir -p $(DESTDIR)$(docdir)/postgis
- 	@mkdir -p $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_DATA) html/postgis.html $(DESTDIR)$(docdir)/postgis/postgis.html
--	$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(docdir)/postgis/README.postgis
- 	$(INSTALL_DATA) man/pgsql2shp.1 $(DESTDIR)$(mandir)/man1/pgsql2shp.1
- 	$(INSTALL_DATA) man/shp2pgsql.1 $(DESTDIR)$(mandir)/man1/shp2pgsql.1
- 
- uninstall:
- 	rm -f $(DESTDIR)$(docdir)/postgis/postgis.html
--	rm -f $(DESTDIR)$(docdir)/postgis/README.postgis
- 	rm -f $(DESTDIR)$(mandir)/man1/shp2pgsql.1
- 	rm -f $(DESTDIR)$(mandir)/man1/pgsql2shp.1
- 
diff --git a/dev-db/postgis/files/postgis_dbs-1.4 b/dev-db/postgis/files/postgis_dbs-1.4
new file mode 100644
index 000000000000..fa7ac2542fa9
--- /dev/null
+++ b/dev-db/postgis/files/postgis_dbs-1.4
@@ -0,0 +1,49 @@
+# This file is used by 'emerge --config dev-db/postgis' to determine which
+# databases it should install to, upgrade or create as a template.
+
+# Unlike the previous versions of the PostGIS ebuilds, it no longer creates any
+# databases except for templates. All databases you list must already exist in
+# the cluster.
+
+# The user to perform the updates as. This user must have the privileges to
+# modify all of the databases you list here. 
+pguser="postgres"
+
+# By default, no databases will have PostGIS enabled. The databases listed here
+# must already exist. The databases you list here must not already be PostGIS
+# enabled. Instead, use the upgrade lists further down.
+#databases=( "your" "databases" )
+
+# Anything you place in this list will create a database and make it a template.
+# It will be PostGIS-enabled. To add additional features, add the template names
+# to the following lists.
+#templates=( "template_postgis" )
+
+# The PostGIS enabled templates will be created using this template.
+from_template="template1"
+
+# For a complete set of EPSG coordinate system definition identifiers, you can
+# also load the spatial_ref_sys.sql definitions file and populate the
+# spatial_ref_sys table. This will permit you to perform ST_Transform()
+# operations on geometries. 
+#epsg_databases=( "enable" "epsg" "on" "these" "databases" )
+
+# Add comments to PostGIS functions to the databases in this list.
+#comment_databases=( "comments" "on" "these" "databases" )
+
+# Any databases you have that are already PostGIS enabled can be listed among
+# the following list to perform a soft upgrade. If the soft upgrade fails,
+# you'll need to do a hard upgrade.
+# http://postgis.refractions.net/documentation/manual-1.5/ch02.html#hard_upgrade
+
+# Upgrade from PostGIS 1.2 to 1.4
+#upgrade_from_1_2=( "upgrade" "these" "databases" )
+
+# Upgrade from PostGIS 1.3 to 1.4
+#upgrade_from_1_3=( "upgrade" "these" "databases" )
+
+# Perform a minor upgrade for PostGIS 1.4
+#upgrade_from_1_4=( "upgrade" "these" "databases" )
+
+# Uncomment this once you're satisfied with the settings in this file.
+#configured="true"
diff --git a/dev-db/postgis/files/postgis_xsl.patch b/dev-db/postgis/files/postgis_xsl.patch
deleted file mode 100644
index f96a703f0ea0..000000000000
--- a/dev-db/postgis/files/postgis_xsl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./postgis-1.2.0/configure.in	2006-11-10 16:17:10.000000000 +0100
-+++ ./postgis-1.2.0-patched/configure.in	2006-12-19 22:55:03.000000000 +0100
-@@ -323,17 +323,28 @@
- dnl
- AC_SUBST(XSLBASE)
- XSLBASE=
--SEARCHPATH="
--	/usr/share/sgml/docbook/xsl-stylesheets 
--	/usr/share/xml/docbook/stylesheet/nwalsh
--	/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
--"
--for p in ${SEARCHPATH}; do
--	if test -r ${p}/html/docbook.xsl; then
--		XSLBASE=${p}
--		break
-+AC_ARG_WITH(xsl,
-+[  --with-xsl=DIR      use the xsl stylesheets located in DIR],
-+	if test "$with_xsl" = yes; then
-+		AC_MSG_ERROR([option --with-xsl requires an argument])
- 	fi
--done
-+	if test "$with_xsl" != "no"; then
-+		xsl="$with_xsl"
-+	else
-+		SEARCHPATH="
-+			/usr/share/sgml/docbook/xsl-stylesheets 
-+			/usr/share/xml/docbook/stylesheet/nwalsh
-+			/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
-+		"
-+		for p in ${SEARCHPATH}; do
-+			if test -r "${p}"/html/docbook.xsl; then
-+				xsl="${p}"
-+				break
-+			fi
-+		done
-+	fi
-+)
-+XSLBASE="${xsl}"
- 
- dnl
- dnl Search for other binaries needed to build docs
diff --git a/dev-db/postgis/postgis-1.4.2.ebuild b/dev-db/postgis/postgis-1.4.2.ebuild
new file mode 100644
index 000000000000..6940592320e4
--- /dev/null
+++ b/dev-db/postgis/postgis-1.4.2.ebuild
@@ -0,0 +1,252 @@
+# 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.4.2.ebuild,v 1.1 2011/08/23 22:31:43 titanofold Exp $
+
+EAPI="4"
+
+inherit eutils versionator
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.refractions.net"
+SRC_URI="http://postgis.refractions.net/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk"
+
+RDEPEND="
+		|| (
+			dev-db/postgresql-server:8.4
+			dev-db/postgresql-server:8.3
+			dev-db/postgresql-server:8.2
+		)
+		>=sci-libs/geos-3.1
+		>=sci-libs/proj-4.5.0
+		gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+		doc? (
+				app-text/docbook-xsl-stylesheets
+				app-text/docbook-xml-dtd:4.3
+				dev-libs/libxslt
+				|| (
+					media-gfx/imagemagick
+					media-gfx/graphicsmagick[imagemagick]
+				)
+		)
+"
+
+RESTRICT="test"
+
+PGIS="$(get_version_component_range 1-2)"
+
+pkg_setup() {
+	export PGSLOT="$(postgresql-config show)"
+	if [[ ${PGSLOT//.} < 82 || ${PGSLOT//.} > 84 ]] ; then
+		eerror "You must build ${CATEGORY}/${PN} against PostgreSQL between 8.2 and 8.4."
+		eerror "Set an appropriate slot with postgresql-config."
+		die "postgresql-config not set to 8.2, 8.3 or 8.4."
+	fi
+}
+
+src_configure() {
+	# Configure interprets --without-gui as being the same as --with-gui
+	if use gtk ; then
+		econf --with-gui
+	else
+		econf
+	fi
+}
+
+src_compile() {
+	# Occasionally, builds fail because of out of order compilation.
+	# Otherwise, it'd be fine.
+	emake -j1
+	cd topology/
+	emake -j1
+
+	if use doc ; then
+		cd "${S}/doc/"
+		emake -j1
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	cd topology/
+	emake -j1 DESTDIR="${D}" install
+
+	cd "${S}"
+	dodoc CREDITS TODO loader/README.* doc/*txt
+
+	docinto topology
+	dodoc topology/{TODO,README}
+	dobin ./utils/postgis_restore.pl
+
+	if use doc; then
+		cd doc/html
+		dohtml -r *
+	fi
+
+	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
+	doins postgis_comments.sql
+
+	insinto /etc
+	doins "${FILESDIR}/postgis_dbs-${PGIS}"
+
+	cd "${S}/doc"
+	doman man/*
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "To finish installing or updating PostGIS edit:"
+	elog "    ${EROOT%/}/etc/postgis_dbs"
+	elog
+	elog "Then, run:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config(){
+	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
+	source "${EROOT%/}/etc/postgis_dbs"
+	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
+
+	if [[ -n ${configured} ]] ; then
+		einfon "Password for PostgreSQL user '${pguser}': "
+		read -s PGPASSWORD
+		export PGPASSWORD
+		echo
+	else
+		eerror "You must edit:"
+		eerror "    ${EROOT%/}/etc/postgis_dbs"
+		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
+		eerror
+		die "Edit postgis_dbs"
+	fi
+
+	# The server we work with must be the same slot we built against.
+	local server_version
+	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
+		-Aqwtc 'SELECT version()' 2> /dev/null)
+	if [[ $? = 0 ]] ; then
+		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
+			cut -d "." -f -2 | tr -d .)
+		if [[ $server_version != ${PGSLOT//.} ]] ; then
+			unset PGPASSWORD
+			eerror "Server version must be ${PGSLOT}.x"
+			die "Server version isn't ${PGSLOT}.x"
+		fi
+	else
+		unset PGPASSWORD
+		eerror "Is the server running?"
+		die "Couldn't connect to server."
+	fi
+
+	local retval
+	safe_exit() {
+		unset PGPASSWORD
+		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
+		eend $retval
+		eerror "All actions could not be performed."
+		eerror "Read above to see what failed."
+		eerror "Once you fix the issue, you'll need to edit:"
+		eerror "    ${EROOT%/}/etc/postgis_dbs"
+		eerror "As some things may have succeeded."
+		eerror
+		die "All actions could not be performed"
+	}
+
+	local db
+	for db in ${databases[@]} ; do
+		ebegin "Performing CREATE LANGUAGE on ${db}"
+		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
+		retval=$?
+		# In this case, only error code 1 is fatal
+		[[ $retval == 1 ]] && safe_exit || eend 0
+
+		ebegin "Enabling PostGIS on ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${templates[@]} ; do
+		ebegin "Creating template database '${db}'"
+		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
+			${db} "PostGIS Template"
+		retval=$?
+		[[ $retval != 0 ]] && safe_exit
+
+		psql -q -U ${pguser} -p ${PGPORT} -c \
+			"UPDATE pg_database \
+			 SET datistemplate = TRUE, datallowconn = TRUE \
+			 WHERE datname = '${db}'"
+		retval=$?
+		[[ $retval != 0 ]] && safe_exit
+
+		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
+		retval=$?
+		# In this case, only error code 1 is fatal
+		[[ $retval == 1 ]] && safe_exit
+
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${epsg_databases[@]} ; do
+		ebegin "Adding EPSG to ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/spatial_ref_sys.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${comment_databases[@]} ; do
+		ebegin "Adding comments on ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis_comments.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${upgrade_from_1_2[@]} ; do
+		ebegin "Upgrading from PostGIS 1.2 to ${PGIS} on ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis_upgrade_12_to_${PGIS//.}.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${upgrade_from_1_3[@]} ; do
+		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	for db in ${upgrade_from_1_4[@]} ; do
+		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
+		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
+			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
+		retval=$?
+		[[ $retval == 0 ]] && eend 0 || safe_exit
+	done
+
+	# Clean up and make it so the user has to edit postgis_dbs again that
+	# way this script won't step on any toes due to user error.
+	unset PGPASSWORD
+	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
+	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
+	einfo
+	einfo "To enable other databases, change the default slot:"
+	einfo "    postgresql-config set <slot>"
+	einfo "Then, emerge this package again:"
+	einfo "    emerge -av =${CATEGORY}/${PF}"
+}