media-sound/chuck - fix makefiles and add USE-flag doc

svn path=/sunrise/; revision=231

3 files changed, 203 insertions, 34 deletions

diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 671ba488a..cdce4df97 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,12 +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
+AUX chuck-1.2.0.5-makefile.patch 5615 RMD160 5e91631fe43eb48ec5f16dd96e79bff142652fc4 SHA1 2edec943b2dff67ab82ed122675e1709fd089bb6 SHA256 20ab571c47df99c2c0fd965e4183575a69b54844b90dbaaf72c196091c730801
+MD5 bd8480cdb788ea972f95da7c42216a06 files/chuck-1.2.0.5-makefile.patch 5615
+RMD160 5e91631fe43eb48ec5f16dd96e79bff142652fc4 files/chuck-1.2.0.5-makefile.patch 5615
+SHA256 20ab571c47df99c2c0fd965e4183575a69b54844b90dbaaf72c196091c730801 files/chuck-1.2.0.5-makefile.patch 5615
 DIST chuck-1.2.0.5.tgz 1477758 RMD160 648c208ca5ecaf9ada390670fb45518489913aeb SHA1 12ddf3f6b2eda4b6d0732268637b15f8a07b5297 SHA256 0b3a845d887de309488414fbec24020930c495f2f02446dcc1bd6a6509c3a160
-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
+EBUILD chuck-1.2.0.5.ebuild 1735 RMD160 d91b6eb1ef1fc853b7a64a165655020ed8cca8bb SHA1 4b8b0bbac16241b2a903b0327f1fd80e8ca8ed9a SHA256 0bc54d84904dcd470a6a00c705557e16702a9b2b8fecb34cb452ef577107361a
+MD5 96eacb9e0752487e223e29f08f9b7bf1 chuck-1.2.0.5.ebuild 1735
+RMD160 d91b6eb1ef1fc853b7a64a165655020ed8cca8bb chuck-1.2.0.5.ebuild 1735
+SHA256 0bc54d84904dcd470a6a00c705557e16702a9b2b8fecb34cb452ef577107361a chuck-1.2.0.5.ebuild 1735
 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 cc5dddbb6..2a4e1a544 100644
--- a/media-sound/chuck/chuck-1.2.0.5.ebuild
+++ b/media-sound/chuck/chuck-1.2.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="oss jack alsa"
+IUSE="oss jack alsa doc"
 
 DEPEND="jack? ( media-sound/jack-audio-connection-kit )
 	alsa? ( >=media-libs/alsa-lib-0.9 )
