Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libtheora/
Date: Tue, 30 Aug 2022 19:06:26
Message-Id: 1661886369.f7f0dc3aea8e956f0a806e54794f8570b5b48c6b.sam@gentoo
1 commit: f7f0dc3aea8e956f0a806e54794f8570b5b48c6b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 30 18:28:30 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 30 19:06:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f0dc3a
7
8 media-libs/libtheora: limit multilib features (drop doc)
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 media-libs/libtheora/libtheora-1.1.1-r2.ebuild | 35 +++++++++++---------------
13 1 file changed, 15 insertions(+), 20 deletions(-)
14
15 diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
16 index de4b8f692f7f..ff35ecea75a0 100644
17 --- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
18 +++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
19 @@ -56,19 +56,13 @@ multilib_src_configure() {
20 use doc || export ac_cv_prog_HAVE_DOXYGEN=false
21
22 local myconf=(
23 + # --disable-spec because LaTeX documentation has been prebuilt
24 --disable-spec
25 $(use_enable encode)
26 + $(multilib_native_use_enable examples)
27 $(use_enable static-libs static)
28 )
29
30 - if [[ "${ABI}" = "${DEFAULT_ABI}" ]] ; then
31 - myconf+=( $(use_enable examples) )
32 - else
33 - # those will be overwritten anyway
34 - myconf+=( --disable-examples )
35 - fi
36 -
37 - # --disable-spec because LaTeX documentation has been prebuilt
38 ECONF_SOURCE="${S}" econf "${myconf[@]}"
39 }
40
41 @@ -77,23 +71,24 @@ multilib_src_install() {
42 DESTDIR="${D}" \
43 docdir="${EPREFIX}"/usr/share/doc/${PF} \
44 install
45 +}
46 +
47 +multilib_src_install_all() {
48 + find "${ED}" -name '*.la' -delete || die
49 +
50 + einstalldocs
51
52 - if use examples && [[ "${ABI}" = "${DEFAULT_ABI}" ]]; then
53 + if use examples ; then
54 dobin examples/.libs/png2theora
55 for bin in dump_{psnr,video} {encoder,player}_example; do
56 newbin examples/.libs/${bin} theora_${bin}
57 done
58 - fi
59 -}
60 -
61 -multilib_src_install_all() {
62 - find "${D}" -name '*.la' -delete || die
63 - einstalldocs
64
65 - if use examples && use doc; then
66 - docinto examples
67 - dodoc examples/*.[ch]
68 - docompress -x /usr/share/doc/${PF}/examples
69 - docinto .
70 + if use doc ; then
71 + docinto examples
72 + dodoc examples/*.[ch]
73 + docompress -x /usr/share/doc/${PF}/examples
74 + docinto .
75 + fi
76 fi
77 }