old

6 files changed, 3 insertions, 171 deletions

diff --git a/media-libs/sdl-mixer/files/1.2.5-system-mikmod.patch b/media-libs/sdl-mixer/files/1.2.5-system-mikmod.patch
deleted file mode 100644
index 0eda4b54dc1b..000000000000
--- a/media-libs/sdl-mixer/files/1.2.5-system-mikmod.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- SDL_mixer-1.2.5.orig/configure.in	2003-02-04 20:59:41.000000000 +0000
-+++ SDL_mixer-1.2.5/configure.in	2004-05-23 20:14:34.246131384 +0000
-@@ -108,7 +108,7 @@
-               , enable_music_mod=yes)
- if test x$enable_music_mod = xyes; then
-     CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"
--    MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod"
-+    SYSTEM_LIBS="$SYSTEM_LIBS -lmikmod"
- fi
- AC_ARG_ENABLE(music-midi,
- [  --enable-music-midi     enable MIDI music via timidity [default=yes]],
---- SDL_mixer-1.2.5.orig/Makefile.am	2003-02-09 00:14:39.000000000 +0000
-+++ SDL_mixer-1.2.5/Makefile.am	2004-05-23 20:17:16.856410864 +0000
-@@ -3,7 +3,7 @@
- lib_LTLIBRARIES = libSDL_mixer.la
- 
- SUBDIRS = @MUSIC_SUBDIRS@
--DIST_SUBDIRS = mikmod timidity native_midi native_midi_gpl
-+DIST_SUBDIRS = timidity native_midi native_midi_gpl
- 
- libSDL_mixerincludedir = $(includedir)/SDL
- libSDL_mixerinclude_HEADERS =	\
-@@ -29,11 +29,6 @@
- 	effects_internal.c	\
- 	effects_internal.h
- 
--if USE_MIKMOD
--MIKMOD_LIB = mikmod/libmikmod.la
--else
--MIKMOD_LIB =
--endif
- if USE_TIMIDITY
- TIMIDITY_LIB = timidity/libtimidity.la
- else
-@@ -62,7 +57,7 @@
- libSDL_mixer_la_LDFLAGS = 		\
- 	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
--libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@
-+libSDL_mixer_la_LIBADD = $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@
- 
- noinst_PROGRAMS = playwave playmus
- 
---- SDL_mixer-1.2.5.orig/music.c.orig	2004-05-23 18:41:25.760726312 -0400
-+++ SDL_mixer-1.2.5/music.c	2004-05-23 18:43:37.272733448 -0400
-@@ -1058,4 +1058,7 @@
- }
- 
-+static int _pl_synchro_value;
-+#define Player_SetSynchroValue(x) _pl_synchro_value=x;
-+#define Player_GetSynchroValue() _pl_synchro_value;
- int Mix_SetSynchroValue(int i)
- {
-@@ -1110,8 +1111,8 @@
- #endif
- #ifdef MOD_MUSIC
- 	MikMod_Exit();
--	MikMod_UnregisterAllLoaders();
--	MikMod_UnregisterAllDrivers();
-+//	MikMod_UnregisterAllLoaders();
-+//	MikMod_UnregisterAllDrivers();
- #endif
- }
- 
diff --git a/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r2 b/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r2
deleted file mode 100644
index 4363805f47b0..000000000000
--- a/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f26d4e4625f00517203e32bd06fbc5d8 SDL_mixer-1.2.5.tar.gz 936765
diff --git a/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r3 b/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r3
deleted file mode 100644
index 4363805f47b0..000000000000
--- a/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f26d4e4625f00517203e32bd06fbc5d8 SDL_mixer-1.2.5.tar.gz 936765
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild
index 25066e9c5705..17db6e5418dc 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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-r1.ebuild,v 1.16 2004/08/11 23:24:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild,v 1.17 2004/11/08 05:53:19 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -12,12 +12,12 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~mips ppc64"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="mpeg mikmod oggvorbis"
 
+#	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 RDEPEND=">=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 )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.5-r2.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.5-r2.ebuild
deleted file mode 100644
index 35813441882d..000000000000
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.5-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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-r2.ebuild,v 1.3 2004/06/24 23:21:43 agriffis Exp $
-
-inherit eutils
-
-MY_P="${P/sdl-/SDL_}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/index.html"
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64"
-IUSE="mpeg mikmod oggvorbis"
-
-RDEPEND=">=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 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gcc3.patch
-	epatch ${FILESDIR}/${PV}-system-mikmod.patch
-	autoreconf -i || die
-	sed -i \
-		-e 's:/usr/local/lib/timidity:/usr/share/timidity:' \
-		timidity/config.h \
-		|| die "sed timidity/config.h failed"
-}
-
-src_compile() {
-	econf \
-		`use_enable mikmod music-mod` \
-		`use_enable mpeg music-mp3` \
-		`use_enable oggvorbis music-ogg` \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc CHANGES README
-}
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.5-r3.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.5-r3.ebuild
deleted file mode 100644
index 9ef0145381e7..000000000000
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.5-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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-r3.ebuild,v 1.2 2004/06/24 23:21:43 agriffis Exp $
-
-inherit eutils
-
-MY_P="${P/sdl-/SDL_}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/index.html"
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64"
-IUSE="mpeg mikmod oggvorbis"
-
-RDEPEND=">=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 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gcc3.patch
-	epatch ${FILESDIR}/${PV}-system-mikmod.patch
-
-	# amd64 patch for mikmod.h and mikmod_internals.h
-	epatch ${FILESDIR}/${P}-amd64-mikmod.patch
-
-	autoreconf -i || die
-	sed -i \
-		-e 's:/usr/local/lib/timidity:/usr/share/timidity:' \
-		timidity/config.h \
-		|| die "sed timidity/config.h failed"
-}
-
-src_compile() {
-	econf \
-		`use_enable mikmod music-mod` \
-		`use_enable mpeg music-mp3` \
-		`use_enable oggvorbis music-ogg` \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc CHANGES README
-}