media-libs/libaom: Cleanup vulnerable 2.0.0, 2.0.1 and 3.1.2

Bug: https://bugs.gentoo.org/828112
Bug: https://bugs.gentoo.org/793932
Bug: https://bugs.gentoo.org/798126
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

9 files changed, 0 insertions, 442 deletions

diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index d0086444b94b..ed28b9d02ffc 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,4 +1 @@
-DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e729fb86380f2849b9bc80deee0251bf0a1149b548ebcb6642fa6edac13658f3e9c55d5f50c905fb733f8312431 SHA512 8e72e6d1c2fbae7fd8afaea6e7d086f2b533006934ffa8e126d4e769d3fc1aa92703ce7cae4c6dfa5dd8050b2afdbe2eba54fbf4f49c1d11ae41cc9913379607
-DIST libaom-2.0.1.tar.xz 2391756 BLAKE2B 46d5938c49e720ec773d55e461f38d86a4307358fe8d3d9cc0e16e63dd52e54d41163bd14a583c059c9881a6980b1a8c54323b499dbef8301e9fa90094cd0e02 SHA512 2e7e2a9f456d51641ded44cb3ff639982e996276157d34e6a38895a68b7a8f36e209bcbad3dea7a04bd5b45b8cfe8a3bf202ab630f93388ea6dfb516f13ed82f
-DIST libaom-3.1.2.tar.gz 4605501 BLAKE2B 7aac22da4103408f04a5c2e5d11a96d5a12651fd52e980b547427ebe3e235ba7c16700a131f4bb1b6b4e8a7f82f3175e526281eb593cf604ad491bd7fed0184e SHA512 466c2923115dcf0b0e29fafc8922a057814a84d0e61780ab9b6816bea31d0b741695326183884da5a04afffa5c925ff8ec8f6073e0a1e48ed4914066da975c3b
 DIST libaom-3.2.0.tar.gz 4717955 BLAKE2B b247c9092bf3b8080b33671f182b10eea060a2eafd94eeb1b92177d2c7b5c32de2342f9cf1c7e500b28fdac2b00ea8d43b1e56c9d1c8c0efe1bbc4e40285a52a SHA512 649bebde85c1a42b0c1c3d2d3b7110b999e3ee1c8e76595259e4e75a8b0f3918e23ff7c7e2c313da4d579882f55bf29765bb882570280adc81f3bc1e82f1ee19
