Revbump to have the ebuild install the default config in /etc

11 files changed, 161 insertions, 68 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index a0f6f202ccb1..7560fdc91c1d 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2004/06/15 08:33:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.28 2004/06/15 08:49:20 eradicator Exp $
+
+*timidity++-2.13.0-r1 (15 Jun 2004)
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +timidity++-2.13.0-r1.ebuild:
+  Revbump to have the ebuild install the default config in /etc
 
   15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
   timidity++-2.12.0-r3.ebuild:
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 8c3342692468..0fb687e3ff47 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -3,6 +3,7 @@ MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 829a16cae0d2c00ed6b8f7bd97bb9303 timidity++-2.12.0-r3.ebuild 3042
 MD5 901f8a8c31bb828ca07af724c192577f timidity++-2.13.0.ebuild 3351
 MD5 a1a1abc57f297afdb69246300a0503d0 timidity++-2.13.0_rc2.ebuild 3263
+MD5 901f8a8c31bb828ca07af724c192577f timidity++-2.13.0-r1.ebuild 3351
 MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912
 MD5 435c2037a224bf9b5a8da7e4d87b48e0 files/digest-timidity++-2.12.0-r3 75
 MD5 0dda67bb7cae71bca455ce730c53bfd1 files/digest-timidity++-2.13.0 71
@@ -12,3 +13,4 @@ MD5 a216b305951cefced3806b5be686dbbe files/init.d.timidity 461
 MD5 c6e1c7a210aef0fcd2bc42c0cb56a650 files/long-64bit.patch 1166
 MD5 8bbea1ed225e28e6c00e1cc57622b2d5 files/timidity++-2.12.0-alsalib-fix.patch 1355
 MD5 4e4757646a4d2477f9bfe883d0b5ae88 files/timidity.cfg 2723
