gentoo auto-resync : 14:12:2023 - 05:46:30

1 files changed, 58 insertions, 26 deletions

diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 4637f4ccbfb9..20d89f9877dc 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -6,12 +6,20 @@ 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=()
-	inherit git-r3
 else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	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"
@@ -19,34 +27,44 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd gui nls pch test"
+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:=
+	>=dev-libs/pugixml-1.11
 	media-libs/flac:=
 	>=media-libs/libmatroska-1.7.1:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
+	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
+	!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
+		)
 	)
-	app-text/cmark:0=
-	dbus? ( dev-qt/qtdbus:5 )
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/nlohmann_json-3.9.1
@@ -64,9 +82,14 @@ BDEPEND="
 	)
 "
 
+if [[ ${PV} != *9999 ]] ; then
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
+fi
+
 PATCHES=(
-	"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
-	"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
+	"${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() {
@@ -93,15 +116,7 @@ src_configure() {
 		$(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)
 		#$(use_with nls po4a)
@@ -111,6 +126,23 @@ src_configure() {
 		--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=