Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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-sound/lmms/
Date: Tue, 26 Sep 2017 00:54:27
Message-Id: 1506387013.24fbf89366fd2cd994e6ca46b58565783d8b0199.asturm@gentoo
1 commit: 24fbf89366fd2cd994e6ca46b58565783d8b0199
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 26 00:44:35 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 26 00:50:13 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24fbf893
7
8 media-sound/lmms: Drop USE=qt5 and make it unconditional
9
10 - Drop unused eutils.eclass
11 - Sort DEPENDs
12 - Remove duplicate KEYWORDS
13
14 Gentoo-bug: 631906
15 Package-Manager: Portage-2.3.10, Repoman-2.3.3
16
17 media-sound/lmms/lmms-1.1.90.ebuild | 54 ++++++++++++++++++-------------------
18 media-sound/lmms/lmms-9999.ebuild | 54 ++++++++++++++++++-------------------
19 2 files changed, 54 insertions(+), 54 deletions(-)
20
21 diff --git a/media-sound/lmms/lmms-1.1.90.ebuild b/media-sound/lmms/lmms-1.1.90.ebuild
22 index 9fb0ae7c9eb..ee2e0167921 100644
23 --- a/media-sound/lmms/lmms-1.1.90.ebuild
24 +++ b/media-sound/lmms/lmms-1.1.90.ebuild
25 @@ -3,14 +3,13 @@
26
27 EAPI=6
28
29 -inherit eutils cmake-utils
30 +inherit cmake-utils
31
32 DESCRIPTION="Cross-platform music production software"
33 HOMEPAGE="https://lmms.io"
34 if [[ ${PV} == "9999" ]]; then
35 EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
36 inherit git-r3
37 - KEYWORDS=""
38 else
39 SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
40 KEYWORDS="~amd64 ~x86"
41 @@ -19,17 +18,11 @@ fi
42 LICENSE="GPL-2 LGPL-2"
43 SLOT="0"
44
45 -IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio qt5 sdl soundio
46 - stk vst"
47 +IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
48
49 -RDEPEND="qt5? (
50 - dev-qt/qtcore:5
51 - dev-qt/qtgui:5
52 - )
53 - !qt5? (
54 - dev-qt/qtcore:4
55 - dev-qt/qtgui:4[accessibility]
56 - )
57 +COMMON_DEPEND="
58 + dev-qt/qtcore:5
59 + dev-qt/qtgui:5
60 >=media-libs/libsamplerate-0.1.8
61 >=media-libs/libsndfile-1.0.11
62 sci-libs/fftw:3.0
63 @@ -39,29 +32,36 @@ RDEPEND="qt5? (
64 fluidsynth? ( media-sound/fluidsynth )
65 jack? ( virtual/jack )
66 libgig? ( media-libs/libgig )
67 - ogg? ( media-libs/libvorbis
68 - media-libs/libogg )
69 + ogg? (
70 + media-libs/libogg
71 + media-libs/libvorbis
72 + )
73 portaudio? ( >=media-libs/portaudio-19_pre )
74 pulseaudio? ( media-sound/pulseaudio )
75 - sdl? ( media-libs/libsdl
76 - >=media-libs/sdl-sound-1.0.1 )
77 + sdl? (
78 + media-libs/libsdl
79 + >=media-libs/sdl-sound-1.0.1
80 + )
81 soundio? ( media-libs/libsoundio )
82 stk? ( media-libs/stk )
83 - vst? ( || ( app-emulation/wine virtual/wine ) )"
84 -DEPEND="${RDEPEND}
85 - qt5? ( dev-qt/linguist-tools:5 )
86 - >=dev-util/cmake-2.4.5"
87 -RDEPEND="${RDEPEND}
88 - media-plugins/swh-plugins
89 + vst? ( || ( app-emulation/wine virtual/wine ) )
90 +"
91 +DEPEND="${COMMON_DEPEND}
92 + dev-qt/linguist-tools:5
93 + >=dev-util/cmake-2.4.5
94 +"
95 +RDEPEND="${COMMON_DEPEND}
96 + media-libs/ladspa-cmt
97 + media-plugins/calf
98 media-plugins/caps-plugins
99 + media-plugins/swh-plugins
100 media-plugins/tap-plugins
101 - media-plugins/calf
102 - media-libs/ladspa-cmt"
103 +"
104
105 -DOCS=(README.md doc/AUTHORS)
106 +DOCS=( README.md doc/AUTHORS )
107
108 src_configure() {
109 - mycmakeargs+=(
110 + local mycmakeargs+=(
111 -DUSE_WERROR=FALSE
112 -DWANT_SYSTEM_SR=TRUE
113 -DWANT_CAPS=FALSE
114 @@ -69,6 +69,7 @@ src_configure() {
115 -DWANT_SWH=FALSE
116 -DWANT_CMT=FALSE
117 -DWANT_CALF=FALSE
118 + -DWANT_QT5=TRUE
119 -DCMAKE_INSTALL_LIBDIR=$(get_libdir)
120 -DWANT_ALSA=$(usex alsa)
121 -DWANT_JACK=$(usex jack)
122 @@ -76,7 +77,6 @@ src_configure() {
123 -DWANT_OGGVORBIS=$(usex ogg)
124 -DWANT_PORTAUDIO=$(usex portaudio)
125 -DWANT_PULSEAUDIO=$(usex pulseaudio)
126 - -DWANT_QT5=$(usex qt5)
127 -DWANT_SDL=$(usex sdl)
128 -DWANT_SOUNDIO=$(usex soundio)
129 -DWANT_STK=$(usex stk)
130
131 diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
132 index 9fb0ae7c9eb..ee2e0167921 100644
133 --- a/media-sound/lmms/lmms-9999.ebuild
134 +++ b/media-sound/lmms/lmms-9999.ebuild
135 @@ -3,14 +3,13 @@
136
137 EAPI=6
138
139 -inherit eutils cmake-utils
140 +inherit cmake-utils
141
142 DESCRIPTION="Cross-platform music production software"
143 HOMEPAGE="https://lmms.io"
144 if [[ ${PV} == "9999" ]]; then
145 EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
146 inherit git-r3
147 - KEYWORDS=""
148 else
149 SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
150 KEYWORDS="~amd64 ~x86"
151 @@ -19,17 +18,11 @@ fi
152 LICENSE="GPL-2 LGPL-2"
153 SLOT="0"
154
155 -IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio qt5 sdl soundio
156 - stk vst"
157 +IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
158
159 -RDEPEND="qt5? (
160 - dev-qt/qtcore:5
161 - dev-qt/qtgui:5
162 - )
163 - !qt5? (
164 - dev-qt/qtcore:4
165 - dev-qt/qtgui:4[accessibility]
166 - )
167 +COMMON_DEPEND="
168 + dev-qt/qtcore:5
169 + dev-qt/qtgui:5
170 >=media-libs/libsamplerate-0.1.8
171 >=media-libs/libsndfile-1.0.11
172 sci-libs/fftw:3.0
173 @@ -39,29 +32,36 @@ RDEPEND="qt5? (
174 fluidsynth? ( media-sound/fluidsynth )
175 jack? ( virtual/jack )
176 libgig? ( media-libs/libgig )
177 - ogg? ( media-libs/libvorbis
178 - media-libs/libogg )
179 + ogg? (
180 + media-libs/libogg
181 + media-libs/libvorbis
182 + )
183 portaudio? ( >=media-libs/portaudio-19_pre )
184 pulseaudio? ( media-sound/pulseaudio )
185 - sdl? ( media-libs/libsdl
186 - >=media-libs/sdl-sound-1.0.1 )
187 + sdl? (
188 + media-libs/libsdl
189 + >=media-libs/sdl-sound-1.0.1
190 + )
191 soundio? ( media-libs/libsoundio )
192 stk? ( media-libs/stk )
193 - vst? ( || ( app-emulation/wine virtual/wine ) )"
194 -DEPEND="${RDEPEND}
195 - qt5? ( dev-qt/linguist-tools:5 )
196 - >=dev-util/cmake-2.4.5"
197 -RDEPEND="${RDEPEND}
198 - media-plugins/swh-plugins
199 + vst? ( || ( app-emulation/wine virtual/wine ) )
200 +"
201 +DEPEND="${COMMON_DEPEND}
202 + dev-qt/linguist-tools:5
203 + >=dev-util/cmake-2.4.5
204 +"
205 +RDEPEND="${COMMON_DEPEND}
206 + media-libs/ladspa-cmt
207 + media-plugins/calf
208 media-plugins/caps-plugins
209 + media-plugins/swh-plugins
210 media-plugins/tap-plugins
211 - media-plugins/calf
212 - media-libs/ladspa-cmt"
213 +"
214
215 -DOCS=(README.md doc/AUTHORS)
216 +DOCS=( README.md doc/AUTHORS )
217
218 src_configure() {
219 - mycmakeargs+=(
220 + local mycmakeargs+=(
221 -DUSE_WERROR=FALSE
222 -DWANT_SYSTEM_SR=TRUE
223 -DWANT_CAPS=FALSE
224 @@ -69,6 +69,7 @@ src_configure() {
225 -DWANT_SWH=FALSE
226 -DWANT_CMT=FALSE
227 -DWANT_CALF=FALSE
228 + -DWANT_QT5=TRUE
229 -DCMAKE_INSTALL_LIBDIR=$(get_libdir)
230 -DWANT_ALSA=$(usex alsa)
231 -DWANT_JACK=$(usex jack)
232 @@ -76,7 +77,6 @@ src_configure() {
233 -DWANT_OGGVORBIS=$(usex ogg)
234 -DWANT_PORTAUDIO=$(usex portaudio)
235 -DWANT_PULSEAUDIO=$(usex pulseaudio)
236 - -DWANT_QT5=$(usex qt5)
237 -DWANT_SDL=$(usex sdl)
238 -DWANT_SOUNDIO=$(usex soundio)
239 -DWANT_STK=$(usex stk)
Report Message
Find on MARC Find on Google Groups