[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Conrad Kostecki]

commit: 65d741c6d67c6c14a797be5015148066d2c67b3e
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Jan 13 16:30:46 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jan 20 21:21:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65d741c6

media-sound/csound: add blocker for app-vim/csound-syntax

Signed-off-by: Michael Mair-Keimberger  levelnine.at>

Closes: https://bugs.gentoo.org/914394
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-sound/csound/{csound-6.17.0.ebuild => csound-6.17.0-r1.ebuild} | 1 +
 media-sound/csound/csound-.ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-sound/csound/csound-6.17.0.ebuild 
b/media-sound/csound/csound-6.17.0-r1.ebuild
similarity index 99%
rename from media-sound/csound/csound-6.17.0.ebuild
rename to media-sound/csound/csound-6.17.0-r1.ebuild
index 715f3b0c1145..cf13e4203d7f 100644
--- a/media-sound/csound/csound-6.17.0.ebuild
+++ b/media-sound/csound/csound-6.17.0-r1.ebuild
@@ -71,6 +71,7 @@ CDEPEND="
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
utils? ( !media-sound/snd )
+   vim-syntax? ( !app-vim/csound-syntax )
 "
 RDEPEND="
${CDEPEND}

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index 5b310b504a64..2f6048b164b7 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -71,6 +71,7 @@ CDEPEND="
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-libs/libpulse )
utils? ( !media-sound/snd )
+   vim-syntax? ( !app-vim/csound-syntax )
 "
 RDEPEND="
${CDEPEND}

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 995921ea6cfbe7d3e3167a2496951ec5d5aa0bd0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jun 18 09:05:32 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jun 19 06:47:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=995921ea

media-sound/csound: update HOMEPAGE

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-6.17.0.ebuild | 2 +-
 media-sound/csound/csound-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/csound/csound-6.17.0.ebuild 
b/media-sound/csound/csound-6.17.0.ebuild
index 2ef8eecd19ae..1d45bb6ba1e1 100644
--- a/media-sound/csound/csound-6.17.0.ebuild
+++ b/media-sound/csound/csound-6.17.0.ebuild
@@ -26,7 +26,7 @@ else
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
+HOMEPAGE="https://csound.com/;
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index def764bd8d28..df2358e1d9d5 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -26,7 +26,7 @@ else
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
+HOMEPAGE="https://csound.com/;
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Andreas Sturmlechner]

commit: 634351b0c562f9a2f794a65d1307a8bff005ef82
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 29 09:44:53 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 29 13:10:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634351b0

media-sound/csound: Switch IUSE=pulseaudio to media-libs/libpulse

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/csound/csound-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index ff9f36b931a6..def764bd8d28 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -69,7 +69,7 @@ CDEPEND="
osc? ( media-libs/liblo )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( media-libs/libpulse )
utils? ( !media-sound/snd )
 "
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/

[Miroslav Šulc]

commit: 19d844a950eb0e03065dd04fa5052730032c2629
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug  2 04:40:31 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug  2 04:40:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19d844a9

media-sound/csound: dropped obsolete 6.16.2

Bug: https://bugs.gentoo.org/862618
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest   |   3 -
 media-sound/csound/csound-6.16.2.ebuild   | 262 --
 media-sound/csound/files/csound-6.15.0-lame.patch |  26 ---
 media-sound/csound/metadata.xml   |   6 -
 4 files changed, 297 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 8b3eb36dbfbb..9eb23bde8e3e 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,6 +1,3 @@
-DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 
3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb
 SHA512 
e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
-DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 
7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754
 SHA512 
18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
 DIST Csound6.17.0_manual_html.zip 25897263 BLAKE2B 
3148a60a398d49d6932864d84b2ee37ddf86d5389b91c99443b2c64f7c3b270d040b83ac88b80ebc772c198223682452da1618391fcc8963fe63151b7837037e
 SHA512 
ff2098828e51e78aa80b10736ea162d90c0b1bef3265e469951a5df63250d283e852490cb2a6599dcb1b8a5c185cf4f0b9534f501e4cb755b9da67ecfb1f4ba6
 DIST Csound6.17.0_manual_pdf.zip 9930889 BLAKE2B 
c0210f2fb97a6707ae6cd0a0cf38cd374f4d4c973b188ee8d418a7efd5c98dc1d4e61867de021ed2859bd8264cc0876b46deb565c358b6efea42f471d39671a9
 SHA512 
bf664bab1dec073b48853ccf7519086c55ad74af33db86ac7f95746231c18fb10d46a485047788050094e412d27bbd0df65e238d31b01b435989f2fd734189a6
-DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B 
f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d
 SHA512 
b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
 DIST csound-6.17.0-distributable.tar.xz 25231984 BLAKE2B 
9767aae3368f33340d80abb84c573e6ceb91bb16448e961f62c679742377e62f611b36341ce7dfb32a2daafc9440c3dff84fe031c9d52b7d86491c383cf79d61
 SHA512 
b7c5b2f70e82d9dc37074cb217bc146d66293cfea2d69ffd3b0eab9aca302e431eb82b906c8d6494969374988edd6a9c7d04d7676efd085a2dce235988400caa

diff --git a/media-sound/csound/csound-6.16.2.ebuild 
b/media-sound/csound/csound-6.16.2.ebuild
deleted file mode 100644
index 6f59d02107af..
--- a/media-sound/csound/csound-6.16.2.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake lua-single python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="https://github.com/csound/csound.git;
-   inherit git-r3
-else
-   DOC_P="Csound$(ver_cut 1-2).0"
-   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-   doc? (
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-   )"
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-   alsa? ( threads )
-   java? ( cxx )
-   linear? ( double-precision )
-   lua? ( ${LUA_REQUIRED_USE} cxx )
-   python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-BDEPEND="
-   sys-devel/flex
-   virtual/yacc
-   chua? ( dev-libs/boost )
-   lua? ( dev-lang/swig )
-   python? ( dev-lang/swig )
-   nls? ( sys-devel/gettext )
-   test? (
-   dev-util/cunit
-   ${PYTHON_DEPS}
-   )
-"
-# linear 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Sam James]

commit: 14002c49182f5527e1e24a17306bcc40b5ce7da4
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  1 22:10:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  1 22:10:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14002c49

media-sound/csound: Stabilize 6.17.0 x86, #862618

Signed-off-by: Sam James  gentoo.org>

 media-sound/csound/csound-6.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.17.0.ebuild 
b/media-sound/csound/csound-6.17.0.ebuild
index ff2a0f274e57..cc3c316eca91 100644
--- a/media-sound/csound/csound-6.17.0.ebuild
+++ b/media-sound/csound/csound-6.17.0.ebuild
@@ -22,7 +22,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Agostino Sarubbo]

commit: 0058eb1609931753028644aa979bd4d4d9d418b5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug  1 08:00:43 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug  1 08:01:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0058eb16

media-sound/csound: amd64 stable wrt bug #862618

Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/csound/csound-6.17.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.17.0.ebuild 
b/media-sound/csound/csound-6.17.0.ebuild
index 6e52221543fd..ff2a0f274e57 100644
--- a/media-sound/csound/csound-6.17.0.ebuild
+++ b/media-sound/csound/csound-6.17.0.ebuild
@@ -22,7 +22,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: f8ba226a0f3e7c66db9ecf50d4f8e4e7b9d476b3
Author: Bruce Schultz  gmail  com>
AuthorDate: Sat Jul 16 20:06:41 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jul 17 03:39:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ba226a

media-sound/csound: Update PYTHON_COMPAT for the stable 6.16.2 ebuild

Closes: https://bugs.gentoo.org/855431
Signed-off-by: Bruce Schultz  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26447
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-6.16.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/csound/csound-6.16.2.ebuild 
b/media-sound/csound/csound-6.16.2.ebuild
index 58046967e8a0..6f59d02107af 100644
--- a/media-sound/csound/csound-6.16.2.ebuild
+++ b/media-sound/csound/csound-6.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -8,7 +8,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake lua-single python-single-r1 toolchain-funcs
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 9cbd71e7ad48dd0e785806de2fbc402cf503c9a4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jul  1 09:17:34 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jul  1 09:38:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbd71e7

media-sound/csound: dropped obsolete 6.16.1

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest |   1 -
 media-sound/csound/csound-6.16.1.ebuild | 262 
 2 files changed, 263 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 1a1dcce1b7de..ecc8f5175a93 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,4 +1,3 @@
 DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 
3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb
 SHA512 
e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
 DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 
7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754
 SHA512 
18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
-DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B 
fe29208afe2cfc9740e68da213f269ca909facd452ffdd595e14a6dc14526bd497e8a2bc1832da28b0bbd6c8b9ac8891f79d819abf64cba0a9e1002c42f8e5dd
 SHA512 
2535f16dab6a682e38b8352cb7bb87a65aedf0550c1705cde8a64b3c0112d7fd97e6c366dad18ef9ef5e1baaf7123f2c0032d9a2ab6979c202692c3a4069117e
 DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B 
f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d
 SHA512 
b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75

diff --git a/media-sound/csound/csound-6.16.1.ebuild 
b/media-sound/csound/csound-6.16.1.ebuild
deleted file mode 100644
index 58046967e8a0..
--- a/media-sound/csound/csound-6.16.1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake lua-single python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="https://github.com/csound/csound.git;
-   inherit git-r3
-else
-   DOC_P="Csound$(ver_cut 1-2).0"
-   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-   doc? (
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-   )"
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-   alsa? ( threads )
-   java? ( cxx )
-   linear? ( double-precision )
-   lua? ( ${LUA_REQUIRED_USE} cxx )
-   python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-BDEPEND="
-   sys-devel/flex
-   virtual/yacc
-   chua? ( dev-libs/boost )
-   lua? ( dev-lang/swig )
-   python? ( dev-lang/swig )
-   nls? ( sys-devel/gettext )
-   test? (
-   dev-util/cunit
-   ${PYTHON_DEPS}
-   )
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-CDEPEND="
-   dev-cpp/eigen:3
-   >=media-libs/libsndfile-1.0.16
-   media-libs/libsamplerate
-   sys-libs/zlib
-   alsa? ( media-libs/alsa-lib )
-   curl? ( net-misc/curl )
-   dssi? (
-   media-libs/dssi
-   media-libs/ladspa-sdk
-   )
-   fluidsynth? ( media-sound/fluidsynth:= )
-   fltk? ( x11-libs/fltk:1[threads?] )
-   hdf5? ( sci-libs/hdf5 )
-   jack? ( virtual/jack )
-   java? ( >=virtual/jdk-1.8:* )
-   keyboard? ( x11-libs/fltk:1[threads?] )
-   linear? ( =sci-mathematics/gmm-5.1* )
-   lua? ( ${LUA_DEPS} )
-   mp3? ( >=media-sound/lame-3.100-r3 )
-   osc? ( media-libs/liblo )
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 00926829aaa9dbaef29f922a7a64ac9fbb87632a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jul  1 09:37:57 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jul  1 09:38:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00926829

media-sound/csound: bump to 6.17.0, eapi8, added python 3.10 & 3.11, updated 
live

Bug: https://bugs.gentoo.org/855431
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest  |  3 +++
 .../csound/{csound-.ebuild => csound-6.17.0.ebuild}  | 12 ++--
 media-sound/csound/csound-.ebuild|  5 +++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index ecc8f5175a93..8b3eb36dbfbb 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,6 @@
 DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 
3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb
 SHA512 
e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
 DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 
7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754
 SHA512 
18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
+DIST Csound6.17.0_manual_html.zip 25897263 BLAKE2B 
3148a60a398d49d6932864d84b2ee37ddf86d5389b91c99443b2c64f7c3b270d040b83ac88b80ebc772c198223682452da1618391fcc8963fe63151b7837037e
 SHA512 
ff2098828e51e78aa80b10736ea162d90c0b1bef3265e469951a5df63250d283e852490cb2a6599dcb1b8a5c185cf4f0b9534f501e4cb755b9da67ecfb1f4ba6
+DIST Csound6.17.0_manual_pdf.zip 9930889 BLAKE2B 
c0210f2fb97a6707ae6cd0a0cf38cd374f4d4c973b188ee8d418a7efd5c98dc1d4e61867de021ed2859bd8264cc0876b46deb565c358b6efea42f471d39671a9
 SHA512 
bf664bab1dec073b48853ccf7519086c55ad74af33db86ac7f95746231c18fb10d46a485047788050094e412d27bbd0df65e238d31b01b435989f2fd734189a6
 DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B 
f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d
 SHA512 
b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
+DIST csound-6.17.0-distributable.tar.xz 25231984 BLAKE2B 
9767aae3368f33340d80abb84c573e6ceb91bb16448e961f62c679742377e62f611b36341ce7dfb32a2daafc9440c3dff84fe031c9d52b7d86491c383cf79d61
 SHA512 
b7c5b2f70e82d9dc37074cb217bc146d66293cfea2d69ffd3b0eab9aca302e431eb82b906c8d6494969374988edd6a9c7d04d7676efd085a2dce235988400caa

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-6.17.0.ebuild
similarity index 93%
copy from media-sound/csound/csound-.ebuild
copy to media-sound/csound/csound-6.17.0.ebuild
index 0486ace1f63d..6e52221543fd 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-6.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -8,7 +8,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake lua-single python-single-r1
 
@@ -44,6 +44,7 @@ BDEPEND="
sys-devel/bison
sys-devel/flex
virtual/yacc
+   doc? ( media-libs/libpng )
lua? ( dev-lang/swig )
nls? ( sys-devel/gettext )
test? (
@@ -103,6 +104,13 @@ src_prepare() {
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
-i CMakeLists.txt || die
+
+   if use doc; then
+   local png="${WORKDIR}/html/images/delayk.png"
+   pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help 
for exit codes
+   [[ $? -gt 15 ]] && die "Failed to fix ${png}"
+   mv -f ${png/.png/fixed.png} ${png} || die
+   fi
 }
 
 src_configure() {

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index 0486ace1f63d..ae7b8aae361e 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -8,7 +8,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake lua-single python-single-r1
 
@@ -44,6 +44,7 @@ BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 94263e579c961c1bcfed33a63e5159177cf38e10
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Oct 28 19:56:46 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Oct 28 19:56:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94263e57

media-sound/csound: updated live ebuild

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-.ebuild | 79 +++
 1 file changed, 16 insertions(+), 63 deletions(-)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index f997f81d644..0486ace1f63 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -5,12 +5,12 @@
 # we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
 # Reference: https://github.com/csound/csound/issues/1148
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
-inherit cmake lua-single python-single-r1 toolchain-funcs
+inherit cmake lua-single python-single-r1
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git;
@@ -30,36 +30,30 @@ HOMEPAGE="https://csound.github.io/;
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
-vim-syntax websocket"
+IUSE="+alsa beats curl +cxx debug doc double-precision dssi examples jack java 
lua nls osc portaudio
+portaudio portmidi pulseaudio samples static-libs test +threads +utils 
vim-syntax"
 
 REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
alsa? ( threads )
java? ( cxx )
-   linear? ( double-precision )
lua? ( ${LUA_REQUIRED_USE} cxx )
-   python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
 
 BDEPEND="
+   sys-devel/bison
sys-devel/flex
virtual/yacc
-   chua? ( dev-libs/boost )
lua? ( dev-lang/swig )
-   python? ( dev-lang/swig )
nls? ( sys-devel/gettext )
test? (
dev-util/cunit
${PYTHON_DEPS}
)
 "
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
 CDEPEND="
dev-cpp/eigen:3
-   >=media-libs/libsndfile-1.0.16
+   media-libs/libsndfile
media-libs/libsamplerate
sys-libs/zlib
alsa? ( media-libs/alsa-lib )
@@ -68,25 +62,19 @@ CDEPEND="
media-libs/dssi
media-libs/ladspa-sdk
)
-   fluidsynth? ( media-sound/fluidsynth:= )
-   fltk? ( x11-libs/fltk:1[threads?] )
-   hdf5? ( sci-libs/hdf5 )
jack? ( virtual/jack )
java? ( >=virtual/jdk-1.8:* )
-   keyboard? ( x11-libs/fltk:1[threads?] )
-   linear? ( =sci-mathematics/gmm-5.1* )
lua? ( ${LUA_DEPS} )
-   mp3? ( >=media-sound/lame-3.100-r3 )
osc? ( media-libs/liblo )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
-   python? ( ${PYTHON_DEPS} )
-   stk? ( media-libs/stk )
utils? ( !media-sound/snd )
-   websocket? ( net-libs/libwebsockets:= )
 "
-RDEPEND="${CDEPEND}"
+RDEPEND="
+   ${CDEPEND}
+   ${PYTHON_DEPS}
+"
 DEPEND="
${CDEPEND}
dev-libs/boost
@@ -101,15 +89,12 @@ RESTRICT="test"
 
 PATCHES=(
"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-   "${FILESDIR}/${PN}-6.15.0-lame.patch"
 )
 
 pkg_setup() {
use lua && lua-single_pkg_setup
 
-   if use python || use test ; then
-   python-single-r1_pkg_setup
-   fi
+   python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -123,47 +108,21 @@ src_prepare() {
 src_configure() {
local mycmakeargs=(
-DBUILD_BELA=OFF
-   -DBUILD_BUCHLA_OPCODES=ON
-   -DBUILD_CHUA_OPCODES=$(usex chua)
-   -DBUILD_COUNTER_OPCODES=ON
-DBUILD_CSBEATS=$(usex beats)
-   -DBUILD_CUDA_OPCODES=OFF
-DBUILD_CXX_INTERFACE=$(usex cxx)
+   -DBUILD_DEPRECATED_OPCODES=ON
-DBUILD_DSSI_OPCODES=$(usex dssi)
-   -DBUILD_EMUGENS_OPCODES=ON
-   -DBUILD_EXCITER_OPCODES=ON
-   -DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-   -DBUILD_FRAMEBUFFER_OPCODES=ON
-   -DBUILD_HDF5_OPCODES=$(usex hdf5)
-DBUILD_INSTALLER=OFF
-   -DBUILD_JACK_OPCODES=$(usex jack)
-DBUILD_JAVA_INTERFACE=$(usex java)
-   -DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-DBUILD_LUA_INTERFACE=$(usex lua)
-   -DBUILD_MP3OUT_OPCODE=$(usex mp3)

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Agostino Sarubbo]

commit: 5c88c3a9068632439dec2e6977871823dec979cb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug 18 12:57:19 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug 18 12:57:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c88c3a9

media-sound/csound: x86 stable wrt bug #808821

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/csound/csound-6.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.16.2.ebuild 
b/media-sound/csound/csound-6.16.2.ebuild
index dcbc081a317..58046967e8a 100644
--- a/media-sound/csound/csound-6.16.2.ebuild
+++ b/media-sound/csound/csound-6.16.2.ebuild
@@ -22,7 +22,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Agostino Sarubbo]

commit: 8f978946dee49624480d4b31a5d08deb9a12eb3d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug 18 12:46:16 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug 18 12:46:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f978946

media-sound/csound: amd64 stable wrt bug #808821

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/csound/csound-6.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.16.2.ebuild 
b/media-sound/csound/csound-6.16.2.ebuild
index b8549ffc9aa..dcbc081a317 100644
--- a/media-sound/csound/csound-6.16.2.ebuild
+++ b/media-sound/csound/csound-6.16.2.ebuild
@@ -22,7 +22,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/

[Miroslav Šulc]

commit: 3a22a7c3f92076f4ad82c8cd038b6b07bd6d505d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Aug  5 19:17:13 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Aug  5 19:17:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a22a7c3

media-sound/csound: removed obsolete 6.15.0-r101 & 6.16.0

Closes: https://bugs.gentoo.org/799359
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest|   4 -
 media-sound/csound/csound-6.15.0-r101.ebuild   | 271 -
 media-sound/csound/csound-6.16.0.ebuild| 262 
 .../csound/files/csound-6.15.0-fix-soname.patch|  21 --
 media-sound/csound/metadata.xml|   1 -
 5 files changed, 559 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index b1c0a022a4e..1a1dcce1b7d 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,8 +1,4 @@
-DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B 
b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1
 SHA512 
cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
-DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 
898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e
 SHA512 
0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
 DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 
3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb
 SHA512 
e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
 DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 
7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754
 SHA512 
18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
-DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B 
f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8
 SHA512 
a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
-DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B 
cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578
 SHA512 
243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca
 DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B 
fe29208afe2cfc9740e68da213f269ca909facd452ffdd595e14a6dc14526bd497e8a2bc1832da28b0bbd6c8b9ac8891f79d819abf64cba0a9e1002c42f8e5dd
 SHA512 
2535f16dab6a682e38b8352cb7bb87a65aedf0550c1705cde8a64b3c0112d7fd97e6c366dad18ef9ef5e1baaf7123f2c0032d9a2ab6979c202692c3a4069117e
 DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B 
f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d
 SHA512 
b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75

diff --git a/media-sound/csound/csound-6.15.0-r101.ebuild 
b/media-sound/csound/csound-6.15.0-r101.ebuild
deleted file mode 100644
index d07527f6c9b..000
--- a/media-sound/csound/csound-6.15.0-r101.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake lua-single python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="https://github.com/csound/csound.git;
-   inherit git-r3
-else
-   DOC_P="Csound${PV}"
-   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-   doc? (
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-   )"
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Sam James]

commit: f710681c79b2d629fa7397a4fffa04d4c0462092
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug  1 23:47:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug  1 23:47:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f710681c

media-sound/csound: Stabilize 6.16.1 amd64, #805323

Signed-off-by: Sam James  gentoo.org>

 media-sound/csound/csound-6.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.16.1.ebuild 
b/media-sound/csound/csound-6.16.1.ebuild
index b8549ffc9aa..dcbc081a317 100644
--- a/media-sound/csound/csound-6.16.1.ebuild
+++ b/media-sound/csound/csound-6.16.1.ebuild
@@ -22,7 +22,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 3b485c3fb240a3277e620ec9c868c9c0034e9a98
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Jul 18 07:04:43 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jul 18 07:04:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b485c3f

media-sound/csound: bump to 6.16.2

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest |   1 +
 media-sound/csound/csound-6.16.2.ebuild | 262 
 2 files changed, 263 insertions(+)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index d8a94873890..b1c0a022a4e 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -5,3 +5,4 @@ DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 
7bb35f806568a80abbd84a4f4988217
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B 
f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8
 SHA512 
a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
 DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B 
cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578
 SHA512 
243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca
 DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B 
fe29208afe2cfc9740e68da213f269ca909facd452ffdd595e14a6dc14526bd497e8a2bc1832da28b0bbd6c8b9ac8891f79d819abf64cba0a9e1002c42f8e5dd
 SHA512 
2535f16dab6a682e38b8352cb7bb87a65aedf0550c1705cde8a64b3c0112d7fd97e6c366dad18ef9ef5e1baaf7123f2c0032d9a2ab6979c202692c3a4069117e
+DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B 
f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d
 SHA512 
b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75

diff --git a/media-sound/csound/csound-6.16.2.ebuild 
b/media-sound/csound/csound-6.16.2.ebuild
new file mode 100644
index 000..b8549ffc9aa
--- /dev/null
+++ b/media-sound/csound/csound-6.16.2.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="https://github.com/csound/csound.git;
+   inherit git-r3
+else
+   DOC_P="Csound$(ver_cut 1-2).0"
+   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
+   doc? (
+   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+   )"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Sound design and signal processing system for composition and 
performance"
+HOMEPAGE="https://csound.github.io/;
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
+vim-syntax websocket"
+
+REQUIRED_USE="
+   alsa? ( threads )
+   java? ( cxx )
+   linear? ( double-precision )
+   lua? ( ${LUA_REQUIRED_USE} cxx )
+   python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+
+BDEPEND="
+   sys-devel/flex
+   virtual/yacc
+   chua? ( dev-libs/boost )
+   lua? ( dev-lang/swig )
+   python? ( dev-lang/swig )
+   nls? ( sys-devel/gettext )
+   test? (
+   dev-util/cunit
+   ${PYTHON_DEPS}
+   )
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+CDEPEND="
+   dev-cpp/eigen:3
+   >=media-libs/libsndfile-1.0.16
+   media-libs/libsamplerate
+   sys-libs/zlib
+   alsa? ( media-libs/alsa-lib )
+   curl? ( net-misc/curl )
+   dssi? (
+   media-libs/dssi
+   media-libs/ladspa-sdk
+   )
+   fluidsynth? ( media-sound/fluidsynth:= )
+   fltk? ( x11-libs/fltk:1[threads?] )
+   hdf5? ( sci-libs/hdf5 )
+   jack? ( virtual/jack )
+   java? ( >=virtual/jdk-1.8:* )
+   keyboard? ( x11-libs/fltk:1[threads?] )
+   linear? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Agostino Sarubbo]

commit: 6df92aff7d9b3611a84c406dda1597e949d6faa4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 15 07:41:37 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 15 07:41:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df92aff

media-sound/csound: x86 stable wrt bug #802102

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/csound/csound-6.16.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.16.0.ebuild 
b/media-sound/csound/csound-6.16.0.ebuild
index e2a58e840f2..c21367e524e 100644
--- a/media-sound/csound/csound-6.16.0.ebuild
+++ b/media-sound/csound/csound-6.16.0.ebuild
@@ -22,7 +22,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Agostino Sarubbo]

