dev-db/postgresql-base: Added blockers for various packages. Removed docs installation again (will be done in dev-db/postgresql-docs).

svn path=/experimental/; revision=318

7 files changed, 33 insertions, 118 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index d842081..4297ee0 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  postgresql-base-7.4.19.ebuild, postgresql-base-8.0.15.ebuild,
+  postgresql-base-8.1.11.ebuild, postgresql-base-8.2.6.ebuild,
+  postgresql-base-8.3.0.ebuild:
+  Added blockers for various packages. Removed docs installation again (will
+  be done in dev-db/postgresql-docs).
+
   05 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
   postgresql-base-7.4.19.ebuild, postgresql-base-8.0.15.ebuild,
   postgresql-base-8.1.11.ebuild, postgresql-base-8.2.6.ebuild,
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index 97eb80f..b237f80 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -16,9 +16,9 @@ DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043a
 DIST postgresql-8.1.11.tar.bz2 11735420 RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 SHA1 73c0f09754fc8e3c7f8d7de49d70244b76927416 SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e
 DIST postgresql-8.2.6.tar.bz2 12559117 RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 SHA1 8934dfbd4c1d8c4f2945cb80f02072611681f967 SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114
 DIST postgresql-8.3.0.tar.bz2 13923051 RMD160 99f48d26d9b0fb0cfda0de7156ad6a9554017d9e SHA1 b221e9a82fdb10af1a2b527551a4e30b7ccb958d SHA256 85356d6ab577e21bb528eb5d672e4373b21fe98ac046e77a0eed975608066ea6
-EBUILD postgresql-base-7.4.19.ebuild 4707 RMD160 3a9da2773885013b162ab7a5b59f94f98148730d SHA1 1b68de5a698b308a334879e14018b40ecbdc59d7 SHA256 4e0e5e2626ee29178e74e7caf3bb7b99ed6e6afd84e23224106a1b24cc955a33
-EBUILD postgresql-base-8.0.15.ebuild 4704 RMD160 223198ec7998c22a8074a10e0ab6b17fd14f05f9 SHA1 94393f593b96ee09e0914226f436fe5de4a5080f SHA256 40fe42b144ff438d68ed8f95aec4c99ed1746fe46a0c9da66183707972901efa
-EBUILD postgresql-base-8.1.11.ebuild 4704 RMD160 223198ec7998c22a8074a10e0ab6b17fd14f05f9 SHA1 94393f593b96ee09e0914226f436fe5de4a5080f SHA256 40fe42b144ff438d68ed8f95aec4c99ed1746fe46a0c9da66183707972901efa
-EBUILD postgresql-base-8.2.6.ebuild 4778 RMD160 d650b2e3ad78bac26614682a829e85b8decefe68 SHA1 449af23af501dc6b8be0bcb55babe722917aaf79 SHA256 39aedf109b185d0f2717b6f564a19084b9193912da2c2cf1e60108dd6bdee6e1
-EBUILD postgresql-base-8.3.0.ebuild 4778 RMD160 d650b2e3ad78bac26614682a829e85b8decefe68 SHA1 449af23af501dc6b8be0bcb55babe722917aaf79 SHA256 39aedf109b185d0f2717b6f564a19084b9193912da2c2cf1e60108dd6bdee6e1
-MISC ChangeLog 1318 RMD160 dfde71ecd447aa80371b6c179a8df65e785706dc SHA1 0fb51c7ecb67892315ce17bc83b3f171c93d75eb SHA256 15677d9f1800130fc0e4df576f90b7c85f0e98e3fa93c0790b241d739a88c739
+EBUILD postgresql-base-7.4.19.ebuild 4420 RMD160 ec40c9aadaeef85e6e8835f0f2a69b5915caf5d5 SHA1 89284de34f281b69ce8385b6397dae6410beb566 SHA256 002121dcaef64e58d0481083740055f1a2c8b88211bda441bc2b245b8fb512e8
+EBUILD postgresql-base-8.0.15.ebuild 4417 RMD160 558cefbe2570c09f2967c4306067addc5908dffd SHA1 5e7ec8b49d8911312efdcf49a2b0c637a2a96eae SHA256 07cab457d6f86e6f8dacdf7d5bed1ea324094a261f1e89f7ae886f357d5f67ff
+EBUILD postgresql-base-8.1.11.ebuild 4417 RMD160 558cefbe2570c09f2967c4306067addc5908dffd SHA1 5e7ec8b49d8911312efdcf49a2b0c637a2a96eae SHA256 07cab457d6f86e6f8dacdf7d5bed1ea324094a261f1e89f7ae886f357d5f67ff
+EBUILD postgresql-base-8.2.6.ebuild 4404 RMD160 6fa3355b1026ee312ef031ebcb039d0d59f31798 SHA1 eafee2f267a2b0eccf00c7e918e3c1053cba9849 SHA256 1144ce15451803ee4a9c765af4a17dbfba3877ddc97657e1ca0aea286232d87b
+EBUILD postgresql-base-8.3.0.ebuild 4404 RMD160 6fa3355b1026ee312ef031ebcb039d0d59f31798 SHA1 eafee2f267a2b0eccf00c7e918e3c1053cba9849 SHA256 1144ce15451803ee4a9c765af4a17dbfba3877ddc97657e1ca0aea286232d87b
+MISC ChangeLog 1646 RMD160 e69931fbd92b522f887f30b5661e31dead327bf1 SHA1 3429a720f1e62d285c2013d81ac38425f476fa9b SHA256 593c86fd311edf1d07663781b2f7e6c4a0f5ee96daf3855b1fffef6a4f6ba231
diff --git a/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild b/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild
index 1ca8e9c..e993657 100644
--- a/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild
@@ -38,12 +38,12 @@ RDEPEND="kerberos? ( virtual/krb5 )
 	>=app-admin/eselect-postgresql-0.2
 	!dev-db/postgresql-libs
 	!dev-db/postgresql-client
-	!dev-db/postgresql-docs
-	!dev-db/libpq:3 !dev-db/libpq:4
-	!dev-db/postgresql:0"
+	!dev-db/libpq
+	!dev-db/postgresql"
 DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.875
 	nls? ( sys-devel/gettext )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -128,25 +128,7 @@ __EOF__
 	__EOF__
 	doenvd "${T}/50postgresql-95-${SLOT}"
 
-
-	if use doc ; then
-		dodir /usr/share/doc/${PF}/html
-		tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
-
-		cd "${S}/doc"
-
-		docinto FAQ_html
-		dodoc src/FAQ/*
-
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
+	keepdir /etc/postgresql-${SLOT}
 }
 
 pkg_postinst() {
diff --git a/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild b/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
index 553c0a1..481a09e 100644
--- a/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
@@ -39,12 +39,12 @@ RDEPEND="kerberos? ( virtual/krb5 )
 	>=app-admin/eselect-postgresql-0.2
 	!dev-db/postgresql-libs
 	!dev-db/postgresql-client
-	!dev-db/postgresql-docs
-	!dev-db/libpq:3 !dev-db/libpq:4
-	!dev-db/postgresql:0"
+	!dev-db/libpq
+	!dev-db/postgresql"
 DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.875
 	nls? ( sys-devel/gettext )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -127,25 +127,7 @@ __EOF__
 	__EOF__
 	doenvd "${T}/50postgresql-95-${SLOT}"
 
-
-	if use doc ; then
-		dodir /usr/share/doc/${PF}/html
-		tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
-
-		cd "${S}/doc"
-
-		docinto FAQ_html
-		dodoc src/FAQ/*
-
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
+	keepdir /etc/postgresql-${SLOT}
 }
 
 pkg_postinst() {
diff --git a/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild b/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
index 553c0a1..481a09e 100644
--- a/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
@@ -39,12 +39,12 @@ RDEPEND="kerberos? ( virtual/krb5 )
 	>=app-admin/eselect-postgresql-0.2
 	!dev-db/postgresql-libs
 	!dev-db/postgresql-client
-	!dev-db/postgresql-docs
-	!dev-db/libpq:3 !dev-db/libpq:4
-	!dev-db/postgresql:0"
+	!dev-db/libpq
+	!dev-db/postgresql"
 DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.875
 	nls? ( sys-devel/gettext )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -127,25 +127,7 @@ __EOF__
 	__EOF__
 	doenvd "${T}/50postgresql-95-${SLOT}"
 
-
-	if use doc ; then
-		dodir /usr/share/doc/${PF}/html
-		tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
-
-		cd "${S}/doc"
-
-		docinto FAQ_html
-		dodoc src/FAQ/*
-
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
+	keepdir /etc/postgresql-${SLOT}
 }
 
 pkg_postinst() {
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.6.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.6.ebuild
index 0b43f76..e6a4085 100644
--- a/dev-db/postgresql-base/postgresql-base-8.2.6.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.2.6.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
-# find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
 IUSE_LINGUAS="
 	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
 	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
@@ -39,13 +38,13 @@ RDEPEND="kerberos? ( virtual/krb5 )
 	>=app-admin/eselect-postgresql-0.2
 	!dev-db/postgresql-libs
 	!dev-db/postgresql-client
-	!dev-db/postgresql-docs
-	!dev-db/libpq:3 !dev-db/libpq:4
-	!dev-db/postgresql:0
+	!dev-db/libpq
+	!dev-db/postgresql
 	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.875
 	nls? ( sys-devel/gettext )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -130,25 +129,7 @@ __EOF__
 	__EOF__
 	doenvd "${T}/50postgresql-95-${SLOT}"
 
-
-	if use doc ; then
-		dodir /usr/share/doc/${PF}/html
-		tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
-
-		cd "${S}/doc"
-
-		docinto FAQ_html
-		dodoc src/FAQ/*
-
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
+	keepdir /etc/postgresql-${SLOT}
 }
 
 pkg_postinst() {
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.0.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.0.ebuild
index 0b43f76..e6a4085 100644
--- a/dev-db/postgresql-base/postgresql-base-8.3.0.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.3.0.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
-# find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
 IUSE_LINGUAS="
 	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
 	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
@@ -39,13 +38,13 @@ RDEPEND="kerberos? ( virtual/krb5 )
 	>=app-admin/eselect-postgresql-0.2
 	!dev-db/postgresql-libs
 	!dev-db/postgresql-client
-	!dev-db/postgresql-docs
-	!dev-db/libpq:3 !dev-db/libpq:4
-	!dev-db/postgresql:0
+	!dev-db/libpq
+	!dev-db/postgresql
 	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.875
 	nls? ( sys-devel/gettext )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -130,25 +129,7 @@ __EOF__
 	__EOF__
 	doenvd "${T}/50postgresql-95-${SLOT}"
 
-
-	if use doc ; then
-		dodir /usr/share/doc/${PF}/html
-		tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
-
-		cd "${S}/doc"
-
-		docinto FAQ_html
-		dodoc src/FAQ/*
-
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
+	keepdir /etc/postgresql-${SLOT}
 }
 
 pkg_postinst() {