Dont RDEPEND on audiofile if USE=noaudio #108091 by Brice Arnould.

Package-Manager: portage-2.0.51.22-r2

7 files changed, 29 insertions, 27 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 466a7694f82d..7381725eadb8 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.90 2005/10/04 23:33:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.91 2005/10/05 00:34:45 vapier Exp $
+
+  05 Oct 2005; Mike Frysinger <vapier@gentoo.org> libsdl-1.2.6-r3.ebuild,
+  libsdl-1.2.7-r3.ebuild, libsdl-1.2.8-r1.ebuild, libsdl-1.2.9.ebuild,
+  libsdl-1.2.9-r1.ebuild:
+  Dont RDEPEND on audiofile if USE=noaudio #108091 by Brice Arnould.
 
   04 Oct 2005; Mike Frysinger <vapier@gentoo.org>
   +files/libsdl-1.2.9-PIC-yuv-mmx.patch, libsdl-1.2.9-r1.ebuild:
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 21639face904..f13a9be565f3 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -2,12 +2,12 @@
 Hash: SHA1
 
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
-MD5 a7bcf0ea25253af8bba0031c22f14e5b libsdl-1.2.9.ebuild 4215
-MD5 7f079469132865bdd25780277639f098 libsdl-1.2.7-r3.ebuild 3960
-MD5 cbbab78f5125f834ffb0f83be4957736 libsdl-1.2.6-r3.ebuild 3013
-MD5 db2452f2f79d4148c9948fd21b118bce libsdl-1.2.9-r1.ebuild 4562
-MD5 4e4caa64c5b89522b2f0e284282eafe6 libsdl-1.2.8-r1.ebuild 5004
-MD5 f8a050f4f26850f854060b399dbb291c ChangeLog 14281
+MD5 741ea667dd2543b0155d32ae2d5a5126 libsdl-1.2.9.ebuild 4229
+MD5 3ce9b61a50a330133454637dccdbb9e9 libsdl-1.2.7-r3.ebuild 3968
+MD5 33a794f49d333129e866fc0f51ea6ddb libsdl-1.2.6-r3.ebuild 3023
+MD5 39999fa0e8ce011aa4911cbc46d07955 libsdl-1.2.9-r1.ebuild 4574
+MD5 70a9110d4bc653c86cf8fde1b9e59840 libsdl-1.2.8-r1.ebuild 5016
+MD5 67ef3b5c87b5a5c1bc27b5887d9b757c ChangeLog 14522
 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.8-nobuggy-X.patch 568
 MD5 e0c6c6ffc15475282fc864b8f52f0abf files/1.2.8-linux26.patch 1268
 MD5 25b8b048d7e5d2a6edc59a66f34566e7 files/libsdl-1.2.9-PIC-load-mmx-masks-from-stack.patch 3901
@@ -45,7 +45,7 @@ MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDQxGugIKl8Uu19MoRAonUAJ9qaRBOPmP5mik9DU5GNfuNM0Mg6ACeIMQP
-dUbNhOjZOlmpqsvlV6/aC9A=
-=QaKb
+iD8DBQFDQx/+gIKl8Uu19MoRAlTHAJ49iKrg223/XePT6fEel1mw/h/1mwCdEeeQ
+pMbwHQtViWXs9ogoEveUxGw=
+=L06K
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/libsdl-1.2.6-r3.ebuild b/media-libs/libsdl/libsdl-1.2.6-r3.ebuild
index d166cdab6e73..2fe8ee6ebc36 100644
--- a/media-libs/libsdl/libsdl-1.2.6-r3.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.6-r3.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/libsdl/libsdl-1.2.6-r3.ebuild,v 1.15 2005/02/25 21:02:09 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.6-r3.ebuild,v 1.16 2005/10/05 00:34:45 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
 IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl noaudio novideo nojoystick"
 # if you disable audio/video/joystick and something breaks, you pick up the pieces
 
-RDEPEND=">=media-libs/audiofile-0.1.9
+RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	esd? ( >=media-sound/esound-0.2.19 )
 	arts? ( kde-base/arts )