commit: 272ba6af96d3eb70b4c57c35c0e9bb650134a871
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 15 07:37:50 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 15 07:37:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=272ba6af

media-sound/csound: amd64 stable wrt bug #802102

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/csound/csound-6.16.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.16.0.ebuild 
b/media-sound/csound/csound-6.16.0.ebuild
index 27e5f4a83d4..e2a58e840f2 100644
--- a/media-sound/csound/csound-6.16.0.ebuild
+++ b/media-sound/csound/csound-6.16.0.ebuild
@@ -22,7 +22,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 4f8a47bf1070d8cb44519237084bcca47affaa70
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jun 30 11:44:26 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jun 30 11:44:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8a47bf

media-sound/csound: bump to 6.16.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest |   1 +
 media-sound/csound/csound-6.16.1.ebuild | 262 
 2 files changed, 263 insertions(+)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 4503725bdf0..d8a94873890 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -4,3 +4,4 @@ DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 
3bf6e2202a42dfa826d39ef41282e
 DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 
7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754
 SHA512 
18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B 
f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8
 SHA512 
a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
 DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B 
cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578
 SHA512 
243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca
+DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B 
fe29208afe2cfc9740e68da213f269ca909facd452ffdd595e14a6dc14526bd497e8a2bc1832da28b0bbd6c8b9ac8891f79d819abf64cba0a9e1002c42f8e5dd
 SHA512 
2535f16dab6a682e38b8352cb7bb87a65aedf0550c1705cde8a64b3c0112d7fd97e6c366dad18ef9ef5e1baaf7123f2c0032d9a2ab6979c202692c3a4069117e

diff --git a/media-sound/csound/csound-6.16.1.ebuild 
b/media-sound/csound/csound-6.16.1.ebuild
new file mode 100644
index 000..b8549ffc9aa
--- /dev/null
+++ b/media-sound/csound/csound-6.16.1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="https://github.com/csound/csound.git;
+   inherit git-r3
+else
+   DOC_P="Csound$(ver_cut 1-2).0"
+   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
+   doc? (
+   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+   )"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Sound design and signal processing system for composition and 
performance"
+HOMEPAGE="https://csound.github.io/;
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
+vim-syntax websocket"
+
+REQUIRED_USE="
+   alsa? ( threads )
+   java? ( cxx )
+   linear? ( double-precision )
+   lua? ( ${LUA_REQUIRED_USE} cxx )
+   python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+
+BDEPEND="
+   sys-devel/flex
+   virtual/yacc
+   chua? ( dev-libs/boost )
+   lua? ( dev-lang/swig )
+   python? ( dev-lang/swig )
+   nls? ( sys-devel/gettext )
+   test? (
+   dev-util/cunit
+   ${PYTHON_DEPS}
+   )
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+CDEPEND="
+   dev-cpp/eigen:3
+   >=media-libs/libsndfile-1.0.16
+   media-libs/libsamplerate
+   sys-libs/zlib
+   alsa? ( media-libs/alsa-lib )
+   curl? ( net-misc/curl )
+   dssi? (
+   media-libs/dssi
+   media-libs/ladspa-sdk
+   )
+   fluidsynth? ( media-sound/fluidsynth:= )
+   fltk? ( x11-libs/fltk:1[threads?] )
+   hdf5? ( sci-libs/hdf5 )
+   jack? ( virtual/jack )
+   java? ( >=virtual/jdk-1.8:* )
+   keyboard? ( x11-libs/fltk:1[threads?] )
+   linear? ( =sci-mathematics/gmm-5.1* )

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 71c4df5b28386c7e83bc523090d8263c394079b2
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Jun 13 08:00:55 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jun 13 08:01:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c4df5b

media-sound/csound: bump to 6.16.0 + sync'd live

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest |  3 +++
 .../csound/{csound-.ebuild => csound-6.16.0.ebuild} | 17 -
 media-sound/csound/csound-.ebuild   | 10 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index dbe4c2256bf..4503725bdf0 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,6 @@
 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B 
b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1
 SHA512 
cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 
898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e
 SHA512 
0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
+DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 
3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb
 SHA512 
e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
+DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 
7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754
 SHA512 
18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B 
f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8
 SHA512 
a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
+DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B 
cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578
 SHA512 
243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-6.16.0.ebuild
similarity index 95%
copy from media-sound/csound/csound-.ebuild
copy to media-sound/csound/csound-6.16.0.ebuild
index f0b57265999..27e5f4a83d4 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-6.16.0.ebuild
@@ -31,7 +31,7 @@ HOMEPAGE="https://csound.github.io/;
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
 IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc 
portaudio
+fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
 vim-syntax websocket"
 
@@ -71,7 +71,6 @@ CDEPEND="
fluidsynth? ( media-sound/fluidsynth:= )
fltk? ( x11-libs/fltk:1[threads?] )
hdf5? ( sci-libs/hdf5 )
-   image? ( media-libs/libpng:0= )
jack? ( virtual/jack )
java? ( >=virtual/jdk-1.8:* )
keyboard? ( x11-libs/fltk:1[threads?] )
@@ -119,6 +118,13 @@ src_prepare() {
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
-i CMakeLists.txt || die
+
+   if use doc; then
+   local png="${WORKDIR}/html/images/delayk.png"
+   pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help 
for exit codes
+   [[ $? -gt 15 ]] && die "Failed to fix ${png}"
+   mv -f ${png/.png/fixed.png} ${png} || die
+   fi
 }
 
 src_configure() {
@@ -133,11 +139,9 @@ src_configure() {
-DBUILD_DSSI_OPCODES=$(usex dssi)
-DBUILD_EMUGENS_OPCODES=ON
-DBUILD_EXCITER_OPCODES=ON
-   -DBUILD_FAUST_OPCODES=OFF
-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-DBUILD_FRAMEBUFFER_OPCODES=ON
-DBUILD_HDF5_OPCODES=$(usex hdf5)
-   -DBUILD_IMAGE_OPCODES=$(usex image)
-DBUILD_INSTALLER=OFF
-DBUILD_JACK_OPCODES=$(usex jack)
-DBUILD_JAVA_INTERFACE=$(usex java)
@@ 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: f68b38eb0e6b9f21768e7091699fb6373c2496a9
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun May 16 06:41:35 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun May 16 06:41:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68b38eb

media-sound/csound: removed obsolete 6.15.0-r100

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-6.15.0-r100.ebuild | 267 ---
 1 file changed, 267 deletions(-)

diff --git a/media-sound/csound/csound-6.15.0-r100.ebuild 
b/media-sound/csound/csound-6.15.0-r100.ebuild
deleted file mode 100644
index 99d7b30062a..000
--- a/media-sound/csound/csound-6.15.0-r100.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake lua-single python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="https://github.com/csound/csound.git;
-   inherit git-r3
-else
-   DOC_P="Csound${PV}"
-   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-   doc? (
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-   )"
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, 
see src_configure
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-   alsa? ( threads )
-   linear? ( double-precision )
-   lua? ( ${LUA_REQUIRED_USE} cxx )
-   python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-#  java? ( cxx )
-
-BDEPEND="
-   sys-devel/flex
-   virtual/yacc
-   chua? ( dev-libs/boost )
-   lua? ( dev-lang/swig )
-   python? ( dev-lang/swig )
-   nls? ( sys-devel/gettext )
-   test? (
-   dev-util/cunit
-   ${PYTHON_DEPS}
-   )
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-# currently not used deps due to some issues
-#  java? ( virtual/jdk:* )
-CDEPEND="
-   dev-cpp/eigen:3
-   >=media-libs/libsndfile-1.0.16
-   media-libs/libsamplerate
-   sys-libs/zlib
-   alsa? ( media-libs/alsa-lib )
-   curl? ( net-misc/curl )
-   dssi? (
-   media-libs/dssi
-   media-libs/ladspa-sdk
-   )
-   fluidsynth? ( media-sound/fluidsynth:= )
-   fltk? ( x11-libs/fltk:1[threads?] )
-   hdf5? ( sci-libs/hdf5 )
-   image? ( media-libs/libpng:0= )
-   jack? ( virtual/jack )
-   keyboard? ( x11-libs/fltk:1[threads?] )
-   linear? ( =sci-mathematics/gmm-5.1* )
-   lua? ( ${LUA_DEPS} )
-   mp3? ( >=media-sound/lame-3.100-r3 )
-   osc? ( media-libs/liblo )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   python? ( ${PYTHON_DEPS} )
-   stk? ( media-libs/stk )
-   utils? ( !media-sound/snd )
-   websocket? ( net-libs/libwebsockets:= )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="
-   ${CDEPEND}
-   dev-libs/boost
-"
-
-if [[ ${PV} != "" ]]; then
-   DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-   "${FILESDIR}/${PN}-6.15.0-lame.patch"
-)
-
-pkg_setup() {
-   use lua && lua-single_pkg_setup
-
-   if use python || use test ; then
-   python-single-r1_pkg_setup
-   fi
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-   -e '/-O3/d' \
-   -i CMakeLists.txt || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_BELA=OFF
-   -DBUILD_BUCHLA_OPCODES=ON
-   -DBUILD_CHUA_OPCODES=$(usex chua)
-   -DBUILD_COUNTER_OPCODES=ON
-   -DBUILD_CSBEATS=$(usex beats)
-   -DBUILD_CUDA_OPCODES=OFF
-   -DBUILD_CXX_INTERFACE=$(usex cxx)
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Sam James]

commit: 0d6069752b0014e08df99c493c8bdd23f6c570a6
Author: Sam James  gentoo  org>
AuthorDate: Sat May 15 17:56:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 15 17:56:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d606975

media-sound/csound: Stabilize 6.15.0-r101 x86, #790335

Signed-off-by: Sam James  gentoo.org>

 media-sound/csound/csound-6.15.0-r101.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.15.0-r101.ebuild 
b/media-sound/csound/csound-6.15.0-r101.ebuild
index 85ffdca25bb..d07527f6c9b 100644
--- a/media-sound/csound/csound-6.15.0-r101.ebuild
+++ b/media-sound/csound/csound-6.15.0-r101.ebuild
@@ -22,7 +22,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Sam James]

commit: b2f04afdd999ee23f5e0b211dadc74d5e075fefd
Author: Sam James  gentoo  org>
AuthorDate: Sat May 15 17:55:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 15 17:55:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f04afd

media-sound/csound: Stabilize 6.15.0-r101 amd64, #790335

Signed-off-by: Sam James  gentoo.org>

 media-sound/csound/csound-6.15.0-r101.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.15.0-r101.ebuild 
b/media-sound/csound/csound-6.15.0-r101.ebuild
index 6705f7c3429..85ffdca25bb 100644
--- a/media-sound/csound/csound-6.15.0-r101.ebuild
+++ b/media-sound/csound/csound-6.15.0-r101.ebuild
@@ -22,7 +22,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/

[Miroslav Šulc]

commit: 85099f7fd4924a0441cb67fd988115aa951dbdc9
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Apr 14 13:51:17 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr 14 13:51:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85099f7f

media-sound/csound: enabled [java] in 6.15.0-r101 + fixed symlink

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...csound-.ebuild => csound-6.15.0-r101.ebuild} | 10 ++
 media-sound/csound/csound-.ebuild   |  2 ++
 .../csound/files/csound-6.15.0-fix-soname.patch | 21 +
 3 files changed, 33 insertions(+)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-6.15.0-r101.ebuild
