Removing old versions.

(Portage version: 2.1.10.44/cvs/Linux i686)

8 files changed, 6 insertions, 1467 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index ae77d7d31091..3c6d12235ba5 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,11 @@
 # 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.61 2012/03/06 21:24:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.62 2012/03/07 00:27:57 titanofold Exp $
+
+  07 Mar 2012; Aaron W. Swenson <titanofold@gentoo.org> -postgis-1.3.1.ebuild,
+  -postgis-1.4.0.ebuild, -postgis-1.5.0.ebuild, -postgis-1.5.0-r1.ebuild,
+  -postgis-1.5.2.ebuild, -postgis-1.5.2-r3.ebuild, -postgis-1.5.3.ebuild:
+  Removing old versions.
 
   06 Mar 2012; Brent Baude <ranger@gentoo.org> postgis-1.5.3-r1.ebuild:
   Marking postgis-1.5.3-r1 ppc for bug 376359
diff --git a/dev-db/postgis/postgis-1.3.1.ebuild b/dev-db/postgis/postgis-1.3.1.ebuild
deleted file mode 100644
index 238870b4461c..000000000000
--- a/dev-db/postgis/postgis-1.3.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.3.1.ebuild,v 1.8 2010/06/17 19:09:52 patrick Exp $
-
-inherit eutils versionator
-
-KEYWORDS="amd64 ppc x86"
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.refractions.net"
-SRC_URI="http://www.postgis.org/download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="geos proj doc"
-
-RDEPEND="dev-db/postgresql-server
-	geos? ( sci-libs/geos )
-	proj? ( sci-libs/proj )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets )"
-
-RESTRICT="test"
-
-pkg_setup(){
-	local tmp
-	tmp="$(portageq match / ${CATEGORY}/${PN} | cut -d'.' -f2)"
-	if [ "${tmp}" != "$(get_version_component_range 2)" ]; then
-		elog "You must soft upgrade your existing postgis enabled databases"
-		elog "using 'emerge --config postgis'."
-		require_soft_upgrade="1"
-		ebeep 2
-	fi
-}
-
-src_compile(){
-	local myconf
-	if use geos; then
-		myconf="--with-geos"
-	fi
-
-	if use doc;then
-		myconf="${myconf} --with-xsl=$(ls "${ROOT}"usr/share/sgml/docbook/* | \
-			grep xsl\- | cut -d':' -f1)"
-	fi
-
-	econf --enable-autoconf \
-		--datadir=/usr/share/postgresql/contrib/ \
-		--libdir=/usr/$(get_libdir)/postgresql/ \
-		--with-docdir=/usr/share/doc/${PF}/html/ \
-		${myconf} \
-		$(use_with proj) ||\
-			die "Error: econf failed"
-
-	emake || die "Error: emake failed"
-
-	cd topology/
-	emake || die "Unable to build topology sql file"
-
-	if use doc ; then
-		cd "${S}"
-		emake docs || die "Unable to build documentation"
-	fi
-}
-
-src_install(){
-	dodir /usr/$(get_libdir)/postgresql /usr/share/postgresql/contrib/
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}/topology/"
-	emake DESTDIR="${D}" install || die "emake install topology failed"
-
-	cd "${S}"
-	dodoc Changelog CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	cd "${S}"
-	if use doc; then
-		emake DESTDIR="${D}" docs-install || die "emake install docs failed"
-	fi
-
-	if [ ! -z "${require_soft_upgrade}" ]; then
-		grep "'C'" -B 4 "${D}"usr/share/postgresql/contrib/lwpostgis.sql |\
-			grep -v "'sql'" > \
-				"${D}"usr/share/postgresql/contrib/load_before_upgrade.sql
-	fi
-}
-
-pkg_postinst() {
-	elog "To create new spatial database use 'emerge --config ${PN}.'"
-}
-
-pkg_config(){
-	myuser="${PG_USER:-postgres}"
-	mydb="${PGDATABASE:-template_gis}"
-
-	is_template=false
-	if [ "${mydb:0:8}" == "template" ];then
-		is_template=true
-		mytype="template database"
-	else
-		mytype="database"
-	fi
-
-	einfo "Create or upgrade a spatial template and database."
-	einfo "Using the user ${myuser} and the ${mydb} ${mytype}."
-	einfo "Please do 'export PG_USER=...' to use another user."
-	einfo "Please do 'export PGDATABASE=...' to set another template/database"
-	einfo "name (templates name have to be prefixed with 'template')."
-
-	logfile=$(mktemp "${ROOT}tmp/error.log.XXXXXX")
-	safe_exit(){
-		eerror "Removing created ${mydb} ${mytype}"
-		dropdb -q -U "${myuser}" "${mydb}" ||\
-			(eerror "${1}"
-			die "Removing old db failed, you must do it manually")
-		eerror "Please read ${logfile} for more information."
-		die "${1}"
-	}
-
-	# if there is not a table or a template existing with the same name, create.
-	if [ -z "$(psql -U "${myuser}" -l | grep "${mydb}")" ]; then
-		einfo
-		einfo "Please hit ENTER if you want to create the ${mydb}"
-		einfo "${mytype} as "${myuser}" user, or Control-C to abort now..."
-		read
-		createdb -q -O ${myuser} -U ${myuser} ${mydb} ||\
-			die "Unable to create the ${mydb} ${mytype} as ${myuser}"
-		createlang -U ${myuser} plpgsql ${mydb}
-		if [ "$?" == 2 ]; then
-				safe_exit "Unable to createlang plpgsql ${mydb}."
-		fi
-		(psql -q -U ${myuser} ${mydb} -f \
-			"${ROOT}"usr/share/postgresql/contrib/lwpostgis.sql &&
-		psql -q -U ${myuser} ${mydb} -f \
-			"${ROOT}"usr/share/postgresql/contrib/spatial_ref_sys.sql) 2>\
-				"${logfile}"
-		if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-				safe_exit "Unable to load sql files."
-		fi
-		if ${is_template}; then
-			psql -q -U ${myuser} ${mydb} -c \
-				"UPDATE pg_database SET datistemplate = TRUE
-				WHERE datname = '${mydb}';
-				GRANT ALL ON table spatial_ref_sys, geometry_columns TO PUBLIC;
-				VACUUM FREEZE;" || die "Unable to create ${mydb}"
-		fi
-	else
-		einfo
-		einfo "Please hit ENTER if you want to upgrade the ${mydb}"
-		einfo "${mytype} as ${myuser} user, or Control-C to abort now..."
-		read
-		if [ -e "${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql ];
-		then
-			einfo "Updating the dynamic library references"
-			psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql\
-					2> "${logfile}"
-			if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-				safe_exit "Unable to update references."
-			fi
-		fi
-		if [ -e "${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql ];
-		then
-			einfo "Running soft upgrade"
-			psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql 2>\
-					"${logfile}"
-			if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-				safe_exit "Unable to run soft upgrade."
-			fi
-		fi
-	fi
-
-	if ${is_template}; then
-		einfo "You can now create a spatial database using :"
-		einfo "'createdb -T ${mydb} test'"
-	fi
-}
diff --git a/dev-db/postgis/postgis-1.4.0.ebuild b/dev-db/postgis/postgis-1.4.0.ebuild
deleted file mode 100644
index 0526b472d22b..000000000000
--- a/dev-db/postgis/postgis-1.4.0.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.4.0.ebuild,v 1.5 2010/06/17 19:09:52 patrick Exp $
-
-EAPI="1"
-
-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"
-
-RDEPEND=">=dev-db/postgresql-server-8.2
-	>=sci-libs/geos-3
-	>=sci-libs/proj-4.5.0"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets
-		media-gfx/imagemagick )"
-
-RESTRICT="test"
-
-pkg_setup(){
-	if [ ! -z "${PGUSER}" ]; then
-		eval unset PGUSER
-	fi
-	if [ ! -z "${PGDATABASE}" ]; then
-		eval unset PGDATABASE
-	fi
-	local tmp
-	tmp="$(portageq match / ${CATEGORY}/${PN} | cut -d'.' -f2)"
-	if [ "${tmp}" != "$(get_version_component_range 2)" ]; then
-		elog "You must soft upgrade your existing postgis enabled databases"
-		elog "by adding their names in the ${ROOT}conf.d/postgis_dbs file"
-		elog "then using 'emerge --config postgis'."
-		require_soft_upgrade="1"
-		ebeep 2
-	fi
-}
-
-src_compile(){
-	local myconf
-	if use doc; then
-		myconf="${myconf} --with-xsldir=$(ls "${ROOT}"usr/share/sgml/docbook/* | \
-			grep xsl\- | cut -d':' -f1)"
-	fi
-
-	econf --enable-autoconf \
-		--datadir=/usr/share/postgresql/contrib/ \
-		--libdir=/usr/$(get_libdir)/postgresql/ \
-		--docdir=${D}/usr/share/doc/${PF}/html/ \
-		${myconf} ||\
-			die "Error: econf failed"
-
-	emake -j1 || die "Error: emake failed"
-
-	cd topology/
-	emake -j1 || die "Unable to build topology sql file"
-
-	if use doc ; then
-		cd "${S}"
-		emake -j1 docs || die "Unable to build documentation"
-	fi
-}
-
-src_install(){
-	dodir /usr/$(get_libdir)/postgresql /usr/share/postgresql/contrib/
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}/topology/"
-	emake DESTDIR="${D}" install || die "emake install topology failed"
-
-	cd "${S}"
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	cd "${S}"
-	if use doc; then
-		emake DESTDIR="${D}" docs-install || die "emake install docs failed"
-	fi
-
-	echo "template_gis" > postgis_dbs
-	doconfd postgis_dbs
-
-	if [ ! -z "${require_soft_upgrade}" ]; then
-		grep "'C'" -B 4 "${D}"usr/share/postgresql/contrib/lwpostgis.sql | \
-			grep -v "'sql'" > \
-				"${D}"usr/share/postgresql/contrib/load_before_upgrade.sql
-	fi
-}
-
-pkg_postinst() {
-	elog "To create new (upgrade) spatial databases add their names in the"
-	elog "${ROOT}conf.d/postgis_dbs file, then use 'emerge --config postgis'."
-}
-
-pkg_config(){
-	einfo "Create or upgrade a spatial templates and databases."
-	einfo "Please add your databases names into ${ROOT}conf.d/postgis_dbs"
-	einfo "(templates name have to be prefixed with 'template')."
-	for i in $(cat "${ROOT}etc/conf.d/postgis_dbs"); do
-		source "${ROOT}"etc/conf.d/postgresql
-		PGDATABASE=${i}
-		eval set PGDATABASE=${i}
-		myuser="${PGUSER:-postgres}"
-		mydb="${PGDATABASE:-template_gis}"
-		eval set PGUSER=${myuser}
-
-		is_template=false
-		if [ "${mydb:0:8}" == "template" ];then
-			is_template=true
-			mytype="template database"
-		else
-			mytype="database"
-		fi
-
-		einfo
-		einfo "Using the user ${myuser} and the ${mydb} ${mytype}."
-
-		logfile=$(mktemp "${ROOT}tmp/error.log.XXXXXX")
-		safe_exit(){
-			eerror "Removing created ${mydb} ${mytype}"
-			dropdb -q -U "${myuser}" "${mydb}" ||\
-				(eerror "${1}"
-				die "Removing old db failed, you must do it manually")
-			eerror "Please read ${logfile} for more information."
-			die "${1}"
-		}
-
-	# if there is not a table or a template existing with the same name, create.
-		if [ -z "$(psql -U ${myuser} -l | grep "${mydb}")" ]; then
-			createdb -q -O ${myuser} -U ${myuser} ${mydb} ||\
-				die "Unable to create the ${mydb} ${mytype} as ${myuser}"
-			createlang -U ${myuser} plpgsql ${mydb}
-			if [ "$?" == 2 ]; then
-				safe_exit "Unable to createlang plpgsql ${mydb}."
-			fi
-			(psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/lwpostgis.sql &&
-			psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/spatial_ref_sys.sql) 2>\
-					"${logfile}"
-			if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-				safe_exit "Unable to load sql files."
-			fi
-			if ${is_template}; then
-				psql -q -U ${myuser} ${mydb} -c \
-					"UPDATE pg_database SET datistemplate = TRUE
-					WHERE datname = '${mydb}';
-			GRANT ALL ON table spatial_ref_sys, geometry_columns TO PUBLIC;" \
-				|| die "Unable to create ${mydb}"
-			psql -q -U ${myuser} ${mydb} -c \
-				"VACUUM FREEZE;" || die "Unable to set VACUUM FREEZE option"
-			fi
-		else
-			if [ -e "${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql ];
-			then
-				einfo "Updating the dynamic library references"
-				psql -q -f \
-					"${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql\
-						2> "${logfile}"
-				if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-					safe_exit "Unable to update references."
-				fi
-			fi
-			if [ -e "${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql ];
-			then
-				einfo "Running soft upgrade"
-				psql -q -U ${myuser} ${mydb} -f \
-					"${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql 2>\
-						"${logfile}"
-				if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-					safe_exit "Unable to run soft upgrade."
-				fi
-			fi
-		fi
-		if ${is_template}; then
-			einfo "You can now create a spatial database using :"
-			einfo "'createdb -T ${mydb} test'"
-		fi
-	done
-}
diff --git a/dev-db/postgis/postgis-1.5.0-r1.ebuild b/dev-db/postgis/postgis-1.5.0-r1.ebuild
deleted file mode 100644
index b1628e457a04..000000000000
--- a/dev-db/postgis/postgis-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# 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.0-r1.ebuild,v 1.4 2011/03/07 13:22:00 jlec Exp $
-
-EAPI="2"
-
-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"
-
-RDEPEND=">=dev-db/postgresql-server-8.3
-	>=sci-libs/geos-3.2
-	>=sci-libs/proj-4.6.0
-	dev-libs/libxml2:2"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets
-		app-text/docbook-xml-dtd:4.3
-		media-gfx/imagemagick )"
-
-RESTRICT="test"
-
-pkg_setup(){
-	if [ ! -z "${PGUSER}" ]; then
-		eval unset PGUSER
-	fi
-	if [ ! -z "${PGDATABASE}" ]; then
-		eval unset PGDATABASE
-	fi
-	local tmp
-	tmp="$(portageq match / ${CATEGORY}/${PN} | cut -d'.' -f2)"
-	if [ "${tmp}" != "$(get_version_component_range 2)" ]; then
-		elog "You must soft upgrade your existing postgis enabled databases"
-		elog "by adding their names in the ${ROOT}conf.d/postgis_dbs file"
-		elog "then using 'emerge --config postgis'."
-		require_soft_upgrade="1"
-		ebeep 2
-	fi
-}
-
-src_configure(){
-	local myconf
-	if use doc; then
-		myconf="${myconf} --with-xsldir=$(ls "${ROOT}"usr/share/sgml/docbook/* | \
-			grep xsl\- | cut -d':' -f1)"
-	fi
-
-	econf --enable-autoconf \
-		--datadir=/usr/share/postgresql/contrib/ \
-		--libdir=/usr/$(get_libdir)/postgresql/ \
-		--docdir="${D}/usr/share/doc/${PF}/html/" \
-		${myconf} ||\
-			die "Error: econf failed"
-
-	if use doc; then
-		cd doc
-		sed -i -e 's:PGSQL_DOCDIR=/:PGSQL_DOCDIR=${D}/:' Makefile || die "Fixing doc install paths failed"
-		sed -i -e 's:PGSQL_MANDIR=/:PGSQL_MANDIR=${D}/:' Makefile || die "Fixing doc install paths failed"
-		sed -i -e 's:PGSQL_SHAREDIR=/:PGSQL_SHAREDIR=${D}/:' Makefile || die "Fixing doc install paths failed"
-	fi
-}
-
-src_compile() {
-	emake -j1 || die "Error: emake failed"
-
-	cd topology/
-	emake -j1 || die "Unable to build topology sql file"
-
-	if use doc ; then
-		cd "${S}"
-		emake -j1 docs || die "Unable to build documentation"
-	fi
-}
-
-src_install(){
-	dodir /usr/$(get_libdir)/postgresql /usr/share/postgresql/contrib/
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}/topology/"
-	emake DESTDIR="${D}" install || die "emake install topology failed"
-
-	cd "${S}"
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	cd "${S}"
-	if use doc; then
-		emake DESTDIR="${D}" docs-install || die "emake install docs failed"
-	fi
-
-	echo "template_gis" > postgis_dbs
-	doconfd postgis_dbs
-
-	if [ ! -z "${require_soft_upgrade}" ]; then
-		grep "'C'" -B 4 "${D}"usr/share/postgresql/contrib/lwpostgis.sql | \
-			grep -v "'sql'" > \
-				"${D}"usr/share/postgresql/contrib/load_before_upgrade.sql
-	fi
-}
-
-pkg_postinst() {
-	elog "To create new (upgrade) spatial databases add their names in the"
-	elog "${ROOT}conf.d/postgis_dbs file, then use 'emerge --config postgis'."
-}
-
-pkg_config(){
-	einfo "Create or upgrade a spatial templates and databases."
-	einfo "Please add your databases names into ${ROOT}conf.d/postgis_dbs"
-	einfo "(templates name have to be prefixed with 'template')."
-	for i in $(cat "${ROOT}etc/conf.d/postgis_dbs"); do
-		source "${ROOT}"etc/conf.d/postgresql
-		PGDATABASE=${i}
-		eval set PGDATABASE=${i}
-		myuser="${PGUSER:-postgres}"
-		mydb="${PGDATABASE:-template_gis}"
-		eval set PGUSER=${myuser}
-
-		is_template=false
-		if [ "${mydb:0:8}" == "template" ];then
-			is_template=true
-			mytype="template database"
-		else
-			mytype="database"
-		fi
-
-		einfo
-		einfo "Using the user ${myuser} and the ${mydb} ${mytype}."
-
-		logfile=$(mktemp "${ROOT}tmp/error.log.XXXXXX")
-		safe_exit(){
-			eerror "Removing created ${mydb} ${mytype}"
-			dropdb -q -U "${myuser}" "${mydb}" ||\
-				(eerror "${1}"
-				die "Removing old db failed, you must do it manually")
-			eerror "Please read ${logfile} for more information."
-			die "${1}"
-		}
-
-	# if there is not a table or a template existing with the same name, create.
-		if [ -z "$(psql -U ${myuser} -l | grep "${mydb}")" ]; then
-			createdb -q -O ${myuser} -U ${myuser} ${mydb} ||\
-				die "Unable to create the ${mydb} ${mytype} as ${myuser}"
-			createlang -U ${myuser} plpgsql ${mydb}
-			if [ "$?" == 2 ]; then
-				safe_exit "Unable to createlang plpgsql ${mydb}."
-			fi
-			(psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/lwpostgis.sql &&
-			psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/spatial_ref_sys.sql) 2>\
-					"${logfile}"
-			if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-				safe_exit "Unable to load sql files."
-			fi
-			if ${is_template}; then
-				psql -q -U ${myuser} ${mydb} -c \
-					"UPDATE pg_database SET datistemplate = TRUE
-					WHERE datname = '${mydb}';
-			GRANT ALL ON table spatial_ref_sys, geometry_columns TO PUBLIC;" \
-				|| die "Unable to create ${mydb}"
-			psql -q -U ${myuser} ${mydb} -c \
-				"VACUUM FREEZE;" || die "Unable to set VACUUM FREEZE option"
-			fi
-		else
-			if [ -e "${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql ];
-			then
-				einfo "Updating the dynamic library references"
-				psql -q -f \
-					"${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql\
-						2> "${logfile}"
-				if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-					safe_exit "Unable to update references."
-				fi
-			fi
-			if [ -e "${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql ];
-			then
-				einfo "Running soft upgrade"
-				psql -q -U ${myuser} ${mydb} -f \
-					"${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql 2>\
-						"${logfile}"
-				if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-					safe_exit "Unable to run soft upgrade."
-				fi
-			fi
-		fi
-		if ${is_template}; then
-			einfo "You can now create a spatial database using :"
-			einfo "'createdb -T ${mydb} test'"
-		fi
-	done
-}
diff --git a/dev-db/postgis/postgis-1.5.0.ebuild b/dev-db/postgis/postgis-1.5.0.ebuild
deleted file mode 100644
index bc780ca467b4..000000000000
--- a/dev-db/postgis/postgis-1.5.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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.0.ebuild,v 1.4 2011/03/07 13:22:00 jlec Exp $
-
-EAPI="1"
-
-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"
-
-RDEPEND=">=dev-db/postgresql-server-8.3
-	>=sci-libs/geos-3.2
-	>=sci-libs/proj-4.6.0
-	dev-libs/libxml2:2"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets
-		media-gfx/imagemagick )"
-
-RESTRICT="test"
-
-pkg_setup(){
-	if [ ! -z "${PGUSER}" ]; then
-		eval unset PGUSER
-	fi
-	if [ ! -z "${PGDATABASE}" ]; then
-		eval unset PGDATABASE
-	fi
-	local tmp
-	tmp="$(portageq match / ${CATEGORY}/${PN} | cut -d'.' -f2)"
-	if [ "${tmp}" != "$(get_version_component_range 2)" ]; then
-		elog "You must soft upgrade your existing postgis enabled databases"
-		elog "by adding their names in the ${ROOT}conf.d/postgis_dbs file"
-		elog "then using 'emerge --config postgis'."
-		require_soft_upgrade="1"
-		ebeep 2
-	fi
-}
-
-src_compile(){
-	local myconf
-	if use doc; then
-		myconf="${myconf} --with-xsldir=$(ls "${ROOT}"usr/share/sgml/docbook/* | \
-			grep xsl\- | cut -d':' -f1)"
-	fi
-
-	econf --enable-autoconf \
-		--datadir=/usr/share/postgresql/contrib/ \
-		--libdir=/usr/$(get_libdir)/postgresql/ \
-		--docdir=${D}/usr/share/doc/${PF}/html/ \
-		${myconf} ||\
-			die "Error: econf failed"
-
-	emake -j1 || die "Error: emake failed"
-
-	cd topology/
-	emake -j1 || die "Unable to build topology sql file"
-
-	if use doc ; then
-		cd "${S}"
-		emake -j1 docs || die "Unable to build documentation"
-	fi
-}
-
-src_install(){
-	dodir /usr/$(get_libdir)/postgresql /usr/share/postgresql/contrib/
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}/topology/"
-	emake DESTDIR="${D}" install || die "emake install topology failed"
-
-	cd "${S}"
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	cd "${S}"
-	if use doc; then
-		emake DESTDIR="${D}" docs-install || die "emake install docs failed"
-	fi
-
-	echo "template_gis" > postgis_dbs
-	doconfd postgis_dbs
-
-	if [ ! -z "${require_soft_upgrade}" ]; then
-		grep "'C'" -B 4 "${D}"usr/share/postgresql/contrib/lwpostgis.sql | \
-			grep -v "'sql'" > \
-				"${D}"usr/share/postgresql/contrib/load_before_upgrade.sql
-	fi
-}
-
-pkg_postinst() {
-	elog "To create new (upgrade) spatial databases add their names in the"
-	elog "${ROOT}conf.d/postgis_dbs file, then use 'emerge --config postgis'."
-}
-
-pkg_config(){
-	einfo "Create or upgrade a spatial templates and databases."
-	einfo "Please add your databases names into ${ROOT}conf.d/postgis_dbs"
-	einfo "(templates name have to be prefixed with 'template')."
-	for i in $(cat "${ROOT}etc/conf.d/postgis_dbs"); do
-		source "${ROOT}"etc/conf.d/postgresql
-		PGDATABASE=${i}
-		eval set PGDATABASE=${i}
-		myuser="${PGUSER:-postgres}"
-		mydb="${PGDATABASE:-template_gis}"
-		eval set PGUSER=${myuser}
-
-		is_template=false
-		if [ "${mydb:0:8}" == "template" ];then
-			is_template=true
-			mytype="template database"
-		else
-			mytype="database"
-		fi
-
-		einfo
-		einfo "Using the user ${myuser} and the ${mydb} ${mytype}."
-
-		logfile=$(mktemp "${ROOT}tmp/error.log.XXXXXX")
-		safe_exit(){
-			eerror "Removing created ${mydb} ${mytype}"
-			dropdb -q -U "${myuser}" "${mydb}" ||\
-				(eerror "${1}"
-				die "Removing old db failed, you must do it manually")
-			eerror "Please read ${logfile} for more information."
-			die "${1}"
-		}
-
-	# if there is not a table or a template existing with the same name, create.
-		if [ -z "$(psql -U ${myuser} -l | grep "${mydb}")" ]; then
-			createdb -q -O ${myuser} -U ${myuser} ${mydb} ||\
-				die "Unable to create the ${mydb} ${mytype} as ${myuser}"
-			createlang -U ${myuser} plpgsql ${mydb}
-			if [ "$?" == 2 ]; then
-				safe_exit "Unable to createlang plpgsql ${mydb}."
-			fi
-			(psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/lwpostgis.sql &&
-			psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/spatial_ref_sys.sql) 2>\
-					"${logfile}"
-			if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-				safe_exit "Unable to load sql files."
-			fi
-			if ${is_template}; then
-				psql -q -U ${myuser} ${mydb} -c \
-					"UPDATE pg_database SET datistemplate = TRUE
-					WHERE datname = '${mydb}';
-			GRANT ALL ON table spatial_ref_sys, geometry_columns TO PUBLIC;" \
-				|| die "Unable to create ${mydb}"
-			psql -q -U ${myuser} ${mydb} -c \
-				"VACUUM FREEZE;" || die "Unable to set VACUUM FREEZE option"
-			fi
-		else
-			if [ -e "${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql ];
-			then
-				einfo "Updating the dynamic library references"
-				psql -q -f \
-					"${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql\
-						2> "${logfile}"
-				if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-					safe_exit "Unable to update references."
-				fi
-			fi
-			if [ -e "${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql ];
-			then
-				einfo "Running soft upgrade"
-				psql -q -U ${myuser} ${mydb} -f \
-					"${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql 2>\
-						"${logfile}"
-				if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-					safe_exit "Unable to run soft upgrade."
-				fi
-			fi
-		fi
-		if ${is_template}; then
-			einfo "You can now create a spatial database using :"
-			einfo "'createdb -T ${mydb} test'"
-		fi
-	done
-}
diff --git a/dev-db/postgis/postgis-1.5.2-r3.ebuild b/dev-db/postgis/postgis-1.5.2-r3.ebuild
deleted file mode 100644
index b08fb688b39e..000000000000
--- a/dev-db/postgis/postgis-1.5.2-r3.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# 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-r3.ebuild,v 1.3 2011/06/17 10:14:09 scarabeus 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: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/proj-4.6.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)"
-
-# not parallel safe
-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."
-		eerror "Set an appropriate slot with postgresql-config."
-		die "postgresql-config not set to 8.3 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
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	emake -C topology
-	use doc && emake -C doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake -C topology 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 /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	cd "${S}/doc"
-	doman man/*
-	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
-	doins postgis_comments.sql
-}
-
-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
-
-		# 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 ${espg_databases[@]} ; do
-			ebegin "Adding ESPG 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_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 "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-				-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-			retval=$?
-			[[ $retval == 0 ]] && eend 0 || safe_exit
-		done
-
-		for db in ${upgrade_from_1_5[@]} ; 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}"
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-}
diff --git a/dev-db/postgis/postgis-1.5.2.ebuild b/dev-db/postgis/postgis-1.5.2.ebuild
deleted file mode 100644
index 3617df050912..000000000000
--- a/dev-db/postgis/postgis-1.5.2.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# 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.ebuild,v 1.2 2011/03/07 13:22:00 jlec Exp $
-
-EAPI="2"
-
-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"
-
-RDEPEND=">=dev-db/postgresql-server-8.3
-	>=sci-libs/geos-3.2
-	>=sci-libs/proj-4.6.0
-	dev-libs/libxml2:2"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets
-		app-text/docbook-xml-dtd:4.3
-		media-gfx/imagemagick )"
-
-RESTRICT="test"
-
-pkg_setup(){
-	if [ ! -z "${PGUSER}" ]; then
-		eval unset PGUSER
-	fi
-	if [ ! -z "${PGDATABASE}" ]; then
-		eval unset PGDATABASE
-	fi
-	local tmp
-	tmp="$(portageq match / ${CATEGORY}/${PN} | cut -d'.' -f2)"
-	if [ "${tmp}" != "$(get_version_component_range 2)" ]; then
-		elog "You must soft upgrade your existing postgis enabled databases"
-		elog "by adding their names in the ${ROOT}conf.d/postgis_dbs file"
-		elog "then using 'emerge --config postgis'."
-		require_soft_upgrade="1"
-		ebeep 2
-	fi
-}
-
-src_configure(){
-	local myconf
-	if use doc; then
-		myconf="${myconf} --with-xsldir=$(ls "${ROOT}"usr/share/sgml/docbook/* | \
-			grep xsl\- | cut -d':' -f1)"
-	fi
-
-	econf --enable-autoconf \
-		--datadir=/usr/share/postgresql/contrib/ \
-		--libdir=/usr/$(get_libdir)/postgresql/ \
-		--docdir="${D}/usr/share/doc/${PF}/html/" \
-		${myconf} ||\
-			die "Error: econf failed"
-
-	if use doc; then
-		cd doc
-		sed -i -e 's:PGSQL_DOCDIR=/:PGSQL_DOCDIR=${D}/:' Makefile || die "Fixing doc install paths failed"
-		sed -i -e 's:PGSQL_MANDIR=/:PGSQL_MANDIR=${D}/:' Makefile || die "Fixing doc install paths failed"
-		sed -i -e 's:PGSQL_SHAREDIR=/:PGSQL_SHAREDIR=${D}/:' Makefile || die "Fixing doc install paths failed"
-	fi
-}
-
-src_compile() {
-	emake -j1 || die "Error: emake failed"
-
-	cd topology/
-	emake -j1 || die "Unable to build topology sql file"
-
-	if use doc ; then
-		cd "${S}"
-		emake -j1 docs || die "Unable to build documentation"
-	fi
-}
-
-src_install(){
-	dodir /usr/$(get_libdir)/postgresql /usr/share/postgresql/contrib/
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}/topology/"
-	emake DESTDIR="${D}" install || die "emake install topology failed"
-
-	cd "${S}"
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	docinto topology
-	dodoc topology/{TODO,README}
-	dobin ./utils/postgis_restore.pl
-
-	cd "${S}"
-	if use doc; then
-		emake DESTDIR="${D}" docs-install || die "emake install docs failed"
-	fi
-
-	echo "template_gis" > postgis_dbs
-	doconfd postgis_dbs
-
-	if [ ! -z "${require_soft_upgrade}" ]; then
-		grep "'C'" -B 4 "${D}"usr/share/postgresql/contrib/lwpostgis.sql | \
-			grep -v "'sql'" > \
-				"${D}"usr/share/postgresql/contrib/load_before_upgrade.sql
-	fi
-}
-
-pkg_postinst() {
-	elog "To create new (upgrade) spatial databases add their names in the"
-	elog "${ROOT}conf.d/postgis_dbs file, then use 'emerge --config postgis'."
-}
-
-pkg_config(){
-	einfo "Create or upgrade a spatial templates and databases."
-	einfo "Please add your databases names into ${ROOT}conf.d/postgis_dbs"
-	einfo "(templates name have to be prefixed with 'template')."
-	for i in $(cat "${ROOT}etc/conf.d/postgis_dbs"); do
-		source "${ROOT}"etc/conf.d/postgresql
-		PGDATABASE=${i}
-		eval set PGDATABASE=${i}
-		myuser="${PGUSER:-postgres}"
-		mydb="${PGDATABASE:-template_gis}"
-		eval set PGUSER=${myuser}
-
-		is_template=false
-		if [ "${mydb:0:8}" == "template" ];then
-			is_template=true
-			mytype="template database"
-		else
-			mytype="database"
-		fi
-
-		einfo
-		einfo "Using the user ${myuser} and the ${mydb} ${mytype}."
-
-		logfile=$(mktemp "${ROOT}tmp/error.log.XXXXXX")
-		safe_exit(){
-			eerror "Removing created ${mydb} ${mytype}"
-			dropdb -q -U "${myuser}" "${mydb}" ||\
-				(eerror "${1}"
-				die "Removing old db failed, you must do it manually")
-			eerror "Please read ${logfile} for more information."
-			die "${1}"
-		}
-
-	# if there is not a table or a template existing with the same name, create.
-		if [ -z "$(psql -U ${myuser} -l | grep "${mydb}")" ]; then
-			createdb -q -O ${myuser} -U ${myuser} ${mydb} ||\
-				die "Unable to create the ${mydb} ${mytype} as ${myuser}"
-			createlang -U ${myuser} plpgsql ${mydb}
-			if [ "$?" == 2 ]; then
-				safe_exit "Unable to createlang plpgsql ${mydb}."
-			fi
-			(psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/lwpostgis.sql &&
-			psql -q -U ${myuser} ${mydb} -f \
-				"${ROOT}"usr/share/postgresql/contrib/spatial_ref_sys.sql) 2>\
-					"${logfile}"
-			if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-				safe_exit "Unable to load sql files."
-			fi
-			if ${is_template}; then
-				psql -q -U ${myuser} ${mydb} -c \
-					"UPDATE pg_database SET datistemplate = TRUE
-					WHERE datname = '${mydb}';
-			GRANT ALL ON table spatial_ref_sys, geometry_columns TO PUBLIC;" \
-				|| die "Unable to create ${mydb}"
-			psql -q -U ${myuser} ${mydb} -c \
-				"VACUUM FREEZE;" || die "Unable to set VACUUM FREEZE option"
-			fi
-		else
-			if [ -e "${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql ];
-			then
-				einfo "Updating the dynamic library references"
-				psql -q -f \
-					"${ROOT}"usr/share/postgresql/contrib/load_before_upgrade.sql\
-						2> "${logfile}"
-				if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-					safe_exit "Unable to update references."
-				fi
-			fi
-			if [ -e "${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql ];
-			then
-				einfo "Running soft upgrade"
-				psql -q -U ${myuser} ${mydb} -f \
-					"${ROOT}"usr/share/postgresql/contrib/lwpostgis_upgrade.sql 2>\
-						"${logfile}"
-				if [ "$(grep -c ERROR "${logfile}")" \> 0 ]; then
-					safe_exit "Unable to run soft upgrade."
-				fi
-			fi
-		fi
-		if ${is_template}; then
-			einfo "You can now create a spatial database using :"
-			einfo "'createdb -T ${mydb} test'"
-		fi
-	done
-}
diff --git a/dev-db/postgis/postgis-1.5.3.ebuild b/dev-db/postgis/postgis-1.5.3.ebuild
deleted file mode 100644
index 5f5f53f70870..000000000000
--- a/dev-db/postgis/postgis-1.5.3.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# 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.3.ebuild,v 1.3 2011/08/07 03:08:39 phajdan.jr 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: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/proj-4.6.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)"
-
-# not parallel safe
-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."
-		eerror "Set an appropriate slot with postgresql-config."
-		die "postgresql-config not set to 8.3 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
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf \
-		${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	emake -C topology
-	use doc && emake -C doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake -C topology 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 /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	cd "${S}/doc"
-	doman man/*
-	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
-	doins postgis_comments.sql
-}
-
-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
-
-		# 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 ${espg_databases[@]} ; do
-			ebegin "Adding ESPG 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_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 "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-				-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-			retval=$?
-			[[ $retval == 0 ]] && eend 0 || safe_exit
-		done
-
-		for db in ${upgrade_from_1_5[@]} ; 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}"
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-}