1 |
commit: 3941babba3417404fffb6276626cd2a799cdff57 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 3 11:54:58 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 3 21:26:24 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3941babb |
7 |
|
8 |
media-sound/qmmp: Sort build flags |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/4840 |
12 |
|
13 |
media-sound/qmmp/qmmp-1.1.8.ebuild | 14 +++++++------- |
14 |
media-sound/qmmp/qmmp-9999.ebuild | 14 +++++++------- |
15 |
2 files changed, 14 insertions(+), 14 deletions(-) |
16 |
|
17 |
diff --git a/media-sound/qmmp/qmmp-1.1.8.ebuild b/media-sound/qmmp/qmmp-1.1.8.ebuild |
18 |
index d7b854b1781..846c740edb7 100644 |
19 |
--- a/media-sound/qmmp/qmmp-1.1.8.ebuild |
20 |
+++ b/media-sound/qmmp/qmmp-1.1.8.ebuild |
21 |
@@ -23,6 +23,8 @@ IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg fl |
22 |
jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm |
23 |
pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack" |
24 |
|
25 |
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )" |
26 |
+ |
27 |
RDEPEND=" |
28 |
dev-qt/qtcore:5 |
29 |
dev-qt/qtgui:5 |
30 |
@@ -84,8 +86,6 @@ DEPEND="${RDEPEND} |
31 |
|
32 |
DOCS=( AUTHORS ChangeLog README ) |
33 |
|
34 |
-REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )" |
35 |
- |
36 |
src_prepare() { |
37 |
if has_version dev-libs/libcdio-paranoia; then |
38 |
sed -i \ |
39 |
@@ -98,15 +98,17 @@ src_prepare() { |
40 |
|
41 |
src_configure() { |
42 |
local mycmakeargs=( |
43 |
- -DUSE_ALSA="$(usex alsa)" |
44 |
-DUSE_AAC="$(usex aac)" |
45 |
+ -DUSE_ALSA="$(usex alsa)" |
46 |
-DUSE_ANALYZER="$(usex analyzer)" |
47 |
-DUSE_BS2B="$(usex bs2b)" |
48 |
-DUSE_CDA="$(usex cdda)" |
49 |
- -DUSE_CROSSFADE="$(usex crossfade)" |
50 |
-DUSE_COVER="$(usex cover)" |
51 |
+ -DUSE_CROSSFADE="$(usex crossfade)" |
52 |
-DUSE_CUE="$(usex cue)" |
53 |
-DUSE_CURL="$(usex curl)" |
54 |
+ -DUSE_KDENOTIFY="$(usex dbus)" |
55 |
+ -DUSE_MPRIS="$(usex dbus)" |
56 |
-DUSE_ENCA="$(usex enca)" |
57 |
-DUSE_FFMPEG="$(usex ffmpeg)" |
58 |
-DUSE_FLAC="$(usex flac)" |
59 |
@@ -114,15 +116,13 @@ src_configure() { |
60 |
-DUSE_GNOMEHOTKEY="$(usex gnome)" |
61 |
-DUSE_HAL=OFF |
62 |
-DUSE_JACK="$(usex jack)" |
63 |
- -DUSE_KDENOTIFY="$(usex dbus)" |
64 |
-DUSE_LADSPA="$(usex ladspa)" |
65 |
-DUSE_LYRICS="$(usex lyrics)" |
66 |
-DUSE_MAD="$(usex mad)" |
67 |
-DUSE_MIDI="$(usex midi)" |
68 |
- -DUSE_MPLAYER="$(usex mplayer)" |
69 |
-DUSE_MMS="$(usex mms)" |
70 |
-DUSE_MODPLUG="$(usex modplug)" |
71 |
- -DUSE_MPRIS="$(usex dbus)" |
72 |
+ -DUSE_MPLAYER="$(usex mplayer)" |
73 |
-DUSE_MPC="$(usex musepack)" |
74 |
-DUSE_NOTIFIER="$(usex notifier)" |
75 |
-DUSE_OPUS="$(usex opus)" |
76 |
|
77 |
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild |
78 |
index d7b854b1781..846c740edb7 100644 |
79 |
--- a/media-sound/qmmp/qmmp-9999.ebuild |
80 |
+++ b/media-sound/qmmp/qmmp-9999.ebuild |
81 |
@@ -23,6 +23,8 @@ IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg fl |
82 |
jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm |
83 |
pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack" |
84 |
|
85 |
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )" |
86 |
+ |
87 |
RDEPEND=" |
88 |
dev-qt/qtcore:5 |
89 |
dev-qt/qtgui:5 |
90 |
@@ -84,8 +86,6 @@ DEPEND="${RDEPEND} |
91 |
|
92 |
DOCS=( AUTHORS ChangeLog README ) |
93 |
|
94 |
-REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )" |
95 |
- |
96 |
src_prepare() { |
97 |
if has_version dev-libs/libcdio-paranoia; then |
98 |
sed -i \ |
99 |
@@ -98,15 +98,17 @@ src_prepare() { |
100 |
|
101 |
src_configure() { |
102 |
local mycmakeargs=( |
103 |
- -DUSE_ALSA="$(usex alsa)" |
104 |
-DUSE_AAC="$(usex aac)" |
105 |
+ -DUSE_ALSA="$(usex alsa)" |
106 |
-DUSE_ANALYZER="$(usex analyzer)" |
107 |
-DUSE_BS2B="$(usex bs2b)" |
108 |
-DUSE_CDA="$(usex cdda)" |
109 |
- -DUSE_CROSSFADE="$(usex crossfade)" |
110 |
-DUSE_COVER="$(usex cover)" |
111 |
+ -DUSE_CROSSFADE="$(usex crossfade)" |
112 |
-DUSE_CUE="$(usex cue)" |
113 |
-DUSE_CURL="$(usex curl)" |
114 |
+ -DUSE_KDENOTIFY="$(usex dbus)" |
115 |
+ -DUSE_MPRIS="$(usex dbus)" |
116 |
-DUSE_ENCA="$(usex enca)" |
117 |
-DUSE_FFMPEG="$(usex ffmpeg)" |
118 |
-DUSE_FLAC="$(usex flac)" |
119 |
@@ -114,15 +116,13 @@ src_configure() { |
120 |
-DUSE_GNOMEHOTKEY="$(usex gnome)" |
121 |
-DUSE_HAL=OFF |
122 |
-DUSE_JACK="$(usex jack)" |
123 |
- -DUSE_KDENOTIFY="$(usex dbus)" |
124 |
-DUSE_LADSPA="$(usex ladspa)" |
125 |
-DUSE_LYRICS="$(usex lyrics)" |
126 |
-DUSE_MAD="$(usex mad)" |
127 |
-DUSE_MIDI="$(usex midi)" |
128 |
- -DUSE_MPLAYER="$(usex mplayer)" |
129 |
-DUSE_MMS="$(usex mms)" |
130 |
-DUSE_MODPLUG="$(usex modplug)" |
131 |
- -DUSE_MPRIS="$(usex dbus)" |
132 |
+ -DUSE_MPLAYER="$(usex mplayer)" |
133 |
-DUSE_MPC="$(usex musepack)" |
134 |
-DUSE_NOTIFIER="$(usex notifier)" |
135 |
-DUSE_OPUS="$(usex opus)" |