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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/
@ 2015-11-27 13:10 Sergey Popov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2015-11-27 13:10 UTC (permalink / raw
  To: gentoo-commits

commit:     622a0356f4db8176c851e608306b95298dbdc0be
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 13:09:51 2015 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:09:51 2015 +0000
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 5912e7c4e3fe42206a3914f66e24e1179e1f50337e17f407762d89a011f5f752e768faaaaf7eb34b097070bed8d28bbab37557cb6c6a1c9eebc174e0a7876dcd
 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..0000000
--- 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? ( 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 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	csoundac? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="java? ( cxx )
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( cxx )"
-
-S=${WORKDIR}/${MY_P}
-
-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() {
-	epatch "${FILESDIR}"/${PN}-5.16.6-tests.patch
-	epatch "${FILESDIR}"/${PN}-5.17.6-fltk.patch
-	epatch "${FILESDIR}"/${PN}-5.17.6-porttime-in-portmidi.patch
-	epatch "${FILESDIR}"/${PN}-5.17.11-cmake.patch
-	epatch "${FILESDIR}"/${PN}-5.17.11-no-fltk-gl.patch
-
-	sed -i "s:^\(csoundExecutable =\).*:\1 \"${WORKDIR}/${P}_build/csound\":" \
-		tests/test.py || die
-
-	sed -i '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' CMakeLists.txt || die
-
-	if [[ $(get_libdir) == "lib64" ]] ; then
-		sed -i '/set(LIBRARY_INSTALL_DIR/s/lib/lib64/' CMakeLists.txt || die
-	fi
-
-	if use python ; then
-		sed -i "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if use csoundac ; then
-		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
-		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_NEW_PARSER=ON
-		$(cmake-utils_use_use alsa ALSA) \
-		$(cmake-utils_use_build beats CSBEATS) \
-		$(cmake-utils_use_build chua CHUA_OPCODES) \
-		$(cmake-utils_use_build csoundac CSOUND_AC) \
-		$(cmake-utils_use_build cxx CXX_INTERFACE) \
-		$(cmake-utils_use debug NEW_PARSER_DEBUG) \
-		$(cmake-utils_use_use double-precision DOUBLE) \
-		$(cmake-utils_use_build dssi DSSI_OPCODES) \
-		$(cmake-utils_use_build fluidsynth FLUID_OPCODES) \
-		$(cmake-utils_use_use fltk FLTK) \
-		$(cmake-utils_use_build image IMAGE_OPCODES) \
-		$(cmake-utils_use_use jack JACK) \
-		$(cmake-utils_use_build jack JACK_OPCODES) \
-		$(cmake-utils_use_build java JAVA_INTERFACE) \
-		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD) \
-		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES) \
-		$(cmake-utils_use_build lua LUA_OPCODES) \
-		$(cmake-utils_use_build lua LUA_INTERFACE) \
-		$(cmake-utils_use_use nls GETTEXT) \
-		$(cmake-utils_use_build osc OSC_OPCODES) \
-		$(cmake-utils_use_use openmp OPEN_MP) \
-		$(cmake-utils_use_use portaudio PORTAUDIO) \
-		$(cmake-utils_use_use portmidi PORTMIDI) \
-		$(cmake-utils_use_use pulseaudio PULSEAUDIO) \
-		$(cmake-utils_use_build python PYTHON_OPCODES) \
-		$(cmake-utils_use_build python PYTHON_INTERFACE) \
-		$(cmake-utils_use_build static-libs STATIC_LIBRARY) \
-		$(cmake-utils_use_build stk STK_OPCODES) \
-		$(cmake-utils_use_build tcl TCLCSOUND) \
-		$(cmake-utils_use_build threads MULTI_CORE) \
-		$(cmake-utils_use_build utils UTILITIES) \
-		${myconf}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}" OPCODEDIR="${S}" OPCODEDIR64="${S}"
-	cd tests
-	./test.py || die "tests failed"
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc AUTHORS ChangeLog readme-csound5-complete.txt
-
-	# 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}
-	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
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{extract,csound_extract} || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	elog
-	elog "The extract tool is now installed as csound_extract"
-	elog "due to collisions with many other packages (bug #247394)."
-	elog
-}

