Fix -9999 ebuild to not build docs and manpages as this doesn't work, upstream is aware of the issue

Package-Manager: portage-2.2.18/cvs/Linux x86_64

3 files changed, 25 insertions, 38 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 716b7cae0ad0..3c475d984072 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.421 2015/03/31 19:06:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.422 2015/04/07 02:08:19 patrick Exp $
+
+  07 Apr 2015; Patrick Lauer <patrick@gentoo.org> postgresql-9999.ebuild:
+  Fix -9999 ebuild to not build docs and manpages as this doesn't work, upstream
+  is aware of the issue
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> postgresql-9.0.19.ebuild,
   postgresql-9.1.15.ebuild, postgresql-9.2.10.ebuild, postgresql-9.3.6.ebuild,
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 2cb505c10a66..aa557d43f6cf 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX pg_ctl-exit-status.patch 283 SHA256 bfa7d6cd233ebb0a3e0a1c818433fb6c7d03282752c62d88af295d683e447937 SHA512 3f0c9187e315a5dde86b2c99d108f702416a69aceda4b00ed0fa5b6d93b883a1e1a38640cb091282a3a8441b5f7264e28d755667fd3395e6c34ad060b107d813 WHIRLPOOL 95f669116d56c7423385f07302106c950a0b1c5050dc4ab5650066d935be09b954cdc8b8fb7ce97c8f90f89a49063405dca4b79b433c5856a56c7e44362123ad
 AUX postgresql-9.0-no-server.patch 4077 SHA256 7c6c29ac472ed884b8752e7f464c4e540483626fb347927bd0919eb7cfe4b4ae SHA512 3a2ab00ca59a2f9fcb8c48487f18c8714058f42bce4e0bc4e914d77a730642e76547677a3c434918e278b81d4a5535463c8fc08bc29a5d046874d1489aa5a8e5 WHIRLPOOL eba9b4b651776f3e8a2733fb4f47ec84647def67b43162a4038f0fe56b16432a138924b2177dd2af1ca93571931d9b389d84f64321c27a4b592265f85fa17362
 AUX postgresql-9.1-no-server.patch 4189 SHA256 6016251ce20d5338d612396bb935bb56f7d2fc7d525b4f2ac1f24ee79fdf013c SHA512 580063deb9f2427342018df0bdfd8ad0922ab72ca800f3b1b29d479dfa2736f573daa3434d47c9f15abf295e85ae6cd90401a40b12245e30c36e277f95df83f4 WHIRLPOOL 11ff7ec71b1f919bfbfe1aae4c4ae582ba8f28dc2a187b82317d8c3772217e7e0e0b0b7b32afe1a5c9f0825d28d05a2850b661f084832189ef0a486e16db6d6b
@@ -24,20 +21,6 @@ EBUILD postgresql-9.1.15.ebuild 11055 SHA256 09595a8ef188121e22dc2f66aa90699e0b7
 EBUILD postgresql-9.2.10.ebuild 11391 SHA256 de925805b4f097f6a7f9795eae374d4fcaa226e1fc40101b345cb04505e603a2 SHA512 174cd3a0e013343ed0582e6df42f79aa6abd2a4c289301b86b85a950b4a54b3549e3472cbf25e7e85291f726742fa6eb009b7d0d84fa1e023e7478b727c6a7ab WHIRLPOOL 1d1686038c338671dad3464aa23e2895196c95bc40c89b383f9cab51b1866ac62684ff7e4a0b19db153dffdaa501da2ce1170cf2351b2d1899bd371264b15bba
 EBUILD postgresql-9.3.6.ebuild 11390 SHA256 f91ff04722a903167d1c87bb03041d5c03f4864ba786beb8a8aaffb25bd26125 SHA512 136b074fc35582c5ba3a6ad1f30b1e342e944095710dd732da70dfb615e0cc92b7d2193c8a90ce47dc9219c072a909776b920860207067cc9a2fd88f42eff6dd WHIRLPOOL d823ad6655a144aa2611b1069e00a7640517e6d0929b9375f11afcf8b8ff927b48a2982b5b5d13d1459ecfd27c6a803c390f9a156755e878c3deca0c0ef11094
 EBUILD postgresql-9.4.1.ebuild 11360 SHA256 dbe78758df3d11bb6619cdc77173767bfe9a1d7bf185c76e4ab1ca20621b3ad3 SHA512 538a9c5df49d6b2a19bd63616c666b54367eb9a6da7d857351193c66fc786fcd7a98de982df02827d0a4af5deeb2afc896ea3f451f8c1c7dd5475abf0b50fa4e WHIRLPOOL 4a72832f0a20efdf8a6741e95e0f1c24c61e9fb87c5e8f6f81776461669cede98a02380e96aa177722b381d9703b3b9735edc3428b17cc5984b952723c4f122f
