app-admin/eselect-postgresql: added unselection of uninstalled selections

svn path=/experimental/; revision=256

4 files changed, 77 insertions, 11 deletions

diff --git a/app-admin/eselect-postgresql/Manifest b/app-admin/eselect-postgresql/Manifest
index be9d2a6..e9ff432 100644
--- a/app-admin/eselect-postgresql/Manifest
+++ b/app-admin/eselect-postgresql/Manifest
@@ -2,14 +2,14 @@ AUX binwrapper 515 RMD160 774f14cc09d6534800e91845e2c4b40b9911af11 SHA1 b9598d62
 MD5 5f952f5a5b44bdc6f6cbc4381f6eee86 files/binwrapper 515
 RMD160 774f14cc09d6534800e91845e2c4b40b9911af11 files/binwrapper 515
 SHA256 99d4774e841f0057fdbf141b9b123975939eac1e5ab6e711d08c44b4adc2b4d1 files/binwrapper 515
-AUX postgresql.eselect 7674 RMD160 e966c299cf5a8dbff844033c8c0350ce9d57ed72 SHA1 ae13880d67436a4d2e0d2d602913aaaf187f4beb SHA256 25b4f19ad909b74f69a02da2482cfb7f529c74bf4b92b3b4536fe6aab701fca8
-MD5 28488970887e22444199327bf091bdf6 files/postgresql.eselect 7674
-RMD160 e966c299cf5a8dbff844033c8c0350ce9d57ed72 files/postgresql.eselect 7674
-SHA256 25b4f19ad909b74f69a02da2482cfb7f529c74bf4b92b3b4536fe6aab701fca8 files/postgresql.eselect 7674
-EBUILD eselect-postgresql-0.1.ebuild 1449 RMD160 d5380e32102d907cb761b329b3a4ca83dcb6dd57 SHA1 2de0220975229e8d972b35916182f5532758c693 SHA256 befbba09c754e4edc8a374fe1641781918030de8164f1ada666b6756ead732bd
-MD5 aa6b6a4a06abf7dd6707bebbefa0f36f eselect-postgresql-0.1.ebuild 1449
-RMD160 d5380e32102d907cb761b329b3a4ca83dcb6dd57 eselect-postgresql-0.1.ebuild 1449
-SHA256 befbba09c754e4edc8a374fe1641781918030de8164f1ada666b6756ead732bd eselect-postgresql-0.1.ebuild 1449
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eselect-postgresql-0.1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-eselect-postgresql-0.1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-eselect-postgresql-0.1 0
+AUX postgresql.eselect 7982 RMD160 10ad641ddf2032fcc9103041e1f90fc03c1febf4 SHA1 15b467da41797fe3596175ac3b8ed474a10ecf43 SHA256 e35befa17c4f37eda2a6e3879258cebc4c29136a5bb4cb134840cf5281cc81dc
+MD5 33fd7ef8e80d54fc63b133420fe0fcc6 files/postgresql.eselect 7982
+RMD160 10ad641ddf2032fcc9103041e1f90fc03c1febf4 files/postgresql.eselect 7982
+SHA256 e35befa17c4f37eda2a6e3879258cebc4c29136a5bb4cb134840cf5281cc81dc files/postgresql.eselect 7982
+EBUILD eselect-postgresql-0.2.ebuild 1449 RMD160 d5380e32102d907cb761b329b3a4ca83dcb6dd57 SHA1 2de0220975229e8d972b35916182f5532758c693 SHA256 befbba09c754e4edc8a374fe1641781918030de8164f1ada666b6756ead732bd
+MD5 aa6b6a4a06abf7dd6707bebbefa0f36f eselect-postgresql-0.2.ebuild 1449
+RMD160 d5380e32102d907cb761b329b3a4ca83dcb6dd57 eselect-postgresql-0.2.ebuild 1449
+SHA256 befbba09c754e4edc8a374fe1641781918030de8164f1ada666b6756ead732bd eselect-postgresql-0.2.ebuild 1449
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eselect-postgresql-0.2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-eselect-postgresql-0.2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-eselect-postgresql-0.2 0
diff --git a/app-admin/eselect-postgresql/eselect-postgresql-0.2.ebuild b/app-admin/eselect-postgresql/eselect-postgresql-0.2.ebuild
new file mode 100644
index 0000000..9a66eac
--- /dev/null
+++ b/app-admin/eselect-postgresql/eselect-postgresql-0.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit multilib
+
+DESCRIPTION="Utility to change the default postgresql installation"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	app-admin/eselect
+	!<dev-db/libpq-99.99.99
+	"
+
+src_install() {
+	keepdir /etc/eselect/postgresql
+	insinto /usr/share/eselect/modules
+	doins ${FILESDIR}/postgresql.eselect
+	dosed "s,alibdir='/usr/lib/',alibdir='/usr/$(get_libdir)/',g" \
+		/usr/share/eselect/modules/postgresql.eselect
+	exeinto /usr/lib/${PN}
+	doexe ${FILESDIR}/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} ; 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
+}
+
diff --git a/app-admin/eselect-postgresql/files/digest-eselect-postgresql-0.2 b/app-admin/eselect-postgresql/files/digest-eselect-postgresql-0.2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app-admin/eselect-postgresql/files/digest-eselect-postgresql-0.2
diff --git a/app-admin/eselect-postgresql/files/postgresql.eselect b/app-admin/eselect-postgresql/files/postgresql.eselect
index 8275b42..8f7f8f3 100644
--- a/app-admin/eselect-postgresql/files/postgresql.eselect
+++ b/app-admin/eselect-postgresql/files/postgresql.eselect
@@ -289,6 +289,14 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" )
 			echo "Removing ${i} symlink.."
 			rm "${i}"
 		done
+		if test -L /etc/eselect/postgresql/active -a ! -d /etc/eselect/postgresql/active ; then
+			echo "Resetting uninstalled selection"
+			do_reset
+		fi
+		if test -L /etc/eselect/postgresql/service -a ! -d /etc/eselect/postgresql/service ; then
+			echo "Resetting uninstalled selection"
+			do_reset-service
+		fi
 	}
 ## }}}