media-video/mkvtoolnix: drop qt5 useflag

It is now mandatory.

Closes: https://bugs.gentoo.org/806256
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

2 files changed, 40 insertions, 46 deletions

diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
index 5f25e8149162..54bd36069efe 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd nls pch qt5 test"
+IUSE="dbus debug dvd nls pch test"
 RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
@@ -37,16 +37,14 @@ RDEPEND="
 	sys-apps/file
 	sys-libs/zlib
 	dvd? ( media-libs/libdvdread:= )
-	qt5? (
-		dev-qt/qtcore: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 )
-	)
+	dev-qt/qtcore: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
@@ -89,7 +87,8 @@ src_configure() {
 		$(use_enable debug)
 		$(usex pch "" --disable-precompiled-headers)
 		$(use_enable dbus)
-		$(use_enable qt5 qt)
+		--disable-qt6
+		--enable-qt5
 		$(use_with dvd dvdread)
 		$(use_with nls gettext)
 		$(usex nls "" --with-po4a-translate=false)
@@ -99,15 +98,13 @@ src_configure() {
 		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
 	)
 
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myeconfargs+=(
-			--with-moc=$(qt5_get_bindir)/moc
-			--with-uic=$(qt5_get_bindir)/uic
-			--with-rcc=$(qt5_get_bindir)/rcc
-			--with-qmake=$(qt5_get_bindir)/qmake
-		)
-	fi
+	# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+	myeconfargs+=(
+		--with-moc=$(qt5_get_bindir)/moc
+		--with-uic=$(qt5_get_bindir)/uic
+		--with-rcc=$(qt5_get_bindir)/rcc
+		--with-qmake=$(qt5_get_bindir)/qmake
+	)
 
 	econf "${myeconfargs[@]}"
 }
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index d84291b28039..54bd36069efe 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,34 +19,32 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd nls pch qt5 test"
+IUSE="dbus debug dvd 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-1.60:=
+	>=dev-libs/boost-1.66:=
 	>=dev-libs/libebml-1.4.0:=
 	>=dev-libs/libfmt-6.1.0:=
 	dev-libs/libpcre2:=
 	dev-libs/pugixml:=
 	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.0:=
+	>=media-libs/libmatroska-1.6.3:=
 	media-libs/libogg:=
 	media-libs/libvorbis:=
 	sys-apps/file
 	sys-libs/zlib
 	dvd? ( media-libs/libdvdread:= )
-	qt5? (
-		dev-qt/qtcore: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 )
-	)
+	dev-qt/qtcore: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
@@ -64,7 +62,7 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch )
+PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch )
 
 src_prepare() {
 	xdg_src_prepare
@@ -89,7 +87,8 @@ src_configure() {
 		$(use_enable debug)
 		$(usex pch "" --disable-precompiled-headers)
 		$(use_enable dbus)
-		$(use_enable qt5 qt)
+		--disable-qt6
+		--enable-qt5
 		$(use_with dvd dvdread)
 		$(use_with nls gettext)
 		$(usex nls "" --with-po4a-translate=false)
@@ -99,15 +98,13 @@ src_configure() {
 		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
 	)
 
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myeconfargs+=(
-			--with-moc=$(qt5_get_bindir)/moc
-			--with-uic=$(qt5_get_bindir)/uic
-			--with-rcc=$(qt5_get_bindir)/rcc
-			--with-qmake=$(qt5_get_bindir)/qmake
-		)
-	fi
+	# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+	myeconfargs+=(
+		--with-moc=$(qt5_get_bindir)/moc
+		--with-uic=$(qt5_get_bindir)/uic
+		--with-rcc=$(qt5_get_bindir)/rcc
+		--with-qmake=$(qt5_get_bindir)/qmake
+	)
 
 	econf "${myeconfargs[@]}"
 }