Cleanup old unneeded versions, fixes bug #17808.

Package-Manager: portage-2.1.2.3

9 files changed, 15 insertions, 407 deletions

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 583178f1f981..adc25d0e4cee 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/postgis
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.26 2007/01/06 19:41:27 djay Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.27 2007/04/09 15:30:01 chtekk Exp $
+
+  09 Apr 2007; Luca Longinotti <chtekk@gentoo.org> -postgis-0.7.5-r2.ebuild,
+  -postgis-1.1.2.ebuild, -postgis-1.1.6.ebuild, postgis-1.2.0.ebuild:
+  Cleanup old unneeded versions, fixes bug #17808.
 
 *postgis-1.2.0 (06 Jan 2007)
 *postgis-1.1.6 (06 Jan 2007)
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 6587183d6132..97437d4097b8 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -6,52 +6,27 @@ AUX postgis_xsl.patch 1058 RMD160 052a9578b27edbded5f7885de5efa3595b4c7ac1 SHA1
 MD5 7334ce94dc73f9a6e6274b01369fe97d files/postgis_xsl.patch 1058
 RMD160 052a9578b27edbded5f7885de5efa3595b4c7ac1 files/postgis_xsl.patch 1058
 SHA256 ed309baa8aa7e9f10f1006c954f75aa9a4898c820ae46b76d5389c618fb7c08d files/postgis_xsl.patch 1058
-DIST postgis-0.7.5.tar.gz 336368 RMD160 c45d2e797b358dc0bf81aa2bc70d153bceae7029 SHA1 7b3417790010dd3ce8bbcfc21ccab772107c3527 SHA256 51a9dc56b34b7325aaeb5ca3540d6ce1ae830bf7ce601a827126fb6028452afb
-DIST postgis-1.1.2.tar.gz 1547680 RMD160 0536e91dc65d3ea8ead7e788f0b0fa1ee81f295a SHA1 e9162c06cee6125011d85dcf37b4a29e78e7e45c SHA256 5d63b1875e6dd8610001ad89d97351eaaf1c3205fc6ec57365e2bb9f6b990fb5
 DIST postgis-1.1.4.tar.gz 1853989 RMD160 8441aba816154ebe743a93334df9df43a15fa87e SHA1 96afd988aeabb92efa0a99b25cc77be29c700dde SHA256 8f7c74c34431120364d623d0d7ef2556ae6c9bb153b9621eb93ebf56a5396018
-DIST postgis-1.1.6.tar.gz 2039011 RMD160 414b7d03e1b14f7e46dabc32484ec25b4dc42916 SHA1 b13c36e50e30c572298cb8631bc83e5318d24bcc SHA256 18923e610e23e4c5fe706b5d52ff3d44fbddac9876775d36917268d32d7d1580
 DIST postgis-1.2.0.tar.gz 2077747 RMD160 4f2ce71ffd49649cd5712a8bc1a6b822d968797a SHA1 b6e33324c4c2dddc925e7bac86fb1f9c635f20a6 SHA256 7d8f5782ddca38199a1630765e4a2b6d7d703af0cc28d04685cbc6156177d9cb
