media-sound/chuck: use correct CC and CXX, clean old version

svn path=/sunrise/; revision=721

6 files changed, 14 insertions, 316 deletions

diff --git a/media-sound/chuck/ChangeLog b/media-sound/chuck/ChangeLog
index db67e9d24..4cf518ddd 100644
--- a/media-sound/chuck/ChangeLog
+++ b/media-sound/chuck/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Jul 2006; Cedric Krier <ced@ced.homedns.org> -chuck-1.2.0.5.ebuild,
+  -files/chuck-1.2.0.5-makefile.patch, chuck-1.2.0.6.ebuild:
+  use correct CC and CXX, clean old version
+
   20 Jul 2006; Cedric Krier <ced@ced.homedns.org> +chuck-1.2.0.6.ebuild,
   +files/chuck-1.2.0.6-makefile.patch:
   Version bump
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 111226420..d158b49a9 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,32 +1,20 @@
-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
 AUX chuck-1.2.0.6-makefile.patch 5615 RMD160 5e91631fe43eb48ec5f16dd96e79bff142652fc4 SHA1 2edec943b2dff67ab82ed122675e1709fd089bb6 SHA256 20ab571c47df99c2c0fd965e4183575a69b54844b90dbaaf72c196091c730801
 MD5 bd8480cdb788ea972f95da7c42216a06 files/chuck-1.2.0.6-makefile.patch 5615
 RMD160 5e91631fe43eb48ec5f16dd96e79bff142652fc4 files/chuck-1.2.0.6-makefile.patch 5615
 SHA256 20ab571c47df99c2c0fd965e4183575a69b54844b90dbaaf72c196091c730801 files/chuck-1.2.0.6-makefile.patch 5615
-DIST chuck-1.2.0.5.tgz 1477758 RMD160 648c208ca5ecaf9ada390670fb45518489913aeb SHA1 12ddf3f6b2eda4b6d0732268637b15f8a07b5297 SHA256 0b3a845d887de309488414fbec24020930c495f2f02446dcc1bd6a6509c3a160
 DIST chuck-1.2.0.6.tgz 1536500 RMD160 de33885c09ce97ead752ca730f42fd7b1ada1325 SHA1 2afc41702341811dfd2ec635d3878287a0642ce5 SHA256 ca15cfc28e3dd861aeda31267e6547c422c39d108f38d9fc51d6c71ca6048386
-EBUILD chuck-1.2.0.5.ebuild 1750 RMD160 320bb19d2c1c94c48d3c18f64f371a4920fcb271 SHA1 490a513e55eae57fea0e4387334979430f9e4635 SHA256 f974ec95bb36060b1ef347fe7ba38109abb99d7bf2dc4c559ddf743940b37ec2
-MD5 fa38ee5680f836174890c33cc6372d92 chuck-1.2.0.5.ebuild 1750
-RMD160 320bb19d2c1c94c48d3c18f64f371a4920fcb271 chuck-1.2.0.5.ebuild 1750
-SHA256 f974ec95bb36060b1ef347fe7ba38109abb99d7bf2dc4c559ddf743940b37ec2 chuck-1.2.0.5.ebuild 1750
-EBUILD chuck-1.2.0.6.ebuild 1750 RMD160 320bb19d2c1c94c48d3c18f64f371a4920fcb271 SHA1 490a513e55eae57fea0e4387334979430f9e4635 SHA256 f974ec95bb36060b1ef347fe7ba38109abb99d7bf2dc4c559ddf743940b37ec2
-MD5 fa38ee5680f836174890c33cc6372d92 chuck-1.2.0.6.ebuild 1750
-RMD160 320bb19d2c1c94c48d3c18f64f371a4920fcb271 chuck-1.2.0.6.ebuild 1750
-SHA256 f974ec95bb36060b1ef347fe7ba38109abb99d7bf2dc4c559ddf743940b37ec2 chuck-1.2.0.6.ebuild 1750
-MISC ChangeLog 361 RMD160 bbe5f88418a966bf2edec5795e270918e565ce84 SHA1 b26fc8c1198e07e19d15f2845329cd448bab4bbc SHA256 036df22ef0ce1f8fcbba6088b3971b0fed7130388d42201a277631ed11226974
-MD5 8124e154e587512d87ed8c11c6be1e50 ChangeLog 361
-RMD160 bbe5f88418a966bf2edec5795e270918e565ce84 ChangeLog 361
-SHA256 036df22ef0ce1f8fcbba6088b3971b0fed7130388d42201a277631ed11226974 ChangeLog 361
+EBUILD chuck-1.2.0.6.ebuild 1798 RMD160 e9806a06da16d3e2e90a7afde1f061a7e71883c6 SHA1 5fc2e7f1a3c002b6ce135861fdebc44bb54ceb01 SHA256 b96ca68420ac5326e8cff5af65de1cdae523b69181eab12a3962abb04bfd7b3c
+MD5 8df6c38d9eb86ef278e59506c6c2b99e chuck-1.2.0.6.ebuild 1798
+RMD160 e9806a06da16d3e2e90a7afde1f061a7e71883c6 chuck-1.2.0.6.ebuild 1798
+SHA256 b96ca68420ac5326e8cff5af65de1cdae523b69181eab12a3962abb04bfd7b3c chuck-1.2.0.6.ebuild 1798
+MISC ChangeLog 540 RMD160 e770eaa05b76ea2a9a0b3637b1a35b0624d49535 SHA1 92991fdb097b5ecdd44ec230803a0ac0584f279c SHA256 7fb026f05a485a3ad589fd5a11d54d18d0384f26552c2f39d978493d6be2dcb3
+MD5 d5b2e2f981878e4d281fbf7c604e7f83 ChangeLog 540
+RMD160 e770eaa05b76ea2a9a0b3637b1a35b0624d49535 ChangeLog 540
+SHA256 7fb026f05a485a3ad589fd5a11d54d18d0384f26552c2f39d978493d6be2dcb3 ChangeLog 540
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 f749899faf180862fe74f4869b3de50b files/digest-chuck-1.2.0.5 235
-RMD160 8384bebdc9d9a8a0dfaa52506cd2a2144c3289ff files/digest-chuck-1.2.0.5 235
-SHA256 3f576bbaf8aacf98364b9b85aad6263f4a7d11a87258ac5dd35440195f497e59 files/digest-chuck-1.2.0.5 235
 MD5 366f4fc642d017bbfe96b28140bb153d files/digest-chuck-1.2.0.6 235
 RMD160 8962f991ec0aed7c62ebd05d923ef66867b8a66f files/digest-chuck-1.2.0.6 235
 SHA256 2187c3956cf5c5247b95c97cec1e6e070ef8715b4a09ea76560512e8717b089f files/digest-chuck-1.2.0.6 235
