Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/
Date: Sat, 01 Jul 2017 10:05:47
Message-Id: 1498903533.4bc4e70ab2ac5f747e554fff50f003fbe8878693.kensington@gentoo
1 commit: 4bc4e70ab2ac5f747e554fff50f003fbe8878693
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 1 10:04:20 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 1 10:05:33 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc4e70a
7
8 media-sound/mixxx: remove old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 media-sound/mixxx/Manifest | 2 -
13 media-sound/mixxx/metadata.xml | 1 -
14 media-sound/mixxx/mixxx-1.10.1.ebuild | 84 ---------------------
15 media-sound/mixxx/mixxx-1.11.0-r1.ebuild | 97 ------------------------
16 media-sound/mixxx/mixxx-2.0.0-r3.ebuild | 126 -------------------------------
17 5 files changed, 310 deletions(-)
18
19 diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
20 index cb3150a1e72..6ecb5227750 100644
21 --- a/media-sound/mixxx/Manifest
22 +++ b/media-sound/mixxx/Manifest
23 @@ -1,5 +1,3 @@
24 -DIST mixxx-1.10.1-src.tar.gz 15948956 SHA256 eab49a95336dacee9a9e4c2ad22a0436e9c0b341930e9a03e3b46619d7a9f365 SHA512 eff18cba96d781830d33a35cf74dcac0dc33c9d2c16e9533d171d2acc2fd0ad602f5bb46d62212e224e61357332a5d9ed078ca86532f39ee01057eb3aaf09af3 WHIRLPOOL 39fda17c512030da1c4de4e495ad22ff9fda9b5aeccfcdd3a7f35d08ebed79c2e6655bef409a43bfd25a072a01e3512669a566048f40b46c9d1c3143f58f821c
25 -DIST mixxx-1.11.0-src.tar.gz 24473835 SHA256 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331 SHA512 a42c2e3a648986e401f9812315942b5c68e0bc4f47ce867eb043d64f9d7836860e414b04b5e5da52b0541da5069d231774f30e965bcf3bd0db09f6bca74876c2 WHIRLPOOL 9ab4de6bfa5840500f04a4e7d523b6546e0ef08ade017f14b73425e205f039a6da11604f2b0e902085ff3062fff451385f984735029592d4b10ac3d4e0c985b1
26 DIST mixxx-2.0.0-ffmpeg30.patch 714 SHA256 a5b6e8fd94ae6572efbff79529dcdb8ec2fc78a2c8fc0864d222516c8dc7b272 SHA512 60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54 WHIRLPOOL 8c780336a5f86ba8134603c1f5e3dd310006f62abe228edb2390e611f2734b0ee7c0bfe5cd91de7fab28e56809804c95fd26da6d198513fc705263e8ceca1612
27 DIST mixxx-2.0.0-ffmpeg31.patch 2844 SHA256 d03109463fa1191ca07bc2be6b6503c4b57272e97064f99aae812e132737f905 SHA512 7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74 WHIRLPOOL 9284dd52c4ffe04ca7977dc4ee1b6c3a6396375a48dcb9673f39a5ceb2698021f93984d57a774b36b3dfaffa15f9ca603eeae169fa146e9951da0a587fed34dd
28 DIST mixxx-2.0.0-src.tar.gz 25300881 SHA256 e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d SHA512 8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a WHIRLPOOL d3e4cf26846b54380f9b11eed26b90cf031a902ca82f20e71f85fb495f99179e8d783f2ba92b51d21fcc77d4779b7bcc16d8456a68e890cfe77daa57f0d3b431
29
30 diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
31 index 127ec81d774..4627d1b0b25 100644
32 --- a/media-sound/mixxx/metadata.xml
33 +++ b/media-sound/mixxx/metadata.xml
34 @@ -8,7 +8,6 @@
35 <use>
36 <flag name="hid">Enable HID controller support</flag>
37 <flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
38 - <flag name="vamp">Enable vamp analyzing plugins support</flag>
39 </use>
40 <upstream>
41 <remote-id type="sourceforge">mixxx</remote-id>
42
43 diff --git a/media-sound/mixxx/mixxx-1.10.1.ebuild b/media-sound/mixxx/mixxx-1.10.1.ebuild
44 deleted file mode 100644
45 index 8f02fbc767f..00000000000
46 --- a/media-sound/mixxx/mixxx-1.10.1.ebuild
47 +++ /dev/null
48 @@ -1,84 +0,0 @@
49 -# Copyright 1999-2013 Gentoo Foundation
50 -# Distributed under the terms of the GNU General Public License v2
51 -
52 -EAPI=4
53 -
54 -inherit eutils multilib scons-utils toolchain-funcs
55 -
56 -DESCRIPTION="A Qt based Digital DJ tool"
57 -HOMEPAGE="http://mixxx.sourceforge.net"
58 -SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz"
59 -
60 -LICENSE="GPL-2"
61 -SLOT="0"
62 -KEYWORDS="amd64 x86"
63 -IUSE="aac debug doc mp3 pulseaudio shout wavpack"
64 -
65 -RDEPEND="media-libs/fidlib
66 - media-libs/flac
67 - media-libs/libid3tag
68 - media-libs/libogg
69 - media-libs/libsndfile
70 - >=media-libs/libsoundtouch-1.5
71 - media-libs/libvorbis
72 - >=media-libs/portaudio-19_pre
73 - media-libs/portmidi
74 - media-libs/taglib
75 - virtual/glu
76 - virtual/opengl
77 - dev-qt/qtgui:4
78 - dev-qt/qtopengl:4
79 - dev-qt/qtsql:4
80 - dev-qt/qtsvg:4
81 - dev-qt/qtwebkit:4
82 - dev-qt/qtxmlpatterns:4
83 - aac? (
84 - media-libs/faad2
85 - media-libs/libmp4v2:0
86 - )
87 - mp3? ( media-libs/libmad )
88 - pulseaudio? ( media-sound/pulseaudio )
89 - shout? ( media-libs/libshout )
90 - wavpack? ( media-sound/wavpack )"
91 -DEPEND="${RDEPEND}
92 - virtual/pkgconfig"
93 -
94 -src_prepare() {
95 - epatch "${FILESDIR}"/${PN}-1.10.0-system-libs.patch
96 - epatch "${FILESDIR}"/${PN}-1.10.0-cflags.patch
97 - epatch "${FILESDIR}"/${PN}-1.10.0-docs.patch
98 - epatch "${FILESDIR}"/${PN}-1.10.0-no-bzr.patch
99 -
100 - # use multilib compatible directory for plugins
101 - sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
102 -
103 - # alter startup command when pulseaudio support is disabled
104 - if ! use pulseaudio ; then
105 - sed -i -e 's:pasuspender ::' src/mixxx.desktop || die
106 - fi
107 -}
108 -
109 -src_compile() {
110 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
111 - LIBPATH="/usr/$(get_libdir)" escons \
112 - prefix=/usr \
113 - qtdir=/usr/$(get_libdir)/qt4 \
114 - hifieq=1 \
115 - vinylcontrol=1 \
116 - optimize=0 \
117 - $(use_scons aac faad) \
118 - $(use_scons debug qdebug) \
119 - $(use_scons mp3 mad) \
120 - $(use_scons shout shoutcast) \
121 - $(use_scons wavpack wv)
122 -}
123 -
124 -src_install() {
125 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
126 - LIBPATH="/usr/$(get_libdir)" escons install \
127 - prefix=/usr \
128 - qtdir=/usr/$(get_libdir)/qt4 \
129 - install_root="${D}"/usr
130 -
131 - dodoc README Mixxx-Manual.pdf
132 -}
133
134 diff --git a/media-sound/mixxx/mixxx-1.11.0-r1.ebuild b/media-sound/mixxx/mixxx-1.11.0-r1.ebuild
135 deleted file mode 100644
136 index aa57a12ce83..00000000000
137 --- a/media-sound/mixxx/mixxx-1.11.0-r1.ebuild
138 +++ /dev/null
139 @@ -1,97 +0,0 @@
140 -# Copyright 1999-2016 Gentoo Foundation
141 -# Distributed under the terms of the GNU General Public License v2
142 -
143 -EAPI=5
144 -
145 -inherit eutils multilib scons-utils toolchain-funcs
146 -
147 -DESCRIPTION="A Qt based Digital DJ tool"
148 -HOMEPAGE="http://mixxx.sourceforge.net"
149 -SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz"
150 -
151 -LICENSE="GPL-2"
152 -SLOT="0"
153 -KEYWORDS="~amd64 ~x86"
154 -IUSE="aac debug doc hid mp3 mp4 pulseaudio shout vamp wavpack"
155 -
156 -RDEPEND="
157 - dev-libs/protobuf:=
158 - virtual/libusb:1
159 - >=media-libs/fidlib-0.9.10-r1
160 - media-libs/flac
161 - media-libs/libid3tag
162 - media-libs/libogg
163 - media-libs/libsndfile
164 - >=media-libs/libsoundtouch-1.5
165 - media-libs/libvorbis
166 - >=media-libs/portaudio-19_pre
167 - media-libs/portmidi
168 - media-libs/taglib
169 - virtual/glu
170 - virtual/opengl
171 - dev-qt/qtcore:4
172 - dev-qt/qtgui:4
173 - dev-qt/qtopengl:4
174 - dev-qt/qtscript:4
175 - dev-qt/qtsql:4
176 - aac? (
177 - media-libs/faad2
178 - media-libs/libmp4v2:0=
179 - )
180 - hid? ( dev-libs/hidapi )
181 - mp3? ( media-libs/libmad )
182 - mp4? ( media-libs/libmp4v2:0= )
183 - pulseaudio? ( media-sound/pulseaudio )
184 - shout? ( media-libs/libshout )
185 - wavpack? ( media-sound/wavpack )
186 - vamp? ( media-libs/vamp-plugin-sdk )
187 -"
188 -DEPEND="${RDEPEND}
189 - virtual/pkgconfig
190 -"
191 -
192 -src_prepare() {
193 - epatch "${FILESDIR}"/${PN}-1.10.0-cflags.patch
194 - epatch "${FILESDIR}"/${P}-system-libs.patch
195 - EPATCH_OPTS="-l" epatch "${FILESDIR}"/${PN}-1.10.0-docs.patch
196 - epatch "${FILESDIR}"/${P}-no-bzr.patch
197 -
198 - # use multilib compatible directory for plugins
199 - sed -i "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
200 -
201 - # alter startup command when pulseaudio support is disabled
202 - if ! use pulseaudio ; then
203 - sed -i 's:pasuspender ::' src/mixxx.desktop || die
204 - fi
205 -}
206 -
207 -src_configure() {
208 - myesconsargs=(
209 - prefix="${EPREFIX}/usr"
210 - qtdir="${EPREFIX}/usr/$(get_libdir)/qt4"
211 - hifieq=1
212 - vinylcontrol=1
213 - optimize=0
214 - $(use_scons aac faad)
215 - $(use_scons debug qdebug)
216 - $(use_scons hid hid)
217 - $(use_scons mp3 mad)
218 - $(use_scons mp4 m4a)
219 - $(use_scons shout shoutcast)
220 - $(use_scons wavpack wv)
221 - $(use_scons vamp)
222 - )
223 -}
224 -
225 -src_compile() {
226 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
227 - LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons
228 -}
229 -
230 -src_install() {
231 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
232 - LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons \
233 - install_root="${ED}"/usr install
234 -
235 - dodoc README Mixxx-Manual.pdf
236 -}
237
238 diff --git a/media-sound/mixxx/mixxx-2.0.0-r3.ebuild b/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
239 deleted file mode 100644
240 index 0647f3a3011..00000000000
241 --- a/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
242 +++ /dev/null
243 @@ -1,126 +0,0 @@
244 -# Copyright 1999-2017 Gentoo Foundation
245 -# Distributed under the terms of the GNU General Public License v2
246 -
247 -EAPI=6
248 -
249 -inherit flag-o-matic scons-utils toolchain-funcs
250 -
251 -DESCRIPTION="Advanced Digital DJ tool based on Qt"
252 -HOMEPAGE="http://www.mixxx.org/"
253 -SRC_URI="http://downloads.${PN}.org/${P}/${P}-src.tar.gz"
254 -
255 -# Upstream patches
256 -SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch -> ${PN}-2.0.0-ffmpeg30.patch"
257 -SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772afdfb79cbc3c.patch -> ${PN}-2.0.0-ffmpeg31.patch"
258 -
259 -LICENSE="GPL-2"
260 -SLOT="0"
261 -KEYWORDS="~amd64 ~x86"
262 -IUSE="aac debug doc ffmpeg hid mp3 mp4 shout wavpack"
263 -
264 -# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
265 -# got fixed
266 -RDEPEND="dev-db/sqlite
267 - dev-libs/protobuf:0=
268 - dev-qt/qtconcurrent:5
269 - dev-qt/qtcore:5
270 - dev-qt/qtgui:5
271 - dev-qt/qtnetwork:5
272 - dev-qt/qtopengl:5
273 - dev-qt/qtscript:5[scripttools]
274 - dev-qt/qtsql:5
275 - dev-qt/qtsvg:5
276 - dev-qt/qtwidgets:5
277 - dev-qt/qtxml:5
278 - media-libs/chromaprint
279 - media-libs/flac
280 - media-libs/libid3tag
281 - media-libs/libogg
282 - media-libs/libsndfile
283 - >=media-libs/libsoundtouch-1.5
284 - media-libs/libvorbis
285 - >=media-libs/portaudio-19_pre
286 - media-libs/portmidi
287 - media-libs/rubberband
288 - media-libs/taglib
289 - media-libs/vamp-plugin-sdk
290 - sci-libs/fftw:3.0=
291 - virtual/libusb:1
292 - virtual/opengl
293 - x11-libs/libX11
294 - aac? (
295 - media-libs/faad2
296 - media-libs/libmp4v2:0
297 - )
298 - hid? ( dev-libs/hidapi )
299 - mp3? ( media-libs/libmad )
300 - mp4? ( media-libs/libmp4v2:= )
301 - shout? ( media-libs/libshout )
302 - wavpack? ( media-sound/wavpack )
303 - ffmpeg? ( media-video/ffmpeg:0= )"
304 -# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
305 -DEPEND="${RDEPEND}
306 - virtual/pkgconfig
307 - dev-qt/qttest:5
308 - dev-qt/qtxmlpatterns:5
309 -"
310 -
311 -PATCHES=(
312 - "${FILESDIR}"/${PN}-2.0.0-docs.patch
313 - "${DISTDIR}"/${P}-ffmpeg30.patch
314 - "${DISTDIR}"/${P}-ffmpeg31.patch
315 - "${FILESDIR}"/${P}-chromaprint-1.4.patch #604528
316 -)
317 -
318 -src_prepare() {
319 - # use multilib compatible directory for plugins
320 - sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
321 -
322 - default
323 -}
324 -
325 -src_configure() {
326 - local myoptimize=0
327 -
328 - # Required for >=qt-5.7.0 (bug #590690)
329 - append-cxxflags -std=c++11
330 -
331 - # Try to get cpu type based on CFLAGS.
332 - # Bug #591968
333 - for i in $(get-flag mcpu) $(get-flag march) ; do
334 - if [[ ${i} = native ]] ; then
335 - myoptimize="native"
336 - break
337 - fi
338 - done
339 -
340 - myesconsargs=(
341 - prefix="${EPREFIX}/usr"
342 - qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
343 - faad="$(usex aac 1 0)"
344 - ffmpeg="$(usex ffmpeg 1 0)"
345 - hid="$(usex hid 1 0)"
346 - hifieq=1
347 - m4a="$(usex mp4 1 0)"
348 - mad="$(usex mp3 1 0)"
349 - optimize="${myoptimize}"
350 - qdebug="$(usex debug 1 0)"
351 - qt5=1
352 - shoutcast="$(usex shout 1 0)"
353 - vinylcontrol=1
354 - wv="$(usex wavpack 1 0)"
355 - )
356 -}
357 -
358 -src_compile() {
359 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
360 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
361 -}
362 -
363 -src_install() {
364 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
365 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
366 - install_root="${ED}"/usr install
367 -
368 - dodoc README Mixxx-Manual.pdf
369 -}