dev-db/postgresql-server: Changed dependency in 7.3 for new postgresql-base package. Added metadata.xml.

svn path=/experimental/; revision=321

9 files changed, 29 insertions, 22 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 4daac16..58f5061 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  postgresql-server-7.3.21.ebuild, postgresql-server-7.4.19.ebuild,
+  postgresql-server-8.0.15.ebuild, postgresql-server-8.1.11.ebuild,
+  postgresql-server-8.2.6.ebuild, postgresql-server-8.3.0.ebuild,
+  +metadata.xml:
+  Changed dependency in 7.3 for new postgresql-base package. Added metadata.xml.
+
   07 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
   postgresql-server-7.3.21.ebuild, postgresql-server-7.4.19.ebuild,
   postgresql-server-8.0.15.ebuild, postgresql-server-8.1.11.ebuild,
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 227d360..e75bbba 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -32,10 +32,11 @@ 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-server-7.3.21.ebuild 7929 RMD160 29c531bbbc3cb50953acde5140b98b22a889465f SHA1 291dbc223047f86c90620d4eb1a11cd370038c1e SHA256 d4abdf22d2024d68eeea7a60f9a9715f623ed9c0da913538bb0091380e748e90
-EBUILD postgresql-server-7.4.19.ebuild 7847 RMD160 4ef6e34429eb1f6ed334cf030379d6b3e4c44050 SHA1 157f43a32f197f6dd1b0e905b3594c56435f72a4 SHA256 9ce520ed728c88cd10004fb60d85ca16dc79bb04e0c2dc73fd07efc8a551586c
-EBUILD postgresql-server-8.0.15.ebuild 7851 RMD160 230f759924a1297a2800b9640675682e202410ef SHA1 cb93479dad7228fc590506e91c014ddeddfdeacb SHA256 8d36ee428c810556fa7365006314c23aa3ac91edb8a4f9da3514fa9bc574cb44
-EBUILD postgresql-server-8.1.11.ebuild 8085 RMD160 297a9e803254b9b2f8d64562d55d3d5116e8955d SHA1 c132b4ec0caa9f4635032ba304e6f07871060705 SHA256 e00d6b9e877cf963948223ac3b649120cf8834ac08e9a2a6af51e33284f528a0
-EBUILD postgresql-server-8.2.6.ebuild 8315 RMD160 88754051df6f6e75a947435679d3b2f64dfb51d6 SHA1 251adf6583689249fcf090a9afda6ff70e74bd49 SHA256 e701ee6e587de667dea1b48030e1767fac53f7fb5e75a9ceb205c2dabe67a180
-EBUILD postgresql-server-8.3.0.ebuild 8342 RMD160 a60103d1c5270767e4a3ce89cdb1b924e19f41b8 SHA1 5d67df7647b8b1499917803baa0120092ab517ee SHA256 43f22efbd4381502c05274246bfcfe416b0ad72f932f6f39a96bbca54474ca2c
-MISC ChangeLog 1245 RMD160 1e8ef2e5d7d2f4c8ef21586ef6b73540491c8846 SHA1 22f4982f2724b18308fb6072623120c5a91b7ee3 SHA256 6a9a3e8442695563b052121ae79b7b11b472839e97c233233156555f2c118dab
+EBUILD postgresql-server-7.3.21.ebuild 7894 RMD160 62d5c1b8e89bb9c27277f63316a369546af05e80 SHA1 4a212c8743326c9f2efdc1eccc762f21b30f8661 SHA256 c50f2c9dbfc77041f6ec6c65908d9ef8864073dc39eed56f8ec718bef2dffbd7
+EBUILD postgresql-server-7.4.19.ebuild 7797 RMD160 4e21f3d89744e9d54b057919a634967f8c16b6d9 SHA1 6b18d02dbd760ce89920f1188303de83fea8ed89 SHA256 f7d0fc63c2a8a31e2844b96d900f64beb514ac14f0886fdce35db0d220d07b3f
+EBUILD postgresql-server-8.0.15.ebuild 7801 RMD160 b808791f7f759b7411e698763863e9d13ea7a128 SHA1 b4625bc1dfd01ecd21183966c96e6edbe707c317 SHA256 f9c4b2720bf23f3391a19b5f05887efb764316696c2e3071ebf651ce94f09494
+EBUILD postgresql-server-8.1.11.ebuild 8035 RMD160 0b5f3eac3207cce2c7fbf3947f801199de24b2b3 SHA1 8cca55a73029c2f088f9e8bf68bb47749059a2b1 SHA256 f1b5bb750481f9546bd076a9d439c8b9ccef49c4322c5f47e0e6c2b10fbbe193
+EBUILD postgresql-server-8.2.6.ebuild 8265 RMD160 9ee00bf7c6f8f31b292d068277db7ea492fb7d0d SHA1 5a716eaeb640cd29840b0f6adec56199fa5e1446 SHA256 c1de231ac851209f1592129da3ac1f8b2d7bd188a80730493a7929beebc30a4b
+EBUILD postgresql-server-8.3.0.ebuild 8292 RMD160 35acd5e06a12e8442640a6ef55e82b9db1083bde SHA1 860990af54e1e0a49b50c26f0d76bf4517836396 SHA256 0a856fe8aca5ecb7ec7bf1e47a196789e199c4e8fc4a496e44be1480a49e557a
+MISC ChangeLog 1599 RMD160 6143f3e1fb422b74000dfb165a1e4cf78858e2dc SHA1 67d5470e06fc5b002166622944938e54b454ca5c SHA256 2c3607499b1ca9c793cd2cddff99a22ac6df0fee0a52dcc05b31667a3508c72e
+MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/postgresql-server/metadata.xml b/dev-db/postgresql-server/metadata.xml
new file mode 100644
index 0000000..d06e452
--- /dev/null
+++ b/dev-db/postgresql-server/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>postgresql</herd>
+</pkgmetadata>
diff --git a/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild b/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
index 35ee51c..8cd2013 100644
--- a/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
@@ -27,16 +27,15 @@ wanted_languages() {
 	done
 }
 