diff --git a/media-sound/chuck/chuck-1.2.0.5.ebuild b/media-sound/chuck/chuck-1.2.0.5.ebuild
deleted file mode 100644
index 33307a5a1..000000000
--- a/media-sound/chuck/chuck-1.2.0.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="oss jack alsa doc"
-
-DEPEND="jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	media-libs/libsndfile
-	sys-devel/bison
-	sys-devel/flex"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-pkg_setup() {
-	local cnt=0
-	use jack && cnt="$((${cnt} + 1))"
-	use alsa && cnt="$((${cnt} + 1))"
-	use oss && cnt="$((${cnt} + 1))"
-	if [[ "${cnt}" -eq 0 ]] ; then
-		local msg="One of the following USE flags is needed: jack, alsa or oss"
-		eerror "${msg}"
-		die "${msg}"
-	elif [[ "${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
-	if use jack ; then
-		backend="jack"
-	elif use alsa ; then
-		backend="alsa"
-	elif use oss ; then
-		backend="oss"
-	fi
-	einfo "Compiling against ${backend}"
-	emake -j1 "linux-${backend}" || die "emake failed"
-}
-
-src_install() {
-	dobin src/chuck
-
-	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
-	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/chuck-1.2.0.6.ebuild b/media-sound/chuck/chuck-1.2.0.6.ebuild
index 33307a5a1..bbea53b49 100644
--- a/media-sound/chuck/chuck-1.2.0.6.ebuild
+++ b/media-sound/chuck/chuck-1.2.0.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="ChuCK - On-the-fly Audio Programming"
 HOMEPAGE="http://chuck.cs.princeton.edu/release/"
@@ -55,7 +55,7 @@ src_compile() {
 		backend="oss"
 	fi
 	einfo "Compiling against ${backend}"
-	emake -j1 "linux-${backend}" || die "emake failed"
+	emake -j1 "linux-${backend}" CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
 }
 
 src_install() {
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
deleted file mode 100644
index 0802be0e3..000000000
--- a/media-sound/chuck/files/chuck-1.2.0.5-makefile.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-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 13:31:55.000000000 +0200
-@@ -1,9 +1,11 @@
- 
--CXX=gcc
-+CC?=gcc
-+CXX?=g++
- LEX=flex
- YACC=bison
- INCLUDES=
--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 13:32:22.000000000 +0200
-@@ -1,9 +1,11 @@
- 
--CXX=gcc
-+CC?=gcc
-+CXX?=g++
- LEX=flex
- YACC=bison
- INCLUDES=
--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 13:32:50.000000000 +0200
-@@ -1,9 +1,11 @@
- 
--CXX=gcc
-+CC?=gcc
-+CXX?=g++
- LEX=flex
- YACC=bison
- INCLUDES=
--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
diff --git a/media-sound/chuck/files/digest-chuck-1.2.0.5 b/media-sound/chuck/files/digest-chuck-1.2.0.5
deleted file mode 100644
index 4e3e22140..000000000
--- a/media-sound/chuck/files/digest-chuck-1.2.0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 acbfb60901b22e1721348e7f07b70987 chuck-1.2.0.5.tgz 1477758
-RMD160 648c208ca5ecaf9ada390670fb45518489913aeb chuck-1.2.0.5.tgz 1477758
-SHA256 0b3a845d887de309488414fbec24020930c495f2f02446dcc1bd6a6509c3a160 chuck-1.2.0.5.tgz 1477758