7 files changed, 28 insertions, 50 deletions
diff --git a/media-sound/wavesurfer/ChangeLog b/media-sound/wavesurfer/ChangeLog
index 6404a6e7f987..c5be78ad8fde 100644
--- a/media-sound/wavesurfer/ChangeLog
+++ b/media-sound/wavesurfer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/wavesurfer
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/ChangeLog,v 1.8 2004/06/25 00:29:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/ChangeLog,v 1.9 2004/07/01 22:34:00 matsuu Exp $
+
+*wavesurfer-1.7 (02 Jul 2004)
+
+  02 Jul 2004; <matsuu@gentoo.org> +wavesurfer-1.7.ebuild:
+  Version bumped.
 
   16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
   wavesurfer-1.6.3.ebuild:
diff --git a/media-sound/wavesurfer/Manifest b/media-sound/wavesurfer/Manifest
index 87ae3381bfe7..092c3f70f80a 100644
--- a/media-sound/wavesurfer/Manifest
+++ b/media-sound/wavesurfer/Manifest
@@ -1,9 +1,11 @@
+MD5 7b42c2627f117f939b479850272d8e9e wavesurfer-1.7.ebuild 975
 MD5 2b4dcc0d97aeb57d6e10fa7b3f03a7c5 wavesurfer-1.5.3.ebuild 852
 MD5 7ea229f6a888122b52a431ed7591840d wavesurfer-1.6.3.ebuild 981
 MD5 aa53f99efe8a982a157944fe29857e14 wavesurfer-1.5.7.ebuild 853
 MD5 116cb5862538e8ed5164e186c37ac645 wavesurfer-1.6.5.ebuild 978
 MD5 163ef8ac03f406e637490220e18f2881 ChangeLog 1059
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 f9ea75ad7d39ed14938ee7189e4517e5 files/digest-wavesurfer-1.7 66
 MD5 062c69c8a32234220a9a72a65bc73622 files/digest-wavesurfer-1.5.3 68
 MD5 129afe62bd2823189d5000ed03253426 files/digest-wavesurfer-1.5.7 68
 MD5 254df36a2cd4044651737a805ba975c9 files/digest-wavesurfer-1.6.3 68
diff --git a/media-sound/wavesurfer/files/digest-wavesurfer-1.5.3 b/media-sound/wavesurfer/files/digest-wavesurfer-1.5.3
deleted file mode 100644
index c4122702c41f..000000000000
--- a/media-sound/wavesurfer/files/digest-wavesurfer-1.5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7b0f0ec29f4d0f609b8386b9b0e8368 wavesurfer-1.5.3.tar.gz 221512
diff --git a/media-sound/wavesurfer/files/digest-wavesurfer-1.5.7 b/media-sound/wavesurfer/files/digest-wavesurfer-1.5.7
deleted file mode 100644
index 677c6dc3d307..000000000000
--- a/media-sound/wavesurfer/files/digest-wavesurfer-1.5.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10dbd1281eb32933b025b40638a8d731 wavesurfer-1.5.7.tar.gz 260420
diff --git a/media-sound/wavesurfer/files/digest-wavesurfer-1.7 b/media-sound/wavesurfer/files/digest-wavesurfer-1.7
new file mode 100644
index 000000000000..5c60769995d2
--- /dev/null
+++ b/media-sound/wavesurfer/files/digest-wavesurfer-1.7
@@ -0,0 +1 @@
+MD5 138169b828104cf020dab41b6dbaf002 wavesurfer-1.7.tar.gz 272063
diff --git a/media-sound/wavesurfer/wavesurfer-1.5.7.ebuild b/media-sound/wavesurfer/wavesurfer-1.5.7.ebuild
deleted file mode 100644
index c09d5b9b881c..000000000000
--- a/media-sound/wavesurfer/wavesurfer-1.5.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/wavesurfer-1.5.7.ebuild,v 1.3 2004/06/25 00:29:07 agriffis Exp $
-
-DESCRIPTION="tool for recording, playing, editing, viewing and labling of audio"
-HOMEPAGE="http://www.speech.kth.se/wavesurfer/"
-SRC_URI="http://www.speech.kth.se/wavesurfer/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-tcltk/snack-2.2.2
-	>=dev-lang/tk-8.4"
-
-TCLV=8.4
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	cp wavesurfer.tcl ${T}
-	sed -e 's/wish[0-9.]\+/wish/' ${T}/wavesurfer.tcl > wavesurfer.tcl
-}
-
-src_install() {
-	newbin wavesurfer.tcl wavesurfer
-
-	dodir /usr/lib/tcl${TCLV}/${PN}
-	cp -r wsurf${PV%.*}/* demos/* icons/* ${D}usr/lib/tcl${TCLV}/${PN}
-	dodoc README.txt
-	dohtml doc/*
-}
-
diff --git a/media-sound/wavesurfer/wavesurfer-1.5.3.ebuild b/media-sound/wavesurfer/wavesurfer-1.7.ebuild
index cbf8e4e413b4..fe8e006191a2 100644
--- a/media-sound/wavesurfer/wavesurfer-1.5.3.ebuild
+++ b/media-sound/wavesurfer/wavesurfer-1.7.ebuild
@@ -1,35 +1,42 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/wavesurfer-1.5.3.ebuild,v 1.3 2004/06/25 00:29:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wavesurfer/wavesurfer-1.7.ebuild,v 1.1 2004/07/01 22:34:00 matsuu Exp $
 
 DESCRIPTION="tool for recording, playing, editing, viewing and labling of audio"
 HOMEPAGE="http://www.speech.kth.se/wavesurfer/"
 SRC_URI="http://www.speech.kth.se/wavesurfer/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 IUSE=""
 
-RDEPEND="=dev-tcltk/snack-2.2.2
-	>=dev-lang/tk-8.3"
-
-TCLV=8.3
+RDEPEND=">=dev-tcltk/snack-2.2.4"
 
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	cp wavesurfer.tcl ${T}
-	sed -e 's/wish[0-9.]\+/wish/' ${T}/wavesurfer.tcl > wavesurfer.tcl
+	sed -i -e 's/wish[0-9.]\+/wish/' wavesurfer.tcl || die
 }
 
 src_install() {
+	local mydir="wsurf${PV}"
+
 	newbin wavesurfer.tcl wavesurfer
+	dodir /usr/lib/${mydir}
+	cp -r ${mydir} ${D}/usr/lib/
+
+	insinto /usr/lib/${mydir}/plugins
+	doins plugins/*.plug
+	insinto /usr/lib/${mydir}/icons
+	doins icons/*
 
-	dodir /usr/lib/tcl${TCLV}/${PN}
-	cp -r wsurf${PV%.*}/* demos/* icons/* ${D}usr/lib/tcl${TCLV}/${PN}
 	dodoc README.txt
 	dohtml doc/*
+	for mydir in demos msgs python tools
+	do
+		docinto ${mydir}
+		dodoc ${mydir}/*
+	done
 }
-