Cleanup old unneeded versions, fixes bug #17808.

(Portage version: 2.1.2.3)

8 files changed, 7 insertions, 374 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/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"