+MD5 0dda67bb7cae71bca455ce730c53bfd1 files/digest-timidity++-2.13.0-r1 71
diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.0-r1 b/media-sound/timidity++/files/digest-timidity++-2.13.0-r1
new file mode 100644
index 000000000000..dc487e1b77c4
--- /dev/null
+++ b/media-sound/timidity++/files/digest-timidity++-2.13.0-r1
@@ -0,0 +1 @@
+MD5 63284981e1ac81fce2b53cc4b1f4c468 TiMidity++-2.13.0.tar.bz2 1418739
diff --git a/media-sound/timidity++/timidity++-2.13.0-r1.ebuild b/media-sound/timidity++/timidity++-2.13.0-r1.ebuild
new file mode 100644
index 000000000000..f03d47c21047
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.13.0-r1.ebuild
@@ -0,0 +1,118 @@
+# 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-r1.ebuild,v 1.1 2004/06/15 08:49:20 eradicator 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"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE="oss nas esd motif X gtk oggvorbis tcltk slang alsa kde jack portaudio emacs"
+
+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 )
+	kde? ( kde-base/arts )
+	jack? ( !sparc? ( media-sound/jack-audio-connection-kit ) )
+	portaudio? ( !ppc? ( media-libs/portaudio ) )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf"
+
+RDEPEND="${RDEPEND}
+	tcltk? ( >=dev-lang/tk-8.1 )
+	emacs? ( virtual/emacs )"
+
+src_compile() {
+	local myconf
+	local audios
+	local interfaces
+
+	interfaces="dynamic,ncurses,emacs,vt100"
+
+	if use X ; then
+		myconf="${myconf} --with-x --enable-spectrogram --enable-wrd"
+		interfaces="${interfaces},xskin,xaw"
+		use gtk && interfaces="${interfaces},gtk"
+		use motif && interfaces="${interfaces},motif"
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	use slang && interfaces="${interfaces},slang"
+
+	use oss && audios="${audios},oss"
+	use esd && audios="${audios},esd"
+	use oggvorbis && audios="${audios},vorbis"
+	use nas && { audios="${audios},nas"; myconf="${myconf} --with-nas-library=/usr/X11R6/lib/libaudio.so"; }
+	use kde && audios="${audios},arts"
+	(! use sparc) && use jack && audios="${audios},jack"
+	(use x86 || use sparc) && use portaudio && audios="${audios},portaudio"
+
+	use alsa \
+		&& audios="${audios},alsa" \
+		&& interfaces="${interfaces},alsaseq" \
+		&& myconf="${myconf} --with-default-output=alsa"
+
+	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
+	insinto /etc
+	doins ${FILESDIR}/timidity.cfg
+
+	dodir /usr/share/timidity
+	dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg
+
+	dodoc AUTHORS ChangeLog* INSTALL*
+	dodoc NEWS README* ${FILESDIR}/timidity.cfg
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/conf.d.timidity timidity
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/init.d.timidity timidity
+
+	if use emacs ; then
+		dosed 's:/usr/local/bin/timidity:/usr/bin/timidity:g' /usr/share/emacs/site-lisp/timidity.el
+	else
+		rm ${D}/timidity.el
+	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 ""
+	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'"
+}
diff --git a/media-sound/timidity-eawpatches/ChangeLog b/media-sound/timidity-eawpatches/ChangeLog
index 3992bb7536ab..2cf24a640033 100644
--- a/media-sound/timidity-eawpatches/ChangeLog
+++ b/media-sound/timidity-eawpatches/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/timidity-eawpatches
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity-eawpatches/ChangeLog,v 1.10 2004/04/20 17:38:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity-eawpatches/ChangeLog,v 1.11 2004/06/15 08:46:00 eradicator Exp $
+
+*timidity-eawpatches-12-r3 (15 Jun 2004)
+
+  15 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -timidity-eawpatches-12-r1.ebuild, +timidity-eawpatches-12-r3.ebuild,
+  -timidity-eawpatches-12.ebuild:
+  Revbump to have the ebuild install the default config in /etc
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   timidity-eawpatches-12-r1.ebuild, timidity-eawpatches-12-r2.ebuild,
diff --git a/media-sound/timidity-eawpatches/Manifest b/media-sound/timidity-eawpatches/Manifest
index 21078b70f48b..3dcc051fc5ed 100644
--- a/media-sound/timidity-eawpatches/Manifest
+++ b/media-sound/timidity-eawpatches/Manifest
@@ -1,9 +1,11 @@
-MD5 64d8e7c2c95c03a0343c46f6ece658c6 timidity-eawpatches-12-r1.ebuild 1311
-MD5 f7cac063f47a06406ddd9c2bde091ce5 timidity-eawpatches-12-r2.ebuild 1230
-MD5 13b3326caeda4f7ac0269c7e48ef9598 ChangeLog 1564
-MD5 a07733d84042c0bb8bef07d2ac8c455e timidity-eawpatches-12.ebuild 1090
+MD5 f9686c1c94723a0b5254d4f545666da6 ChangeLog 1563
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 26f9d8443d7496118ea402d9e0e74b33 timidity-eawpatches-12-r1.ebuild 1310
+MD5 348f95e97e48e28884c6b430480cc77b timidity-eawpatches-12-r2.ebuild 1229
+MD5 28ab6877bfae52861c05c0430df445d0 timidity-eawpatches-12.ebuild 1089
+MD5 21a43057002754731360c31d7df2ca7c timidity-eawpatches-12-r3.ebuild 1295
+MD5 aecff3a0d51d1faa2911a0e785603df6 files/digest-timidity-eawpatches-12 65
 MD5 aecff3a0d51d1faa2911a0e785603df6 files/digest-timidity-eawpatches-12-r1 65
 MD5 0fc3bf4990261c76091fa637ad44583a files/digest-timidity-eawpatches-12-r2 68
 MD5 bc4db09d3bca05b826128910ee3ea94f files/timidity-eawpatches-12-gentoo.diff 650
-MD5 aecff3a0d51d1faa2911a0e785603df6 files/digest-timidity-eawpatches-12 65
+MD5 0fc3bf4990261c76091fa637ad44583a files/digest-timidity-eawpatches-12-r3 68
diff --git a/media-sound/timidity-eawpatches/files/digest-timidity-eawpatches-12 b/media-sound/timidity-eawpatches/files/digest-timidity-eawpatches-12
deleted file mode 100644
index e21b59465f77..000000000000
--- a/media-sound/timidity-eawpatches/files/digest-timidity-eawpatches-12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f49190da4b1b4bdf999e0351edda8f2 eawpats12_full.rar 24444187
diff --git a/media-sound/timidity-eawpatches/files/digest-timidity-eawpatches-12-r1 b/media-sound/timidity-eawpatches/files/digest-timidity-eawpatches-12-r1
deleted file mode 100644
index e21b59465f77..000000000000
--- a/media-sound/timidity-eawpatches/files/digest-timidity-eawpatches-12-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f49190da4b1b4bdf999e0351edda8f2 eawpats12_full.rar 24444187
diff --git a/media-sound/timidity-eawpatches/files/digest-timidity-eawpatches-12-r3 b/media-sound/timidity-eawpatches/files/digest-timidity-eawpatches-12-r3
new file mode 100644
index 000000000000..a45653bba691
--- /dev/null
+++ b/media-sound/timidity-eawpatches/files/digest-timidity-eawpatches-12-r3
@@ -0,0 +1 @@
+MD5 8ebcf0583f3077346ebace93c8ea166f eawpats12_full.tar.gz 32047230
diff --git a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r1.ebuild b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r3.ebuild
index 495014262df9..f472f75a5ad6 100644
--- a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r1.ebuild
+++ b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r3.ebuild
@@ -1,39 +1,37 @@
 # 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-eawpatches/timidity-eawpatches-12-r1.ebuild,v 1.5 2004/04/20 17:38:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity-eawpatches/timidity-eawpatches-12-r3.ebuild,v 1.1 2004/06/15 08:46:00 eradicator Exp $
 
 IUSE=""
 
