moved blocker and cruft removal code to eselect-postgresql

svn path=/experimental/; revision=254

8 files changed, 55 insertions, 155 deletions

diff --git a/app-admin/eselect-postgresql/Manifest b/app-admin/eselect-postgresql/Manifest
index 1fadd95..be9d2a6 100644
--- a/app-admin/eselect-postgresql/Manifest
+++ b/app-admin/eselect-postgresql/Manifest
@@ -6,10 +6,10 @@ AUX postgresql.eselect 7674 RMD160 e966c299cf5a8dbff844033c8c0350ce9d57ed72 SHA1
 MD5 28488970887e22444199327bf091bdf6 files/postgresql.eselect 7674
 RMD160 e966c299cf5a8dbff844033c8c0350ce9d57ed72 files/postgresql.eselect 7674
 SHA256 25b4f19ad909b74f69a02da2482cfb7f529c74bf4b92b3b4536fe6aab701fca8 files/postgresql.eselect 7674
-EBUILD eselect-postgresql-0.1.ebuild 779 RMD160 b47732afd4fed53579a6ef81011e427d3f1041e5 SHA1 3bdecb1eeab12c3814b20850a8f6517d0abc021e SHA256 c7e95b54d36722cddaa1c1a0b3fa88d889d6d173c981eeb89f841e911f0e6d4d
-MD5 06b3f44c51bea131888766c94b35f49a eselect-postgresql-0.1.ebuild 779
-RMD160 b47732afd4fed53579a6ef81011e427d3f1041e5 eselect-postgresql-0.1.ebuild 779
-SHA256 c7e95b54d36722cddaa1c1a0b3fa88d889d6d173c981eeb89f841e911f0e6d4d eselect-postgresql-0.1.ebuild 779
+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
diff --git a/app-admin/eselect-postgresql/eselect-postgresql-0.1.ebuild b/app-admin/eselect-postgresql/eselect-postgresql-0.1.ebuild
index e767885..9a66eac 100644
--- a/app-admin/eselect-postgresql/eselect-postgresql-0.1.ebuild
+++ b/app-admin/eselect-postgresql/eselect-postgresql-0.1.ebuild
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="app-admin/eselect"
+RDEPEND="
+	app-admin/eselect
+	!<dev-db/libpq-99.99.99
+	"
 
 src_install() {
 	keepdir /etc/eselect/postgresql
@@ -26,3 +29,30 @@ src_install() {
 	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/dev-db/postgresql-libs/Manifest b/dev-db/postgresql-libs/Manifest
index 5b89f6f..50de296 100644
--- a/dev-db/postgresql-libs/Manifest
+++ b/dev-db/postgresql-libs/Manifest
@@ -70,26 +70,26 @@ DIST postgresql-base-8.2.3.tar.bz2 8500472 RMD160 8ec01f0ea8ad3a7d380ea2a0564109
 DIST postgresql-opt-8.0.12.tar.bz2 134790 RMD160 be0d57de5000296bfd5b64685f4d4ef81edea347 SHA1 bd26e2cce6ea7b486e29bc983ee76cfb0551f32b SHA256 ceaf90195860694487918032c19e0a11f991d74c77838cac2ea827d6c85f54da
 DIST postgresql-opt-8.1.8.tar.bz2 144643 RMD160 2a31e70be662ee6753bcc8e712ea5a693079f692 SHA1 df4cf9481a6272d5a33b07f8343e88fe8f1350a4 SHA256 ffcc9519a7a697b370630ab1afb1280d3d9e62a25a7904291153d0de6fca6750
 DIST postgresql-test-8.2.3.tar.bz2 985623 RMD160 fe6ee516bf5b985bbc374b1cadf9eb68c5f4709b SHA1 a322a5df3252e68c2ceec5c1554ace9b3eb353ca SHA256 4efdb72c8bf6f8784719147002ddd3458122b21f054a8f6a921365ddc753db32
-EBUILD postgresql-libs-7.3.18.ebuild 4487 RMD160 0e30942ff60ff7f085aefff6c253511ad6c4432e SHA1 eca761ab81a23cb43cfa3541bc0416e4aa26eba7 SHA256 261977cb194c3e50c0dbe43047210880e3ba93a9f71037a7a9dbddf12ac1de73
-MD5 7b272d9741335f7caa52bd85ab41e3aa postgresql-libs-7.3.18.ebuild 4487
-RMD160 0e30942ff60ff7f085aefff6c253511ad6c4432e postgresql-libs-7.3.18.ebuild 4487
-SHA256 261977cb194c3e50c0dbe43047210880e3ba93a9f71037a7a9dbddf12ac1de73 postgresql-libs-7.3.18.ebuild 4487
-EBUILD postgresql-libs-7.4.16.ebuild 4718 RMD160 7024b8ddea5ffa1cf132147ff92c0360b41cc5fa SHA1 ec8044012f602c14b701ccfb6d7d49b88f5fc9cc SHA256 c9f767b1f57b1e3ff80a0d7034453f76f41945aeff9f80deec2d875d4c269f23
-MD5 6aa187e58f1471edabd0852bb13e5312 postgresql-libs-7.4.16.ebuild 4718
-RMD160 7024b8ddea5ffa1cf132147ff92c0360b41cc5fa postgresql-libs-7.4.16.ebuild 4718
-SHA256 c9f767b1f57b1e3ff80a0d7034453f76f41945aeff9f80deec2d875d4c269f23 postgresql-libs-7.4.16.ebuild 4718
-EBUILD postgresql-libs-8.0.12.ebuild 4767 RMD160 1585e80f272f8ee89b3e1cb23c2fd0bf2947e4db SHA1 42b4c11b8b84eb600fe275cc79f4389adac9550f SHA256 1a2fd9aa8417bbfdf6dc0e72336e28c0b8bb7ca8dd8902c221a53540e6a555ff
-MD5 ebc64ad96bc7683de08cf2e6728b235e postgresql-libs-8.0.12.ebuild 4767
-RMD160 1585e80f272f8ee89b3e1cb23c2fd0bf2947e4db postgresql-libs-8.0.12.ebuild 4767
-SHA256 1a2fd9aa8417bbfdf6dc0e72336e28c0b8bb7ca8dd8902c221a53540e6a555ff postgresql-libs-8.0.12.ebuild 4767
-EBUILD postgresql-libs-8.1.8.ebuild 4766 RMD160 997865376363402f53695678eed3ab215782c21e SHA1 1a71065b962ff6d3e2141a27cce90caa8c85883a SHA256 455759f91bc862c3f6d202b56f3deacc6c426adf85f36860ce3e0072d363b2b9
-MD5 3431a60e7e29999e8b2bff7d12261b8a postgresql-libs-8.1.8.ebuild 4766
-RMD160 997865376363402f53695678eed3ab215782c21e postgresql-libs-8.1.8.ebuild 4766
-SHA256 455759f91bc862c3f6d202b56f3deacc6c426adf85f36860ce3e0072d363b2b9 postgresql-libs-8.1.8.ebuild 4766
-EBUILD postgresql-libs-8.2.3.ebuild 4902 RMD160 8452985380fd21b6f94e615c8d9a0cbd158806f4 SHA1 c94c5ab79946a56dbafe20810e0830f02b952079 SHA256 b2653afd74156d7f7499b556c5c67c06a9050181a8e64d03e6cb8e1f6952da9c
-MD5 54d3feb26f4b3bd40705827593fdd448 postgresql-libs-8.2.3.ebuild 4902
-RMD160 8452985380fd21b6f94e615c8d9a0cbd158806f4 postgresql-libs-8.2.3.ebuild 4902
-SHA256 b2653afd74156d7f7499b556c5c67c06a9050181a8e64d03e6cb8e1f6952da9c postgresql-libs-8.2.3.ebuild 4902
+EBUILD postgresql-libs-7.3.18.ebuild 3845 RMD160 e28b36abf7a172822ca21a69183147070415221f SHA1 a45f21120217f55fe9a71180842d95d283a6d79c SHA256 e6ff43e5ae9299be6ce6310f1d6a05f98ac8c2e0f4e6d41b64d697c3a37f4e12
+MD5 93e199b237d948b9a100a7afd548a1f9 postgresql-libs-7.3.18.ebuild 3845
+RMD160 e28b36abf7a172822ca21a69183147070415221f postgresql-libs-7.3.18.ebuild 3845
+SHA256 e6ff43e5ae9299be6ce6310f1d6a05f98ac8c2e0f4e6d41b64d697c3a37f4e12 postgresql-libs-7.3.18.ebuild 3845
+EBUILD postgresql-libs-7.4.16.ebuild 4076 RMD160 2b73a2266f2724123db230da7dff9ad5e6c3b73a SHA1 93e9293c6a8ba6079f28be1876b55ff3d28d4c90 SHA256 0bfd24ad6e674d6ff63dbdb255935089b1022ed136bf7fcc1b003a39e0b97c8d
+MD5 18d5f20c21fc9d9eb80351cc96f8b899 postgresql-libs-7.4.16.ebuild 4076
+RMD160 2b73a2266f2724123db230da7dff9ad5e6c3b73a postgresql-libs-7.4.16.ebuild 4076
+SHA256 0bfd24ad6e674d6ff63dbdb255935089b1022ed136bf7fcc1b003a39e0b97c8d postgresql-libs-7.4.16.ebuild 4076
+EBUILD postgresql-libs-8.0.12.ebuild 4125 RMD160 3050d9d63e5824f3da41c9c161a2d86531a92cc4 SHA1 cc20f128c3b0c6faa26648bf6e4e72a23ae3b6e9 SHA256 f4baae2bbac23cdc88e21f09357dbd63faf6964da35e349b1bc517d9ed067869
+MD5 9e994c1d199941854794d3bda3e54f5f postgresql-libs-8.0.12.ebuild 4125
+RMD160 3050d9d63e5824f3da41c9c161a2d86531a92cc4 postgresql-libs-8.0.12.ebuild 4125
+SHA256 f4baae2bbac23cdc88e21f09357dbd63faf6964da35e349b1bc517d9ed067869 postgresql-libs-8.0.12.ebuild 4125
+EBUILD postgresql-libs-8.1.8.ebuild 4124 RMD160 2b5ab850d5cbf11851d556e01e225ca5e7d20403 SHA1 9d832a85f5e5372f842f92713e26b18dea3cae61 SHA256 55ef38e18f20fed45d75f98fe14a9be6103b1b933d034e2a9037bbf02217e88e
+MD5 dea63b8bca4a1d2713a5c3d336b31a65 postgresql-libs-8.1.8.ebuild 4124
+RMD160 2b5ab850d5cbf11851d556e01e225ca5e7d20403 postgresql-libs-8.1.8.ebuild 4124
+SHA256 55ef38e18f20fed45d75f98fe14a9be6103b1b933d034e2a9037bbf02217e88e postgresql-libs-8.1.8.ebuild 4124
+EBUILD postgresql-libs-8.2.3.ebuild 4260 RMD160 295d1d39d699fc712cf5faebe638c772129361b4 SHA1 3d743fc8811560bfce90c7ef5aaec7cf385eb14c SHA256 02126b3b3f4306d854559becf3edd87a72441d6009bd9b2624b31e77cff0dbac
+MD5 72cc7bd32a635b2a2966b4dbedb2ea8b postgresql-libs-8.2.3.ebuild 4260
+RMD160 295d1d39d699fc712cf5faebe638c772129361b4 postgresql-libs-8.2.3.ebuild 4260
+SHA256 02126b3b3f4306d854559becf3edd87a72441d6009bd9b2624b31e77cff0dbac postgresql-libs-8.2.3.ebuild 4260
 MISC ChangeLog 400 RMD160 ca729246e5c726e3b01b2c0c62718b505842dfb2 SHA1 8ed3d5e9213e84edcd426bd58cf19478e0c2c7d3 SHA256 37e34604de47ded00b6da91224ab32be7bd9cee7af0df9f80a4f0c661e88b171
 MD5 fa0d2242fded2ca473e1b749069da17c ChangeLog 400
 RMD160 ca729246e5c726e3b01b2c0c62718b505842dfb2 ChangeLog 400
diff --git a/dev-db/postgresql-libs/postgresql-libs-7.3.18.ebuild b/dev-db/postgresql-libs/postgresql-libs-7.3.18.ebuild
index 68f31cc..425bb7f 100644
--- a/dev-db/postgresql-libs/postgresql-libs-7.3.18.ebuild
+++ b/dev-db/postgresql-libs/postgresql-libs-7.3.18.ebuild
@@ -33,7 +33,6 @@ RDEPEND="kerberos? ( virtual/krb5 )
 		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 		zlib? ( >=sys-libs/zlib-1.1.3 )
 		>=app-admin/eselect-postgresql-0.1
-		!<dev-db/libpq-99.99.99
 		"
 DEPEND="${RDEPEND}
 		>=sys-devel/bison-1.875
@@ -108,31 +107,6 @@ src_install() {
 	doenvd "${T}/50postgresql-99-${SLOT}"
 }
 
-pkg_setup() {
-	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 installations that can't be"
-		eerror "dealt with automatically. The proper way to treat files is:"
-		eerror ""
-		eerror "rm -rf ${ff}"
-		eerror ""
-		die "Please, remove the files manually"
-	fi
-}
-
 pkg_postinst() {
 	use eselect && eselect postgresql set ${SLOT}
 	eselect postgresql update
diff --git a/dev-db/postgresql-libs/postgresql-libs-7.4.16.ebuild b/dev-db/postgresql-libs/postgresql-libs-7.4.16.ebuild
index 0f31538..2bea071 100644
--- a/dev-db/postgresql-libs/postgresql-libs-7.4.16.ebuild
+++ b/dev-db/postgresql-libs/postgresql-libs-7.4.16.ebuild
@@ -33,7 +33,6 @@ RDEPEND="kerberos? ( virtual/krb5 )
 		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 		zlib? ( >=sys-libs/zlib-1.1.3 )
 		>=app-admin/eselect-postgresql-0.1
-		!<dev-db/libpq-99.99.99
 		"
 DEPEND="${RDEPEND}
 		>=sys-devel/bison-1.875
@@ -113,31 +112,6 @@ src_install() {
 	dolib.a "${S}/src/port/libpgport.a"
 }
 
-pkg_setup() {
-	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 installations that can't be"
-		eerror "dealt with automatically. The proper way to treat files is:"
-		eerror ""
-		eerror "rm -rf ${ff}"
-		eerror ""
-		die "Please, remove the files manually"
-	fi
-}
-
 pkg_postinst() {
 	use eselect && eselect postgresql set ${SLOT}
 	eselect postgresql update
diff --git a/dev-db/postgresql-libs/postgresql-libs-8.0.12.ebuild b/dev-db/postgresql-libs/postgresql-libs-8.0.12.ebuild
index c8c1829..88f348d 100644
--- a/dev-db/postgresql-libs/postgresql-libs-8.0.12.ebuild
+++ b/dev-db/postgresql-libs/postgresql-libs-8.0.12.ebuild
@@ -35,7 +35,6 @@ RDEPEND="kerberos? ( virtual/krb5 )
 		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 		zlib? ( >=sys-libs/zlib-1.1.3 )
 		>=app-admin/eselect-postgresql-0.1
-		!<dev-db/libpq-99.99.99
 		"
 DEPEND="${RDEPEND}
 		>=sys-devel/bison-1.875
@@ -111,31 +110,6 @@ src_install() {
 	doenvd "${T}/50postgresql-97-${SLOT}"
 }
 
-pkg_setup() {
-	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 installations that can't be"
-		eerror "dealt with automatically. The proper way to treat files is:"
-		eerror ""
-		eerror "rm -rf ${ff}"
-		eerror ""
-		die "Please, remove the files manually"
-	fi
-}
-
 pkg_postinst() {
 	use eselect && eselect postgresql set ${SLOT}
 	eselect postgresql update
diff --git a/dev-db/postgresql-libs/postgresql-libs-8.1.8.ebuild b/dev-db/postgresql-libs/postgresql-libs-8.1.8.ebuild
index b5756ef..8a0613e 100644
--- a/dev-db/postgresql-libs/postgresql-libs-8.1.8.ebuild
+++ b/dev-db/postgresql-libs/postgresql-libs-8.1.8.ebuild
@@ -35,7 +35,6 @@ RDEPEND="kerberos? ( virtual/krb5 )
 		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 		zlib? ( >=sys-libs/zlib-1.1.3 )
 		>=app-admin/eselect-postgresql-0.1
-		!<dev-db/libpq-99.99.99
 		"
 DEPEND="${RDEPEND}
 		>=sys-devel/bison-1.875
@@ -111,31 +110,6 @@ src_install() {
 	doenvd "${T}/50postgresql-96-${SLOT}"
 }
 
-pkg_setup() {
-	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 installations that can't be"
-		eerror "dealt with automatically. The proper way to treat files is:"
-		eerror ""
-		eerror "rm -rf ${ff}"
-		eerror ""
-		die "Please, remove the files manually"
-	fi
-}
-
 pkg_postinst() {
 	use eselect && eselect postgresql set ${SLOT}
 	eselect postgresql update
diff --git a/dev-db/postgresql-libs/postgresql-libs-8.2.3.ebuild b/dev-db/postgresql-libs/postgresql-libs-8.2.3.ebuild
index 5f3b519..34d238c 100644
--- a/dev-db/postgresql-libs/postgresql-libs-8.2.3.ebuild
+++ b/dev-db/postgresql-libs/postgresql-libs-8.2.3.ebuild
@@ -36,7 +36,6 @@ RDEPEND="kerberos? ( virtual/krb5 )
 		zlib? ( >=sys-libs/zlib-1.1.3 )
 		>=app-admin/eselect-postgresql-0.1
 		ldap? ( net-nds/openldap )
-		!<dev-db/libpq-99.99.99
 		"
 DEPEND="${RDEPEND}
 		>=sys-devel/bison-1.875
@@ -115,31 +114,6 @@ src_install() {
 	doenvd "${T}/50postgresql-95-${SLOT}"
 }
 
-pkg_setup() {
-	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 installations that can't be"
-		eerror "dealt with automatically. The proper way to treat files is:"
-		eerror ""
-		eerror "rm -rf ${ff}"
-		eerror ""
-		die "Please, remove the files manually"
-	fi
-}
-
 pkg_postinst() {
 	use eselect && eselect postgresql set ${SLOT}
 	eselect postgresql update