media-sound/chuck - add DEPEND, fix CXX and LFLAGS

svn path=/sunrise/; revision=223

3 files changed, 81 insertions, 11 deletions

diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index b4f64842f..671ba488a 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,8 +1,12 @@
+AUX chuck-1.2.0.5-makefile.patch 1232 RMD160 5026761837405a372680f589e879653bb3c5e3e0 SHA1 8f009621ceea130517889e1136465aca21c360e3 SHA256 412bc5848ec11648e0ce63c546f76175bad7b1b594fe94d097c7ec36f2bc439e
+MD5 af7b32ee143d298301e3c219e9c30d4e files/chuck-1.2.0.5-makefile.patch 1232
+RMD160 5026761837405a372680f589e879653bb3c5e3e0 files/chuck-1.2.0.5-makefile.patch 1232
+SHA256 412bc5848ec11648e0ce63c546f76175bad7b1b594fe94d097c7ec36f2bc439e files/chuck-1.2.0.5-makefile.patch 1232
 DIST chuck-1.2.0.5.tgz 1477758 RMD160 648c208ca5ecaf9ada390670fb45518489913aeb SHA1 12ddf3f6b2eda4b6d0732268637b15f8a07b5297 SHA256 0b3a845d887de309488414fbec24020930c495f2f02446dcc1bd6a6509c3a160
-EBUILD chuck-1.2.0.5.ebuild 1167 RMD160 b7466abb0d8c241b6fdbc271941e3a7afd6d6691 SHA1 a403b71dd4e9befa96f2a79b5516eb1ec998d9f8 SHA256 4a90cc68c46c413ddf61d4498a74ddba19f61db21343187542ec95d0850d9488
-MD5 2e612350fa0be353b6d3f307fcda1bb1 chuck-1.2.0.5.ebuild 1167
-RMD160 b7466abb0d8c241b6fdbc271941e3a7afd6d6691 chuck-1.2.0.5.ebuild 1167
-SHA256 4a90cc68c46c413ddf61d4498a74ddba19f61db21343187542ec95d0850d9488 chuck-1.2.0.5.ebuild 1167
+EBUILD chuck-1.2.0.5.ebuild 1818 RMD160 d1fa0ca165020ccce9f7e840fb139ba9faffb4b1 SHA1 d6a38acdcfa895e1df94f390ae0b5a742fc721f9 SHA256 3661ccda80c2fc3a063000c46da97ef0139c29dc5d5f422598993ffad384ff60
+MD5 25a890747160e176444c1b673652f192 chuck-1.2.0.5.ebuild 1818
+RMD160 d1fa0ca165020ccce9f7e840fb139ba9faffb4b1 chuck-1.2.0.5.ebuild 1818
+SHA256 3661ccda80c2fc3a063000c46da97ef0139c29dc5d5f422598993ffad384ff60 chuck-1.2.0.5.ebuild 1818
 MISC ChangeLog 233 RMD160 10f735c420b85d0c20d829f0abe16c734e08318a SHA1 3ae788eb5c43f376105fce968bd3b7320c41c5be SHA256 86f379a203b033cb3531eac4149b69b7699740fd5c69821a445db8f2b91666dd
 MD5 72e19bbae69ec838926286515590dd84 ChangeLog 233
 RMD160 10f735c420b85d0c20d829f0abe16c734e08318a ChangeLog 233
diff --git a/media-sound/chuck/chuck-1.2.0.5.ebuild b/media-sound/chuck/chuck-1.2.0.5.ebuild
index 19fd31fdb..cc5dddbb6 100644
--- a/media-sound/chuck/chuck-1.2.0.5.ebuild
+++ b/media-sound/chuck/chuck-1.2.0.5.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit toolchain-funcs base
+
 DESCRIPTION="ChuCK - On-the-fly Audio Programming"
 HOMEPAGE="http://chuck.cs.princeton.edu/release/"
 SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
@@ -11,35 +13,54 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="oss jack alsa"
 
-
 DEPEND="jack? ( media-sound/jack-audio-connection-kit )
 	alsa? ( >=media-libs/alsa-lib-0.9 )
