remove old libX11 and samba deps

Package-Manager: portage-2.2.0_alpha62/cvs/Linux x86_64

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 31f3fd225de5438c3789f228546d241a488ea563..96d82a6f8c0c4a652f21e8d297b3108324c9ccf7 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.743 2011/10/06 20:47:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.744 2011/10/06 20:51:39 aballier Exp $
+
+  06 Oct 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
+  remove old libX11 and samba deps
 
 *vlc-1.1.12 (06 Oct 2011)
 

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 18092904c9f4e2ff24d05774f5ce687beea51dca..8961a80acd0cd42c8649f56904ed2ed6ae34d1d7 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -8,13 +8,13 @@ DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525
 EBUILD vlc-1.1.11.ebuild 12434 RMD160 841ccd134aefacdaf865478cb9cc70225b2e6a65 SHA1 69b27da2bff3f063981711beb585e55cf834f90c SHA256 941fe6c49003c443920845246e57a3d6ce4b38edd6780a59cc264b8c2dc92f12
 EBUILD vlc-1.1.12.ebuild 12440 RMD160 16b472dfe7c82accdfc54bd28aa96d7170435b94 SHA1 337610446845b5aac8a068d2ab184106b89c53d9 SHA256 b77e9a876501447b6fd098a70dbaf7286961f8b3c654bacf26c860949a94575e
 EBUILD vlc-1.1.9999.ebuild 12347 RMD160 2c6e70371161e8def7ef908338917ee0561414db SHA1 d8ca1b960700e7ae68c62a465e62b80449bc308a SHA256 b7f47cdc537b0ec0b334cf7f85269f20eb01e976c2855fdc3921de7539958d78
-EBUILD vlc-9999.ebuild 10918 RMD160 0b99b52040aa5621513499f820870f8fcbfc13cd SHA1 638b33d492ca30066f92289dda664163e9405475 SHA256 26ca8b5f6e36bb207818fcea2f0a1e71070e9467bf3b57bb9ee7da6437dd3bb1
-MISC ChangeLog 110534 RMD160 600a9f54770c05208b3557c5e903122b13c73632 SHA1 fd4d238c26b3f0f7fb4bf7d86acdb1b65757b962 SHA256 8d889b339d03ce44213c873cf5d3a5d21bd39eba891a533108b122fc3e1e321e
+EBUILD vlc-9999.ebuild 10853 RMD160 2550f8da3a2b517e8dd5fe83739952777cf35de9 SHA1 a299cb59887f0c938bb47d0edb1b5a3ea556033c SHA256 046a511f09d5e30f8f18b8ae3fc5b1e5c02fbc6068c65f2b891dc02c5121b4e1
+MISC ChangeLog 110639 RMD160 7ac636e382d84abe62e89855ae5a7d0d266bbdce SHA1 1884fdcc2d8823f994735a2f4e8397699140fb84 SHA256 7bc9a10c689d7a3a54e67e279a88446639908b6c20a80d854a6d2681f498a4c4
 MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6OE98ACgkQvFcC4BYPU0rj/gCfV0foi5PYqueW3AepWcpQJ6i3
-XfIAoIfP1xuwnVMxf36WjqTDfc7bS9hv
-=Zji1
+iEYEARECAAYFAk6OFQoACgkQvFcC4BYPU0pCSwCeNlp6Nqn27VSltBpxUm6MI54B
++1QAoJz+G+xRKlhWmZ+LT7q7R753X29r
+=kZUu
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 4d759075c24f0ccbef9ff2c21fbb86a88259b2d4..6697b61d83949997503044b49b55b0ff3bf77f88 100644 (file)
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.149 2011/09/22 15:29:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.150 2011/10/06 20:51:39 aballier Exp $
 
 EAPI="4"
 
@@ -109,14 +109,14 @@ RDEPEND="
                musepack? ( >=media-sound/musepack-tools-444 )
                ncurses? ( sys-libs/ncurses )
                ogg? ( media-libs/libogg )
-               opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
+               opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
                png? ( media-libs/libpng sys-libs/zlib )
                portaudio? ( >=media-libs/portaudio-19_pre )
                postproc? ( virtual/ffmpeg )
                projectm? ( media-libs/libprojectm )
                pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
                qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
-               samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
+               samba? ( >=net-fs/samba-3.4.6[smbclient] )
                schroedinger? ( >=media-libs/schroedinger-1.0.10 )
                sdl? ( >=media-libs/libsdl-1.2.8
                        sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )