media-sound/sndpeek: Drop old

svn path=/sunrise/; revision=4441

4 files changed, 5 insertions, 357 deletions

diff --git a/media-sound/sndpeek/ChangeLog b/media-sound/sndpeek/ChangeLog
index 773ebb645..bf7e36330 100644
--- a/media-sound/sndpeek/ChangeLog
+++ b/media-sound/sndpeek/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Aug 2007; Markus Ullmann <jokey@gentoo.org>
+  -sndpeek-1.1-makefile.patch:
+  Drop old
+
   10 Sep 2006; Jakub Moc <jakub@gentoo.org> sndpeek-1.1.ebuild:
   Monolithic X is not supported any more
 
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
index 343296a87..03f7b42e4 100644
--- a/media-sound/sndpeek/Manifest
+++ b/media-sound/sndpeek/Manifest
@@ -1,8 +1,5 @@
-AUX sndpeek-1.1-makefile.patch 7483 RMD160 cd6d9542334e4730e8cafc6c46ca2dc819595123 SHA1 308626810732e5015553c0d5f4eb159ba48e7406 SHA256 4e4fc3d4f795867512a6fdd208c1b91e76354e97c2249417b0bf70ed29a76be7
 AUX sndpeek-1.3-makefile.patch 7578 RMD160 1559c7b9e2aeb24d929379ea5b0aa5d69c5608d5 SHA1 851b0ddeaedfaf04f480ec44a8c5046a50472b42 SHA256 80fefd8c3a1e1fadf1a5342389e553e18b53d0623f15b115a281d2304d9ed797
-DIST sndpeek-1.1.tgz 109859 RMD160 912e9c9523020ea4eff6250a064c7a71d7f216b5 SHA1 f70f32475160828de4b59784e6d8fb62122f9d6d SHA256 eef56be9fd0e20bb431b41832ee5fbd18aff19f35889af3c5143868e6953b9d5
 DIST sndpeek-1.3.tgz 298983 RMD160 cec1696a6b5e26551748fc7e6230baa2bd77edc2 SHA1 16291c1cc595068150d4c2a9075982d9bed5416e SHA256 36291830b345338777dd304bacb81b97885d31b33e9e6dba19340f25ac169d08
-EBUILD sndpeek-1.1.ebuild 1444 RMD160 2d8b45915a017f6c18dfc32ba2359095dd1efcb0 SHA1 1f1181af234cd3982797eb6350ffd8d6fb85fdf8 SHA256 e4a208421fa8f555d7e667f41442a4842cd7f4f66fae3dbfc2021d4aee44c6d7
 EBUILD sndpeek-1.3.ebuild 1441 RMD160 9fc653807f2a76c3718edf91b69a981af5be8cc2 SHA1 2073294fe8515e15fab1bd6c2d0c27fc2c7fbf93 SHA256 85bbb2ccf8b6563a31bf7b55f8019d453c447f43848c18aff54b5b62874b8d79
