add support for USE=timidity

Package-Manager: portage-2.0.53_rc7

diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index e10f2994fd28be0341cba069ac9fd5f5e748826b..6a5d8fa665ced84bc8469f7effb300fb46f9d574 100644 (file)
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 7c716e9117528d5569b6a234c91a149b ChangeLog 4472
 MD5 f026901e029ec31037b0bca6dc7f07d8 files/1.2.5-gcc3.patch 1235
 MD5 53b2015dae19981548f34d124a734f8e files/digest-sdl-mixer-1.2.5-r1 67
@@ -7,5 +10,12 @@ MD5 b20854212133319dd5b400f71a372bcb files/sdl-mixer-1.2.5-amd64-mikmod.patch 92
 MD5 85c429a982fe437337599502a8fa6c1d files/sdl-mixer-1.2.6-mikmod-music-init.patch 260
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 39b686f066984e4b0942a03eb596250f sdl-mixer-1.2.5-r1.ebuild 1430
-MD5 105bd937f731521730bc492e4173f68d sdl-mixer-1.2.6-r1.ebuild 1324
+MD5 d6686251612298eb01cd14b8ec7395a3 sdl-mixer-1.2.6-r1.ebuild 1411
 MD5 f84eb8e4df8c2d8e6cc02b8f50990127 sdl-mixer-1.2.6.ebuild 1236
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDa/OdgIKl8Uu19MoRAqIFAJ4gk6+M78Mhp2BlzUUwNcnogNM/TQCfdt1v
+UYNLrXzo9LJyqgqlo0sefrA=
+=AZbQ
+-----END PGP SIGNATURE-----

diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild
index e60e217aaa45a9eef920561708d4e2ca7b4a466b..11f531718d0eeb6059f4e8693cbec4d6f18c7f9d 100644 (file)
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.6-r1.ebuild,v 1.3 2005/11/04 16:22:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild,v 1.4 2005/11/04 23:48:52 vapier Exp $
 
 inherit eutils
 
@@ -12,9 +12,10 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mp3 mikmod vorbis"
+IUSE="mp3 mikmod timidity vorbis"
 
 DEPEND=">=media-libs/libsdl-1.2.5
+       timidity? ( media-sound/timidity++ )
        mp3? ( >=media-libs/smpeg-0.4.4-r1 )
        vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )
        mikmod? ( >=media-libs/libmikmod-3.1.10 )"
@@ -33,8 +34,9 @@ src_unpack() {
 
 src_compile() {
        econf \
-               --disable-dependency-tracking \
+               $(use_enable timidity timidity-midi) \
                $(use_enable mikmod music-libmikmod) \
+               $(use_enable mikmod music-mod) \
                $(use_enable mp3 music-mp3) \
                $(use_enable vorbis music-ogg) \
                || die