Removing old versions.

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

9 files changed, 17 insertions, 1479 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/Manifest b/dev-db/postgis/Manifest
index 6c3db3edd00d..31eaabd4402c 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,21 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX postgis_dbs 2096 RMD160 64b66e99aed34fb8e9523505851962a547bd41d0 SHA1 68565ab29a22ec08c7a2271f2219d653e11ca393 SHA256 dafde4a1d1d95e18facb3287baddab3c1c116933498c310438c91dbd736833ec
 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-r1.ebuild 6696 RMD160 0b9672fdd64eed9a7f203a2f340ab2a3cd4ec087 SHA1 60abe281b88bf0d8fbef20dced9cfdd957b878a8 SHA256 789cd4a5a6515f10946931330b4241c5bdd7f3a8519de059c290713532f2cc11
-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-r1.ebuild 6912 RMD160 16d2be1d567554203afa805ad357c2042c5664aa SHA1 72a6743a5e0697ed3632b49d495e2a922a6d5d20 SHA256 8680d2bf4db5fc0ff1d1631e7ecf827aae1786f86c5a2f19951bd86a549a156f
-EBUILD postgis-1.5.3.ebuild 7023 RMD160 4e0cdd32268f8a9da26cfaffacc0749135c79cd7 SHA1 6a20b216440acecbdd801c33e8fc5346bfe4b937 SHA256 6b9d06a69aba974f630821a4fd69c4448e21718e3387378b79398b4ac99c2254
-MISC ChangeLog 8585 RMD160 aab0dc5a631c8c1406e9de6153508ad24903a75a SHA1 e03e20b84fbd4f3737a5d82648d7336d55558216 SHA256 be33e6982f9affc6c4eef0b7ac06afd79e6b1e62efa1a98d2efa740574abddfc
+MISC ChangeLog 8842 RMD160 5287d7d530e8f09fa0f27fd9d1ffbe1105b5490a SHA1 d850e3ba4a53c5769688b055ccea164c7c6a5f13 SHA256 cc3e550a963551c9cb0cb923400ca9eeb2fd1886092a7975bb0184d22be1e75d
 MISC metadata.xml 481 RMD160 09ed331d86c1d68797aaf8a4912539f08f91cbb6 SHA1 a45afb667212035b630d417d2fc9632d99bbd62a SHA256 d0ab8dbe26001259f36c968e1d48ad5fda768227d99319cf4302af804a08d5ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk9Wq5MACgkQVxOqA9G7/aBeDAD+Pis0hQ7moZqP8WVzrfJzbWDd
+bU31sSe0Y/qZdjakVG0A/3VLtMX/exzPR4rzsEg9glusMiOiLu44BwpZgIJafKuy
+=VpVo
+-----END PGP SIGNATURE-----
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
-}