diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2021-08-03 14:42:36 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2021-08-03 15:37:34 +0200 |
| commit | 2aec44868aca30ce8f391400c38253c0431c2c2f (patch) | |
| tree | a0e9742490c96e01c47c710e025c07e43cab8f9c /media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild | |
| parent | profiles/base: Mask exp M68k target on LLVM < 14 (diff) | |
| download | gentoo-2aec44868aca30ce8f391400c38253c0431c2c2f.tar.gz gentoo-2aec44868aca30ce8f391400c38253c0431c2c2f.tar.bz2 gentoo-2aec44868aca30ce8f391400c38253c0431c2c2f.zip | |
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>
Diffstat (limited to 'media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild')
| -rw-r--r-- | media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild | 39 |
1 files changed, 18 insertions, 21 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[@]}" } |