Fixes bug 364257 and bug 364237

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

5 files changed, 21 insertions, 49 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/Manifest b/app-admin/eselect-postgresql/Manifest
index f07511987c29..6dd14279b60b 100644
--- a/app-admin/eselect-postgresql/Manifest
+++ b/app-admin/eselect-postgresql/Manifest
@@ -4,18 +4,16 @@ Hash: SHA256
 AUX 50postgresql-eselect 46 RMD160 d7cdbde94df59d4ef758015304654a879fef6e72 SHA1 ac56ae31172f4916107c289c47463f6ddcc80d41 SHA256 3aa6dd48312eb63e181c46012a918e7744365949d58f76a73823592e32de06fc
 DIST eselect-postgresql-0.3.tbz2 2410 RMD160 d806bbdc730f74163135a3d5249bdb92b333893a SHA1 5d41e82b63c9b02d2b9f9c0cc5c5af761b4acb49 SHA256 1e3ab1d0a2c2612c32d7d5ea80720d0fd1e0440ef5e6bf4f86f7dcc1abf1109e
 DIST eselect-postgresql-0.4.tbz2 2370 RMD160 eb868b5aa999899883e5989f0035a037b9d4db1d SHA1 d5e00bb35a697ffe006d8b16203f99a96eee8e22 SHA256 a75eb5b86444f3200d7b99193c5a61eda310cb9f87cba4d01ecbcf658576c375
-DIST eselect-postgresql-1.0.6.tbz2 3177 RMD160 8220a5c41dc81072d34d79681c69bf07372c9742 SHA1 65e5cbe1aed731fd7d6fb025dcbc2ae4d74ef843 SHA256 58094ffe6fe7458f2f892b0cd53034c24d29256583aac075362ba3f92c360e24
-DIST eselect-postgresql-1.0.7.tbz2 3189 RMD160 b27fe5d87bc50d62eda43093a8f4766080801c1d SHA1 71e3bf8d925b4da93899600d0112607adb5c2b6a SHA256 4e8eb807a663238feea7d5259084e196dea52f1e2c8d40aafd278107f4dc9bb3
+DIST eselect-postgresql-1.0.8.tbz2 3240 RMD160 bd0279b6853f9d9ecf32f0c0abca247119d4b12d SHA1 55c131933cd0682d225d334fca7aa4eeacc32202 SHA256 513a09c856b1060a02070cce624563140f9416421e66afd369952ecbcec37729
 EBUILD eselect-postgresql-0.3.ebuild 2441 RMD160 ffc741ae41c128c0cd87369685825213f9a24340 SHA1 66aba18d96824d73f41b1d691b8454aa612dd4b7 SHA256 bdb2b42fa258739a7c25192b1748c172647e57750b7d28fd732bd158bc807fae
 EBUILD eselect-postgresql-0.4.ebuild 2511 RMD160 09ab1a450b0c603cd1b3d1bce4e400a68f00239e SHA1 6fc360dc0b20fee2abc004ea5882ee87d8bcb9b0 SHA256 c263d57ab38daaf56fd8912afbc4eb53287ad203eaf663d811c1a732abdfd76f
-EBUILD eselect-postgresql-1.0.6.ebuild 1090 RMD160 b61cec44b20f6e87df9dc4f0523616bacd3c7955 SHA1 31bd76591684f85d7d91d9cfd026551685632358 SHA256 7a2c397b7ad5a728abef484bf673368640ded1fe442feed2169bd4a4377105f7
-EBUILD eselect-postgresql-1.0.7.ebuild 1111 RMD160 ef5d1535ec36e402b2cfa6959e1c706f0ecffe38 SHA1 606d4db7199d5ceada63323f0fd5db2f67c46a2d SHA256 dbf7e90a343c3b04c95520ee6f5ef455b18519d4432d37b91bb3b8950af904a0
-MISC ChangeLog 3390 RMD160 da4dc8e881743556a317babcf2567e4b055c1854 SHA1 c65fdf71133bbd731d4e2279465fd7be94b9057e SHA256 233fd12c634218e5c3a1f67d5a37b5ab2e8850b3ec0c86400f4059b396528f03
-MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
+EBUILD eselect-postgresql-1.0.8.ebuild 1105 RMD160 f68961f8ec19266dc708f0ec99ec0af3eda61e13 SHA1 b725ae0c74b2568bdd5bead9123882e292fdfa34 SHA256 267892bf42710e3da4ebb70e4a8724470742ae965eab7e13632e0f860ecdce2b
+MISC ChangeLog 3642 RMD160 36eb28d86f94b3150b8e0933df844b09e0d07c46 SHA1 899f822dacaeb57884cea54eff2e662164f6b35a SHA256 0fa7cfd61cc8578a99ef430c284d27744c8f0469de74966f327de87d843f2730
+MISC metadata.xml 316 RMD160 4d61de0feb9717f2eaced030848f38e5f4bacfc5 SHA1 063accdd5f46535776fa5c1fdeb6c756fb862103 SHA256 0dc4feca2d41c1c3890800c58698965555560d51c15418a0637463065e9e1696
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2s6PsACgkQCOhwUhu5AEn8vAD/dDenxgohJHbb+hXLL3cvM4Im
-mtzhKpC/VVJaOFgdRLkBAINELdSOhj6/ec8A3gz5er8kRqXhCs955PFE0DXH7AAl
-=ZUNE
+iF4EAREIAAYFAk2xXsUACgkQCOhwUhu5AEkLpwD+OPUTda43jYIIXEwHEMwd5g0m
+Z6cxfp5UuolOpVvFTroBALNVW8T84FmdXtrhv1W7s5EimoYaLfqLCrF6/19j//Vv
+=yVm4
 -----END PGP SIGNATURE-----
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>