gentoo auto-resync : 30:08:2022 - 22:49:20

2 files changed, 16 insertions, 21 deletions

diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 989563a24e84..24223fb9b140 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -3,5 +3,5 @@ AUX libtheora-1.1.1-fix-UB.patch 1499 BLAKE2B b2336cac99a2810d1ba5733e09dde80d42
 AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b42ef39f0f83d306666caf80808de023e2c4c77de51009c5dd668e230b169e5073539ee11e69e3e0201d6def1a4c7401d SHA512 5ed8c35eee6fb533fbbfc835fe62eddea18ddc956b453b1062a4d1534b6d69db2e70a03bdf3300a8b1a5832feef2c7536bfad4274e8e89769e07a8a3f635b1b5
 AUX libtheora-1.1.1-underlinking.patch 481 BLAKE2B 0939e1789eee97d999d229bb37620fe787b0da17253e15e6fbdf3109dd2c11cf201c6d77133529a779730acdd23806a52bb033d909509a6065ff6ac08db4b4d5 SHA512 9e8219ab32993470a4566b59b544eb04175577f4c82174924aa53b2ef61f0b94496a0de5afa630da291322fc6fbc640978152de8b61edd50231818838a330b0b
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
-EBUILD libtheora-1.1.1-r2.ebuild 2341 BLAKE2B 3087df83ece97b3f6a0303cbcaee9e162e6aea524f100e55ad53f0364362c7fce63a32f873ef131e6759abda915b99d9001924534a7093915ec4f176ccde8522 SHA512 b4e9aa2575245f095469a95c446281f5659118b4def06a2aa6714c42e15a93825041d06b57cffbf27d9f577a93aaedb6a894dddd704c22ac47e9f4b4c666a898
+EBUILD libtheora-1.1.1-r2.ebuild 2177 BLAKE2B 25681339b2bfee42d953c62318c8b6f8b07ac4767a45d851121560284a47b9063e65886c93a36f722eb84b0cac4b10cbe2c57d9bbd8cc4a77ab7ea53364b997c SHA512 1cf78379bd87d53934e393f417f26484f3a3df986ad4803a4aeaa64e9ff81795bacd3499f5d0b734caee9c412fb476e7c4cbaa2464a7f14340eb89ccab611148
 MISC metadata.xml 222 BLAKE2B 96fcf0d83a18e2c1f4611d550e7e2123a06fe8b3b2890cb5757284d8fc7d3bebdf1aeb4f82affbc7c51268749cac9fdcbf43888e3bec0e68e1b6548a3f6eca76 SHA512 c3657a6bf2503e6585ee53453bf0ba26b5eed2e894342087358b5f4306a960db915de61036b6c8dc57cdb7a7f3326d57ff3badf7b3ecefaa99291289a73997de
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
 }