gentoo auto-resync : 27:08:2024 - 12:00:02

6 files changed, 222 insertions, 9 deletions

diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 358ecdba5a3c..59362e8d5dc4 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -6,6 +6,8 @@ AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f
 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
@@ -13,7 +15,7 @@ DIST x265-3.6.tar.gz 1655889 BLAKE2B 2598421e2e21974998b0b20895dc7e12dbf6ebe1b6c
 DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
 EBUILD x265-3.5-r3.ebuild 6322 BLAKE2B ca7ca9bb3bc5b1b2b9cac87e66c3b9ac6274046f3d9de4bf482b3eb41cc298cb343540aecdd452f76e568adcd81ee448c500ff33b04bebe0538b1ff57ab97381 SHA512 34e8d843a8de25ea41752dc66df2663fb352405d8ea6206bd92d9e8bf6c32ffc567a5e4e06d7e6df589d5da9f6579c8a3e96a93a3d3865961e6f5c3de9958234
 EBUILD x265-3.5-r4.ebuild 6328 BLAKE2B 018ae5f029ced97cc842ab0909a4586ec71c9bd218b08476161468e347694315f186752cc89aa50aae11d3de182b55c7f13b8c9594a3fe2d123812a0a0e7e994 SHA512 649eddcc4c087a23160c2ecbfc305c62010fc5b72a31f82c2f772dfa73b999db93bf791410df78ff843f15f1da9ad4aefa4a830b88989fa8681095291f7ee168
-EBUILD x265-3.5-r5.ebuild 5137 BLAKE2B b57ffbaf26fd9ff55c278d2d13f18120dfc760b9be4d943a35e96e898ebceb471fe63c88f18e9b410c77c849d1fde1cbc9f101d3b030eec41bff4fbdcce6a61e SHA512 bb52e246492bd6ce050716ca5ff73e7865f319f08367068dd932a937a4ed298d008dfd7a34796ce8fb085ce7e57e58c19fed72b09dcd50b02a0addfdac8d1e8d
-EBUILD x265-3.6.ebuild 5164 BLAKE2B 440ae0712a1d9d477b9b1cf3e8441ee6d9cf9724ba8bfc2a0cfe26635fbb1fdb8187a1478239bbff32aed5efa1b96e3b279903c8c0bed9099aa5ebf25602420f SHA512 c92b945df6cc74ca3d02965064ab763ca2cfa6e88e292520e49e3c4153b6b176a2deda8336b4dfa6bb2b6705fea628b545a752f540af5493de36e4f3ab58cdd7
-EBUILD x265-9999.ebuild 5161 BLAKE2B 6a6c948ac735944fd928aa0da10cd592530b3c3326970dffe0e166e48f65de18e852660954962ae2037d755d895967fe268541eaa3622b84a0a91c7c1b85de18 SHA512 9967cce944d9e7746ef5882c20cfbaf51eca203d932e34a53042fe5481dbd55d93fa4cd09eba5277a0e308b977ba9238f60d07bda6b55d2d22c3cf5c55bdffc1
+EBUILD x265-3.5-r5.ebuild 5343 BLAKE2B eefbad58d102fec9ec5bfbecf424e7f3967715ef99b11a321b0cc80e9cabc02bd76d0ac5ce7ef2f6d8d4835287daafedba19e6131d5c38c1e694e933e15d20b2 SHA512 c5ccc95c29718659381d2855a0f3d9f28ef60a92e34bfb03cb52dddc9c9aabb4d0b9c4d0dc4251d59b7beb20ba93ab5aa128311c1d9034692111760e3c9ae229
+EBUILD x265-3.6.ebuild 5370 BLAKE2B 32fc65ba64535edf20e10110e4a6a3700936099a128caeea21ec4628fd6cb2c8cd628cb71a51ed547d1a068482c4d1a96bc3afa1b5f09e4bdb14dc83f0e1b779 SHA512 d6ac971603f4e82bca3cf9a6d90e4fa8976b6ade8833a98a03340e94b6b24a7f82cc6270106d546827bd7e3949608d0f9fcfabd59a51fbdeb620126b948cc8ca
+EBUILD x265-9999.ebuild 5367 BLAKE2B aa9a9cedfa72fc0caa242801a7378ea8a8c5afaaa51ff38a33c29ead943bc165f02e6074bb19581d00eedf49416f208e39edd0623196a58f9ee1752e1ad8aba3 SHA512 5ffe18314c90f517529c338c5e7b575a0371cbb2e59f75890cc38846516a13fca8c847106267ee66b95fe460bfa73eef961c8d488bd12bb5039c7b8232742141
 MISC metadata.xml 541 BLAKE2B 4509c092fe30d689d4f18d077d429bbd0c05f704fa2027dd400d3686a35f1d39631480abce2357cb7cec8f468b2eeed2a08156f8830938171016c6e77d3f2a73 SHA512 d80b09241e28cffdab81e21f40d81f4da4814574f3e56109684f654887767a671c111bdc9f44566b0e7ab7c8cca949a5718d8afb20f0a43e73c2e6b878bd28a7