-inherit eutils
-
-S=${WORKDIR}/eawpatches
 DESCRIPTION="Eric Welsh's GUS patches for TiMidity"
-SRC_URI="http://www.stardate.bc.ca/eawpatches/eawpats${PV}_full.rar"
 HOMEPAGE="http://www.stardate.bc.ca/eawpatches/html/default.htm"
+SRC_URI="http://5hdumat.samizdat.net/music/eawpats${PV}_full.tar.gz"
 
-DEPEND="media-sound/timidity++
-	app-arch/unrar"
-
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
 
-src_unpack() {
-	mkdir eawpatches
-	cd eawpatches
-	unrar x "${DISTDIR}/${A}" || die "error unpacking ${DISTDIR}/${A}"
+DEPEND="media-sound/timidity++"
+
+S=${WORKDIR}/eawpats
 
-	# Patch the default configuration so the patches can be found
-	epatch ${FILESDIR}/${PN}-12-gentoo.diff
+src_unpack() {
+	unpack ${A}
+	cd ${S}/linuxconfig
+	sed -i -e "s:dir /home/user/eawpats/:dir /usr/share/timidity/eawpatches:" timidity.cfg
 }
 
-src_install () {
+src_install() {
 	local instdir=/usr/share/timidity
 
 	# Install base timidity configuration
+	insinto /etc
+	doins linuxconfig/timidity.cfg
+
 	insinto ${instdir}
-	doins timidity.cfg
-	rm timidity.cfg
+	dosym /etc/timidity.cfg ${instdir}/timidity.cfg
+	rm -rf linuxconfig/ winconfig/
 
 	# Install base eawpatches
 	insinto ${instdir}/eawpatches
diff --git a/media-sound/timidity-eawpatches/timidity-eawpatches-12.ebuild b/media-sound/timidity-eawpatches/timidity-eawpatches-12.ebuild
deleted file mode 100644
index 35cad47ddc5a..000000000000
--- a/media-sound/timidity-eawpatches/timidity-eawpatches-12.ebuild
+++ /dev/null
@@ -1,40 +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-eawpatches/timidity-eawpatches-12.ebuild,v 1.8 2004/04/20 17:38:10 eradicator Exp $
-
-IUSE=""
-
-S=${WORKDIR}
-DESCRIPTION="Eric Welsh's GUS patches for TiMidity"
-SRC_URI="http://www.stardate.bc.ca/eawpatches/eawpats${PV}_full.rar"
-HOMEPAGE="http://www.stardate.bc.ca/eawpatches/html/default.htm"
-
-DEPEND="media-sound/timidity++
-	app-arch/unrar"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86"
-
-src_unpack() {
-	mkdir eawpatches
-	cd eawpatches
-	unrar x "${DISTDIR}/${A}" || die "error unpacking ${DISTDIR}/${A}"
-
-	# Patch the default configuration so the patches can be found
-	patch -p0 < "${FILESDIR}/${PF}-gentoo.diff"
-}
-
-src_install () {
-	instdir=/usr/share/timidity/eawpatches
-	insinto ${instdir}
-	doins eawpatches/*
-
-	# Make sure ownership and perms are sane
-	cd ${D}/${instdir}
-	chown -R root:root eawpatches
-	chmod -R a+rX,go-w eawpatches
-
-	# Install timidity.cfg where timidity can find it
-	mv eawpatches/timidity.cfg .
-}