From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1058552-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 13A74138334
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 1F007E097C;
Fri, 23 Nov 2018 21:33:56 +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 E6752E097C
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Nov 2018 21:33:55 +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 93F68335D15
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 9AF354B5
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: <1543008818.4ece59ae43dec75fa8c0095571f3d170fdf3e82c.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
X-VCS-Directories: media-plugins/audacious-plugins/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 4ece59ae43dec75fa8c0095571f3d170fdf3e82c
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: 8b59567e-89ef-42ed-b7d1-4c2287cc5531
X-Archives-Hash: 501678cc744d5dc7f7c221679ac0606b
commit: 4ece59ae43dec75fa8c0095571f3d170fdf3e82c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 20:31:29 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 23 21:33:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ece59ae
media-plugins/audacious-plugins: Merge USE aosd into !qt5
No extra dependencies over x11-libs/gtk+, simplifies REQUIRED_USE.
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 | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index f7a52770417..5386dd7a599 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -17,12 +17,11 @@ HOMEPAGE="https://audacious-media-player.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="aac +adplug +alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth http gme 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 bs2b cdda cue ffmpeg flac fluidsynth 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="
|| ( alsa jack pulseaudio qtmedia sdl )
- ampache? ( qt5 http ) qtmedia? ( qt5 )
- aosd? ( !qt5 )"
+ ampache? ( qt5 http ) qtmedia? ( qt5 )"
# The following plugins REQUIRE a GUI build of audacious, because non-GUI
# builds do NOT install the libaudgui library & headers.
@@ -50,10 +49,6 @@ RDEPEND="
aac? ( >=media-libs/faad2-2.7 )
alsa? ( >=media-libs/alsa-lib-1.0.16 )
ampache? ( =media-libs/ampache_browser-1* )
- aosd? (
- x11-libs/libXcomposite
- x11-libs/libXrender
- )
bs2b? ( media-libs/libbs2b )
cdda? (
dev-libs/libcdio:=
@@ -126,7 +121,6 @@ src_configure() {
$(use_enable aac)
$(use_enable alsa)
$(use_enable ampache)
- $(use_enable aosd)
$(use_enable bs2b)
$(use_enable cdda cdaudio)
$(use_enable cue)
@@ -145,6 +139,7 @@ src_configure() {
$(use_enable mp3 mpg123)
$(use_enable nls)
$(use_enable pulseaudio pulse)
+ $(use_enable !qt5 aosd)
$(use_enable !qt5 gtk)
$(use_enable !qt5 hotkey)
$(use_enable qt5 qt)