diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2009-10-10 12:58:32 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2009-10-10 12:58:32 +0000 |
| commit | 6e5307d1fc69e49af9f09cd9293194c071269731 (patch) | |
| tree | 4a188cf7f8d70d6fd2e145718857512703b3bdb3 /media-video | |
| parent | Merge from Prefix (diff) | |
| download | gentoo-2-6e5307d1fc69e49af9f09cd9293194c071269731.tar.gz gentoo-2-6e5307d1fc69e49af9f09cd9293194c071269731.tar.bz2 gentoo-2-6e5307d1fc69e49af9f09cd9293194c071269731.zip | |
Fixing samba deps in live ebuilds too
(Portage version: 2.2_rc44/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/vlc-1.0.9999.ebuild | 5 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 36c3cb54e55d..5f83a497bc8f 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.517 2009/10/10 10:46:03 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.518 2009/10/10 12:58:32 patrick Exp $ + + 10 Oct 2009; Patrick Lauer <patrick@gentoo.org> vlc-1.0.9999.ebuild, + vlc-9999.ebuild: + Fixing samba deps in live ebuilds too 10 Oct 2009; Patrick Lauer <patrick@gentoo.org> vlc-1.0.2.ebuild: Fixing samba deps for samba 3.4, fixes #288381. diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild index f3fec375b597..0e8fefe834dc 100644 --- a/media-video/vlc/vlc-1.0.9999.ebuild +++ b/media-video/vlc/vlc-1.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.28 2009/10/02 22:29:38 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.29 2009/10/10 12:58:32 patrick Exp $ EAPI="2" @@ -123,7 +123,8 @@ RDEPEND=" pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) - samba? ( net-fs/samba ) + samba? ( || ( >=net-fs/samba-libs-3.4[smbclient] + <net-fs/samba-3.4 ) ) schroedinger? ( >=media-libs/schroedinger-1.0.6 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image ) ) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 46a3b3631db7..90b8f3f3f292 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.41 2009/09/30 12:56:40 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.42 2009/10/10 12:58:32 patrick Exp $ EAPI="2" @@ -122,7 +122,8 @@ RDEPEND=" pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) - samba? ( net-fs/samba ) + samba? ( || ( >=net-fs/samba-libs-3.4[smbclient] + <net-fs/samba-3.4 ) ) schroedinger? ( >=media-libs/schroedinger-1.0.6 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) |