Removing rc1. Fixed RDEPEND

4 files changed, 11 insertions, 114 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index b94e7e0404d7..be00add5bd30 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.21 2004/04/06 18:07:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.22 2004/04/16 09:40:02 eradicator Exp $
+
+  16 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.13.0_rc1.ebuild, timidity++-2.13.0_rc2.ebuild:
+  Removing rc1.  Fixed RDEPEND
 
   06 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   timidity++-2.13.0_rc2.ebuild:
diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.0_rc1 b/media-sound/timidity++/files/digest-timidity++-2.13.0_rc1
deleted file mode 100644
index 0cea69e7f2b9..000000000000
--- a/media-sound/timidity++/files/digest-timidity++-2.13.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88086fcc327b138cd1159cd33cc16d65 TiMidity++-2.13.0-rc1.tar.bz2 1286941
diff --git a/media-sound/timidity++/timidity++-2.13.0_rc1.ebuild b/media-sound/timidity++/timidity++-2.13.0_rc1.ebuild
deleted file mode 100644
index 6ea985d17258..000000000000
--- a/media-sound/timidity++/timidity++-2.13.0_rc1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.0_rc1.ebuild,v 1.3 2004/04/16 05:37:26 vapier Exp $
-
-inherit gnuconfig
-
-MY_PV=${PV/_/-}
-MY_P=TiMidity++-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
-HOMEPAGE="http://timidity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa"
-
-RDEPEND=">=sys-libs/ncurses-5.0
-	X? ( virtual/x11 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	nas? ( >=media-libs/nas-1.4 )
-	alsa? ( media-libs/alsa-lib )
-	motif? ( >=x11-libs/openmotif-2.1 )
-	slang? ( >=sys-libs/slang-1.4 )
-	tcltk? ( >=dev-lang/tk-8.1 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-src_compile() {
-	local myconf
-	local audios
-	local interfaces
-
-	if use amd64 ; then
-		epatch ${FILESDIR}/gnuconfig_update.patch
-		epatch ${FILESDIR}/long-64bit.patch
-		gnuconfig_update
-	fi
-
-	interfaces="dynamic,ncurses,emacs,vt100"
-	use oss && audios="oss";
-
-	use X \
-		&& myconf="${myconf} --with-x \
-			--enable-spectrogram --enable-wrd" \
-		&& interfaces="${interfaces},xskin,xaw" \
-		|| myconf="${myconf} --without-x "
-
-	use slang && interfaces="${interfaces},slang"
-	if use X ; then \
-		use gtk && interfaces="${interfaces},gtk";
-		use motif && interfaces="${interfaces},motif";
-	fi
-
-	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"
-
-	econf \
-		--localstatedir=/var/state/timidity++ \
-		--with-elf \
-		--enable-audio=${audios} \
-		--enable-interface=${interfaces} \
-		--enable-server \
-		--enable-network \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodir /usr/share/timidity/config
-	insinto /usr/share/timidity/config
-	doins ${FILESDIR}/timidity.cfg
-	dodoc AUTHORS ChangeLog* INSTALL*
-	dodoc NEWS README*
-
-	if use alsa ; then
-		insinto /etc/conf.d
-		newins ${FILESDIR}/conf.d.timidity timidity
-
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/init.d.timidity timidity
-	fi
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "A timidity config file has been installed in"
-	einfo "/usr/share/timitidy/config/timidity.cfg. This"
-	einfo "file must to copied into /usr/share/timidity/"
-	einfo "and edited to match your configuration."
-	einfo ""
-	if use alsa ; then
-		einfo "An init script for the alsa timidity sequencer has been installed."
-		einfo "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
-		einfo "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
-	fi
-}
diff --git a/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild b/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild
index 3f2b48e9bc4d..b01954ca8f25 100644
--- a/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild,v 1.8 2004/04/16 05:37:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.0_rc2.ebuild,v 1.9 2004/04/16 09:40:02 eradicator Exp $
 
 inherit gnuconfig
 
@@ -29,11 +29,14 @@ RDEPEND=">=sys-libs/ncurses-5.0
 	jack? ( !sparc? ( virtual/jack ) )
 	portaudio? ( !ppc? ( media-libs/portaudio ) )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-	tcltk? ( >=dev-lang/tk-8.1 )
-	emacs? ( virtual/emacs )"
+
 DEPEND="${RDEPEND}
 	sys-devel/autoconf"
 
+RDEPEND="${RDEPEND}
+        tcltk? ( >=dev-lang/tk-8.1 )
+        emacs? ( virtual/emacs )"
+
 src_compile() {
 	local myconf
 	local audios