-MISC ChangeLog 576 RMD160 0f15a448960d9688703095fb36638294a79aa659 SHA1 dd918b731ee7c15ed750dad6e2e49331999e9bf6 SHA256 c0469479747c4c5a00b96c936eaeda392722a61a56960e0fbb15503cef9aa25d
+MISC ChangeLog 668 RMD160 c36e5065d5213a6f4e1c0acc0a8c5d4d33d10b2a SHA1 7af20183c4c99f4a7064eff33335948b3528b79a SHA256 59e8dae3692fa9457b4b9d18d673d479376b8060f3f64e1c0b31a2c56b2e66e2
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-sound/sndpeek/files/sndpeek-1.1-makefile.patch b/media-sound/sndpeek/files/sndpeek-1.1-makefile.patch
deleted file mode 100644
index cac9cf85a..000000000
--- a/media-sound/sndpeek/files/sndpeek-1.1-makefile.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-diff -ru sndpeek-1.1~/src/sndpeek/makefile.alsa sndpeek-1.1/src/sndpeek/makefile.alsa
---- sndpeek-1.1~/src/sndpeek/makefile.alsa	2006-07-29 12:50:41.000000000 +0200
-+++ sndpeek-1.1/src/sndpeek/makefile.alsa	2006-07-29 12:57:13.000000000 +0200
-@@ -4,63 +4,63 @@
- 	Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o System.o fvec.o \
- 	AutoCorrelation.o Communicator.o Hamming.o MagFFT.o NormRMS.o MarSignal.o fmatrix.o
- 
--CC=gcc
--CPP=g++
-+CC?=gcc
-+CXX?=g++
- INCLUDES=-I../marsyas/
- MARSYAS_DIR=../marsyas/
--CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
--LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm
-+CFLAGS+=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
-+LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm
- 
- sndpeek: $(OBJS)
--	$(CPP) -o $@ $(OBJS) $(LIBS)
-+	$(CXX) -o $@ $(OBJS) $(LIBS)
- 
- Centroid.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- DownSampler.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Flux.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- LPC.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- MFCC.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- RMS.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Rolloff.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- System.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- fvec.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- AutoCorrelation.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Communicator.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Hamming.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- MagFFT.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- NormRMS.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- MarSignal.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- fmatrix.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- .o: $*.h
- 
-@@ -68,7 +68,7 @@
- 	$(CC) $(CFLAGS) $*.c
- 
- .cpp.o: $*.h $*.cpp
--	$(CC) $(CFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $*.cpp
- 
- clean: 
- 	rm -f sndpeek *~ *.o
-diff -ru sndpeek-1.1~/src/sndpeek/makefile.jack sndpeek-1.1/src/sndpeek/makefile.jack
---- sndpeek-1.1~/src/sndpeek/makefile.jack	2006-07-29 12:50:41.000000000 +0200
-+++ sndpeek-1.1/src/sndpeek/makefile.jack	2006-07-29 12:56:20.000000000 +0200
-@@ -4,63 +4,63 @@
- 	Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o System.o fvec.o \
- 	AutoCorrelation.o Communicator.o Hamming.o MagFFT.o NormRMS.o MarSignal.o fmatrix.o
- 
--CC=gcc
--CPP=g++
-+CC?=gcc
-+CXX?=g++
- INCLUDES=-I../marsyas/
- MARSYAS_DIR=../marsyas/
--CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
-+CFLAGS+=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
- LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm
- 
- sndpeek: $(OBJS)
--	$(CPP) -o $@ $(OBJS) $(LIBS)
-+	$(CXX) -o $@ $(OBJS) $(LIBS)
- 
- Centroid.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- DownSampler.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Flux.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- LPC.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- MFCC.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- RMS.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Rolloff.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- System.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- fvec.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- AutoCorrelation.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Communicator.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Hamming.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- MagFFT.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- NormRMS.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- MarSignal.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- fmatrix.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- .o: $*.h
- 
-@@ -68,7 +68,7 @@
- 	$(CC) $(CFLAGS) $*.c
- 
- .cpp.o: $*.h $*.cpp
--	$(CC) $(CFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $*.cpp
- 
- clean: 
- 	rm -f sndpeek *~ *.o
-diff -ru sndpeek-1.1~/src/sndpeek/makefile.oss sndpeek-1.1/src/sndpeek/makefile.oss
---- sndpeek-1.1~/src/sndpeek/makefile.oss	2006-07-29 12:50:41.000000000 +0200
-+++ sndpeek-1.1/src/sndpeek/makefile.oss	2006-07-29 12:58:02.000000000 +0200
-@@ -4,63 +4,63 @@
- 	Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o System.o fvec.o \
- 	AutoCorrelation.o Communicator.o Hamming.o MagFFT.o NormRMS.o MarSignal.o fmatrix.o
- 
--CC=gcc
--CPP=g++
-+CC?=gcc
-+CXX?=g++
- INCLUDES=-I../marsyas/
- MARSYAS_DIR=../marsyas/
--CFLAGS=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
-+CFLAGS+=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
- LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lXmu -lX11 -lXext -lXi -lm
- 
- sndpeek: $(OBJS)
--	$(CPP) -o $@ $(OBJS) $(LIBS)
-+	$(CXX) -o $@ $(OBJS) $(LIBS)
- 
- Centroid.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- DownSampler.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Flux.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- LPC.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- MFCC.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- RMS.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Rolloff.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- System.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- fvec.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- AutoCorrelation.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Communicator.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- Hamming.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- MagFFT.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- NormRMS.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- MarSignal.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- fmatrix.o:
--	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
-+	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
- 
- .o: $*.h
- 
-@@ -68,7 +68,7 @@
- 	$(CC) $(CFLAGS) $*.c
- 
- .cpp.o: $*.h $*.cpp
--	$(CC) $(CFLAGS) $*.cpp
-+	$(CXX) $(CFLAGS) $*.cpp
- 
- clean: 
- 	rm -f sndpeek *~ *.o
diff --git a/media-sound/sndpeek/sndpeek-1.1.ebuild b/media-sound/sndpeek/sndpeek-1.1.ebuild
deleted file mode 100644
index ec51a0664..000000000
--- a/media-sound/sndpeek/sndpeek-1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="real-time audio visualization"
-HOMEPAGE="http://soundlab.cs.princeton.edu/software/sndpeek/"
-SRC_URI="http://soundlab.cs.princeton.edu/software/${PN}/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="oss jack alsa"
-
-DEPEND="media-libs/glut
-	virtual/opengl
-	virtual/glu
-	x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXext
-	jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( media-libs/alsa-lib )"
-RDEPEND="${DEPEND}"
-
-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
-		eerror "One of the following USE flags is needed: jack, alsa or oss"
-		die "Please set one audio engine type"
-	elif [[ "${cnt}" -ne 1 ]]; then
-		ewarn "You have set ${P} to use multiple audio engine."
-	fi
-}
-
-src_compile() {
-	cd "${S}/src/sndpeek"
-
-	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 -f "makefile.${backend}" CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
-}
-
-src_install() {
-	dobin src/sndpeek/sndpeek
-
-	dodoc AUTHORS README THANKS TODO VERSIONS
-}