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

7 files changed, 33 insertions, 67 deletions

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 .
-}