commit: bfa66eeea70d54e3d9d29020335d196f7bc9122d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 21:40:30 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 21:52:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa66eee
media-plugins/audacious-plugins: Drop USE gtk3 from live ebuild
- git master has no concept of 'Gtk+3'
- USE gtk3 was permanently broken by src_unpack phase anyway
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../audacious-plugins-9999.ebuild | 31 +++++++---------------
1 file changed, 9 insertions(+), 22 deletions(-)
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index 30c931fcafa..5d63400ef48 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -12,18 +12,16 @@ if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git";
else
- SRC_URI="
- !gtk3? (
https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
- gtk3? (
https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+ SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2";
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth
hotkeys http gme gtk gtk3 jack lame libav
+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 pulseaudio qt5
scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
REQUIRED_USE="
- ^^ ( gtk gtk3 qt5 )
+ ^^ ( gtk qt5 )
qt5? ( !aosd !hotkeys )
|| ( alsa jack pulseaudio sdl )
ampache? ( qt5 http )"
@@ -50,7 +48,7 @@ RDEPEND="
dev-libs/dbus-glib
dev-libs/glib
dev-libs/libxml2:2
- ~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
+ ~media-sound/audacious-${PV}[gtk?,qt5?]
aac? ( >=media-libs/faad2-2.7 )
alsa? ( >=media-libs/alsa-lib-1.0.16 )
ampache? ( =media-libs/ampache_browser-1* )
@@ -73,7 +71,6 @@ RDEPEND="
fluidsynth? ( media-sound/fluidsynth )
http? ( >=net-libs/neon-0.26.4 )
gtk? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -103,26 +100,16 @@ RDEPEND="
>=media-libs/libogg-1.1.3
>=media-libs/libvorbis-1.2.0
)
- wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
+ wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+"
DEPEND="${RDEPEND}
dev-util/gdbus-codegen
virtual/pkgconfig
- nls? ( dev-util/intltool )"
+ nls? ( dev-util/intltool )
+"
S="${WORKDIR}/${MY_P}"
-src_unpack() {
- if [[ ${PV} == *9999 ]]; then
- git-r3_src_unpack
- else
- default
- if use gtk3; then
- mv "${MY_P}"{-gtk3,} || die
- fi
- fi
-}
-
src_prepare() {
default
[[ ${PV} == *9999 ]] && eautoreconf
@@ -151,7 +138,7 @@ src_configure() {
$(use_enable flac filewriter) \
$(use_enable fluidsynth amidiplug) \
$(use_enable gme console) \
- $(use_enable $(usex gtk gtk gtk3) gtk) \
+ $(use_enable gtk) \
$(use_enable hotkeys hotkey) \
$(use_enable http neon) \
$(use_enable jack) \
