Fixed 7.4.21 to install libpgport.a, don't install html-documentation since provided by postgresql-doc (bug #225629).

Package-Manager: portage-2.1.5.4

8 files changed, 35 insertions, 20 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index c0bc6632ccb7..74556e76aaea 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/postgresql-base
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.7 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.8 2008/06/14 10:42:50 dev-zero Exp $
+
+*postgresql-base-7.4.21-r1 (14 Jun 2008)
+
+  14 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -postgresql-base-7.4.21.ebuild, +postgresql-base-7.4.21-r1.ebuild,
+  postgresql-base-8.0.17.ebuild, postgresql-base-8.1.13.ebuild,
+  postgresql-base-8.2.9.ebuild, postgresql-base-8.3.3.ebuild:
+  Fixed 7.4.21 to install libpgport.a, don't install html-documentation
+  since provided by postgresql-doc (bug #225629).
 
 *postgresql-base-8.3.3 (13 Jun 2008)
 *postgresql-base-8.2.9 (13 Jun 2008)
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index ee6ce19b1854..712895d5b15f 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -28,14 +28,14 @@ DIST postgresql-8.3.1.tar.bz2 13995572 RMD160 075efb67126f2b308d2a5fe4f9097fdbfb
 DIST postgresql-8.3.3.tar.bz2 14004538 RMD160 8cc31cae862e328c8372245c8f953a1773dcc1f8 SHA1 b933f26a70bef9a5971c0ff2f392e293eed138b2 SHA256 e9406b93794dc4fd15b21e10512d2b694236d79b018d29b9ca86311d5cca2437
 EBUILD postgresql-base-7.3.21.ebuild 4218 RMD160 5631b29631c2cd60c1fdaad9bda2b0ed95adef66 SHA1 c41c008bc7e1f49d22e623d66a698251365d1052 SHA256 65928ffb6f1b2c1027a60ae11996ac585f133d9e586ec65986d2bd4b58f05c85
 EBUILD postgresql-base-7.4.19.ebuild 4407 RMD160 76525cdd0333394d0b1773b797503be3998b6e90 SHA1 3aab349310d844accfd793061cb4e563e1edda18 SHA256 da182b9ee44a4027fdfced6e2c62b2efa8116b75f9f6df1ad104e0d2aac87c0c
-EBUILD postgresql-base-7.4.21.ebuild 4407 RMD160 6107bdd8c43c168c78c962b4f40f1f1aab9c4fe0 SHA1 36115d0c3d304174d5b7c0dae56f2919fd399273 SHA256 a8ccbac8f3d990f7ee58bfa5bd52a3ab61a939b233285ca57f1414292757b4b5
+EBUILD postgresql-base-7.4.21-r1.ebuild 4574 RMD160 c444c51b4ad2b10b21b6dc62dbcd98aef44f32ee SHA1 7ecf0cec3850be462d8b1326f1e69ec4cb4a2a44 SHA256 f5d049aef08b9ae090f6e26dd369e68a566463dba0bab93c3e398d5099b88ccb
 EBUILD postgresql-base-8.0.15.ebuild 4494 RMD160 c1ee041c3e1c6f2c851243d4b525169a3127ffad SHA1 828f74b9f4908dbb93240f10afef16d1088a7075 SHA256 8889899a94c9cb2f721c714ab5eafb272b57144724715259b3974ef99794e4e4
-EBUILD postgresql-base-8.0.17.ebuild 4491 RMD160 7e4f0acb8dc8658b569c5c3b02005a9cb9ba71ba SHA1 a43c9c2c8d8103ab96ec778374d08071233249d1 SHA256 09f67e25ef032b40e16f6503f61c220a0a8ad1a0cd14848f8c3e29e486006aa3
+EBUILD postgresql-base-8.0.17.ebuild 4473 RMD160 fd5e01758fbb03b6f0051356ecad95594eaf3939 SHA1 ee7205257763526f6381a589464dfa8a8b5af1fc SHA256 c66a39d30f4f4609e4ec2484e10e7e24166415dbf4dd6fa3a784b87a4409e12c
 EBUILD postgresql-base-8.1.11.ebuild 4491 RMD160 2ccab3e960b5443cc4a8af666175cd4a65a5f1af SHA1 2b3ef3029490aaadc47c6d18890b41456cf86f1c SHA256 c50f5c34972a0b010857ecc6477c3f0ea891d9dc277056f8ff63862ad1635422
-EBUILD postgresql-base-8.1.13.ebuild 4491 RMD160 ea109144fd3ca770a64f35363f74e70205b261b0 SHA1 6a0baa84c2d22dd4c48ff3c48a14f3b74351ae66 SHA256 0b9e58291a2ad4266c5049e64e1ba90ad7a5225f413618c4a66971bccb9709db
+EBUILD postgresql-base-8.1.13.ebuild 4473 RMD160 57e5a28eddfccad47129ce1dec83c66106ef41de SHA1 7435404400924ebf802a960333bfea754fded414 SHA256 9d7ed6811b28dc58409a774e05e0efac951f327a06b7c5a0096973f16eb1e5e0
 EBUILD postgresql-base-8.2.7.ebuild 4600 RMD160 328a974cd40dec73b19c8be57b6f256e60b150e7 SHA1 53205c6e26497109a03ae6a20a0aec129fc6fa00 SHA256 6f360a81032a291037236056b43e849501f97435a22a16383d87fc4c96a55cbc
-EBUILD postgresql-base-8.2.9.ebuild 4600 RMD160 101fceb46821a9b0c87e0cc8dd60c90cc0e42c90 SHA1 79cd89868230db301186df942056f670f89acc6c SHA256 9a8cf62c629ff4e50b4324ead63daed4cc26f95282c1aa3150a7feb7542fc56f
+EBUILD postgresql-base-8.2.9.ebuild 4582 RMD160 82ff71c78e53fd4c9dc5a39ae0ddfc0323ecc3bd SHA1 725c299784b74f5ecc6b6b34358cd37d850682c8 SHA256 f404a3d6b8d2873f52820fae6c1a0fc0a987487a0c5b2479adb8a228267309f8
 EBUILD postgresql-base-8.3.1.ebuild 4707 RMD160 18e5251bb1654d95dd440992fcaa3e51d39754b6 SHA1 14058c9560ed207db001dd3d6496296ebeddf4f6 SHA256 34b97372b5de92b92cae2dfc09d5d5d0d87ae60b4e770c4f73e27f36ea09901f
-EBUILD postgresql-base-8.3.3.ebuild 4707 RMD160 ba4494d0d72bf28cade3842f84fcda92f6b0d21c SHA1 55eaa2a7aa8c4c7ff3c833b061fd5404ee09ac40 SHA256 fd9042a04864ee0c8ab65b334d1722ecd7063bc80573574afe787ecf714e8b46
-MISC ChangeLog 8038 RMD160 4a14f2b7f2d9c51ebe0c3dbce08aa535ad1b6b28 SHA1 1d74b593d73df6e2b4798735e10a5942fc910eab SHA256 86c1e0b3f05667ebc135d3100747f23765dad2fa9394ac8e17a8d187e12e64b8
+EBUILD postgresql-base-8.3.3.ebuild 4689 RMD160 dad2725dfafb1219c94c34912ad0dbb7c5e9c2e5 SHA1 cb3abc993c812e547cc572421e2d37e2c282dd12 SHA256 95e762fe07399dcad37343647187f1998f7152966dc543c07608d0d673dc5e61
+MISC ChangeLog 8451 RMD160 8dd46cc83dda8d8467e44c5a6eca6824f232bd8e SHA1 27d528bdd6ac85115acfffd45ec85c6125b4dee8 SHA256 e841b396b102a688e8d03446ee3bf371518f1e0d20b2b5e93c839546427ef2be
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/postgresql-base/postgresql-base-7.4.21.ebuild b/dev-db/postgresql-base/postgresql-base-7.4.21-r1.ebuild
index 2b752f38d4b4..6b50f5dc8f3f 100644
--- a/dev-db/postgresql-base/postgresql-base-7.4.21.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-7.4.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-7.4.21.ebuild,v 1.1 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-7.4.21-r1.ebuild,v 1.1 2008/06/14 10:42:50 dev-zero Exp $
 
 EAPI="1"
 
@@ -72,7 +72,7 @@ src_compile() {
 		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
 		--host=${CHOST} \
-		--with-docdir=/usr/share/doc/${PF} \
+		--docdir=/usr/share/doc/${PF} \
 		--without-tcl \
 		--without-perl \
 		--without-python \
@@ -96,9 +96,15 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	insinto /usr/include/postgresql-${SLOT}/postmaster
 	doins "${S}"/src/include/postmaster/*.h
+
+	# Install missing libpgport.a
+	insinto /usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
+	doins "${S}/src/port/libpgport.a"
+
 	dodir /usr/share/postgresql-${SLOT}/man/man1
 	tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
 
+	rm -rf "${D}/usr/share/doc/${PF}/html"
 	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,initlocation,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
 
diff --git a/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild b/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild
index 34033b2b2eaf..4677bb441cb6 100644
--- a/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild,v 1.1 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild,v 1.2 2008/06/14 10:42:50 dev-zero Exp $
 
 EAPI="1"
 
@@ -72,7 +72,7 @@ src_compile() {
 		--includedir=/usr/include/postgresql-${SLOT} \
 		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--with-docdir=/usr/share/doc/${PF} \
+		--without-docdir \
 		--without-tcl \
 		--without-perl \
 		--without-python \
diff --git a/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild b/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild
index ae4feb0c725c..835f35fa6e8b 100644
--- a/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild,v 1.1 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild,v 1.2 2008/06/14 10:42:50 dev-zero Exp $
 
 EAPI="1"
 
@@ -72,7 +72,7 @@ src_compile() {
 		--includedir=/usr/include/postgresql-${SLOT} \
 		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--with-docdir=/usr/share/doc/${PF} \
+		--without-docdir \
 		--without-tcl \
 		--without-perl \
 		--without-python \
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild
index e9f3e3555e49..9763b921f36b 100644
--- a/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild,v 1.1 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild,v 1.2 2008/06/14 10:42:50 dev-zero Exp $
 
 EAPI="1"
 
@@ -73,7 +73,7 @@ src_compile() {
 		--includedir=/usr/include/postgresql-${SLOT} \
 		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--with-docdir=/usr/share/doc/${PF} \
+		--without-docdir \
 		--enable-depend \
 		--without-tcl \
 		--without-perl \
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild
index 961ab2d24792..969de0a2e97c 100644
--- a/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild,v 1.1 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild,v 1.2 2008/06/14 10:42:50 dev-zero Exp $
 
 EAPI="1"
 
@@ -73,7 +73,7 @@ src_compile() {
 		--includedir=/usr/include/postgresql-${SLOT} \
 		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--with-docdir=/usr/share/doc/${PF} \
+		--without-docdir \
 		--enable-depend \
 		--without-tcl \
 		--without-perl \
diff --git a/dev-db/postgresql-docs/Manifest b/dev-db/postgresql-docs/Manifest
index 99286a93b899..ba61f250ebed 100644
--- a/dev-db/postgresql-docs/Manifest
+++ b/dev-db/postgresql-docs/Manifest
@@ -18,7 +18,7 @@ EBUILD postgresql-docs-8.1.11.ebuild 1028 RMD160 946bb084f002bed4d7a13aa85968b4e
 EBUILD postgresql-docs-8.1.13.ebuild 1028 RMD160 1a1c82728f0f411bd862acfd0e39c77cfbface75 SHA1 3dc409877f57ab269e90abd1ff7381df24019912 SHA256 fa7565e739dd1f272b6715b96fcb6d8c20cd09e79e53017275b305486233d4f7
 EBUILD postgresql-docs-8.2.7.ebuild 1027 RMD160 cbef470b79907678aa6e8e8f26fbd2c23ca05b9b SHA1 6f1d6fc9803e6566770967ca0952bfda8f667b21 SHA256 8649e1d63eea020ccc4fde2e50390c7fcce5c2431c462fc3e162dfaa7872388b
 EBUILD postgresql-docs-8.2.9.ebuild 1027 RMD160 c82ad76a867ca506685422c1a0aec317e4cd2715 SHA1 e7be5c511e17da5fb2fc6a233d209f1b90f64f5b SHA256 4a77bdf5adb50d378194ed8e80486dca065fdd85ef1d5b652a21948b17d8df87
-EBUILD postgresql-docs-8.3.1.ebuild 1090 RMD160 f4ec3c38142b29c2a39b7fda2eb926c63b64561a SHA1 b205951065690e33a98817e1838dd04783bc7241 SHA256 4cdae9a5cfd3c00f3acb14aba69791d8f99de7b363612bc2bfca3f06edb1e2e7
-EBUILD postgresql-docs-8.3.3.ebuild 1090 RMD160 8f7ea6cd46b35210476f8feb4afd4043c6aad5a4 SHA1 2fa115fde37ab0e76dd86bc985afb6ec828084ce SHA256 1d9872c23b5bbccbcf7d269e9d4da5223232efa985ea9d65449f564e4bf85d9e
-MISC ChangeLog 1715 RMD160 42e134c7dbe06d71eb161fe04b5a28781924d992 SHA1 a7c3486511c28c8d65154750f841185d739cfedc SHA256 ca510138ddc8b1f8f7084e97ce28dbf20e288b552098a448672c38384094dd3d
+EBUILD postgresql-docs-8.3.1.ebuild 1102 RMD160 1bdcf7bb87daf350aa75d0c334ab29f08e85ea6e SHA1 843c056de78f7e9be0394de5dc0cceea05101537 SHA256 a16c926af9dc4c6c567d329ed81de24220f3c9614ec41b17b03a565fc20b0f69
+EBUILD postgresql-docs-8.3.3.ebuild 1102 RMD160 ffd8d5a6c50a677789ae4d05f6aa77587008b1dd SHA1 3e45a08c435fc7b7d5f9199175db59be84db6d01 SHA256 3259cefc69dde28609ed9bcfc42424d4b7f7fb765c31566beee18a39fc9ebdd6
+MISC ChangeLog 1869 RMD160 dabb8a9552926fca2dc377d655c947316f1a91c8 SHA1 5e821db09f684fc656beabd9e5b86e10933770a8 SHA256 3682a0fc358b4409c6eac1ed97dd59225b2482a9d0ec4ab6607bba4aad116b5f
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b