look in right place for timidity

4 files changed, 9 insertions, 43 deletions

diff --git a/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.4 b/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.4
deleted file mode 100644
index 6b2bbdcd4f12..000000000000
--- a/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13935e2945cf8ecb7056e0d3e0e36509 SDL_mixer-1.2.4.tar.gz 955542
diff --git a/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5 b/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r1
index 4363805f47b0..4363805f47b0 100644
--- a/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5
+++ b/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r1
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.4.ebuild
deleted file mode 100644
index 02418f9c1c2c..000000000000
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.4.ebuild,v 1.9 2003/02/13 12:54:57 vapier Exp $
-
-IUSE="mpeg mikmod oggvorbis"
-
-MY_P="${P/sdl-/SDL_}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/index.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND=">=media-libs/libsdl-1.2.4
-	>=media-libs/smpeg-0.4.4-r1
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-
-src_compile() {
-
-	local myconf
-
-	use mikmod || myconf="${myconf} --disable-mod"
-	use mpeg || myconf="${myconf} --disable-music-mp3"
-	use oggvorbis || myconf="${myconf} --disable-music-ogg"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	
-	dodoc CHANGES COPYING README  
-}
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.5.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild
index fd49e34f6215..29336fc35641 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.5.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.5.ebuild,v 1.1 2003/03/21 05:01:50 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild,v 1.1 2003/03/25 00:26:17 malverian Exp $
 
 IUSE="mpeg mikmod oggvorbis"
 
@@ -12,13 +12,20 @@ HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/index.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc ~alpha"
 
 DEPEND=">=media-libs/libsdl-1.2.5
 	>=media-libs/smpeg-0.4.4-r1
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
+src_unpack() {
+unpack ${A}
+cd ${S}/timidity
+cp config.h config.h.orig
+sed -e 's:/usr/local/lib/timidity:/usr/share/timidity:' config.h.orig > config.h
+rm -f config.h.orig
+}
 
 src_compile() {