ogg and vorbis USE flags deprecated -- replaced with one oggvorbis flag

5 files changed, 70 insertions, 87 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index b2352b8c0a18..7584cbf4dfcc 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,8 +1,8 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.2 2002/03/28 23:11:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.3 2002/04/12 13:58:19 seemant Exp $
 
-*timidity++-2.11.1-r1 (28 Mar 2002)
+*timidity++-2.11.1-r2 (28 Mar 2002)
 
   28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> timidity++-2.11.1-r1.ebuild:
 
diff --git a/media-sound/timidity++/files/digest-timidity++-2.10.4-r1 b/media-sound/timidity++/files/digest-timidity++-2.10.4-r1
deleted file mode 100644
index 37395c5412fd..000000000000
--- a/media-sound/timidity++/files/digest-timidity++-2.10.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e69753b7e71055e61aeb3c234048f1e TiMidity++-2.10.4.tar.bz2 867561
diff --git a/media-sound/timidity++/files/digest-timidity++-2.11.1-r2 b/media-sound/timidity++/files/digest-timidity++-2.11.1-r2
new file mode 100644
index 000000000000..2fff12260211
--- /dev/null
+++ b/media-sound/timidity++/files/digest-timidity++-2.11.1-r2
@@ -0,0 +1 @@
+MD5 42a4281bf4dbcc3cafe24adc416225f5 TiMidity++-2.11.1.tar.bz2 959872
diff --git a/media-sound/timidity++/timidity++-2.10.4-r1.ebuild b/media-sound/timidity++/timidity++-2.10.4-r1.ebuild
deleted file mode 100644
index dda22aa8abe9..000000000000
--- a/media-sound/timidity++/timidity++-2.10.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.10.4-r1.ebuild,v 1.2 2001/11/17 11:28:28 danarmak Exp $
-
-#P=
-A=TiMidity++-${PV}.tar.bz2
-S=${WORKDIR}/TiMidity++-${PV}
-DESCRIPTION=""
-SRC_URI="http://www.goice.co.jp/member/mo/timidity/dist/TiMidity++-${PV}.tar.bz2"
-HOMEPAGE="http://www.goice.co.jp/member/mo/timidity/"
-
-DEPEND=">=sys-libs/ncurses-5.0
-	X? ( >=x11-base/xfree-4.0 )
-	motif? ( >=x11-libs/openmotif-2.1 )
-	tcltk? ( >=dev-lang/tcl-tk-8.1 )
-	nas? ( >=media-libs/nas-1.4 )
-	alsa? ( >=media-libs/alsa-lib-0.5.10 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
-	slang? ( >=sys-libs/slang-1.4 )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_compile() {
-    local myconf
-    local audios
-    local interfaces
-    
-    interfaces="dynamic,ncurses,emacs,vt100"
-    audios="oss"
-    
-    if [ "`use X`" ]
-    then
-	myconf="${myconf} --with-x"
-	interfaces="${interfaces},xskin,xaw"
-    else
-	myconf="${myconf} --without-x"
-    fi
-    if [ "`use slang`" ]
-    then
-	interfaces="${interfaces},slang"
-    fi
-    if [ "`use gtk`" ]
-    then
-	interfaces="${interfaces},gtk"
-    fi
-    if [ "`use motif`" ]
-    then
-	interfaces="${interfaces},motif"
-    fi
-    if [ "`use alsa`" ]
-    then
-	audios="${audios},alsa"
-	interfaces="${interfaces},alsaseq"
-	myconf="${myconf} --with-default-output=alsa"
-    fi
-    if [ "`use esd`" ]
-    then
-	audios="${audios},esd"
-    fi
-    if [ "`use vorbis`" ]
-    then
-	audios="${audios},vorbis"
-    fi
-    if [ "`use nas`" ]
-    then
-	audios="${audios},nas"
-    fi
-        
-    try ./configure --prefix=/usr --host=${CHOST} --mandir=/usr/share/man\
-	--with-elf \
-	--enable-audio=${audios} \
-	--enable-interface=${interfaces} \
-	--enable-server --enable-network \
-	--enable-spectrogram --enable-wrd \
-	${myconf}
-    try make
-}
-
-src_install () {
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog* INSTALL*
-    dodoc NEWS README*
-}
diff --git a/media-sound/timidity++/timidity++-2.11.1-r2.ebuild b/media-sound/timidity++/timidity++-2.11.1-r2.ebuild
new file mode 100644
index 000000000000..bddb5347ffe1
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.11.1-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.11.1-r2.ebuild,v 1.1 2002/04/12 13:58:19 seemant Exp $
+
+PN=TiMidity++-${PV}
+S=${WORKDIR}/${PN}
+DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
+SRC_URI="http://www.goice.co.jp/member/mo/timidity/dist/${PN}.tar.bz2"
+HOMEPAGE="http://www.goice.co.jp/member/mo/timidity/"
+
+DEPEND=">=sys-libs/ncurses-5.0
+	X? ( >=x11-base/xfree-4.0 )
+	motif? ( >=x11-libs/openmotif-2.1 )
+	tcltk? ( >=dev-lang/tk-8.1 )
+	nas? ( >=media-libs/nas-1.4 )
+	alsa? ( >=media-libs/alsa-lib-0.5.10 )
+	esd? ( >=media-sound/esound-0.2.22 )
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
+	slang? ( >=sys-libs/slang-1.4 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+
+src_compile() {
+	local myconf
+	local audios
+	local interfaces
+	
+	interfaces="dynamic,ncurses,emacs,vt100"
+	audios="oss"
+	
+	use X	\
+		&& myconf="${myconf} --with-x"	\
+		&& interfaces="${interfaces},xskin,xaw"	\
+		|| myconf="${myconf} --without-x"
+
+	use slang && interfaces="${interfaces},slang"
+	use gtk && interfaces="${interfaces},gtk"
+	use motif && interfaces="${interfaces},motif"
+
+	use alsa	\
+		&& audios="${audios},alsa"	\
+		&& interfaces="${interfaces},alsaseq"	\
+		&& myconf="${myconf} --with-default-output=alsa"
+
+	use esd && audios="${audios},esd"
+	use oggvorbis && audios="${audios},vorbis"
+	use nas && audios="${audios},nas"
+		
+	./configure 	\
+		--prefix=/usr	\
+		--host=${CHOST}	\
+		--mandir=/usr/share/man\
+		--with-elf \
+		--enable-audio=${audios} \
+		--enable-interface=${interfaces} \
+		--enable-server --enable-network \
+		--enable-spectrogram --enable-wrd \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog* INSTALL*
+	dodoc NEWS README*
+}