gentoo auto-resync : 10:06:2024 - 00:08:04

3 files changed, 50 insertions, 1 deletions

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index cdcfa7660f29..d16fce9db191 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -4,6 +4,7 @@ AUX mkvtoolnix-80.0.0-fix-qtmultimedia.patch 808 BLAKE2B 560d85d4ef07677adb63053
 AUX mkvtoolnix-80.0.0-no-uic-qtwidgets.patch 1035 BLAKE2B ff38fb84285d2f496ebe56325dbb3c0059c41ec32bfbf31c2f45659ee17a2b4d29391d5f7b258b2c8c7d2ffcd25644c32ba4f4c0261e51a83bd518cb967c99a1 SHA512 d0b8ebbb246049ec8749dc1dc14575e41f091c758d323a4b7597475eb6422a0886eb9e4408084d4e386467760903e5fc444685d490216cae6642634318a6eef2
 AUX mkvtoolnix-80.0.0-optional-qtdbus.patch 2501 BLAKE2B 9372aee680a4b20adef6e0b9fe444548b40573ee50a9d9ac7593407d1b9e69670fe3c16ecd2dc3d752154a5414f714f201d00a5a1b4a96065265bd553219c1ba SHA512 75eb5344605ef9c461df7e8d92ce5422d241efe01aa49d148cbb337ac29f589ce83e4e258918dd62246c84fead8d971770ca577d7ead47246b5a74b023503fd1
 AUX mkvtoolnix-83.0.0-fix-disable-gui.patch 4772 BLAKE2B 9f1244cd93e1292cc91903846af71dac9bf0a81f2eedebe8166cd3516208a815d7054bec4ad77fb51f4adfc71a6ae5d84eb2096f5dc2d2895adde93d900a5f93 SHA512 f8939d53940fe2cd4a3b4e80b2af111934a5cacb9f87e7d17be9c3a34ce4205ec02ac4a2003c1b55ba97d0c5da132cdd8e123105db02cdcf7dfc289fdbc97314
+AUX mkvtoolnix-84.0.0-fix-libcxx-c++20.patch 1459 BLAKE2B 0836cb4b8d3df74254257b977272d3e6cdc4e9c0b92a95b17b880b722b942ed1a9eafe2b9bb2b822a2a593264d76f8a0941331db08e3377359b357fd5dd7be4f SHA512 8de434ee48cc4021fdbf2b8edf644f85bcfebf1c76a5ebfe11f74c86eb0564f7820db183ea7f2f3103e84a84428694cc946c142da54a5ee86950841feaa7c89e
 DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0 SHA512 d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7
 DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5 SHA512 3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
 DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5 SHA512 e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d
@@ -12,6 +13,6 @@ DIST mkvtoolnix-84.0.tar.xz 11325260 BLAKE2B 147878e796c3ce9b3dc03e026eaeb45c219
 DIST mkvtoolnix-84.0.tar.xz.sig 833 BLAKE2B 903530d5968d9409a9b0fe1f236c254386a33ce1224b36d4e6f33d603851eec2ed27aac2923d59a3f2e729a48bd7724d8b697cbdff5213bec338417f1632ef29 SHA512 2338a226e0df776e1b3c78f93793900e62c391fd7fd4e56c317840f3d00fccc20d6ede3118ad47266b6772459d1959a221f2e475a4b96bd9c2d58caab3dae184
 EBUILD mkvtoolnix-81.0.ebuild 3617 BLAKE2B 68232e3bc6f600d7c33c8d9263193457d1eaa21c42c192c7c02749b0cf8db06b02fa7947b33319af7515af7822f4ddfa2d1adfe8a87c868a5e7c0b7d05d94de1 SHA512 f224a17d42ce74aae9ac6d8a9b7b1c8f38f34656707503d0c6f304fb67ca3ba3ce15d511f6fcab7a9a3038b7a156a6956c10a02e9d66b4fc1ba32fc30400028d
 EBUILD mkvtoolnix-83.0.ebuild 3139 BLAKE2B d4683b37ac50dc5a7d49eb340003529e435c51fdbe451b7705466b2c3db994754b48f082b84822bd1dbe73b4386d456196aa942bf926c9848b566ded7f026260 SHA512 37800d4858371d78a5a712c86abc5a4c642362efa48fb5dba1df68ef21d1bceb6545af4a8066f440429afd4b2317f2a78be089dd679aa0490123d01ff6dee46c
