From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D9BF158094 for ; Tue, 30 Aug 2022 19:06:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F935E0946; Tue, 30 Aug 2022 19:06:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54DB0E0946 for ; Tue, 30 Aug 2022 19:06:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 60FEC341250 for ; Tue, 30 Aug 2022 19:06:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D7E05A4 for ; Tue, 30 Aug 2022 19:06:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661886369.f7f0dc3aea8e956f0a806e54794f8570b5b48c6b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libtheora/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libtheora/libtheora-1.1.1-r2.ebuild X-VCS-Directories: media-libs/libtheora/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f7f0dc3aea8e956f0a806e54794f8570b5b48c6b X-VCS-Branch: master Date: Tue, 30 Aug 2022 19:06:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3c48f557-b9fb-4f49-8f23-0a8b0f20d4d1 X-Archives-Hash: 024412ec8f77d8ad240e9d0d7fb7a508 commit: f7f0dc3aea8e956f0a806e54794f8570b5b48c6b Author: Sam James gentoo org> AuthorDate: Tue Aug 30 18:28:30 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Aug 30 19:06:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f0dc3a media-libs/libtheora: limit multilib features (drop doc) Signed-off-by: Sam James gentoo.org> media-libs/libtheora/libtheora-1.1.1-r2.ebuild | 35 +++++++++++--------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild index de4b8f692f7f..ff35ecea75a0 100644 --- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild +++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild @@ -56,19 +56,13 @@ multilib_src_configure() { use doc || export ac_cv_prog_HAVE_DOXYGEN=false local myconf=( + # --disable-spec because LaTeX documentation has been prebuilt --disable-spec $(use_enable encode) + $(multilib_native_use_enable examples) $(use_enable static-libs static) ) - if [[ "${ABI}" = "${DEFAULT_ABI}" ]] ; then - myconf+=( $(use_enable examples) ) - else - # those will be overwritten anyway - myconf+=( --disable-examples ) - fi - - # --disable-spec because LaTeX documentation has been prebuilt ECONF_SOURCE="${S}" econf "${myconf[@]}" } @@ -77,23 +71,24 @@ multilib_src_install() { DESTDIR="${D}" \ docdir="${EPREFIX}"/usr/share/doc/${PF} \ install +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete || die + + einstalldocs - if use examples && [[ "${ABI}" = "${DEFAULT_ABI}" ]]; then + if use examples ; then dobin examples/.libs/png2theora for bin in dump_{psnr,video} {encoder,player}_example; do newbin examples/.libs/${bin} theora_${bin} done - fi -} - -multilib_src_install_all() { - find "${D}" -name '*.la' -delete || die - einstalldocs - if use examples && use doc; then - docinto examples - dodoc examples/*.[ch] - docompress -x /usr/share/doc/${PF}/examples - docinto . + if use doc ; then + docinto examples + dodoc examples/*.[ch] + docompress -x /usr/share/doc/${PF}/examples + docinto . + fi fi }