similarity index 94%
copy from media-sound/csound/csound-.ebuild
copy to media-sound/csound/csound-6.15.0-r101.ebuild
index cdc5d7cf593..6705f7c3429 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-6.15.0-r101.ebuild
@@ -103,6 +103,7 @@ RESTRICT="test"
 PATCHES=(
"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
"${FILESDIR}/${PN}-6.15.0-lame.patch"
+   "${FILESDIR}/${PN}-6.15.0-fix-soname.patch"
 )
 
 pkg_setup() {
@@ -119,6 +120,13 @@ src_prepare() {
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
-i CMakeLists.txt || die
+
+   if use doc; then
+   local png="${WORKDIR}/html/images/delayk.png"
+   pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help 
for exit codes
+   [[ $? -gt 15 ]] && die "Failed to fix ${png}"
+   mv -f ${png/.png/fixed.png} ${png} || die
+   fi
 }
 
 src_configure() {
@@ -244,6 +252,8 @@ src_install() {
 
use python && python_optimize
 
+   use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die 
"Failed to create java lib symlink")
+
# install docs
if [[ ${PV} != "" ]] && use doc ; then
dodoc "${WORKDIR}"/*.pdf

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index cdc5d7cf593..f0b57265999 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -244,6 +244,8 @@ src_install() {
 
use python && python_optimize
 
+   use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die 
"Failed to create java lib symlink")
+
# install docs
if [[ ${PV} != "" ]] && use doc ; then
dodoc "${WORKDIR}"/*.pdf

diff --git a/media-sound/csound/files/csound-6.15.0-fix-soname.patch 
b/media-sound/csound/files/csound-6.15.0-fix-soname.patch
new file mode 100644
index 000..7bac8708256
--- /dev/null
+++ b/media-sound/csound/files/csound-6.15.0-fix-soname.patch
@@ -0,0 +1,21 @@
+From 20daf5f4edbbf7291ad32dd623a335be1de0c54f Mon Sep 17 00:00:00 2001
+From: vlazzarini 
+Date: Tue, 13 Apr 2021 21:04:05 +0100
+Subject: [PATCH] issue #1449
+
+---
+ interfaces/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
+index d72c4ffdc6..3da25b627a 100644
+--- a/interfaces/CMakeLists.txt
 b/interfaces/CMakeLists.txt
+@@ -216,6 +216,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR 
BUILD_LUA_INTERFACE)
+ ARCHIVE_OUTPUT_DIRECTORY ${BUILD_LIB_DIR})
+ if(${CMAKE_COMPILER_IS_GNUCC})
+ target_compile_options(_jcsound6 PRIVATE "-Wno-error")
++ target_link_options(_jcsound6 PRIVATE 
"-Wl,-soname,lib_jcsound.so.1")
+ endif()
+ 
+ install(TARGETS _jcsound6

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 3119ee98389be7a834b97142410eb3b8f3d78a11
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Mar 12 15:58:29 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Mar 12 15:59:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3119ee98

media-sound/csound: enabled java on the live ebuild

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-.ebuild | 20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index bb0ad26e45f..cdc5d7cf593 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -30,19 +30,18 @@ HOMEPAGE="https://csound.github.io/;
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, 
see src_configure
 IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua mp3 nls osc portaudio
+fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc 
portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
 vim-syntax websocket"
 
 REQUIRED_USE="
alsa? ( threads )
+   java? ( cxx )
linear? ( double-precision )
lua? ( ${LUA_REQUIRED_USE} cxx )
python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
-#  java? ( cxx )
 
 BDEPEND="
sys-devel/flex
@@ -58,8 +57,6 @@ BDEPEND="
 "
 # linear currently works only with sci-mathematics-gmm-5.1
 #   https://github.com/csound/csound/issues/920
-# currently not used deps due to some issues
-#  java? ( virtual/jdk:* )
 CDEPEND="
dev-cpp/eigen:3
>=media-libs/libsndfile-1.0.16
@@ -76,6 +73,7 @@ CDEPEND="
hdf5? ( sci-libs/hdf5 )
image? ( media-libs/libpng:0= )
jack? ( virtual/jack )
+   java? ( >=virtual/jdk-1.8:* )
keyboard? ( x11-libs/fltk:1[threads?] )
linear? ( =sci-mathematics/gmm-5.1* )
lua? ( ${LUA_DEPS} )
@@ -142,7 +140,7 @@ src_configure() {
-DBUILD_IMAGE_OPCODES=$(usex image)
-DBUILD_INSTALLER=OFF
-DBUILD_JACK_OPCODES=$(usex jack)
-   -DBUILD_JAVA_INTERFACE=OFF
+   -DBUILD_JAVA_INTERFACE=$(usex java)
-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-DBUILD_LUA_INTERFACE=$(usex lua)
-DBUILD_MP3OUT_OPCODE=$(usex mp3)
@@ -195,13 +193,9 @@ src_configure() {
 
)
 
-   #use java && mycmakeargs+=(
-   #-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
-   #-DJAVA_AWT_LIBRARY="?"
-   #-DJAVA_JVM_LIBRARY="?"
-   #-DJAVA_INCLUDE_PATH2="?"
-   #-DJAVA_AWT_INCLUDE_PATH="?"
-   #)
+   use java && mycmakeargs+=(
+   -DJAVA_HOME="$(java-config -g JAVA_HOME)"
+   )
 
use lua && mycmakeargs+=(
-DLUA_H_PATH="$(lua_get_include_dir)"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: c3241b9cd5e6ab946da4ab40fb0e8efab4685ab0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Feb 13 18:03:57 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Feb 13 18:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3241b9c

media-sound/csound: removed obsolete 6.15.0

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-6.15.0.ebuild | 276 
 1 file changed, 276 deletions(-)

diff --git a/media-sound/csound/csound-6.15.0.ebuild 
b/media-sound/csound/csound-6.15.0.ebuild
deleted file mode 100644
index 65e4c105afb..000
--- a/media-sound/csound/csound-6.15.0.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="https://github.com/csound/csound.git;
-   inherit git-r3
-else
-   DOC_P="Csound${PV}"
-   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-   doc? (
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-   )"
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, 
see src_configure
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit mp3 nls osc 
portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-   linear? ( double-precision )
-   lua? ( cxx )
-   python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-#  java? ( cxx )
-
-BDEPEND="
-   sys-devel/flex
-   virtual/yacc
-   chua? ( dev-libs/boost )
-   python? ( dev-lang/swig )
-   nls? ( sys-devel/gettext )
-   test? (
-   dev-util/cunit
-   ${PYTHON_DEPS}
-   )
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-# currently not used deps due to some issues
-#  java? ( virtual/jdk:* )
-CDEPEND="
-   dev-cpp/eigen:3
-   >=media-libs/libsndfile-1.0.16
-   media-libs/libsamplerate
-   sys-libs/zlib
-   alsa? ( media-libs/alsa-lib )
-   curl? ( net-misc/curl )
-   dssi? (
-   media-libs/dssi
-   media-libs/ladspa-sdk
-   )
-   fluidsynth? ( media-sound/fluidsynth:= )
-   fltk? ( x11-libs/fltk:1[threads?] )
-   hdf5? ( sci-libs/hdf5 )
-   image? ( media-libs/libpng:0= )
-   jack? ( virtual/jack )
-   keyboard? ( x11-libs/fltk:1[threads?] )
-   linear? ( =sci-mathematics/gmm-5.1* )
-   lua? (
-   luajit? ( dev-lang/luajit:2 )
-   !luajit? ( dev-lang/lua:0 )
-   )
-   mp3? ( >=media-sound/lame-3.100-r3 )
-   osc? ( media-libs/liblo )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   python? ( ${PYTHON_DEPS} )
-   stk? ( media-libs/stk )
-   utils? ( !media-sound/snd )
-   websocket? ( net-libs/libwebsockets:= )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="
-   ${CDEPEND}
-   dev-libs/boost
-"
-
-if [[ ${PV} != "" ]]; then
-   DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-   "${FILESDIR}/${PN}-6.15.0-lame.patch"
-)
-
-pkg_setup() {
-   if use python || use test ; then
-   python-single-r1_pkg_setup
-   fi
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-   -e '/-O3/d' \
-   -i CMakeLists.txt || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_BELA=OFF
-   -DBUILD_BUCHLA_OPCODES=ON
-   -DBUILD_CHUA_OPCODES=$(usex chua)
-   -DBUILD_COUNTER_OPCODES=ON
-   -DBUILD_CSBEATS=$(usex beats)
-   -DBUILD_CUDA_OPCODES=OFF
-   -DBUILD_CXX_INTERFACE=$(usex cxx)
-   -DBUILD_DSSI_OPCODES=$(usex dssi)
-   -DBUILD_EMUGENS_OPCODES=ON
-  

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 60865938cda96bb7850ec5e8241076ee478e12a2
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Feb 13 18:08:50 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Feb 13 18:09:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60865938

media-sound/csound: fixed required use flag

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Closes: https://bugs.gentoo.org/762400
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-6.15.0-r100.ebuild | 1 +
 media-sound/csound/csound-.ebuild| 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.15.0-r100.ebuild 
b/media-sound/csound/csound-6.15.0-r100.ebuild
index b25982383b3..99d7b30062a 100644
--- a/media-sound/csound/csound-6.15.0-r100.ebuild
+++ b/media-sound/csound/csound-6.15.0-r100.ebuild
@@ -37,6 +37,7 @@ portaudio portmidi pulseaudio python samples static-libs stk 
test +threads +util
 vim-syntax websocket"
 
 REQUIRED_USE="
+   alsa? ( threads )
linear? ( double-precision )
lua? ( ${LUA_REQUIRED_USE} cxx )
python? ( ${PYTHON_REQUIRED_USE} cxx )

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index 4eca61bfb21..bb0ad26e45f 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -37,6 +37,7 @@ portaudio portmidi pulseaudio python samples static-libs stk 
test +threads +util
 vim-syntax websocket"
 
 REQUIRED_USE="
+   alsa? ( threads )
linear? ( double-precision )
lua? ( ${LUA_REQUIRED_USE} cxx )
python? ( ${PYTHON_REQUIRED_USE} cxx )

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, profiles/

[Marek Szuba]

commit: 3cc380b02a1d945c459bc7b8e619643728a15f59
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Dec 22 17:29:15 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Dec 22 17:32:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc380b0

media-sound/csound: migrate to lua-single.eclass

Compatibility + implementation selections as per the unmigrated ebuilds.
Single-impl because the compiled Lua module this package installs links
against liblua.

Closes: https://bugs.gentoo.org/752762
Signed-off-by: Marek Szuba  gentoo.org>

 ...sound-.ebuild => csound-6.15.0-r100.ebuild} | 40 --
 media-sound/csound/csound-.ebuild  | 40 --
 profiles/package.mask  |  1 +
 3 files changed, 31 insertions(+), 50 deletions(-)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-6.15.0-r100.ebuild
similarity index 91%
copy from media-sound/csound/csound-.ebuild
copy to media-sound/csound/csound-6.15.0-r100.ebuild
index b52669444ab..93b965bc730 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-6.15.0-r100.ebuild
@@ -7,8 +7,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-1 luajit )
 PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit cmake python-single-r1 toolchain-funcs
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git;
@@ -30,13 +32,13 @@ LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
 # java doesn't work atm as it needs to have some variables specified to work, 
see src_configure
 IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit mp3 nls osc 
portaudio
+fltk +fluidsynth hdf5 +image jack keyboard linear lua mp3 nls osc portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
 vim-syntax websocket"
 
 REQUIRED_USE="
linear? ( double-precision )
-   lua? ( cxx )
+   lua? ( ${LUA_REQUIRED_USE} cxx )
python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
 #  java? ( cxx )
@@ -45,6 +47,7 @@ BDEPEND="
sys-devel/flex
virtual/yacc
chua? ( dev-libs/boost )
+   lua? ( dev-lang/swig )
python? ( dev-lang/swig )
nls? ( sys-devel/gettext )
test? (
@@ -74,10 +77,7 @@ CDEPEND="
jack? ( virtual/jack )
keyboard? ( x11-libs/fltk:1[threads?] )
linear? ( =sci-mathematics/gmm-5.1* )
-   lua? (
-   luajit? ( dev-lang/luajit:2 )
-   !luajit? ( dev-lang/lua:0 )
-   )
+   lua? ( ${LUA_DEPS} )
mp3? ( >=media-sound/lame-3.100-r3 )
osc? ( media-libs/liblo )
portaudio? ( media-libs/portaudio )
@@ -107,6 +107,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+   use lua && lua-single_pkg_setup
+
if use python || use test ; then
python-single-r1_pkg_setup
fi
@@ -200,24 +202,12 @@ src_configure() {
#-DJAVA_AWT_INCLUDE_PATH="?"
#)
 
-   # set the library that we want to use
-   if use lua ; then
-   local libdir
-   local libname
-
-   if use luajit ; then
-   libdir=$(pkg-config --variable=libdir luajit)
-   libname=$(pkg-config --variable=libname luajit)
-   else
-   libdir=$(pkg-config --variable=libdir lua)
-   libname=$(pkg-config --variable=libname lua)
-   [[ -z "${libname}" ]] && libname="lua"
-   fi
-
-   mycmakeargs+=(
-   -DLUA_LIBRARY="${libdir}/lib${libname}.so"
-   )
-   fi
+   use lua && mycmakeargs+=(
+   -DLUA_H_PATH="$(lua_get_include_dir)"
+   -DLUA_LIBRARY="$(lua_get_shared_lib)"
+   # LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module 
links against liblua
+   # so it must NOT be installed into cmod_dir.
+   )
 
use python && mycmakeargs+=(
-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index b52669444ab..93b965bc730 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -7,8 +7,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-1 luajit )
 PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit cmake python-single-r1 toolchain-funcs
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git;
@@ -30,13 +32,13 @@ LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
 # java doesn't work atm as it needs to have some variables specified to work, 
see src_configure
 IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: d4f9e6856cb72361c2a195215ff249c83271762d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Sep 18 10:02:58 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep 18 10:02:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f9e685

media-sound/csound: removed obsolete 6.14.0

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest |   3 -
 media-sound/csound/csound-6.14.0.ebuild | 278 
 2 files changed, 281 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index a964a75e23b..dbe4c2256bf 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,6 +1,3 @@
-DIST Csound6.14.0_manual_html.zip 17081006 BLAKE2B 
9565c21623a60e06aae82bfbde186e496b5f3ae0eb619289a7db08235c7dcd520bee2283552fdf2ddb4eb85c7b0f184397d2fa0ee14d3bdeff9dccb44a7d7ff1
 SHA512 
638ecd8bc0b4c981e1f8c5592a123a3b1bb5582ee7017288be224eb670fccda79242ae42b6f6d8e91c2ad2f708af1de3c66283030d4b3373c0ec29ec260f379b
-DIST Csound6.14.0_manual_pdf.zip 8881242 BLAKE2B 
a91a3689dd3efa5c32c924178b646b73787132a07575f05a65ee1acafc69108ce6c33512e0b703012f75f201a86a0b84e08976f158b01ef5201807d1aaa31c35
 SHA512 
55769acd58add0ec6df5e188c74e16424deb679aebdbdd50dc5d9006c80a26c31dfe2564e5d71478abcb7a920b40c1f1baa02e4c3fd682a6d3bbc378ddcb8b7d
 DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B 
b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1
 SHA512 
cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 
898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e
 SHA512 
0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
-DIST csound-6.14.0-distributable.tar.xz 21114184 BLAKE2B 
ebcdff074d77fd6244875a3ccb6c0dc6364b6f3ae0ca0de75cc8ad893c91a30f17237bf7f1b06296f7141d2c9092594dea75b7539f033574bec7c8f36aaf9251
 SHA512 
21e857a363962c95f0b7702ce8a07713e56b267dae51f2c50d34ae8885f89e2ad0e241e84927d649912cddffeaecc6bfef15ef8958ffb621d825f4547c3632f8
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B 
f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8
 SHA512 
a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308

diff --git a/media-sound/csound/csound-6.14.0.ebuild 
b/media-sound/csound/csound-6.14.0.ebuild
deleted file mode 100644
index 389c8227528..000
--- a/media-sound/csound/csound-6.14.0.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="https://github.com/csound/csound.git;
-   inherit git-r3
-else
-   DOC_P="Csound${PV}"
-   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-   doc? (
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-   )"
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, 
see src_configure
-# mp3 doesnt work as media-sound/lame does not install cmake file
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-   linear? ( double-precision )
-   lua? ( cxx )
-   python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-#  java? ( cxx )
-
-BDEPEND="
-   sys-devel/flex
-   virtual/yacc
-   chua? ( dev-libs/boost )
-   python? ( dev-lang/swig )
-   nls? ( sys-devel/gettext )
-   test? (
-   dev-util/cunit
-   ${PYTHON_DEPS}
-   )
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Agostino Sarubbo]

commit: 4a1458e648a35c33aa11efffb550f73e6cf03fd3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 18 08:24:22 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 18 08:26:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1458e6

media-sound/csound: x86 stable wrt bug #742368

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/csound/csound-6.15.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.15.0.ebuild 
b/media-sound/csound/csound-6.15.0.ebuild
index 695b7485fbe..da75681bf4b 100644
--- a/media-sound/csound/csound-6.15.0.ebuild
+++ b/media-sound/csound/csound-6.15.0.ebuild
@@ -20,7 +20,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Agostino Sarubbo]

commit: 9ebf1c58e4cf8fb4af0e9911b08e847213cee677
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 18 07:25:31 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 18 07:29:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ebf1c58

media-sound/csound: amd64 stable wrt bug #742368

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/csound/csound-6.15.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.15.0.ebuild 
b/media-sound/csound/csound-6.15.0.ebuild
index b52669444ab..695b7485fbe 100644
--- a/media-sound/csound/csound-6.15.0.ebuild
+++ b/media-sound/csound/csound-6.15.0.ebuild
@@ -20,7 +20,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/

[Miroslav Šulc]

commit: 915ec0fc165587ef999b19d8b19098ae10c85cd8
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Aug 14 08:17:52 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Aug 14 08:20:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=915ec0fc

media-sound/csound: bump to 6.15.0 + updated live

1) added python3_9
2) re-introduced mp3 use flag as lame already has lame.pc
3) updated configuration parameters

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest|  3 +++
 .../{csound-.ebuild => csound-6.15.0.ebuild}   | 26 ++
 media-sound/csound/csound-.ebuild  | 26 ++
 media-sound/csound/files/csound-6.15.0-lame.patch  | 26 ++
 4 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 278aa09d586..a964a75e23b 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,6 @@
 DIST Csound6.14.0_manual_html.zip 17081006 BLAKE2B 
9565c21623a60e06aae82bfbde186e496b5f3ae0eb619289a7db08235c7dcd520bee2283552fdf2ddb4eb85c7b0f184397d2fa0ee14d3bdeff9dccb44a7d7ff1
 SHA512 
638ecd8bc0b4c981e1f8c5592a123a3b1bb5582ee7017288be224eb670fccda79242ae42b6f6d8e91c2ad2f708af1de3c66283030d4b3373c0ec29ec260f379b
 DIST Csound6.14.0_manual_pdf.zip 8881242 BLAKE2B 
a91a3689dd3efa5c32c924178b646b73787132a07575f05a65ee1acafc69108ce6c33512e0b703012f75f201a86a0b84e08976f158b01ef5201807d1aaa31c35
 SHA512 
55769acd58add0ec6df5e188c74e16424deb679aebdbdd50dc5d9006c80a26c31dfe2564e5d71478abcb7a920b40c1f1baa02e4c3fd682a6d3bbc378ddcb8b7d
+DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B 
b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1
 SHA512 
cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
+DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 
898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e
 SHA512 
0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
 DIST csound-6.14.0-distributable.tar.xz 21114184 BLAKE2B 
ebcdff074d77fd6244875a3ccb6c0dc6364b6f3ae0ca0de75cc8ad893c91a30f17237bf7f1b06296f7141d2c9092594dea75b7539f033574bec7c8f36aaf9251
 SHA512 
21e857a363962c95f0b7702ce8a07713e56b267dae51f2c50d34ae8885f89e2ad0e241e84927d649912cddffeaecc6bfef15ef8958ffb621d825f4547c3632f8
+DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B 
f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8
 SHA512 
a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-6.15.0.ebuild
similarity index 93%
copy from media-sound/csound/csound-.ebuild
copy to media-sound/csound/csound-6.15.0.ebuild
index f9db4411fa0..b52669444ab 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-6.15.0.ebuild
@@ -7,7 +7,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit cmake python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "" ]]; then
@@ -29,9 +29,8 @@ HOMEPAGE="https://csound.github.io/;
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
 # java doesn't work atm as it needs to have some variables specified to work, 
see src_configure
-# mp3 doesnt work as media-sound/lame does not install cmake file
 IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
+fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit mp3 nls osc 
portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
 vim-syntax websocket"
 
@@ -57,7 +56,6 @@ BDEPEND="
 #   https://github.com/csound/csound/issues/920
 # currently not used deps due to some issues
 #  java? ( virtual/jdk:* )
-#  mp3? ( media-sound/lame )
 CDEPEND="
dev-cpp/eigen:3
>=media-libs/libsndfile-1.0.16
@@ -80,6 +78,7 @@ CDEPEND="
luajit? ( dev-lang/luajit:2 )
!luajit? ( dev-lang/lua:0 )
)
+   mp3? ( >=media-sound/lame-3.100-r3 )
osc? ( media-libs/liblo )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
@@ -104,6 +103,7 @@ RESTRICT="test"
 
 PATCHES=(
"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
+   "${FILESDIR}/${PN}-6.15.0-lame.patch"
 )
 
 pkg_setup() {
@@ -125,6 +125,7 @@ src_configure() {
-DBUILD_BELA=OFF
-DBUILD_BUCHLA_OPCODES=ON
  

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Agostino Sarubbo]

commit: f3bb639f73b8221fdbcd3053483f18e7616a2964
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 11 14:23:10 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 11 14:23:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3bb639f

media-sound/csound: x86 stable wrt bug #736352

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/csound/csound-6.14.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.14.0.ebuild 
b/media-sound/csound/csound-6.14.0.ebuild
index a60bc5000f9..389c8227528 100644
--- a/media-sound/csound/csound-6.14.0.ebuild
+++ b/media-sound/csound/csound-6.14.0.ebuild
@@ -20,7 +20,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Agostino Sarubbo]

commit: 349660f1a3e75efe16a738e4a95368fd12b73d14
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 10 13:09:08 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 10 13:09:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349660f1

media-sound/csound: amd64 stable wrt bug #736352

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/csound/csound-6.14.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.14.0.ebuild 
b/media-sound/csound/csound-6.14.0.ebuild
index f9db4411fa0..a60bc5000f9 100644
--- a/media-sound/csound/csound-6.14.0.ebuild
+++ b/media-sound/csound/csound-6.14.0.ebuild
@@ -20,7 +20,7 @@ else

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
)"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and 
performance"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 31675613c8972ced7cc887310ec016417d4085d4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jul  8 08:02:18 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jul  8 08:02:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31675613

media-sound/csound: removed obsolete 6.13.0

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest |   3 -
 media-sound/csound/csound-6.13.0.ebuild | 277 
 2 files changed, 280 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 26f73b96048..278aa09d586 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,6 +1,3 @@
-DIST Csound6.13.0_manual_html.zip 16436055 BLAKE2B 
4ac6d24442cbb09f97f73167df84143df84045a077d3863564bab803e8c9e00c0ca506cff4a37d7aced54817cf95b2c0c6bed1b5ea744e2d11baef08c71f23ab
 SHA512 
87de3efc9aba736751d5bd93bb7bb9d47a3fc4c2e9df4552c9c1f3030f84e1aa29fa421f5360a22993cf0f6f7baae1d70bfb54201e5110f44f5a8c81d955deb5
-DIST Csound6.13.0_manual_pdf.zip 8846303 BLAKE2B 
f60becbe2df925d3d2db755d0ddf806507c6f8355d5ceb97a5e0ce971a0ee0ba19c44bbd018e41437036d9553db7fe8c44fea875bf36ef752ce5c26467ff3a82
 SHA512 
30a55ec2c3ab0e243ac48a081954bea1f8fa653d25c908383c49a879972b94ba2ce7c3b3b0701be18ace28dc7fd199597d889fa1f9e5aca478792b835909c8fa
 DIST Csound6.14.0_manual_html.zip 17081006 BLAKE2B 
9565c21623a60e06aae82bfbde186e496b5f3ae0eb619289a7db08235c7dcd520bee2283552fdf2ddb4eb85c7b0f184397d2fa0ee14d3bdeff9dccb44a7d7ff1
 SHA512 
638ecd8bc0b4c981e1f8c5592a123a3b1bb5582ee7017288be224eb670fccda79242ae42b6f6d8e91c2ad2f708af1de3c66283030d4b3373c0ec29ec260f379b
 DIST Csound6.14.0_manual_pdf.zip 8881242 BLAKE2B 
a91a3689dd3efa5c32c924178b646b73787132a07575f05a65ee1acafc69108ce6c33512e0b703012f75f201a86a0b84e08976f158b01ef5201807d1aaa31c35
 SHA512 
55769acd58add0ec6df5e188c74e16424deb679aebdbdd50dc5d9006c80a26c31dfe2564e5d71478abcb7a920b40c1f1baa02e4c3fd682a6d3bbc378ddcb8b7d
-DIST csound-6.13.0-distributable.tar.xz 20831668 BLAKE2B 
efefbb0d2a6532f087a940677dacce41b31be30bd10256300826f92516dddfadf6679f767e23655a0e35d09626ed11b03a13e22b88f378422f6d5a0f7856a566
 SHA512 
b8bedc893fed678b40d2d9ffa376b4d7557612e63c389145e6292cec4c1e847f6b86184d13b11392980eedfd215f0e08cdc234b2803e389f7387a009d83a3b40
 DIST csound-6.14.0-distributable.tar.xz 21114184 BLAKE2B 
ebcdff074d77fd6244875a3ccb6c0dc6364b6f3ae0ca0de75cc8ad893c91a30f17237bf7f1b06296f7141d2c9092594dea75b7539f033574bec7c8f36aaf9251
 SHA512 
21e857a363962c95f0b7702ce8a07713e56b267dae51f2c50d34ae8885f89e2ad0e241e84927d649912cddffeaecc6bfef15ef8958ffb621d825f4547c3632f8

diff --git a/media-sound/csound/csound-6.13.0.ebuild 
b/media-sound/csound/csound-6.13.0.ebuild
deleted file mode 100644
index e7d1d96b3f9..000
--- a/media-sound/csound/csound-6.13.0.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="https://github.com/csound/csound.git;
-   inherit git-r3
-else
-   DOC_P="Csound${PV}"
-   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-   doc? (
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-   )"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, 
see src_configure
-# mp3 doesnt work as media-sound/lame does not install cmake file
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-   linear? ( double-precision )
-   lua? ( cxx )
-   python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-#  java? ( cxx )
-
-BDEPEND="
-   sys-devel/flex
-   virtual/yacc
-   chua? ( dev-libs/boost )
-   python? ( dev-lang/swig )
-   nls? ( sys-devel/gettext )
-   test? (
-   dev-util/cunit
-   ${PYTHON_DEPS}
-   )
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 1f78f8c6bda0fe0e7fd36c3686424ea5cde581f4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Feb  8 00:39:24 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Feb  8 00:42:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f78f8c6

media-sound/csound: bump to 6.14.0 and  sync

updated config args

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest | 3 +++
 media-sound/csound/{csound-.ebuild => csound-6.14.0.ebuild} | 8 
 media-sound/csound/csound-.ebuild   | 8 
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 9a793153871..26f73b96048 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,6 @@
 DIST Csound6.13.0_manual_html.zip 16436055 BLAKE2B 
4ac6d24442cbb09f97f73167df84143df84045a077d3863564bab803e8c9e00c0ca506cff4a37d7aced54817cf95b2c0c6bed1b5ea744e2d11baef08c71f23ab
 SHA512 
87de3efc9aba736751d5bd93bb7bb9d47a3fc4c2e9df4552c9c1f3030f84e1aa29fa421f5360a22993cf0f6f7baae1d70bfb54201e5110f44f5a8c81d955deb5
 DIST Csound6.13.0_manual_pdf.zip 8846303 BLAKE2B 
f60becbe2df925d3d2db755d0ddf806507c6f8355d5ceb97a5e0ce971a0ee0ba19c44bbd018e41437036d9553db7fe8c44fea875bf36ef752ce5c26467ff3a82
 SHA512 
30a55ec2c3ab0e243ac48a081954bea1f8fa653d25c908383c49a879972b94ba2ce7c3b3b0701be18ace28dc7fd199597d889fa1f9e5aca478792b835909c8fa
+DIST Csound6.14.0_manual_html.zip 17081006 BLAKE2B 
9565c21623a60e06aae82bfbde186e496b5f3ae0eb619289a7db08235c7dcd520bee2283552fdf2ddb4eb85c7b0f184397d2fa0ee14d3bdeff9dccb44a7d7ff1
 SHA512 
638ecd8bc0b4c981e1f8c5592a123a3b1bb5582ee7017288be224eb670fccda79242ae42b6f6d8e91c2ad2f708af1de3c66283030d4b3373c0ec29ec260f379b
+DIST Csound6.14.0_manual_pdf.zip 8881242 BLAKE2B 
a91a3689dd3efa5c32c924178b646b73787132a07575f05a65ee1acafc69108ce6c33512e0b703012f75f201a86a0b84e08976f158b01ef5201807d1aaa31c35
 SHA512 
55769acd58add0ec6df5e188c74e16424deb679aebdbdd50dc5d9006c80a26c31dfe2564e5d71478abcb7a920b40c1f1baa02e4c3fd682a6d3bbc378ddcb8b7d
 DIST csound-6.13.0-distributable.tar.xz 20831668 BLAKE2B 
efefbb0d2a6532f087a940677dacce41b31be30bd10256300826f92516dddfadf6679f767e23655a0e35d09626ed11b03a13e22b88f378422f6d5a0f7856a566
 SHA512 
b8bedc893fed678b40d2d9ffa376b4d7557612e63c389145e6292cec4c1e847f6b86184d13b11392980eedfd215f0e08cdc234b2803e389f7387a009d83a3b40
+DIST csound-6.14.0-distributable.tar.xz 21114184 BLAKE2B 
ebcdff074d77fd6244875a3ccb6c0dc6364b6f3ae0ca0de75cc8ad893c91a30f17237bf7f1b06296f7141d2c9092594dea75b7539f033574bec7c8f36aaf9251
 SHA512 
21e857a363962c95f0b7702ce8a07713e56b267dae51f2c50d34ae8885f89e2ad0e241e84927d649912cddffeaecc6bfef15ef8958ffb621d825f4547c3632f8

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-6.14.0.ebuild
similarity index 98%
copy from media-sound/csound/csound-.ebuild
copy to media-sound/csound/csound-6.14.0.ebuild
index f29357886e4..f9db4411fa0 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-6.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -136,6 +136,7 @@ src_configure() {
-DBUILD_FRAMEBUFFER_OPCODES=ON
-DBUILD_HDF5_OPCODES=$(usex hdf5)
-DBUILD_IMAGE_OPCODES=$(usex image)
+   -DBUILD_INSTALLER=OFF
-DBUILD_JACK_OPCODES=$(usex jack)
-DBUILD_JAVA_INTERFACE=OFF
-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
@@ -155,8 +156,7 @@ src_configure() {
-DBUILD_SELECT_OPCODE=ON
-DBUILD_SERIAL_OPCODES=ON
-DBUILD_STACK_OPCODES=ON
-   -DBUILD_STATIC_LIBRARY=$(usex static-libs)
-   -DBUILD_STATIC_LIBRARY=$(usex test)
+   -DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-DBUILD_STK_OPCODES=$(usex stk)
-DBUILD_TESTS=$(usex test)
-DBUILD_UTILITIES=$(usex utils)
@@ -181,8 +181,8 @@ src_configure() {
-DUSE_GETTEXT=$(usex nls)
-DUSE_GIT_COMMIT=ON
_DUSE_IPMIDI=ON
-   -DUSE_LRINT=ON
-DUSE_JACK=$(usex jack)
+   -DUSE_LRINT=ON
-DUSE_PORTAUDIO=$(usex portaudio)
-DUSE_PORTMIDI=$(usex portmidi)
-DUSE_PULSEAUDIO=$(usex pulseaudio)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index f29357886e4..f9db4411fa0 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/hydrogen/, media-libs/portmidi/, ...

[Andreas Sturmlechner]

commit: 8f8c6827621d0aa475f92a2c19b9f530db3db114
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 30 18:15:41 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 31 14:34:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8c6827

*/*: Switch proaudio proj packages to cmake.eclass

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/portmidi/portmidi-217-r3.ebuild   | 10 +-
 media-sound/csound/csound-6.13.0.ebuild  |  9 -
 media-sound/csound/csound-.ebuild|  9 -
 media-sound/hydrogen/hydrogen-.ebuild| 10 +-
 media-sound/rosegarden/rosegarden-17.12.1.ebuild |  6 +++---
 media-sound/rosegarden/rosegarden-19.06.ebuild   |  8 
 media-sound/rosegarden/rosegarden-19.12.ebuild   |  8 
 media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild | 18 +-
 8 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild 
b/media-libs/portmidi/portmidi-217-r3.ebuild
index f50b4e526ed..27dd06fd49d 100644
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ b/media-libs/portmidi/portmidi-217-r3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 # ninja: error: build.ninja:521: multiple rules generate 
pm_java/pmdefaults.jar [-w dupbuild=err]
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils desktop xdg distutils-r1 java-pkg-opt-2
+inherit cmake desktop xdg distutils-r1 java-pkg-opt-2
 
 DESCRIPTION="Library for real time MIDI input and output"
 HOMEPAGE="http://portmedia.sourceforge.net/;
@@ -58,7 +58,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
# install wrapper for pmdefaults
if use java ; then
@@ -88,11 +88,11 @@ src_configure() {

mycmakeargs+=(-DJAR_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/lib")
fi
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_compile() {
-   cmake-utils_src_compile
+   cmake_src_compile
 
if use python ; then
sed -i -e "/library_dirs=.*linux/s#./linux#${CMAKE_BUILD_DIR}#" 
pm_python/setup.py || die
@@ -110,7 +110,7 @@ src_compile() {
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt
 

diff --git a/media-sound/csound/csound-6.13.0.ebuild 
b/media-sound/csound/csound-6.13.0.ebuild
index bee79ef4877..e7d1d96b3f9 100644
--- a/media-sound/csound/csound-6.13.0.ebuild
+++ b/media-sound/csound/csound-6.13.0.ebuild
@@ -8,7 +8,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils python-single-r1 toolchain-funcs
+inherit cmake python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git;
@@ -113,7 +113,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
@@ -153,7 +153,6 @@ src_configure() {
-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be 
redistributed: https://github.com/csound/csound/issues/1148
-DBUILD_SELECT_OPCODE=ON
-DBUILD_SERIAL_OPCODES=ON
-   -DBUILD_SHARED_LIBS=ON
-DBUILD_STACK_OPCODES=ON
-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-DBUILD_STATIC_LIBRARY=$(usex test)
@@ -225,11 +224,11 @@ src_configure() {
-DUSE_LIB64=ON
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
dodoc -r Release_Notes/.
 
# generate env.d file

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index d6e3677445f..f29357886e4 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -8,7 +8,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils python-single-r1 toolchain-funcs
+inherit cmake python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git;
@@ -113,7 +113,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
@@ -154,7 +154,6 @@ src_configure() {
-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be 
redistributed: https://github.com/csound/csound/issues/1148
-DBUILD_SELECT_OPCODE=ON
-DBUILD_SERIAL_OPCODES=ON
-   -DBUILD_SHARED_LIBS=ON
-DBUILD_STACK_OPCODES=ON
-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-DBUILD_STATIC_LIBRARY=$(usex test)
@@ 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Andreas Sturmlechner]

commit: c06dab394be78f626ba52648f590b3c7227bda7d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 23 22:09:50 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 23 22:11:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06dab39

media-sound/csound: Drop 6.10.0

Closes: https://bugs.gentoo.org/659400
Closes: https://bugs.gentoo.org/680062
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/csound/Manifest |   3 -
 media-sound/csound/csound-6.10.0.ebuild | 231 
 media-sound/csound/metadata.xml |   3 -
 3 files changed, 237 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 3a3c34187d4..9a793153871 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,6 +1,3 @@
-DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B 
dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab
 SHA512 
f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
-DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B 
ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c
 SHA512 
cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
 DIST Csound6.13.0_manual_html.zip 16436055 BLAKE2B 
4ac6d24442cbb09f97f73167df84143df84045a077d3863564bab803e8c9e00c0ca506cff4a37d7aced54817cf95b2c0c6bed1b5ea744e2d11baef08c71f23ab
 SHA512 
87de3efc9aba736751d5bd93bb7bb9d47a3fc4c2e9df4552c9c1f3030f84e1aa29fa421f5360a22993cf0f6f7baae1d70bfb54201e5110f44f5a8c81d955deb5
 DIST Csound6.13.0_manual_pdf.zip 8846303 BLAKE2B 
f60becbe2df925d3d2db755d0ddf806507c6f8355d5ceb97a5e0ce971a0ee0ba19c44bbd018e41437036d9553db7fe8c44fea875bf36ef752ce5c26467ff3a82
 SHA512 
30a55ec2c3ab0e243ac48a081954bea1f8fa653d25c908383c49a879972b94ba2ce7c3b3b0701be18ace28dc7fd199597d889fa1f9e5aca478792b835909c8fa
-DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 
4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697
 SHA512 
1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
 DIST csound-6.13.0-distributable.tar.xz 20831668 BLAKE2B 
efefbb0d2a6532f087a940677dacce41b31be30bd10256300826f92516dddfadf6679f767e23655a0e35d09626ed11b03a13e22b88f378422f6d5a0f7856a566
 SHA512 
b8bedc893fed678b40d2d9ffa376b4d7557612e63c389145e6292cec4c1e847f6b86184d13b11392980eedfd215f0e08cdc234b2803e389f7387a009d83a3b40

diff --git a/media-sound/csound/csound-6.10.0.ebuild 
b/media-sound/csound/csound-6.10.0.ebuild
deleted file mode 100644
index 2c61ca708be..000
--- a/media-sound/csound/csound-6.10.0.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="https://github.com/csound/csound.git;
-   inherit git-r3
-else
-   DOC_P="Csound${PV}"
-   SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> 
${P}.tar.gz
-   doc? (
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-   )"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi 
examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
-
-IUSE_LANGS=" de en_US es es_CO fr it ro ru"
-
-REQUIRED_USE="
-   csoundac? ( || ( lua python ) )
-   java? ( cxx )
-   linear? ( double-precision )
-   lua? ( cxx )
-   python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-RDEPEND="
-   >=media-libs/libsndfile-1.0.16
-   media-libs/libsamplerate
-   alsa? ( media-libs/alsa-lib )
-   csoundac? (
-   x11-libs/fltk:1[threads?]
-   dev-cpp/eigen:3
-   dev-libs/boost:=
-   )
-   curl? ( net-misc/curl )
-   dssi? (
-   media-libs/dssi
-   media-libs/ladspa-sdk
-   )
-   fluidsynth? ( =dev-lang/tcl-8.5:0=
-   >=dev-lang/tk-8.5:0=
-   )
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 5774c968ebbb210686b29e27e1d87239955e6165
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Dec 16 10:48:44 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Dec 16 10:49:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5774c968

media-sound/csound-{6.13.0,}: fixes

1) added hdf5 use flag and related dependency (bug #703072)
2) enabled most of the cmake flags to catch other possible issues
3) fixed configuring lua library when -luajit (bug #703078)
   pkg-config --variable=libname returns empty string so in that
   case using default libname
4) 6.13.0 - removed BUILD_MP3OUT_OPCODE as that was introduced later

Closes: https://bugs.gentoo.org/703072
Closes: https://bugs.gentoo.org/703078
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-6.13.0.ebuild | 50 ++---
 media-sound/csound/csound-.ebuild   | 49 +---
 2 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/media-sound/csound/csound-6.13.0.ebuild 
b/media-sound/csound/csound-6.13.0.ebuild
index fc723946ca3..bee79ef4877 100644
--- a/media-sound/csound/csound-6.13.0.ebuild
+++ b/media-sound/csound/csound-6.13.0.ebuild
@@ -31,7 +31,7 @@ SLOT="0"
 # java doesn't work atm as it needs to have some variables specified to work, 
see src_configure
 # mp3 doesnt work as media-sound/lame does not install cmake file
 IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth +image jack keyboard linear lua luajit nls osc portaudio
+fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
 vim-syntax websocket"
 
@@ -71,6 +71,7 @@ CDEPEND="
)
fluidsynth? ( media-sound/fluidsynth:= )
fltk? ( x11-libs/fltk:1[threads?] )
+   hdf5? ( sci-libs/hdf5 )
image? ( media-libs/libpng:0= )
jack? ( virtual/jack )
keyboard? ( x11-libs/fltk:1[threads?] )
@@ -121,47 +122,46 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
-   #-DBUILD_BELA=OFF
-   #-DBUILD_BUCHLA_OPCODES=ON
+   -DBUILD_BELA=OFF
+   -DBUILD_BUCHLA_OPCODES=ON
-DBUILD_CHUA_OPCODES=$(usex chua)
-DBUILD_CSBEATS=$(usex beats)
-   #-DBUILD_CUDA_OPCODES=OFF
+   -DBUILD_CUDA_OPCODES=OFF
-DBUILD_CXX_INTERFACE=$(usex cxx)
-DBUILD_DSSI_OPCODES=$(usex dssi)
-   #-DBUILD_EMUGENS_OPCODES=ON
-   #-DBUILD_EXCITER_OPCODES=ON
+   -DBUILD_EMUGENS_OPCODES=ON
+   -DBUILD_EXCITER_OPCODES=ON
-DBUILD_FAUST_OPCODES=OFF
-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-   #-DBUILD_FRAMEBUFFER_OPCODES=ON
-   #-DBUILD_HDF5_OPCODES=ON
+   -DBUILD_FRAMEBUFFER_OPCODES=ON
+   -DBUILD_HDF5_OPCODES=$(usex hdf5)
-DBUILD_IMAGE_OPCODES=$(usex image)
-DBUILD_JACK_OPCODES=$(usex jack)
-DBUILD_JAVA_INTERFACE=OFF
-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-DBUILD_LUA_INTERFACE=$(usex lua)
-   -DBUILD_MP3OUT_OPCODE=OFF
-DBUILD_MULTI_CORE=$(usex threads)
-   #-DBUULD_OPENCL_OPCODES=OFF
+   -DBUILD_OPENCL_OPCODES=OFF
-DBUILD_OSC_OPCODES=$(usex osc)
-DBUILD_P5GLOVE_OPCODES=OFF
-   #-DBUILD_PADSYNTH_OPCODES=ON
-   #-DBUILD_PLATEREV_OPCODES=ON
-   #-DBUILD_PVSGENDY_OPCODE=OFF
+   -DBUILD_PADSYNTH_OPCODES=ON
+   -DBUILD_PLATEREV_OPCODES=ON
+   -DBUILD_PVSGENDY_OPCODE=OFF
-DBUILD_PYTHON_INTERFACE=$(usex python)
-DBUILD_PYTHON_OPCODES=$(usex python)
-DBUILD_RELEASE=ON
-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be 
redistributed: https://github.com/csound/csound/issues/1148
-   #-DBUILD_SELECT_OPCODE=ON
-   #-DBUILD_SERIAL_OPCODES=ON
+   -DBUILD_SELECT_OPCODE=ON
+   -DBUILD_SERIAL_OPCODES=ON
-DBUILD_SHARED_LIBS=ON
-   #-DBUILD_STACK_OPCODES=ON
+   -DBUILD_STACK_OPCODES=ON
-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-DBUILD_STATIC_LIBRARY=$(usex test)
-DBUILD_STK_OPCODES=$(usex stk)
-DBUILD_TESTS=$(usex test)
-DBUILD_UTILITIES=$(usex utils)
-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-   #-DBUILD_VST4CS_OPCODES=OFF
+   -DBUILD_VST4CS_OPCODES=OFF
-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-DBUILD_WIIMOTE_OPCODES=OFF
-DBUILD_WINSOUND=OFF
@@ -180,8 +180,8 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/

[Miroslav Šulc]

commit: 5744da87a6bf1f417179b0cd36bf647850b071a5
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Dec 15 20:15:42 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Dec 15 20:15:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5744da87

media-sound/csound-{6.13.0,}: bump + more fixes

1) bumped to 6.13.0
2) updated SRC_URI to repackaged csound
3)  - replaced package name in patch name with variable
4) disabled Apple specific cmake flags
5) fixed typo in files/repackage.sh