diff --git a/media-libs/libsdl/libsdl-1.2.7-r3.ebuild b/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
index 8ab8da4c66e8..e7436ea0b21c 100644
--- a/media-libs/libsdl/libsdl-1.2.7-r3.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.7-r3.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/libsdl/libsdl-1.2.7-r3.ebuild,v 1.10 2005/02/25 21:02:09 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r3.ebuild,v 1.11 2005/10/05 00:34:45 vapier Exp $
 
 inherit toolchain-funcs fixheadtails eutils gnuconfig flag-o-matic
 
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick"
 # if you disable audio/video/joystick and something breaks, you pick up the pieces
 
-RDEPEND=">=media-libs/audiofile-0.1.9
+RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	esd? ( >=media-sound/esound-0.2.19 )
 	arts? ( kde-base/arts )
@@ -29,7 +29,7 @@ RDEPEND=">=media-libs/audiofile-0.1.9
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
 
-S="${WORKDIR}/SDL-${PV}"
+S=${WORKDIR}/SDL-${PV}
 
 pkg_setup() {
 	if use noaudio || use novideo || use nojoystick ; then
diff --git a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
index 835c9a4913a8..57ad298497e4 100644
--- a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.8-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/libsdl/libsdl-1.2.8-r1.ebuild,v 1.21 2005/09/27 23:29:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.22 2005/10/05 00:34:45 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -17,12 +17,11 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 sparc x86"
 # bug reports to be marked INVALID.
 IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca pic noaudio novideo nojoystick noflagstrip"
 
-RDEPEND=">=media-libs/audiofile-0.1.9
+RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	esd? ( >=media-sound/esound-0.2.19 )
 	arts? ( kde-base/arts )
-	nas? ( media-libs/nas
-		virtual/x11 )
+	nas? ( media-libs/nas virtual/x11 )
 	X? ( virtual/x11 )
 	directfb? ( >=dev-libs/DirectFB-0.9.19 )
 	ggi? ( >=media-libs/libggi-2.0_beta3 )
diff --git a/media-libs/libsdl/libsdl-1.2.9-r1.ebuild b/media-libs/libsdl/libsdl-1.2.9-r1.ebuild
index b8793430d4a9..0bcb5d9d25e9 100644
--- a/media-libs/libsdl/libsdl-1.2.9-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.9-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/libsdl/libsdl-1.2.9-r1.ebuild,v 1.2 2005/10/04 23:33:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9-r1.ebuild,v 1.3 2005/10/05 00:34:45 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -17,12 +17,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x8
 # bug reports to be marked INVALID.
 IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick noflagstrip"
 
-RDEPEND=">=media-libs/audiofile-0.1.9
+RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	esd? ( >=media-sound/esound-0.2.19 )
 	arts? ( kde-base/arts )
-	nas? ( media-libs/nas
-		virtual/x11 )
+	nas? ( media-libs/nas virtual/x11 )
 	X? ( virtual/x11 )
 	directfb? ( >=dev-libs/DirectFB-0.9.19 )
 	ggi? ( >=media-libs/libggi-2.0_beta3 )
diff --git a/media-libs/libsdl/libsdl-1.2.9.ebuild b/media-libs/libsdl/libsdl-1.2.9.ebuild
index a70f58696b25..f4ee02c2b267 100644
--- a/media-libs/libsdl/libsdl-1.2.9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.9.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/libsdl/libsdl-1.2.9.ebuild,v 1.6 2005/09/28 04:05:36 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9.ebuild,v 1.7 2005/10/05 00:34:45 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -17,12 +17,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x8
 # bug reports to be marked INVALID.
 IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca pic noaudio novideo nojoystick noflagstrip"
 
-RDEPEND=">=media-libs/audiofile-0.1.9
+RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	esd? ( >=media-sound/esound-0.2.19 )
 	arts? ( kde-base/arts )
-	nas? ( media-libs/nas
-		virtual/x11 )
+	nas? ( media-libs/nas virtual/x11 )
 	X? ( virtual/x11 )
 	directfb? ( >=dev-libs/DirectFB-0.9.19 )
 	ggi? ( >=media-libs/libggi-2.0_beta3 )