Fix dodoc when html docs aren't being generated

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

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 926ae11c08e560360523fbd38e1b0921b80596cd..6b9ed29ead4a374acf2b5954e76fd777a6272c50 100644 (file)
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.43 2012/01/04 19:02:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.44 2012/01/04 21:16:26 lu_zero Exp $
+
+  04 Jan 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.8_beta1.ebuild,
+  libav-9999.ebuild:
+  Fix dodoc when html docs aren't being generated
 
   04 Jan 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.8_beta1.ebuild,
   libav-9999.ebuild:

diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index f4a7362a7c578399cff8104fff8a8b74003753df..903fd896ebacfd742de4da5c422dd8ee65f1b76c 100644 (file)
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -13,17 +13,17 @@ EBUILD libav-0.6.2.ebuild 7601 RMD160 8b2329b0cfd64a38f2e72885773d6b18688e5f5a S
 EBUILD libav-0.6.9999.ebuild 7550 RMD160 6672751ade7f462a9134c08e44188879067d043e SHA1 86380647dbeb7c60c98badf9b5b3b8432598fe6e SHA256 28971104a9a4974163372f8ac60de0cb888c9834cb34d5954d221fca78200b9f
 EBUILD libav-0.7.2.ebuild 7996 RMD160 81b96e3ca6176f648ac34630f21977508ce41de4 SHA1 f7bdeb001903628a815cadd900d58dbf0e378db3 SHA256 cf238120e21b69bb6519ccba0984c542778cb756d9e2e8edf27c2853a25e9aff
 EBUILD libav-0.7.9999.ebuild 7946 RMD160 24ff053d192305c3ba9ececf6d09c6f21404637e SHA1 7de4f420d1ef49f2afca974cfc203dca32c7ec2a SHA256 df71abb32ba6fa7861f7d6b7bb623488f32fec628fe9b5d4652dc72b34887395
-EBUILD libav-0.8_beta1.ebuild 8984 RMD160 b0a9657d11dec393a03d901c02d4aca813b59ea8 SHA1 964f4ba3b6aa5436bffd4b2ce9ea51b557258eba SHA256 9d85d7ecd5f0bf5cfac98b5923728014916a994d82b3637387ba36875403cbeb
+EBUILD libav-0.8_beta1.ebuild 9002 RMD160 dfb5d18675657ac2126187e2942c3b2028aa3b36 SHA1 90814b89162153e0d419e52d675b3cfd9b8259b8 SHA256 04625a2d86f66f83253d7b14f660aebc2801cd1484ce3e2c856ae2a69101f9a8
 EBUILD libav-0.8_pre20110818.ebuild 8362 RMD160 d85fee5ec8c1cd08449f9be2b22ccc961e6313ad SHA1 bf0859b5a7f9d0df163a4d9ec38b2494d082d329 SHA256 78390689a1a395a687f851de948db01ec559f755cf09b2a2733b3853e1496224
 EBUILD libav-0.8_pre20111116.ebuild 8975 RMD160 97bcdfd5b96ba70228f4a81fc21dc9cd15c5b4cf SHA1 6abcd889bf03caf5f65a75a010e38d45805999c6 SHA256 e6670215774617ba8a39ceabc38f6c5bffea3ce5fb48b4fd5d51a43393981095
 EBUILD libav-0.8_pre20111222.ebuild 8979 RMD160 fc889694924ed543248e5f80a64196a81b79c8e3 SHA1 250698887b2c579c52cd6c458b0acf2c74511d2e SHA256 2a335cd5b73f7e81e8d6d79ff9ca2cd367f0e2c99c25bf6a2142fb0dbb7c03fa
-EBUILD libav-9999.ebuild 8980 RMD160 fa64711ab6d73e3d34b515b31814fa9b1f511d22 SHA1 5898b94e699e599d8b83d72715ccd76473fb6221 SHA256 c18f6d87d15429191c8427768a8af64dc7b30d2b2ff288ee75b23ab8e36f46c4
-MISC ChangeLog 6779 RMD160 78197e3cc1944c746e7bc4cae2d7ac36f6bd79d1 SHA1 35701cedbf0499cb09e69b23cda7d4a8b6669135 SHA256 15f8f520760d92b57eebc5fe700fe6e8be2655a744758f6c7a409b0caf5c208d
+EBUILD libav-9999.ebuild 8998 RMD160 824d6dfa2c5685957aec5a970b8034d7d30057d2 SHA1 f5cf7a722fe7a7e9f0640a3f5d88d207fe7f299f SHA256 57fc948b603b00d1f092957745dce999542c752a56a52db3269c245efbf64cca
+MISC ChangeLog 6924 RMD160 9aff280a0bac51c82c6903dd76b1a11a13fdddd5 SHA1 afdceb095c4582c3dacd5e04625ad5b76194d0f7 SHA256 38d94ef52afbb65d1691da5efc63a8212763c916eba9bdb3d5365ae25829ea3d
 MISC metadata.xml 2904 RMD160 d3635d2f979c63f22eadd94ea30f1923e6f4f03b SHA1 5f8dc5b79546cb7554aa89c55bbb55aceabd0d15 SHA256 d85a42bbac6df6bb7d12e2a2820c854353e0eecb9bc3ba4725e847eaf92e7130
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8EolsACgkQYpJnKVbCxcykRAD+KJ/P8YbgBtr7gOYflK4sSxQj
-AlP8Qkt9wFOKFs4WV+sA/i4NyTg8z9UH0RraDDEiPrhbfxdiZ64wIfYbNfATsqBO
-=7BBB
+iF4EAREIAAYFAk8EwbwACgkQYpJnKVbCxcx4PgD+PsC+ej2LoORrbKDU9kZpFU9s
+M5PE6572tBi8SJ0O8l0A/j9v+uBiDngxZCCZhsLSjfsKs5K3yoaTdcwa3h9uyBbG
+=pDr3
 -----END PGP SIGNATURE-----

diff --git a/media-video/libav/libav-0.8_beta1.ebuild b/media-video/libav/libav-0.8_beta1.ebuild
index 41fea8f5bbe0dc575da028ad3c529a6e5460958a..774a4a996461a386f92571d66c15fb35403e854b 100644 (file)
--- a/media-video/libav/libav-0.8_beta1.ebuild
+++ b/media-video/libav/libav-0.8_beta1.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/media-video/libav/libav-0.8_beta1.ebuild,v 1.2 2012/01/04 19:02:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8_beta1.ebuild,v 1.3 2012/01/04 21:16:26 lu_zero Exp $
 
 EAPI=4
 
@@ -276,7 +276,8 @@ src_install() {
        emake DESTDIR="${D}" install install-man
 
        dodoc Changelog README INSTALL
-       dodoc doc/*.html doc/*.txt
+       dodoc doc/*.txt
+       use doc && dodoc doc/*.html
 
        if use qt-faststart; then
                dobin tools/qt-faststart

diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 1ac0a82dd13691a6c428e9a2116e3a3e119e0803..c6ca20da86e3d75307219b85d7ee611b2ac3fc9d 100644 (file)
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.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/media-video/libav/libav-9999.ebuild,v 1.24 2012/01/04 19:02:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.25 2012/01/04 21:16:26 lu_zero Exp $
 
 EAPI=4
 
@@ -276,7 +276,8 @@ src_install() {
        emake DESTDIR="${D}" install install-man
 
        dodoc Changelog README INSTALL
-       dodoc doc/*.html doc/*.txt
+       dodoc doc/*.txt
+       use doc && dodoc doc/*.html
 
        if use qt-faststart; then
                dobin tools/qt-faststart