Closes: https://bugs.gentoo.org/700298
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/Manifest | 3 +++
 media-sound/csound/{csound-.ebuild => csound-6.13.0.ebuild} | 8 
 media-sound/csound/csound-.ebuild   | 8 
 media-sound/csound/files/repackage.sh   | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 1fd37912a56..3a3c34187d4 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,6 @@
 DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B 
dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab
 SHA512 
f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
 DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B 
ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c
 SHA512 
cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
+DIST Csound6.13.0_manual_html.zip 16436055 BLAKE2B 
4ac6d24442cbb09f97f73167df84143df84045a077d3863564bab803e8c9e00c0ca506cff4a37d7aced54817cf95b2c0c6bed1b5ea744e2d11baef08c71f23ab
 SHA512 
87de3efc9aba736751d5bd93bb7bb9d47a3fc4c2e9df4552c9c1f3030f84e1aa29fa421f5360a22993cf0f6f7baae1d70bfb54201e5110f44f5a8c81d955deb5
+DIST Csound6.13.0_manual_pdf.zip 8846303 BLAKE2B 
f60becbe2df925d3d2db755d0ddf806507c6f8355d5ceb97a5e0ce971a0ee0ba19c44bbd018e41437036d9553db7fe8c44fea875bf36ef752ce5c26467ff3a82
 SHA512 
