Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
Date: Sat, 24 Apr 2010 13:56:26
Message-Id: 20100424135622.5A0212C04C@corvid.gentoo.org
1 aballier 10/04/24 13:56:22
2
3 Modified: ChangeLog mplayer-9999.ebuild
4 Log:
5 Build and install html documentation into the correct location, based on the LINGUAS variable, from on a patch by Andrew Savchenko in bug #299405
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.729 media-video/mplayer/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.729&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.729&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.728&r2=1.729
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
18 retrieving revision 1.728
19 retrieving revision 1.729
20 diff -u -r1.728 -r1.729
21 --- ChangeLog 24 Apr 2010 13:30:48 -0000 1.728
22 +++ ChangeLog 24 Apr 2010 13:56:22 -0000 1.729
23 @@ -1,6 +1,10 @@
24 # ChangeLog for media-video/mplayer
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.728 2010/04/24 13:30:48 aballier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.729 2010/04/24 13:56:22 aballier Exp $
28 +
29 + 24 Apr 2010; Alexis Ballier <aballier@g.o> mplayer-9999.ebuild:
30 + Build and install html documentation into the correct location, based on
31 + the LINGUAS variable, from on a patch by Andrew Savchenko in bug #299405
32
33 24 Apr 2010; Alexis Ballier <aballier@g.o> mplayer-9999.ebuild:
34 dont depend on cdparanoia if cdio is enabled, we wont use it; patch by
35
36
37
38 1.46 media-video/mplayer/mplayer-9999.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.46&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.46&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.45&r2=1.46
43
44 Index: mplayer-9999.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
47 retrieving revision 1.45
48 retrieving revision 1.46
49 diff -u -r1.45 -r1.46
50 --- mplayer-9999.ebuild 24 Apr 2010 13:30:48 -0000 1.45
51 +++ mplayer-9999.ebuild 24 Apr 2010 13:56:22 -0000 1.46
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.45 2010/04/24 13:30:48 aballier Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.46 2010/04/24 13:56:22 aballier Exp $
57
58 EAPI="2"
59
60 @@ -641,7 +641,24 @@
61 src_compile() {
62 base_src_compile
63 emake || die "Failed to build MPlayer!"
64 - use doc && make -C DOCS/xml html-chunked
65 + # Build only user-requested docs if they're available.
66 + if use doc ; then
67 + # select available languages from $LINGUAS
68 + LINGUAS=${LINGUAS/zh/zh_CN}
69 + local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
70 + local BUILT_DOCS=""
71 + for i in ${LINGUAS} ; do
72 + hasq $i ${ALLOWED_LINGUAS} && BUILT_DOCS+=" $i"
73 + done
74 + if [[ -z $BUILT_DOCS ]]
75 + then
76 + emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html docs"
77 + else
78 + for i in ${BUILT_DOCS} ; do
79 + emake -j1 -C DOCS/xml html-chunked-$i || die "Failed to generate html docs for $i"
80 + done
81 + fi
82 + fi
83 }
84
85 src_install() {
86 @@ -672,6 +689,7 @@
87 dodoc DOCS/tech/mirrors/* || die
88
89 if use doc; then
90 + docinto html/
91 dohtml -r "${S}"/DOCS/HTML/* || die
92 fi