gentoo auto-resync : 27:10:2022 - 15:57:47

3 files changed, 137 insertions, 3 deletions

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 6aab88b1738a..ec476617e676 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -10,6 +10,7 @@ DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B f0c64786fdc3d05915650a08ca398dc7f5
 DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c SHA512 eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997
 DIST mkvtoolnix-68.0.0.tar.xz 10911424 BLAKE2B e4704592212aa919a7cbd62b3906b5af6c4bb88293299e93a4ad65cc8857615b1654ed554c17daf60e1b001d8e5265afda808e81ee51f372be2f738d737fdd4d SHA512 fd078208f5ef0438f06b3bb19c3f3c477f87561997a847c56a731265ee9627b089cc568e1d31a9a2c7e46f63aeeabccf98a27694b6b4b1586ba93f7656d20838
 DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1 SHA512 c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c
+DIST mkvtoolnix-71.1.0.tar.xz 10989788 BLAKE2B 6b90ac9e103a75f5db76fa06def3593c7dc3c77d1179400aecda7217692fbe7f3866d838a541895d704ab9ddfb9972855c3cdad928356552136f9481cd65cf41 SHA512 f0565813ee4a303f0710b2d8019b6275e5ce7542174475e8ef9d4828c3e5ff5cf8a7940eb0e878b419e0b22a9fd55e2fc41e8e26c1b0777b95caac30d82fad5b
 EBUILD mkvtoolnix-57.0.0.ebuild 2962 BLAKE2B f3a339ece4e0cb98fb0533478cfbe888021ff56f831a3faedbcb67205313df4af7727a6b5f5bb2103234710cec224e55d1421b5d5c423f6b103d27b1fdd60236 SHA512 2aa6f5ffe2fc3fe20ad0bc8b1ffd839c468484f36c8e36821e2a3b1689d2d935d80b9c45f4b1612b39c5b9342fc017b9cb373bf4998a506694e9086d8c76c600
 EBUILD mkvtoolnix-60.0.0.ebuild 2706 BLAKE2B dd751ea20eab19a91848f07ebeeedc411849a409c78d19695b77d1ea45dfd94d19651e7cd6824d8d2e9b061cf82b56a7207e05b2b1dd489ceff02b400c253231 SHA512 ab3106fb27a970c0873717fa402c937af4288ae100d26b1f361e7f0382cda413b1a2159812b1be2b738b241a2e0ddcb621e67e51a4c0b32e034c944dc35ba68b
 EBUILD mkvtoolnix-61.0.0.ebuild 2726 BLAKE2B 2279b0cb4059b76a66af001589060a3206e05c4c90a9e1b313701ceac45d431cb0535824be25a7882c0ae990dfee9384be2dcc60bc36f3cb183c74cab5081341 SHA512 037d0c1c978eb03634f16c39a8c5c09b1a9f0694c8f226ed3335763dd542133902d13f389e1778f6e4ab0ceb5193a02d960deb2d700f01e0c54dcc161a608763
@@ -17,5 +18,6 @@ EBUILD mkvtoolnix-64.0.0.ebuild 2736 BLAKE2B 2f4fcd86ff3a7fc61adbebd1689e7123e4c
 EBUILD mkvtoolnix-67.0.0.ebuild 2946 BLAKE2B 6b4beb782bf52c52314af7b9df19c1920c6c1e54451ebc2cb3d7b56a2eb2628bf3cb3a62b52eb6a3720384858158fce3be596f946c69dc139324a7cd423139b3 SHA512 6103ec8d155a14015e3c01f49618daee3fddc487816e130157ea8f144531cfffa1a4e94012c8028700201dce34a78a254e75f53029f1d06ff1644caf13ad2f9e
 EBUILD mkvtoolnix-68.0.0-r3.ebuild 2973 BLAKE2B 2a3b8f0d5f61ccb1d2cbc69cabd9466fde5c1ef1e36689aac4e5433c66c05f1cc72a3afbb536af5604e0748aeb264f54c1c2193170e64b8f34e304f879c6f32c SHA512 69d1bab3c7e6329468930c5a716dfbecfea61b7360e11e333ce047dc4c082ebee2d15044adcd8c6c3a6700cd53a0e69042d9d665997074f461a6ff2a562d943f
 EBUILD mkvtoolnix-69.0.0.ebuild 2939 BLAKE2B b626b90bd71651f79431cc1cd803f57904c48dacc906a7e220474b602adaf5a8108febe262a08bf56e0c960817e6322413fdc70537a7ae77241c32ca07b85059 SHA512 cafe20ffdc9de60647a63dd4a7cb0806a012582f4d864423650603c6fa3b33658936e2c81ce8d3d4a076e55aefe55f1baaab912701e5d9175971d8492a4a20bc