30a55ec2c3ab0e243ac48a081954bea1f8fa653d25c908383c49a879972b94ba2ce7c3b3b0701be18ace28dc7fd199597d889fa1f9e5aca478792b835909c8fa
 DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 
4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697
 SHA512 
1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
+DIST csound-6.13.0-distributable.tar.xz 20831668 BLAKE2B 
efefbb0d2a6532f087a940677dacce41b31be30bd10256300826f92516dddfadf6679f767e23655a0e35d09626ed11b03a13e22b88f378422f6d5a0f7856a566
 SHA512 
b8bedc893fed678b40d2d9ffa376b4d7557612e63c389145e6292cec4c1e847f6b86184d13b11392980eedfd215f0e08cdc234b2803e389f7387a009d83a3b40

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-6.13.0.ebuild
similarity index 97%
copy from media-sound/csound/csound-.ebuild
copy to media-sound/csound/csound-6.13.0.ebuild
index 04aea31ab2b..fc723946ca3 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-6.13.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
 else
DOC_P="Csound${PV}"
-   SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> 
${P}.tar.gz
+   
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
doc? (

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip

https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
@@ -102,7 +102,7 @@ fi
 RESTRICT="test"
 
 PATCHES=(
-   "${FILESDIR}/csound-6.13.0-xdg-open.patch"
+   "${FILESDIR}/${P}-xdg-open.patch"
 )
 
 pkg_setup() {
@@ -172,9 +172,9 @@ src_configure() {
 
-DUSE_ALSA=$(usex alsa)
#-DUSE_ATOMIC_BUILTIN=ON
-   #-DUSE_AUDIOUNIT=ON
+   -DUSE_AUDIOUNIT=OFF # Apple specific
#-DUSE_COMPILER_OPTIMIZATIONS=ON
-   #-DUSE_COREMIDI=ON
+   -DUSE_COREMIDI=OFF # Apple specific
-DUSE_CURL=$(usex curl)
-DUSE_DOUBLE=$(usex double-precision)
-DUSE_FLTK=$(usex fltk)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index 04aea31ab2b..84567ca2d8d 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
 else
DOC_P="Csound${PV}"
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/

[Miroslav Šulc]

commit: 4201cebc1ec69ededd2db6043e201afc8ae38acc
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Dec 15 19:45:30 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Dec 15 19:47:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4201cebc

media-sound/csound-: some improvements

1) added info about repackaging due to license issue
2) added patch from OpenSUSE to support xdg-open
3) added script for repackaging csound for redistribution

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-.ebuild  |  8 +
 .../csound/files/csound-6.13.0-xdg-open.patch  | 24 +++
 media-sound/csound/files/repackage.sh  | 35 ++
 3 files changed, 67 insertions(+)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index bf5bdabf976..04aea31ab2b 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash 
files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
@@ -97,6 +101,10 @@ fi
 # requires specific alsa settings
 RESTRICT="test"
 
+PATCHES=(
+   "${FILESDIR}/csound-6.13.0-xdg-open.patch"
+)
+
 pkg_setup() {
if use python || use test ; then
python-single-r1_pkg_setup

diff --git a/media-sound/csound/files/csound-6.13.0-xdg-open.patch 
b/media-sound/csound/files/csound-6.13.0-xdg-open.patch
new file mode 100644
index 000..19d428fabf3
--- /dev/null
+++ b/media-sound/csound/files/csound-6.13.0-xdg-open.patch
@@ -0,0 +1,24 @@
+Source: 
https://build.opensuse.org/package/view_file/openSUSE:Factory/csound/csound-6.08-xdg-open.patch
+Index: csound-6.12.2/installer/misc/vim/cshelp
+===
+--- csound-6.12.2.orig/installer/misc/vim/cshelp   2018-11-07 
16:05:23.0 +0200
 csound-6.12.2/installer/misc/vim/cshelp2019-04-05 15:32:23.670308342 
+0200
+@@ -3,7 +3,9 @@
+ BROWSER_CMD=""
+ 
+ if [ "${DISPLAY}" != "" ] ; then
+-if ( which links | grep -q -G -e "^/usr" ) ; then
++if ( which xdg-open | grep -E -e "^(/usr)?/bin" ); then
++BROWSER_CMD="xdg-open" ;
++elif ( which links | grep -q -G -e "^/usr" ) ; then
+ BROWSER_CMD="links -g" ;
+ elif ( which konqueror | grep -q -G -e "^/opt" ) ; then
+ BROWSER_CMD="konqueror" ;
+@@ -38,5 +40,5 @@ else
+ OPNAME="${1}" ;
+ fi
+ 
+-exec ${BROWSER_CMD} "/usr/local/share/doc/csound/manual/${OPNAME}.html"
++exec ${BROWSER_CMD} "/usr/share/doc/csound-manual/${OPNAME}.html"
+ 
+

diff --git a/media-sound/csound/files/repackage.sh 
b/media-sound/csound/files/repackage.sh
new file mode 100644
index 000..39b8068b930
--- /dev/null
+++ b/media-sound/csound/files/repackage.sh
@@ -0,0 +1,35 @@
+#! /bin/bash
+
+# Adjusted from OpenSUSE script
+# Source: 
https://build.opensuse.org/package/view_file/openSUSE:Factory/csound/pre_checkin.sh
+
+VERSION="${1}"
+
+if [[ -z "${VERSION}" ]]; then
+   echo "Version must be specified"
+   exit 1
+fi
+
+rm -f *.tar.*
+
+wget https://github.com/csound/csound/archive/${VERSION}.tar.gz || exit 1
+
+echo -e "\n\nUnpacking tarball\n"
+tar -xf ${VERSION}.tar.gz
+
+echo -e "Removing undistibutable files\n"
+rm -f csound-${VERSION}/Opcodes/scansyn*
+
+echo -e "Creating distributable tarball\n"
+tar -acf csound-${VERSION}-distibutable.tar.xz csound-${VERSION}
+
+echo -e "Cleaning up\n"
+rm -rf csound-${VERSION} ${VERSION}.tar.gz
+
+if ! test -e ${VERSION}.tar.gz; then
+   echo "success"
+   exit 0
+else
+   echo "error"
+   exit 1
+fi

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: ac1fc5c3864a08119267826cfcd17b4b3ee1fbbe
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Dec 15 18:45:15 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Dec 15 19:47:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1fc5c3

media-sound/csound-: disabled scansyn opcodes

upstream is not allowed to redistribute it:
https://github.com/csound/csound/issues/1148

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index 60dad6bb992..bf5bdabf976 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -142,7 +142,7 @@ src_configure() {
-DBUILD_PYTHON_INTERFACE=$(usex python)
-DBUILD_PYTHON_OPCODES=$(usex python)
-DBUILD_RELEASE=ON
-   #-DBUILD_SCANSYN_OPCODES=ON
+   -DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be 
redistributed: https://github.com/csound/csound/issues/1148
#-DBUILD_SELECT_OPCODE=ON
#-DBUILD_SERIAL_OPCODES=ON
-DBUILD_SHARED_LIBS=ON

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 72c7eae70abfbd66c6c8b461f113593b584d8ff0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Dec 15 17:39:22 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Dec 15 17:39:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c7eae7

media-sound/csound-: some fixes

1) removed java-pkg-opt-2 from inerit as java use flag is not enabled atm
2) removed code that compiled just some translations selectively
3) fixed boost dep (needed only header files, no linking)
4) added slot to net-libs/libwebsockets
5) added comment to -DUSE_LIB64 to make these line purpose clear

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-.ebuild | 21 +++--
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index b0de613cfe2..60dad6bb992 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils java-pkg-opt-2 python-single-r1 toolchain-funcs
+inherit cmake-utils python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git;
@@ -31,8 +31,6 @@ fltk +fluidsynth +image jack keyboard linear lua luajit nls 
osc portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
 vim-syntax websocket"
 
-IUSE_LANGS=" de en_US es es_CO fr it ro ru"
-
 REQUIRED_USE="
linear? ( double-precision )
lua? ( cxx )
@@ -41,7 +39,6 @@ REQUIRED_USE="
 #  java? ( cxx )
 
 BDEPEND="
-   dev-libs/boost:=
sys-devel/flex
virtual/yacc
chua? ( dev-libs/boost )
@@ -85,10 +82,13 @@ CDEPEND="
python? ( ${PYTHON_DEPS} )
stk? ( media-libs/stk )
utils? ( !media-sound/snd )
-   websocket? ( net-libs/libwebsockets )
+   websocket? ( net-libs/libwebsockets:= )
 "
 RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+DEPEND="
+   ${CDEPEND}
+   dev-libs/boost
+"
 
 if [[ ${PV} != "" ]]; then
DEPEND+="doc? ( app-arch/unzip )"
@@ -109,14 +109,6 @@ src_prepare() {
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
-i CMakeLists.txt || die
-
-   local lang
-
-   for lang in ${IUSE_LANGS} ; do
-   if ! has ${lang} ${LINGUAS-${lang}} ; then
-   sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-   fi
-   done
 }
 
 src_configure() {
@@ -216,6 +208,7 @@ src_configure() {
-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
)
 
+   # this is needed, otherwise it sets LIBRARY INSTALL DIR: lib
[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
-DUSE_LIB64=ON
)

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: 222930f179886fcd00ab3a5b229670ec2a4d173f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Dec 15 15:53:49 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Dec 15 15:53:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=222930f1

media-sound/csound-: dropped python3_5

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index 825888b2359..b0de613cfe2 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-utils java-pkg-opt-2 python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "" ]]; then

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Miroslav Šulc]

commit: c40f8490d6399793f65b2505b10994bd71c42e57
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Dec 15 14:08:01 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Dec 15 14:09:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40f8490

media-sound/csound-: updated

 1) updated to eapi7
 2) removed python2_7, added python3_{5,6,7,8}
 3) removed temporarily java use flag as building java interface
does not work atm due to missing configuration variables
 4) updated and organized deps
 5) removed csoundac use flag as it does not have corresponding
configuration in cmake
 6) added most of configurable options from cmake for future
reference
 7) reorganized cmake flags so they match the alphabetical order
of their names so they can be easily match in cmake-gui
for example
 8) added -DFAIL_MISSING=ON so that the ebuild fails when a dep
is missing
 9) removed cmake flags that are not present anymore
10) added selection of correct lua implementation based
on lua and luajit use flags

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/csound/csound-.ebuild | 154 +++---
 1 file changed, 106 insertions(+), 48 deletions(-)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index c0694b7cd5c..825888b2359 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 inherit cmake-utils java-pkg-opt-2 python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "" ]]; then
@@ -24,30 +24,45 @@ HOMEPAGE="https://csound.github.io/;
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi 
examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc portaudio
+# java doesn't work atm as it needs to have some variables specified to work, 
see src_configure
+# mp3 doesnt work as media-sound/lame does not install cmake file
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth +image jack keyboard linear lua luajit nls osc portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
 vim-syntax websocket"
 
 IUSE_LANGS=" de en_US es es_CO fr it ro ru"
 
 REQUIRED_USE="
-   csoundac? ( || ( lua python ) )
-   java? ( cxx )
linear? ( double-precision )
lua? ( cxx )
python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
+#  java? ( cxx )
 
-RDEPEND="
+BDEPEND="
+   dev-libs/boost:=
+   sys-devel/flex
+   virtual/yacc
+   chua? ( dev-libs/boost )
+   python? ( dev-lang/swig )
+   nls? ( sys-devel/gettext )
+   test? (
+   dev-util/cunit
+   ${PYTHON_DEPS}
+   )
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+# currently not used deps due to some issues
+#  java? ( virtual/jdk:* )
+#  mp3? ( media-sound/lame )
+CDEPEND="
+   dev-cpp/eigen:3
>=media-libs/libsndfile-1.0.16
media-libs/libsamplerate
+   sys-libs/zlib
alsa? ( media-libs/alsa-lib )
-   csoundac? (
-   x11-libs/fltk:1[threads?]
-   dev-cpp/eigen:3
-   dev-libs/boost:=
-   )
curl? ( net-misc/curl )
dssi? (
media-libs/dssi
@@ -56,10 +71,9 @@ RDEPEND="
fluidsynth? ( media-sound/fluidsynth:= )
fltk? ( x11-libs/fltk:1[threads?] )
image? ( media-libs/libpng:0= )
-   jack? ( media-sound/jack-audio-connection-kit )
-   java? ( virtual/jdk:* )
+   jack? ( virtual/jack )
keyboard? ( x11-libs/fltk:1[threads?] )
-   linear? ( sci-mathematics/gmm )
+   linear? ( =sci-mathematics/gmm-5.1* )
lua? (
luajit? ( dev-lang/luajit:2 )
!luajit? ( dev-lang/lua:0 )
@@ -73,17 +87,8 @@ RDEPEND="
utils? ( !media-sound/snd )
websocket? ( net-libs/libwebsockets )
 "
-DEPEND="${RDEPEND}
-   sys-devel/flex
-   virtual/yacc
-   chua? ( dev-libs/boost )
-   csoundac? ( dev-lang/swig )
-   nls? ( sys-devel/gettext )
-   test? (
-   dev-util/cunit
-   ${PYTHON_DEPS}
-   )
-"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
 
 if [[ ${PV} != "" ]]; then
DEPEND+="doc? ( app-arch/unzip )"
@@ -106,6 +111,7 @@ src_prepare() {
-i CMakeLists.txt || die
 
local lang
+
for lang in ${IUSE_LANGS} ; do
if ! has ${lang} ${LINGUAS-${lang}} ; then
sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
@@ -115,45 +121,97 @@ 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Andreas Sturmlechner]

commit: 60a3b3747f67527f467ae1ae88ec940c160a40e8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  1 21:25:56 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  1 21:36:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60a3b374

media-sound/csound: Restrict to https://bugs.gentoo.org/659400
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/csound/csound-6.10.0.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.10.0.ebuild 
b/media-sound/csound/csound-6.10.0.ebuild
index 185ce6f382b..2c61ca708be 100644
--- a/media-sound/csound/csound-6.10.0.ebuild
+++ b/media-sound/csound/csound-6.10.0.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
media-libs/dssi
media-libs/ladspa-sdk
)
-   fluidsynth? ( media-sound/fluidsynth:= )
+   fluidsynth? ( =media-sound/fluidsynth-2" &&
+   eapply "${FILESDIR}/${P}-fluidsynth2.patch" # 680062
+
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
-i CMakeLists.txt || die

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Andreas Sturmlechner]

commit: 36ad66b98b048df09c21f6cc62604f9a5a12a093
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 10 21:54:10 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 10 22:45:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ad66b9

media-sound/csound: Add media-sound/fluidsynth slot op

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/csound/csound-6.10.0.ebuild | 4 ++--
 media-sound/csound/csound-.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/csound/csound-6.10.0.ebuild 
b/media-sound/csound/csound-6.10.0.ebuild
index 5906af36652..185ce6f382b 100644
--- a/media-sound/csound/csound-6.10.0.ebuild
+++ b/media-sound/csound/csound-6.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ RDEPEND="
media-libs/dssi
media-libs/ladspa-sdk
)
-   fluidsynth? ( media-sound/fluidsynth )
+   fluidsynth? ( media-sound/fluidsynth:= )
fltk? ( x11-libs/fltk:1[threads?] )
image? ( media-libs/libpng:0= )
jack? ( media-sound/jack-audio-connection-kit )

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index b97419c554c..c0694b7cd5c 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ RDEPEND="
media-libs/dssi
media-libs/ladspa-sdk
)
-   fluidsynth? ( media-sound/fluidsynth )
+   fluidsynth? ( media-sound/fluidsynth:= )
fltk? ( x11-libs/fltk:1[threads?] )
image? ( media-libs/libpng:0= )
jack? ( media-sound/jack-audio-connection-kit )

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/

[Andreas Sturmlechner]

commit: cf037c1f38528312fbc283c26a2d389151d5a42b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  4 18:12:06 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  4 19:11:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf037c1f

media-sound/csound: Drop old

Closes: https://bugs.gentoo.org/602376
Closes: https://bugs.gentoo.org/590670
Closes: https://bugs.gentoo.org/599184
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 media-sound/csound/Manifest|   4 -
 media-sound/csound/csound-6.08.0.ebuild| 216 ---
 media-sound/csound/csound-6.09.1.ebuild| 230 -
 media-sound/csound/files/csound-6.05-python.patch  |  19 --
 .../csound/files/csound-6.09.1-python.patch|  23 ---
 5 files changed, 492 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index e41d387d163..1fd37912a56 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,7 +1,3 @@
-DIST Csound6.09.1_manual_html.zip 15537547 BLAKE2B 
8864cd42e811c596b1c17c68d0552edff39437412ce828772cf8cf13f47390d0edc25fa9a85ecfe1a50a01fe592cb0ee27ce5a11679195f8c1b41da9b1ede8cd
 SHA512 
8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd
-DIST Csound6.09.1_manual_pdf.zip 8647957 BLAKE2B 
52209784a08c67284a6481d17eaef8db2abf03f068bf347a40b06d4ba323389371474cb87fd93a318fe6abadeb69afd060be0aa64fdd2b638172ef33a282386a
 SHA512 
1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b
 DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B 
dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab
 SHA512 
f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
 DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B 
ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c
 SHA512 
cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
-DIST csound-6.08.0.tar.gz 33948686 BLAKE2B 
6a81e5806420b63ffd487d71d507d34336c46e91ec7073b4805324d04af31101c1ea65142f22aae2de071f149eb8fe4c88547b6795462aea248b585d029bad6c
 SHA512 
22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca
-DIST csound-6.09.1.tar.gz 41969942 BLAKE2B 
87dd02f61346f95648391c405edc18d08edad9d33c1cd2ab2cf054e0f10b7f987aaedce698a18520a8d8559d1fd78a20fa4f3d7db99e6afb3fdba316207e0495
 SHA512 
c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454
 DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 
4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697
 SHA512 
1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4

diff --git a/media-sound/csound/csound-6.08.0.ebuild 
b/media-sound/csound/csound-6.08.0.ebuild
deleted file mode 100644
index 56eb7fc9cdf..000
--- a/media-sound/csound/csound-6.08.0.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 
cmake-utils
-
-if [[ ${PV} == * ]]; then
-   EGIT_REPO_URI="https://github.com/csound/csound.git;
-   inherit git-r3
-else
-   SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A sound design and signal processing system for composition and 
performance"
-HOMEPAGE="https://csound.github.io/;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
-
-LANGS=" de en_US es_CO fr it ro ru"
-
-REQUIRED_USE="
-   csoundac? ( || ( lua python ) )
-   java? ( cxx )
-   linear? ( double-precision )
-   lua? ( cxx )
-   python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-RDEPEND="
-   >=media-libs/libsndfile-1.0.16
-   media-libs/libsamplerate
-   alsa? ( media-libs/alsa-lib )
-   csoundac? (
-   x11-libs/fltk:1[threads?]
-   dev-cpp/eigen:3
-   dev-libs/boost:=
-   )
-   curl? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Andreas Sturmlechner]

commit: a7858c40c0099e20413ef9d4f7af8af3f6a2308f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  4 19:02:17 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  4 19:11:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7858c40

media-sound/csound: Drop unused CMake variables

Bug: https://bugs.gentoo.org/659400
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 media-sound/csound/csound-.ebuild | 27 +++
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index 5906af36652..b97419c554c 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
 
-inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils java-pkg-opt-2 python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git;
@@ -19,15 +19,15 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A sound design and signal processing system for composition and 
performance"
+DESCRIPTION="Sound design and signal processing system for composition and 
performance"
 HOMEPAGE="https://csound.github.io/;
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
 IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi 
examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
+fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads 
+utils
+vim-syntax websocket"
 
 IUSE_LANGS=" de en_US es es_CO fr it ro ru"
 
@@ -70,10 +70,6 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
stk? ( media-libs/stk )
-   tcl? (
-   >=dev-lang/tcl-8.5:0=
-   >=dev-lang/tk-8.5:0=
-   )
utils? ( !media-sound/snd )
websocket? ( net-libs/libwebsockets )
 "
