Remove 0 byte manpages in src_prepare() for rst2man.py to generate them again wrt #434140 by José Romildo Malaquias

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

3 files changed, 22 insertions, 15 deletions

diff --git a/app-text/zathura/ChangeLog b/app-text/zathura/ChangeLog
index 7a9be31f5c8b..de29284403d1 100644
--- a/app-text/zathura/ChangeLog
+++ b/app-text/zathura/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/zathura
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/ChangeLog,v 1.38 2012/09/03 18:43:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/ChangeLog,v 1.39 2012/09/06 17:42:21 ssuominen Exp $
+
+  06 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> zathura-0.2.1.ebuild:
+  Remove 0 byte manpages in src_prepare() for rst2man.py to generate them again
+  wrt #434140 by José Romildo Malaquias
 
 *zathura-0.2.1 (03 Sep 2012)
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index a75adb207735..8b2ba359534a 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -4,17 +4,17 @@ Hash: SHA256
 DIST zathura-0.2.0.tar.gz 86951 SHA256 fd235a44c545e929a538ebb0a3f385349a190fd86c8b044a4328a3779d5c2d2f SHA512 a804b6a36a1a91cd799f7cf0c2e9ed581783be443175c0c46527e9719ce57eac125d991b8c20f421cbd6c7f49d3ef3f02d1ad56246c7641b47ec7016fb041914 WHIRLPOOL 893cdae9b1b498275e47016f5b95efd8d4b2d68eb89a63e4699e9e368c7f7b1f044d0bdf7200c2aa896ac558694a86ba4f77218d21ce61463dc2798e5d52a230
 DIST zathura-0.2.1.tar.gz 95179 SHA256 075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790 SHA512 fec1185cbbabdbad266c81074d372a35ed41bc1f6f14adb55107f0bf6cca15a10736afda2ad827db8766ab15e884e15f64aeeb40e31defe29b34061623e4464d WHIRLPOOL 1c55315cd11a486a29a45cdd708c7df7cb01bed1a37f89777b78be15617b57053399efe0ea1297c1db07500744c4771f9dfb0db8b0be7a95f5909aefb67606c1
 EBUILD zathura-0.2.0.ebuild 1052 SHA256 f29f649e4b9dfa27cf8eb3c982d6375d08d16999dafe39eddcbe3d54fdf3dd1c SHA512 11e37c2c19b931f04ed8a172eb9e69caeebe5bd789355e3a2770d4779e51fb4e5d59cf52fc34f1799ce351826d285e5b63176e540d41c8c272f4a6a054eae5ea WHIRLPOOL 47a46cb85331ce4664523a17b7f6252982ab2fc74d6525e28b02a052483b1314b9d2d436f918064617afc6617868dff6173fb70c0efd88c2a73bfc95beabef6d
-EBUILD zathura-0.2.1.ebuild 1150 SHA256 306d4df5fe2771ef8eefbcdbe67a11c0a0a6f1ecd21ac3a7193c67224c51cb13 SHA512 80f7e3f77a17794de09dfdb27434b2ea0d6098d4428980ba0cbda809cf50a4ab13c3e9749be79dc8d785b28735ef20dbf7f6f5b9e5ad63135a18a6269b27b2d9 WHIRLPOOL 076c56c4168aba44850b4d9abbdc284738e8f5121ca1717748c3834fc6dfbab4028a604f00d6fe17eb46fe2b30fdfc0fe08c5f6cfa29aa36168e69a37589c5a1
-MISC ChangeLog 5042 SHA256 87c42d031304f65472d1e83b082bc12a00f71db14217bd36ad981eb3e3a4e61f SHA512 e248ba613c38403391dd37fedc27a7463c1af937559a9dbeed6959e0d4e63195129184f361fe576599ed1c705fbe29e0b7f57df25307d7506c7c7cbb01e04961 WHIRLPOOL c9716666fa4452e5774cf5e7b07b264596a17a64ffb5fc8eca36454f6e8a39390dc56aa045cef4182e2302379471108aefe61f5df3467809f9dd94d974cf1b6c
+EBUILD zathura-0.2.1.ebuild 1172 SHA256 dd9c4d12820b0380fab68a23931be101a918c25a0b91b611eca497789867367b SHA512 782f7aa0cb8eedb876c87f1455e10b065c2eb0a08f385cf9fa70836a2bfe24bc9709fa1cd194c4c2771bcdcd2012491ecf7aa82dbf7559865faae48b58b53203 WHIRLPOOL f6a7774a040443a8955af9533854fad17feef1228b217537d3c60b627bad0c1271c3c77356a5475f650f954d30f784147d4e8134157bce842189b25a7f7ecca2
+MISC ChangeLog 5240 SHA256 36a598a1c11aa47b7bb49411800848f75e7305a7b705d7a6398ece8a3046ce92 SHA512 cd3baba7f60c9abb25ae58fd51d48e1345bbb35b7b428ffded95bbff6c2f9e328c79ba56e82da3be915997f549ef3ada686ebe3f751f729e69f91cc640729391 WHIRLPOOL 7611156f351f6b2a7fb5642509653db3326e1e7686d5441b00a456106b2d79b66f118f9b27489e5cb8fde6aa089462857cba2352f772e594f91336d9deaeb743
 MISC metadata.xml 342 SHA256 57da1012a80ac7b3f5844c593af2f963adb5318cffc057cbe243b4bc7bc356ce SHA512 8ec10499ea8c8792afe0bdfea65c61614ecce69b759ec43e65c2fc2d1577bb98a057bbb580edc3a658ecb477bb14a834a3f66aa757948759633033a20503bccd WHIRLPOOL 7572e8d401cc445f7325bcf28a49654edb3001e6a94f4c6631ee038789880dac8dab0e9d8f7d607ea0f43be2475ae3e2966959a49c9ade9441be7dd284fe7c5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQRPn+AAoJEEdUh39IaPFNOyAH/2BSZXXU45uMWkgQZeX3RS78