-RDEPEND="~dev-db/postgresql-libs-${PV}
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		perl? ( >=dev-lang/perl-5.6.1-r2 )
 		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 		selinux? ( sec-policy/selinux-postgresql )
 		tcl? ( >=dev-lang/tcl-8 )
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
-		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-client-${PV} )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+		xml? ( dev-util/pkgconfig )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
@@ -110,7 +109,7 @@ src_install() {
 			emake install -C $bd -j1 DESTDIR="${D}" \
 				docdir=/usr/share/doc/${PF} SLOT=${SLOT} || die "emake install in $bd failed"
 	done
-	rm -rf "${D}"/usr/share/postgresql-${SLOT}/man/man7/
+	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/"
 	rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,vacuumdb,pgtksh,pgtclsh}.1
 
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
diff --git a/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild b/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
index c1668c8..9b38d95 100644
--- a/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
@@ -34,8 +34,7 @@ RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		tcl? ( >=dev-lang/tcl-8 )
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
-		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-base-${PV}:${SLOT} )"
+		xml? ( dev-util/pkgconfig )"
 PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
diff --git a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
index e7fb735..6133d2f 100644
--- a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
@@ -35,8 +35,7 @@ RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		tcl? ( >=dev-lang/tcl-8 )
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
-		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-base-${PV}:${SLOT} )"
+		xml? ( dev-util/pkgconfig )"
 PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
diff --git a/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild b/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
index 749f2b3..d183676 100644
--- a/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
@@ -35,8 +35,7 @@ RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		tcl? ( >=dev-lang/tcl-8 )
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
-		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-base-${PV}:${SLOT} )"
+		xml? ( dev-util/pkgconfig )"
 PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
diff --git a/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild b/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild
index 08d61c5..f1df39e 100644
--- a/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild
@@ -35,8 +35,7 @@ RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		tcl? ( >=dev-lang/tcl-8 )
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
-		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-base-${PV}:${SLOT} )"
+		xml? ( dev-util/pkgconfig )"
 PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild
index 6b43b84..c02a244 100644
--- a/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild
@@ -35,8 +35,7 @@ RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		tcl? ( >=dev-lang/tcl-8 )
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
-		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-base-${PV}:${SLOT} )"
+		xml? ( dev-util/pkgconfig )"
 PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}