gentoo auto-resync : 29:12:2024 - 06:30:44

8 files changed, 2 insertions, 751 deletions

diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 0f7c4c7e3fcb..b1261009a2d5 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,21 +1,14 @@
-AUX arm-r1.patch 2252 BLAKE2B 86ea85441e4023cf415f57ea6b909e3a9d6c3cc4f35c1e402d4a84632f533e37b3ba8bea07af4cde0218c20c684d59cb4632de1cf73d6f2cc843e048c7a424a9 SHA512 387e8fd56fbc4d56765c0bcad2f5c5a1b43c4d3db51f81d010e0926932a58b16dcaae614e191efdfb0afedcf6ae5981966e8a94258fb0b22e85e003a1cea15ec
 AUX neon.patch 677 BLAKE2B 805177f9d3d3f703699adad93b0ca655065b9d093ecc3776600fa4eb3c565962beac47ebbeb35dcdf6fa3d0d19c734310b4032bcda62aeeea8ddc99debe901f1 SHA512 69e3d7c6d987ccbbaa7111eb8efc1e02c1e02096936a0eedfbe7e9e1c1377bed0f50f7b09aec0768e8de31251b8e3d2191aab56f19259c0e4aeda9684ab55bc6
 AUX test-ns.patch 13886 BLAKE2B acc90ce7878861ee0faf6e5a4081a63c9ace5153895a4f69d1ccdbcfeabb9fd782ab86841d98a05f0bc36566749368b111f00dad4b7fcab4b8fdd347c7fc1579 SHA512 fc9182128855babca12629188221e8b3bb5c7eb8148e83532d16a3e1ef0fcd211d1b55728ce10a510481cd7eb4f47918d644eb6d6b795969545b62a57307af59
 AUX tests.patch 650 BLAKE2B 21759b11966e12df1a72a1ed00935ff781ad8b912e734de65cf0872cf92400aef71d4aebbe067dd1059a1d445cd9819cef4dc4b1c7df63ca7b8e97b8e578045e SHA512 a4a3b69fa86e6910ff4f963b9667c8deaea4ff88f3396e8e426e61d036b12cbf550bff7867657da1ba98417f1ccae88db1887b94ea6271604060e01fb8698d79
-AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f05cf9c499412d491127c877c342b1900bb9d06d66126aca2f383da1a4986ce69670ebc392fec0fe9b59a9 SHA512 bb4ace2c4bc899a0ccdd17fb78e63980354f41ff0f201812d47c5df16b23fea6fcdbde086e737d0efd5d8cb8fa571a131c03433bec31999c71ff51bccd754950
 AUX x265-3.5-r5-cpp-std.patch 779 BLAKE2B 815de056af19c721d612fccf8bea233764bdd161d175c0d7f9b0591a91b6607a5e7556e70fe181d7ab02b4e5067b818fe7a8162c2c2ce5fd01779c8f1c641111 SHA512 2ce2c6fa598db565bd5a6acddd0ec9095b68fde28584a23c5a398a16b44a5514b6d4ec2f9b8e4ab9a871320c694f4723958eca55588d90b3fdb5a94244c08729
 AUX x265-3.5-r5-gcc15.patch 1187 BLAKE2B ff951ae974c7df6aaccbb8b0f937564b41b88bbe029a2b6d0e188911a3ce80276fa960d559c86c4d1762a93c448b1862b02e00b5247e7cec83531b5921b9700a SHA512 ed87e6919f0bcd6a719411716c4dbd0016e4d7c23beca4cf7d93d0beca4c7af275c8734e103098f7f358161917fed0a6a0d1301e1eb8de8744a8b4e6b288519f
-AUX x265-3.5-r5-test-ns_2.patch 521 BLAKE2B 987a20dd57642bf5003d138913e39a4efd0a1c3708ba186619777d8854964dcb8415a6fcefcaefe5f2a12741664cf852aea5181cc47179ae6bdb6268c477c1f0 SHA512 f03ed7f48df097ea4f8d92809a4eb68234cb62dc47b66e10616df6c8f6dea06a403bcedb47b54994d81563faa3b0b6a82bea6043dddbbdb75dd584924e90e900
 AUX x265-3.6-cmake-cleanup.patch 1551 BLAKE2B 86071cac1e63667812debbeaf3d8074d40359ba92282c48b72a83ccb286f03ddb7b5107f6d13c106102ea7ee067e4a0976c7ab2fa58e869711893efd55838d61 SHA512 43d4c8420e8722337b9787ad434f00747bb97d7fe71dfd4934e1a8b36525ee7cc96ba2dd1dde3b7621452a59b2db2dbcd887732c8bfd828449e48e955e9c7f9b
 AUX x265-3.6-code-cleanup.patch 5838 BLAKE2B e7c4507fccd66f8e964a321c41f5ca2f6a6f385898689f2432f42772f85000730f05caeb664f1f52fe8bde876414a7c9da2b4a641fc28001f2c65e1e28d281b5 SHA512 feeab88a3c41e01c5fa83a74936b0ea93b0787dd7a4ce3f3442a34c57b0faa0b1c70c4a2524ade06d2cc0d7c0bcdbfe0038f75283363998638b493f55cb4edae
 AUX x265-3.6-test-ns_2.patch 1060 BLAKE2B 19d59ef567fc67bdcab790a29567ddc16c861a5952af5cb32cfe40634920c6c3bbafb0730b5d012922e7dd15b57ad3aeff689a178ce35e46ea1619a4ceddff8d SHA512 aeea732684209e55155d012cf134badc455c598e4540384b765679e5dc91331ccfabd8b2f5b48c132390f103d774424fa547e146eb9e1f498581635b1da3b709
 AUX x265-9999-arm.patch 2115 BLAKE2B 92f2225fd23030220531e6bfda7a3d4ce197090a7b1d996fe5995885fe332352e3628ca3fe307d2ae7af2d0342b183c5bbe4337201c51fb4092e273eae2f1308 SHA512 602725dc487397466c48d4d0aa09d8d63b3519fc72cd9538e732c2c82f6f3fa9c959f6f29ff3f810fec82dbdf609d9fd37fe05dd67496fc4c8bbda5f87c9f165
 AUX x265-9999-test-ns.patch 15836 BLAKE2B 9dc3384f38654a49c0dc62273ed824b5a556494233d33cba0032e7949c38d095299d7e30fe47046a162ac07ec13cff3ea85322738396c2999f4d873813698f24 SHA512 ec4d47d6b2d7e4ffed3891476811955f4eec420563d02caec27138fb580f3d47173ab9be2be6ddee98eef07e9b878df8a9648e7ffbd4add397e5aaca6616c9a5
 DIST x265-3.6.tar.gz 1655889 BLAKE2B 2598421e2e21974998b0b20895dc7e12dbf6ebe1b6c23bb5a7710b575d3db773335cd1f0b3ef110b79cf4d6dd01e543e9807a0509963497edc25f617f80c29f3 SHA512 570429c3f0b560b2f946ac9baba97d66d7d6485e46eb695b17003b5913028f62d35822477633e911cd3ea60e6ce0ecc7d9d82de7d8257272f9ca7b43761438be
-DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
-EBUILD x265-3.5-r3.ebuild 6316 BLAKE2B 5b99f0ce346bb24e74e561ec7b135e10c32346121750bb27c3a93fa5e36dc182436fe44ec6c0838762690ebb4258876b0134db8788838872d21e1e7e9c2f8dee SHA512 898a05326c6b89dba113e55fa842e7dd830d13197dced98d7a0015a402132a9c1848106443cbc3e4b9ab26e5ad53e63dbb9ed4e4b199c963e9c1bdf7be134e1e
-EBUILD x265-3.5-r4.ebuild 6322 BLAKE2B c6adc976356fcf9cb3fdc62a6fbe59fe5685a105ea57f5a6267aee55d5ab5f06c43f7cdb29fdae7d2fefbe8b31407fbcb30c104a044473a11357a3a80ac3672e SHA512 8d443c96c79b9ca9737509f72839f2db02854f21f8391e9dd60a2c83eb967363bbe1953e2aa7ba4b9b675aa685c88abd2a84af0d99e461be7719c2e56a70f7b4
-EBUILD x265-3.5-r6.ebuild 5350 BLAKE2B 0b019e6c35b3e61990ee28bb19ea8a157b44531617d7e71e0f039a62a2dd24909bc3c640b554fb5e1433db3424e4b35eead1e2685ac606470a428bd460855541 SHA512 22816466595e1e5bbf4358ef62683cee064bbc4c6aa1f71c5d780f6e4b217a8b25c6a8c1b4732fdeba686c271272355a30746fc040404dfe896edc67840f190b
-EBUILD x265-3.6-r1.ebuild 5372 BLAKE2B c2331e50fe175f3c040cc45b2aa90afc4ee67877f771612d9d2a9b339fcc1405fa883ca94e8169b3770f1acd752353499cf2b8e238a2cc02de9114241461dc3e SHA512 b1976fbe14e2a6ba6f1811bfe67fc387a40918703164d845943f4fcafe28f88a8a5240d6604d49711a7e1fb876d1cb6a2448168ac8e09a0040ea825ffd54b620
+EBUILD x265-3.6-r1.ebuild 5371 BLAKE2B 0f9d6b08818586d444ec6ff955eae28df2d2006856b61571edc978f3c267d1e534702193cef6a242df1219678a11bf17e6c8ff5f1bb5421ee2d33438b2bca515 SHA512 167f77d47973c3be91eb6d3658985457a65742b31d6533a711cb5d8a26bb6bca3d957460091d76be22aefef16f075486a0906e67c65776bbb6baefa734db94fc
 EBUILD x265-9999.ebuild 5374 BLAKE2B 7134b8f29ccab6ddbeb933de089caade90f02c8affbe8c2f1c703ac1fee116824b5406b0b1bce7da93a995df8ee661340f69002b41e8b772cbbb613d7e976958 SHA512 c49a0acb6893a2f54e89fec2f8af26f63d79b6302697f8f85ce222b7749af17a5075f7bfcd72852288a41846281fe18802ceefb7330f5b2c5aa15ad34e4cb696
 MISC metadata.xml 541 BLAKE2B 4509c092fe30d689d4f18d077d429bbd0c05f704fa2027dd400d3686a35f1d39631480abce2357cb7cec8f468b2eeed2a08156f8830938171016c6e77d3f2a73 SHA512 d80b09241e28cffdab81e21f40d81f4da4814574f3e56109684f654887767a671c111bdc9f44566b0e7ab7c8cca949a5718d8afb20f0a43e73c2e6b878bd28a7
