gentoo auto-resync : 20:01:2024 - 14:08:56

4 files changed, 182 insertions, 45 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 46c2d14a39eb..8ba775ea1d94 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 67da477acff4..34941f7dc16d 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -8,9 +8,12 @@ DIST mkvtoolnix-75.0.0.tar.xz 11009552 BLAKE2B d9c32a453ac1f07e201b99fdcaaa5e553
 DIST mkvtoolnix-77.0.tar.xz 11044004 BLAKE2B 5aa43e155c1318dc6c3fd4418fb59ec498ad488a8459cf0aefa0bc0660ff93dd51f2699642ea633695fbf76ae1b4b6cfddddfca1b0e72e16357b579ce8dbee42 SHA512 b310077cfaddef3163c732943f1aaf7e63fb9f7efb19fdb27a35e2d0ad92dfc4536ea29366b44745f3f918703b02e2d52edb63369c23540df1312f3d54c06bb0
 DIST mkvtoolnix-80.0.tar.xz 11056764 BLAKE2B 6178b65ce57b1ab897c91a456fa9887499e683619654b2a7f8fbcd8b7d98f04dd831d2c875da85a644357ec8c8de3b408394f7b29def9203f35a28ec19513a0d SHA512 066c10a9112ca0cdb59567235aae70e94ccab25b0e2d6156f4ba1090e102614b07c37eb0116a9ee540b2ed8f4b9d58a699f553b974a3f2636c65241915b3b6bc
 DIST mkvtoolnix-80.0.tar.xz.sig 833 BLAKE2B 6c08689419877da7f3f16b8453a44f837792f5e7f3de7fb8574597dee3317ffadf2418cae82949a7585ab53cf1e0a60391ba898fc4607290d678501c3ffd4672 SHA512 47df9f0199275873b300b229fc91d14d5ab93c423e4fb8f31055b84619ae00609850ccb77f6d84c8eb3e4afee76acbe3e0779d03f3041d01d598f462788c618d
+DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0 SHA512 d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7
+DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5 SHA512 3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
 EBUILD mkvtoolnix-72.0.0.ebuild 2937 BLAKE2B ad306e107e1065ecbf0df631cb0eebb0d6f981da9f479b0a17604b016b21a6e0e544ee2f2eea50bb62cc3fcec7b8a59cfd717eee706d137f62e0717a5794584a SHA512 52e2adf07dce52e3bbf035bc11a9cfb27bc53e33109d3d781f845b1f0805b7999b4923ce9e89eb54f1b8b472819411019cd7bbb5776cdc36ccba123fc7ebfaf2
 EBUILD mkvtoolnix-75.0.0.ebuild 2981 BLAKE2B eaee5dd08153c3efd23fe7006e9c5980df1e6f62fed5d2303ed65918bfe036efdb450340b48f34492b747f0c5c0e2c4b622e529ee29d4458e26dca8935fec3bd SHA512 57dd6092f75d4fb1d794e59029da33e9c318a2e8f9ba0ca1f436ea8ead67ace12125eda560fbabad1c06390c3f3699202ce35e45120cdf02ad8d3d5b0c43f001
 EBUILD mkvtoolnix-77.0.ebuild 2981 BLAKE2B eaee5dd08153c3efd23fe7006e9c5980df1e6f62fed5d2303ed65918bfe036efdb450340b48f34492b747f0c5c0e2c4b622e529ee29d4458e26dca8935fec3bd SHA512 57dd6092f75d4fb1d794e59029da33e9c318a2e8f9ba0ca1f436ea8ead67ace12125eda560fbabad1c06390c3f3699202ce35e45120cdf02ad8d3d5b0c43f001
 EBUILD mkvtoolnix-80.0.ebuild 3621 BLAKE2B b762c6a8f2a036a1a12cee52c743f657f51a0f7ee14045bfd9afe2d57f30ddf8d14920c45a6356623f67b65e4c2f406a121f32936372ba6bb0e6deba03f607e5 SHA512 dbeab97b6e0f1a41a39110c8e5d70d49f1445b1ebbd059c1b1f0bdad4f91e58b88fff0f481fcd186f5874c70a5fd1457762bcc6f684c7ddd109585c3bc80db1b