diff --git a/media-sound/csound/csound-6.03.2.ebuild b/media-sound/csound/csound-6.03.2.ebuild
deleted file mode 100644
index f873d90..0000000
--- a/media-sound/csound/csound-6.03.2.ebuild
+++ /dev/null
@@ -1,215 +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? (
-		>=dev-lang/tcl-8.5:0=
-		>=dev-lang/tk-8.5:0=
-	)
-	utils? ( !media-sound/snd )
-"
-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="
-	java? ( cxx )
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( cxx )
-"
-
-# requires specific alsa settings
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-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() {
-	epatch "${FILESDIR}"/${PN}-6.02-porttime-in-portmidi.patch
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-
-	if use python ; then
-		sed -i "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die
-	fi
-
-	for lang in ${LANGS} ; do
-		if ! use linguas_${lang} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
-}
-
-src_configure() {
-	local myconf
-
-	if use csoundac ; then
-		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
-		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
-	fi
-
-	[[ $(get_libdir) == "lib64" ]] && myconf+=" -DUSE_LIB64=ON"
-
-	local mycmakeargs=(
-		$(cmake-utils_use_use alsa ALSA)
-		$(cmake-utils_use_build beats CSBEATS)
-		$(cmake-utils_use_build chua CHUA_OPCODES)
-		$(cmake-utils_use_build csoundac CSOUND_AC)
-		$(cmake-utils_use_build cxx CXX_INTERFACE)
-		$(cmake-utils_use_use curl CURL)
-		$(cmake-utils_use debug NEW_PARSER_DEBUG)
-		$(cmake-utils_use_use double-precision DOUBLE)
-		$(cmake-utils_use_build dssi DSSI_OPCODES)
-		$(cmake-utils_use_build fluidsynth FLUID_OPCODES)
-		$(cmake-utils_use_use fltk FLTK)
-		$(cmake-utils_use_build image IMAGE_OPCODES)
-		$(cmake-utils_use_use jack JACK)
-		$(cmake-utils_use_build jack JACK_OPCODES)
-		$(cmake-utils_use_build java JAVA_INTERFACE)
-		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD)
-		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES)
-		$(cmake-utils_use_build lua LUA_OPCODES)
-		$(cmake-utils_use_build lua LUA_INTERFACE)
-		$(cmake-utils_use_use nls GETTEXT)
-		$(cmake-utils_use_build osc OSC_OPCODES)
-		$(cmake-utils_use_use openmp OPEN_MP)
-		$(cmake-utils_use_use portaudio PORTAUDIO)
-		$(cmake-utils_use_use portmidi PORTMIDI)
-		$(cmake-utils_use_use pulseaudio PULSEAUDIO)
-		$(cmake-utils_use_build python PYTHON_OPCODES)
-		$(cmake-utils_use_build python PYTHON_INTERFACE)
-		$(cmake-utils_use score SCORE_PARSER)
-		$(cmake-utils_use_build static-libs STATIC_LIBRARY)
-		$(cmake-utils_use_build stk STK_OPCODES)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build test STATIC_LIBRARY)
-		$(cmake-utils_use_build tcl TCLCSOUND)
-		$(cmake-utils_use_build threads MULTI_CORE)
-		$(cmake-utils_use_build utils UTILITIES)
-		-DBUILD_RELEASE=ON
-		${myconf}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog README.md 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}
-	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
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{extract,csound_extract} || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}

diff --git a/media-sound/csound/files/csound-5.16.6-tests.patch b/media-sound/csound/files/csound-5.16.6-tests.patch
deleted file mode 100644
index dd8b8ed..0000000
--- a/media-sound/csound/files/csound-5.16.6-tests.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- Csound5.16.6/tests/test.py.orig
-+++ Csound5.16.6/tests/test.py
-@@ -6,9 +6,6 @@
- import os
- import sys
- 
--from testUI import TestApplication
--from Tkinter import *
--
- parserType = "--new-parser"
- showUIatClose = False
- csoundExecutable = ""
-@@ -104,8 +101,6 @@
-    ]
- 
- 
--    output = ""
--    tempfile = "/tmp/csound_test_output.txt"
-     counter = 1
- 
-     retVals = []
-@@ -124,7 +119,7 @@
-             retVal = os.system(command)
-         else:
-             executable = (csoundExecutable == "") and "../csound" or csoundExecutable
--            command = "%s %s %s %s &> %s"%(executable, parserType, runArgs, filename, tempfile)
-+            command = "%s %s %s %s"%(executable, parserType, runArgs, filename)
-             retVal = os.system(command)
- 
-         print "Test %i: %s (%s)\nReturn Code: %i"%(counter, desc, filename, retVal)
-@@ -136,24 +131,6 @@
-             testFail += 1
-             print "Result: FAIL\n"
-         
--        output += "%s\n"%("=" * 80)
--        output += "Test %i: %s (%s)\nReturn Code: %i\n"%(counter, desc, filename, retVal)
--        output += "%s\n\n"%("=" * 80)
--
--        f = open(tempfile, "r")
--
--        csOutput = ""
--
--        for line in f:
--            csOutput += line
--
--        output += csOutput
--
--        f.close()
--
--        retVals.append(t + [retVal, csOutput])
--
--        output += "\n\n"
-         counter += 1
- 
- #    print output
-@@ -162,12 +139,7 @@
-     print "Tests Passed: %i\nTests Failed: %i\n"%(testPass, testFail)
- 
- 
--    f = open("results.txt", "w")
--    f.write(output)
--    f.flush()
--    f.close()
--
--    return retVals
-+    return testFail
- 
- if __name__ == "__main__":
-     if(len(sys.argv) > 1):
-@@ -176,6 +148,8 @@
-                 showHelp()
-                 sys.exit(0)
-             elif arg == "--show-ui":
-+                from testUI import TestApplication
-+                from Tkinter import *
-                 showUIatClose = True
-             elif arg == "--old-parser":
-                 parserType = "--old-parser"
-@@ -185,6 +159,8 @@
-             elif arg.startswith("--opcodedir64="):
-                 os.environ['OPCODEDIR64'] = arg[14:]
-                 print os.environ['OPCODEDIR64'] 
--    results = runTest()
--    if (showUIatClose):
--        showUI(results)
-+    failures = runTest()
-+    if failures > 0:
-+        sys.exit(1)
-+    else:
-+        sys.exit(0)