-	media-libs/libsndfile"
+	media-libs/libsndfile
+	sys-devel/bison
+	sys-devel/flex"
+
+PATCHES="${FILESDIR}/chuck-1.2.0.5-makefile.patch"
+
+pkg_setup() {
+	local cnt=0
+	use jack && cnt="$((${cnt} + 1))"
+	use alsa && cnt="$((${cnt} + 1))"
+	use oss && cnt="$((${cnt} + 1))"
+	if [[ "${cnt}" -ne 1 ]] ; then
+		eerror "You have set ${P} to use multiple audio engine."
+		eerror "I don't know which to use!"
+		eerror "You can use /etc/portage/package.use to set per-package USE flags"
+		eerror "Set it so only one audio engine type jack, alsa, oss"
+		die "Please set only one audio engine type"
+	fi
+}
 
 src_compile() {
 	cd "${S}/src"
 
 	local backend
+	local flags
 	if use jack ; then
 		backend="jack"
+		flags="JACK"
 	elif use alsa ; then
 		backend="alsa"
+		flags="ALSA"
 	elif use oss ; then
 		backend="oss"
+		flags="OSS"
 	else
 		einfo "One of the following USE flags is needed: jack, alsa or oss"
 		die "One of the following USE flags is needed: jack, alsa or oss"
 	fi
 	einfo "Compiling against ${backend}"
-	emake "linux-${backend}" || die "emake failed"
+	CXX="$(tc-getCC)" FLAGS="-D__LINUX_${flags}__ -c ${CFLAGS}" emake -j1 "linux-${backend}" || die "emake failed"
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe src/chuck
+	dobin src/chuck
 
-	dodoc AUTHORS COPYING DEVELOPER INSTALL PROGRAMMER QUICKSTART README \
-		THANKS TODO VERSIONS
+	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
 	docinto examples
 	dodoc `find examples -type f`
 	for dir in `find examples/* -type d`; do
diff --git a/media-sound/chuck/files/chuck-1.2.0.5-makefile.patch b/media-sound/chuck/files/chuck-1.2.0.5-makefile.patch
new file mode 100644
index 000000000..a869fd578
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.2.0.5-makefile.patch
@@ -0,0 +1,45 @@
+diff -ur chuck-1.2.0.5~/src/makefile.alsa chuck-1.2.0.5/src/makefile.alsa
+--- chuck-1.2.0.5~/src/makefile.alsa	2006-06-24 01:38:24.000000000 +0200
++++ chuck-1.2.0.5/src/makefile.alsa	2006-06-24 01:39:06.000000000 +0200
+@@ -1,9 +1,9 @@
+ 
+-CXX=gcc
++#CXX=gcc
+ LEX=flex
+ YACC=bison
+ INCLUDES=
+-FLAGS=-D__LINUX_ALSA__ -O3 -c
++#FLAGS=-D__LINUX_ALSA__ -O3 -c
+ LIBS=-lasound -lstdc++ -ldl -lm
+ SF_OBJ=util_sndfile.o
+ 
+diff -ur chuck-1.2.0.5~/src/makefile.jack chuck-1.2.0.5/src/makefile.jack
+--- chuck-1.2.0.5~/src/makefile.jack	2006-06-24 01:38:24.000000000 +0200
++++ chuck-1.2.0.5/src/makefile.jack	2006-06-24 01:39:19.000000000 +0200
+@@ -1,9 +1,9 @@
+ 
+-CXX=gcc
++#CXX=gcc
+ LEX=flex
+ YACC=bison
+ INCLUDES=
+-FLAGS=-D__LINUX_JACK__ -O3 -c
++#FLAGS=-D__LINUX_JACK__ -O3 -c
+ LIBS=-lasound -ljack -lstdc++ -ldl -lm
+ SF_OBJ=util_sndfile.o
+ 
+diff -ur chuck-1.2.0.5~/src/makefile.oss chuck-1.2.0.5/src/makefile.oss
+--- chuck-1.2.0.5~/src/makefile.oss	2006-06-24 01:38:24.000000000 +0200
++++ chuck-1.2.0.5/src/makefile.oss	2006-06-24 01:39:29.000000000 +0200
+@@ -1,9 +1,9 @@
+ 
+-CXX=gcc
++#CXX=gcc
+ LEX=flex
+ YACC=bison
+ INCLUDES=
+-FLAGS=-D__LINUX_OSS__ -O3 -c
++#FLAGS=-D__LINUX_OSS__ -O3 -c
+ LIBS=-lpthread -lstdc++ -ldl -lm
+ SF_OBJ=util_sndfile.o
+