-EBUILD mkvtoolnix-9999.ebuild 3621 BLAKE2B b762c6a8f2a036a1a12cee52c743f657f51a0f7ee14045bfd9afe2d57f30ddf8d14920c45a6356623f67b65e4c2f406a121f32936372ba6bb0e6deba03f607e5 SHA512 dbeab97b6e0f1a41a39110c8e5d70d49f1445b1ebbd059c1b1f0bdad4f91e58b88fff0f481fcd186f5874c70a5fd1457762bcc6f684c7ddd109585c3bc80db1b
+EBUILD mkvtoolnix-81.0.ebuild 3621 BLAKE2B b762c6a8f2a036a1a12cee52c743f657f51a0f7ee14045bfd9afe2d57f30ddf8d14920c45a6356623f67b65e4c2f406a121f32936372ba6bb0e6deba03f607e5 SHA512 dbeab97b6e0f1a41a39110c8e5d70d49f1445b1ebbd059c1b1f0bdad4f91e58b88fff0f481fcd186f5874c70a5fd1457762bcc6f684c7ddd109585c3bc80db1b
+EBUILD mkvtoolnix-9999.ebuild 3040 BLAKE2B 5344aa6e366d686bc26cb3b6397f1e1f5fbc8f6acef4ccda6f306d6c2b00fe7f2fa33fd131c2cfe6376936557239c807ec2a39584c5b034ae0a2574f121bd8a6 SHA512 4dd14ce9015d48af8c1f2f1b7ed319d8137a608f7d405f38b2919b2128256accd780f3aa727d2abf8e48e04b179eeff1a339589ee9c0629a56ac29c9a828a74a
 MISC metadata.xml 343 BLAKE2B b13d9c252a7ad2f27c772c43d3476eee87d9a173c8fcc04a3be28ca9cfb826e6f1de6eade1211b4ff5f4a379b20a0961667fc99eee91495589e0632ad94b4c0a SHA512 cb7fd77f65779de841da03890fd1d0031cea8a95153f116f01f1be7d8ef5b87bb760933fc74f64a1d49ce94bc897cde94fdd4f6b45c016c3c20b842097692dc0
diff --git a/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild
new file mode 100644
index 000000000000..20d89f9877dc
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	EGIT_SUBMODULES=()
+else
+	inherit verify-sig
+
+	SRC_URI="
+		https://mkvtoolnix.download/sources/${P}.tar.xz
+		verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
+	"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dbus debug dvd gui nls qt6 pch test"
+RESTRICT="!test? ( test )"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	app-text/cmark:0=
+	dev-libs/boost:=
+	dev-libs/gmp:=
+	>=dev-libs/libebml-1.4.4:=
+	>=dev-libs/libfmt-8.0.1:=
+	>=dev-libs/pugixml-1.11
+	media-libs/flac:=
+	>=media-libs/libmatroska-1.7.1:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-libs/zlib
+	dvd? ( media-libs/libdvdread:= )
+	!qt6? (
+		dev-qt/qtcore:5
+		dbus? ( dev-qt/qtdbus:5 )
+		gui? (
+			dev-qt/qtsvg:5
+			dev-qt/qtgui:5
+			dev-qt/qtnetwork:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtconcurrent:5
+			dev-qt/qtmultimedia:5
+		)
+	)
+	qt6? (
+		dev-qt/qtbase:6[dbus?]
+		gui? (
+			dev-qt/qtbase:6[concurrent,gui,network,widgets]
+			dev-qt/qtmultimedia:6
+			dev-qt/qtsvg:6
+		)
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-cpp/nlohmann_json-3.9.1
+	>=dev-libs/utfcpp-3.1.2
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-ruby/rake
+	virtual/pkgconfig
+	nls? (
+		sys-devel/gettext
+		app-text/po4a
+	)
+"
+
+if [[ ${PV} != *9999 ]] ; then
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
+	"${FILESDIR}"/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
+	"${FILESDIR}"/mkvtoolnix-80.0.0-optional-qtdbus.patch
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# bug #692018
+	sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
+
+	eautoreconf
+
+	# remove bundled libs
+	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+	# bug #692322, use system dev-libs/utfcpp
+	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(usex pch "" --disable-precompiled-headers)
+		$(use_enable dbus)
+		$(use_enable gui)
+		$(use_with dvd dvdread)
+		$(use_with nls gettext)
+		#$(use_with nls po4a)
+		--disable-update-check
+		--disable-optimization
+		--with-boost="${ESYSROOT}"/usr
+		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+	)
+
+	# Qt (of some version) is always needed, even for non-GUI builds,
+	# to do e.g. MIME detection. See e.g. bug #844097.
+	# But most of the Qt deps are conditional on a GUI build.
+	if use qt6; then
+		myeconfargs+=(
+			--enable-qt6
+			--disable-qt5
+			--with-qmake6="$(qt6_get_bindir)"/qmake
+		)
+	else
+		myeconfargs+=(
+			--disable-qt6
+			--enable-qt5
+			--with-qmake="$(qt5_get_bindir)"/qmake
+		)
+	fi
+
+	# Work around bug #904710.
+	use nls || export ac_cv_path_PO4A=
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	dodoc NEWS.md
+	doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 20d89f9877dc..1f14599ac81e 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd gui nls qt6 pch test"
+IUSE="debug dvd gui nls pch test"
 RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
