proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

14 files changed, 1291 insertions, 0 deletions

diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
new file mode 100644
index 000000000000..60852ee30424
--- /dev/null
+++ b/media-sound/csound/Manifest
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000000..4b19c0256fef
--- /dev/null
+++ b/media-sound/csound/csound-5.19.01.ebuild
@@ -0,0 +1,202 @@
+# 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.02.ebuild b/media-sound/csound/csound-6.02.ebuild
new file mode 100644
index 000000000000..f8bc979a3735
--- /dev/null
+++ b/media-sound/csound/csound-6.02.ebuild
@@ -0,0 +1,217 @@
+# 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.03.2.ebuild b/media-sound/csound/csound-6.03.2.ebuild
new file mode 100644
index 000000000000..f873d90f24a8
--- /dev/null
+++ b/media-sound/csound/csound-6.03.2.ebuild
@@ -0,0 +1,215 @@
+# 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/csound-6.04.ebuild b/media-sound/csound/csound-6.04.ebuild
new file mode 100644
index 000000000000..c95a023b0755
--- /dev/null
+++ b/media-sound/csound/csound-6.04.ebuild
@@ -0,0 +1,214 @@
+# 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
new file mode 100644
index 000000000000..02e99b959cc3
--- /dev/null
+++ b/media-sound/csound/csound-6.05.0.ebuild
@@ -0,0 +1,212 @@
+# 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-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="
+	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)
+		-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-5.16.6-tests.patch b/media-sound/csound/files/csound-5.16.6-tests.patch
new file mode 100644
index 000000000000..dd8b8ed289bc
--- /dev/null
+++ b/media-sound/csound/files/csound-5.16.6-tests.patch
@@ -0,0 +1,90 @@
+--- 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
new file mode 100644
index 000000000000..388a043d57cf
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.11-cmake.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..ae07d41a63e3
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 000000000000..74b72689e889
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.6-fltk.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..3f69a3795f04
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 000000000000..1ef67a15c13d
--- /dev/null
+++ b/media-sound/csound/files/csound-6.02-porttime-in-portmidi.patch
@@ -0,0 +1,30 @@
+--- 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})

diff --git a/media-sound/csound/files/csound-6.05-python.patch b/media-sound/csound/files/csound-6.05-python.patch
new file mode 100644
index 000000000000..3e9ee857fe98
--- /dev/null
+++ b/media-sound/csound/files/csound-6.05-python.patch
@@ -0,0 +1,19 @@
+--- 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/metadata.xml b/media-sound/csound/metadata.xml
new file mode 100644
index 000000000000..7bab04e3178c
--- /dev/null
+++ b/media-sound/csound/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<use>
+		<flag name="beats">Build the beats score frontend</flag>
+		<flag name="chua">Build the chua opcodes</flag>
+		<flag name="csoundac">Build the CsoundAC extension module</flag>
+		<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="luajit">Use the lua just-in-time compiler <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+		<flag name="portmidi">Build the PortMIDI I/O module</flag>
+		<flag name="samples">Install the HRTF datafiles for use with hrtfmove, hrtfmove2, hrtfstat, hrtfearly, and hrtfreverb</flag>
+		<flag name="score">Build the alternative score parser</flag>
+		<flag name="stk">Build the stk opcodes</flag>
+		<flag name="tcl">Build the tcl interface and clients</flag>
+		<flag name="utils">Build stand-alone executables for utilities that can also be used via `csound -U`</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">csound</remote-id>
+		<remote-id type="github">csound/csound</remote-id>
+	</upstream>
+</pkgmetadata>