gentoo auto-resync : 20:11:2024 - 03:02:59

4 files changed, 6 insertions, 53 deletions

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 0f39dd6bff70..3f7b322275fb 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,14 +1,13 @@
 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
 AUX mkvtoolnix-86.0-libfmt-11-fix.patch 726 BLAKE2B 0379ba93dfb9669123492335516a3618cb970ea1ed19234202be7a28aa6276b51f982c596319f921ec0476e7d25b8ff74d46247f21af00838eed2bde22f36ab3 SHA512 6085ce904bf2ecb4fd43e469778f634b8e609a4a0f2733477605ead9b275a12be0fc1204ec09b601b5efb4328d65790ec424c2a542e14c962172b43797fc821f
 DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5 SHA512 e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d
 DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0eeeef8fd05f37bcaf4f SHA512 6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7
-DIST mkvtoolnix-84.0.tar.xz 11325260 BLAKE2B 147878e796c3ce9b3dc03e026eaeb45c21946d0a80ff76d090a8a11a22e1e02fddfe158192df264c5a006ad9007a73d68ddd5c79f0ccd1d103e827e4d0123974 SHA512 3a73bb2497a227fd2e0a65d58e72bf479662828a7b4201b37b7bfdd7f88d294a6690aee024661d8b5615036f64a4ce1c2ba64d7b24ebd352f8f5ce3ffdac543a
-DIST mkvtoolnix-84.0.tar.xz.sig 833 BLAKE2B 903530d5968d9409a9b0fe1f236c254386a33ce1224b36d4e6f33d603851eec2ed27aac2923d59a3f2e729a48bd7724d8b697cbdff5213bec338417f1632ef29 SHA512 2338a226e0df776e1b3c78f93793900e62c391fd7fd4e56c317840f3d00fccc20d6ede3118ad47266b6772459d1959a221f2e475a4b96bd9c2d58caab3dae184
 DIST mkvtoolnix-86.0.tar.xz 11369476 BLAKE2B a18ed1534f693f98924bc5c4bb1d3acedd154dacede17691a88b1d1a14c99d5ba4bc5483060d67624e682058e8af1a91ea0f77b095f35af340dea84a441dedc1 SHA512 ca1009439d662f32c75ee915f89ed1ccf1475f84782a5da977521e1ab1a558400d844d689ba37d3e5bcc2cb0ec70d3fac5db5594d0088668dd0ba3ac759819c6
 DIST mkvtoolnix-86.0.tar.xz.sig 833 BLAKE2B d53e8f8198f5ce5faec0b6c991ecf64a43f42395182aa7ead970f17e56b01c986392922b052cc2ac5e380983b937345838a96cde84e575d72bfcff2dd3084b09 SHA512 19901f9f61e108b8c4db0dab833e0998ab2bdc227130fe6d1aea6b9f495e66aa796bd4d3f70f14dadc906226884f03aaca90e710233e58fb604f66b28fb4abee
-EBUILD mkvtoolnix-83.0.ebuild 3138 BLAKE2B 71c5d5528b5a6b1f4fa70e85e9cfe0c2aacb292f0d088d93cd6b441fa0b300e5eef9d8d4e9be0ab32d2004c8a046fb2ea8a398a9b2b77ae75f6471be20d6f997 SHA512 0323f6e04b0d32e9ba2bc9c0fef1dce65ab23b2cd6e959a3b4572aedcf3c1f42e3d8e2411891f96d7bf2c9eade8090caba095422be82326434937e3ee3d828df
-EBUILD mkvtoolnix-84.0-r1.ebuild 3191 BLAKE2B cdbcd27d650f4e193a2fc76ff1e97f06be5b2ab49656332a235655465a87998546a160d18e35574c2814db700988951f6933cb8261752dc3b3f8c8b821e6024e SHA512 f5390992e4a381d5744f998fe624b633b2f141c7ee0d47aaced4d5903f1e33c958f8c33c0924106fa4975de03902071f53d816102a865028f9dddfea74947bfd
+DIST mkvtoolnix-88.0.tar.xz 11241552 BLAKE2B 01edcfe995e75fa7cde1916eb37a5f75d9788d5e56ee7a07ca106d861cf2d297a7d72974b0b6f958fec175d3db675e9e852af9f50345ededcca403983dcffa85 SHA512 b1b08a42f55e841c618cbfe19f40310ea7c879d43a6a1db4152abfd5618deccc33332a73b1fc21757660891907b9eb12028b8c016134708f0464d5cc10a343c2
+DIST mkvtoolnix-88.0.tar.xz.sig 833 BLAKE2B b0acd58dbc4c937ec50477e2695c4df1e67d6b40e985d676be38eaaff513a4eed17b19c612892c39c613e3736f516074febd12f76087ade3078d1183b0a3bce1 SHA512 f8175019b12f5a7bf36cc69f806d3dfc18431945f50bd1c4be5e5c1422ea9e53ca8ca93a08a417cae97da163b622ed09e7490a80255fccece6a5cbd32efbfe96
+EBUILD mkvtoolnix-83.0-r1.ebuild 3232 BLAKE2B f260b944cba90951c0db5b83bacb2ebbbd3f466dd14f0e4ba69460430783c334d232ec80c19aacb2dc926f4f1271966ee7444ad5d74d03ab77fbc729ebb65139 SHA512 3620d4f073e157e60e6f67b4f9fff494295cf7bb4df6b7140135902ed1d000fe6a4f712f10132f64adecc23673097f4e21a1ea83c522ee9e462b84575deee284
 EBUILD mkvtoolnix-86.0.ebuild 3182 BLAKE2B a081872ad23073066638aebc67ceac238e2200f7e6ebd431706b3dd21f1b3424ba8d361353a5550bf94d0ba696be8e973bfddf98caf57724c137f75c5f48e6e6 SHA512 97f41c0614f8e2cf9e95eaf750671ca913415a6ee88965cad4c7fc3e0dc15fbcfb22bdf756227a171747710ad81f36f84d98228c081fb1a359baef0794836463
+EBUILD mkvtoolnix-88.0.ebuild 3122 BLAKE2B 08bd971c6a8eac6d5c328e864692176097b8c10fe00da64d2985626b2fa5eab4dc239f7042ebe152a8c566e047b217924935e2ec0d31a8ac3f6fe60beacd0649 SHA512 3adf6b36985c95a0112274021bb80419ac51a652aa6a6004e46357488bf34e3367849bc35e7ead16e78012b36632d4cfc6aaa0daff7456451628cc72f04fa68c
 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
deleted file mode 100644
index 9a45aaa9cb9e..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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-83.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild
index 2cef711afba8..ed9f5a45e234 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild
@@ -32,12 +32,14 @@ RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
 # version requirement updates and other packaging info
+# <libfmt-11 https://gitlab.com/mbunkus/mkvtoolnix/-/merge_requests/2259
 RDEPEND="
 	app-text/cmark:0=
 	dev-libs/boost:=
 	dev-libs/gmp:=
 	>=dev-libs/libebml-1.4.5:=
 	>=dev-libs/libfmt-8.0.1:=
+	<dev-libs/libfmt-11
 	>=dev-libs/pugixml-1.11
 	>=dev-qt/qtbase-6.2:6[dbus]
 	media-libs/flac:=
diff --git a/media-video/mkvtoolnix/mkvtoolnix-84.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-88.0.ebuild
index f5eaf0cade1f..6731cce63b2d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-84.0-r1.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-88.0.ebuild
@@ -73,10 +73,6 @@ 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