From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1058551-garchives=archives.gentoo.org@lists.gentoo.org>
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 722C5138334
for <garchives@archives.gentoo.org>; Fri, 23 Nov 2018 21:33:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 57EE7E0975;
Fri, 23 Nov 2018 21:33:55 +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 15F0AE0975
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Nov 2018 21:33:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 0BF84335D13
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Nov 2018 21:33:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 627C2442
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Nov 2018 21:33:51 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1543008817.b061eb2ab21b762371c93aeeaf1b565a00c73245.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-plugins/audacious-plugins/audacious-plugins-9999.ebuild media-plugins/audacious-plugins/metadata.xml
X-VCS-Directories: media-plugins/audacious-plugins/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: b061eb2ab21b762371c93aeeaf1b565a00c73245
X-VCS-Branch: master
Date: Fri, 23 Nov 2018 21:33:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 415ed64f-e88a-431a-93fe-1b3fcea1ea00
X-Archives-Hash: 8a49ef32e9002a93d07514ab3335a48e
commit: b061eb2ab21b762371c93aeeaf1b565a00c73245
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 20:25:53 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 23 21:33:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b061eb2a
media-plugins/audacious-plugins: Make USE gtk -> !qt5, alsa default
Simplifies REQUIRED_USE, makes repoman happier.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../audacious-plugins/audacious-plugins-9999.ebuild | 21 +++++++++------------
media-plugins/audacious-plugins/metadata.xml | 1 +
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index d7585a68aa8..79742c34a4a 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -5,9 +5,6 @@ EAPI=6
MY_P="${P/_/-}"
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-
if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
@@ -15,17 +12,17 @@ else
SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
KEYWORDS="~amd64 ~x86"
fi
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk jack lame libav libnotify
- libsamplerate lirc mms modplug mp3 nls opengl pulseaudio +qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+IUSE="aac +adplug +alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme jack lame libav libnotify
+ libsamplerate lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
REQUIRED_USE="
- ^^ ( gtk qt5 )
- qt5? ( !aosd !hotkeys )
|| ( alsa jack pulseaudio qtmedia sdl )
- ampache? ( qt5 http )
- qtmedia? ( qt5 )"
+ ampache? ( qt5 http ) qtmedia? ( qt5 )
+ aosd? ( !qt5 ) hotkeys? ( !qt5 )"
# The following plugins REQUIRE a GUI build of audacious, because non-GUI
# builds do NOT install the libaudgui library & headers.
@@ -49,7 +46,7 @@ RDEPEND="
dev-libs/dbus-glib
dev-libs/glib
dev-libs/libxml2:2
- ~media-sound/audacious-${PV}[gtk?,qt5?]
+ ~media-sound/audacious-${PV}[qt5=]
aac? ( >=media-libs/faad2-2.7 )
alsa? ( >=media-libs/alsa-lib-1.0.16 )
ampache? ( =media-libs/ampache_browser-1* )
@@ -71,7 +68,7 @@ RDEPEND="
)
fluidsynth? ( media-sound/fluidsynth )
http? ( >=net-libs/neon-0.26.4 )
- gtk? ( x11-libs/gtk+:2 )
+ !qt5? ( x11-libs/gtk+:2 )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -137,7 +134,6 @@ src_configure() {
$(use_enable flac filewriter)
$(use_enable fluidsynth amidiplug)
$(use_enable gme console)
- $(use_enable gtk)
$(use_enable hotkeys hotkey)
$(use_enable http neon)
$(use_enable jack)
@@ -150,6 +146,7 @@ src_configure() {
$(use_enable mp3 mpg123)
$(use_enable nls)
$(use_enable pulseaudio pulse)
+ $(use_enable !qt5 gtk)
$(use_enable qt5 qt)
$(use_enable qtmedia qtaudio)
$(use_enable scrobbler scrobbler2)
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 49372c8715d..bf0fc38a66a 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -20,6 +20,7 @@
<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
<flag name="hotkeys">Enable support for controlling via hotkeys</flag>
<flag name="http">Support HTTP streams through neon</flag>
+ <flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>