Fixes bug 364257 and bug 364237

(Portage version: 2.1.9.42/cvs/Linux i686)

4 files changed, 14 insertions, 40 deletions

diff --git a/app-admin/eselect-postgresql/ChangeLog b/app-admin/eselect-postgresql/ChangeLog
index 6318dd188b8e..d73e56d71d03 100644
--- a/app-admin/eselect-postgresql/ChangeLog
+++ b/app-admin/eselect-postgresql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/eselect-postgresql
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/ChangeLog,v 1.15 2011/04/19 01:44:21 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/ChangeLog,v 1.16 2011/04/22 10:56:00 titanofold Exp $
+
+*eselect-postgresql-1.0.8 (22 Apr 2011)
+
+  22 Apr 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  -eselect-postgresql-1.0.6.ebuild, -eselect-postgresql-1.0.7.ebuild,
+  +eselect-postgresql-1.0.8.ebuild, metadata.xml:
+  Fixes bug 364257 and bug 364237
 
 *eselect-postgresql-1.0.7 (19 Apr 2011)
 
diff --git a/app-admin/eselect-postgresql/eselect-postgresql-1.0.6.ebuild b/app-admin/eselect-postgresql/eselect-postgresql-1.0.6.ebuild
deleted file mode 100644
index 98ef33aa8411..000000000000
--- a/app-admin/eselect-postgresql/eselect-postgresql-1.0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.0.6.ebuild,v 1.1 2011/04/02 11:52:32 titanofold Exp $
-
-EAPI="4"
-
-DESCRIPTION="Utility to select the default PostgreSQL slot"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~titanofold/${P}.tbz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="app-admin/eselect
-		!!dev-db/libpq"
-
-S="${WORKDIR}"
-
-src_install() {
-	keepdir /etc/eselect/postgresql
-
-	insinto /usr/share/eselect/modules
-	doins postgresql.eselect
-
-	dosym /usr/bin/eselect /usr/bin/postgresql-config
-}
-
-pkg_postinst() {
-	ewarn "If you are updating from app-admin/eselect-postgresql-0.4 or older, run:"
-	ewarn "    eselect postgresql update"
-	ewarn "To get your system in a proper state."
-	elog "You should set your desired PostgreSQL slot:"
-	elog "    eselect postgresql list"
-	elog "    eselect postgresql set <slot>"
-}
diff --git a/app-admin/eselect-postgresql/eselect-postgresql-1.0.7.ebuild b/app-admin/eselect-postgresql/eselect-postgresql-1.0.8.ebuild
index 7610db785212..a9e4b929f9a2 100644
--- a/app-admin/eselect-postgresql/eselect-postgresql-1.0.7.ebuild
+++ b/app-admin/eselect-postgresql/eselect-postgresql-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.0.7.ebuild,v 1.1 2011/04/19 01:44:21 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.0.8.ebuild,v 1.1 2011/04/22 10:56:00 titanofold Exp $
 
 EAPI="4"
 
@@ -32,7 +32,6 @@ pkg_postinst() {
 	ewarn "    eselect postgresql update"
 	ewarn
 	ewarn "To get your system in a proper state."
-	echo
 	elog "You should set your desired PostgreSQL slot:"
 	elog "    eselect postgresql list"
 	elog "    eselect postgresql set <slot>"
diff --git a/app-admin/eselect-postgresql/metadata.xml b/app-admin/eselect-postgresql/metadata.xml
index d06e452b35af..8dbbcfba9b1a 100644
--- a/app-admin/eselect-postgresql/metadata.xml
+++ b/app-admin/eselect-postgresql/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>postgresql</herd>
+  <herd>postgresql</herd>
+  <maintainer restrict="&gt;=app-admin/eselect-postgresql-1.0.0">
+	<email>titanofold@gentoo.org</email>
+	<name>Aaron W. Swenson</name>
+  </maintainer>
 </pkgmetadata>