-EBUILD mkvtoolnix-84.0.ebuild 3122 BLAKE2B 08bd971c6a8eac6d5c328e864692176097b8c10fe00da64d2985626b2fa5eab4dc239f7042ebe152a8c566e047b217924935e2ec0d31a8ac3f6fe60beacd0649 SHA512 3adf6b36985c95a0112274021bb80419ac51a652aa6a6004e46357488bf34e3367849bc35e7ead16e78012b36632d4cfc6aaa0daff7456451628cc72f04fa68c
+EBUILD mkvtoolnix-84.0-r1.ebuild 3191 BLAKE2B cdbcd27d650f4e193a2fc76ff1e97f06be5b2ab49656332a235655465a87998546a160d18e35574c2814db700988951f6933cb8261752dc3b3f8c8b821e6024e SHA512 f5390992e4a381d5744f998fe624b633b2f141c7ee0d47aaced4d5903f1e33c958f8c33c0924106fa4975de03902071f53d816102a865028f9dddfea74947bfd
 EBUILD mkvtoolnix-9999.ebuild 3122 BLAKE2B 08bd971c6a8eac6d5c328e864692176097b8c10fe00da64d2985626b2fa5eab4dc239f7042ebe152a8c566e047b217924935e2ec0d31a8ac3f6fe60beacd0649 SHA512 3adf6b36985c95a0112274021bb80419ac51a652aa6a6004e46357488bf34e3367849bc35e7ead16e78012b36632d4cfc6aaa0daff7456451628cc72f04fa68c
 MISC metadata.xml 343 BLAKE2B b13d9c252a7ad2f27c772c43d3476eee87d9a173c8fcc04a3be28ca9cfb826e6f1de6eade1211b4ff5f4a379b20a0961667fc99eee91495589e0632ad94b4c0a SHA512 cb7fd77f65779de841da03890fd1d0031cea8a95153f116f01f1be7d8ef5b87bb760933fc74f64a1d49ce94bc897cde94fdd4f6b45c016c3c20b842097692dc0
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch b/media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch
new file mode 100644
index 000000000000..9a45aaa9cb9e
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch
@@ -0,0 +1,44 @@
+https://bugs.gentoo.org/933417
+https://gitlab.com/mbunkus/mkvtoolnix/-/issues/3695
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/7e1bea9527616ab6ab38425e7290579f05dd9bb1
+
+From 7e1bea9527616ab6ab38425e7290579f05dd9bb1 Mon Sep 17 00:00:00 2001
+From: Moritz Bunkus <mo@bunkus.online>
+Date: Tue, 30 Apr 2024 16:05:35 +0200
+Subject: [PATCH] replace removed `std::result_of` with `std::invoke_result`
+
+`std::result_of` was deprecated in C++17 & removed in C++20. A lot of
+compilers still make it available even when running in C++20 mode,
+while others don't.
+
+Therefore replace it with equivalent use of `std::invoke_result`.
+
+Fixes #3695.
+--- a/NEWS.md
++++ b/NEWS.md
+@@ -1,3 +1,11 @@
++# Version ?
++
++## Bug fixes
++
++* fixed compilation of `src/common/sorting.h` with certain compilers due to
++  the deprecation & removal of `std::result_of<>` in C++20. Fixes #3695.
++
++
+ # Version 84.0 "Sleeper" 2024-04-28
+ 
+ ## New features and enhancements
+--- a/src/common/sorting.h
++++ b/src/common/sorting.h
+@@ -27,7 +27,7 @@ namespace mtx::sort {
+ 
+ template<  typename Titer
+          , typename Tcriterion_maker
+-         , typename Tcriterion = typename std::result_of< Tcriterion_maker(typename std::iterator_traits<Titer>::value_type) >::type
++         , typename Tcriterion = typename std::invoke_result< Tcriterion_maker, typename std::iterator_traits<Titer>::value_type >::type
+          , typename Tcomparator = std::less<Tcriterion>
+          >
+ void
+-- 
+GitLab
+
diff --git a/media-video/mkvtoolnix/mkvtoolnix-84.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-84.0-r1.ebuild
index 6731cce63b2d..f5eaf0cade1f 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-84.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-84.0-r1.ebuild
@@ -73,6 +73,10 @@ if [[ ${PV} != *9999 ]] ; then
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch
+)
+
 src_prepare() {
 	default