gentoo resync : 25.08.2020

5 files changed, 63 insertions, 39 deletions

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 1bb2fb771617..4e6b590ab5f1 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,12 +1,13 @@
 AUX csound-6.13.0-xdg-open.patch 982 BLAKE2B e6643fc554feb8b0fd4cbb4d96e6ca727bf04da998b61df515e090fc0784ce9c2fbe0b67ce45da83d36838cc57de6de5f176d38c322b1586264a527b1b44fe09 SHA512 e141beafdd2a93bbd7bd0a12c71e1dc3ffd2c67558c3e7e47a24298aefe6197bbde179d2bfc7e82e78bdffac1c889d43789a17e364785e9892bd35306fa07c6a
+AUX csound-6.15.0-lame.patch 737 BLAKE2B 5febfbd58a9f4591f2ac06fbdc311552d18153cec7d3f5923d14319eea02ad69d75277aaa75a06ad02bd23d2d24a9913f7bb9719456ef98c487e93091b841278 SHA512 2e71e5c46b78e8867257ee86e70072f3c2e7f6021e67d0a3381cbc8226cb7deb023b8ffc1d047628ec527da6fc383a55ce310402c5ecc2696ff36250ecf7081d
 AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d218985426e9ba9a808399fb4b8973d9acce3063c968fca561a1429035b01e85588e99c0135521f92ea96c SHA512 fa418daaddcce4f5296596038726720675ad9988f57bbcd943bf2f247fd8368401a193c031ab65bea5753b37274f41cb9bf28dd2b18309bd0cee90b931d2fab1
-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 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
-EBUILD csound-6.13.0.ebuild 7310 BLAKE2B 95ff707d04e049346933503d1a4a1556b7a91ef0a9f8c3633989288249d5427d429ea7c79b6e4f741f8bd6ed97915c07bdcafe9c4994646a908acfe5c15ea67a SHA512 91da3b9efc6695c23bf2c4376baa91e317aa9ee129d3587643c80201c919a9b8f70dd031cea6e690fe62f13788c1981c3a0419a799277aa8373012a7bf921683
-EBUILD csound-6.14.0.ebuild 7350 BLAKE2B 320d965e7133965d0283cda1e9fae24a265c33837cd0299408e1a7a5f26dac1c6005a15aca2a13330f77ae61a8a9a5229dee60e6ffddc44f37dc1c551896e0fa SHA512 bf57349c2a62598a03098bf0e33d89dfb320cbab3adbfd8aec623b8c26df50b84c96aa69f2a255654a2f52c771a31ba4c744c00d6fa46e42accf0f52562b6a0c
-EBUILD csound-9999.ebuild 7350 BLAKE2B 320d965e7133965d0283cda1e9fae24a265c33837cd0299408e1a7a5f26dac1c6005a15aca2a13330f77ae61a8a9a5229dee60e6ffddc44f37dc1c551896e0fa SHA512 bf57349c2a62598a03098bf0e33d89dfb320cbab3adbfd8aec623b8c26df50b84c96aa69f2a255654a2f52c771a31ba4c744c00d6fa46e42accf0f52562b6a0c
+DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
+EBUILD csound-6.14.0.ebuild 7348 BLAKE2B ce6e6ceaaece2796ce8ae758bc6638baf18df4429a04c6af949c42ddecb311166ae2fa004488ce8f0b1d46ce32e0ebbea9c351c6dbc22dbc8cab13ba5caca54f SHA512 f794e00b7b63ac98c98a49f1a88912c7a7ebd740b8d9d51f02c92060dbb0192d36f69a4aef1494a22dc8f72975273eb626ed68ff62600ef71a0eaa1dd9726302
+EBUILD csound-6.15.0.ebuild 7356 BLAKE2B 8e6082be3939068e32f20ca3de55fe67a93639c203e9fb29ed86b415d766bfc9f9509767d9be86135032dc896b909ff06648f4d913cbcc2dfaad8d12750ae5ba SHA512 ba20b3813545fa79eb1a75974df8d980b76780eb4e5acb3861731f01dc769b9542218091accdcd289ab09b6da3dc99d26d65864a0783e1a2c129c8869c0b7fb1
+EBUILD csound-9999.ebuild 7356 BLAKE2B 8e6082be3939068e32f20ca3de55fe67a93639c203e9fb29ed86b415d766bfc9f9509767d9be86135032dc896b909ff06648f4d913cbcc2dfaad8d12750ae5ba SHA512 ba20b3813545fa79eb1a75974df8d980b76780eb4e5acb3861731f01dc769b9542218091accdcd289ab09b6da3dc99d26d65864a0783e1a2c129c8869c0b7fb1
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.14.0.ebuild b/media-sound/csound/csound-6.14.0.ebuild
index f9db4411fa0f..389c8227528a 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"
diff --git a/media-sound/csound/csound-6.13.0.ebuild b/media-sound/csound/csound-6.15.0.ebuild
index e7d1d96b3f99..b52669444ab9 100644
--- a/media-sound/csound/csound-6.13.0.ebuild
+++ b/media-sound/csound/csound-6.15.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,
@@ -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} == "9999" ]]; 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 )
@@ -103,7 +102,8 @@ fi
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/${P}-xdg-open.patch"
+	"${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
 		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_COUNTER_OPCODES=ON
 		-DBUILD_CSBEATS=$(usex beats)
 		-DBUILD_CUDA_OPCODES=OFF
 		-DBUILD_CXX_INTERFACE=$(usex cxx)
