commit: c382628fac657a40f0d846c1372f35324ae83105 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 18 13:52:47 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 18 14:14:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c382628f
media-plugins/audacious-plugins: USE aosd does not like qt5 Closes: https://bugs.gentoo.org/671428 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild | 10 +++------- media-plugins/audacious-plugins/audacious-plugins-9999.ebuild | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild index 5871219ae3b..f8439c86fa9 100644 --- a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild +++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild @@ -18,8 +18,8 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify - libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio 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 pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" REQUIRED_USE=" || ( alsa jack pulseaudio sdl ) ampache? ( http )" @@ -55,10 +55,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/libXrender - x11-libs/libXcomposite - ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 @@ -116,6 +112,7 @@ src_configure() { --enable-qt \ --enable-qtaudio \ --enable-songchange \ + --disable-aosd \ --disable-coreaudio \ --disable-gtk \ --disable-hotkey \ @@ -126,7 +123,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) \ diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild index 57cc7a7ae92..49746fa262f 100644 --- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild +++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild @@ -24,7 +24,7 @@ IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" REQUIRED_USE=" ^^ ( gtk gtk3 qt5 ) - qt5? ( !hotkeys ) + qt5? ( !aosd !hotkeys ) || ( alsa jack pulseaudio sdl ) ampache? ( qt5 http )"
