6 files changed, 17 insertions, 95 deletions
diff --git a/media-sound/waif/ChangeLog b/media-sound/waif/ChangeLog
index 3ea9c0944922..6a0df25c77c0 100644
--- a/media-sound/waif/ChangeLog
+++ b/media-sound/waif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/waif
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/ChangeLog,v 1.20 2005/01/09 11:12:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/ChangeLog,v 1.21 2005/05/28 17:37:23 luckyduck Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/LICENSE,
+  -waif-0.59.6.ebuild, waif-0.59.7.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
 
   09 Jan 2005; Sven Wegener <swegener@gentoo.org> waif-0.59.6.ebuild,
   waif-0.59.7.ebuild:
diff --git a/media-sound/waif/Manifest b/media-sound/waif/Manifest
index c15d0408bd29..4c5683f779a7 100644
--- a/media-sound/waif/Manifest
+++ b/media-sound/waif/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 699daef30d9563bc1e8c1a60e7cf2215 waif-0.59.7.ebuild 1393
-MD5 555c4db843785cb5a576a142927ba1c3 ChangeLog 3395
+MD5 74201d44bc392f165d27d2df0bc9595c waif-0.59.7.ebuild 1362
+MD5 af834cc258ae24354e7ecb715e8b874e ChangeLog 3584
 MD5 aa0bfeeaf772ac88a10eaadfcec3936f metadata.xml 250
-MD5 937fbe2447f9d6b954c6f95596d7c4b6 waif-0.59.6.ebuild 1311
-MD5 fbdc57553cb2209c0b024afb096509c1 files/digest-waif-0.59.6 119
 MD5 b672105be7c357165e12fd4963e9a54d files/digest-waif-0.59.7 119
-MD5 3b3e0a6ef4724b594fc78b9b0dfd9c5e files/LICENSE 146
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD4DBQFB4RGvI1lqEGTUzyQRAk0EAKDejoSRvACxqz9OfqdZn4s5va51bACYvjpB
-Pd1dwpMxtidJmcW8k6Q6JA==
-=dDLc
+iD8DBQFCmKxt06ebR+OMO78RAoB5AJ0WvQ9CMRW31JcgK59IUPMEMjLcIgCfSdX1
+d7Uni0P6yimpV19Ywl48Xx8=
+=tEJn
 -----END PGP SIGNATURE-----
diff --git a/media-sound/waif/files/LICENSE b/media-sound/waif/files/LICENSE
deleted file mode 100644
index 8b388eca3c5b..000000000000
--- a/media-sound/waif/files/LICENSE
+++ /dev/null
@@ -1,5 +0,0 @@
-Licenses confuse and bore me.  As long as I'm not
-plagiarized, anyone is free to do what they wish with
-waif in whole or in part.
-
-Matthew Levine
diff --git a/media-sound/waif/files/digest-waif-0.59.6 b/media-sound/waif/files/digest-waif-0.59.6
deleted file mode 100644
index 6a46b5ca71f0..000000000000
--- a/media-sound/waif/files/digest-waif-0.59.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e15f3ff309fbb86bdd44ade30025295 waif-0.59.6.tar.gz 61661
-MD5 563a36a809ff3e422f41ed5cc90c8a69 wfxmms-0.6.tgz 5192
diff --git a/media-sound/waif/waif-0.59.6.ebuild b/media-sound/waif/waif-0.59.6.ebuild
deleted file mode 100644
index 7d2ba40d04f4..000000000000
--- a/media-sound/waif/waif-0.59.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/waif-0.59.6.ebuild,v 1.9 2005/01/09 11:12:41 swegener Exp $
-
-IUSE="oggvorbis xmms"
-
-S=${WORKDIR}/${PN}
-S2=${WORKDIR}/wfxmms
-DESCRIPTION="Why Another Infernal Frontend -- console front end for various media-players"
-HOMEPAGE="http://eds.org/~straycat"
-SRC_URI="http://www.eds.org/~straycat/${P}.tar.gz
-	xmms? ( http://www.eds.org/~straycat/wfxmms-0.6.tgz )"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86"
-
-DEPEND="dev-lang/tcl
-	dev-tcltk/expect"
-
-RDEPEND="dev-tcltk/expect
-	virtual/mpg123
-	media-sound/takcd
-	media-sound/aumix
-	media-sound/id3ed
-	xmms? ( media-sound/xmms )
-	oggvorbis? ( media-sound/vorbis-tools )"
-
-
-src_compile() {
-	cd Waif
-	./mkindex.sh || die
-
-	if use xmms
-	then
-		cd ${S2}
-		make || die
-	fi
-}
-
-src_install() {
-
-	local tclv
-	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's:^.*"\(.*\)".*:\1:')
-
-	cd ${S}
-	insinto /usr/lib/tcl${tclv}/Waif
-	doins Waif/*
-
-	into /usr
-	dobin waif-helper waifsh
-	doman waifsh.1
-
-	dodoc CHANGES FAQ INSTALL README* TODO WHATSNEW
-	dodoc ${FILESDIR}/LICENSE
-	docinto Documentation
-	dodoc Documentation/*
-
-	if use xmms
-	then
-		cd ${S2}
-		into /usr
-		dobin wfxmms
-
-		docinto wfxmms
-		dodoc BUGS CHANGES README
-	fi
-}
diff --git a/media-sound/waif/waif-0.59.7.ebuild b/media-sound/waif/waif-0.59.7.ebuild
index ff6be80d5981..e08c2c88db5f 100644
--- a/media-sound/waif/waif-0.59.7.ebuild
+++ b/media-sound/waif/waif-0.59.7.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/waif-0.59.7.ebuild,v 1.14 2005/01/09 11:12:41 swegener Exp $
-
-IUSE="xmms oggvorbis"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/waif/waif-0.59.7.ebuild,v 1.15 2005/05/28 17:37:23 luckyduck Exp $
 
 inherit eutils
 
 S=${WORKDIR}/${PN}
 S2=${WORKDIR}/wfxmms
+
 DESCRIPTION="Why Another Infernal Frontend -- console front end for various media-players"
-HOMEPAGE="http://eds.org/~straycat"
+HOMEPAGE="http://eds.org/~straycat/waif.html"
 SRC_URI="http://www.eds.org/~straycat/${P}.tar.gz
 	xmms? ( http://www.eds.org/~straycat/wfxmms-0.6.tgz )"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="~ppc x86 sparc amd64"
+IUSE="xmms ogg"
 
 DEPEND="dev-lang/tcl
 	dev-tcltk/expect"
-
 RDEPEND="dev-tcltk/expect
 	virtual/mpg123
 	media-sound/takcd
@@ -28,8 +27,7 @@ RDEPEND="dev-tcltk/expect
 	media-sound/id3v2
 	media-sound/id3ed
 	xmms? ( media-sound/xmms )
-	oggvorbis? ( media-sound/vorbis-tools )"
-
+	ogg? ( media-sound/vorbis-tools )"
 
 src_compile() {
 	cd Waif
@@ -43,7 +41,6 @@ src_compile() {
 }
 
 src_install() {
-
 	local tclv
 	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's:^.*"\(.*\)".*:\1:')
 
@@ -56,7 +53,6 @@ src_install() {
 	doman waifsh.1
 
 	dodoc CHANGES FAQ INSTALL README* TODO WHATSNEW
-	dodoc ${FILESDIR}/LICENSE
 	docinto Documentation
 	dodoc Documentation/*