public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libtheora/
Date: Tue, 30 Aug 2022 19:06:23 +0000 (UTC)	[thread overview]
Message-ID: <1661886369.f7f0dc3aea8e956f0a806e54794f8570b5b48c6b.sam@gentoo> (raw)

commit:     f7f0dc3aea8e956f0a806e54794f8570b5b48c6b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 18:28:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
 }


             reply	other threads:[~2022-08-30 19:06 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-30 19:06 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-19 10:38 [gentoo-commits] repo/gentoo:master commit in: media-libs/libtheora/ Sam James
2022-09-13 19:10 Sam James
2021-05-25 14:21 Yixun Lan
2021-01-06 14:27 Fabian Groffen
2020-12-27 17:47 Fabian Groffen
2018-12-13  9:57 Andreas Sturmlechner
2018-11-26  7:12 Sergei Trofimovich
2018-11-18 11:58 Mikle Kolyada
2018-10-13  6:56 Tobias Klausmann
2018-10-08 15:30 Andreas Sturmlechner
2018-10-07 12:07 Mikle Kolyada
2018-10-06 22:08 Sergei Trofimovich
2018-10-06 16:48 Matt Turner
2018-10-05  4:10 Thomas Deutschmann
2018-10-04 22:36 Sergei Trofimovich
2017-08-31 12:37 Tim Harder
2017-08-31 12:37 Tim Harder
2017-06-16  9:36 Alexis Ballier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1661886369.f7f0dc3aea8e956f0a806e54794f8570b5b48c6b.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox