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 BDDF413997D for ; Fri, 15 Nov 2019 00:36:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 593CAE085D; Fri, 15 Nov 2019 00:36:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1CAFCE085D for ; Fri, 15 Nov 2019 00:36: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 9248234CE5C for ; Fri, 15 Nov 2019 00:36:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3B70824 for ; Fri, 15 Nov 2019 00:36:37 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1573778082.74da6ad0fd38f7c9e62db4820af0d2640b14670a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/audacious/audacious-9999.ebuild media-sound/audacious/metadata.xml X-VCS-Directories: media-sound/audacious/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 74da6ad0fd38f7c9e62db4820af0d2640b14670a X-VCS-Branch: master Date: Fri, 15 Nov 2019 00:36:37 +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: 048fe87d-69fd-467e-a774-3006ba68fe9c X-Archives-Hash: 1233f404066240bf89161e9ceff9b9bf commit: 74da6ad0fd38f7c9e62db4820af0d2640b14670a Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 14 20:08:59 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 15 00:34:42 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74da6ad0 media-sound/audacious: Default switched to Qt5 Upstream commit 72e6f21e3a77a18ecfa57120a607a48c4e66b493 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/audacious/audacious-9999.ebuild | 20 +++++++++++--------- media-sound/audacious/metadata.xml | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild index 12769bfaa10..edf35f502de 100644 --- a/media-sound/audacious/audacious-9999.ebuild +++ b/media-sound/audacious/audacious-9999.ebuild @@ -20,7 +20,7 @@ SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2" LICENSE="BSD-2" SLOT="0" -IUSE="nls qt5" +IUSE="gtk nls" BDEPEND=" virtual/pkgconfig @@ -32,8 +32,8 @@ DEPEND=" >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme - !qt5? ( x11-libs/gtk+:2 ) - qt5? ( + gtk? ( x11-libs/gtk+:2 ) + !gtk? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 @@ -63,12 +63,14 @@ src_configure() { # Building without D-Bus is *unsupported* and a USE-flag # will not be added due to the bug reports that will result. # Bugs #197894, #199069, #207330, #208606 - econf \ - --disable-valgrind \ - --enable-dbus \ - $(use_enable nls) \ - $(use_enable !qt5 gtk) \ - $(use_enable qt5 qt) + local myeconfargs=( + --disable-valgrind + --enable-dbus + $(use_enable gtk gtk) + $(use_enable !gtk qt) + $(use_enable nls) + ) + econf "${myeconfargs[@]}" } src_install() { diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml index 56e2b754081..c563fb86934 100644 --- a/media-sound/audacious/metadata.xml +++ b/media-sound/audacious/metadata.xml @@ -10,6 +10,7 @@ Gentoo Sound project - Build with Qt5 interface instead Gtk+ + Build with GTK interface instead of Qt5 + Build with Qt5 interface instead of GTK