diff --git a/media-libs/x265/files/arm-r1.patch b/media-libs/x265/files/arm-r1.patch
deleted file mode 100644
index 69aa3036eff3..000000000000
--- a/media-libs/x265/files/arm-r1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-More aliases for ARM.
-Do not force CFLAGS for ARM.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
- # System architecture detection
- string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
- set(X86_ALIASES x86 i386 i686 x86_64 amd64)
--set(ARM_ALIASES armv6l armv7l aarch64)
-+set(ARM_ALIASES armv6l armv6l armv7l armv7a aarch64)
- list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
- list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
- set(POWER_ALIASES ppc64 ppc64le)
-@@ -239,11 +239,7 @@ if(GCC)
-         endif()
-     endif()
-     if(ARM AND CROSS_COMPILE_ARM)
--        if(ARM64)
--            set(ARM_ARGS -fPIC)
--        else()
--            set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
--        endif()
-+        set(ARM_ARGS -fPIC)
-         message(STATUS "cross compile arm")
-     elseif(ARM)
-         if(ARM64)
-@@ -252,10 +248,10 @@ if(GCC)
-         else()
-             find_package(Neon)
-             if(CPU_HAS_NEON)
--                set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
-+                set(ARM_ARGS -mfpu=neon -fPIC)
-                 add_definitions(-DHAVE_NEON)
-             else()
--                set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
-+	        set(ARM_ARGS -fPIC)
-             endif()
-         endif()
-     endif()
---- a/dynamicHDR10/CMakeLists.txt
-+++ b/dynamicHDR10/CMakeLists.txt
-@@ -43,14 +43,14 @@ if(GCC)
-         endif()
-     endif()
-     if(ARM AND CROSS_COMPILE_ARM)
--        set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
-+        set(ARM_ARGS -fPIC)
-     elseif(ARM)
-         find_package(Neon)
-         if(CPU_HAS_NEON)
--            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
-+            set(ARM_ARGS -fPIC)
-             add_definitions(-DHAVE_NEON)
-         else()
--            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
-+            set(ARM_ARGS -fPIC)
-         endif()
-     endif()
-     add_definitions(${ARM_ARGS})
-@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")
- option(ENABLE_SHARED "Build shared library" OFF)
- 
- install(FILES hdr10plus.h DESTINATION include)
--endif()
-\ No newline at end of file
-+endif()
-
diff --git a/media-libs/x265/files/x265-3.3-ppc64.patch b/media-libs/x265/files/x265-3.3-ppc64.patch
deleted file mode 100644
index 8e739e3fab1b..000000000000
--- a/media-libs/x265/files/x265-3.3-ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-More complete ppc64 matches.
-
-Index: x265_2.2/source/CMakeLists.txt
-===================================================================
---- old/CMakeLists.txt
-+++ new/CMakeLists.txt
-@@ -44,7 +44,7 @@ set(X86_ALIASES x86 i386 i686 x86_64 amd
- set(ARM_ALIASES armv6l armv6j armv7l armv7a)
- list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
- list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
--set(POWER_ALIASES ppc64 ppc64le)
-+set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le)
- list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
- if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
-     set(X86 1)
diff --git a/media-libs/x265/files/x265-3.5-r5-test-ns_2.patch b/media-libs/x265/files/x265-3.5-r5-test-ns_2.patch
deleted file mode 100644
index eec119f7f923..000000000000
--- a/media-libs/x265/files/x265-3.5-r5-test-ns_2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source.orig/encoder/encoder.cpp
-+++ source/encoder/encoder.cpp
-@@ -1592,7 +1592,7 @@ int Encoder::encode(const x265_picture*
-     if (m_exportedPic)
-     {
-         if (!m_param->bUseAnalysisFile && m_param->analysisSave)
--            x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
-+            PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData);
-         ATOMIC_DEC(&m_exportedPic->m_countRefEncoders);
-         m_exportedPic = NULL;
-         m_dpb->recycleUnreferenced();
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
deleted file mode 100644
index 7dae9a86bfa8..000000000000
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic multilib-minimal multibuild
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
-	S=${WORKDIR}/${P}/source
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/199"
-IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-BDEPEND="
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/arm-r1.patch"
-	"${FILESDIR}/neon.patch"
-	"${FILESDIR}/x265-3.3-ppc64.patch"
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/test-ns.patch"
-	"${FILESDIR}/${PN}-3.5-r5-test-ns_2.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
-	fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
-	local variants=""
-	use 12bit && variants+="main12 "
-	use 10bit && variants+="main10 "
-	variants+="main"
-	echo "${variants}"
-}
-
-x265_variant_src_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-
-	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
-
-	local mycmakeargs=( "${myabicmakeargs[@]}" )
-	case "${MULTIBUILD_VARIANT}" in
-		"main12")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DMAIN12=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 12bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main10")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DENABLE_HDR10_PLUS=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 10bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main")
-			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
-				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
-				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
-				local liblist="" v=
-				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
-					liblist+="libx265_${v}.a;"
-				done
-				mycmakeargs+=(
-					-DEXTRA_LIB="${liblist}"
-					-DEXTRA_LINK_FLAGS=-L.
-					-DLINKED_10BIT=$(usex 10bit)
-					-DLINKED_12BIT=$(usex 12bit)
-				)
-				if [[ ${ABI} = ppc* ]] ; then
-					# upstream uses mix of altivec + power8 vectors
-					# it's impossible to enable altivec without CPU_POWER8
-					# and it does not work on ppc32
-					# so we toggle both variables together
-					mycmakeargs+=(
-						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-					)
-				fi
-			fi
-			;;
-		*)
-			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
-	esac
-	cmake_src_configure
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/875854
-	# https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
-	filter-lto
-
-	local myabicmakeargs=(
-		-DENABLE_TESTS=$(usex test ON OFF)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DENABLE_PIC=ON
-		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DGIT_ARCHETYPE=1 #814116
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	# Unfortunately, the asm for x86/x32/arm isn't PIC-safe.
-	if [[ ${ABI} = x86 ]] ; then
-		# Bug #528202, bug #913412
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	elif [[ ${ABI} = arm ]] ; then
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	fi
-
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant cmake_src_compile
-}
-
-x265_variant_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
-		"${BUILD_DIR}/test/TestBench" || die
-	else
-		einfo "Unit tests check only assembly."
-		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
-		einfo "Skipping tests."
-	fi
-}
-
-multilib_src_test() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
-	# Install only "main" variant since the others are already linked into it.
-	local MULTIBUILD_VARIANTS=( "main" )
-	multibuild_foreach_variant cmake_src_install
-}
-
-multilib_src_install_all() {
-	dodoc -r "${S}/../doc/"*
-
-	# we don't install *.a files for all variants,
-	# so just delete these files instead of pretending
-	# real USE=static-libs support
-	find "${ED}" -name "*.a" -delete || die
-}
diff --git a/media-libs/x265/x265-3.5-r4.ebuild b/media-libs/x265/x265-3.5-r4.ebuild
deleted file mode 100644
index 762fbb6bd7f4..000000000000
--- a/media-libs/x265/x265-3.5-r4.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic multilib-minimal multibuild
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
-	S=${WORKDIR}/${P}/source
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/199"
-IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-BDEPEND="
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/arm-r1.patch"
-	"${FILESDIR}/neon.patch"
-	"${FILESDIR}/x265-3.3-ppc64.patch"
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/test-ns.patch"
-	"${FILESDIR}/${PN}-3.5-r5-test-ns_2.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
-	fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
-	local variants=""
-	use 12bit && variants+="main12 "
-	use 10bit && variants+="main10 "
-	variants+="main"
-	echo "${variants}"
-}
-
-x265_variant_src_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-
-	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
-
-	local mycmakeargs=( "${myabicmakeargs[@]}" )
-	case "${MULTIBUILD_VARIANT}" in
-		"main12")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DMAIN12=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 12bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main10")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DENABLE_HDR10_PLUS=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 10bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main")
-			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
-				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
-				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
-				local liblist="" v=
-				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
-					liblist+="libx265_${v}.a;"
-				done
-				mycmakeargs+=(
-					-DEXTRA_LIB="${liblist}"
-					-DEXTRA_LINK_FLAGS=-L.
-					-DLINKED_10BIT=$(usex 10bit)
-					-DLINKED_12BIT=$(usex 12bit)
-				)
-				if [[ ${ABI} = ppc* ]] ; then
-					# upstream uses mix of altivec + power8 vectors
-					# it's impossible to enable altivec without CPU_POWER8
-					# and it does not work on ppc32
-					# so we toggle both variables together
-					mycmakeargs+=(
-						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-					)
-				fi
-			fi
-			;;
-		*)
-			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
-	esac
-	cmake_src_configure
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/875854
-	# https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
-	filter-lto
-
-	local myabicmakeargs=(
-		-DENABLE_TESTS=$(usex test ON OFF)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DENABLE_PIC=ON
-		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DGIT_ARCHETYPE=1 #814116
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	# Unfortunately, the asm for x86/x32/arm isn't PIC-safe.
-	if [[ ${ABI} = x86 ]] ; then
-		# Bug #528202, bug #913412
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	elif [[ ${ABI} = arm ]] ; then
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	fi
-
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant cmake_src_compile
-}
-
-x265_variant_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
-		"${BUILD_DIR}/test/TestBench" || die
-	else
-		einfo "Unit tests check only assembly."
-		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
-		einfo "Skipping tests."
-	fi
-}
-
-multilib_src_test() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
-	# Install only "main" variant since the others are already linked into it.
-	local MULTIBUILD_VARIANTS=( "main" )
-	multibuild_foreach_variant cmake_src_install
-}
-
-multilib_src_install_all() {
-	dodoc -r "${S}/../doc/"*
-
-	# we don't install *.a files for all variants,
-	# so just delete these files instead of pretending
-	# real USE=static-libs support
-	find "${ED}" -name "*.a" -delete || die
-}
diff --git a/media-libs/x265/x265-3.5-r6.ebuild b/media-libs/x265/x265-3.5-r6.ebuild
deleted file mode 100644
index f38a58ad7981..000000000000
--- a/media-libs/x265/x265-3.5-r6.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic multilib-minimal multibuild
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="https://www.x265.org/ https://bitbucket.org/multicoreware/x265_git/"
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
-	MY_P="${PN}-${PV}"
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
-	MY_P="${PN}_${PV}"
-fi
-
-S="${WORKDIR}/${MY_P}/source"
-unset MY_P
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/199"
-IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-BDEPEND="
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/arm-r1.patch"
-	"${FILESDIR}/neon.patch"
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/test-ns.patch"
-	"${FILESDIR}/${PN}-3.5-r5-cpp-std.patch"
-	"${FILESDIR}/${PN}-3.5-r5-gcc15.patch"
-	"${FILESDIR}/${PN}-3.5-r5-test-ns_2.patch"
-	"${FILESDIR}/${PN}-3.6-cmake-cleanup.patch"
-	"${FILESDIR}/${PN}-3.6-code-cleanup.patch"
-)
-
-pkg_setup() {
-	variants=(
-		$(usev 12bit "main12")
-		$(usev 10bit "main10")
-	)
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it
-
-x265_variant_src_configure() {
-	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
-
-	local mycmakeargs=(
-		"${mycmakeargs[@]}"
-		-DHIGH_BIT_DEPTH=ON
-		-DEXPORT_C_API=OFF
-		-DENABLE_SHARED=OFF
-		-DENABLE_CLI=OFF
-	)
-
-	case "${MULTIBUILD_VARIANT}" in
-		"main12")
-			mycmakeargs+=(
-				-DMAIN12=ON
-			)
-			;;
-		"main10")
-			mycmakeargs+=(
-				-DENABLE_HDR10_PLUS=ON
-			)
-			;;
-		*)
-			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
-	esac
-	cmake_src_configure
-}
-
-multilib_src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/875854
-	# https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
-	filter-lto
-
-	local mycmakeargs=(
-		-DENABLE_PIC=ON
-		-DENABLE_LIBNUMA="$(usex numa)"
-		-DENABLE_SVT_HEVC="no" # missing
-		-DENABLE_VTUNE="no" # missing
-		-DGIT_ARCHETYPE=1 #814116
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	if ! multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DENABLE_CLI="no"
-		)
-	fi
-
-	# Unfortunately, the asm for x86/x32/arm isn't PIC-safe.
-	# x86 # Bug #528202, bug #913412
-	# x32 # bug #510890
-	if [[ ${ABI} = x86 ]] || [[ ${ABI} = x32 ]] || [[ ${ABI} = arm ]] ; then
-		mycmakeargs+=(
-			-DENABLE_ASSEMBLY=OFF
-			# ENABLE_TESTS requires ENABLE_ASSEMBLY=ON to be visible
-			# source/CMakeLists.txt:858
-			# -DENABLE_TESTS="no" #728748
-		)
-	else
-		mycmakeargs+=(
-			-DENABLE_TESTS="$(usex test)"
-		)
-	fi
-
-	if [[ ${ABI} = ppc* ]] ; then
-		# upstream uses mix of altivec + power8 vectors
-		# it's impossible to enable altivec without CPU_POWER8
-		# and it does not work on ppc32
-		# so we toggle both variables together
-		mycmakeargs+=(
-			-DCPU_POWER8="$(usex cpu_flags_ppc_vsx2)"
-			-DENABLE_ALTIVEC="$(usex cpu_flags_ppc_vsx2)"
-		)
-	fi
-
-	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
-	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
-		multibuild_foreach_variant x265_variant_src_configure
-
-		local liblist="" v=
-		for v in "${MULTIBUILD_VARIANTS[@]}" ; do
-			ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die
-			liblist+="libx265_${v}.a;"
-		done
-
-		mycmakeargs+=(
-			-DEXTRA_LIB="${liblist}"
-			-DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
-			-DLINKED_10BIT"=$(usex 10bit)"
-			-DLINKED_12BIT="$(usex 12bit)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
-	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
-		multibuild_foreach_variant cmake_src_compile
-	fi
-	cmake_src_compile
-}
-
-x265_variant_src_test() {
-	if [[ -x "${BUILD_DIR}/test/TestBench" ]] ; then
-		"${BUILD_DIR}/test/TestBench" || die
-	else
-		einfo "Unit tests check only assembly."
-		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
-		einfo "Skipping tests."
-	fi
-}
-
-multilib_src_test() {
-	local MULTIBUILD_VARIANTS=( "${variants[@]}" )
-	if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then
-		multibuild_foreach_variant x265_variant_src_test
-	fi
-	x265_variant_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	dodoc -r "${S}/../doc/"*
-
-	# we don't install *.a files for all variants,
-	# so just delete these files instead of pretending
-	# real USE=static-libs support
-	find "${ED}" -name "*.a" -delete || die
-}
diff --git a/media-libs/x265/x265-3.6-r1.ebuild b/media-libs/x265/x265-3.6-r1.ebuild
index b77af05462a2..f3f31fde6afc 100644
--- a/media-libs/x265/x265-3.6-r1.ebuild
+++ b/media-libs/x265/x265-3.6-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
 	MY_P="${PN}-${PV}"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
 	MY_P="${PN}_${PV}"
 fi