diff --git a/media-libs/libaom/files/libaom-1.0.0-armv7l.patch b/media-libs/libaom/files/libaom-1.0.0-armv7l.patch
deleted file mode 100644
index 25fb9e0ff41c..000000000000
--- a/media-libs/libaom/files/libaom-1.0.0-armv7l.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Only in libaom.orig/build/cmake: .aom_configure.cmake.swp
-diff -ru libaom.orig/build/cmake/aom_configure.cmake libaom/build/cmake/aom_configure.cmake
---- libaom.orig/build/cmake/aom_configure.cmake	2018-06-13 21:22:56.295771914 +0200
-+++ libaom/build/cmake/aom_configure.cmake	2018-06-13 21:23:10.489772591 +0200
-@@ -16,7 +16,7 @@
- include(FindThreads)
- 
- set(AOM_SUPPORTED_CPU_TARGETS
--    "arm64 armv7 armv7s generic mips32 mips64 ppc x86 x86_64")
-+    "arm64 armv7 armv7l armv7s generic mips32 mips64 ppc x86 x86_64")
- 
- # Generate the user config settings. This must occur before include of
- # aom_config_defaults.cmake (because it turns every config variable into a cache
diff --git a/media-libs/libaom/files/libaom-1.0.0-update-vsx-ppc.patch b/media-libs/libaom/files/libaom-1.0.0-update-vsx-ppc.patch
deleted file mode 100644
index 7293c1a75e3a..000000000000
--- a/media-libs/libaom/files/libaom-1.0.0-update-vsx-ppc.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 2f8587a8b30cb2e4b45df36c6c8461a440a77336 Mon Sep 17 00:00:00 2001
-From: Luca Barbato <lu_zero@gentoo.org>
-Date: Sat, 23 Jun 2018 02:47:16 -0500
-Subject: [PATCH] Update the VSX support
-
-The CFL function signature takes a source and destination pointer.
-Also make the typedef compatible with clang.
-
-Change-Id: Ia633d10141ac0fd10af0a40b9878d18293463fb8
----
- av1/common/ppc/cfl_ppc.c | 85 ++++++++++++++++++++--------------------
- 1 file changed, 42 insertions(+), 43 deletions(-)
-
-diff --git a/av1/common/ppc/cfl_ppc.c b/av1/common/ppc/cfl_ppc.c
-index 58933a7b3..026a07809 100644
---- a/av1/common/ppc/cfl_ppc.c
-+++ b/av1/common/ppc/cfl_ppc.c
-@@ -24,19 +24,21 @@
- #define CFL_LINE_2 128
- #define CFL_LINE_3 192
- 
--typedef vector int8_t int8x16_t;
--typedef vector uint8_t uint8x16_t;
--typedef vector int16_t int16x8_t;
--typedef vector uint16_t uint16x8_t;
--typedef vector int32_t int32x4_t;
--typedef vector uint32_t uint32x4_t;
--typedef vector uint64_t uint64x2_t;
-+typedef vector signed char int8x16_t;          // NOLINT(runtime/int)
-+typedef vector unsigned char uint8x16_t;       // NOLINT(runtime/int)
-+typedef vector signed short int16x8_t;         // NOLINT(runtime/int)
-+typedef vector unsigned short uint16x8_t;      // NOLINT(runtime/int)
-+typedef vector signed int int32x4_t;           // NOLINT(runtime/int)
-+typedef vector unsigned int uint32x4_t;        // NOLINT(runtime/int)
-+typedef vector unsigned long long uint64x2_t;  // NOLINT(runtime/int)
- 
--static INLINE void subtract_average_vsx(int16_t *pred_buf, int width,
--                                        int height, int round_offset,
-+static INLINE void subtract_average_vsx(const uint16_t *src_ptr, int16_t *dst,
-+                                        int width, int height, int round_offset,
-                                         int num_pel_log2) {
--  const int16_t *end = pred_buf + height * CFL_BUF_LINE;
--  const int16_t *sum_buf = pred_buf;
-+  //  int16_t *dst = dst_ptr;
-+  const int16_t *dst_end = dst + height * CFL_BUF_LINE;
-+  const int16_t *sum_buf = (const int16_t *)src_ptr;
-+  const int16_t *end = sum_buf + height * CFL_BUF_LINE;
-   const uint32x4_t div_shift = vec_splats((uint32_t)num_pel_log2);
-   const uint8x16_t mask_64 = { 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-                                0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 };
-@@ -71,43 +73,40 @@ static INLINE void subtract_average_vsx(int16_t *pred_buf, int width,
-   const int32x4_t avg = vec_sr(sum_32x4, div_shift);
-   const int16x8_t vec_avg = vec_pack(avg, avg);
-   do {
--    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0, pred_buf), vec_avg), OFF_0, pred_buf);
--    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_1, pred_buf), vec_avg),
--               OFF_0 + CFL_BUF_LINE_BYTES, pred_buf);
--    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_2, pred_buf), vec_avg),
--               OFF_0 + CFL_LINE_2, pred_buf);
--    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_3, pred_buf), vec_avg),
--               OFF_0 + CFL_LINE_3, pred_buf);
-+    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0, dst), vec_avg), OFF_0, dst);
-+    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_1, dst), vec_avg),
-+               OFF_0 + CFL_BUF_LINE_BYTES, dst);
-+    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_2, dst), vec_avg),
-+               OFF_0 + CFL_LINE_2, dst);
-+    vec_vsx_st(vec_sub(vec_vsx_ld(OFF_0 + CFL_LINE_3, dst), vec_avg),
-+               OFF_0 + CFL_LINE_3, dst);
-     if (width >= 16) {
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1, pred_buf), vec_avg), OFF_1,
--                 pred_buf);
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_1, pred_buf), vec_avg),
--                 OFF_1 + CFL_LINE_1, pred_buf);
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_2, pred_buf), vec_avg),
--                 OFF_1 + CFL_LINE_2, pred_buf);
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_3, pred_buf), vec_avg),
--                 OFF_1 + CFL_LINE_3, pred_buf);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1, dst), vec_avg), OFF_1, dst);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_1, dst), vec_avg),
-+                 OFF_1 + CFL_LINE_1, dst);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_2, dst), vec_avg),
-+                 OFF_1 + CFL_LINE_2, dst);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_1 + CFL_LINE_3, dst), vec_avg),
-+                 OFF_1 + CFL_LINE_3, dst);
-     }
-     if (width == 32) {
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2, pred_buf), vec_avg), OFF_2,
--                 pred_buf);
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_1, pred_buf), vec_avg),
--                 OFF_2 + CFL_LINE_1, pred_buf);
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_2, pred_buf), vec_avg),
--                 OFF_2 + CFL_LINE_2, pred_buf);
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_3, pred_buf), vec_avg),
--                 OFF_2 + CFL_LINE_3, pred_buf);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2, dst), vec_avg), OFF_2, dst);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_1, dst), vec_avg),
-+                 OFF_2 + CFL_LINE_1, dst);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_2, dst), vec_avg),
-+                 OFF_2 + CFL_LINE_2, dst);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_2 + CFL_LINE_3, dst), vec_avg),
-+                 OFF_2 + CFL_LINE_3, dst);
- 
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3, pred_buf), vec_avg), OFF_3,
--                 pred_buf);
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_1, pred_buf), vec_avg),
--                 OFF_3 + CFL_LINE_1, pred_buf);
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_2, pred_buf), vec_avg),
--                 OFF_3 + CFL_LINE_2, pred_buf);
--      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_3, pred_buf), vec_avg),
--                 OFF_3 + CFL_LINE_3, pred_buf);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3, dst), vec_avg), OFF_3, dst);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_1, dst), vec_avg),
-+                 OFF_3 + CFL_LINE_1, dst);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_2, dst), vec_avg),
-+                 OFF_3 + CFL_LINE_2, dst);
-+      vec_vsx_st(vec_sub(vec_vsx_ld(OFF_3 + CFL_LINE_3, dst), vec_avg),
-+                 OFF_3 + CFL_LINE_3, dst);
-     }
--  } while ((pred_buf += CFL_BUF_LINE * 4) < end);
-+  } while ((dst += CFL_BUF_LINE * 4) < dst_end);
- }
- 
- // Declare wrappers for VSX sizes
--- 
-2.22.0
-
diff --git a/media-libs/libaom/files/libaom-1.0.0-version.patch b/media-libs/libaom/files/libaom-1.0.0-version.patch
deleted file mode 100644
index 6b2145d5ba9b..000000000000
--- a/media-libs/libaom/files/libaom-1.0.0-version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/cmake/version.cmake	2018-09-21 01:20:32.299238765 +0200
-+++ b/build/cmake/version.cmake	2018-09-21 01:21:01.473106534 +0200
-@@ -46,6 +46,7 @@
- endif()
- 
- if(NOT "${aom_version}" STREQUAL "${last_aom_version}")
-+  set(aom_version "v1.0.0")
- 
-   # TODO(tomfinegan): Perl dependency is unnecessary. CMake can do everything
-   # that is done by version.pl on its own (if a bit more verbose...).
diff --git a/media-libs/libaom/files/libdirpc2.patch b/media-libs/libaom/files/libdirpc2.patch
deleted file mode 100644
index cbd1b901fb30..000000000000
--- a/media-libs/libaom/files/libdirpc2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: libaom-9999/CMakeLists.txt
-===================================================================
---- libaom-9999.orig/CMakeLists.txt
-+++ libaom-9999/CMakeLists.txt
-@@ -234,8 +234,9 @@ if(NOT MSVC)
-                              -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-                              -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}
-                              -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}
--                             -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H} -P
--                             "${AOM_ROOT}/build/cmake/pkg_config.cmake"
-+                             -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H}
-+                             -DLIB_SUFFIX=${LIB_SUFFIX}
-+                             -P "${AOM_ROOT}/build/cmake/pkg_config.cmake"
-                      COMMENT "Writing aom.pc" VERBATIM)
-   add_dependencies(aom_pc aom_version)
- endif()
-Index: libaom-9999/build/cmake/pkg_config.cmake
-===================================================================
---- libaom-9999.orig/build/cmake/pkg_config.cmake
-+++ libaom-9999/build/cmake/pkg_config.cmake
-@@ -34,12 +34,13 @@ endif()
- 
- # Write pkg-config info.
- set(prefix "${CMAKE_INSTALL_PREFIX}")
-+set(libdir "lib${LIB_SUFFIX}")
- set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc")
- string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name)
- file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n")
- file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")
- file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}/bin\n")
--file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/lib\n")
-+file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/${libdir}\n")
- file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/include\n\n")
- file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n")
- file(APPEND "${pkgconfig_file}"
-@@ -49,10 +50,10 @@ file(APPEND "${pkgconfig_file}" "Require
- file(APPEND "${pkgconfig_file}" "Conflicts:\n")
- if(CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
-   file(APPEND "${pkgconfig_file}"
--              "Libs: -L\${prefix}/lib -l${pkg_name} -lm -lpthread\n")
-+              "Libs: -L\${prefix}/${libdir} -l${pkg_name} -lm -lpthread\n")
-   file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
- else()
--  file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
-+  file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/${libdir} -l${pkg_name} -lm\n")
-   file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
- endif()
- file(APPEND "${pkgconfig_file}" "Cflags: -I\${prefix}/include\n")
diff --git a/media-libs/libaom/files/pthread_lib2.patch b/media-libs/libaom/files/pthread_lib2.patch
deleted file mode 100644
index ec4b9107e996..000000000000
--- a/media-libs/libaom/files/pthread_lib2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libaom-9999/CMakeLists.txt
-===================================================================
---- libaom-9999.orig/CMakeLists.txt
-+++ libaom-9999/CMakeLists.txt
-@@ -575,6 +575,9 @@
-   include("${AOM_ROOT}/build/cmake/exports.cmake")
-   setup_exports_target()
-   set_target_properties(aom PROPERTIES SOVERSION 0)
-+  if(HAVE_PTHREAD_H AND CONFIG_MULTITHREAD)
-+    target_link_libraries(aom ${AOM_LIB_LINK_TYPE} Threads::Threads)
-+  endif()
- endif()
- 
- # Handle user supplied compile and link flags last to ensure they're obeyed.
diff --git a/media-libs/libaom/libaom-2.0.0.ebuild b/media-libs/libaom/libaom-2.0.0.ebuild
deleted file mode 100644
index 1218908d6994..000000000000
--- a/media-libs/libaom/libaom-2.0.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
-else
-	SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.gz"
-	S="${WORKDIR}"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-IUSE="doc examples"
-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"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-BDEPEND="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_DOCS=$(multilib_native_usex doc ON OFF)
-		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
-		-DENABLE_NASM=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_TOOLS=ON
-		-DENABLE_WERROR=OFF
-
-		# 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)
-	)
-	cmake_src_configure
-}
-
-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-2.0.1.ebuild b/media-libs/libaom/libaom-2.0.1.ebuild
deleted file mode 100644
index 52ec43347fc0..000000000000
--- a/media-libs/libaom/libaom-2.0.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
-else
-	SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	S="${WORKDIR}"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-IUSE="doc examples"
-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"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-BDEPEND="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_DOCS=$(multilib_native_usex doc ON OFF)
-		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
-		-DENABLE_NASM=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_TOOLS=ON
-		-DENABLE_WERROR=OFF
-
-		# 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)
-	)
-	cmake_src_configure
-}
-
-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.1.2.ebuild b/media-libs/libaom/libaom-3.1.2.ebuild
deleted file mode 100644
index 6a08183ea158..000000000000
--- a/media-libs/libaom/libaom-3.1.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-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"
-	S="${WORKDIR}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org"
-
-LICENSE="BSD-2"
-SLOT="0/3"
-IUSE="doc examples"
-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"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-BDEPEND="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_DOCS=$(multilib_native_usex doc ON OFF)
-		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
-		-DENABLE_NASM=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_TOOLS=ON
-		-DENABLE_WERROR=OFF
-
-		# 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)
-	)
-	cmake_src_configure
-}
-
-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
-}