@@ -96,13 +92,7 @@ fi
 # requires specific alsa settings
 RESTRICT="test"
 
-pkg_pretend() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
 pkg_setup() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
if use python || use test ; then
python-single-r1_pkg_setup
fi
@@ -148,18 +138,15 @@ src_configure() {
-DBUILD_LUA_INTERFACE=$(usex lua)
-DUSE_GETTEXT=$(usex nls)
-DBUILD_OSC_OPCODES=$(usex osc)
-   -DUSE_OPEN_MP=$(usex openmp)
-DUSE_PORTAUDIO=$(usex portaudio)
-DUSE_PORTMIDI=$(usex portmidi)
-DUSE_PULSEAUDIO=$(usex pulseaudio)
-DBUILD_PYTHON_OPCODES=$(usex python)
-DBUILD_PYTHON_INTERFACE=$(usex python)
-   -DSCORE_PARSER=$(usex score)
-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-DBUILD_STK_OPCODES=$(usex stk)
-DBUILD_TESTS=$(usex test)
-DBUILD_STATIC_LIBRARY=$(usex test)
-   -DBUILD_TCLCSOUND=$(usex tcl)
-DBUILD_MULTI_CORE=$(usex threads)
-DBUILD_UTILITIES=$(usex utils)
-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Tim Harder]

commit: 2eff6c67fb2f2e265c3210da83cfe891da567e8f
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Feb 13 08:39:30 2018 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Feb 13 21:25:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eff6c67

media-sound/csound: version bump to 6.10.0

 media-sound/csound/Manifest |   3 +
 media-sound/csound/csound-6.10.0.ebuild | 228 
 2 files changed, 231 insertions(+)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 102028d8861..e41d387d163 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,4 +1,7 @@
 DIST Csound6.09.1_manual_html.zip 15537547 BLAKE2B 
8864cd42e811c596b1c17c68d0552edff39437412ce828772cf8cf13f47390d0edc25fa9a85ecfe1a50a01fe592cb0ee27ce5a11679195f8c1b41da9b1ede8cd
 SHA512 
8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd
 DIST Csound6.09.1_manual_pdf.zip 8647957 BLAKE2B 
52209784a08c67284a6481d17eaef8db2abf03f068bf347a40b06d4ba323389371474cb87fd93a318fe6abadeb69afd060be0aa64fdd2b638172ef33a282386a
 SHA512 
1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b
+DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B 
dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab
 SHA512 
f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
+DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B 
ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c
 SHA512 
cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
 DIST csound-6.08.0.tar.gz 33948686 BLAKE2B 
6a81e5806420b63ffd487d71d507d34336c46e91ec7073b4805324d04af31101c1ea65142f22aae2de071f149eb8fe4c88547b6795462aea248b585d029bad6c
 SHA512 
22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca
 DIST csound-6.09.1.tar.gz 41969942 BLAKE2B 
87dd02f61346f95648391c405edc18d08edad9d33c1cd2ab2cf054e0f10b7f987aaedce698a18520a8d8559d1fd78a20fa4f3d7db99e6afb3fdba316207e0495
 SHA512 
c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454
+DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 
4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697
 SHA512 
1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4

diff --git a/media-sound/csound/csound-6.10.0.ebuild 
b/media-sound/csound/csound-6.10.0.ebuild
new file mode 100644
index 000..5906af36652
--- /dev/null
+++ b/media-sound/csound/csound-6.10.0.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="https://github.com/csound/csound.git;
+   inherit git-r3
+else
+   DOC_P="Csound${PV}"
+   SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> 
${P}.tar.gz
+   doc? (
+   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+   )"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A sound design and signal processing system for composition and 
performance"
+HOMEPAGE="https://csound.github.io/;
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi 
examples
+fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
+portaudio portmidi pulseaudio python samples score static-libs stk tcl test
++threads +utils vim-syntax websocket"
+
+IUSE_LANGS=" de en_US es es_CO fr it ro ru"
+
+REQUIRED_USE="
+   csoundac? ( || ( lua python ) )
+   java? ( cxx )
+   linear? ( double-precision )
+   lua? ( cxx )
+   python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+
+RDEPEND="
+   >=media-libs/libsndfile-1.0.16
+   media-libs/libsamplerate
+   alsa? ( media-libs/alsa-lib )
+   csoundac? (
+   x11-libs/fltk:1[threads?]
+   dev-cpp/eigen:3
+   dev-libs/boost:=
+   )
+   curl? ( net-misc/curl )
+   dssi? (
+   media-libs/dssi
+   media-libs/ladspa-sdk
+   )
+   fluidsynth? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Ulrich Müller]

commit: 1a120b974a27ceaeb466ae6e9d69ddf38a8fd9fc
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan  6 15:28:22 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan  6 15:29:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a120b97

media-sound/csound: Remove linguas_* from IUSE.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-sound/csound/csound-6.08.0.ebuild | 5 ++---
 media-sound/csound/csound-6.09.1.ebuild | 5 ++---
 media-sound/csound/csound-.ebuild   | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/media-sound/csound/csound-6.08.0.ebuild 
b/media-sound/csound/csound-6.08.0.ebuild
index 9cf35beeed2..56eb7fc9cdf 100644
--- a/media-sound/csound/csound-6.08.0.ebuild
+++ b/media-sound/csound/csound-6.08.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,6 @@ portaudio portmidi pulseaudio python samples score 
static-libs stk tcl test
 +threads +utils vim-syntax websocket"
 
 LANGS=" de en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
 
 REQUIRED_USE="
csoundac? ( || ( lua python ) )
@@ -112,7 +111,7 @@ src_prepare() {
 
local lang
for lang in ${LANGS} ; do
-   if ! use linguas_${lang} ; then
+   if ! has ${lang} ${LINGUAS-${lang}} ; then
sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
fi
done

diff --git a/media-sound/csound/csound-6.09.1.ebuild 
b/media-sound/csound/csound-6.09.1.ebuild
index 75d25554860..7f018b3a913 100644
--- a/media-sound/csound/csound-6.09.1.ebuild
+++ b/media-sound/csound/csound-6.09.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,6 @@ portaudio portmidi pulseaudio python samples score 
static-libs stk tcl test
 +threads +utils vim-syntax websocket"
 
 IUSE_LANGS=" de en_US es es_CO fr it ro ru"
-IUSE+="${IUSE_LANGS// / linguas_}"
 
 REQUIRED_USE="
csoundac? ( || ( lua python ) )
@@ -120,7 +119,7 @@ src_prepare() {
 
local lang
for lang in ${IUSE_LANGS} ; do
-   if ! use linguas_${lang} ; then
+   if ! has ${lang} ${LINGUAS-${lang}} ; then
sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
fi
done

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index afdb7ee6315..5906af36652 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,6 @@ portaudio portmidi pulseaudio python samples score 
static-libs stk tcl test
 +threads +utils vim-syntax websocket"
 
 IUSE_LANGS=" de en_US es es_CO fr it ro ru"
-IUSE+="${IUSE_LANGS// / linguas_}"
 
 REQUIRED_USE="
csoundac? ( || ( lua python ) )
@@ -118,7 +117,7 @@ src_prepare() {
 
local lang
for lang in ${IUSE_LANGS} ; do
-   if ! use linguas_${lang} ; then
+   if ! has ${lang} ${LINGUAS-${lang}} ; then
sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
fi
done

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Tim Harder]

commit: 0da3cbad6c50977f2e8b75de0eb1652661f2f367
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 31 13:14:31 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 31 13:14:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da3cbad

media-sound/csound: use https for HOMEPAGE

 media-sound/csound/csound-6.08.0.ebuild | 2 +-
 media-sound/csound/csound-6.09.1.ebuild | 2 +-
 media-sound/csound/csound-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/csound/csound-6.08.0.ebuild 
b/media-sound/csound/csound-6.08.0.ebuild
index 02b97f9a43e..9cf35beeed2 100644
--- a/media-sound/csound/csound-6.08.0.ebuild
+++ b/media-sound/csound/csound-6.08.0.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="A sound design and signal processing system for composition and 
performance"
-HOMEPAGE="http://csound.github.io/;
+HOMEPAGE="https://csound.github.io/;
 
 LICENSE="LGPL-2.1"
 SLOT="0"

diff --git a/media-sound/csound/csound-6.09.1.ebuild 
b/media-sound/csound/csound-6.09.1.ebuild
index 064241c1a08..75d25554860 100644
--- a/media-sound/csound/csound-6.09.1.ebuild
+++ b/media-sound/csound/csound-6.09.1.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="A sound design and signal processing system for composition and 
performance"
-HOMEPAGE="http://csound.github.io/;
+HOMEPAGE="https://csound.github.io/;
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index a896acb2486..afdb7ee6315 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="A sound design and signal processing system for composition and 
performance"
-HOMEPAGE="http://csound.github.io/;
+HOMEPAGE="https://csound.github.io/;
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Tim Harder]

commit: 80258bd2af43f1b9a1a5015c7f6f7101b2075ca9
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Aug  1 13:34:51 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Fri Aug  4 00:33:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80258bd2

media-sound/csound: drop unnecessary csound-manual blocker

 media-sound/csound/csound-6.09.1.ebuild | 7 +--
 media-sound/csound/csound-.ebuild   | 7 +--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/media-sound/csound/csound-6.09.1.ebuild 
b/media-sound/csound/csound-6.09.1.ebuild
index 13059c170b0..064241c1a08 100644
--- a/media-sound/csound/csound-6.09.1.ebuild
+++ b/media-sound/csound/csound-6.09.1.ebuild
@@ -91,12 +91,7 @@ DEPEND="${RDEPEND}
 "
 
 if [[ ${PV} != "" ]]; then
-   DEPEND+="
-   doc? (
-   app-arch/unzip
-   !app-doc/csound-manual
-   )
-   "
+   DEPEND+="doc? ( app-arch/unzip )"
 fi
 
 # requires specific alsa settings

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index 73a1cd39197..a896acb2486 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -91,12 +91,7 @@ DEPEND="${RDEPEND}
 "
 
 if [[ ${PV} != "" ]]; then
-   DEPEND+="
-   doc? (
-   app-arch/unzip
-   !app-doc/csound-manual
-   )
-   "
+   DEPEND+="doc? ( app-arch/unzip )"
 fi
 
 # requires specific alsa settings

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/

[Tim Harder]

commit: 46793735da631fae7af30b9826c267a666439057
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Jul 29 11:30:58 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Jul 29 11:32:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46793735

media-sound/csound: version bump to 6.09.1

Merge csound-manual back in as releases now appear to be coordinated for
both on github.

 media-sound/csound/Manifest|  3 ++
 .../{csound-.ebuild => csound-6.09.1.ebuild}   | 41 --
 media-sound/csound/csound-.ebuild  | 39 ++--
 .../csound/files/csound-6.09.1-python.patch| 23 
 4 files changed, 86 insertions(+), 20 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 3a5290e6ef0..e2165ff71ae 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1 +1,4 @@
+DIST Csound6.09.1_manual_html.zip 15537547 SHA256 
b2e8ef90e43762c64643c6adddb1e276ac6b496b4fe64fe83e2b8393dbd69100 SHA512 
8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd
 WHIRLPOOL 
e5d0091dca95c311af5ecf42482a2693851fda4b38f66d3ccc3d06568a6c548a0410b1d5c444b655cf9a3bc73fbbf7cede896311bf109f30bb907b9ed1b5b744
+DIST Csound6.09.1_manual_pdf.zip 8647957 SHA256 
6c4287758791d4cd04c75adfea310d7d34581294d520d4da881a5653f47c9b24 SHA512 
1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b
 WHIRLPOOL 
b6460e66a2d043cef9adbd5bef61913f46bafdb3cb55ea107af5903c160e066544bed0011e4d0780d04945c7f585ea8952e48046e14ec74d8fb29cc3e2493050
 DIST csound-6.08.0.tar.gz 33948686 SHA256 
480bde5c07ac7fb8303b4c84c01710999815c2334501d007170adc9cdbf826a1 SHA512 
22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca
 WHIRLPOOL 
987fb74135a55a945e67a2ef083bb69e315fa3807018db5619bb8a57d33760b3aa85a8f6bfcfb2ac46b9a3f8676398ea12e2ac068b97bf917ef3e1f698d33faf
+DIST csound-6.09.1.tar.gz 41969942 SHA256 
d49735b4ed50f2818b577abcface45fe7f9b7fb49ccd898db030893cbcdfc738 SHA512 
c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454
 WHIRLPOOL 
31b3bba6ae60760cc70ca8e8234c45dcee1a070ab7a63891acac62218cfd39de3e11d24cb13789b9fb2152cebfa6a6a450a9c5c078531e8b7c5066206ae09079

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-6.09.1.ebuild
similarity index 86%
copy from media-sound/csound/csound-.ebuild
copy to media-sound/csound/csound-6.09.1.ebuild
index 93c01700dd0..13059c170b0 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-6.09.1.ebuild
@@ -2,31 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 
cmake-utils
+inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
 
-if [[ ${PV} == * ]]; then
+if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/csound/csound.git;
inherit git-r3
 else
-   SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   DOC_P="Csound${PV}"
+   SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> 
${P}.tar.gz
+   doc? (
+   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+   
https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+   )"
KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="A sound design and signal processing system for composition and 
performance"
 HOMEPAGE="http://csound.github.io/;
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
+IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi 
examples
 fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
 portaudio portmidi pulseaudio python samples score static-libs stk tcl test
 +threads +utils vim-syntax websocket"
 
-LANGS=" de en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
+IUSE_LANGS=" de en_US es es_CO fr it ro ru"
+IUSE+="${IUSE_LANGS// / linguas_}"
 
 REQUIRED_USE="
csoundac? ( || ( lua python ) )
@@ -86,9 +90,20 @@ DEPEND="${RDEPEND}
)
 "
 
+if [[ ${PV} != "" ]]; then
+   DEPEND+="
+   doc? (
+   app-arch/unzip
+   !app-doc/csound-manual
+   )
+   "
+fi
+
 # requires specific alsa settings
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}"/${P}-python.patch )
+
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[David Seifert]

commit: aea24fb5e01177cfaf782c0977bbd723a4d00f81
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jun  3 19:59:30 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jun  3 20:52:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea24fb5

media-sound/csound: [QA] Various fixes

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-sound/csound/csound-6.08.0.ebuild | 60 ++---
 media-sound/csound/csound-.ebuild   | 50 +--
 2 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/media-sound/csound/csound-6.08.0.ebuild 
b/media-sound/csound/csound-6.08.0.ebuild
index 8cc84ab08b7..02b97f9a43e 100644
--- a/media-sound/csound/csound-6.08.0.ebuild
+++ b/media-sound/csound/csound-6.08.0.ebuild
@@ -2,16 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator 
python-single-r1
 
-DESCRIPTION="A sound design and signal processing system providing facilities 
for composition and performance"
+inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 
cmake-utils
+
+if [[ ${PV} == * ]]; then
+   EGIT_REPO_URI="https://github.com/csound/csound.git;
+   inherit git-r3
+else
+   SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A sound design and signal processing system for composition and 
performance"
 HOMEPAGE="http://csound.github.io/;
-SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
 fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
 portaudio portmidi pulseaudio python samples score static-libs stk tcl test
