[gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/

[Alexis Ballier]

commit:     285f1f1ad7318c0a46af79697de1f51786d74486
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  3 12:53:57 2021 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug  3 13:37:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285f1f1a

media-video/mkvtoolnix: do not feed invalid configure switches

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild | 9 +--------
 media-video/mkvtoolnix/mkvtoolnix-9999.ebuild   | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
index 54bd36069ef..cd70327db01 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
@@ -89,6 +89,7 @@ src_configure() {
                $(use_enable dbus)
                --disable-qt6
                --enable-qt5
+               --with-qmake=$(qt5_get_bindir)/qmake
                $(use_with dvd dvdread)
                $(use_with nls gettext)
                $(usex nls "" --with-po4a-translate=false)
@@ -98,14 +99,6 @@ src_configure() {
                --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
        )
 
-       # 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 54bd36069ef..cd70327db01 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -89,6 +89,7 @@ src_configure() {
                $(use_enable dbus)
                --disable-qt6
                --enable-qt5
+               --with-qmake=$(qt5_get_bindir)/qmake
                $(use_with dvd dvdread)
                $(use_with nls gettext)
                $(usex nls "" --with-po4a-translate=false)
@@ -98,14 +99,6 @@ src_configure() {
                --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
        )
 
-       # 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[@]}"
 }