1 |
commit: 7e55472c302c17e309425bb0c2344cd802604c87 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 3 08:13:17 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 3 21:26:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e55472c |
7 |
|
8 |
media-sound/qmmp: USE: kde->dbus; add gnome,libav; drop mpris |
9 |
|
10 |
virtual/ffmpeg -> ffmpeg/libav |
11 |
Consolidate USE kde, mpris into one dbus flag |
12 |
Add USE=dbus to get full control over optional dev-qt/qtdbus DEPEND |
13 |
Add missing DEPEND: dev-libs/libcdio |
14 |
Sort IUSE, DEPENDs |
15 |
CMAKE_IN_SOURCE_BUILD seems not necessary anymore. |
16 |
|
17 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
18 |
Closes: https://github.com/gentoo/gentoo/pull/4840 |
19 |
|
20 |
media-sound/qmmp/qmmp-0.10.8.ebuild | 71 ++++++++++++++++++++++--------------- |
21 |
1 file changed, 43 insertions(+), 28 deletions(-) |
22 |
|
23 |
diff --git a/media-sound/qmmp/qmmp-0.10.8.ebuild b/media-sound/qmmp/qmmp-0.10.8.ebuild |
24 |
index 9c17a3c486f..8cae55c54f9 100644 |
25 |
--- a/media-sound/qmmp/qmmp-0.10.8.ebuild |
26 |
+++ b/media-sound/qmmp/qmmp-0.10.8.ebuild |
27 |
@@ -4,11 +4,11 @@ |
28 |
EAPI=6 |
29 |
|
30 |
inherit cmake-utils |
31 |
-[ "$PV" == "9999" ] && inherit subversion |
32 |
+[[ ${PV} = 9999 ]] && inherit subversion |
33 |
|
34 |
DESCRIPTION="Qt4-based audio player with winamp/xmms skins support" |
35 |
HOMEPAGE="http://qmmp.ylsoftware.com" |
36 |
-if [ "$PV" != "9999" ]; then |
37 |
+if [[ ${PV} != 9999 ]]; then |
38 |
SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2" |
39 |
KEYWORDS="~amd64 ~ppc ~x86" |
40 |
else |
41 |
@@ -18,50 +18,64 @@ fi |
42 |
LICENSE="GPL-2" |
43 |
SLOT="0" |
44 |
# KEYWORDS further up |
45 |
-IUSE="analyzer aac +alsa bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa |
46 |
-lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss projectm |
47 |
+IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome |
48 |
+jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm |
49 |
pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack" |
50 |
|
51 |
-RDEPEND="media-libs/taglib |
52 |
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )" |
53 |
+ |
54 |
+RDEPEND=" |
55 |
dev-qt/qtcore:4 |
56 |
- dev-qt/qtdbus:4 |
57 |
dev-qt/qtgui:4 |
58 |
dev-qt/qtmultimedia:4 |
59 |
+ media-libs/taglib |
60 |
+ aac? ( media-libs/faad2 ) |
61 |
alsa? ( media-libs/alsa-lib ) |
62 |
bs2b? ( media-libs/libbs2b ) |
63 |
- cdda? ( dev-libs/libcdio-paranoia ) |
64 |
+ cdda? ( |
65 |
+ dev-libs/libcdio |
66 |
+ dev-libs/libcdio-paranoia |
67 |
+ ) |
68 |
cue? ( media-libs/libcue ) |
69 |
curl? ( net-misc/curl ) |
70 |
- aac? ( media-libs/faad2 ) |
71 |
+ dbus? ( dev-qt/qtdbus:4 ) |
72 |
enca? ( app-i18n/enca ) |
73 |
+ ffmpeg? ( |
74 |
+ !libav? ( media-video/ffmpeg:= ) |
75 |
+ libav? ( media-video/libav:= ) |
76 |
+ ) |
77 |
flac? ( media-libs/flac ) |
78 |
game? ( media-libs/game-music-emu ) |
79 |
+ jack? ( |
80 |
+ media-libs/libsamplerate |
81 |
+ media-sound/jack-audio-connection-kit |
82 |
+ ) |
83 |
ladspa? ( media-libs/ladspa-cmt ) |
84 |
mad? ( media-libs/libmad ) |
85 |
midi? ( media-sound/wildmidi ) |
86 |
mms? ( media-libs/libmms ) |
87 |
+ modplug? ( >=media-libs/libmodplug-0.8.4 ) |
88 |
mplayer? ( media-video/mplayer ) |
89 |
musepack? ( >=media-sound/musepack-tools-444 ) |
90 |
- modplug? ( >=media-libs/libmodplug-0.8.4 ) |
91 |
- vorbis? ( media-libs/libvorbis |
92 |
- media-libs/libogg ) |
93 |
- jack? ( media-sound/jack-audio-connection-kit |
94 |
- media-libs/libsamplerate ) |
95 |
- ffmpeg? ( virtual/ffmpeg ) |
96 |
opus? ( media-libs/opusfile ) |
97 |
- projectm? ( media-libs/libprojectm |
98 |
- dev-qt/qtopengl:4 ) |
99 |
+ projectm? ( |
100 |
+ dev-qt/qtopengl:4 |
101 |
+ media-libs/libprojectm |
102 |
+ ) |
103 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) |
104 |
- wavpack? ( media-sound/wavpack ) |
105 |
scrobbler? ( net-misc/curl ) |
106 |
sndfile? ( media-libs/libsndfile ) |
107 |
soxr? ( media-libs/soxr ) |
108 |
- udisks? ( sys-fs/udisks:2 )" |
109 |
+ udisks? ( sys-fs/udisks:2 ) |
110 |
+ vorbis? ( |
111 |
+ media-libs/libogg |
112 |
+ media-libs/libvorbis |
113 |
+ ) |
114 |
+ wavpack? ( media-sound/wavpack ) |
115 |
+" |
116 |
DEPEND="${RDEPEND}" |
117 |
|
118 |
-DOCS="AUTHORS ChangeLog README" |
119 |
- |
120 |
-CMAKE_IN_SOURCE_BUILD="1" |
121 |
+DOCS=( AUTHORS ChangeLog README ) |
122 |
|
123 |
src_prepare() { |
124 |
if has_version dev-libs/libcdio-paranoia; then |
125 |
@@ -74,32 +88,33 @@ src_prepare() { |
126 |
} |
127 |
|
128 |
src_configure() { |
129 |
- mycmakeargs=( |
130 |
- -DUSE_ALSA="$(usex alsa)" |
131 |
+ local mycmakeargs=( |
132 |
-DUSE_AAC="$(usex aac)" |
133 |
+ -DUSE_ALSA="$(usex alsa)" |
134 |
-DUSE_ANALYZER="$(usex analyzer)" |
135 |
-DUSE_BS2B="$(usex bs2b)" |
136 |
-DUSE_CDA="$(usex cdda)" |
137 |
- -DUSE_CROSSFADE="$(usex crossfade)" |
138 |
-DUSE_COVER="$(usex cover)" |
139 |
+ -DUSE_CROSSFADE="$(usex crossfade)" |
140 |
-DUSE_CUE="$(usex cue)" |
141 |
-DUSE_CURL="$(usex curl)" |
142 |
+ -DUSE_KDENOTIFY="$(usex dbus)" |
143 |
+ -DUSE_MPRIS="$(usex dbus)" |
144 |
-DUSE_ENCA="$(usex enca)" |
145 |
-DUSE_FFMPEG="$(usex ffmpeg)" |
146 |
-DUSE_FFMPEG_LEGACY=OFF |
147 |
-DUSE_FLAC="$(usex flac)" |
148 |
-DUSE_GME="$(usex game)" |
149 |
+ -DUSE_GNOMEHOTKEY="$(usex gnome)" |
150 |
-DUSE_HAL=OFF |
151 |
-DUSE_JACK="$(usex jack)" |
152 |
- -DUSE_KDENOTIFY="$(usex kde)" |
153 |
-DUSE_LADSPA="$(usex ladspa)" |
154 |
-DUSE_LYRICS="$(usex lyrics)" |
155 |
-DUSE_MAD="$(usex mad)" |
156 |
-DUSE_MIDI="$(usex midi)" |
157 |
- -DUSE_MPLAYER="$(usex mplayer)" |
158 |
-DUSE_MMS="$(usex mms)" |
159 |
-DUSE_MODPLUG="$(usex modplug)" |
160 |
- -DUSE_MPRIS="$(usex mpris)" |
161 |
+ -DUSE_MPLAYER="$(usex mplayer)" |
162 |
-DUSE_MPC="$(usex musepack)" |
163 |
-DUSE_NOTIFIER="$(usex notifier)" |
164 |
-DUSE_OPUS="$(usex opus)" |
165 |
@@ -116,7 +131,7 @@ src_configure() { |
166 |
-DUSE_UDISKS=OFF |
167 |
-DUSE_VORBIS="$(usex vorbis)" |
168 |
-DUSE_WAVPACK="$(usex wavpack)" |
169 |
- ) |
170 |
+ ) |
171 |
|
172 |
cmake-utils_src_configure |
173 |
} |