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/csound/files/, media-sound/csound/
Date: Thu, 04 Oct 2018 19:14:36
Message-Id: 1538680311.cf037c1f38528312fbc283c26a2d389151d5a42b.asturm@gentoo
1 commit: cf037c1f38528312fbc283c26a2d389151d5a42b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 4 18:12:06 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 4 19:11:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf037c1f
7
8 media-sound/csound: Drop old
9
10 Closes: https://bugs.gentoo.org/602376
11 Closes: https://bugs.gentoo.org/590670
12 Closes: https://bugs.gentoo.org/599184
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14 Package-Manager: Portage-2.3.50, Repoman-2.3.11
15
16 media-sound/csound/Manifest | 4 -
17 media-sound/csound/csound-6.08.0.ebuild | 216 -------------------
18 media-sound/csound/csound-6.09.1.ebuild | 230 ---------------------
19 media-sound/csound/files/csound-6.05-python.patch | 19 --
20 .../csound/files/csound-6.09.1-python.patch | 23 ---
21 5 files changed, 492 deletions(-)
22
23 diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
24 index e41d387d163..1fd37912a56 100644
25 --- a/media-sound/csound/Manifest
26 +++ b/media-sound/csound/Manifest
27 @@ -1,7 +1,3 @@
28 -DIST Csound6.09.1_manual_html.zip 15537547 BLAKE2B 8864cd42e811c596b1c17c68d0552edff39437412ce828772cf8cf13f47390d0edc25fa9a85ecfe1a50a01fe592cb0ee27ce5a11679195f8c1b41da9b1ede8cd SHA512 8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd
29 -DIST Csound6.09.1_manual_pdf.zip 8647957 BLAKE2B 52209784a08c67284a6481d17eaef8db2abf03f068bf347a40b06d4ba323389371474cb87fd93a318fe6abadeb69afd060be0aa64fdd2b638172ef33a282386a SHA512 1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b
30 DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab SHA512 f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
31 DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c SHA512 cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
32 -DIST csound-6.08.0.tar.gz 33948686 BLAKE2B 6a81e5806420b63ffd487d71d507d34336c46e91ec7073b4805324d04af31101c1ea65142f22aae2de071f149eb8fe4c88547b6795462aea248b585d029bad6c SHA512 22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca
33 -DIST csound-6.09.1.tar.gz 41969942 BLAKE2B 87dd02f61346f95648391c405edc18d08edad9d33c1cd2ab2cf054e0f10b7f987aaedce698a18520a8d8559d1fd78a20fa4f3d7db99e6afb3fdba316207e0495 SHA512 c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454
34 DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697 SHA512 1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
35
36 diff --git a/media-sound/csound/csound-6.08.0.ebuild b/media-sound/csound/csound-6.08.0.ebuild
37 deleted file mode 100644
38 index 56eb7fc9cdf..00000000000
39 --- a/media-sound/csound/csound-6.08.0.ebuild
40 +++ /dev/null
41 @@ -1,216 +0,0 @@
42 -# Copyright 1999-2018 Gentoo Foundation
43 -# Distributed under the terms of the GNU General Public License v2
44 -
45 -EAPI=6
46 -
47 -PYTHON_COMPAT=( python2_7 )
48 -
49 -inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 cmake-utils
50 -
51 -if [[ ${PV} == *9999 ]]; then
52 - EGIT_REPO_URI="https://github.com/csound/csound.git"
53 - inherit git-r3
54 -else
55 - SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
56 - KEYWORDS="~amd64 ~x86"
57 -fi
58 -
59 -DESCRIPTION="A sound design and signal processing system for composition and performance"
60 -HOMEPAGE="https://csound.github.io/"
61 -
62 -LICENSE="LGPL-2.1"
63 -SLOT="0"
64 -IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
65 -fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
66 -portaudio portmidi pulseaudio python samples score static-libs stk tcl test
67 -+threads +utils vim-syntax websocket"
68 -
69 -LANGS=" de en_US es_CO fr it ro ru"
70 -
71 -REQUIRED_USE="
72 - csoundac? ( || ( lua python ) )
73 - java? ( cxx )
74 - linear? ( double-precision )
75 - lua? ( cxx )
76 - python? ( ${PYTHON_REQUIRED_USE} cxx )
77 -"
78 -
79 -RDEPEND="
80 - >=media-libs/libsndfile-1.0.16
81 - media-libs/libsamplerate
82 - alsa? ( media-libs/alsa-lib )
83 - csoundac? (
84 - x11-libs/fltk:1[threads?]
85 - dev-cpp/eigen:3
86 - dev-libs/boost:=
87 - )
88 - curl? ( net-misc/curl )
89 - dssi? (
90 - media-libs/dssi
91 - media-libs/ladspa-sdk
92 - )
93 - fluidsynth? ( media-sound/fluidsynth )
94 - fltk? ( x11-libs/fltk:1[threads?] )
95 - image? ( media-libs/libpng:0= )
96 - jack? ( media-sound/jack-audio-connection-kit )
97 - java? ( virtual/jdk:* )
98 - keyboard? ( x11-libs/fltk:1[threads?] )
99 - linear? ( sci-mathematics/gmm )
100 - lua? (
101 - luajit? ( dev-lang/luajit:2 )
102 - !luajit? ( dev-lang/lua:0 )
103 - )
104 - osc? ( media-libs/liblo )
105 - portaudio? ( media-libs/portaudio )
106 - portmidi? ( media-libs/portmidi )
107 - pulseaudio? ( media-sound/pulseaudio )
108 - python? ( ${PYTHON_DEPS} )
109 - stk? ( media-libs/stk )
110 - tcl? (
111 - >=dev-lang/tcl-8.5:0=
112 - >=dev-lang/tk-8.5:0=
113 - )
114 - utils? ( !media-sound/snd )
115 - websocket? ( net-libs/libwebsockets )
116 -"
117 -DEPEND="${RDEPEND}
118 - sys-devel/flex
119 - virtual/yacc
120 - chua? ( dev-libs/boost )
121 - csoundac? ( dev-lang/swig )
122 - nls? ( sys-devel/gettext )
123 - test? (
124 - dev-util/cunit
125 - ${PYTHON_DEPS}
126 - )
127 -"
128 -
129 -# requires specific alsa settings
130 -RESTRICT="test"
131 -
132 -PATCHES=( "${FILESDIR}"/csound-6.05-python.patch )
133 -
134 -pkg_pretend() {
135 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
136 -}
137 -
138 -pkg_setup() {
139 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
140 -
141 - if use python || use test ; then
142 - python-single-r1_pkg_setup
143 - fi
144 -}
145 -
146 -src_prepare() {
147 - cmake-utils_src_prepare
148 -
149 - sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
150 - -e '/-O3/d' \
151 - -i CMakeLists.txt || die
152 -
153 - local lang
154 - for lang in ${LANGS} ; do
155 - if ! has ${lang} ${LINGUAS-${lang}} ; then
156 - sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
157 - fi
158 - done
159 -}
160 -
161 -src_configure() {
162 - local mycmakeargs=(
163 - -DUSE_ALSA=$(usex alsa)
164 - -DBUILD_CSBEATS=$(usex beats)
165 - -DBUILD_CHUA_OPCODES=$(usex chua)
166 - -DBUILD_CSOUND_AC=$(usex csoundac)
167 - -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
168 - -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
169 - -DBUILD_CXX_INTERFACE=$(usex cxx)
170 - -DUSE_CURL=$(usex curl)
171 - -DNEW_PARSER_DEBUG=$(usex debug)
172 - -DUSE_DOUBLE=$(usex double-precision)
173 - -DBUILD_DSSI_OPCODES=$(usex dssi)
174 - -DBUILD_FLUID_OPCODES=$(usex fluidsynth)
175 - -DUSE_FLTK=$(usex fltk)
176 - -DBUILD_IMAGE_OPCODES=$(usex image)
177 - -DUSE_JACK=$(usex jack)
178 - -DBUILD_JACK_OPCODES=$(usex jack)
179 - -DBUILD_JAVA_INTERFACE=$(usex java)
180 - -DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
181 - -DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
182 - -DBUILD_LUA_OPCODES=$(usex lua)
183 - -DBUILD_LUA_INTERFACE=$(usex lua)
184 - -DUSE_GETTEXT=$(usex nls)
185 - -DBUILD_OSC_OPCODES=$(usex osc)
186 - -DUSE_OPEN_MP=$(usex openmp)
187 - -DUSE_PORTAUDIO=$(usex portaudio)
188 - -DUSE_PORTMIDI=$(usex portmidi)
189 - -DUSE_PULSEAUDIO=$(usex pulseaudio)
190 - -DBUILD_PYTHON_OPCODES=$(usex python)
191 - -DBUILD_PYTHON_INTERFACE=$(usex python)
192 - -DSCORE_PARSER=$(usex score)
193 - -DBUILD_STATIC_LIBRARY=$(usex static-libs)
194 - -DBUILD_STK_OPCODES=$(usex stk)
195 - -DBUILD_TESTS=$(usex test)
196 - -DBUILD_STATIC_LIBRARY=$(usex test)
197 - -DBUILD_TCLCSOUND=$(usex tcl)
198 - -DBUILD_MULTI_CORE=$(usex threads)
199 - -DBUILD_UTILITIES=$(usex utils)
200 - -DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
201 - -DNEED_PORTTIME=OFF
202 - -DBUILD_RELEASE=ON
203 - )
204 -
205 - use python && mycmakeargs+=(
206 - -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
207 - )
208 -
209 - [[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
210 - -DUSE_LIB64=ON
211 - )
212 -
213 - cmake-utils_src_configure
214 -}
215 -
216 -src_install() {
217 - cmake-utils_src_install
218 - dodoc -r Release_Notes/.
219 -
220 - # Generate env.d file
221 - cat > "${T}"/62${PN} <<-_EOF_ || die
222 - OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
223 - CSSTRNGS="${EPREFIX}/usr/share/locale"
224 - _EOF_
225 - if use stk ; then
226 - echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
227 - fi
228 - doenvd "${T}"/62${PN}
229 -
230 - if use examples ; then
231 - dodoc -r examples
232 - docompress -x /usr/share/doc/${PF}/examples
233 - fi
234 -
235 - use samples && dodoc -r samples
236 -
237 - if use vim-syntax ; then
238 - insinto /usr/share/vim/vimfiles/syntax
239 - doins installer/misc/vim/csound_{csd,orc,sco}.vim
240 - insinto /usr/share/vim/vimfiles/plugin
241 - doins installer/misc/vim/csound.vim
242 - fi
243 -
244 - # rename extract to csound_extract (bug #247394)
245 - mv "${ED%/}"/usr/bin/{,csound_}extract || die
246 -
247 - use python && python_optimize
248 -}
249 -
250 -pkg_postinst() {
251 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
252 - elog
253 - elog "The extract tool is now installed as csound_extract"
254 - elog "due to collisions with many other packages (bug #247394)."
255 - elog
256 - fi
257 -}
258
259 diff --git a/media-sound/csound/csound-6.09.1.ebuild b/media-sound/csound/csound-6.09.1.ebuild
260 deleted file mode 100644
261 index 7f018b3a913..00000000000
262 --- a/media-sound/csound/csound-6.09.1.ebuild
263 +++ /dev/null
264 @@ -1,230 +0,0 @@
265 -# Copyright 1999-2018 Gentoo Foundation
266 -# Distributed under the terms of the GNU General Public License v2
267 -
268 -EAPI=6
269 -PYTHON_COMPAT=( python2_7 )
270 -
271 -inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
272 -
273 -if [[ ${PV} == "9999" ]]; then
274 - EGIT_REPO_URI="https://github.com/csound/csound.git"
275 - inherit git-r3
276 -else
277 - DOC_P="Csound${PV}"
278 - SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
279 - doc? (
280 - https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
281 - https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
282 - )"
283 - KEYWORDS="~amd64 ~x86"
284 -fi
285 -
286 -DESCRIPTION="A sound design and signal processing system for composition and performance"
287 -HOMEPAGE="https://csound.github.io/"
288 -
289 -LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
290 -SLOT="0"
291 -IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
292 -fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
293 -portaudio portmidi pulseaudio python samples score static-libs stk tcl test
294 -+threads +utils vim-syntax websocket"
295 -
296 -IUSE_LANGS=" de en_US es es_CO fr it ro ru"
297 -
298 -REQUIRED_USE="
299 - csoundac? ( || ( lua python ) )
300 - java? ( cxx )
301 - linear? ( double-precision )
302 - lua? ( cxx )
303 - python? ( ${PYTHON_REQUIRED_USE} cxx )
304 -"
305 -
306 -RDEPEND="
307 - >=media-libs/libsndfile-1.0.16
308 - media-libs/libsamplerate
309 - alsa? ( media-libs/alsa-lib )
310 - csoundac? (
311 - x11-libs/fltk:1[threads?]
312 - dev-cpp/eigen:3
313 - dev-libs/boost:=
314 - )
315 - curl? ( net-misc/curl )
316 - dssi? (
317 - media-libs/dssi
318 - media-libs/ladspa-sdk
319 - )
320 - fluidsynth? ( media-sound/fluidsynth )
321 - fltk? ( x11-libs/fltk:1[threads?] )
322 - image? ( media-libs/libpng:0= )
323 - jack? ( media-sound/jack-audio-connection-kit )
324 - java? ( virtual/jdk:* )
325 - keyboard? ( x11-libs/fltk:1[threads?] )
326 - linear? ( sci-mathematics/gmm )
327 - lua? (
328 - luajit? ( dev-lang/luajit:2 )
329 - !luajit? ( dev-lang/lua:0 )
330 - )
331 - osc? ( media-libs/liblo )
332 - portaudio? ( media-libs/portaudio )
333 - portmidi? ( media-libs/portmidi )
334 - pulseaudio? ( media-sound/pulseaudio )
335 - python? ( ${PYTHON_DEPS} )
336 - stk? ( media-libs/stk )
337 - tcl? (
338 - >=dev-lang/tcl-8.5:0=
339 - >=dev-lang/tk-8.5:0=
340 - )
341 - utils? ( !media-sound/snd )
342 - websocket? ( net-libs/libwebsockets )
343 -"
344 -DEPEND="${RDEPEND}
345 - sys-devel/flex
346 - virtual/yacc
347 - chua? ( dev-libs/boost )
348 - csoundac? ( dev-lang/swig )
349 - nls? ( sys-devel/gettext )
350 - test? (
351 - dev-util/cunit
352 - ${PYTHON_DEPS}
353 - )
354 -"
355 -
356 -if [[ ${PV} != "9999" ]]; then
357 - DEPEND+="doc? ( app-arch/unzip )"
358 -fi
359 -
360 -# requires specific alsa settings
361 -RESTRICT="test"
362 -
363 -PATCHES=( "${FILESDIR}"/${P}-python.patch )
364 -
365 -pkg_pretend() {
366 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
367 -}
368 -
369 -pkg_setup() {
370 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
371 -
372 - if use python || use test ; then
373 - python-single-r1_pkg_setup
374 - fi
375 -}
376 -
377 -src_prepare() {
378 - cmake-utils_src_prepare
379 -
380 - sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
381 - -e '/-O3/d' \
382 - -i CMakeLists.txt || die
383 -
384 - local lang
385 - for lang in ${IUSE_LANGS} ; do
386 - if ! has ${lang} ${LINGUAS-${lang}} ; then
387 - sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
388 - fi
389 - done
390 -}
391 -
392 -src_configure() {
393 - local mycmakeargs=(
394 - -DUSE_ALSA=$(usex alsa)
395 - -DBUILD_CSBEATS=$(usex beats)
396 - -DBUILD_CHUA_OPCODES=$(usex chua)
397 - -DBUILD_CSOUND_AC=$(usex csoundac)
398 - -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
399 - -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
400 - -DBUILD_CXX_INTERFACE=$(usex cxx)
401 - -DUSE_CURL=$(usex curl)
402 - -DNEW_PARSER_DEBUG=$(usex debug)
403 - -DUSE_DOUBLE=$(usex double-precision)
404 - -DBUILD_DSSI_OPCODES=$(usex dssi)
405 - -DBUILD_FLUID_OPCODES=$(usex fluidsynth)
406 - -DUSE_FLTK=$(usex fltk)
407 - -DBUILD_IMAGE_OPCODES=$(usex image)
408 - -DUSE_JACK=$(usex jack)
409 - -DBUILD_JACK_OPCODES=$(usex jack)
410 - -DBUILD_JAVA_INTERFACE=$(usex java)
411 - -DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
412 - -DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
413 - -DBUILD_LUA_OPCODES=$(usex lua)
414 - -DBUILD_LUA_INTERFACE=$(usex lua)
415 - -DUSE_GETTEXT=$(usex nls)
416 - -DBUILD_OSC_OPCODES=$(usex osc)
417 - -DUSE_OPEN_MP=$(usex openmp)
418 - -DUSE_PORTAUDIO=$(usex portaudio)
419 - -DUSE_PORTMIDI=$(usex portmidi)
420 - -DUSE_PULSEAUDIO=$(usex pulseaudio)
421 - -DBUILD_PYTHON_OPCODES=$(usex python)
422 - -DBUILD_PYTHON_INTERFACE=$(usex python)
423 - -DSCORE_PARSER=$(usex score)
424 - -DBUILD_STATIC_LIBRARY=$(usex static-libs)
425 - -DBUILD_STK_OPCODES=$(usex stk)
426 - -DBUILD_TESTS=$(usex test)
427 - -DBUILD_STATIC_LIBRARY=$(usex test)
428 - -DBUILD_TCLCSOUND=$(usex tcl)
429 - -DBUILD_MULTI_CORE=$(usex threads)
430 - -DBUILD_UTILITIES=$(usex utils)
431 - -DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
432 - -DNEED_PORTTIME=OFF
433 - -DBUILD_RELEASE=ON
434 - )
435 -
436 - use python && mycmakeargs+=(
437 - -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
438 - )
439 -
440 - [[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
441 - -DUSE_LIB64=ON
442 - )
443 -
444 - cmake-utils_src_configure
445 -}
446 -
447 -src_install() {
448 - cmake-utils_src_install
449 - dodoc -r Release_Notes/.
450 -
451 - # generate env.d file
452 - cat > "${T}"/62${PN} <<-_EOF_ || die
453 - OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
454 - CSSTRNGS="${EPREFIX}/usr/share/locale"
455 - _EOF_
456 - if use stk ; then
457 - echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
458 - fi
459 - doenvd "${T}"/62${PN}
460 -
461 - if use examples ; then
462 - dodoc -r examples
463 - docompress -x /usr/share/doc/${PF}/examples
464 - fi
465 -
466 - use samples && dodoc -r samples
467 -
468 - if use vim-syntax ; then
469 - insinto /usr/share/vim/vimfiles/syntax
470 - doins installer/misc/vim/csound_{csd,orc,sco}.vim
471 - insinto /usr/share/vim/vimfiles/plugin
472 - doins installer/misc/vim/csound.vim
473 - fi
474 -
475 - # rename extract to csound_extract (bug #247394)
476 - mv "${ED%/}"/usr/bin/{,csound_}extract || die
477 -
478 - use python && python_optimize
479 -
480 - # install docs
481 - if [[ ${PV} != "9999" ]] && use doc ; then
482 - dodoc "${WORKDIR}"/*.pdf
483 - dodoc -r "${WORKDIR}"/html
484 - fi
485 -}
486 -
487 -pkg_postinst() {
488 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
489 - elog
490 - elog "The extract tool is now installed as csound_extract"
491 - elog "due to collisions with many other packages (bug #247394)."
492 - elog
493 - fi
494 -}
495
496 diff --git a/media-sound/csound/files/csound-6.05-python.patch b/media-sound/csound/files/csound-6.05-python.patch
497 deleted file mode 100644
498 index 3e9ee857fe9..00000000000
499 --- a/media-sound/csound/files/csound-6.05-python.patch
500 +++ /dev/null
501 @@ -1,19 +0,0 @@
502 ---- csound-6.05.0.orig/CMakeLists.txt 2015-04-26 03:06:22.941646148 +0800
503 -+++ csound-6.05.0/CMakeLists.txt 2015-07-08 22:31:16.637995822 +0800
504 -@@ -41,15 +41,9 @@
505 - set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
506 - endif()
507 -
508 --
509 --execute_process (
510 -- COMMAND python -c
511 -- "import site, sys; sys.stdout.write(site.getusersitepackages())"
512 -- OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
513 -- )
514 --
515 - set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
516 - set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
517 -+set(PYTHON_MODULE_INSTALL_DIR ${REPLACE_ME})
518 - set(LOCALE_INSTALL_DIR "share/locale")
519 - set(HEADER_INSTALL_DIR "include/csound")
520 -
521
522 diff --git a/media-sound/csound/files/csound-6.09.1-python.patch b/media-sound/csound/files/csound-6.09.1-python.patch
523 deleted file mode 100644
524 index 47461e48aaf..00000000000
525 --- a/media-sound/csound/files/csound-6.09.1-python.patch
526 +++ /dev/null
527 @@ -1,23 +0,0 @@
528 -Respect externally set PYTHON_MODULE_INSTALL_DIR.
529 -
530 ---- csound-6.09.1/CMakeLists.txt
531 -+++ csound-6.09.1/CMakeLists.txt
532 -@@ -218,11 +218,13 @@
533 - set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
534 - endif()
535 -
536 --execute_process (
537 -- COMMAND python -c
538 -- "import site, sys; sys.stdout.write(site.getusersitepackages())"
539 -- OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
540 -- )
541 -+if(NOT DEFINED PYTHON_MODULE_INSTALL_DIR)
542 -+ execute_process (
543 -+ COMMAND python -c
544 -+ "import site, sys; sys.stdout.write(site.getusersitepackages())"
545 -+ OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
546 -+ )
547 -+endif()
548 -
549 - set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
550 - set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})