@@ -39,31 +39,17 @@ RDEPEND="
 	>=dev-libs/libebml-1.4.4:=
 	>=dev-libs/libfmt-8.0.1:=
 	>=dev-libs/pugixml-1.11
+	>=dev-qt/qtbase-6.2:6[dbus]
 	media-libs/flac:=
 	>=media-libs/libmatroska-1.7.1:=
 	media-libs/libogg
 	media-libs/libvorbis
 	sys-libs/zlib
 	dvd? ( media-libs/libdvdread:= )
-	!qt6? (
-		dev-qt/qtcore:5
-		dbus? ( dev-qt/qtdbus:5 )
-		gui? (
-			dev-qt/qtsvg:5
-			dev-qt/qtgui:5
-			dev-qt/qtnetwork:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtconcurrent:5
-			dev-qt/qtmultimedia:5
-		)
-	)
-	qt6? (
-		dev-qt/qtbase:6[dbus?]
-		gui? (
-			dev-qt/qtbase:6[concurrent,gui,network,widgets]
-			dev-qt/qtmultimedia:6
-			dev-qt/qtsvg:6
-		)
+	gui? (
+		>=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets]
+		>=dev-qt/qtmultimedia-6.2:6
+		>=dev-qt/qtsvg-6.2:6
 	)
 "
 DEPEND="${RDEPEND}
@@ -86,12 +72,6 @@ if [[ ${PV} != *9999 ]] ; then
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
 fi
 
-PATCHES=(
-	"${FILESDIR}"/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
-	"${FILESDIR}"/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
-	"${FILESDIR}"/mkvtoolnix-80.0.0-optional-qtdbus.patch
-)
-
 src_prepare() {
 	default
 
@@ -115,7 +95,6 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
 		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
 		$(use_enable gui)
 		$(use_with dvd dvdread)
 		$(use_with nls gettext)
@@ -124,24 +103,12 @@ src_configure() {
 		--disable-optimization
 		--with-boost="${ESYSROOT}"/usr
 		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
 
-	# Qt (of some version) is always needed, even for non-GUI builds,
-	# to do e.g. MIME detection. See e.g. bug #844097.
-	# But most of the Qt deps are conditional on a GUI build.
-	if use qt6; then
-		myeconfargs+=(
-			--enable-qt6
-			--disable-qt5
-			--with-qmake6="$(qt6_get_bindir)"/qmake
-		)
-	else
-		myeconfargs+=(
-			--disable-qt6
-			--enable-qt5
-			--with-qmake="$(qt5_get_bindir)"/qmake
-		)
-	fi
+		# Qt (of some version) is always needed, even for non-GUI builds,
+		# to do e.g. MIME detection. See e.g. bug #844097.
+		# But most of the Qt deps are conditional on a GUI build.
+		--with-qmake6="$(qt6_get_bindir)"/qmake
+	)
 
 	# Work around bug #904710.
 	use nls || export ac_cv_path_PO4A=