Remove sdl-image automagic, added as a useflag, bug #165177

(Portage version: 2.1.2-r9)

3 files changed, 13 insertions, 8 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 7cf9d0960a3b..03c67b2cbe4e 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.215 2007/02/10 10:50:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.216 2007/02/10 14:35:40 aballier Exp $
+
+  10 Feb 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6_p18636.ebuild:
+  Remove sdl-image automagic, added as a useflag, bug #165177
 
   10 Feb 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6-r1.ebuild,
   vlc-0.8.6_p18636.ebuild:
diff --git a/media-video/vlc/files/digest-vlc-0.8.6_p18636 b/media-video/vlc/files/digest-vlc-0.8.6_p18636
index d131ec6515d4..7e23258501b0 100644
--- a/media-video/vlc/files/digest-vlc-0.8.6_p18636
+++ b/media-video/vlc/files/digest-vlc-0.8.6_p18636
@@ -1,6 +1,6 @@
 MD5 32efedc258bb97c935f501a75c83c980 vlc-0.8.6_p18636.tar.bz2 10732448
 RMD160 7be1851933e13cb8938ace4139324fae1485eaa1 vlc-0.8.6_p18636.tar.bz2 10732448
 SHA256 8d1dbee4b95f460457beddfa02fd4ab9ff162815e9d82f11a96c4e4f03aa09fe vlc-0.8.6_p18636.tar.bz2 10732448
-MD5 6be0e25388c648db5fc3dfa4f171f8c6 vlc-patches-34.tar.bz2 10391
-RMD160 403f755734ed1fbb2c63346547ca91bd37ef227f vlc-patches-34.tar.bz2 10391
-SHA256 0d50a8b1c1104dcd4603d105990db36d90a3880c5e00ecdf65579a23f71d4fc6 vlc-patches-34.tar.bz2 10391
+MD5 fdab9a3cd8b160d293f00f2076f1e3e6 vlc-patches-35.tar.bz2 11019
+RMD160 a79a774e94be36824745d415a7743d4b74abc76e vlc-patches-35.tar.bz2 11019
+SHA256 3b74d69405b107569b47b33342e78d7c7ef8ac10cdc486bef6803975853405fa vlc-patches-35.tar.bz2 11019
diff --git a/media-video/vlc/vlc-0.8.6_p18636.ebuild b/media-video/vlc/vlc-0.8.6_p18636.ebuild
index 8078e234358a..6fd56f2ab90e 100644
--- a/media-video/vlc/vlc-0.8.6_p18636.ebuild
+++ b/media-video/vlc/vlc-0.8.6_p18636.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_p18636.ebuild,v 1.3 2007/02/10 10:50:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_p18636.ebuild,v 1.4 2007/02/10 14:35:40 aballier Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -13,7 +13,7 @@ MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 
-PATCHLEVEL="34"
+PATCHLEVEL="35"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 
@@ -36,7 +36,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l cdda ogg matroska
 dvb dvd vcd dts flac mpeg vorbis theora X opengl truetype svg fbcon svga
 oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream
-mp3 xv bidi sdl png xml samba daap corba mod speex shout rtsp
+mp3 xv bidi sdl sdl-image png xml samba daap corba mod speex shout rtsp
 win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
 optimisememory libnotify"
 
@@ -80,7 +80,8 @@ RDEPEND="
 		sys-libs/zlib
 		png? ( media-libs/libpng )
 		media-libs/libdvbpsi
-		sdl? ( >=media-libs/libsdl-1.2.8 )
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image ) )
 		xml? ( dev-libs/libxml2 )
 		samba? ( net-fs/samba )
 		vcd? ( >=dev-libs/libcdio-0.72
@@ -220,6 +221,7 @@ src_compile () {
 		$(use_enable ggi) \
 		$(use_enable 3dfx glide) \
 		$(use_enable sdl) \
+		$(use_enable sdl-image) \
 		$(use_enable png) \
 		$(use_enable xml libxml2) \
 		$(use_enable samba smb) \