Version bump closes bug #42379. Move autoconf out of RDEPEND. Bumping 2.12.0-r3 to stable on ppc and removing old 2.12.0 ebuild.

6 files changed, 64 insertions, 31 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 8fcfd35ab586..0528029ff616 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2004/02/10 09:48:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.14 2004/02/21 20:18:32 eradicator Exp $
+
+*timidity++-2.13.0_rc1 (21 Feb 2004)
+
+  21 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  timidity++-2.12.0-r3.ebuild, timidity++-2.12.0.ebuild,
+  timidity++-2.13.0_rc1.ebuild:
+  Version bump closes bug #42379. Move autoconf out of RDEPEND. Bumping
+  2.12.0-r3 to stable on ppc and removing old 2.12.0 ebuild.
 
   10 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
   timidity++-2.12.0-r3.ebuild, timidity++-2.12.0.ebuild,
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 218d9cd140c5..ef0b796f0e16 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -2,6 +2,8 @@ MD5 464b010a1669b09e551c7238ac61cb8e timidity++-2.12.0.ebuild 2505
 MD5 86dcf36253cbbca6f9c3f78eeea717ed ChangeLog 2378
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 6e7fd4e649e81a113bb68388b9cb3937 timidity++-2.12.0-r3.ebuild 3118
+MD5 e968d243229e58a1a71b5b7816491001 timidity++-2.13.0_rc1.ebuild 2917
+MD5 d324de8cc3fd3761f47c8d23d4016669 files/digest-timidity++-2.13.0_rc1 75
 MD5 4e4757646a4d2477f9bfe883d0b5ae88 files/timidity.cfg 2723
 MD5 c6e1c7a210aef0fcd2bc42c0cb56a650 files/long-64bit.patch 1166
 MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477
diff --git a/media-sound/timidity++/files/digest-timidity++-2.12.0 b/media-sound/timidity++/files/digest-timidity++-2.12.0
deleted file mode 100644
index 1a026bfe37a3..000000000000
--- a/media-sound/timidity++/files/digest-timidity++-2.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a878bc9341812d6a0b9a7a7d38c368c TiMidity++-2.12.0-pre1.tar.bz2 967676
diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.0_rc1 b/media-sound/timidity++/files/digest-timidity++-2.13.0_rc1
new file mode 100644
index 000000000000..0cea69e7f2b9
--- /dev/null
+++ b/media-sound/timidity++/files/digest-timidity++-2.13.0_rc1
@@ -0,0 +1 @@
+MD5 88086fcc327b138cd1159cd33cc16d65 TiMidity++-2.13.0-rc1.tar.bz2 1286941
diff --git a/media-sound/timidity++/timidity++-2.12.0-r3.ebuild b/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
index 2fecd361ebc9..f070748a12b6 100644
--- a/media-sound/timidity++/timidity++-2.12.0-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.12.0-r3.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.12.0-r3.ebuild,v 1.9 2004/02/10 09:48:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.12.0-r3.ebuild,v 1.10 2004/02/21 20:18:33 eradicator Exp $
 
 MY_P=TiMidity++-${PV}-pre1
 S=${WORKDIR}/${MY_P}
@@ -10,11 +10,11 @@ SRC_URI="http://www.goice.co.jp/member/mo/timidity/dist/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ppc ~amd64 ~sparc"
 IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa"
 inherit gnuconfig
 
-DEPEND=">=sys-libs/ncurses-5.0
+RDEPEND=">=sys-libs/ncurses-5.0
 	X? ( >=x11-base/xfree-4.0 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	gtk? ( =x11-libs/gtk+-1.2* )
@@ -23,7 +23,9 @@ DEPEND=">=sys-libs/ncurses-5.0
 	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 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+
+DEPEND="${RDEPEND}
 	sys-devel/autoconf"
 
 src_unpack() {
diff --git a/media-sound/timidity++/timidity++-2.12.0.ebuild b/media-sound/timidity++/timidity++-2.13.0_rc1.ebuild
index a81f77695962..17414be9f9e9 100644
--- a/media-sound/timidity++/timidity++-2.12.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.0_rc1.ebuild
@@ -1,19 +1,25 @@
 # 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.12.0.ebuild,v 1.10 2004/02/10 09:48:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.0_rc1.ebuild,v 1.1 2004/02/21 20:18:33 eradicator Exp $
 
-MY_P=TiMidity++-${PV}-pre1
+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://www.goice.co.jp/member/mo/timidity/"
-SRC_URI="http://www.goice.co.jp/member/mo/timidity/dist/${MY_P}.tar.bz2"
+HOMEPAGE="http://timidity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="nas esd motif X gtk oggvorbis tcltk slang alsa"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa"
+
+inherit gnuconfig
+
 
-DEPEND=">=sys-libs/ncurses-5.0
+RDEPEND=">=sys-libs/ncurses-5.0
 	X? ( >=x11-base/xfree-4.0 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	gtk? ( =x11-libs/gtk+-1.2* )
@@ -24,28 +30,36 @@ DEPEND=">=sys-libs/ncurses-5.0
 	tcltk? ( >=dev-lang/tk-8.1 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-alsalib-fix.patch || die "Alsalib-1.0 patch failed"
-}
+DEPEND="${RDEPEND}
+	sys-devel/autoconf"
 
 src_compile() {
 	local myconf
 	local audios
 	local interfaces
 
+	use amd64 && ( epatch ${FILESDIR}/gnuconfig_update.patch
+		epatch ${FILESDIR}/long-64bit.patch
+		gnuconfig_update )
+
 	interfaces="dynamic,ncurses,emacs,vt100"
-	#audios="oss"
+	if [ "`use oss`" ]; then \
+		audios="oss";
+	fi
 
 	use X \
-		&& myconf="${myconf} --with-x" \
+		&& myconf="${myconf} --with-x \
+			--enable-spectrogram --enable-wrd" \
 		&& interfaces="${interfaces},xskin,xaw" \
-		|| myconf="${myconf} --without-x"
+		|| myconf="${myconf} --without-x "
 
 	use slang && interfaces="${interfaces},slang"
-	use gtk && interfaces="${interfaces},gtk"
-	use motif && interfaces="${interfaces},motif"
+	if [ "`use X`" ]; then \
+		use gtk && interfaces="${interfaces},gtk";
+	fi
+	if [ "`use X`" ]; then \
+		use motif && interfaces="${interfaces},motif";
+	fi
 
 	use alsa \
 		&& audios="${audios},alsa" \
@@ -63,8 +77,6 @@ src_compile() {
 		--enable-interface=${interfaces} \
 		--enable-server \
 		--enable-network \
-		--enable-spectrogram \
-		--enable-wrd \
 		${myconf} || die
 
 	emake || die
@@ -72,6 +84,9 @@ src_compile() {
 
 src_install () {
 	make DESTDIR=${D} install || die
+	dodir /usr/share/timidity/config
+	insinto /usr/share/timidity/config
+	doins ${FILESDIR}/timidity.cfg
 	dodoc AUTHORS COPYING ChangeLog* INSTALL*
 	dodoc NEWS README*
 
@@ -84,10 +99,16 @@ src_install () {
 	fi
 }
 
-pkg_postinst() {
-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
+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
 }