gentoo resync : 30.10.2021

2 files changed, 17 insertions, 64 deletions

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index ebabfd1a507e..aa7ce87d8d4a 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -7,5 +7,5 @@ DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B fe29208afe2cfc9740e68da
 DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d SHA512 b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
 EBUILD csound-6.16.1.ebuild 7132 BLAKE2B 134d88291b5af94d99a8c2e0b6b421b3a75722db07b204eb0e8e98991365ecc78a260f691ba3fb37191da4b506ec8bd57392174e191a9ed3185b38280c89a882 SHA512 30a822eea460f01ba8b6201c8978d1fc1f40ff9cdea8ebb1fbe99ed7c3b6adac686ab400a5ec1adc9321b978c3919408ad79f22b393fc3d34e003dc860ac987f
 EBUILD csound-6.16.2.ebuild 7132 BLAKE2B 134d88291b5af94d99a8c2e0b6b421b3a75722db07b204eb0e8e98991365ecc78a260f691ba3fb37191da4b506ec8bd57392174e191a9ed3185b38280c89a882 SHA512 30a822eea460f01ba8b6201c8978d1fc1f40ff9cdea8ebb1fbe99ed7c3b6adac686ab400a5ec1adc9321b978c3919408ad79f22b393fc3d34e003dc860ac987f
-EBUILD csound-9999.ebuild 6880 BLAKE2B f07b7aff3c721a0115d1edd7e6389ecc7203ff7bb20c4d114516a96490a29af0005837724a1ddeb5ae3ae362fa8a743757c13b6fe16dfc68346089b4e66d837d SHA512 cb74a9452eda7897f5595491d2c974cba029af4609faaed6fadcb2895b850e5c73b0e54c62172bd50919cb46de20aaa9f1a510c8a43298f750ae93cfd34fa256
+EBUILD csound-9999.ebuild 5166 BLAKE2B ae5a7585fe35ccab9efd9d5da3c09ed6e94a18e156ad5b69473cf59db54cacf140d30f4dbf6202a983c6b4b7fe7eae6ad2c15cf5402344709bca5ee9e5e395b4 SHA512 e9e9fe4de713c770d3ef60541ef5024f5829b6e1d5d5d8dad33f29dcd27391ffefe6e33f7f35e82c08bb03fcfaf5c5660e37c3200ff0cc510758838bea44a9d1
 MISC metadata.xml 1244 BLAKE2B cd28c168f6625c7ab090f3b3812fbdcb8a7f2e17d649083c54761ea3a109d4ec90f9d6241cacf8502f386d10fa682e5c2d0be1a77a6f19d94820d80115b290a9 SHA512 96e697c02828da5fa3ca22a3a564f76ad06b55d8479f5bd2c207aa2427675b814f351fd5d9e5ec61e9c3b88d2e803137288a11e15dc92c149c015a2dcd315cbc
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index f997f81d6444..0486ace1f63d 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.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} == "9999" ]]; 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)
 		-DBUILD_MULTI_CORE=$(usex threads)
-		-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_PYTHON_INTERFACE=$(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_SHARED_LIBS=ON
-		-DBUILD_STACK_OPCODES=ON
 		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(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_WEBSOCKET_OPCODE=$(usex websocket)
-		-DBUILD_WIIMOTE_OPCODES=OFF
-		-DBUILD_WINSOUND=OFF
 
 		-DFAIL_MISSING=ON
 		-DNEW_PARSER_DEBUG=$(usex debug)
@@ -171,12 +130,9 @@ src_configure() {
 
 		-DUSE_ALSA=$(usex alsa)
 		-DUSE_ATOMIC_BUILTIN=ON
-		-DUSE_AUDIOUNIT=OFF # Apple specific
 		-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
@@ -186,7 +142,7 @@ src_configure() {
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
+		-DUSE_VCPKG=OFF
 	)
 
 	use java && mycmakeargs+=(
@@ -212,9 +168,6 @@ src_install() {
 		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
 	doenvd "${T}"/62${PN}
 
 	if use examples ; then
@@ -234,7 +187,7 @@ src_install() {
 	# rename extract to csound_extract (bug #247394)
 	mv "${ED}"/usr/bin/{,csound_}extract || die
 
-	use python && python_optimize
+	python_optimize
 
 	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")