@@ -39,34 +39,32 @@ 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}"
-	CXX="$(tc-getCC)" FLAGS="-D__LINUX_${flags}__ -c ${CFLAGS}" emake -j1 "linux-${backend}" || die "emake failed"
+	emake -j1 "linux-${backend}" || die "emake failed"
 }
 
 src_install() {
 	dobin src/chuck
 
 	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
-	docinto examples
-	dodoc `find examples -type f`
-	for dir in `find examples/* -type d`; do
-		docinto $dir
-		dodoc $dir/*
-	done
-	docinto doc
-	dodoc doc/*
+	if use doc; then
+		docinto examples
+		dodoc `find examples -type f`
+		for dir in `find examples/* -type d`; do
+			docinto $dir
+			dodoc $dir/*
+		done
+		docinto doc
+		dodoc doc/*
+	fi
 }
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
index a869fd578..0802be0e3 100644
--- a/media-sound/chuck/files/chuck-1.2.0.5-makefile.patch
+++ b/media-sound/chuck/files/chuck-1.2.0.5-makefile.patch
@@ -1,45 +1,216 @@
 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 @@
++++ chuck-1.2.0.5/src/makefile.alsa	2006-06-24 13:31:55.000000000 +0200
+@@ -1,9 +1,11 @@
  
 -CXX=gcc
-+#CXX=gcc
++CC?=gcc
++CXX?=g++
  LEX=flex
  YACC=bison
  INCLUDES=
 -FLAGS=-D__LINUX_ALSA__ -O3 -c
-+#FLAGS=-D__LINUX_ALSA__ -O3 -c
++CFLAGS?= -O3
++FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)
  LIBS=-lasound -lstdc++ -ldl -lm
  SF_OBJ=util_sndfile.o
  
+@@ -46,7 +48,7 @@
+ 	$(CXX) -o chuck $(OBJS) $(LIBS)
+ 
+ chuck.tab.o: chuck.tab.c
+-	$(CXX) $(FLAGS) chuck.tab.c
++	$(CC) $(FLAGS) chuck.tab.c
+ 
+ chuck.tab.c: chuck.y
+ 	$(YACC) -dv -b chuck chuck.y
+@@ -55,7 +57,7 @@
+ 	echo "chuck.tab.h was created at the same time as chuck.tab.c"
+ 
+ chuck.yy.o: chuck.yy.c chuck.tab.h chuck_errmsg.h chuck_utils.h
+-	$(CXX) $(FLAGS) chuck.yy.c
++	$(CC) $(FLAGS) chuck.yy.c
+ 
+ chuck.yy.c: chuck.lex
+ 	$(LEX) -ochuck.yy.c chuck.lex
+@@ -181,19 +183,19 @@
+ 	$(CXX) $(FLAGS) util_console.cpp
+ 
+ util_hid.o: util_hid.h util_hid.c
+-	$(CXX) $(FLAGS) util_hid.c
++	$(CC) $(FLAGS) util_hid.c
+ 
+ util_math.o: util_math.h util_math.c
+-	$(CXX) $(FLAGS) util_math.c
++	$(CC) $(FLAGS) util_math.c
+ 
+ util_network.o: util_network.h util_network.c
+-	$(CXX) $(FLAGS) util_network.c
++	$(CC) $(FLAGS) util_network.c
+ 
+ util_opsc.o: util_opsc.h util_opsc.cpp
+ 	$(CXX) $(FLAGS) util_opsc.cpp
+ 
+ util_raw.o: util_raw.h util_raw.c
+-	$(CXX) $(FLAGS) util_raw.c
++	$(CC) $(FLAGS) util_raw.c
+ 
+ util_string.o: util_string.h util_string.cpp
+ 	$(CXX) $(FLAGS) util_string.cpp
+@@ -202,10 +204,10 @@
+ 	$(CXX) $(FLAGS) util_thread.cpp
+ 
+ util_xforms.o: util_xforms.h util_xforms.c
+-	$(CXX) $(FLAGS) util_xforms.c
++	$(CC) $(FLAGS) util_xforms.c
+ 
+ util_sndfile.o: util_sndfile.h util_sndfile.c
+-	$(CXX) $(FLAGS) util_sndfile.c
++	$(CC) $(FLAGS) util_sndfile.c
+ 
+ clean: 
+ 	rm -f chuck *~ *.o chuck.output chuck.tab.h chuck.tab.c chuck.yy.c
 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 @@
++++ chuck-1.2.0.5/src/makefile.jack	2006-06-24 13:32:22.000000000 +0200
+@@ -1,9 +1,11 @@
  
 -CXX=gcc
-+#CXX=gcc
++CC?=gcc
++CXX?=g++
  LEX=flex
  YACC=bison
  INCLUDES=
 -FLAGS=-D__LINUX_JACK__ -O3 -c
-+#FLAGS=-D__LINUX_JACK__ -O3 -c
++CFLAGS?= -O3
++FLAGS= -D__LINUX_JACK__ -c $(CFLAGS)
  LIBS=-lasound -ljack -lstdc++ -ldl -lm
  SF_OBJ=util_sndfile.o
  
+@@ -46,7 +48,7 @@
+ 	$(CXX) -o chuck $(OBJS) $(LIBS)
+ 
+ chuck.tab.o: chuck.tab.c
+-	$(CXX) $(FLAGS) chuck.tab.c
++	$(CC) $(FLAGS) chuck.tab.c
+ 
+ chuck.tab.c: chuck.y
+ 	$(YACC) -dv -b chuck chuck.y
+@@ -55,7 +57,7 @@
+ 	echo "chuck.tab.h was created at the same time as chuck.tab.c"
+ 
+ chuck.yy.o: chuck.yy.c chuck.tab.h chuck_errmsg.h chuck_utils.h
+-	$(CXX) $(FLAGS) chuck.yy.c
++	$(CC) $(FLAGS) chuck.yy.c
+ 
+ chuck.yy.c: chuck.lex
+ 	$(LEX) -ochuck.yy.c chuck.lex
+@@ -181,19 +183,19 @@
+ 	$(CXX) $(FLAGS) util_console.cpp
+ 
+ util_hid.o: util_hid.h util_hid.c
+-	$(CXX) $(FLAGS) util_hid.c
++	$(CC) $(FLAGS) util_hid.c
+ 
+ util_math.o: util_math.h util_math.c
+-	$(CXX) $(FLAGS) util_math.c
++	$(CC) $(FLAGS) util_math.c
+ 
+ util_network.o: util_network.h util_network.c
+-	$(CXX) $(FLAGS) util_network.c
++	$(CC) $(FLAGS) util_network.c
+ 
+ util_opsc.o: util_opsc.h util_opsc.cpp
+ 	$(CXX) $(FLAGS) util_opsc.cpp
+ 
+ util_raw.o: util_raw.h util_raw.c
+-	$(CXX) $(FLAGS) util_raw.c
++	$(CC) $(FLAGS) util_raw.c
+ 
+ util_string.o: util_string.h util_string.cpp
+ 	$(CXX) $(FLAGS) util_string.cpp
+@@ -202,10 +204,10 @@
+ 	$(CXX) $(FLAGS) util_thread.cpp
+ 
+ util_xforms.o: util_xforms.h util_xforms.c
+-	$(CXX) $(FLAGS) util_xforms.c
++	$(CC) $(FLAGS) util_xforms.c
+ 
+ util_sndfile.o: util_sndfile.h util_sndfile.c
+-	$(CXX) $(FLAGS) util_sndfile.c
++	$(CC) $(FLAGS) util_sndfile.c
+ 
+ clean: 
+ 	rm -f chuck *~ *.o chuck.output chuck.tab.h chuck.tab.c chuck.yy.c
 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 @@
++++ chuck-1.2.0.5/src/makefile.oss	2006-06-24 13:32:50.000000000 +0200
+@@ -1,9 +1,11 @@
  
 -CXX=gcc
-+#CXX=gcc
++CC?=gcc
++CXX?=g++
  LEX=flex
  YACC=bison
  INCLUDES=
 -FLAGS=-D__LINUX_OSS__ -O3 -c
-+#FLAGS=-D__LINUX_OSS__ -O3 -c
++CFLAGS?= -O3
++FLAGS= -D__LINUX_OSS__ -c $(CFLAGS)
  LIBS=-lpthread -lstdc++ -ldl -lm
  SF_OBJ=util_sndfile.o
  
+@@ -46,7 +48,7 @@
+ 	$(CXX) -o chuck $(OBJS) $(LIBS)
+ 
+ chuck.tab.o: chuck.tab.c
+-	$(CXX) $(FLAGS) chuck.tab.c
++	$(CC) $(FLAGS) chuck.tab.c
+ 
+ chuck.tab.c: chuck.y
+ 	$(YACC) -dv -b chuck chuck.y
+@@ -55,7 +57,7 @@
+ 	echo "chuck.tab.h was created at the same time as chuck.tab.c"
+ 
+ chuck.yy.o: chuck.yy.c chuck.tab.h chuck_errmsg.h chuck_utils.h
+-	$(CXX) $(FLAGS) chuck.yy.c
++	$(CC) $(FLAGS) chuck.yy.c
+ 
+ chuck.yy.c: chuck.lex
+ 	$(LEX) -ochuck.yy.c chuck.lex
+@@ -181,19 +183,19 @@
+ 	$(CXX) $(FLAGS) util_console.cpp
+ 
+ util_hid.o: util_hid.h util_hid.c
+-	$(CXX) $(FLAGS) util_hid.c
++	$(CC) $(FLAGS) util_hid.c
+ 
+ util_math.o: util_math.h util_math.c
+-	$(CXX) $(FLAGS) util_math.c
++	$(CC) $(FLAGS) util_math.c
+ 
+ util_network.o: util_network.h util_network.c
+-	$(CXX) $(FLAGS) util_network.c
++	$(CC) $(FLAGS) util_network.c
+ 
+ util_opsc.o: util_opsc.h util_opsc.cpp
+ 	$(CXX) $(FLAGS) util_opsc.cpp
+ 
+ util_raw.o: util_raw.h util_raw.c
+-	$(CXX) $(FLAGS) util_raw.c
++	$(CC) $(FLAGS) util_raw.c
+ 
+ util_string.o: util_string.h util_string.cpp
+ 	$(CXX) $(FLAGS) util_string.cpp
+@@ -202,10 +204,10 @@
+ 	$(CXX) $(FLAGS) util_thread.cpp
+ 
+ util_xforms.o: util_xforms.h util_xforms.c
+-	$(CXX) $(FLAGS) util_xforms.c
++	$(CC) $(FLAGS) util_xforms.c
+ 
+ util_sndfile.o: util_sndfile.h util_sndfile.c
+-	$(CXX) $(FLAGS) util_sndfile.c
++	$(CC) $(FLAGS) util_sndfile.c
+ 
+ clean: 
+ 	rm -f chuck *~ *.o chuck.output chuck.tab.h chuck.tab.c chuck.yy.c