-Q3AOvw6FaIVBYgAsvDxmXyOH04NSoob+hHoN5mIdx+e6ZEDILnVV3kNWaLORF26Z
-k7wsi6pmWRpat6rgjAim/GCbbkwcn0lS0VJsQe70MuqowhMB0iHdxihN7Tx0oQm1
-BFGp/Q7YF1A09Q6FAZ/KOTpPl++s6dRhQ+o/0aXeZdzrf/Us9OJ6iqjWvF0PgB4Q
-DZ3mtrB8SvX7/E5elV2iI0V9jh48ujkBJ7Xc28sI55VCd+/wU40AVcV7tF0G8ux4
-FLUN8Vy7izB8s0CDB5/PpBNnjTikNFtOAg56bLW1VKogKOf+AidSo3Fa2NA3EUw=
-=JIRF
+iQEcBAEBCAAGBQJQSOA+AAoJEEdUh39IaPFNOp0H/iE02fU7osfw0KwS8YeTbmsB
+MJ/33jNupFeWqmENB5kV576+s2NsnpxYnfBRFQm4sW2pOzUHcyyX7UHMdQvNskPg
+6wB5rFDfEdybRmgsx/iw0SSbby9rgSeruLNM6ixyom6ts4cPwOclfMvNZZWSe7As
+6VcXirRtor4p3Gd/98cYKDEzSUStoK8ZLYyZ3IqBTkNBJ0/UECi6fCwvdyoMsY1L
+O6hfObEakBxXFagouGjdNdR0iVpEX5InER1UcDPViMFxKrnXUWj2RUqekGeozuQq
+u8tHWVIXfUOC5i7f4Cit1ua//jen+kB9jXuWg1dFzeiWzNqD2ryDeG/Z710U/Vo=
+=2mUq
 -----END PGP SIGNATURE-----
diff --git a/app-text/zathura/zathura-0.2.1.ebuild b/app-text/zathura/zathura-0.2.1.ebuild
index b414d3d4fb9e..7fdeec83c5c4 100644
--- a/app-text/zathura/zathura-0.2.1.ebuild
+++ b/app-text/zathura/zathura-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.2.1.ebuild,v 1.1 2012/09/03 18:43:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.2.1.ebuild,v 1.2 2012/09/06 17:42:21 ssuominen Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs
@@ -28,7 +28,7 @@ pkg_setup() {
 		ZATHURA_GTK_VERSION=2
 		WITH_SQLITE=$(usex sqlite 1 0)
 		LIBDIR='${PREFIX}'/$(get_libdir)
-		RSTTOMAN="$(type -P rst2man.py || echo true)"
+		RSTTOMAN="$(use doc && type -P rst2man.py)"
 		CC="$(tc-getCC)"
 		SFLAGS=""
 		VERBOSE=1
@@ -36,6 +36,12 @@ pkg_setup() {
 		)
 }
 
+src_prepare() {
+	# http://bugs.pwmt.org/msg816
+	# these are 0 byte files in dist tarball wrt #434140
+	rm *.{1,5}
+}
+
 src_compile() {
 	emake "${myzathuraconf[@]}"
 }
@@ -43,7 +49,4 @@ src_compile() {
 src_install() {
 	emake "${myzathuraconf[@]}" install
 	dodoc AUTHORS
-
-	# For rst2man.py and type -P hack in pkg_setup()
-	use doc || rm -rf "${ED}"/usr/share/man
 }