-DIST postgresql-7.3.6.tar.gz 11288430 RMD160 66dc806f0eab410059b9233d62b0744fd8b6192b SHA1 5135ed429a22f8290eece18d67a459716a80871a SHA256 ecfbbdd16c0ace4ae1d10997765cfefc49092d01f9198846ad58a79bd06e23e0
-EBUILD postgis-0.7.5-r2.ebuild 1819 RMD160 c88a1807587b16c24e4816da2e756680a379551f SHA1 1b9bb8126c1c73ddb265abd2ec02bfc9998be9f1 SHA256 3e91e8fbe26403397d883009717cf2cb59e17f507351e1446007f9cd2887a092
-MD5 566f2c9cd28601b48aed55459bb49689 postgis-0.7.5-r2.ebuild 1819
-RMD160 c88a1807587b16c24e4816da2e756680a379551f postgis-0.7.5-r2.ebuild 1819
-SHA256 3e91e8fbe26403397d883009717cf2cb59e17f507351e1446007f9cd2887a092 postgis-0.7.5-r2.ebuild 1819
-EBUILD postgis-1.1.2.ebuild 2722 RMD160 d974bf1b2ed0c23748f42f68dfb0928092cc10e9 SHA1 5b0a4d29c97e720bb17039a65fee67d0cb1f537a SHA256 85b4391834041a4a92c99cad5e52e397c6b113252a5e035deaabf971052f618d
-MD5 1a5f5dbae554e5e59505490e4a222b7f postgis-1.1.2.ebuild 2722
-RMD160 d974bf1b2ed0c23748f42f68dfb0928092cc10e9 postgis-1.1.2.ebuild 2722
-SHA256 85b4391834041a4a92c99cad5e52e397c6b113252a5e035deaabf971052f618d postgis-1.1.2.ebuild 2722
 EBUILD postgis-1.1.4.ebuild 2673 RMD160 b6ce2679497231931e4f3ca1d5d60e5db63805ae SHA1 a5203055b41fabb4610a6137a98dd50e6dc134ff SHA256 19e71582fa0a997e44ff594b8bcef5818884ad3e48c512673e486ccce3f76523
 MD5 228658ca0a66b4490f83fedcdc5beee8 postgis-1.1.4.ebuild 2673
 RMD160 b6ce2679497231931e4f3ca1d5d60e5db63805ae postgis-1.1.4.ebuild 2673
 SHA256 19e71582fa0a997e44ff594b8bcef5818884ad3e48c512673e486ccce3f76523 postgis-1.1.4.ebuild 2673
-EBUILD postgis-1.1.6.ebuild 5402 RMD160 d111f33616e6478d5b3897136fa3721e006987f9 SHA1 5b74e7293e750699f05227ca4cb9c5a758ed6af1 SHA256 81d3a609467210902fa8fcfff3058bebec4226d1a99e9d3b49e4788eecd1e19c
-MD5 763e4d351370eede100868b9cae3b598 postgis-1.1.6.ebuild 5402
-RMD160 d111f33616e6478d5b3897136fa3721e006987f9 postgis-1.1.6.ebuild 5402
-SHA256 81d3a609467210902fa8fcfff3058bebec4226d1a99e9d3b49e4788eecd1e19c postgis-1.1.6.ebuild 5402
-EBUILD postgis-1.2.0.ebuild 5402 RMD160 fa89a567707b003cef8a5b55a82d0ed0f14ee973 SHA1 c16f34896f4d1fc46d16dd393445fb8b0543e8cf SHA256 6f351aa4841be931770ba0858895127cac9f7915a9afc8ee6ecd1acef63fde9f
-MD5 844818ab540c561bbfc341004d62a14c postgis-1.2.0.ebuild 5402
-RMD160 fa89a567707b003cef8a5b55a82d0ed0f14ee973 postgis-1.2.0.ebuild 5402
-SHA256 6f351aa4841be931770ba0858895127cac9f7915a9afc8ee6ecd1acef63fde9f postgis-1.2.0.ebuild 5402
-MISC ChangeLog 3165 RMD160 efee1877a548ca149ab6e43d95732335d4532850 SHA1 242e2606866e1778d4b2194e42bd99dc53cb4803 SHA256 6e615199238b1c71ce561a1b193173c954de60ad0b93473d818c7655c778b227
-MD5 68cde65cdbe40ec0d313aa38083b9f2c ChangeLog 3165
-RMD160 efee1877a548ca149ab6e43d95732335d4532850 ChangeLog 3165
-SHA256 6e615199238b1c71ce561a1b193173c954de60ad0b93473d818c7655c778b227 ChangeLog 3165
+EBUILD postgis-1.2.0.ebuild 5404 RMD160 03b4c95e462f8e36857c5d44b5fc61decb800f15 SHA1 cd93d90669726529f9410419922a1403c9593f12 SHA256 f645ab25436a133f0e2d89528c3b30a37359579a8d393d332e4fa6ef94717145
+MD5 2f0aa42968124fe2bd12764c03cbb10f postgis-1.2.0.ebuild 5404
+RMD160 03b4c95e462f8e36857c5d44b5fc61decb800f15 postgis-1.2.0.ebuild 5404
+SHA256 f645ab25436a133f0e2d89528c3b30a37359579a8d393d332e4fa6ef94717145 postgis-1.2.0.ebuild 5404
+MISC ChangeLog 3366 RMD160 869625981802ca5b4d6b9609a97a80ffd92e3c02 SHA1 c292f995d3ff6968e4dace601031a987dca7baa2 SHA256 8a4388946e93cad8e595de9a4d9e1c255896e3a73db1c547aee70aa7c5d75ff4
+MD5 e3f278b1ddb04dee336c30172deebdf7 ChangeLog 3366
+RMD160 869625981802ca5b4d6b9609a97a80ffd92e3c02 ChangeLog 3366
+SHA256 8a4388946e93cad8e595de9a4d9e1c255896e3a73db1c547aee70aa7c5d75ff4 ChangeLog 3366
 MISC metadata.xml 194 RMD160 19177cc0060792a4212a48493143cc82f0302ef8 SHA1 4acac2c575abc8f6bfe00506117dc2f83a8355a2 SHA256 58a43dec1240568210b57a8396a5d317593309353f64e474c93d12a39a7bc071
 MD5 b37bf0bf48388c9f32b981c5bb00468e metadata.xml 194
 RMD160 19177cc0060792a4212a48493143cc82f0302ef8 metadata.xml 194
 SHA256 58a43dec1240568210b57a8396a5d317593309353f64e474c93d12a39a7bc071 metadata.xml 194
-MD5 2db1c5915dbd7611af6934a26d3a6013 files/digest-postgis-0.7.5-r2 497
-RMD160 0d0124fc5429a511155d66725f8c6e1e305575cf files/digest-postgis-0.7.5-r2 497
-SHA256 dd81ed8116cf975c877b3911f0a4a5c9798261abbf5299e92d71cd1a9e59dc52 files/digest-postgis-0.7.5-r2 497
-MD5 74f40ff3f40001a4f63b8bc558aabd85 files/digest-postgis-1.1.2 244
-RMD160 6cb427bacdb15ba68c494b454526a6a5313c0061 files/digest-postgis-1.1.2 244
-SHA256 c81dd0e4008794ce0b9f9add53e8c74935f65acce6b9a1dbe9474678aefb9c28 files/digest-postgis-1.1.2 244
 MD5 fe40aee1dd66bf3f650789430be3c26c files/digest-postgis-1.1.4 244
 RMD160 77a1bd4aa3c4ef4aeb58e19229f44a2290e5797c files/digest-postgis-1.1.4 244
 SHA256 ab448b547354b8a5cf4e1eb12d643d1dd8c0427c932f35a8f5ad5c5e64f97b10 files/digest-postgis-1.1.4 244
-MD5 ab3e538298261e4c8cc0a91e21c816ed files/digest-postgis-1.1.6 244
-RMD160 bac03daea0f1472df5670c176e2a007ed7d5bdd4 files/digest-postgis-1.1.6 244
-SHA256 67a2f2ae2598a277edc25fd27e836439d1bad0dd19ed978458c55ab82bfded04 files/digest-postgis-1.1.6 244
 MD5 eb0637aa1fc2a780e1ec9ed54d0d6a2f files/digest-postgis-1.2.0 244
 RMD160 390369df28592de2364eed68ada3d0f67b2fcc82 files/digest-postgis-1.2.0 244
 SHA256 c9bcac468877fd1a90215723d8c00fd69caee2286b631b04ff6e798ee20c639c files/digest-postgis-1.2.0 244
