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 | 2a28ea3e87c62153a701cca9c7295c6cbffa5ec3 (patch) | |
| tree | 81433ee3ed2bbbc11077fff261214a647699fa80 /media-video | |
| parent | Merge from Prefix (diff) | |
| download | historical-2a28ea3e87c62153a701cca9c7295c6cbffa5ec3.tar.gz historical-2a28ea3e87c62153a701cca9c7295c6cbffa5ec3.tar.bz2 historical-2a28ea3e87c62153a701cca9c7295c6cbffa5ec3.zip | |
Fixing samba deps in live ebuilds too
Package-Manager: portage-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/Manifest | 6 | ||||
| -rw-r--r-- | media-video/vlc/vlc-1.0.9999.ebuild | 5 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 5 |
4 files changed, 14 insertions, 8 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/Manifest b/media-video/vlc/Manifest index e4c814af83cc..2304e2b7d895 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -7,7 +7,7 @@ DIST vlc-patches-77.tar.bz2 8054 RMD160 fbab51b6f9867880b272d27803112dff46d1bbdd DIST vlc-patches-78.tar.bz2 7106 RMD160 44575d5236cf753cadb1611ba032b6ce6dd78bf5 SHA1 2c8be84e9988d358347f7cf58415b13dd214cd6e SHA256 0586e95fb793bb0d24d890cd9cbe6cc6ae26857e9a6e95729bc3b96526769ad3 EBUILD vlc-0.9.10.ebuild 11217 RMD160 3e74034201c55964f4b415859af65b2cfacbe77b SHA1 404de36f361fa4859f04426e7334cd902e42ff35 SHA256 63de3fdeef487c7af556b9203ac58af408b10434a686c3646d11793b76f096aa EBUILD vlc-1.0.2.ebuild 12004 RMD160 4b0f0853665d064c59edc0dcdd73b831589acdd3 SHA1 5779e16c7ba49348aa024ac286d891aa6b6206ec SHA256 8bc2a7d93d75bb251bc43d30eaa797fe22d1dfe683d651396f4f2f4fe13fe571 -EBUILD vlc-1.0.9999.ebuild 11915 RMD160 b9a1c377daee631b029f969b93601f0b242c7356 SHA1 0cbe401e27fecd779b6084c8e220ece42981970f SHA256 df32ef0723b777bc47d1e82f25b287a163cf90a3187aea9d4b81ea6a4f38da76 -EBUILD vlc-9999.ebuild 11847 RMD160 5cd40612df6dc3531b6335fbeafc07734cf8ec2e SHA1 da8f25799d428593fd1449531152485e3628b699 SHA256 922731dccdc3ee953143d4d23a357a3259a0cd4cf8c9e2b57aa8bca31aa963b7 -MISC ChangeLog 81657 RMD160 44715954677771b37968b942d076c97843745158 SHA1 8e5502a1ad502fc1f54f1e61c22d9fbc8bb52dd4 SHA256 f5e8d1e02f3efc8b13d6d8ac89b19d987bd317b5099091ea6ac686e346b1bc3c +EBUILD vlc-1.0.9999.ebuild 11965 RMD160 725bb415ab31182b398f0f15ec6314ed5996bade SHA1 11e80b0b3d6e24f90cb4d3d0a9f525e8449f0d84 SHA256 7379ec069938beeed72ea62eef991889ea8781448a7740f36022c5d4f182e65e +EBUILD vlc-9999.ebuild 11899 RMD160 39f47f07669fb9ebc29db16ebb60546d5483735c SHA1 9b9bea84effd955eaad773b5bb72b212abeb9afe SHA256 535f58923e3db4eef48a16be4024dcb1346df8fbe43014c56634e72227f167f3 +MISC ChangeLog 81788 RMD160 56084ad5e534fe32ab90007576ec0148e94f3e90 SHA1 541feb0fc3d7a6675efe0ac91299c301121a1079 SHA256 5c9383e9342c39328cfb720c3034c2c85c52ef3f37bec597a0ab603242703863 MISC metadata.xml 4017 RMD160 2f8beef230b8a858e6653b52d1c86e7f5c66f54e SHA1 874fd0d99f1233ce5ed5f09493ce4d7ba68df9a4 SHA256 4831b6f500d5051ebfbb96f04679dc7574296f5f439707a87564c62050ba21d0 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 ) ) |