Made smpeg conditional based on mp3 USE flag and closing bug #111395.

Package-Manager: portage-2.0.53_rc6

5 files changed, 19 insertions, 24 deletions

diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index dbbd34796592..000f5242feb4 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/sdl-mixer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.29 2005/10/10 15:01:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.30 2005/11/04 16:22:05 wolf31o2 Exp $
+
+  04 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  sdl-mixer-1.2.5-r1.ebuild, sdl-mixer-1.2.6.ebuild,
+  sdl-mixer-1.2.6-r1.ebuild:
+  Made smpeg conditional based on mp3 USE flag and closing bug #111395.
 
 *sdl-mixer-1.2.6-r1 (10 Oct 2005)
 
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index f50ad625f2ea..e10f2994fd28 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5945a1bed5e1f840d0f5532d23b852b4 ChangeLog 4261
+MD5 7c716e9117528d5569b6a234c91a149b ChangeLog 4472
 MD5 f026901e029ec31037b0bca6dc7f07d8 files/1.2.5-gcc3.patch 1235
 MD5 53b2015dae19981548f34d124a734f8e files/digest-sdl-mixer-1.2.5-r1 67
 MD5 1ca1975170b01d4da4056cc84635b608 files/digest-sdl-mixer-1.2.6 68
@@ -9,13 +6,6 @@ MD5 1ca1975170b01d4da4056cc84635b608 files/digest-sdl-mixer-1.2.6-r1 68
 MD5 b20854212133319dd5b400f71a372bcb files/sdl-mixer-1.2.5-amd64-mikmod.patch 929
 MD5 85c429a982fe437337599502a8fa6c1d files/sdl-mixer-1.2.6-mikmod-music-init.patch 260
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 375360d31ec4aa8f404bb421dc7bc39b sdl-mixer-1.2.5-r1.ebuild 1421
-MD5 e9ce06b7207658c19886d1a7ef8de16a sdl-mixer-1.2.6-r1.ebuild 1313
-MD5 23705937b9797ba254ff614c89c1b306 sdl-mixer-1.2.6.ebuild 1225
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDSoLygIKl8Uu19MoRAgk3AJ9HUcnl6gY8KnPWm3cppS9yVmu+eQCfYKdR
-bufxl5/hddhza9RNhwAjs6w=
-=TW1p
------END PGP SIGNATURE-----
+MD5 39b686f066984e4b0942a03eb596250f sdl-mixer-1.2.5-r1.ebuild 1430
+MD5 105bd937f731521730bc492e4173f68d sdl-mixer-1.2.6-r1.ebuild 1324
+MD5 f84eb8e4df8c2d8e6cc02b8f50990127 sdl-mixer-1.2.6.ebuild 1236
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 61f120f1e451..1f2989069dce 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
+# 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.5-r1.ebuild,v 1.18 2004/12/17 03:51:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild,v 1.19 2005/11/04 16:22:05 wolf31o2 Exp $
 
 inherit eutils gnuconfig
 
@@ -13,11 +13,11 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="mpeg mikmod oggvorbis"
+IUSE="mp3 mikmod oggvorbis"
 
 #	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 RDEPEND=">=media-libs/libsdl-1.2.5
-	>=media-libs/smpeg-0.4.4-r1
+	mp3? ( >=media-libs/smpeg-0.4.4-r1 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
@@ -40,7 +40,7 @@ src_unpack() {
 src_compile() {
 	econf \
 		$(use_enable mikmod mod) \
-		$(use_enable mpeg music-mp3) \
+		$(use_enable mp3 music-mp3) \
 		$(use_enable oggvorbis music-ogg) \
 		|| die
 	emake || die "emake failed"
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 24d2bb8d1028..e60e217aaa45 100644
--- 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.2 2005/10/10 15:02:14 vapier Exp $
+# $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 $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="mp3 mikmod vorbis"
 
 DEPEND=">=media-libs/libsdl-1.2.5
-	>=media-libs/smpeg-0.4.4-r1
+	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 )"
 
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.6.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.6.ebuild
index 4f50e5695ed9..7ae373e20ddd 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.6.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.6.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.ebuild,v 1.8 2005/07/09 22:58:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.6.ebuild,v 1.9 2005/11/04 16:22:05 wolf31o2 Exp $
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="Simple Direct Media Layer Mixer Library"
@@ -13,7 +13,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="mp3 mikmod vorbis"
 
 DEPEND=">=media-libs/libsdl-1.2.5
-	>=media-libs/smpeg-0.4.4-r1
+	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 )"