@@ -136,10 +137,12 @@ 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)
 		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
 		-DBUILD_MULTI_CORE=$(usex threads)
 		-DBUILD_OPENCL_OPCODES=OFF
 		-DBUILD_OSC_OPCODES=$(usex osc)
@@ -153,9 +156,9 @@ 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)
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
 		-DBUILD_STK_OPCODES=$(usex stk)
 		-DBUILD_TESTS=$(usex test)
 		-DBUILD_UTILITIES=$(usex utils)
@@ -166,22 +169,23 @@ src_configure() {
 		-DBUILD_WINSOUND=OFF
 
 		-DFAIL_MISSING=ON
-		-DNEED_PORTTIME=OFF
 		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DREQUIRE_PTHREADS=$(usex threads)
 
 		-DUSE_ALSA=$(usex alsa)
-		#-DUSE_ATOMIC_BUILTIN=ON
+		-DUSE_ATOMIC_BUILTIN=ON
 		-DUSE_AUDIOUNIT=OFF # Apple specific
-		#-DUSE_COMPILER_OPTIMIZATIONS=ON
+		-DUSE_COMPILER_OPTIMIZATIONS=ON
 		-DUSE_COREMIDI=OFF # Apple specific
 		-DUSE_CURL=$(usex curl)
 		-DUSE_DOUBLE=$(usex double-precision)
 		-DUSE_FLTK=$(usex fltk)
 		-DUSE_GETTEXT=$(usex nls)
 		-DUSE_GIT_COMMIT=ON
-		_DUSE_IPMIDI=ON
-		-DUSE_LRINT=ON
+		-DUSE_IPMIDI=ON
 		-DUSE_JACK=$(usex jack)
+		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
+		-DUSE_LRINT=ON
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
@@ -219,11 +223,6 @@ 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
-	)
-
 	cmake_src_configure
 }
 
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index f9db4411fa0f..b52669444ab9 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.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} == "9999" ]]; 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
 		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_COUNTER_OPCODES=ON
 		-DBUILD_CSBEATS=$(usex beats)
 		-DBUILD_CUDA_OPCODES=OFF
 		-DBUILD_CXX_INTERFACE=$(usex cxx)
@@ -141,7 +142,7 @@ src_configure() {
 		-DBUILD_JAVA_INTERFACE=OFF
 		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
 		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DBUILD_MP3OUT_OPCODE=OFF
+		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
 		-DBUILD_MULTI_CORE=$(usex threads)
 		-DBUILD_OPENCL_OPCODES=OFF
 		-DBUILD_OSC_OPCODES=$(usex osc)
@@ -155,6 +156,7 @@ 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 "ON" $(usex test))
 		-DBUILD_STK_OPCODES=$(usex stk)
@@ -167,21 +169,22 @@ src_configure() {
 		-DBUILD_WINSOUND=OFF
 
 		-DFAIL_MISSING=ON
-		-DNEED_PORTTIME=OFF
 		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DREQUIRE_PTHREADS=$(usex threads)
 
 		-DUSE_ALSA=$(usex alsa)
-		#-DUSE_ATOMIC_BUILTIN=ON
+		-DUSE_ATOMIC_BUILTIN=ON
 		-DUSE_AUDIOUNIT=OFF # Apple specific
-		#-DUSE_COMPILER_OPTIMIZATIONS=ON
+		-DUSE_COMPILER_OPTIMIZATIONS=ON
 		-DUSE_COREMIDI=OFF # Apple specific
 		-DUSE_CURL=$(usex curl)
 		-DUSE_DOUBLE=$(usex double-precision)
 		-DUSE_FLTK=$(usex fltk)
 		-DUSE_GETTEXT=$(usex nls)
 		-DUSE_GIT_COMMIT=ON
-		_DUSE_IPMIDI=ON
+		-DUSE_IPMIDI=ON
 		-DUSE_JACK=$(usex jack)
+		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
 		-DUSE_LRINT=ON
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
@@ -220,11 +223,6 @@ 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
-	)
-
 	cmake_src_configure
 }
 
diff --git a/media-sound/csound/files/csound-6.15.0-lame.patch b/media-sound/csound/files/csound-6.15.0-lame.patch
new file mode 100644
index 000000000000..800ec4fd0f46
--- /dev/null
+++ b/media-sound/csound/files/csound-6.15.0-lame.patch
@@ -0,0 +1,26 @@
+diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt
+index af39138..ec48294 100644
+--- a/Opcodes/CMakeLists.txt
++++ b/Opcodes/CMakeLists.txt
+@@ -41,7 +41,7 @@ check_include_file(wiiuse.h WIIUSE_H)
+ find_library(WIIUSE_LIB wiiuse)
+ check_include_file(p5glove.h P5GLOVE_H)
+ find_library(P5GLOVE_LIB p5glove)
+-check_include_file(lame.h LAME_HEADER)
++check_include_file(lame/lame.h LAME_HEADER)
+ find_library(LAME_LIB mp3lame)
+ 
+ ## OPCODE LIBS WITH NO EXTERNAL DEPENDENCIES ##
+diff --git a/Opcodes/lame.c b/Opcodes/lame.c
+index a951f47..0c1c3e6 100644
+--- a/Opcodes/lame.c
++++ b/Opcodes/lame.c
+@@ -22,7 +22,7 @@
+ */
+ 
+ #include "csdl.h"
+-#include "lame.h"
++#include "lame/lame.h"
+ 
+ typedef struct _mp3out {
+   OPDS              h;