| 1 |
commit: bfa66eeea70d54e3d9d29020335d196f7bc9122d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 19 21:40:30 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 19 21:52:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa66eee |
| 7 |
|
| 8 |
media-plugins/audacious-plugins: Drop USE gtk3 from live ebuild |
| 9 |
|
| 10 |
- git master has no concept of 'Gtk+3' |
| 11 |
- USE gtk3 was permanently broken by src_unpack phase anyway |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
.../audacious-plugins-9999.ebuild | 31 +++++++--------------- |
| 17 |
1 file changed, 9 insertions(+), 22 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
| 20 |
index 30c931fcafa..5d63400ef48 100644 |
| 21 |
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
| 22 |
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild |
| 23 |
@@ -12,18 +12,16 @@ if [[ ${PV} == *9999 ]]; then |
| 24 |
inherit autotools git-r3 |
| 25 |
EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git" |
| 26 |
else |
| 27 |
- SRC_URI=" |
| 28 |
- !gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 ) |
| 29 |
- gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )" |
| 30 |
+ SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2" |
| 31 |
KEYWORDS="~amd64 ~x86" |
| 32 |
fi |
| 33 |
|
| 34 |
LICENSE="GPL-2" |
| 35 |
SLOT="0" |
| 36 |
-IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk gtk3 jack lame libav |
| 37 |
+IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk jack lame libav |
| 38 |
libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" |
| 39 |
REQUIRED_USE=" |
| 40 |
- ^^ ( gtk gtk3 qt5 ) |
| 41 |
+ ^^ ( gtk qt5 ) |
| 42 |
qt5? ( !aosd !hotkeys ) |
| 43 |
|| ( alsa jack pulseaudio sdl ) |
| 44 |
ampache? ( qt5 http )" |
| 45 |
@@ -50,7 +48,7 @@ RDEPEND=" |
| 46 |
dev-libs/dbus-glib |
| 47 |
dev-libs/glib |
| 48 |
dev-libs/libxml2:2 |
| 49 |
- ~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?] |
| 50 |
+ ~media-sound/audacious-${PV}[gtk?,qt5?] |
| 51 |
aac? ( >=media-libs/faad2-2.7 ) |
| 52 |
alsa? ( >=media-libs/alsa-lib-1.0.16 ) |
| 53 |
ampache? ( =media-libs/ampache_browser-1* ) |
| 54 |
@@ -73,7 +71,6 @@ RDEPEND=" |
| 55 |
fluidsynth? ( media-sound/fluidsynth ) |
| 56 |
http? ( >=net-libs/neon-0.26.4 ) |
| 57 |
gtk? ( x11-libs/gtk+:2 ) |
| 58 |
- gtk3? ( x11-libs/gtk+:3 ) |
| 59 |
qt5? ( |
| 60 |
dev-qt/qtcore:5 |
| 61 |
dev-qt/qtgui:5 |
| 62 |
@@ -103,26 +100,16 @@ RDEPEND=" |
| 63 |
>=media-libs/libogg-1.1.3 |
| 64 |
>=media-libs/libvorbis-1.2.0 |
| 65 |
) |
| 66 |
- wavpack? ( >=media-sound/wavpack-4.50.1-r1 )" |
| 67 |
- |
| 68 |
+ wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) |
| 69 |
+" |
| 70 |
DEPEND="${RDEPEND} |
| 71 |
dev-util/gdbus-codegen |
| 72 |
virtual/pkgconfig |
| 73 |
- nls? ( dev-util/intltool )" |
| 74 |
+ nls? ( dev-util/intltool ) |
| 75 |
+" |
| 76 |
|
| 77 |
S="${WORKDIR}/${MY_P}" |
| 78 |
|
| 79 |
-src_unpack() { |
| 80 |
- if [[ ${PV} == *9999 ]]; then |
| 81 |
- git-r3_src_unpack |
| 82 |
- else |
| 83 |
- default |
| 84 |
- if use gtk3; then |
| 85 |
- mv "${MY_P}"{-gtk3,} || die |
| 86 |
- fi |
| 87 |
- fi |
| 88 |
-} |
| 89 |
- |
| 90 |
src_prepare() { |
| 91 |
default |
| 92 |
[[ ${PV} == *9999 ]] && eautoreconf |
| 93 |
@@ -151,7 +138,7 @@ src_configure() { |
| 94 |
$(use_enable flac filewriter) \ |
| 95 |
$(use_enable fluidsynth amidiplug) \ |
| 96 |
$(use_enable gme console) \ |
| 97 |
- $(use_enable $(usex gtk gtk gtk3) gtk) \ |
| 98 |
+ $(use_enable gtk) \ |
| 99 |
$(use_enable hotkeys hotkey) \ |
| 100 |
$(use_enable http neon) \ |
| 101 |
$(use_enable jack) \ |
Archives