Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/
Date: Mon, 19 Nov 2018 22:53:57
Message-Id: 1542667674.004d0ed46fdc06dea52671cf44ef5d4778a7b002.asturm@gentoo
1 commit: 004d0ed46fdc06dea52671cf44ef5d4778a7b002
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 19 22:32:37 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 19 22:47:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=004d0ed4
7
8 media-plugins/audacious-plugins: Modernise src_configure
9
10 Use myeconfargs array.
11
12 Package-Manager: Portage-2.3.52, Repoman-2.3.12
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 .../audacious-plugins-3.10.ebuild | 90 +++++++++++-----------
16 .../audacious-plugins-9999.ebuild | 88 ++++++++++-----------
17 2 files changed, 89 insertions(+), 89 deletions(-)
18
19 diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
20 index 6cbc7f32165..01c53d0961d 100644
21 --- a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
22 +++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild
23 @@ -103,51 +103,51 @@ PATCHES=( "${FILESDIR}/${P}-fix-slow-search.patch" )
24 S="${WORKDIR}/${MY_P}"
25
26 src_configure() {
27 - if ! use mp3 ; then
28 - ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
29 - fi
30 + use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
31
32 - econf \
33 - --enable-mpris2 \
34 - --enable-qt \
35 - --enable-songchange \
36 - --disable-aosd \
37 - --disable-coreaudio \
38 - --disable-gtk \
39 - --disable-hotkey \
40 - --disable-notify \
41 - --disable-oss4 \
42 - --disable-qtglspectrum \
43 - --disable-sndio \
44 - $(use_enable aac) \
45 - $(use_enable alsa) \
46 - $(use_enable ampache) \
47 - $(use_enable bs2b) \
48 - $(use_enable cdda cdaudio) \
49 - $(use_enable cue) \
50 - $(use_enable flac) \
51 - $(use_enable flac filewriter) \
52 - $(use_enable fluidsynth amidiplug) \
53 - $(use_enable gme console) \
54 - $(use_enable http neon) \
55 - $(use_enable jack) \
56 - $(use_enable lame filewriter_mp3) \
57 - $(use_enable libnotify notify) \
58 - $(use_enable libsamplerate resample) \
59 - $(use_enable lirc) \
60 - $(use_enable mms) \
61 - $(use_enable modplug) \
62 - $(use_enable mp3 mpg123) \
63 - $(use_enable nls) \
64 - $(use_enable pulseaudio pulse) \
65 - $(use_enable qtmedia qtaudio) \
66 - $(use_enable scrobbler scrobbler2) \
67 - $(use_enable sdl sdlout) \
68 - $(use_enable sid) \
69 - $(use_enable sndfile) \
70 - $(use_enable soxr) \
71 - $(use_enable speedpitch) \
72 - $(use_enable vorbis) \
73 - $(use_enable wavpack) \
74 + local myeconfargs=(
75 + --enable-mpris2
76 + --enable-qt
77 + --enable-songchange
78 + --disable-aosd
79 + --disable-coreaudio
80 + --disable-gtk
81 + --disable-hotkey
82 + --disable-notify
83 + --disable-oss4
84 + --disable-qtglspectrum
85 + --disable-sndio
86 + $(use_enable aac)
87 + $(use_enable alsa)
88 + $(use_enable ampache)
89 + $(use_enable bs2b)
90 + $(use_enable cdda cdaudio)
91 + $(use_enable cue)
92 + $(use_enable flac)
93 + $(use_enable flac filewriter)
94 + $(use_enable fluidsynth amidiplug)
95 + $(use_enable gme console)
96 + $(use_enable http neon)
97 + $(use_enable jack)
98 + $(use_enable lame filewriter_mp3)
99 + $(use_enable libnotify notify)
100 + $(use_enable libsamplerate resample)
101 + $(use_enable lirc)
102 + $(use_enable mms)
103 + $(use_enable modplug)
104 + $(use_enable mp3 mpg123)
105 + $(use_enable nls)
106 + $(use_enable pulseaudio pulse)
107 + $(use_enable qtmedia qtaudio)
108 + $(use_enable scrobbler scrobbler2)
109 + $(use_enable sdl sdlout)
110 + $(use_enable sid)
111 + $(use_enable sndfile)
112 + $(use_enable soxr)
113 + $(use_enable speedpitch)
114 + $(use_enable vorbis)
115 + $(use_enable wavpack)
116 $(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
117 + )
118 + econf "${myeconfargs[@]}"
119 }
120
121 diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
122 index 944bc654f1d..bcc581ce8a0 100644
123 --- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
124 +++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
125 @@ -117,50 +117,50 @@ src_prepare() {
126 }
127
128 src_configure() {
129 - if ! use mp3 ; then
130 - ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
131 - fi
132 + use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
133
134 - econf \
135 - --enable-mpris2 \
136 - --enable-songchange \
137 - --disable-oss4 \
138 - --disable-qtglspectrum \
139 - --disable-coreaudio \
140 - --disable-sndio \
141 - $(use_enable aac) \
142 - $(use_enable alsa) \
143 - $(use_enable ampache) \
144 - $(use_enable aosd) \
145 - $(use_enable bs2b) \
146 - $(use_enable cdda cdaudio) \
147 - $(use_enable cue) \
148 - $(use_enable flac) \
149 - $(use_enable flac filewriter) \
150 - $(use_enable fluidsynth amidiplug) \
151 - $(use_enable gme console) \
152 - $(use_enable gtk) \
153 - $(use_enable hotkeys hotkey) \
154 - $(use_enable http neon) \
155 - $(use_enable jack) \
156 - $(use_enable lame filewriter_mp3) \
157 - $(use_enable libnotify notify) \
158 - $(use_enable libsamplerate resample) \
159 - $(use_enable lirc) \
160 - $(use_enable mms) \
161 - $(use_enable modplug) \
162 - $(use_enable mp3 mpg123) \
163 - $(use_enable nls) \
164 - $(use_enable pulseaudio pulse) \
165 - $(use_enable qt5 qt) \
166 - $(use_enable qtmedia qtaudio) \
167 - $(use_enable scrobbler scrobbler2) \
168 - $(use_enable sdl sdlout) \
169 - $(use_enable sid) \
170 - $(use_enable sndfile) \
171 - $(use_enable soxr) \
172 - $(use_enable speedpitch) \
173 - $(use_enable vorbis) \
174 - $(use_enable wavpack) \
175 + local myeconfargs=(
176 + --enable-mpris2
177 + --enable-songchange
178 + --disable-oss4
179 + --disable-qtglspectrum
180 + --disable-coreaudio
181 + --disable-sndio
182 + $(use_enable aac)
183 + $(use_enable alsa)
184 + $(use_enable ampache)
185 + $(use_enable aosd)
186 + $(use_enable bs2b)
187 + $(use_enable cdda cdaudio)
188 + $(use_enable cue)
189 + $(use_enable flac)
190 + $(use_enable flac filewriter)
191 + $(use_enable fluidsynth amidiplug)
192 + $(use_enable gme console)
193 + $(use_enable gtk)
194 + $(use_enable hotkeys hotkey)
195 + $(use_enable http neon)
196 + $(use_enable jack)
197 + $(use_enable lame filewriter_mp3)
198 + $(use_enable libnotify notify)
199 + $(use_enable libsamplerate resample)
200 + $(use_enable lirc)
201 + $(use_enable mms)
202 + $(use_enable modplug)
203 + $(use_enable mp3 mpg123)
204 + $(use_enable nls)
205 + $(use_enable pulseaudio pulse)
206 + $(use_enable qt5 qt)
207 + $(use_enable qtmedia qtaudio)
208 + $(use_enable scrobbler scrobbler2)
209 + $(use_enable sdl sdlout)
210 + $(use_enable sid)
211 + $(use_enable sndfile)
212 + $(use_enable soxr)
213 + $(use_enable speedpitch)
214 + $(use_enable vorbis)
215 + $(use_enable wavpack)
216 $(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
217 + )
218 + econf "${myeconfargs[@]}"
219 }