Version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 231 insertions, 10 deletions

diff --git a/media-sound/csound/ChangeLog b/media-sound/csound/ChangeLog
index cca9947f5129..503432f540ae 100644
--- a/media-sound/csound/ChangeLog
+++ b/media-sound/csound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/csound
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.33 2014/05/28 05:26:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.34 2014/12/08 01:33:02 radhermit Exp $
+
+*csound-6.04 (08 Dec 2014)
+
+  08 Dec 2014; Tim Harder <radhermit@gentoo.org> +csound-6.04.ebuild:
+  Version bump.
 
 *csound-6.03.2 (28 May 2014)
 
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index abb2d63498c8..4836675eb47f 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -10,19 +10,21 @@ AUX csound-6.02-porttime-in-portmidi.patch 1039 SHA256 b1a55c9e749669639e0af0218
 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
 EBUILD csound-5.19.01.ebuild 5926 SHA256 37678b5907a54b42b88380567aef735bfcd7d19a306135371e331c520595ee88 SHA512 335ad735488d9c530c0a717f3935ceece6d2399094381f7c0338a7b9cecb86773e3f74bb0f577bca5a4c38254ecc651a260a4209ac7c70f3a3ba05fd56081485 WHIRLPOOL 7e6dca75bf3475de2f59fa83bcca22980f705e75857be067953cd497d8db782902801c71ad5e679de8afbe15e36026413bf05aefa404c18efaebcd75403e8918
 EBUILD csound-6.02.ebuild 5951 SHA256 70094491704b323b2d5b8a9a1c697c47155a46ca7401775e0a9263afe79aeddd SHA512 f9fbf7721cac18633ea324d8d2380aa9dc9c93352492cc47d6db1fa1993c16e4eceba76b31be709251831b6aa36ba820882bd97824d8f971d511805f8dc554df WHIRLPOOL 60bad6806cd267f3eee684ad2d5bd58adbdb55cb76a2a62d9fb5e5707f98cf209139bb512f5f11ba90472a8273be526f3c2760d80d04f106104e5dd5bb8b11a8
 EBUILD csound-6.03.2.ebuild 5885 SHA256 9d68b1ab98397663840e5141e217fb1733d9e2bae081718ae994a51235f7e438 SHA512 1b605ed58522a53996d9ab02fcb6c8947aa075932f3b6d48679d64bd40d2e0defca8394c6e60e738578b82d78182cef5dc7908ef5fc31e812a54112fe0044746 WHIRLPOOL bf6960b7be9412e7ec15c705acc920313af0741f38f6590e19f4dfe955265ca06ec8df0f8d1a27a6db45c0ad3e02b798b2674569e33889d621e3b7a46f5f2c76
-MISC ChangeLog 5381 SHA256 1f4c88986546aa7b4191fab69aedd91bd1b2fdfbc7b3704ba5dad995584eeb9a SHA512 c4d6683979e7435322465fe6ce6d86da439082de9029fcf0c995445b5b23f23ba16c4d77a88413d56ce89c11b542105b8db4490b1c699af84670258fa06db838 WHIRLPOOL 0f6208b16adadcac6f5bfbf9d7e7f831f52aea26908bed853f0e6c786669a55af739bec00cfb17e092e3ae46a8fb0dfe7ba3ca0abfaea7df4bfef4fe0cd6dfcc
+EBUILD csound-6.04.ebuild 5844 SHA256 2dcd62a5d9c8fc8c7a422a400d6a6e9568d1477f58e4c4db1963f2c277c007ef SHA512 ba4e40a90934629b2f3e2f869be75a58d5b01404e1fcf8de5f78b4ff6846a83fcca01b569b423db6c3b010a39e176fedab168d1db28162bb01ab0b79e48d4b99 WHIRLPOOL 7067b07c936d01e4c4b68d3250a1deddb9f08af6aba2f8cebea7b85632d709aed1318ec2f8ee53f4ee593e4ba3fc0ad30a0b151f488e84860effa11be8516a71
+MISC ChangeLog 5496 SHA256 43a10aa120e028f6acf00661fa4276c705351dee3afc809c7dc6bbf746c521b1 SHA512 70e5610f7a309d035b47f7ff12cc46c1682387a602397fec08c0fcdfad9470b7c6e621d9a8709bfbfa47baadc71fd8cb9d8e5ad986413631cd15df146497ceac WHIRLPOOL d5056c17397a91bd41b11816c5f0c305423225b3b9c670123b841631a1195a0ce00ae8557b4d5df27752d2b2fcf74e17a45b9fd77caa89afee518ab3a4cb5605
 MISC metadata.xml 1420 SHA256 472c15afc34ae6659ee1a5557851d9b2731776368ad61726bce14578473e8127 SHA512 e0a4020c3cb1e5060b3332f9b3d22e0e3746d152ee101d02c7d9ff8b08e3bbd3bae3269d4bc84b4e4cd7c76b0a3c1b20939dbe5299095a8db17346f3c8ad97df WHIRLPOOL 6f76316152f9e56bb0a88f7faec7fd4f95fec37779b72fb48c4d08e5cb6d94588c2694b1c1c2afa6202d39f7c307e57427897b4de266d2cd0e8bbb38fc40de5f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJThXOkAAoJEEqz6FtPBkyjrg8H/jydIOx9Zq2b/GD/ZlAGzRrT
-WgLxUgoeyn6vLgh0BfDAJq+b59OkWF4QHbvmtAHN5wRh89PEDWFwrzi0cRjhWRE8
-HFhUs7D7RMwkPDm0ZwFggtPLRn0i9afwPofhM+Z7GwZ9rKqms7ecmTTAFqFKtb5I
-qAB0QdYtosYcYB+So/Cs1U5aueLz4ZTunJ7Xz+qxWFJTiEGt9hxfoAPD38rIQdGi
-SmhjYo2HGTsEtrBkBoYNTj4y8EDXr8itwFMN3FiPHgB7oPK4IsEOQVwyLONh4xyu
-wTltQ75Un2cna0SXqrzFURQ8cRcKD+kUjUWOEepwJyklrfHa9/cM2Me7IUe3TxE=
-=fm4l
+iQEcBAEBCAAGBQJUhP/XAAoJEEqz6FtPBkyjniUIAJjBzYTiRpjBkEBNo97R5ESU
+HzvCALIErpvokk5Xot8iB/ZAD0WlamK2OulEKuGm4+BXmVisIBIxszDjTv3it02F
+Cx38daTi89B/4gp4MMtrTr4pY/fmYuqUmH29t0ipEyZ3AqfBMsXqNsnl2ZOOW6kw
+5WzN+6b1JsdZg5LEY7jBA2cm50/SzLj0ZZjIP1RVn8bWaReAyv0HSSmjtQ21/856
+UvLZOlg+50ZpPBWkaQw+EPMvK2cWYdmmNfC6qAGLQ/fANtjSUcGaqeBEr3GBoGwo
+9hXLDOBfn4ILASs+msS1lK4JbKLej7rJ8NAR9oOMLUIdzmWLwc+t/juJO+PYIiY=
+=zEjP
 -----END PGP SIGNATURE-----
diff --git a/media-sound/csound/csound-6.04.ebuild b/media-sound/csound/csound-6.04.ebuild
new file mode 100644
index 000000000000..61c68a2e47ba
--- /dev/null
+++ b/media-sound/csound/csound-6.04.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-6.04.ebuild,v 1.1 2014/12/08 01:33:02 radhermit Exp $
+
+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 )
+	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 )
+	)
+	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
+		>=dev-lang/tk-8.5
+	)
+	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
+}