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

media-sound/csound: bump to 6.14.0 and 9999 sync

updated config args

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

 media-sound/csound/Manifest                                     | 3 +++
 media-sound/csound/{csound-9999.ebuild => csound-6.14.0.ebuild} | 8 ++++----
 media-sound/csound/csound-9999.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-9999.ebuild 
b/media-sound/csound/csound-6.14.0.ebuild
similarity index 98%
copy from media-sound/csound/csound-9999.ebuild
copy to media-sound/csound/csound-6.14.0.ebuild
index f29357886e4..f9db4411fa0 100644
--- a/media-sound/csound/csound-9999.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-9999.ebuild 
b/media-sound/csound/csound-9999.ebuild
index f29357886e4..f9db4411fa0 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.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)

Reply via email to