diff --git a/media-sound/csound/files/csound-5.17.11-cmake.patch b/media-sound/csound/files/csound-5.17.11-cmake.patch
deleted file mode 100644
index 388a043..0000000
--- a/media-sound/csound/files/csound-5.17.11-cmake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
-+++ Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
-@@ -29,7 +29,6 @@
- 	allegrowr.cpp
- 	Cell.cpp
- 	ChordLindenmayer.cpp
--	cmake_install.cmake
- 	Composition.cpp
- 	Conversions.cpp
- 	Counterpoint.cpp

diff --git a/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch b/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch
deleted file mode 100644
index ae07d41..0000000
--- a/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
-+++ Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
-@@ -7,6 +7,7 @@
- 
- find_package(Boost)
- find_library(MUSICXML_LIBRARY musicxml2)
-+set(FLTK_SKIP_OPENGL true)
- find_package(FLTK)
- find_package(SWIG)
- find_package(PythonLibs)
---- Csound5.17.11/InOut/CMakeLists.txt
-+++ Csound5.17.11/InOut/CMakeLists.txt
-@@ -56,6 +56,7 @@
-     find_library(COREAUDIO_LIBRARY CoreAudio)
- endif()
- if(USE_FLTK OR BUILD_VIRTUAL_KEYBOARD)
-+    set(FLTK_SKIP_OPENGL true)
-     find_package(FLTK)
- endif()
- 

diff --git a/media-sound/csound/files/csound-5.17.6-fltk.patch b/media-sound/csound/files/csound-5.17.6-fltk.patch
deleted file mode 100644
index 74b7268..0000000
--- a/media-sound/csound/files/csound-5.17.6-fltk.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Csound5.17.6/InOut/CMakeLists.txt
-+++ Csound5.17.6/InOut/CMakeLists.txt
-@@ -148,6 +148,7 @@
- if(USE_FLTK)
-     set(widgets_SRCS FL_graph.cpp winFLTK.c widgets.cpp)
-     make_plugin(widgets "${widgets_SRCS}" "${FLTK_LIBRARIES}")
-+    include_directories(${FLTK_INCLUDE_DIR})
- endif()
- 
- check_deps(BUILD_VIRTUAL_KEYBOARD FLTK_FOUND)

diff --git a/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch b/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch
deleted file mode 100644
index 3f69a37..0000000
--- a/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Csound5.17.6/InOut/CMakeLists.txt
-+++ Csound5.17.6/InOut/CMakeLists.txt
-@@ -26,7 +26,6 @@
- endif()
- if(USE_PORTMIDI)
-     find_library(PORTMIDI_LIBRARY portmidi)
--    find_library(PORTTIME_LIBRARY porttime)
-     check_include_file(portmidi.h PORTMIDI_HEADER)
- endif()
- if(USE_JACK)
-@@ -116,9 +115,6 @@
- check_deps(USE_PORTMIDI PORTMIDI_HEADER PORTMIDI_LIBRARY)
- if(USE_PORTMIDI)
-     set(pmidi_LIBS ${PORTMIDI_LIBRARY})
--    if(NOT APPLE)
--        list(APPEND pmidi_LIBS ${PORTTIME_LIBRARY})
--    endif()
-     if(WIN32)
-         list(APPEND pmidi_LIBS ${CSOUND_WINDOWS_LIBRARIES})
-     endif()

diff --git a/media-sound/csound/files/csound-6.02-porttime-in-portmidi.patch b/media-sound/csound/files/csound-6.02-porttime-in-portmidi.patch
deleted file mode 100644
index 1ef67a1..0000000
--- a/media-sound/csound/files/csound-6.02-porttime-in-portmidi.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Csound6.02/InOut/CMakeLists.txt
-+++ Csound6.02/InOut/CMakeLists.txt
-@@ -33,10 +33,6 @@
-     find_library(PORTMIDI_LIBRARY portmidi)
- #    include_directories(${PORTMIDI_INCLUDE_PATH})
- #    include_directories(${PORTTIME_INCLUDE_PATH})
--    if(WIN32)
--    else()
--        find_library(PORTTIME_LIBRARY porttime)
--    endif()
- endif()
- if(USE_JACK)
-     find_library(JACK_LIBRARY jack)
-@@ -126,15 +122,12 @@
- elseif(WIN32)
-     check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTTIME_INCLUDE_PATH PORTMIDI_LIBRARY)
- else()
--    check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTMIDI_LIBRARY PORTTIME_LIBRARY)
-+    check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTMIDI_LIBRARY)
- endif()
- 
- if(USE_PORTMIDI)
-     set(pmidi_LIBS ${PORTMIDI_LIBRARY})
-     include_directories(${PORTMIDI_INCLUDE_PATH})
--    if(LINUX)
--        list(APPEND pmidi_LIBS ${PORTTIME_LIBRARY})
--    endif()
-     if(WIN32)
-         include_directories(${PORTTIME_INCLUDE_PATH})
-         list(APPEND pmidi_LIBS ${CSOUND_WINDOWS_LIBRARIES})


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/
@ 2016-08-07  2:13 Tim Harder
  0 siblings, 0 replies; 9+ messages in thread