-EBUILD postgresql-9999.ebuild 11433 SHA256 5573019197cecf6678a62a577e05e16b11339d9019704b1a3a75aea5ceda8b45 SHA512 69296e6a8b6dda3131a19370984e1cbe4b0fc54f4d63ed6cb67beb125904c6faa30e530c657e853bd7855f98bd6789289b2ed6b9c7efa1b76592a59a2ed6ecb4 WHIRLPOOL 41edc852468ae15d82b99ac3ee807e0a457b35c44b1396c9f70073519f6bbdde2385e4d25e5f6182501f7e9dde4afa792463d583e92c4323526df22d3b579b48
-MISC ChangeLog 10311 SHA256 f76ae822430d748aac6b843a6b66030fcc7abdf9d78bda3fdb2531576946d4ee SHA512 60b86e6f1e34d9282eb9e0381225c6d31d5dcdc0bbc9d82ea3b0579c384ca86cf115f079ffa81fbe189fc87edb6a96217b94987a5d0b564412b2d6bc5e48c87f WHIRLPOOL 40da9acb340adc704fa16b7d7f342d102a02b85807f3ec7d4c340031d8af3c31806c36312c0385e806869be57ea9087936d75fa6f6d4fd5e93b6112f9c4a6b90
+EBUILD postgresql-9999.ebuild 11449 SHA256 be408302aabb34d82bb95b71b32cd1da03fa8503b36507eed01a0e04f483c65c SHA512 51bc5f228e0dd48d730c4c7c80f1dd1cce5b4ef8cf746f733d7a1e9699626e2b9e8df0cb238c84aed88cb8470674e25b72ded5caa7a5e2325d6a348baca752a1 WHIRLPOOL ecf5cc5477da77a7864f22e6969be24e53a196419a0d6ca9421a4e7556cd3a2ae9bf79987d08b0aba5b09e9cdaea9c9cc1cf68648dcd370ea0a44aad126c1eec
+MISC ChangeLog 10495 SHA256 91c25593758e95ecc8e225fd49ed1404b790d7cb217720f72d03458b17d569f3 SHA512 262ae50cc0d23f86b24eb26022213e6233e95fce6c58e5f292c8b1cab6561e8ecee2beeafa895b481bd82841253db2adf86f24725d65e98053896cde0d83094a WHIRLPOOL 39591339b8350fe8e88b4c7d56226769cf94fce5c9e3ab1706f6cc5232707d02b18c5a18616148dfde6640d8b91e407e40139652afd45cf861562c0d8a22f25b
 MISC metadata.xml 620 SHA256 85335fdf06be777d6fa46902094b666ddd7e0a64d12f03b0ba54c181641822c0 SHA512 00a3f52a73add4922a366534f50decb308254a27c64130c9b4fde4f27fbed318ff65a5065a95e0d99219f5f4c439d502b0b0a3951f4589393617385ad656e003 WHIRLPOOL b0a0bf7d88a585d04cdc7acb7aa46d455fff5508100c3a81485ecb9cf221dbbc13f10501652ff084253eacde019d4c79c7b4f997bc8408ade041edb8a23cb1cd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQGcBAEBCAAGBQJVGvBUAAoJEJQzkH1pP7W4aU4L/ibE9qIhCNJ+DZ/92kX66XC2
-FRWetWb8PBLS08idnRqA/dHcSEjeTmoWxhFwKqHivyxELqjdBFPfHXxM6frFl1tu
-tFluoVQuiPIrJ/aWexejnpHofz27OLFmRDGf9GW2NGgJj+S9XOtvHDiYl1Hzc7UJ
-QskjFqp2B3CwwYy3545+k+tHZ7J6HWdvyYLGk/wvZHJaQvX+MsxD2y03Z6Vp5FWA
-ibCCmQv23ZJslWtHx58jPs0bONfklry2TzvJktEe7i/85SKNy7IbUGHeI3OqkEoD
-RZMi6hqkY7lBZxTbVR/Oeu4ulP2q5Jq9ruzSrtQXBz+Lfk6M65QYkfNXBPpYMl8o
-8p8xkvpt9OsJ0ajHEpx1ckRiBLdOlJAwWfWNJaNX2cOsDSuH/2mralX9OC2uG1Pe
-d4fjPGhMT5ZiDViR6v4YeJACrmM8weg0/75sOhpyrBKUVFwXJgYjcQAn4xmZImIO
-iZDmF3/uXC8NhuUT5nE2s8sM+XEvsqzoB9iVSZDuUQ==
-=F/bK
------END PGP SIGNATURE-----
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 6a749a694cf2..ada9ba5565cb 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9999.ebuild,v 1.8 2015/03/31 19:06:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9999.ebuild,v 1.9 2015/04/07 02:07:32 patrick Exp $
 
 EAPI="5"
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.postgresql.org/"
 
 LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
 		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
+IUSE="kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
 	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
 
 for lingua in ${LINGUAS}; do
@@ -152,7 +152,7 @@ src_compile() {
 
 	# If use doc, generate all documentation, otherwise just the
 	# man pages
-	use doc && emake -C doc || emake -C doc man
+	#use doc && emake -C doc || emake -C doc man
 }
 
 src_install() {
@@ -162,15 +162,15 @@ src_install() {
 	dodoc README HISTORY doc/{TODO,bug.template}
 
 	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+	#insinto /usr/share/postgresql-${SLOT}/man/
+	#doins -r doc/src/sgml/man{1,3,7}
+	#if ! use server; then
+	#	# Remove man pages for non-existent binaries
+	#	for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+	#		rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+	#	done
+	#fi
+	#docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
 
 	insinto /etc/postgresql-${SLOT}
 	newins src/bin/psql/psqlrc.sample psqlrc
@@ -181,13 +181,13 @@ src_install() {
 
 	use static-libs || find "${ED}" -name '*.a' -delete
 
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
+	#if use doc ; then
+	#	docinto html
+	#	dodoc doc/src/sgml/html/*
 
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
+	#	docinto sgml
+	#	dodoc doc/src/sgml/*.{sgml,dsl}
+	#fi
 
 	if use server; then
 		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \