Revision bump. Rename extract tool to csound_extract (bug #247394).

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

3 files changed, 207 insertions, 9 deletions

diff --git a/media-sound/csound/ChangeLog b/media-sound/csound/ChangeLog
index 7a782a8ca883..727d9f47d201 100644
--- a/media-sound/csound/ChangeLog
+++ b/media-sound/csound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/csound
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.23 2012/09/15 05:49:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.24 2012/09/15 06:11:30 radhermit Exp $
+
+*csound-5.18.02-r1 (15 Sep 2012)
+
+  15 Sep 2012; Tim Harder <radhermit@gentoo.org> +csound-5.18.02-r1.ebuild:
+  Revision bump. Rename extract tool to csound_extract (bug #247394).
 
   15 Sep 2012; Tim Harder <radhermit@gentoo.org> csound-5.18.02.ebuild:
   Use fixed tarball release (previous one was corrupted).
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index a61e8640ccf2..d21a5290b506 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -10,17 +10,18 @@ AUX csound-5.17.6-porttime-in-portmidi.patch 614 SHA256 98a9fd9a7d3b2ff5fd287aed
 DIST Csound5.17.11.tar.gz 9152189 SHA256 a86595c4328b63e9b37205b40bf1441182a453451b0ea20558a7777dbc0380b7 SHA512 ff45b5ce057cc92481de90ad67515eaca1ce3a2bd906e43920e7f7597a285a6cf2289d379b4d8fa1ee9e66da712da0290d06f7f98f173603c159d484b91f3c31 WHIRLPOOL 127ca5947640c36e9a6c082127525c21abd69e5dde58fa54c6383f5c56b5863ea86e7c4d8832038efa0631862406aba75a09a3c2e250ffdf774fe5de7f87a1f6
 DIST Csound5.18.02.tar.gz 9211491 SHA256 4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8 SHA512 74db496d2f7c4fa288579c171982c2620165d4677885be692610695fb72ba9f08bd00d8976830f72158428cc05b8362c271f05a4f83b2925df246faa3281b045 WHIRLPOOL e7592fe5bf9d4eae5e2b2b78e5f3bf829c7b6c7431013a16594e3766bf6f51f32133a096c4e587c3bd26020e1c64d3799be7a0f3bb17a7dcafbb54616f8e78d2
 EBUILD csound-5.17.11.ebuild 5661 SHA256 94e83442ef946953035b6cc96eb865f964be694c798e62729d3302adefaafe06 SHA512 fe14aea891f440b3e658b16c5243c8f09de21eca31be4961ff8607ff8df24070dfd82df32ab54a3238d502b5be12444af7291e873c1e7944a4861d639b0190a6 WHIRLPOOL a7d30ba8c80ff5f43c9a618e54b18ce20c14c0feff6bd648b3c982899837bb5be810ad15b0be9432c652c1101bf3be5010451bb26fed68f56a530e03b3f8bb2a
+EBUILD csound-5.18.02-r1.ebuild 5862 SHA256 06ec4be9b270be63f1535c6020be84aeec7ae81e3f35600a713067f1c00dec27 SHA512 81d9475890cf28d4231f25c1fcce2ae14c41d2d127ff51a807cc32d9a28e2303816f066e30bcf619749a1858d9ed711e6517c8aab95074d4e8e85ccf4b1e7c84 WHIRLPOOL c1d24fa5315dabfba6d6f0fb02069ae7a1300ac3f62e688c8d82dc7d1274820a3921495ba7b2bca9b187bef280c21890ec9a7f07da09e97f43c2924a3a30f1f8
 EBUILD csound-5.18.02.ebuild 5606 SHA256 4959fda4861d5234ceb7c19de7e9e897280cad93ff4166361280f8560d76cff1 SHA512 0da5cb442dac468cf7b8503b20bc187ef622e4006684ce6bdd2d872a6b7529395f04faea4a00f5bdaaa236e9ac48fd7c8da0d670ed37ac13889b28ce24db0f0f WHIRLPOOL 4d2a283f0cd15fbd47f4b80bf98a231d154fa31e7f4bfb986135ed8fe7df5bac44ad3388b2587e5d731e8c4205b3340cf0b138a62d331858b68a5ca611ef71ef
-MISC ChangeLog 4015 SHA256 3c7d669af8486e57df02cc235b43b21fc8f134790b59f0aabd7b9c53591f1bca SHA512 d7d1e99bbddf067740c8fcdbd8af8cb46593707e0e58d2368d00ae975706a6049472b5d6e160f9db28a8b13a4e2585ee8e5c03ff068a83d2325f3875763c44b1 WHIRLPOOL ced3d4182d10c42c12e17fe453477e5c1814d4af1ec9fe16c428acbf24d1a88ff5683109d0cfac4fa85347e754ef8c7b214852c9895aefc786a8beb40846f69d
+MISC ChangeLog 4196 SHA256 e2c526414ae91c8680c0312d669ec95b80350f3e4ef6a09db3c5ca6a2d27a7f0 SHA512 eb8b13ec6383267010461c035a44548afa41b18fb1f12139c9ce023b3dc67273ef68a5b6161f8677fcc40ea17518a469b8d9b7e5952a035182084e3e84518fa2 WHIRLPOOL f6d0a5589055e772cd4fc2741edb625315b5882e4f759056228e8c2abbc6ddfd1a0a4d0969955d15e9ebb7023b9c4e68196bed614bfa81d6364784f6ad253e2a
 MISC metadata.xml 1357 SHA256 82e7de59c27c84a574f06e24d17c97eb7561fed13c1119602b518ce7c850bfee SHA512 147cac3dc74b94d8ceab87d160cf94373643324ec93a99786ceb45715c94bc24d9f47cf6e6f4816795dd66a63b3f83a8b027a50844978c7d49598e0b5c6ce34d WHIRLPOOL 7c0e7f3f168a31e3fabb878885b0200e50c837213e515e7f091bea1181191d61cafc82a2f7ded9c6affa03a4c63ed4c7b477d815b539199c705eb9ebed37505f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQVBcUAAoJEEqz6FtPBkyjAn0H/27hv/SN7gpnTc5o2tykAPsO
-31O+DgJmS6yW48Gaha5Gr014XZEUdMxM9g0sxRU3yiV8ZSAB6mtuh8TAC4I7a9CK
-o5MP36WJzxAFXlZgqv94xTUJ0wmK+0PHtf1YgRy/83P6sIR49E1NosKHeps7gDfs
-GT21IndhyH3EFJBdGmExLDbzxQlf4AhJgxrptZu9HxddhaJ6olGBZXQofMjZu4CO
-3q7Kla7n+1K1nXxgOlOenYhts3k2GDvsgSmzUzqJDSB+9sLlagK7nbydnSEy46xV
-n0D13+uwRZ0WgBRaa7kaf3iCmMUvkutROVZSPmQpXTQlXkOsuNkJJmJpNNdc4SY=
-=kAs3
+iQEcBAEBCAAGBQJQVBwYAAoJEEqz6FtPBkyjRrYH/1QRQoF2fQD2EQYpo+Rn2urq
+Eck1hYiLIoShajwNNkJ2/LPcgMBaqksisBMnn8mcl/VvOJjSQoKHi5f5XUj0zdGv
+Nnzx0CyerhhE1aE0ZDhz166DulDT0TGcm6X53BZAPw2QlbfO4X5+N4M/iNFntXy+
+XMBUUDHzhaQZSnpCIicaxImacVEFMe+E68qjtz//tu/dLcs0kksS7Ypd3l3K90X8
+zSsSKF8edEoZ3IQHaef6UQ+9aY/wqg0p1F8Z0Dg3wIYJ6bGMhxTDkbkXwiXVIXSt
+YKwL8C/LqXNOc4wqfZt04ey+iQOZxVuw9pnAgbQcjCvOwWOj6gG6d9B2wQyNIYE=
+=TfWw
 -----END PGP SIGNATURE-----
diff --git a/media-sound/csound/csound-5.18.02-r1.ebuild b/media-sound/csound/csound-5.18.02-r1.ebuild
new file mode 100644
index 000000000000..253124d759fc
--- /dev/null
+++ b/media-sound/csound/csound-5.18.02-r1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.18.02-r1.ebuild,v 1.1 2012/09/15 06:11:30 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+inherit eutils multilib python java-pkg-opt-2 cmake-utils toolchain-funcs versionator
+
+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
+		=dev-lang/python-2* )
+	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 )
+	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-lang/python-2* )"
+
+REQUIRED_USE="java? ( cxx )
+	linear? ( double-precision )
+	lua? ( cxx )
+	python? ( cxx )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if use python || use test ; then
+		python_set_active_version 2
+	fi
+	use python && python_pkg_setup
+}
+
+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 "${D}"/usr/bin/{extract,csound_extract}
+}
+
+pkg_postinst() {
+	elog
+	elog "The extract tool is now installed as csound_extract"
+	elog "due to collisions with many other packages (bug #247394)."
+	elog
+}