Build and install html documentation into the correct location, based on the LINGUAS...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 36b786d15526d8134fdfbd7f150b1cfa2e6ff03c..1038ea4eb95ae57e2b87af84c067645a312912a4 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.728 2010/04/24 13:30:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.729 2010/04/24 13:56:22 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  Build and install html documentation into the correct location, based on
+  the LINGUAS variable, from on a patch by Andrew Savchenko in bug #299405
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   dont depend on cdparanoia if cdio is enabled, we wont use it; patch by

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index ea834ee86fe2ee33b31771e417b0b0f89399c73a..16354ceb6b742a535f7940117887638b67425b16 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -15,13 +15,13 @@ DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484
 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070
 EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19858 RMD160 5f77503100806ab35de8133fa488d965438b73f6 SHA1 2d24955936312f05e7c21e0121ca0140d2fc2f0e SHA256 1655621f8bd99ed913f5e3b3104645c2c4fb6644a0de4dcc26b28c71ef1b5fd8
-EBUILD mplayer-9999.ebuild 19987 RMD160 57d613e208e816929dc2a605c595a6d3ef5aa904 SHA1 e97ff1b515240881c610c85ca5dd311f36ad7aba SHA256 1eac50c316e1fe381829f44dee8a8e54951231b29b3d224242984da05f586b6b
-MISC ChangeLog 128702 RMD160 d1e0950525848f9f5a1ca0894a55adbd2be092ad SHA1 d53507d4240866cff3688a24c6caf0cc5171e800 SHA256 f38f610b790e03d8eb67315b7c2038509f73731a2d3971dd5f4b8e047e3b3de0
+EBUILD mplayer-9999.ebuild 20529 RMD160 c216e8f96c2e025c0e95de970992e2a853878207 SHA1 9b75e05fab80591355eca598870ccd5f5269e97f SHA256 838a59372d69f617c2c093951686b8b6b88bbecf525908eadd9a7d4d577dc263
+MISC ChangeLog 128926 RMD160 ecdff4869c4403f21951254db1b44faacb13d82a SHA1 7565d2b17606b3950af7adaa06abed2ad00007d0 SHA256 247b39664c7292a00fdd6a97d24ea119f76974bac886276642b2d1f70b383ad2
 MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvS8o4ACgkQvFcC4BYPU0rDswCgg+fasPSHEAKBjIKGfxQJg3DN
-UaEAoKXOiWsLzcRQUZX/XPSQaq36124c
-=jjV/
+iEYEARECAAYFAkvS+IwACgkQvFcC4BYPU0r8mQCdE0Fs5QFl4twMiqpZX8g3fhZ+
+uHsAn2ojgu/wCMD6RYrydjTKscJ5B5Pg
+=XFIr
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index c4b708cb6135b80837fd786940dee0a7035a5010..1a24ad9b600085da64886b1438688a032b7b0b71 100644 (file)
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.45 2010/04/24 13:30:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.46 2010/04/24 13:56:22 aballier Exp $
 
 EAPI="2"
 
@@ -641,7 +641,24 @@ src_configure() {
 src_compile() {
        base_src_compile
        emake || die "Failed to build MPlayer!"
-       use doc && make -C DOCS/xml html-chunked
+       # Build only user-requested docs if they're available.
+       if use doc ; then
+               # select available languages from $LINGUAS
+               LINGUAS=${LINGUAS/zh/zh_CN}
+               local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+               local BUILT_DOCS=""
+               for i in ${LINGUAS} ; do
+                       hasq $i ${ALLOWED_LINGUAS} && BUILT_DOCS+=" $i"
+               done
+               if [[ -z $BUILT_DOCS ]]
+               then 
+                       emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs"
+               else
+                       for i in ${BUILT_DOCS} ; do
+                               emake -j1 -C DOCS/xml html-chunked-$i || die "Failed to generate html docs for $i"
+                       done
+               fi
+       fi
 }
 
 src_install() {
@@ -672,6 +689,7 @@ src_install() {
        dodoc DOCS/tech/mirrors/* || die
 
        if use doc; then
+               docinto html/
                dohtml -r "${S}"/DOCS/HTML/* || die
        fi