Gentoo Archives: gentoo-commits

From: Markos Chandras <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/
Date: Sun, 04 Dec 2016 19:53:28
Message-Id: 1480881099.1fb075db6d8cae32e04c87d06f12092f424460f9.hwoarang@gentoo
1 commit: 1fb075db6d8cae32e04c87d06f12092f424460f9
2 Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 4 19:49:16 2016 +0000
4 Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 4 19:51:39 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb075db
7
8 media-sound/qmmp: Capitalize cmake options
9
10 Gentoo-Bug: 576592, 601526
11
12 Package-Manager: portage-2.3.2
13
14 .../{qmmp-1.0.10.ebuild => qmmp-1.0.10-r1.ebuild} | 60 +++++++++---------
15 media-sound/qmmp/qmmp-9999.ebuild | 74 ++++++++++------------
16 2 files changed, 65 insertions(+), 69 deletions(-)
17
18 diff --git a/media-sound/qmmp/qmmp-1.0.10.ebuild b/media-sound/qmmp/qmmp-1.0.10-r1.ebuild
19 similarity index 75%
20 rename from media-sound/qmmp/qmmp-1.0.10.ebuild
21 rename to media-sound/qmmp/qmmp-1.0.10-r1.ebuild
22 index 0713ab9..902fb39 100644
23 --- a/media-sound/qmmp/qmmp-1.0.10.ebuild
24 +++ b/media-sound/qmmp/qmmp-1.0.10-r1.ebuild
25 @@ -87,46 +87,46 @@ src_prepare() {
26
27 src_configure() {
28 mycmakeargs=(
29 - -DUSE_alsa="$(usex alsa)"
30 - -DUSE_aac="$(usex aac)"
31 - -DUSE_analyzer="$(usex analyzer)"
32 - -DUSE_bs2b="$(usex bs2b)"
33 + -DUSE_ALSA="$(usex alsa)"
34 + -DUSE_AAC="$(usex aac)"
35 + -DUSE_ANALYZER="$(usex analyzer)"
36 + -DUSE_BS2B="$(usex bs2b)"
37 -DUSE_CDA="$(usex cdda)"
38 - -DUSE_crossfade="$(usex crossfade)"
39 - -DUSE_cover="$(usex cover)"
40 - -DUSE_cue="$(usex cue)"
41 - -DUSE_curl="$(usex curl)"
42 - -DUSE_dbus="$(usex dbus)"
43 - -DUSE_enca="$(usex enca)"
44 - -DUSE_ffmpeg="$(usex ffmpeg)"
45 - -DUSE_flac="$(usex flac)"
46 + -DUSE_CROSSFADE="$(usex crossfade)"
47 + -DUSE_COVER="$(usex cover)"
48 + -DUSE_CUE="$(usex cue)"
49 + -DUSE_CURL="$(usex curl)"
50 + -DUSE_DBUS="$(usex dbus)"
51 + -DUSE_ENCA="$(usex enca)"
52 + -DUSE_FFMPEG="$(usex ffmpeg)"
53 + -DUSE_FLAC="$(usex flac)"
54 -DUSE_GME="$(usex game)"
55 -DUSE_HAL=OFF
56 - -DUSE_jack="$(usex jack)"
57 + -DUSE_JACK="$(usex jack)"
58 -DUSE_KDENOTIFY="$(usex kde)"
59 - -DUSE_ladspa="$(usex ladspa)"
60 - -DUSE_lyrics="$(usex lyrics)"
61 - -DUSE_mad="$(usex mad)"
62 + -DUSE_LADSPA="$(usex ladspa)"
63 + -DUSE_LYRICS="$(usex lyrics)"
64 + -DUSE_MAD="$(usex mad)"
65 -DUSE_MIDI_WILDMIDI="$(usex midi)"
66 - -DUSE_mplayer="$(usex mplayer)"
67 - -DUSE_mms="$(usex mms)"
68 - -DUSE_modplug="$(usex modplug)"
69 - -DUSE_mpris="$(usex mpris)"
70 + -DUSE_MPLAYER="$(usex mplayer)"
71 + -DUSE_MMS="$(usex mms)"
72 + -DUSE_MODPLUG="$(usex modplug)"
73 + -DUSE_MPRIS="$(usex mpris)"
74 -DUSE_MPC="$(usex musepack)"
75 - -DUSE_notifier="$(usex notifier)"
76 - -DUSE_opus="$(usex opus)"
77 - -DUSE_oss="$(usex oss)"
78 - -DUSE_projectm="$(usex projectm)"
79 + -DUSE_NOTIFIER="$(usex notifier)"
80 + -DUSE_OPUS="$(usex opus)"
81 + -DUSE_OSS="$(usex oss)"
82 + -DUSE_PROJECTM="$(usex projectm)"
83 -DUSE_PULSE="$(usex pulseaudio)"
84 - -DUSE_qsui="$(usex qsui)"
85 - -DUSE_scrobbler="$(usex scrobbler)"
86 - -DUSE_sndfile="$(usex sndfile)"
87 - -DUSE_stereo="$(usex stereo)"
88 + -DUSE_QSUI="$(usex qsui)"
89 + -DUSE_SCROBBLER="$(usex scrobbler)"
90 + -DUSE_SNDFILE="$(usex sndfile)"
91 + -DUSE_STEREO="$(usex stereo)"
92 -DUSE_STATICON="$(usex tray)"
93 -DUSE_UDISKS2="$(usex udisks)"
94 -DUSE_SRC="$(usex libsamplerate)"
95 - -DUSE_vorbis="$(usex vorbis)"
96 - -DUSE_wavpack="$(usex wavpack)"
97 + -DUSE_VORBIS="$(usex vorbis)"
98 + -DUSE_WAVPACK="$(usex wavpack)"
99 )
100
101 cmake-utils_src_configure
102
103 diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
104 index 0713ab9..488c726 100644
105 --- a/media-sound/qmmp/qmmp-9999.ebuild
106 +++ b/media-sound/qmmp/qmmp-9999.ebuild
107 @@ -22,9 +22,9 @@ fi
108 LICENSE="GPL-2"
109 SLOT="0"
110 # KEYWORDS further up
111 -IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
112 -libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
113 -projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
114 +IUSE="analyzer aac +alsa bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
115 +lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss projectm
116 +pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack"
117
118 RDEPEND="media-libs/taglib
119 dev-qt/qtcore:5
120 @@ -38,13 +38,11 @@ RDEPEND="media-libs/taglib
121 cdda? ( dev-libs/libcdio-paranoia )
122 cue? ( media-libs/libcue )
123 curl? ( net-misc/curl )
124 - dbus? ( sys-apps/dbus )
125 aac? ( media-libs/faad2 )
126 enca? ( app-i18n/enca )
127 flac? ( media-libs/flac )
128 game? ( media-libs/game-music-emu )
129 ladspa? ( media-libs/ladspa-cmt )
130 - libsamplerate? ( media-libs/libsamplerate )
131 mad? ( media-libs/libmad )
132 midi? ( media-sound/wildmidi )
133 mms? ( media-libs/libmms )
134 @@ -65,6 +63,7 @@ RDEPEND="media-libs/taglib
135 wavpack? ( media-sound/wavpack )
136 scrobbler? ( net-misc/curl )
137 sndfile? ( media-libs/libsndfile )
138 + soxr? ( media-libs/soxr )
139 udisks? ( sys-fs/udisks:2 )"
140 DEPEND="${RDEPEND}
141 dev-qt/linguist-tools:5"
142 @@ -73,8 +72,6 @@ DOCS="AUTHORS ChangeLog README"
143
144 CMAKE_IN_SOURCE_BUILD="1"
145
146 -REQUIRED_USE="kde? ( dbus ) "
147 -
148 src_prepare() {
149 if has_version dev-libs/libcdio-paranoia; then
150 sed -i \
151 @@ -87,46 +84,45 @@ src_prepare() {
152
153 src_configure() {
154 mycmakeargs=(
155 - -DUSE_alsa="$(usex alsa)"
156 - -DUSE_aac="$(usex aac)"
157 - -DUSE_analyzer="$(usex analyzer)"
158 - -DUSE_bs2b="$(usex bs2b)"
159 + -DUSE_ALSA="$(usex alsa)"
160 + -DUSE_AAC="$(usex aac)"
161 + -DUSE_ANALYZER="$(usex analyzer)"
162 + -DUSE_BS2B="$(usex bs2b)"
163 -DUSE_CDA="$(usex cdda)"
164 - -DUSE_crossfade="$(usex crossfade)"
165 - -DUSE_cover="$(usex cover)"
166 - -DUSE_cue="$(usex cue)"
167 - -DUSE_curl="$(usex curl)"
168 - -DUSE_dbus="$(usex dbus)"
169 - -DUSE_enca="$(usex enca)"
170 - -DUSE_ffmpeg="$(usex ffmpeg)"
171 - -DUSE_flac="$(usex flac)"
172 + -DUSE_CROSSFADE="$(usex crossfade)"
173 + -DUSE_COVER="$(usex cover)"
174 + -DUSE_CUE="$(usex cue)"
175 + -DUSE_CURL="$(usex curl)"
176 + -DUSE_ENCA="$(usex enca)"
177 + -DUSE_FFMPEG="$(usex ffmpeg)"
178 + -DUSE_FLAC="$(usex flac)"
179 -DUSE_GME="$(usex game)"
180 -DUSE_HAL=OFF
181 - -DUSE_jack="$(usex jack)"
182 + -DUSE_JACK="$(usex jack)"
183 -DUSE_KDENOTIFY="$(usex kde)"
184 - -DUSE_ladspa="$(usex ladspa)"
185 - -DUSE_lyrics="$(usex lyrics)"
186 - -DUSE_mad="$(usex mad)"
187 - -DUSE_MIDI_WILDMIDI="$(usex midi)"
188 - -DUSE_mplayer="$(usex mplayer)"
189 - -DUSE_mms="$(usex mms)"
190 - -DUSE_modplug="$(usex modplug)"
191 - -DUSE_mpris="$(usex mpris)"
192 + -DUSE_LADSPA="$(usex ladspa)"
193 + -DUSE_LYRICS="$(usex lyrics)"
194 + -DUSE_MAD="$(usex mad)"
195 + -DUSE_MIDI="$(usex midi)"
196 + -DUSE_MPLAYER="$(usex mplayer)"
197 + -DUSE_MMS="$(usex mms)"
198 + -DUSE_MODPLUG="$(usex modplug)"
199 + -DUSE_MPRIS="$(usex mpris)"
200 -DUSE_MPC="$(usex musepack)"
201 - -DUSE_notifier="$(usex notifier)"
202 - -DUSE_opus="$(usex opus)"
203 - -DUSE_oss="$(usex oss)"
204 - -DUSE_projectm="$(usex projectm)"
205 + -DUSE_NOTIFIER="$(usex notifier)"
206 + -DUSE_OPUS="$(usex opus)"
207 + -DUSE_OSS="$(usex oss)"
208 + -DUSE_PROJECTM="$(usex projectm)"
209 -DUSE_PULSE="$(usex pulseaudio)"
210 - -DUSE_qsui="$(usex qsui)"
211 - -DUSE_scrobbler="$(usex scrobbler)"
212 - -DUSE_sndfile="$(usex sndfile)"
213 - -DUSE_stereo="$(usex stereo)"
214 + -DUSE_QSUI="$(usex qsui)"
215 + -DUSE_SCROBBLER="$(usex scrobbler)"
216 + -DUSE_SNDFILE="$(usex sndfile)"
217 + -DUSE_SOXR="$(usex soxr)"
218 + -DUSE_STEREO="$(usex stereo)"
219 -DUSE_STATICON="$(usex tray)"
220 -DUSE_UDISKS2="$(usex udisks)"
221 - -DUSE_SRC="$(usex libsamplerate)"
222 - -DUSE_vorbis="$(usex vorbis)"
223 - -DUSE_wavpack="$(usex wavpack)"
224 + -DUSE_VORBIS="$(usex vorbis)"
225 + -DUSE_WAVPACK="$(usex wavpack)"
226 )
227
228 cmake-utils_src_configure