From: Tim Harder @ 2016-08-07  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     c310826265b20d8debb6c03849ac6ce7e1587a6c
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  7 02:01:41 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 02:13:29 2016 +0000
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 5912e7c4e3fe42206a3914f66e24e1179e1f50337e17f407762d89a011f5f752e768faaaaf7eb34b097070bed8d28bbab37557cb6c6a1c9eebc174e0a7876dcd
 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 0000000..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? ( 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
+		"${FILESDIR}"/${P}-fltk-headers.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=()
+
+	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 )
+
+	local mycmakeargs=(
+		-DUSE_ALSA=$(usex alsa)
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_CSOUND_AC=$(usex csoundac)
+		-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)
+		-DUSE_FLTK=$(usex fltk)
+		-DBUILD_IMAGE_OPCODES=$(usex image)
+		-DUSE_JACK=$(usex jack)
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_OPCODES=$(usex lua)
+		-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)
+		-DNEED_PORTTIME=OFF
+		-DBUILD_RELEASE=ON
+		"${myconf[@]}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS ChangeLog README.md 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}
+	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
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use samples && dodoc -r samples
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins installer/misc/vim/csound_{csd,orc,sco}.vim
+		insinto /usr/share/vim/vimfiles/plugin
+		doins installer/misc/vim/csound.vim
+	fi
+
+	# rename extract to csound_extract (bug #247394)
+	mv "${ED}"/usr/bin/{extract,csound_extract} || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}

diff --git a/media-sound/csound/files/csound-6.07.0-fltk-headers.patch b/media-sound/csound/files/csound-6.07.0-fltk-headers.patch
new file mode 100644
index 0000000..c8c7beb
--- /dev/null
+++ b/media-sound/csound/files/csound-6.07.0-fltk-headers.patch
@@ -0,0 +1,10 @@
+--- csound-6.07.0/InOut/CMakeLists.txt
++++ csound-6.07.0/InOut/CMakeLists.txt
+@@ -213,6 +213,7 @@
+     #add_dependency_to_framework(widgets ${FLTK_BASE_LIBRARY})
+     #add_dependency_to_framework(widgets ${FLTK_FORMS_LIBRARY})
+     #add_dependency_to_framework(widgets ${FLTK_IMAGES_LIBRARY})
++    include_directories(${FLTK_INCLUDE_DIR})
+ endif()
+ 
+ check_deps(BUILD_VIRTUAL_KEYBOARD FLTK_FOUND)


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/
@ 2016-08-07  2:13 Tim Harder
  0 siblings, 0 replies; 9+ messages in thread