-EBUILD mkvtoolnix-9999.ebuild 2941 BLAKE2B ce1f0414a8e8a263040aff60e593cdd486fe2f19e2b92ba48d41022c9207442b5f7e5770586a56292d0ba5e5bab2e95534b0988d86004cc15858d7369dc7c460 SHA512 dd31c3098960acf45a854c7b3d2b34e343e0d3027c4c63673893f3015a03999c3a2fdc10b7f8950d45728a62fbe675a40587acc14d63648b101067312a8fa19a
+EBUILD mkvtoolnix-71.1.0.ebuild 2941 BLAKE2B 30aca40ae6f0cc410f9cb9d102f14b5efe0a1becbb529762b9dac566087882ac2f2b04db91c62b96825d9c4cccffebb6c7b29d3ead34558004922585f3d0b1c3 SHA512 09a813e5ae9df385fce514fd0f721f49184e4365f43b04952701e11db170889f1933b2a464f021ef804196384f63c96d0f0081e074c7d12081a5c37e99fbb92a
+EBUILD mkvtoolnix-9999.ebuild 2941 BLAKE2B 30aca40ae6f0cc410f9cb9d102f14b5efe0a1becbb529762b9dac566087882ac2f2b04db91c62b96825d9c4cccffebb6c7b29d3ead34558004922585f3d0b1c3 SHA512 09a813e5ae9df385fce514fd0f721f49184e4365f43b04952701e11db170889f1933b2a464f021ef804196384f63c96d0f0081e074c7d12081a5c37e99fbb92a
 MISC metadata.xml 256 BLAKE2B ff2b5536809c94dc64867bca73d779a31bd343559cd65520c9b5684091734b3ccf7bf495335890df5533857480794cb3258566e5836e8dce7514b6833ba93f37 SHA512 b7f3d0564d06254ff552beec9594236b84ebc3ad87adab673f68963bcc4dfbf2e29b401e75486ba41b9b526de74b73f65e9d5e901221f810363497aa694c8567
diff --git a/media-video/mkvtoolnix/mkvtoolnix-71.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-71.1.0.ebuild
new file mode 100644
index 000000000000..23a2e80da85d
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-71.1.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 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
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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 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="
+	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:= )
+	dev-qt/qtcore: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
+	)
+	app-text/cmark:0=
+	dbus? ( dev-qt/qtdbus:5 )
+"
+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
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
+	"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.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)
+
+		# 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.
+		--disable-qt6
+		--enable-qt5
+		$(use_enable gui)
+		--with-qmake="$(qt5_get_bindir)"/qmake
+
+		$(use_with dvd dvdread)
+		$(use_with nls gettext)
+		$(usex nls "" --with-po4a-translate=false)
+		--disable-update-check
+		--disable-optimization
+		--with-boost="${ESYSROOT}"/usr
+		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+	)
+
+	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 0f9ef7d7a056..23a2e80da85d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -27,11 +27,11 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/gmp:=
-	>=dev-libs/libebml-1.4.2:=
+	>=dev-libs/libebml-1.4.4:=
 	>=dev-libs/libfmt-8.0.1:=
 	>=dev-libs/pugixml-1.11:=
 	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.3:=
+	>=media-libs/libmatroska-1.7.1:=
 	media-libs/libogg:=
 	media-libs/libvorbis:=
 	sys-libs/zlib