Bump, thanks to Aaron Swenson for the improvements

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 87 insertions, 2 deletions

diff --git a/app-admin/eselect-postgresql/ChangeLog b/app-admin/eselect-postgresql/ChangeLog
index be974ee5afb6..dbb78e90b391 100644
--- a/app-admin/eselect-postgresql/ChangeLog
+++ b/app-admin/eselect-postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-postgresql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/ChangeLog,v 1.10 2010/04/25 19:55:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/ChangeLog,v 1.11 2010/06/02 18:26:49 patrick Exp $
+
+*eselect-postgresql-0.4 (02 Jun 2010)
+
+  02 Jun 2010; Patrick Lauer <patrick@gentoo.org>
+  +eselect-postgresql-0.4.ebuild:
+  Bump, thanks to Aaron Swenson for the improvements
 
   25 Apr 2010; Raúl Porcel <armin76@gentoo.org>
   eselect-postgresql-0.3.ebuild:
diff --git a/app-admin/eselect-postgresql/Manifest b/app-admin/eselect-postgresql/Manifest
index 9034c3cec91a..b4090ba647be 100644
--- a/app-admin/eselect-postgresql/Manifest
+++ b/app-admin/eselect-postgresql/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD eselect-postgresql-0.3.ebuild 2441 RMD160 ffc741ae41c128c0cd87369685825213f9a24340 SHA1 66aba18d96824d73f41b1d691b8454aa612dd4b7 SHA256 bdb2b42fa258739a7c25192b1748c172647e57750b7d28fd732bd158bc807fae
-MISC ChangeLog 2069 RMD160 dd124f1b762d830ab6f5ce90c996244635174443 SHA1 0ac44418857a20418b1602eec3df2c56396da060 SHA256 519321e6f538e211ba8d3491ee594f10d42167524958f2c6955d55855e69cc66
+EBUILD eselect-postgresql-0.4.ebuild 2511 RMD160 09ab1a450b0c603cd1b3d1bce4e400a68f00239e SHA1 6fc360dc0b20fee2abc004ea5882ee87d8bcb9b0 SHA256 c263d57ab38daaf56fd8912afbc4eb53287ad203eaf663d811c1a732abdfd76f
+MISC ChangeLog 2246 RMD160 fc90002a79274e709974413d6380e6d3afd506f5 SHA1 2b6cd1937fb0f7965b27dac04e293ea9391668bb SHA256 edb95df6902e8ae140dcf339506bbed4f738d5bb2d42cee7f460c707d04776ee
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/app-admin/eselect-postgresql/eselect-postgresql-0.4.ebuild b/app-admin/eselect-postgresql/eselect-postgresql-0.4.ebuild
new file mode 100644
index 000000000000..6c4fc2f90439
--- /dev/null
+++ b/app-admin/eselect-postgresql/eselect-postgresql-0.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-0.4.ebuild,v 1.1 2010/06/02 18:26:49 patrick Exp $
+
+EAPI=2
+
+inherit multilib
+
+DESCRIPTION="Utility to change the default postgresql installation"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://gentooexperimental.org/~patrick/${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"
+
+src_install() {
+	keepdir /etc/eselect/postgresql
+	doenvd "${FILESDIR}/50postgresql-eselect"
+
+	insinto /usr/share/eselect/modules
+	doins postgresql.eselect
+	sed -i \
+		-e "s|/usr/lib/|/usr/$(get_libdir)/|g" \
+		"${D}/usr/share/eselect/modules/postgresql.eselect"
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe "binwrapper"
+
+	dodir /usr/bin
+	dosym /usr/bin/eselect /usr/bin/postgresql-config
+}
+
+pkg_preinst() {
+	local ff=""
+	for f in "${ROOT}"/usr/include/{postgresql,libpq-fe.h,libpq,postgres_ext.h,pg_config_manual.h} ; do
+		[[ -e "${f}" ]] || continue
+		[[ -L "${f}" ]] && continue
+		if [[ -d "${f}" ]] ; then
+			if [[ -z "$(find \"${f}\" -not \( -type l -or -type d \))" ]] ; then
+				rm -rf "${f}"
+			else
+				ff="$ff $f"
+			fi
+		else
+			ff="$ff $f"
+		fi
+	done
+	if [[ ! -z "$ff" ]] ; then
+		eerror "You have leftovers from previous postgresql installations that"
+		eerror "can't be dealt with automatically. The proper way to treat"
+		eerror "files is:"
+		eerror ""
+		eerror "rm -rf ${ff}"
+		eerror ""
+		die "Please, remove the files manually"
+	fi
+}
+
+pkg_postinst() {
+	elog "This eselect module can be used to define which PostgreSQL version is being used"
+	elog "to link against and which (major) version of PostgreSQL is being started by the"
+	elog "init-system when an init.d file lists 'need postgresql' or 'use postgresql' in"
+	elog "its dependencies."
+	elog
+	elog "For users of the 'postgresql' overlay: In case you have"
+	elog "dev-db/postgresql-{base,server} installed but 'eselect postgresql list' doesn't"
+	elog "anything, please re-install dev-db/postgresql-{base,server} since we had to move"
+	elog "around some stuff. Sorry for the inconvenience."
+	elog
+	elog "Please make sure that you use the new postgresql ebuilds"
+	elog "(dev-db/postgresql-{base,server}). This eselect module won't list the old"
+	elog "dev-db/{postgresql,libpq} installations as available libraries or services."
+}