Dropped old versions. Added note for people having the pg-hier USE-flag set.

Package-Manager: portage-2.1.2_rc3

3 files changed, 28 insertions, 3 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 123c7f7424eb..9a270f99f4bd 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.307 2006/12/17 08:08:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.308 2006/12/17 09:40:42 dev-zero Exp $
+
+  17 Dec 2006; Tiziano Müller <dev-zero@gentoo.org>
+  postgresql-7.4.14.ebuild, -postgresql-8.0.9.ebuild,
+  postgresql-8.0.9-r1.ebuild, -postgresql-8.1.5.ebuild:
+  Dropped old versions. Added note for people having the pg-hier USE-flag set.
 
   17 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   postgresql-7.3.16.ebuild, postgresql-7.4.14.ebuild,
diff --git a/dev-db/postgresql/postgresql-7.4.14.ebuild b/dev-db/postgresql/postgresql-7.4.14.ebuild
index 201960076c57..9b0f30124509 100644
--- a/dev-db/postgresql/postgresql-7.4.14.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.14.ebuild,v 1.8 2006/12/17 08:08:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.14.ebuild,v 1.9 2006/12/17 09:40:42 dev-zero Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
 
@@ -47,7 +47,17 @@ pkg_setup() {
 			eerror "(database directory = ${PG_DIR})."
 			die "Remove your database directory to continue"
 		fi
+		if built_with_use dev-db/postgresql pg-hier ; then
+			eerror "The hier-patch has been dropped and your existing database"
+			eerror "can't be used without it. You have to use pg_dump to export your"
+			eerror "existing database cluster, move ${PG_DIR}/data away and then use"
+			eerror "pg_restore to re-create the database using the new version."
+			eerror "Sorry for the inconvience. Please open a bug if you really need"
+			eerror "the hier-patch."
+			die "Move your database directory to continue."
+		fi
 	fi
+
 	enewgroup postgres 70
 	enewuser postgres 70 /bin/bash /var/lib postgres
 }
diff --git a/dev-db/postgresql/postgresql-8.0.9-r1.ebuild b/dev-db/postgresql/postgresql-8.0.9-r1.ebuild
index bfbf17d7740e..9afc18467a2e 100644
--- a/dev-db/postgresql/postgresql-8.0.9-r1.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.9-r1.ebuild,v 1.4 2006/12/17 08:08:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.9-r1.ebuild,v 1.5 2006/12/17 09:40:42 dev-zero Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
 
@@ -47,7 +47,17 @@ pkg_setup() {
 			eerror "(database directory = ${PG_DIR})."
 			die "Remove your database directory to continue"
 		fi
+		if built_with_use dev-db/postgresql pg-hier ; then
+			eerror "The hier-patch has been dropped and your existing database"
+			eerror "can't be used without it. You have to use pg_dump to export your"
+			eerror "existing database cluster, move ${PG_DIR}/data away and then use"
+			eerror "pg_restore to re-create the database using the new version."
+			eerror "Sorry for the inconvience. Please open a bug if you really need"
+			eerror "the hier-patch."
+			die "Move your database directory to continue."
+		fi
 	fi
+
 	enewgroup postgres 70
 	enewuser postgres 70 /bin/bash /var/lib postgres
 }