diff --git a/media-libs/x265/files/x265-3.6-cmake-cleanup.patch b/media-libs/x265/files/x265-3.6-cmake-cleanup.patch
new file mode 100644
index 000000000000..7cbe3722f1e0
--- /dev/null
+++ b/media-libs/x265/files/x265-3.6-cmake-cleanup.patch
@@ -0,0 +1,47 @@
+From d6b009be2aa62c679ea994125c02310d4b8d401b Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:23:49 +0200
+Subject: [PATCH 1/2] cmake: cleanup old policies
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,18 +6,9 @@ if(NOT CMAKE_BUILD_TYPE)
+         FORCE)
+ endif()
+ message(STATUS "cmake version ${CMAKE_VERSION}")
+-if(POLICY CMP0025)
+-    cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
+-endif()
+-if(POLICY CMP0042)
+-    cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
+-endif()
+-if(POLICY CMP0054)
+-    cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
+-endif()
+ 
++cmake_minimum_required (VERSION 3.28) # OBJECT libraries require 2.8.8
+ project (x265)
+-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
+ include(CheckSymbolExists)
+
+From 701cc9679e9453cc94afac7904657262109e56b5 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:23:59 +0200
+Subject: [PATCH 2/2] cmake: fix nasm warning
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/cmake/FindNasm.cmake
++++ b/cmake/FindNasm.cmake
+@@ -20,6 +20,6 @@ if(NASM_EXECUTABLE)
+ endif()
+ 
+ # Provide standardized success/failure messages
+-find_package_handle_standard_args(nasm
++find_package_handle_standard_args(Nasm
+     REQUIRED_VARS NASM_EXECUTABLE
+     VERSION_VAR NASM_VERSION_STRING)
diff --git a/media-libs/x265/files/x265-3.6-code-cleanup.patch b/media-libs/x265/files/x265-3.6-code-cleanup.patch
new file mode 100644
index 000000000000..dbea7ef6c1ff
--- /dev/null
+++ b/media-libs/x265/files/x265-3.6-code-cleanup.patch
@@ -0,0 +1,140 @@
+From bca0b4b72977683794d441e57adc8c279ff4bfca Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:25:35 +0200
+Subject: [PATCH 1/4] use boolean compare instead of bitwise
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/common/cudata.cpp b/common/cudata.cpp
+index 19281de..d5b295f 100644
+--- a/common/cudata.cpp
++++ b/common/cudata.cpp
+@@ -73,7 +73,7 @@ inline bool isEqualRow(int addrA, int addrB)
+ /* Check whether 2 addresses point to the same row or column */
+ inline bool isEqualRowOrCol(int addrA, int addrB)
+ {
+-    return isEqualCol(addrA, addrB) | isEqualRow(addrA, addrB);
++    return isEqualCol(addrA, addrB) || isEqualRow(addrA, addrB);
+ }
+ 
+ /* Check whether one address points to the first column */
+
+From da3eb3ea55be74e440b272e24d7d8e67cb7a76db Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:44:55 +0200
+Subject: [PATCH 2/4] fix variable shadowing
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/common/cudata.h b/common/cudata.h
+index 8397f05..7f132e6 100644
+--- a/common/cudata.h
++++ b/common/cudata.h
+@@ -48,7 +48,7 @@ enum PartSize
+     SIZE_2NxnD, // asymmetric motion partition, 2Nx(3N/2) + 2Nx( N/2)
+     SIZE_nLx2N, // asymmetric motion partition, ( N/2)x2N + (3N/2)x2N
+     SIZE_nRx2N, // asymmetric motion partition, (3N/2)x2N + ( N/2)x2N
+-    NUM_SIZES
++    PART_NUM_SIZES
+ };
+ 
+ enum PredMode
+
+From 4ec09af244e2cfe3dfb739d74af7640ac114e775 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:45:33 +0200
+Subject: [PATCH 3/4] register is a unused and reserved keyword in c++-17
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/common/md5.cpp b/common/md5.cpp
+index a9042f4..7e638e7 100644
+--- a/common/md5.cpp
++++ b/common/md5.cpp
+@@ -185,7 +185,10 @@ void MD5Final(MD5Context *ctx, uint8_t *digest)
+  */
+ void MD5Transform(uint32_t *buf, uint32_t *in)
+ {
+-    register uint32_t a, b, c, d;
++#if __cplusplus < 201703L
++    register
++#endif
++    uint32_t a, b, c, d;
+ 
+     a = buf[0];
+     b = buf[1];
+
+From 09379bbfe797e54f91ef5702c802f75aad604067 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Mon, 26 Aug 2024 14:26:55 +0200
+Subject: [PATCH 4/4] use std::abs instead of abs to avoid truncating values
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/common/pixel.cpp b/common/pixel.cpp
+index 3cd074c..62410f3 100644
+--- a/common/pixel.cpp
++++ b/common/pixel.cpp
+@@ -124,10 +124,10 @@ int ads_x4(int encDC[4], uint32_t *sums, int delta, uint16_t *costMvX, int16_t *
+     int nmv = 0;
+     for (int16_t i = 0; i < width; i++, sums++)
+     {
+-        int ads = abs(encDC[0] - long(sums[0]))
+-            + abs(encDC[1] - long(sums[lx >> 1]))
+-            + abs(encDC[2] - long(sums[delta]))
+-            + abs(encDC[3] - long(sums[delta + (lx >> 1)]))
++        int ads = std::abs(encDC[0] - long(sums[0]))
++            + std::abs(encDC[1] - long(sums[lx >> 1]))
++            + std::abs(encDC[2] - long(sums[delta]))
++            + std::abs(encDC[3] - long(sums[delta + (lx >> 1)]))
+             + costMvX[i];
+         if (ads < thresh)
+             mvs[nmv++] = i;
+@@ -141,8 +141,8 @@ int ads_x2(int encDC[2], uint32_t *sums, int delta, uint16_t *costMvX, int16_t *
+     int nmv = 0;
+     for (int16_t i = 0; i < width; i++, sums++)
+     {
+-        int ads = abs(encDC[0] - long(sums[0]))
+-            + abs(encDC[1] - long(sums[delta]))
++        int ads = std::abs(encDC[0] - long(sums[0]))
++            + std::abs(encDC[1] - long(sums[delta]))
+             + costMvX[i];
+         if (ads < thresh)
+             mvs[nmv++] = i;
+@@ -156,7 +156,7 @@ int ads_x1(int encDC[1], uint32_t *sums, int, uint16_t *costMvX, int16_t *mvs, i
+     int nmv = 0;
+     for (int16_t i = 0; i < width; i++, sums++)
+     {
+-        int ads = abs(encDC[0] - long(sums[0]))
++        int ads = std::abs(encDC[0] - long(sums[0]))
+             + costMvX[i];
+         if (ads < thresh)
+             mvs[nmv++] = i;
+diff --git a/encoder/analysis.cpp b/encoder/analysis.cpp
+index aabf386..127032d 100644
+--- a/encoder/analysis.cpp
++++ b/encoder/analysis.cpp
+@@ -2692,8 +2692,8 @@ void Analysis::classifyCU(const CUData& ctu, const CUGeom& cuGeom, const Mode& b
+             {
+                 offset = (depth * X265_REFINE_INTER_LEVELS) + i;
+                 /* Calculate distance values */
+-                diffRefine[i] = abs((int64_t)(trainData.cuVariance - m_frame->m_classifyVariance[offset]));
+-                diffRefineRd[i] = abs((int64_t)(cuCost - m_frame->m_classifyRd[offset]));
++                diffRefine[i] = std::abs((int64_t)(trainData.cuVariance - m_frame->m_classifyVariance[offset]));
++                diffRefineRd[i] = std::abs((int64_t)(cuCost - m_frame->m_classifyRd[offset]));
+ 
+                 /* Calculate prior probability - ranges between 0 and 1 */
+                 if (trainingCount)
+diff --git a/encoder/ratecontrol.cpp b/encoder/ratecontrol.cpp
+index 9f2b8d9..7732ccd 100644
+--- a/encoder/ratecontrol.cpp
++++ b/encoder/ratecontrol.cpp
+@@ -1891,7 +1891,7 @@ double RateControl::tuneQScaleForGrain(double rcOverflow)
+     int newQp = rcOverflow > 1.1 ? curQp + 2 : rcOverflow > 1 ? curQp + 1 : curQp - 1 ;
+     double projectedBitrate =  int(m_fps + 0.5) * m_qpToEncodedBits[newQp];
+     if (curBitrate > 0 && projectedBitrate > 0)
+-        q =  abs(projectedBitrate - m_bitrate) < abs (curBitrate - m_bitrate) ? x265_qp2qScale(newQp) : m_lastQScaleFor[P_SLICE];
++        q =  std::abs(projectedBitrate - m_bitrate) < std::abs (curBitrate - m_bitrate) ? x265_qp2qScale(newQp) : m_lastQScaleFor[P_SLICE];
+     else
+         q = rcOverflow > 1 ? qScaleAvg * qpstep : rcOverflow < 1 ?  qScaleAvg / qpstep : m_lastQScaleFor[P_SLICE];
+     return q;
diff --git a/media-libs/x265/x265-3.5-r5.ebuild b/media-libs/x265/x265-3.5-r5.ebuild
index ad78f487735a..c9db10613904 100644
--- a/media-libs/x265/x265-3.5-r5.ebuild
+++ b/media-libs/x265/x265-3.5-r5.ebuild
@@ -42,6 +42,8 @@ PATCHES=(
 	"${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() {
@@ -99,7 +101,6 @@ multilib_src_configure() {
 	filter-lto
 
 	local mycmakeargs=(
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_PIC=ON
 		-DENABLE_LIBNUMA="$(usex numa)"
 		-DENABLE_SVT_HEVC="no" # missing
@@ -107,6 +108,11 @@ multilib_src_configure() {
 		-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
@@ -114,7 +120,9 @@ multilib_src_configure() {
 	if [[ ${ABI} = x86 ]] || [[ ${ABI} = x32 ]] || [[ ${ABI} = arm ]] ; then
 		mycmakeargs+=(
 			-DENABLE_ASSEMBLY=OFF
-			-DENABLE_TESTS="no" #728748
+			# ENABLE_TESTS requires ENABLE_ASSEMBLY=ON to be visible
+			# source/CMakeLists.txt:858
+			# -DENABLE_TESTS="no" #728748
 		)
 	else
 		mycmakeargs+=(
diff --git a/media-libs/x265/x265-3.6.ebuild b/media-libs/x265/x265-3.6.ebuild
index 064bd95be46a..ba013c73d378 100644
--- a/media-libs/x265/x265-3.6.ebuild
+++ b/media-libs/x265/x265-3.6.ebuild
@@ -42,6 +42,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.5-r5-cpp-std.patch"
 	"${FILESDIR}/${PN}-3.5-r5-gcc15.patch"
 	"${FILESDIR}/${PN}-3.6-test-ns_2.patch"
+	"${FILESDIR}/${PN}-3.6-cmake-cleanup.patch"
+	"${FILESDIR}/${PN}-3.6-code-cleanup.patch"
 )
 
 pkg_setup() {
@@ -99,7 +101,6 @@ multilib_src_configure() {
 	filter-lto
 
 	local mycmakeargs=(
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_PIC=ON
 		-DENABLE_LIBNUMA="$(usex numa)"
 		-DENABLE_SVT_HEVC="no" # missing
@@ -107,6 +108,11 @@ multilib_src_configure() {
 		-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
@@ -114,7 +120,9 @@ multilib_src_configure() {
 	if [[ ${ABI} = x86 ]] || [[ ${ABI} = x32 ]] || [[ ${ABI} = arm ]] ; then
 		mycmakeargs+=(
 			-DENABLE_ASSEMBLY=OFF
-			-DENABLE_TESTS="no" #728748
+			# ENABLE_TESTS requires ENABLE_ASSEMBLY=ON to be visible
+			# source/CMakeLists.txt:858
+			# -DENABLE_TESTS="no" #728748
 		)
 	else
 		mycmakeargs+=(
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 9e4c71595c06..bf2855a23f64 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -41,6 +41,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.5-r5-cpp-std.patch"
 	"${FILESDIR}/${PN}-3.5-r5-gcc15.patch"
 	"${FILESDIR}/${PN}-9999-test-ns.patch"
+	"${FILESDIR}/${PN}-3.6-cmake-cleanup.patch"
+	"${FILESDIR}/${PN}-3.6-code-cleanup.patch"
 )
 
 pkg_setup() {
@@ -98,7 +100,6 @@ multilib_src_configure() {
 	filter-lto
 
 	local mycmakeargs=(
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
 		-DENABLE_PIC=ON
 		-DENABLE_LIBNUMA="$(usex numa)"
 		-DENABLE_MULTIVIEW="yes"
@@ -107,6 +108,11 @@ multilib_src_configure() {
 		-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
@@ -114,7 +120,9 @@ multilib_src_configure() {
 	if [[ ${ABI} = x86 ]] || [[ ${ABI} = x32 ]] || [[ ${ABI} = arm ]] ; then
 		mycmakeargs+=(
 			-DENABLE_ASSEMBLY=OFF
-			-DENABLE_TESTS="no" #728748
+			# ENABLE_TESTS requires ENABLE_ASSEMBLY=ON to be visible
+			# source/CMakeLists.txt:858
+			# -DENABLE_TESTS="no" #728748
 		)
 	else
 		mycmakeargs+=(