From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 197E1139360 for ; Tue, 3 Aug 2021 13:37:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59EDDE08BD; Tue, 3 Aug 2021 13:37:41 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F31AE0998 for ; Tue, 3 Aug 2021 13:37:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 37D6D343CD2 for ; Tue, 3 Aug 2021 13:37:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9BE67CE for ; Tue, 3 Aug 2021 13:37:38 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1627997854.285f1f1ad7318c0a46af79697de1f51786d74486.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild media-video/mkvtoolnix/mkvtoolnix-9999.ebuild X-VCS-Directories: media-video/mkvtoolnix/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 285f1f1ad7318c0a46af79697de1f51786d74486 X-VCS-Branch: master Date: Tue, 3 Aug 2021 13:37:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0477196a-75ec-4c87-8098-a28862f94b62 X-Archives-Hash: a56f4318ac6e6c7c2b2902f7d53e6423 commit: 285f1f1ad7318c0a46af79697de1f51786d74486 Author: Alexis Ballier gentoo org> AuthorDate: Tue Aug 3 12:53:57 2021 +0000 Commit: Alexis Ballier gentoo 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 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[@]}" }