diff --git a/dev-db/postgis/files/digest-postgis-0.7.5-r2 b/dev-db/postgis/files/digest-postgis-0.7.5-r2
deleted file mode 100644
index f06bd525aaac..000000000000
--- a/dev-db/postgis/files/digest-postgis-0.7.5-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6ce60ba78bf133147cc502c27dba2f67 postgis-0.7.5.tar.gz 336368
-RMD160 c45d2e797b358dc0bf81aa2bc70d153bceae7029 postgis-0.7.5.tar.gz 336368
-SHA256 51a9dc56b34b7325aaeb5ca3540d6ce1ae830bf7ce601a827126fb6028452afb postgis-0.7.5.tar.gz 336368
-MD5 e29bd379789a59e061d5cf126024913f postgresql-7.3.6.tar.gz 11288430
-RMD160 66dc806f0eab410059b9233d62b0744fd8b6192b postgresql-7.3.6.tar.gz 11288430
-SHA256 ecfbbdd16c0ace4ae1d10997765cfefc49092d01f9198846ad58a79bd06e23e0 postgresql-7.3.6.tar.gz 11288430
diff --git a/dev-db/postgis/files/digest-postgis-1.1.2 b/dev-db/postgis/files/digest-postgis-1.1.2
deleted file mode 100644
index 44314be4ce12..000000000000
--- a/dev-db/postgis/files/digest-postgis-1.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4b170cc30d9b7fec493fe779e46aa50c postgis-1.1.2.tar.gz 1547680
-RMD160 0536e91dc65d3ea8ead7e788f0b0fa1ee81f295a postgis-1.1.2.tar.gz 1547680
-SHA256 5d63b1875e6dd8610001ad89d97351eaaf1c3205fc6ec57365e2bb9f6b990fb5 postgis-1.1.2.tar.gz 1547680
diff --git a/dev-db/postgis/files/digest-postgis-1.1.6 b/dev-db/postgis/files/digest-postgis-1.1.6
deleted file mode 100644
index cb168c1fd524..000000000000
--- a/dev-db/postgis/files/digest-postgis-1.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d9df1ea49df747607e7ed9fdccf728cb postgis-1.1.6.tar.gz 2039011
-RMD160 414b7d03e1b14f7e46dabc32484ec25b4dc42916 postgis-1.1.6.tar.gz 2039011
-SHA256 18923e610e23e4c5fe706b5d52ff3d44fbddac9876775d36917268d32d7d1580 postgis-1.1.6.tar.gz 2039011
diff --git a/dev-db/postgis/postgis-0.7.5-r2.ebuild b/dev-db/postgis/postgis-0.7.5-r2.ebuild
deleted file mode 100644
index 8519d4c4b651..000000000000
--- a/dev-db/postgis/postgis-0.7.5-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-0.7.5-r2.ebuild,v 1.8 2006/08/01 00:14:18 chtekk Exp $
-
-MY_PGSQL="postgresql-7.3.6"
-DESCRIPTION="adds support for geographic objects to PostgreSQL"
-HOMEPAGE="http://postgis.refractions.net/"
-SRC_URI="http://postgis.refractions.net/${P}.tar.gz
-	mirror://postgresql/source/v7.3.6/${MY_PGSQL}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="tcltk python perl java ssl nls libg++"
-
-DEPEND="=dev-db/postgresql-7.3*
-	sci-libs/proj
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack "${MY_PGSQL}.tar.gz"
-	cd ${MY_PGSQL}/contrib
-	unpack "${P}.tar.gz"
-	cd "${P}"
-	sed -i -e "s:USE_PROJ=0:USE_PROJ=1:g" \
-		-e "s:PROJ_DIR=/usr/local:PROJ_DIR=/usr:g" \
-		Makefile
-}
-
-src_compile() {
-	local myconf
-	cd "${WORKDIR}/${MY_PGSQL}"
-	use tcltk && myconf="--with-tcl"
-	use python && myconf="${myconf} --with-python"
-	use perl && myconf="${myconf} --with-perl"
-	use java && myconf="${myconf} --with-java"
-	use ssl && myconf="${myconf} --with-ssl"
-	use nls && myconf="${myconf} --enable-locale --enable-nls --enable-multibyte"
-	use libg++ && myconf="${myconf} --with-CXX"
-
-	use ppc && CFLAGS="-pipe-fsigned-char"
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${MY_PGSQL}-r1 \
-		--libdir=/usr/lib \
-		--enable-syslog \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-pam \
-		--with-maxbackends=1024 \
-		${myconf} || die
-
-	cd contrib/${P}
-
-	make || die
-}
-
-src_install() {
-	cd ${WORKDIR}/${MY_PGSQL}/contrib/${P}
-
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		docdir=${D}/usr/share/doc/${MY_PGSQL} \
-		libdir=${D}/usr/lib/postgresql \
-		install || die
-
-	dodoc CHANGES COPYING CREDITS TODO
-}
diff --git a/dev-db/postgis/postgis-1.1.2.ebuild b/dev-db/postgis/postgis-1.1.2.ebuild
deleted file mode 100644
index 2a89fae5f9d8..000000000000
--- a/dev-db/postgis/postgis-1.1.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.1.2.ebuild,v 1.2 2006/08/01 00:14:18 chtekk Exp $
-
-inherit autotools eutils
-
-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"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="geos proj"
-
-DEPEND=">=dev-db/postgresql-7.4
-	app-text/docbook-xsl-stylesheets
-	geos? ( sci-libs/geos )
-	proj? ( sci-libs/proj )
-	sys-devel/autoconf"
-RDEPEND=">=dev-db/postgresql-7.4
-	geos? ( sci-libs/geos )
-	proj? ( sci-libs/proj )"
-
-RESTRICT="test"
-
-pkg_setup(){
-	tmp="$(portageq match / ${CATEGORY}/${PN})"
-	if [ "${tmp}" != "${CATEGORY}/${PF}" ]; then
-		ewarn "Don't forget to dump your databases with -Fc options before"
-		ewarn "upgrading postgis."
-		ewarn "(see http://postgis.refractions.net/docs/ch02.html#upgrading)"
-		ebeep 4
-	fi
-}
-
-src_unpack(){
-	unpack "${P}.tar.gz"
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.1_doc.patch
-	local xslv
-	xslv="$(ls /usr/share/sgml/docbook/ | grep xsl\-)"
-	einfo "doc will be build with template :"
-	einfo "${xslv}"
-	sed "s:xsl-stylesheets:${xslv}:" -i configure.in || die "xsl-stylesheets pb"
-}
-
-src_compile(){
-	cd "${S}"
-	eautoconf
-	local myconf
-	myconf="${myconf} --enable-autoconf \
-		--datadir=/usr/share/postgresql/contrib/\
-		--libdir=/usr/$(get_libdir)/postgresql/\
-		--with-docdir=/usr/share/doc/${PF}/html/"
-	econf ${myconf} \
-		$(use_with geos) \
-		$(use_with proj)\
-		|| die "Error: econf failed"
-
-	emake || die "Error: emake failed"
-
-	make docs || die "Unable to build documentation"
-	cd topology/
-	emake || die "Unable to build topology sql file"
-}
-
-src_install(){
-	into /usr
-	cd "${S}"
-	dodir /usr/$(get_libdir)/postgresql /usr/share/postgresql/contrib/
-	make DESTDIR="${D}" install || die "einstall failed"
-	cd "${S}"/topology/
-	make DESTDIR="${D}" install
-
-	cd "${S}"
-	dodoc CHANGES COPYING CREDITS README.postgis TODO loader/README.*\
-		doc/*txt || die "Unable to install doc"
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	cd "${S}"
-	make DESTDIR="${D}" docs-install || die "Unable to install documentation"
-
-	dobin ./utils/postgis_restore.pl
-}
-
-pkg_postinst() {
-	einfo "To create your first postgis database use the following commands :"
-	einfo " # su postgres"
-	einfo " # createdb test"
-	einfo " # createlang plpgsql test"
-	einfo " # psql -d test -f /usr/share/postgresql/contrib/lwpostgis.sql"
-	einfo " # psql -d test -f /usr/share/postgresql/contrib/spatial_ref_sys.sql"
-	einfo "For more informations see : http://www.postgis.org/documentation.php"
-	einfo "(For french user only see http://postgis.fr)"
-}
diff --git a/dev-db/postgis/postgis-1.1.6.ebuild b/dev-db/postgis/postgis-1.1.6.ebuild
deleted file mode 100644
index e9d44a5fb1f1..000000000000
--- a/dev-db/postgis/postgis-1.1.6.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.1.6.ebuild,v 1.2 2007/01/07 12:43:04 djay Exp $
-
-WANT_AUTOCONF="lastest"
-inherit autotools eutils versionator
-
-KEYWORDS="~x86 ~ppc ~amd64"
-
-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-7.4
-	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 / postgis | 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_unpack(){
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}_xsl.patch"
-
-	eautoconf
-}
-
-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.2.0.ebuild b/dev-db/postgis/postgis-1.2.0.ebuild
index bf911dbf5dfa..c15b8485b381 100644
--- a/dev-db/postgis/postgis-1.2.0.ebuild
+++ b/dev-db/postgis/postgis-1.2.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.2.0.ebuild,v 1.2 2007/01/07 12:43:04 djay Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.2.0.ebuild,v 1.3 2007/04/09 15:30:01 chtekk Exp $
 
 WANT_AUTOCONF="lastest"
 inherit autotools eutils versionator
 
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
 HOMEPAGE="http://postgis.refractions.net"