@@ -46,7 +54,7 @@ RDEPEND="
fltk? ( x11-libs/fltk:1[threads?] )
image? ( media-libs/libpng:0= )
jack? ( media-sound/jack-audio-connection-kit )
-   java? ( virtual/jdk )
+   java? ( virtual/jdk:* )
keyboard? ( x11-libs/fltk:1[threads?] )
linear? ( sci-mathematics/gmm )
lua? (
@@ -81,6 +89,8 @@ DEPEND="${RDEPEND}
 # requires specific alsa settings
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}"/csound-6.05-python.patch )
+
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -94,28 +104,21 @@ pkg_setup() {
 }
 
 src_prepare() {
-   local PATCHES=( "${FILESDIR}"/csound-6.05-python.patch )
+   cmake-utils_src_prepare
 
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
-i CMakeLists.txt || die
 
+   local lang
for lang in ${LANGS} ; do
if ! use linguas_${lang} ; then
sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
fi
done
-
-   default
 }
 
 src_configure() {
-   local myconf=()
-
-   use python && myconf+=( 
"-DPYTHON_MODULE_INSTALL_DIR=$(python_get_sitedir)" )
-
-   [[ $(get_libdir) == "lib64" ]] && myconf+=( -DUSE_LIB64=ON )
-
local mycmakeargs=(
-DUSE_ALSA=$(usex alsa)
-DBUILD_CSBEATS=$(usex beats)
@@ -157,28 +160,31 @@ src_configure() {
-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-DNEED_PORTTIME=OFF
-DBUILD_RELEASE=ON
-   "${myconf[@]}"
)
 
-   cmake-utils_src_configure
-}
+   use python && mycmakeargs+=(
+   -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
+   )
 
-src_test() {
-   cmake-utils_src_test
+   [[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
+   -DUSE_LIB64=ON
+   )
+
+   cmake-utils_src_configure
 }
 
 src_install() {
cmake-utils_src_install
-   dodoc AUTHORS ChangeLog README.md Release_Notes/*
+   dodoc -r Release_Notes/.
 
# Generate env.d file
-   if use double-precision ; then
-   echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > 
"${T}"/62${PN}
-   else
-   echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN}
+   cat > "${T}"/62${PN} <<-_EOF_ || die
+   OPCODEDIR$(usex double-precision 64 
'')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+   CSSTRNGS="${EPREFIX}/usr/share/locale"
+   _EOF_
+   if use stk ; then
+   echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> 
"${T}"/62${PN} || die
fi
-   echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN}
-   use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> 
"${T}"/62${PN}
doenvd "${T}"/62${PN}
 
if use examples ; then
@@ -196,7 +202,7 @@ src_install() {
fi
 
# 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[David Seifert]

commit: 2ee7d72d539753a7e9f9e9752d888f0d9f121f80
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 23 10:30:05 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 23 11:27:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee7d72d

media-sound/csound: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-sound/csound/csound-6.08.0.ebuild | 10 +-
 media-sound/csound/csound-.ebuild   | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-sound/csound/csound-6.08.0.ebuild 
b/media-sound/csound/csound-6.08.0.ebuild
index a28fec3c57e..8cc84ab08b7 100644
--- a/media-sound/csound/csound-6.08.0.ebuild
+++ b/media-sound/csound/csound-6.08.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ REQUIRED_USE="
java? ( cxx )
linear? ( double-precision )
lua? ( cxx )
-   python? ( cxx )
+   python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
 
 RDEPEND="
@@ -82,12 +82,12 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 pkg_pretend() {
-   if use openmp ; then
-   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-   fi
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
if use python || use test ; then
python-single-r1_pkg_setup
fi

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
index 06c09139e74..b67f5ec5779 100644
--- a/media-sound/csound/csound-.ebuild
+++ b/media-sound/csound/csound-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,7 +31,7 @@ REQUIRED_USE="
java? ( cxx )
linear? ( double-precision )
lua? ( cxx )
-   python? ( cxx )
+   python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
 
 RDEPEND="
@@ -88,12 +88,12 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 pkg_pretend() {
-   if use openmp ; then
-   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-   fi
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
if use python || use test ; then
python-single-r1_pkg_setup
fi

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/

[Tim Harder]

commit: ff604f4c45862f44a08b8ba16868726f5142b72c
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Dec 10 20:48:53 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Dec 10 20:49:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff604f4c

media-sound/csound: remove old

 media-sound/csound/Manifest|   2 -
 media-sound/csound/csound-6.06.0.ebuild| 215 -
 media-sound/csound/csound-6.07.0.ebuild| 215 -
 .../csound/files/csound-6.07.0-fltk-headers.patch  |  10 -
 4 files changed, 442 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index a4dca7d..3a5290e 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1 @@
-DIST csound-6.06.0.tar.gz 33113094 SHA256 
0be4d845729f9219d59f3e87b91bc2672e26838178fb0fc4a7753211984d3ef2 SHA512 
6a8c2afec4ccaf27a5af37f8f847a1fa32d1800724fd0c80139ad7487288a49d19779d0ee505dc35bc7847bac34bb6c3a184da3600ddc7343531884845e6393b
 WHIRLPOOL 
3bbbe0f27a1d104b2483c42016feaa3df28cda4488e71a15e7b1fc77360df801c6e06644f539167579055b7fa5877a937cb26b4d132ba30272c0827575eb0fe4
-DIST csound-6.07.0.tar.gz 33834342 SHA256 
606af463da477cf4a3f89d00a4fda63c7eb0dc7f50a8923069f009dfdc545799 SHA512 
73f8f3a31f570cff309168127adc476cf78c7671d864fb0230175aba358e46b5272ba654688b2060abaf4de7ee4d68e29cc8480fdddaac48657332d5a0802a06
 WHIRLPOOL 
53cc86e9997088cfd1528b405b8aaf58f65a5ec6a0a4ceb20fa438ef59c96d4a0fc3996245b16da6bde72cf47bef2130d37cc8ed095cfd04e8b7948c66e6d046
 DIST csound-6.08.0.tar.gz 33948686 SHA256 
480bde5c07ac7fb8303b4c84c01710999815c2334501d007170adc9cdbf826a1 SHA512 
22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca
 WHIRLPOOL 
987fb74135a55a945e67a2ef083bb69e315fa3807018db5619bb8a57d33760b3aa85a8f6bfcfb2ac46b9a3f8676398ea12e2ac068b97bf917ef3e1f698d33faf

diff --git a/media-sound/csound/csound-6.06.0.ebuild 
b/media-sound/csound/csound-6.06.0.ebuild
deleted file mode 100644
index 6f63c47..
--- a/media-sound/csound/csound-6.06.0.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator 
python-single-r1
-
-DESCRIPTION="A sound design and signal processing system providing facilities 
for composition and performance"
-HOMEPAGE="http://csound.github.io/;
-SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
-portaudio portmidi pulseaudio python samples score static-libs stk tcl test
-+threads +utils vim-syntax websocket"
-
-LANGS=" de en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
-
-RDEPEND="
-   >=media-libs/libsndfile-1.0.16
-   media-libs/libsamplerate
-   alsa? ( media-libs/alsa-lib )
-   csoundac? (
-   x11-libs/fltk:1[threads?]
-   dev-cpp/eigen:3
-   dev-libs/boost
-   )
-   curl? ( net-misc/curl )
-   dssi? (
-   media-libs/dssi
-   media-libs/ladspa-sdk
-   )
-   fluidsynth? ( media-sound/fluidsynth )
-   fltk? ( x11-libs/fltk:1[threads?] )
-   image? ( media-libs/libpng:0= )
-   jack? ( media-sound/jack-audio-connection-kit )
-   java? ( virtual/jdk )
-   keyboard? ( x11-libs/fltk:1[threads?] )
-   linear? ( sci-mathematics/gmm )
-   lua? (
-   luajit? ( dev-lang/luajit:2 )
-   !luajit? ( dev-lang/lua:0 )
-   )
-   osc? ( media-libs/liblo )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   python? ( ${PYTHON_DEPS} )
-   stk? ( media-libs/stk )
-   tcl? (
-   >=dev-lang/tcl-8.5:0=
-   >=dev-lang/tk-8.5:0=
-   )
-   utils? ( !media-sound/snd )
-   websocket? ( net-libs/libwebsockets )
-"
-DEPEND="${RDEPEND}
-   sys-devel/flex
-   virtual/yacc
-   chua? ( dev-libs/boost )
-   csoundac? ( dev-lang/swig )
-   nls? ( sys-devel/gettext )
-   test? (
-   dev-util/cunit
-   ${PYTHON_DEPS}
-   )
-"
-REQUIRED_USE="
-   csoundac? ( || ( lua python ) )
-   java? ( cxx )
-   linear? ( double-precision )
-   lua? ( cxx )
-   python? ( cxx )
-"
-
-# requires specific alsa settings
-RESTRICT="test"
-
-pkg_pretend() {
-   if use openmp ; then
-   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-   fi
-}
-
-pkg_setup() {
-   if use python || use test ; then
- 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Tim Harder]

commit: 7874c533f5731be18c702427951cf77df788085b
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Dec 10 20:01:17 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Dec 10 20:48:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7874c533

media-sound/csound: add live ebuild

 media-sound/csound/csound-.ebuild | 218 ++
 1 file changed, 218 insertions(+)

diff --git a/media-sound/csound/csound-.ebuild 
b/media-sound/csound/csound-.ebuild
new file mode 100644
index ..97493ca
--- /dev/null
+++ b/media-sound/csound/csound-.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator 
python-single-r1
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/csound/csound.git;
+   inherit git-r3
+else
+   SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A sound design and signal processing system providing facilities 
for composition and performance"
+HOMEPAGE="http://csound.github.io/;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
+fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
+portaudio portmidi pulseaudio python samples score static-libs stk tcl test
++threads +utils vim-syntax websocket"
+
+LANGS=" de en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+   csoundac? ( || ( lua python ) )
+   java? ( cxx )
+   linear? ( double-precision )
+   lua? ( cxx )
+   python? ( cxx )
+"
+
+RDEPEND="
+   >=media-libs/libsndfile-1.0.16
+   media-libs/libsamplerate
+   alsa? ( media-libs/alsa-lib )
+   csoundac? (
+   x11-libs/fltk:1[threads?]
+   dev-cpp/eigen:3
+   dev-libs/boost:=
+   )
+   curl? ( net-misc/curl )
+   dssi? (
+   media-libs/dssi
+   media-libs/ladspa-sdk
+   )
+   fluidsynth? ( media-sound/fluidsynth )
+   fltk? ( x11-libs/fltk:1[threads?] )
+   image? ( media-libs/libpng:0= )
+   jack? ( media-sound/jack-audio-connection-kit )
+   java? ( virtual/jdk )
+   keyboard? ( x11-libs/fltk:1[threads?] )
+   linear? ( sci-mathematics/gmm )
+   lua? (
+   luajit? ( dev-lang/luajit:2 )
+   !luajit? ( dev-lang/lua:0 )
+   )
+   osc? ( media-libs/liblo )
+   portaudio? ( media-libs/portaudio )
+   portmidi? ( media-libs/portmidi )
+   pulseaudio? ( media-sound/pulseaudio )
+   python? ( ${PYTHON_DEPS} )
+   stk? ( media-libs/stk )
+   tcl? (
+   >=dev-lang/tcl-8.5:0=
+   >=dev-lang/tk-8.5:0=
+   )
+   utils? ( !media-sound/snd )
+   websocket? ( net-libs/libwebsockets )
+"
+DEPEND="${RDEPEND}
+   sys-devel/flex
+   virtual/yacc
+   chua? ( dev-libs/boost )
+   csoundac? ( dev-lang/swig )
+   nls? ( sys-devel/gettext )
+   test? (
+   dev-util/cunit
+   ${PYTHON_DEPS}
+   )
+"
+
+# requires specific alsa settings
+RESTRICT="test"
+
+pkg_pretend() {
+   if use openmp ; then
+   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
+   fi
+}
+
+pkg_setup() {
+   if use python || use test ; then
+   python-single-r1_pkg_setup
+   fi
+}
+
+src_prepare() {
+   local PATCHES=( "${FILESDIR}"/csound-6.05-python.patch )
+
+   sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+   -e '/-O3/d' \
+   -i CMakeLists.txt || die
+
+   for lang in ${LANGS} ; do
+   if ! use linguas_${lang} ; then
+   sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
+   fi
+   done
+
+   default
+}
+
+src_configure() {
+   local myconf=()
+
+   use python && myconf+=( 
"-DPYTHON_MODULE_INSTALL_DIR=$(python_get_sitedir)" )
+
+   [[ $(get_libdir) == "lib64" ]] && myconf+=( -DUSE_LIB64=ON )
+
+   local mycmakeargs=(
+   -DUSE_ALSA=$(usex alsa)
+   -DBUILD_CSBEATS=$(usex beats)
+   -DBUILD_CHUA_OPCODES=$(usex chua)
+   -DBUILD_CSOUND_AC=$(usex csoundac)
+   -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
+   -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex 
python))
+   -DBUILD_CXX_INTERFACE=$(usex cxx)
+   -DUSE_CURL=$(usex curl)
+   -DNEW_PARSER_DEBUG=$(usex debug)
+   -DUSE_DOUBLE=$(usex double-precision)
+   -DBUILD_DSSI_OPCODES=$(usex dssi)
+   -DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Tim Harder]

commit: 86e4ecaab954315104fe059d8b9958f20f58eaa3
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Dec  8 05:15:59 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Dec  8 05:15:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e4ecaa

media-sound/csound: version bump to 6.08

 media-sound/csound/Manifest |   1 +
 media-sound/csound/csound-6.08.0.ebuild | 212 
 2 files changed, 213 insertions(+)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index a49efed..a4dca7d 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,2 +1,3 @@
 DIST csound-6.06.0.tar.gz 33113094 SHA256 
0be4d845729f9219d59f3e87b91bc2672e26838178fb0fc4a7753211984d3ef2 SHA512 
6a8c2afec4ccaf27a5af37f8f847a1fa32d1800724fd0c80139ad7487288a49d19779d0ee505dc35bc7847bac34bb6c3a184da3600ddc7343531884845e6393b
 WHIRLPOOL 
3bbbe0f27a1d104b2483c42016feaa3df28cda4488e71a15e7b1fc77360df801c6e06644f539167579055b7fa5877a937cb26b4d132ba30272c0827575eb0fe4
 DIST csound-6.07.0.tar.gz 33834342 SHA256 
606af463da477cf4a3f89d00a4fda63c7eb0dc7f50a8923069f009dfdc545799 SHA512 
73f8f3a31f570cff309168127adc476cf78c7671d864fb0230175aba358e46b5272ba654688b2060abaf4de7ee4d68e29cc8480fdddaac48657332d5a0802a06
 WHIRLPOOL 
53cc86e9997088cfd1528b405b8aaf58f65a5ec6a0a4ceb20fa438ef59c96d4a0fc3996245b16da6bde72cf47bef2130d37cc8ed095cfd04e8b7948c66e6d046
+DIST csound-6.08.0.tar.gz 33948686 SHA256 
480bde5c07ac7fb8303b4c84c01710999815c2334501d007170adc9cdbf826a1 SHA512 
22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca
 WHIRLPOOL 
987fb74135a55a945e67a2ef083bb69e315fa3807018db5619bb8a57d33760b3aa85a8f6bfcfb2ac46b9a3f8676398ea12e2ac068b97bf917ef3e1f698d33faf

diff --git a/media-sound/csound/csound-6.08.0.ebuild 
b/media-sound/csound/csound-6.08.0.ebuild
new file mode 100644
index ..067d9f3
--- /dev/null
+++ b/media-sound/csound/csound-6.08.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator 
python-single-r1
+
+DESCRIPTION="A sound design and signal processing system providing facilities 
for composition and performance"
+HOMEPAGE="http://csound.github.io/;
+SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
+fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
+portaudio portmidi pulseaudio python samples score static-libs stk tcl test
++threads +utils vim-syntax websocket"
+
+LANGS=" de en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+   csoundac? ( || ( lua python ) )
+   java? ( cxx )
+   linear? ( double-precision )
+   lua? ( cxx )
+   python? ( cxx )
+"
+
+RDEPEND="
+   >=media-libs/libsndfile-1.0.16
+   media-libs/libsamplerate
+   alsa? ( media-libs/alsa-lib )
+   csoundac? (
+   x11-libs/fltk:1[threads?]
+   dev-cpp/eigen:3
+   dev-libs/boost:=
+   )
+   curl? ( net-misc/curl )
+   dssi? (
+   media-libs/dssi
+   media-libs/ladspa-sdk
+   )
+   fluidsynth? ( media-sound/fluidsynth )
+   fltk? ( x11-libs/fltk:1[threads?] )
+   image? ( media-libs/libpng:0= )
+   jack? ( media-sound/jack-audio-connection-kit )
+   java? ( virtual/jdk )
+   keyboard? ( x11-libs/fltk:1[threads?] )
+   linear? ( sci-mathematics/gmm )
+   lua? (
+   luajit? ( dev-lang/luajit:2 )
+   !luajit? ( dev-lang/lua:0 )
+   )
+   osc? ( media-libs/liblo )
+   portaudio? ( media-libs/portaudio )
+   portmidi? ( media-libs/portmidi )
+   pulseaudio? ( media-sound/pulseaudio )
+   python? ( ${PYTHON_DEPS} )
+   stk? ( media-libs/stk )
+   tcl? (
+   >=dev-lang/tcl-8.5:0=
+   >=dev-lang/tk-8.5:0=
+   )
+   utils? ( !media-sound/snd )
+   websocket? ( net-libs/libwebsockets )
+"
+DEPEND="${RDEPEND}
+   sys-devel/flex
+   virtual/yacc
+   chua? ( dev-libs/boost )
+   csoundac? ( dev-lang/swig )
+   nls? ( sys-devel/gettext )
+   test? (
+   dev-util/cunit
+   ${PYTHON_DEPS}
+   )
+"
+
+# requires specific alsa settings
+RESTRICT="test"
+
+pkg_pretend() {
+   if use openmp ; then
+   tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
+   fi
+}
+
+pkg_setup() {
+   if use python || use test ; then
+   python-single-r1_pkg_setup
+   fi
+}
+
+src_prepare() {
+   local PATCHES=( "${FILESDIR}"/csound-6.05-python.patch 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Tim Harder]

commit: 4476e9893735ee89bc074d6fa177233e014d4051
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Aug  7 09:08:45 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Aug  7 09:08:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4476e989

media-sound/csound: always define csound_ac interfaces for cmake

 media-sound/csound/csound-6.07.0.ebuild | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/media-sound/csound/csound-6.07.0.ebuild 
b/media-sound/csound/csound-6.07.0.ebuild
index 6ea7a0b..3a9ef32 100644
--- a/media-sound/csound/csound-6.07.0.ebuild
+++ b/media-sound/csound/csound-6.07.0.ebuild
@@ -116,13 +116,6 @@ src_prepare() {
 src_configure() {
local myconf=()
 
-   if use csoundac ; then
-   myconf+=(
-   -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python)
-   -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua)
-   )
-   fi
-
use python && myconf+=( 
"-DPYTHON_MODULE_INSTALL_DIR=$(python_get_sitedir)" )
 
[[ $(get_libdir) == "lib64" ]] && myconf+=( -DUSE_LIB64=ON )
@@ -132,6 +125,8 @@ src_configure() {
-DBUILD_CSBEATS=$(usex beats)
-DBUILD_CHUA_OPCODES=$(usex chua)
-DBUILD_CSOUND_AC=$(usex csoundac)
+   -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
+   -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex 
python))
-DBUILD_CXX_INTERFACE=$(usex cxx)
-DUSE_CURL=$(usex curl)
-DNEW_PARSER_DEBUG=$(usex debug)

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/

[Tim Harder]

commit: c310826265b20d8debb6c03849ac6ce7e1587a6c
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Aug  7 02:01:41 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Aug  7 02:13:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3108262

media-sound/csound: version bump to 6.07.0

 media-sound/csound/Manifest|   1 +
 media-sound/csound/csound-6.07.0.ebuild| 220 +
 .../csound/files/csound-6.07.0-fltk-headers.patch  |  10 +
 3 files changed, 231 insertions(+)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index a5c5bcd..35aecf0 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -2,3 +2,4 @@ DIST Csound6.02.tar.gz 23459796 SHA256 
b964199642b1141d4e3253a86996c613c2420c4e2
 DIST Csound6.04.tar.gz 23959744 SHA256 
0ff0203b87d10779dca962292a407e15ab0b284b558c9c63f892b74ed1e06080 SHA512 
b19e2c4173c6d964b073ef19221f285e9ebd5a5d5d93148687b06860091bcc6e97e6b5e2223687e8f498608d9e27a33a75a50bb9d81ba83f4cd34e2eb4ceaeac
 WHIRLPOOL 
5912e7c4e3fe42206a3914f66e24e1179e1f50337e17f407762d89a011f5f752e768ff7eb34b097070bed8d28bbab37557cb6c6a1c9eebc174e0a7876dcd
 DIST csound-6.05.0.tar.gz 32094544 SHA256 
2384cbc82fe37b70192c87977b52c55b336731ecbfd3be1d8d30c7223815d7b9 SHA512 
a30a818e6e03b8ede0384c0bfddbde62ec9d9f1cfc33b92d6b23780c0d87a0c4e25229f9707eb2a5081971d0e53ff00c1e3465fd2af706a1c3bf2b53bc312be1
 WHIRLPOOL 
f2e10297dbb337957dcd595b32df1a3279a504076fb113c0907374ff5ac88510e9df856c69fbef402681012adc1e36b7a03b1bf757014387b883b225d1da962f
 DIST csound-6.06.0.tar.gz 33113094 SHA256 
0be4d845729f9219d59f3e87b91bc2672e26838178fb0fc4a7753211984d3ef2 SHA512 
6a8c2afec4ccaf27a5af37f8f847a1fa32d1800724fd0c80139ad7487288a49d19779d0ee505dc35bc7847bac34bb6c3a184da3600ddc7343531884845e6393b
 WHIRLPOOL 
3bbbe0f27a1d104b2483c42016feaa3df28cda4488e71a15e7b1fc77360df801c6e06644f539167579055b7fa5877a937cb26b4d132ba30272c0827575eb0fe4
+DIST csound-6.07.0.tar.gz 33834342 SHA256 
606af463da477cf4a3f89d00a4fda63c7eb0dc7f50a8923069f009dfdc545799 SHA512 
73f8f3a31f570cff309168127adc476cf78c7671d864fb0230175aba358e46b5272ba654688b2060abaf4de7ee4d68e29cc8480fdddaac48657332d5a0802a06
 WHIRLPOOL 
53cc86e9997088cfd1528b405b8aaf58f65a5ec6a0a4ceb20fa438ef59c96d4a0fc3996245b16da6bde72cf47bef2130d37cc8ed095cfd04e8b7948c66e6d046

diff --git a/media-sound/csound/csound-6.07.0.ebuild 
b/media-sound/csound/csound-6.07.0.ebuild
new file mode 100644
index 000..6ea7a0b
--- /dev/null
+++ b/media-sound/csound/csound-6.07.0.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator 
python-single-r1
+
+DESCRIPTION="A sound design and signal processing system providing facilities 
for composition and performance"
+HOMEPAGE="http://csound.github.io/;
+SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
+fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
+portaudio portmidi pulseaudio python samples score static-libs stk tcl test
++threads +utils vim-syntax websocket"
+
+LANGS=" de en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+   csoundac? ( || ( lua python ) )
+   java? ( cxx )
+   linear? ( double-precision )
+   lua? ( cxx )
+   python? ( cxx )
+"
+
+RDEPEND="
+   >=media-libs/libsndfile-1.0.16
+   media-libs/libsamplerate
+   alsa? ( media-libs/alsa-lib )
+   csoundac? (
+   x11-libs/fltk:1[threads?]
+   dev-cpp/eigen:3
+   dev-libs/boost:=
+   )
+   curl? ( net-misc/curl )
+   dssi? (
+   media-libs/dssi
+   media-libs/ladspa-sdk
+   )
+   fluidsynth? ( media-sound/fluidsynth )
+   fltk? ( x11-libs/fltk:1[threads?] )
+   image? ( media-libs/libpng:0= )
+   jack? ( media-sound/jack-audio-connection-kit )
+   java? ( virtual/jdk )
+   keyboard? ( x11-libs/fltk:1[threads?] )
+   linear? ( sci-mathematics/gmm )
+   lua? (
+   luajit? ( dev-lang/luajit:2 )
+   !luajit? ( dev-lang/lua:0 )
+   )
+   osc? ( media-libs/liblo )
+   portaudio? ( media-libs/portaudio )
+   portmidi? ( media-libs/portmidi )
+   pulseaudio? ( media-sound/pulseaudio )
+   python? ( ${PYTHON_DEPS} )
+   stk? ( media-libs/stk )
+   tcl? (
+   >=dev-lang/tcl-8.5:0=
+   >=dev-lang/tk-8.5:0=
+   )
+   utils? ( !media-sound/snd )
+   websocket? ( net-libs/libwebsockets )
+"
+DEPEND="${RDEPEND}
+   sys-devel/flex
+   virtual/yacc
+   chua? ( dev-libs/boost )
+   csoundac? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/

[Tim Harder]

commit: 2adc2485e705ba9921d40f4ff7bd76cc509dd8f1
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Aug  7 02:06:25 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Aug  7 02:13:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2adc2485

media-sound/csound: remove old

 media-sound/csound/Manifest|   3 -
 media-sound/csound/csound-6.02.ebuild  | 217 -
 media-sound/csound/csound-6.04.ebuild  | 214 
 media-sound/csound/csound-6.05.0.ebuild| 215 
 .../csound/files/csound-6.05-underlinking.patch|  53 -
 5 files changed, 702 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 35aecf0..a49efed 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,5 +1,2 @@
-DIST Csound6.02.tar.gz 23459796 SHA256 
b964199642b1141d4e3253a86996c613c2420c4e2cc39cad347ad7115768c0a5 SHA512 
885911561768fe4f9761b442899ba3481d09d02f095aaeb14d076a4902482269274e394517423bf8fea68c2f9e76bd3faaebe328d878ccc0a4c4a8d2d95d1dc0
 WHIRLPOOL 
9ee8e51c3ce224717b3b3f0cca249d2b10052defc9749abb359b862325766117ec887e07c00a1287b7d0915849c018ee7c3985bd147d4517f466b69f7e4cbdd8
-DIST Csound6.04.tar.gz 23959744 SHA256 
0ff0203b87d10779dca962292a407e15ab0b284b558c9c63f892b74ed1e06080 SHA512 
b19e2c4173c6d964b073ef19221f285e9ebd5a5d5d93148687b06860091bcc6e97e6b5e2223687e8f498608d9e27a33a75a50bb9d81ba83f4cd34e2eb4ceaeac
 WHIRLPOOL 
5912e7c4e3fe42206a3914f66e24e1179e1f50337e17f407762d89a011f5f752e768ff7eb34b097070bed8d28bbab37557cb6c6a1c9eebc174e0a7876dcd
-DIST csound-6.05.0.tar.gz 32094544 SHA256 
2384cbc82fe37b70192c87977b52c55b336731ecbfd3be1d8d30c7223815d7b9 SHA512 
a30a818e6e03b8ede0384c0bfddbde62ec9d9f1cfc33b92d6b23780c0d87a0c4e25229f9707eb2a5081971d0e53ff00c1e3465fd2af706a1c3bf2b53bc312be1
 WHIRLPOOL 
f2e10297dbb337957dcd595b32df1a3279a504076fb113c0907374ff5ac88510e9df856c69fbef402681012adc1e36b7a03b1bf757014387b883b225d1da962f
 DIST csound-6.06.0.tar.gz 33113094 SHA256 
0be4d845729f9219d59f3e87b91bc2672e26838178fb0fc4a7753211984d3ef2 SHA512 
6a8c2afec4ccaf27a5af37f8f847a1fa32d1800724fd0c80139ad7487288a49d19779d0ee505dc35bc7847bac34bb6c3a184da3600ddc7343531884845e6393b
 WHIRLPOOL 
3bbbe0f27a1d104b2483c42016feaa3df28cda4488e71a15e7b1fc77360df801c6e06644f539167579055b7fa5877a937cb26b4d132ba30272c0827575eb0fe4
 DIST csound-6.07.0.tar.gz 33834342 SHA256 
606af463da477cf4a3f89d00a4fda63c7eb0dc7f50a8923069f009dfdc545799 SHA512 
73f8f3a31f570cff309168127adc476cf78c7671d864fb0230175aba358e46b5272ba654688b2060abaf4de7ee4d68e29cc8480fdddaac48657332d5a0802a06
 WHIRLPOOL 
53cc86e9997088cfd1528b405b8aaf58f65a5ec6a0a4ceb20fa438ef59c96d4a0fc3996245b16da6bde72cf47bef2130d37cc8ed095cfd04e8b7948c66e6d046

diff --git a/media-sound/csound/csound-6.02.ebuild 
b/media-sound/csound/csound-6.02.ebuild
deleted file mode 100644
index f8bc979..000
--- a/media-sound/csound/csound-6.02.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator 
python-single-r1
-
-MY_PN="${PN/c/C}"
-MY_P="${MY_PN}${PV}"
-
-DESCRIPTION="A sound design and signal processing system providing facilities 
for composition and performance"
-HOMEPAGE="http://csounds.com/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples 
fltk +fluidsynth
-+image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi 
pulseaudio
-python samples score static-libs stk tcl test +threads +utils vim-syntax"
-
-LANGS=" de en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
-
-RDEPEND="
-   >=media-libs/libsndfile-1.0.16
-   alsa? ( media-libs/alsa-lib )
-   csoundac? (
-   x11-libs/fltk:1[threads?]
-   dev-cpp/eigen:3
-   dev-libs/boost
-   ${PYTHON_DEPS}
-   )
-   curl? ( net-misc/curl )
-   dssi? (
-   media-libs/dssi
-   media-libs/ladspa-sdk
-   )
-   fluidsynth? ( media-sound/fluidsynth )
-   fltk? ( x11-libs/fltk:1[threads?] )
-   image? ( media-libs/libpng:0= )
-   jack? ( media-sound/jack-audio-connection-kit )
-   java? ( >=virtual/jdk-1.5 )
-   keyboard? ( x11-libs/fltk:1[threads?] )
-   linear? ( sci-mathematics/gmm )
-   lua? (
-   luajit? ( dev-lang/luajit:2 )
-   !luajit? ( dev-lang/lua:0 )
-   )
-   osc? ( media-libs/liblo )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   python? ( ${PYTHON_DEPS} )
-   stk? ( media-libs/stk )
-   tcl? (

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Tim Harder]

commit: d12c0b24fa72919d0ac038a194da53f5fea7a4d7
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Apr  2 16:40:24 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Apr  2 16:44:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12c0b24

media-sound/csound: version bump to 6.06.0

Add websocket USE flag.

 media-sound/csound/Manifest |   1 +
 media-sound/csound/csound-6.06.0.ebuild | 215 
 media-sound/csound/metadata.xml |   1 +
 3 files changed, 217 insertions(+)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 860d635..a5c5bcd 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,4 @@
 DIST Csound6.02.tar.gz 23459796 SHA256 
b964199642b1141d4e3253a86996c613c2420c4e2cc39cad347ad7115768c0a5 SHA512 
885911561768fe4f9761b442899ba3481d09d02f095aaeb14d076a4902482269274e394517423bf8fea68c2f9e76bd3faaebe328d878ccc0a4c4a8d2d95d1dc0
 WHIRLPOOL 
9ee8e51c3ce224717b3b3f0cca249d2b10052defc9749abb359b862325766117ec887e07c00a1287b7d0915849c018ee7c3985bd147d4517f466b69f7e4cbdd8
 DIST Csound6.04.tar.gz 23959744 SHA256 
0ff0203b87d10779dca962292a407e15ab0b284b558c9c63f892b74ed1e06080 SHA512 
b19e2c4173c6d964b073ef19221f285e9ebd5a5d5d93148687b06860091bcc6e97e6b5e2223687e8f498608d9e27a33a75a50bb9d81ba83f4cd34e2eb4ceaeac
 WHIRLPOOL 
5912e7c4e3fe42206a3914f66e24e1179e1f50337e17f407762d89a011f5f752e768ff7eb34b097070bed8d28bbab37557cb6c6a1c9eebc174e0a7876dcd
 DIST csound-6.05.0.tar.gz 32094544 SHA256 
2384cbc82fe37b70192c87977b52c55b336731ecbfd3be1d8d30c7223815d7b9 SHA512 
a30a818e6e03b8ede0384c0bfddbde62ec9d9f1cfc33b92d6b23780c0d87a0c4e25229f9707eb2a5081971d0e53ff00c1e3465fd2af706a1c3bf2b53bc312be1
 WHIRLPOOL 
f2e10297dbb337957dcd595b32df1a3279a504076fb113c0907374ff5ac88510e9df856c69fbef402681012adc1e36b7a03b1bf757014387b883b225d1da962f
+DIST csound-6.06.0.tar.gz 33113094 SHA256 
0be4d845729f9219d59f3e87b91bc2672e26838178fb0fc4a7753211984d3ef2 SHA512 
6a8c2afec4ccaf27a5af37f8f847a1fa32d1800724fd0c80139ad7487288a49d19779d0ee505dc35bc7847bac34bb6c3a184da3600ddc7343531884845e6393b
 WHIRLPOOL 
3bbbe0f27a1d104b2483c42016feaa3df28cda4488e71a15e7b1fc77360df801c6e06644f539167579055b7fa5877a937cb26b4d132ba30272c0827575eb0fe4

diff --git a/media-sound/csound/csound-6.06.0.ebuild 
b/media-sound/csound/csound-6.06.0.ebuild
new file mode 100644
index 000..6f63c47
--- /dev/null
+++ b/media-sound/csound/csound-6.06.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator 
python-single-r1
+
+DESCRIPTION="A sound design and signal processing system providing facilities 
for composition and performance"
+HOMEPAGE="http://csound.github.io/;
+SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa beats chua csoundac curl +cxx debug double-precision dssi examples
+fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
+portaudio portmidi pulseaudio python samples score static-libs stk tcl test
++threads +utils vim-syntax websocket"
+
+LANGS=" de en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+RDEPEND="
+   >=media-libs/libsndfile-1.0.16
+   media-libs/libsamplerate
+   alsa? ( media-libs/alsa-lib )
+   csoundac? (
+   x11-libs/fltk:1[threads?]
+   dev-cpp/eigen:3
+   dev-libs/boost
+   )
+   curl? ( net-misc/curl )
+   dssi? (
+   media-libs/dssi
+   media-libs/ladspa-sdk
+   )
+   fluidsynth? ( media-sound/fluidsynth )
+   fltk? ( x11-libs/fltk:1[threads?] )
+   image? ( media-libs/libpng:0= )
+   jack? ( media-sound/jack-audio-connection-kit )
+   java? ( virtual/jdk )
+   keyboard? ( x11-libs/fltk:1[threads?] )
+   linear? ( sci-mathematics/gmm )
+   lua? (
+   luajit? ( dev-lang/luajit:2 )
+   !luajit? ( dev-lang/lua:0 )
+   )
+   osc? ( media-libs/liblo )
+   portaudio? ( media-libs/portaudio )
+   portmidi? ( media-libs/portmidi )
+   pulseaudio? ( media-sound/pulseaudio )
+   python? ( ${PYTHON_DEPS} )
+   stk? ( media-libs/stk )
+   tcl? (
+   >=dev-lang/tcl-8.5:0=
+   >=dev-lang/tk-8.5:0=
+   )
+   utils? ( !media-sound/snd )
+   websocket? ( net-libs/libwebsockets )
+"
+DEPEND="${RDEPEND}
+   sys-devel/flex
+   virtual/yacc
+   chua? ( dev-libs/boost )
+   csoundac? ( dev-lang/swig )
+   nls? ( sys-devel/gettext )
+   test? (
+   dev-util/cunit
+   ${PYTHON_DEPS}
+   )
+"
+REQUIRED_USE="
+   csoundac? ( || ( lua python ) )
+   java? ( cxx )
+   linear? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/

[Sergey Popov]

commit: f6c373eb122810a19b5b38fffba210134da5b748
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Nov 27 13:05:51 2015 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Nov 27 13:05:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c373eb

media-sound/csound: fix underlinking on libm

Reported-by: Toralf Förster  gmx.de>
Gentoo-Bug: 566064

Package-Manager: portage-2.2.23

 media-sound/csound/csound-6.05.0.ebuild|  3 ++
 .../csound/files/csound-6.05-underlinking.patch| 53 ++
 2 files changed, 56 insertions(+)

diff --git a/media-sound/csound/csound-6.05.0.ebuild 
b/media-sound/csound/csound-6.05.0.ebuild
index 02e99b9..1249920 100644
--- a/media-sound/csound/csound-6.05.0.ebuild
+++ b/media-sound/csound/csound-6.05.0.ebuild
@@ -94,6 +94,9 @@ pkg_setup() {
 src_prepare() {
epatch "${FILESDIR}"/csound-6.05-python.patch
 
+   # bug #566064
+   epatch "${FILESDIR}"/csound-6.05-underlinking.patch
+
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-e '/-O3/d' \
-i CMakeLists.txt || die

diff --git a/media-sound/csound/files/csound-6.05-underlinking.patch 
b/media-sound/csound/files/csound-6.05-underlinking.patch
new file mode 100644
index 000..eac83f2
--- /dev/null
+++ b/media-sound/csound/files/csound-6.05-underlinking.patch
@@ -0,0 +1,53 @@
+commit a4b1930b506274e328ee26cd6287965cb496062b
+Author: Steven Yi 
+Date:   Mon Sep 28 18:21:22 2015 -0400
+
+modified make_utility and targets for csound-bin and mixer-bin to use add 
libm for linking when on Linux [fixes #526]
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b16079..18a6ad1 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -97,6 +97,10 @@ endfunction(make_executable)
+ function(make_utility name srcs)
+ make_executable(${name} "${srcs}" "${CSOUNDLIB}")
+ add_dependencies(${name} ${CSOUNDLIB})
++ 
++if(LINUX)
++target_link_libraries(${name} m)
++endif()
+ endfunction()
+ 
+ 
+diff --git a/frontends/CMakeLists.txt b/frontends/CMakeLists.txt
+index d0e3a21..b31f37a 100644
+--- a/frontends/CMakeLists.txt
 b/frontends/CMakeLists.txt
+@@ -43,6 +43,9 @@ endfunction(make_plugin_frontend)
+ 
+ # We need a different name to avoid clashes with float libcsound
+ make_executable(csound-bin "${CS_MAIN_SRCS}" "${CSOUNDLIB}" csound)
++if(LINUX)
++  target_link_libraries(csound-bin m)
++endif()
+ 
+ message(STATUS "Building csLadspa")
+ 
+diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
+index 25089cc..ebf0aa5 100644
+--- a/util/CMakeLists.txt
 b/util/CMakeLists.txt
+@@ -23,9 +23,11 @@ if(BUILD_UTILITIES)
+ make_utility(hetro   het_main.c)
+ make_utility(lpanal  lpc_main.c)
+ make_utility(lpc_export  lpcx_main.c)
+-target_link_libraries(lpc_export m)
+ make_utility(lpc_import  lpci_main.c)
+-make_executable(mixer-bin   mixer_main.c   "${CSOUNDLIB}" mixer)
++if(LINUX)
++  make_executable(mixer-bin   mixer_main.c   "${CSOUNDLIB}" mixer)
++endif()
++target_link_libraries(mixer-bin m)
+ make_utility(pvanal  pvc_main.c)
+ make_utility(pvlook  pvl_main.c)
+ make_utility(pv_export   pvx_main.c)

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/

[Sergey Popov]

commit: 115774f62ea1eca1df9e381f818c7db576018b38
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Nov 27 13:06:52 2015 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Nov 27 13:06:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=115774f6

media-sound/csound: fix virtual/jdk dependency warning

Package-Manager: portage-2.2.23

 media-sound/csound/csound-6.05.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/csound/csound-6.05.0.ebuild 
b/media-sound/csound/csound-6.05.0.ebuild
index 1249920..186991f 100644
--- a/media-sound/csound/csound-6.05.0.ebuild
+++ b/media-sound/csound/csound-6.05.0.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
fltk? ( x11-libs/fltk:1[threads?] )
image? ( media-libs/libpng:0= )
jack? ( media-sound/jack-audio-connection-kit )
-   java? ( >=virtual/jdk-1.5 )
+   java? ( virtual/jdk )
keyboard? ( x11-libs/fltk:1[threads?] )
linear? ( sci-mathematics/gmm )
lua? (

[gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/

[Sergey Popov]

commit: 622a0356f4db8176c851e608306b95298dbdc0be
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Nov 27 13:09:51 2015 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Nov 27 13:09:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622a0356

media-sound/csound: drop old

Package-Manager: portage-2.2.23

 media-sound/csound/Manifest|   2 -
 media-sound/csound/csound-5.19.01.ebuild   | 202 ---
 media-sound/csound/csound-6.03.2.ebuild| 215 -
 media-sound/csound/files/csound-5.16.6-tests.patch |  90 -
 .../csound/files/csound-5.17.11-cmake.patch|  10 -
 .../csound/files/csound-5.17.11-no-fltk-gl.patch   |  20 --
 media-sound/csound/files/csound-5.17.6-fltk.patch  |  10 -
 .../files/csound-5.17.6-porttime-in-portmidi.patch |  20 --
 .../files/csound-6.02-porttime-in-portmidi.patch   |  30 ---
 9 files changed, 599 deletions(-)

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 60852ee..860d635 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,5 +1,3 @@
-DIST Csound5.19.01.tar.gz 9302526 SHA256 
c918fbdfa7a65cefd080966ba4b44aadb2e36f80c83a5714efb5a9c76532111d SHA512 
8dd0c8984a75fe74e5aea53abf15276fdb526ce34ff48402ad2cfd2953b65a67a52f3a279cd030964cddd2322711df04638e039e2998022d92c56593450d3c8c
 WHIRLPOOL 
86ff2a5aea5ec2a65153a5582352a292815e95059d9c48360ea16b8a1bca6d22ec4693cd744b4335df1fcf720a8b006598cd9c1ed8ff54d93af6fe37c8165be6
 DIST Csound6.02.tar.gz 23459796 SHA256 
b964199642b1141d4e3253a86996c613c2420c4e2cc39cad347ad7115768c0a5 SHA512 
885911561768fe4f9761b442899ba3481d09d02f095aaeb14d076a4902482269274e394517423bf8fea68c2f9e76bd3faaebe328d878ccc0a4c4a8d2d95d1dc0
 WHIRLPOOL 
9ee8e51c3ce224717b3b3f0cca249d2b10052defc9749abb359b862325766117ec887e07c00a1287b7d0915849c018ee7c3985bd147d4517f466b69f7e4cbdd8
-DIST Csound6.03.2.tar.gz 24571513 SHA256 
f5f8364e0bc10aba473800e66176c08ac32b43ca69ad02dc9554bad54e91d170 SHA512 
01cea31349632ecf3692a23535793c1cd622669e07a9035e1ee80d6ad117e8d0296d2ece78635fee8a73eb5ba53d2b03a8b895f0b2a9a74ae015288243445c1b
 WHIRLPOOL 
029c9c68f20ce691b1bb50be38f12723e4cdcbdc757f12d12351b6f6b7b2ec7fda517d2677bfa8a746f41daaa8e7c61e652645c3677af9198caf0d555d9d0821
 DIST Csound6.04.tar.gz 23959744 SHA256 
0ff0203b87d10779dca962292a407e15ab0b284b558c9c63f892b74ed1e06080 SHA512 
b19e2c4173c6d964b073ef19221f285e9ebd5a5d5d93148687b06860091bcc6e97e6b5e2223687e8f498608d9e27a33a75a50bb9d81ba83f4cd34e2eb4ceaeac
 WHIRLPOOL 
5912e7c4e3fe42206a3914f66e24e1179e1f50337e17f407762d89a011f5f752e768ff7eb34b097070bed8d28bbab37557cb6c6a1c9eebc174e0a7876dcd
 DIST csound-6.05.0.tar.gz 32094544 SHA256 
2384cbc82fe37b70192c87977b52c55b336731ecbfd3be1d8d30c7223815d7b9 SHA512 
a30a818e6e03b8ede0384c0bfddbde62ec9d9f1cfc33b92d6b23780c0d87a0c4e25229f9707eb2a5081971d0e53ff00c1e3465fd2af706a1c3bf2b53bc312be1
 WHIRLPOOL 
f2e10297dbb337957dcd595b32df1a3279a504076fb113c0907374ff5ac88510e9df856c69fbef402681012adc1e36b7a03b1bf757014387b883b225d1da962f

diff --git a/media-sound/csound/csound-5.19.01.ebuild 
b/media-sound/csound/csound-5.19.01.ebuild
deleted file mode 100644
index 4b19c02..000
--- a/media-sound/csound/csound-5.19.01.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator 
python-single-r1
-
-MY_PN="${PN/c/C}"
-MY_P="${MY_PN}${PV}"
-
-DESCRIPTION="A sound design and signal processing system providing facilities 
for composition and performance"
-HOMEPAGE="http://csounds.com/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk 
+fluidsynth
-+image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi 
pulseaudio
-python samples static-libs stk tcl test +threads +utils vim-syntax"
-
-LANGS=" de en_GB en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
-
-RDEPEND=">=media-libs/libsndfile-1.0.16
-   alsa? ( media-libs/alsa-lib )
-   csoundac? (
-   x11-libs/fltk:1[threads?]
-   dev-cpp/eigen:3
-   dev-libs/boost
-   ${PYTHON_DEPS}
-   )
-   dssi? (
-   media-libs/dssi
-   media-libs/ladspa-sdk
-   )
-   fluidsynth? ( media-sound/fluidsynth )
-   fltk? ( x11-libs/fltk:1[threads?] )
-   image? ( media-libs/libpng:0= )
-   jack? ( media-sound/jack-audio-connection-kit )
-   java? ( >=virtual/jdk-1.5 )
-   keyboard? ( x11-libs/fltk:1[threads?] )
-   linear? ( sci-mathematics/gmm )
-   lua? (
-   luajit? ( dev-lang/luajit:2 )
-   !luajit? ( dev-lang/lua:0 )
-   )
-   osc? (