gentoo auto-resync : 12:11:2022 - 21:32:47

4 files changed, 2 insertions, 226 deletions

diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index b2e7a557d6ad..8db2434576fb 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,10 +1,7 @@
 AUX libaom-3.4.0-posix-c-source-ftello.patch 429 BLAKE2B 3e6ff2b95dbf39d2d90a46c9189abf160d3460e247446db4ad0e534bde7f382aeaa4e1457c0a4ddb7cf3c9666fd173efa1955a22fc4d3708a93dcd6b7c160f07 SHA512 30cc17c38219e81f92f1f034786d5d4096a0e657c86dfe581f84d18fc201a0e34bd331e98271f92c07e5dc49740e164a983b3316fc57599b98aea2615f7cf107
-DIST libaom-3.3.0.tar.gz 4768475 BLAKE2B 22060694019bcd925cb38c365063b8f2be60aed4cc6f9b0aa95cf8b4c4c5b40f5c603359d8c0728c5650fe9f7eea7573b8fd4a93975481c67409b201b4c48428 SHA512 9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
 DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478
 DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
-EBUILD libaom-3.3.0.ebuild 3231 BLAKE2B 3ad7ddf62b2aad9be9401ac792241cc162be618d8f1c4a35e015479f5736a6970ae48b99ab2e950a890f5bddb6f44ee50edf421e46f8c072ccd82a0bf6d5dbb3 SHA512 aba993a08e60d01e6d904ba4103a761d6dcaf9290f6af726c4c0dc98eeb0644a1cd2167ade6357b0382f5629b7065d595b5bd634705fec89bf7330f364132f0e
-EBUILD libaom-3.4.0-r1.ebuild 3320 BLAKE2B 67bb1e13449421ebef4f28456c8095c3765e3b24b0a2c8d884055447251f2568d7a310b9142ee45d9f0fcf41c3b190510053faf2c17948d41c7964eb465e0d24 SHA512 388d0ddbc9538c070a6fd5280644865b452f32926a2cba8012a16ea8cf0a962419edba5642811176633c55c3a98032e2b5e9ebeee4611e95d09fe55c4427dde4
-EBUILD libaom-3.4.0.ebuild 3249 BLAKE2B f4f278e68c492fb87625ddff065cfe0096dc60473069fcb164a824eaaa07fc0d20e2256d5a5fafc3abad17fdef2ce2b08a956cc4e5d8c97d1b29e6f137f56356 SHA512 f96e63a0c1d0521d43bd41a850d4decb9ffb71c562baf6ad0e8159b24330c979a638b52c6ee5100e99acca2df96e15c8c0cc6c3f8252fbc2ffe3964ea284cc18
+EBUILD libaom-3.4.0.ebuild 3246 BLAKE2B a7c3b90d137417f62c0673f1e373cd10cdea97635013482b5903e474186b676c8a7921682112e30b9210c4d0c00e9ac44fd8a3261c478da461a17bdabd710410 SHA512 ccd77bed1e72cf12031b5c437df79a5ee1f81c364d00358301e15a8b17a5b5ab1a6e3fa65c9223cbdc3ac68db2ee6163b0b154a3929e0369cdfb1b4d684c04c9
 EBUILD libaom-3.5.0.ebuild 3320 BLAKE2B 67bb1e13449421ebef4f28456c8095c3765e3b24b0a2c8d884055447251f2568d7a310b9142ee45d9f0fcf41c3b190510053faf2c17948d41c7964eb465e0d24 SHA512 388d0ddbc9538c070a6fd5280644865b452f32926a2cba8012a16ea8cf0a962419edba5642811176633c55c3a98032e2b5e9ebeee4611e95d09fe55c4427dde4
 EBUILD libaom-9999.ebuild 3320 BLAKE2B 67bb1e13449421ebef4f28456c8095c3765e3b24b0a2c8d884055447251f2568d7a310b9142ee45d9f0fcf41c3b190510053faf2c17948d41c7964eb465e0d24 SHA512 388d0ddbc9538c070a6fd5280644865b452f32926a2cba8012a16ea8cf0a962419edba5642811176633c55c3a98032e2b5e9ebeee4611e95d09fe55c4427dde4
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.3.0.ebuild b/media-libs/libaom/libaom-3.3.0.ebuild
deleted file mode 100644
index 3cceed6f3e43..000000000000
--- a/media-libs/libaom/libaom-3.3.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
-else
-	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
-
-LICENSE="BSD-2"
-SLOT="0/3"
-IUSE="doc +examples test"
-IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
-IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
-IUSE="${IUSE} cpu_flags_arm_neon"
-# Tests need more wiring up
-RESTRICT="!test? ( test ) test"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-BDEPEND="${PYTHON_DEPS}
-	abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	doc? ( app-doc/doxygen )
-"
-
-# the PATENTS file is required to be distributed with this package, bug #682214
-DOCS=( PATENTS )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CCACHE=OFF
-		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
-		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
-		-DENABLE_NASM=OFF
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TOOLS=ON
-		-DENABLE_WERROR=OFF
-
-		# Needs libjxl, currently unpackaged.
-		-DCONFIG_TUNE_BUTTERAUGLI=0
-
-		# neon support is assumed to be always enabled on arm64
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
-		# ENABLE_DSPR2 / ENABLE_MSA for mips
-		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
-		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
-		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
-		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
-		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
-		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
-		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
-	)
-
-	# For 32-bit multilib builds, force some intrinsics on to work around
-	# bug #816027. libaom seems to do runtime detection for some targets
-	# at least, so this isn't an issue.
-	if ! multilib_is_native_abi && use amd64 ; then
-		mycmakeargs+=(
-			-DENABLE_SSE3=ON
-			-DENABLE_SSSE3=ON
-		)
-	fi
-
-	# On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456
-	# Just force generic, given it's a niche situation.
-	# TODO: could try forcing armv7 or similar?
-	if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then
-		ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)"
-		mycmakeargs+=(
-			-DAOM_TARGET_CPU=generic
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	"${BUILD_DIR}"/test_libaom || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use doc ; then
-		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	fi
-
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libaom/libaom-3.4.0-r1.ebuild b/media-libs/libaom/libaom-3.4.0-r1.ebuild
deleted file mode 100644
index 7c969b44ed77..000000000000
--- a/media-libs/libaom/libaom-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
-else
-	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
-
-LICENSE="BSD-2"
-SLOT="0/3"
-IUSE="doc +examples test"
-IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
-IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
-IUSE="${IUSE} cpu_flags_arm_neon"
-# Tests need more wiring up
-RESTRICT="!test? ( test ) test"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/perl
-	abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	doc? ( app-doc/doxygen )
-"
-
-# The PATENTS file is required to be distributed with this package, bug #682214
-DOCS=( PATENTS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CCACHE=OFF
-		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
-		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
-		-DENABLE_NASM=OFF
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TOOLS=ON
-		-DENABLE_WERROR=OFF
-
-		# Needs libjxl, currently unpackaged.
-		-DCONFIG_TUNE_BUTTERAUGLI=0
-
-		# neon support is assumed to be always enabled on arm64
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
-		# ENABLE_DSPR2 / ENABLE_MSA for mips
-		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
-		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
-		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
-		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
-		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
-		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
-		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
-	)
-
-	# For 32-bit multilib builds, force some intrinsics on to work around
-	# bug #816027. libaom seems to do runtime detection for some targets
-	# at least, so this isn't an issue.
-	if ! multilib_is_native_abi && use amd64 ; then
-		mycmakeargs+=(
-			-DENABLE_SSE3=ON
-			-DENABLE_SSSE3=ON
-		)
-	fi
-
-	# On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456
-	# Just force generic, given it's a niche situation.
-	# TODO: could try forcing armv7 or similar?
-	if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then
-		ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)"
-		mycmakeargs+=(
-			-DAOM_TARGET_CPU=generic
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	"${BUILD_DIR}"/test_libaom || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use doc ; then
-		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	fi
-
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libaom/libaom-3.4.0.ebuild b/media-libs/libaom/libaom-3.4.0.ebuild
index cefd516e80a6..7fdfdd23f9a4 100644
--- a/media-libs/libaom/libaom-3.4.0.ebuild
+++ b/media-libs/libaom/libaom-3.4.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
 else
 	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"