From: Tim Harder @ 2016-08-07  2:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2adc2485e705ba9921d40f4ff7bd76cc509dd8f1
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  7 02:06:25 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 02:13:29 2016 +0000
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 5912e7c4e3fe42206a3914f66e24e1179e1f50337e17f407762d89a011f5f752e768faaaaf7eb34b097070bed8d28bbab37557cb6c6a1c9eebc174e0a7876dcd
-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..0000000
--- 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? (
-		>=dev-lang/tcl-8.5:0=
-		>=dev-lang/tk-8.5:0=
-	)
-	utils? ( !media-sound/snd )
-"
-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="
-	java? ( cxx )
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( cxx )
-"
-
-# requires specific alsa settings
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-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() {
-	epatch "${FILESDIR}"/${P}-porttime-in-portmidi.patch
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-
-	if use python ; then
-		sed -i "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die
-	fi
-
-	for lang in ${LANGS} ; do
-		if ! use linguas_${lang} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
-}
-
-src_configure() {
-	local myconf
-
-	if use csoundac ; then
-		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
-		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
-	fi
-
-	[[ $(get_libdir) == "lib64" ]] && myconf+=" -DUSE_LIB64=ON"
-
-	local mycmakeargs=(
-		$(cmake-utils_use_use alsa ALSA)
-		$(cmake-utils_use_build beats CSBEATS)
-		$(cmake-utils_use_build chua CHUA_OPCODES)
-		$(cmake-utils_use_build csoundac CSOUND_AC)
-		$(cmake-utils_use_build cxx CXX_INTERFACE)
-		$(cmake-utils_use_use curl CURL)
-		$(cmake-utils_use debug NEW_PARSER_DEBUG)
-		$(cmake-utils_use_use double-precision DOUBLE)
-		$(cmake-utils_use_build dssi DSSI_OPCODES)
-		$(cmake-utils_use_build fluidsynth FLUID_OPCODES)
-		$(cmake-utils_use_use fltk FLTK)
-		$(cmake-utils_use_build image IMAGE_OPCODES)
-		$(cmake-utils_use_use jack JACK)
-		$(cmake-utils_use_build jack JACK_OPCODES)
-		$(cmake-utils_use_build java JAVA_INTERFACE)
-		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD)
-		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES)
-		$(cmake-utils_use_build lua LUA_OPCODES)
-		$(cmake-utils_use_build lua LUA_INTERFACE)
-		$(cmake-utils_use_use nls GETTEXT)
-		$(cmake-utils_use_build osc OSC_OPCODES)
-		$(cmake-utils_use_use openmp OPEN_MP)
-		$(cmake-utils_use_use portaudio PORTAUDIO)
-		$(cmake-utils_use_use portmidi PORTMIDI)
-		$(cmake-utils_use_use pulseaudio PULSEAUDIO)
-		$(cmake-utils_use_build python PYTHON_OPCODES)
-		$(cmake-utils_use_build python PYTHON_INTERFACE)
-		$(cmake-utils_use score SCORE_PARSER)
-		$(cmake-utils_use_build static-libs STATIC_LIBRARY)
-		$(cmake-utils_use_build stk STK_OPCODES)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build test STATIC_LIBRARY)
-		$(cmake-utils_use_build tcl TCLCSOUND)
-		$(cmake-utils_use_build threads MULTI_CORE)
-		$(cmake-utils_use_build utils UTILITIES)
-		-DBUILD_RELEASE=ON
-		${myconf}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc AUTHORS ChangeLog readme-csound6.txt What_is_New.txt \
-		Release_Notes/* Known_Problems todo.txt To-fix-and-do
-
-	# 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}
-	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
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{extract,csound_extract} || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}

diff --git a/media-sound/csound/csound-6.04.ebuild b/media-sound/csound/csound-6.04.ebuild
deleted file mode 100644
index c95a023..0000000
--- a/media-sound/csound/csound-6.04.ebuild
+++ /dev/null
@@ -1,214 +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? (
-		>=dev-lang/tcl-8.5:0=
-		>=dev-lang/tk-8.5:0=
-	)
-	utils? ( !media-sound/snd )
-"
-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="
-	java? ( cxx )
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( cxx )
-"
-
-# requires specific alsa settings
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-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() {
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-
-	if use python ; then
-		sed -i "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die
-	fi
-
-	for lang in ${LANGS} ; do
-		if ! use linguas_${lang} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
-}
-
-src_configure() {
-	local myconf
-
-	if use csoundac ; then
-		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
-		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
-	fi
-
-	[[ $(get_libdir) == "lib64" ]] && myconf+=" -DUSE_LIB64=ON"
-
-	local mycmakeargs=(
-		$(cmake-utils_use_use alsa ALSA)
-		$(cmake-utils_use_build beats CSBEATS)
-		$(cmake-utils_use_build chua CHUA_OPCODES)
-		$(cmake-utils_use_build csoundac CSOUND_AC)
-		$(cmake-utils_use_build cxx CXX_INTERFACE)
-		$(cmake-utils_use_use curl CURL)
-		$(cmake-utils_use debug NEW_PARSER_DEBUG)
-		$(cmake-utils_use_use double-precision DOUBLE)
-		$(cmake-utils_use_build dssi DSSI_OPCODES)
-		$(cmake-utils_use_build fluidsynth FLUID_OPCODES)
-		$(cmake-utils_use_use fltk FLTK)
-		$(cmake-utils_use_build image IMAGE_OPCODES)
-		$(cmake-utils_use_use jack JACK)
-		$(cmake-utils_use_build jack JACK_OPCODES)
-		$(cmake-utils_use_build java JAVA_INTERFACE)
-		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD)
-		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES)
-		$(cmake-utils_use_build lua LUA_OPCODES)
-		$(cmake-utils_use_build lua LUA_INTERFACE)
-		$(cmake-utils_use_use nls GETTEXT)
-		$(cmake-utils_use_build osc OSC_OPCODES)
-		$(cmake-utils_use_use openmp OPEN_MP)
-		$(cmake-utils_use_use portaudio PORTAUDIO)
-		$(cmake-utils_use_use portmidi PORTMIDI)
-		$(cmake-utils_use_use pulseaudio PULSEAUDIO)
-		$(cmake-utils_use_build python PYTHON_OPCODES)
-		$(cmake-utils_use_build python PYTHON_INTERFACE)
-		$(cmake-utils_use score SCORE_PARSER)
-		$(cmake-utils_use_build static-libs STATIC_LIBRARY)
-		$(cmake-utils_use_build stk STK_OPCODES)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build test STATIC_LIBRARY)
-		$(cmake-utils_use_build tcl TCLCSOUND)
-		$(cmake-utils_use_build threads MULTI_CORE)
-		$(cmake-utils_use_build utils UTILITIES)
-		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
-		${myconf}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog README.md 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}
-	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
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{extract,csound_extract} || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}

diff --git a/media-sound/csound/csound-6.05.0.ebuild b/media-sound/csound/csound-6.05.0.ebuild
deleted file mode 100644
index 186991f..0000000
--- a/media-sound/csound/csound-6.05.0.ebuild
+++ /dev/null
@@ -1,215 +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
-
-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"
-
-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
-	)
-	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 )
-"
-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
-		python-single-r1_pkg_setup
-	fi
-}
-
-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
-
-	if use python ; then
-		sed -e 's#${REPLACE_ME}#'$(python_get_sitedir)'#' \
-			-i CMakeLists.txt || die
-	fi
-
-	for lang in ${LANGS} ; do
-		if ! use linguas_${lang} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
-}
-
-src_configure() {
-	local myconf
-
-	if use csoundac ; then
-		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
-		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
-	fi
-
-	[[ $(get_libdir) == "lib64" ]] && myconf+=" -DUSE_LIB64=ON"
-
-	local mycmakeargs=(
-		$(cmake-utils_use_use alsa ALSA)
-		$(cmake-utils_use_build beats CSBEATS)
-		$(cmake-utils_use_build chua CHUA_OPCODES)
-		$(cmake-utils_use_build csoundac CSOUND_AC)
-		$(cmake-utils_use_build cxx CXX_INTERFACE)
-		$(cmake-utils_use_use curl CURL)
-		$(cmake-utils_use debug NEW_PARSER_DEBUG)
-		$(cmake-utils_use_use double-precision DOUBLE)
-		$(cmake-utils_use_build dssi DSSI_OPCODES)
-		$(cmake-utils_use_build fluidsynth FLUID_OPCODES)
-		$(cmake-utils_use_use fltk FLTK)
-		$(cmake-utils_use_build image IMAGE_OPCODES)
-		$(cmake-utils_use_use jack JACK)
-		$(cmake-utils_use_build jack JACK_OPCODES)
-		$(cmake-utils_use_build java JAVA_INTERFACE)
-		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD)
-		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES)
-		$(cmake-utils_use_build lua LUA_OPCODES)
-		$(cmake-utils_use_build lua LUA_INTERFACE)
-		$(cmake-utils_use_use nls GETTEXT)
-		$(cmake-utils_use_build osc OSC_OPCODES)
-		$(cmake-utils_use_use openmp OPEN_MP)
-		$(cmake-utils_use_use portaudio PORTAUDIO)
-		$(cmake-utils_use_use portmidi PORTMIDI)
-		$(cmake-utils_use_use pulseaudio PULSEAUDIO)
-		$(cmake-utils_use_build python PYTHON_OPCODES)
-		$(cmake-utils_use_build python PYTHON_INTERFACE)
-		$(cmake-utils_use score SCORE_PARSER)
-		$(cmake-utils_use_build static-libs STATIC_LIBRARY)
-		$(cmake-utils_use_build stk STK_OPCODES)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build test STATIC_LIBRARY)
-		$(cmake-utils_use_build tcl TCLCSOUND)
-		$(cmake-utils_use_build threads MULTI_CORE)
-		$(cmake-utils_use_build utils UTILITIES)
-		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
-		${myconf}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog README.md 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}
-	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
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{extract,csound_extract} || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}

diff --git a/media-sound/csound/files/csound-6.05-underlinking.patch b/media-sound/csound/files/csound-6.05-underlinking.patch
deleted file mode 100644
index eac83f2..0000000
--- a/media-sound/csound/files/csound-6.05-underlinking.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit a4b1930b506274e328ee26cd6287965cb496062b
-Author: Steven Yi <stevenyi@gmail.com>
-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)


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/
@ 2016-12-10 20:49 Tim Harder
  0 siblings, 0 replies; 9+ messages in thread
From: Tim Harder @ 2016-12-10 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     ff604f4c45862f44a08b8ba16868726f5142b72c
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 20:48:53 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 20:49:32 2016 +0000
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..00000000
--- 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
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/csound-6.05-python.patch
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-
-	if use python ; then
-		sed -e 's#${REPLACE_ME}#'$(python_get_sitedir)'#' \
-			-i CMakeLists.txt || die
-	fi
-
-	for lang in ${LANGS} ; do
-		if ! use linguas_${lang} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
-}
-
-src_configure() {
-	local myconf
-
-	if use csoundac ; then
-		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
-		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
-	fi
-
-	[[ $(get_libdir) == "lib64" ]] && myconf+=" -DUSE_LIB64=ON"
-
-	local mycmakeargs=(
-		$(cmake-utils_use_use alsa ALSA)
-		$(cmake-utils_use_build beats CSBEATS)
-		$(cmake-utils_use_build chua CHUA_OPCODES)
-		$(cmake-utils_use_build csoundac CSOUND_AC)
-		$(cmake-utils_use_build cxx CXX_INTERFACE)
-		$(cmake-utils_use_use curl CURL)
-		$(cmake-utils_use debug NEW_PARSER_DEBUG)
-		$(cmake-utils_use_use double-precision DOUBLE)
-		$(cmake-utils_use_build dssi DSSI_OPCODES)
-		$(cmake-utils_use_build fluidsynth FLUID_OPCODES)
-		$(cmake-utils_use_use fltk FLTK)
-		$(cmake-utils_use_build image IMAGE_OPCODES)
-		$(cmake-utils_use_use jack JACK)
-		$(cmake-utils_use_build jack JACK_OPCODES)
-		$(cmake-utils_use_build java JAVA_INTERFACE)
-		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD)
-		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES)
-		$(cmake-utils_use_build lua LUA_OPCODES)
-		$(cmake-utils_use_build lua LUA_INTERFACE)
-		$(cmake-utils_use_use nls GETTEXT)
-		$(cmake-utils_use_build osc OSC_OPCODES)
-		$(cmake-utils_use_use openmp OPEN_MP)
-		$(cmake-utils_use_use portaudio PORTAUDIO)
-		$(cmake-utils_use_use portmidi PORTMIDI)
-		$(cmake-utils_use_use pulseaudio PULSEAUDIO)
-		$(cmake-utils_use_build python PYTHON_OPCODES)
-		$(cmake-utils_use_build python PYTHON_INTERFACE)
-		$(cmake-utils_use score SCORE_PARSER)
-		$(cmake-utils_use_build static-libs STATIC_LIBRARY)
-		$(cmake-utils_use_build stk STK_OPCODES)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_build test STATIC_LIBRARY)
-		$(cmake-utils_use_build tcl TCLCSOUND)
-		$(cmake-utils_use_build threads MULTI_CORE)
-		$(cmake-utils_use_build utils UTILITIES)
-		$(cmake-utils_use_build websocket WEBSOCKET_OPCODE)
-		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
-		${myconf}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog README.md 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}
-	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
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{extract,csound_extract} || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}

diff --git a/media-sound/csound/csound-6.07.0.ebuild b/media-sound/csound/csound-6.07.0.ebuild
deleted file mode 100644
index 3a9ef32..00000000
--- a/media-sound/csound/csound-6.07.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=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
-		"${FILESDIR}"/${P}-fltk-headers.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)
-		-DUSE_FLTK=$(usex fltk)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DUSE_JACK=$(usex jack)
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_OPCODES=$(usex lua)
-		-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)
-		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
-		"${myconf[@]}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog README.md 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}
-	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
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{extract,csound_extract} || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}

diff --git a/media-sound/csound/files/csound-6.07.0-fltk-headers.patch b/media-sound/csound/files/csound-6.07.0-fltk-headers.patch
deleted file mode 100644
index c8c7beb..00000000
--- a/media-sound/csound/files/csound-6.07.0-fltk-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- csound-6.07.0/InOut/CMakeLists.txt
-+++ csound-6.07.0/InOut/CMakeLists.txt
-@@ -213,6 +213,7 @@
-     #add_dependency_to_framework(widgets ${FLTK_BASE_LIBRARY})
-     #add_dependency_to_framework(widgets ${FLTK_FORMS_LIBRARY})
-     #add_dependency_to_framework(widgets ${FLTK_IMAGES_LIBRARY})
-+    include_directories(${FLTK_INCLUDE_DIR})
- endif()
- 
- check_deps(BUILD_VIRTUAL_KEYBOARD FLTK_FOUND)


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/
@ 2018-10-04 19:14 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-10-04 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     cf037c1f38528312fbc283c26a2d389151d5a42b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  4 18:12:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 19:11:51 2018 +0000
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 <asturm <AT> 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..00000000000
--- 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} == *9999 ]]; 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? ( 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"
-
-PATCHES=( "${FILESDIR}"/csound-6.05-python.patch )
-
-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
-}
-
-src_prepare() {
-	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 ! has ${lang} ${LINGUAS-${lang}} ; then
-			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
-		fi
-	done
-}
-
-src_configure() {
-	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)
-		-DUSE_FLTK=$(usex fltk)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DUSE_JACK=$(usex jack)
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_OPCODES=$(usex lua)
-		-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)
-		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
-	)
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
-		-DUSE_LIB64=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r Release_Notes/.
-
-	# Generate env.d file
-	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
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED%/}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}

diff --git a/media-sound/csound/csound-6.09.1.ebuild b/media-sound/csound/csound-6.09.1.ebuild
deleted file mode 100644
index 7f018b3a913..00000000000
--- a/media-sound/csound/csound-6.09.1.ebuild
+++ /dev/null
@@ -1,230 +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 java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
-
-if [[ ${PV} == "9999" ]]; 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? ( 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}
-	)
-"
-
-if [[ ${PV} != "9999" ]]; then
-	DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-python.patch )
-
-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
-}
-
-src_prepare() {
-	cmake-utils_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() {
-	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)
-		-DUSE_FLTK=$(usex fltk)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DUSE_JACK=$(usex jack)
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_OPCODES=$(usex lua)
-		-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)
-		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
-	)
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
-		-DUSE_LIB64=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	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
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED%/}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-
-	# install docs
-	if [[ ${PV} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}

diff --git a/media-sound/csound/files/csound-6.05-python.patch b/media-sound/csound/files/csound-6.05-python.patch
deleted file mode 100644
index 3e9ee857fe9..00000000000
--- a/media-sound/csound/files/csound-6.05-python.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- csound-6.05.0.orig/CMakeLists.txt	2015-04-26 03:06:22.941646148 +0800
-+++ csound-6.05.0/CMakeLists.txt	2015-07-08 22:31:16.637995822 +0800
-@@ -41,15 +41,9 @@
-     set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
- endif()
-
--
--execute_process (
--     COMMAND python -c
--     "import site, sys; sys.stdout.write(site.getusersitepackages())"
--     OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
--   )
--
- set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
- set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
-+set(PYTHON_MODULE_INSTALL_DIR ${REPLACE_ME})
- set(LOCALE_INSTALL_DIR "share/locale")
- set(HEADER_INSTALL_DIR "include/csound")
-

diff --git a/media-sound/csound/files/csound-6.09.1-python.patch b/media-sound/csound/files/csound-6.09.1-python.patch
deleted file mode 100644
index 47461e48aaf..00000000000
--- a/media-sound/csound/files/csound-6.09.1-python.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Respect externally set PYTHON_MODULE_INSTALL_DIR.
-
---- csound-6.09.1/CMakeLists.txt
-+++ csound-6.09.1/CMakeLists.txt
-@@ -218,11 +218,13 @@
-     set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
- endif()
- 
--execute_process (
--     COMMAND python -c
--     "import site, sys; sys.stdout.write(site.getusersitepackages())"
--     OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
--   )
-+if(NOT DEFINED PYTHON_MODULE_INSTALL_DIR)
-+    execute_process (
-+        COMMAND python -c
-+        "import site, sys; sys.stdout.write(site.getusersitepackages())"
-+        OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
-+    )
-+endif()
- 
- set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
- set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/
@ 2019-12-15 20:16 Miroslav Šulc
  0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2019-12-15 20:16 UTC (permalink / raw
  To: gentoo-commits

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

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

1) bumped to 6.13.0
2) updated SRC_URI to repackaged csound
3) 9999 - 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 <fordfrog <AT> gentoo.org>

 media-sound/csound/Manifest                                     | 3 +++
 media-sound/csound/{csound-9999.ebuild => csound-6.13.0.ebuild} | 8 ++++----
 media-sound/csound/csound-9999.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-9999.ebuild b/media-sound/csound/csound-6.13.0.ebuild
similarity index 97%
copy from media-sound/csound/csound-9999.ebuild
copy to media-sound/csound/csound-6.13.0.ebuild
index 04aea31ab2b..fc723946ca3 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-6.13.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; 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-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index 04aea31ab2b..84567ca2d8d 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; 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}/${PN}-6.13.0-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/files/repackage.sh b/media-sound/csound/files/repackage.sh
index 39b8068b930..fea97d24a46 100644
--- a/media-sound/csound/files/repackage.sh
+++ b/media-sound/csound/files/repackage.sh
@@ -21,7 +21,7 @@ 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}
+tar -acf csound-${VERSION}-distributable.tar.xz csound-${VERSION}
 
 echo -e "Cleaning up\n"
 rm -rf csound-${VERSION} ${VERSION}.tar.gz


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/
@ 2020-08-14  8:21 Miroslav Šulc
  0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2020-08-14  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     915ec0fc165587ef999b19d8b19098ae10c85cd8
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 08:17:52 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 08:20:58 2020 +0000
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 <fordfrog <AT> gentoo.org>

 media-sound/csound/Manifest                        |  3 +++
 .../{csound-9999.ebuild => csound-6.15.0.ebuild}   | 26 ++++++++++------------
 media-sound/csound/csound-9999.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-9999.ebuild b/media-sound/csound/csound-6.15.0.ebuild
similarity index 93%
copy from media-sound/csound/csound-9999.ebuild
copy to media-sound/csound/csound-6.15.0.ebuild
index f9db4411fa0..b52669444ab 100644
--- a/media-sound/csound/csound-9999.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} == "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/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index f9db4411fa0..b52669444ab 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 00000000000..800ec4fd0f4
--- /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;


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/
@ 2021-04-14 13:51 Miroslav Šulc
  0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2021-04-14 13:51 UTC (permalink / raw
  To: gentoo-commits

commit:     85099f7fd4924a0441cb67fd988115aa951dbdc9
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 13:51:17 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 13:51:32 2021 +0000
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 <fordfrog <AT> gentoo.org>

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

diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-6.15.0-r101.ebuild
similarity index 94%
copy from media-sound/csound/csound-9999.ebuild
copy to media-sound/csound/csound-6.15.0-r101.ebuild
index cdc5d7cf593..6705f7c3429 100644
--- a/media-sound/csound/csound-9999.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} != "9999" ]] && use doc ; then
 		dodoc "${WORKDIR}"/*.pdf

diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index cdc5d7cf593..f0b57265999 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.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} != "9999" ]] && 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 00000000000..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 <victor.lazzarini@mu.ie>
+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


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/
@ 2021-08-05 19:17 Miroslav Šulc
  0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2021-08-05 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     3a22a7c3f92076f4ad82c8cd038b6b07bd6d505d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  5 19:17:13 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug  5 19:17:13 2021 +0000
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 <fordfrog <AT> 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..00000000000
--- 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} == "9999" ]]; 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"
-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
-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 )
-	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} )
-	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} != "9999" ]]; 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"
-	"${FILESDIR}/${PN}-6.15.0-fix-soname.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
-
-	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() {
-	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
-		-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)
-		-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_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_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)
-		-DREQUIRE_PTHREADS=$(usex threads)
-
-		-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
-		-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)
-
-	)
-
-	use java && mycmakeargs+=(
-		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
-	)
-
-	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)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	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
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{,csound_}extract || die
-
-	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} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}

diff --git a/media-sound/csound/csound-6.16.0.ebuild b/media-sound/csound/csound-6.16.0.ebuild
deleted file mode 100644
index c21367e524e..00000000000
--- a/media-sound/csound/csound-6.16.0.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} == "9999" ]]; 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"
-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 )
-	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} != "9999" ]]; 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
-
-	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() {
-	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
-		-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)
-		-DREQUIRE_PTHREADS=$(usex threads)
-
-		-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
-		-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)
-
-	)
-
-	use java && mycmakeargs+=(
-		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
-	)
-
-	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.
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	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
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{,csound_}extract || die
-
-	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} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}

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
deleted file mode 100644
index 7bac8708256..00000000000
--- a/media-sound/csound/files/csound-6.15.0-fix-soname.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 20daf5f4edbbf7291ad32dd623a335be1de0c54f Mon Sep 17 00:00:00 2001
-From: vlazzarini <victor.lazzarini@mu.ie>
-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

diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index c5216b6e38c..7b96747a6c9 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="double-precision">Use double-precision floating point for audio samples</flag>
 		<flag name="dssi">Build the DSSI opcodes</flag>
 		<flag name="fluidsynth">Build the fluidsynth opcodes</flag>
-		<flag name="image">Build the image opcodes</flag>
 		<flag name="keyboard">Build Virtual MIDI keyboard</flag>
 		<flag name="linear">Build the linear algebra Opcodes</flag>
 		<flag name="portmidi">Build the PortMIDI I/O module</flag>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2021-08-05 19:17 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-05 19:17 [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/files/, media-sound/csound/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2021-04-14 13:51 Miroslav Šulc
2020-08-14  8:21 Miroslav Šulc
2019-12-15 20:16 Miroslav Šulc
2018-10-04 19:14 Andreas Sturmlechner
2016-12-10 20:49 Tim Harder
2016-08-07  2:13 Tim Harder
2016-08-07  2:13 Tim Harder
2015-11-27 13:10 Sergey Popov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox