From 6993498d4785e895e2efdd99f43381d10859a6a6 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sun, 18 Jul 2010 10:43:05 +0000 Subject: [PATCH] block up to 1.1 for master, we still have the relink issue Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-video/vlc/ChangeLog | 5 ++++- media-video/vlc/Manifest | 10 +++++----- media-video/vlc/vlc-9999.ebuild | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 086f5788ff63..6816557268b7 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/vlc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.604 2010/07/18 10:28:20 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.605 2010/07/18 10:43:05 aballier Exp $ + + 18 Jul 2010; Alexis Ballier vlc-9999.ebuild: + block up to 1.1 for master, we still have the relink issue 18 Jul 2010; Alexis Ballier vlc-9999.ebuild: ggi, svga and opengl output modules have been removed diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 25b83b28ac76..0abd4c61e628 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -10,13 +10,13 @@ DIST vlc-patches-86.tar.bz2 3359 RMD160 29db216fa1424db0ad5cb0a129b01d01ab08141b EBUILD vlc-1.0.6.ebuild 12224 RMD160 5a6b842122fb912a688c23e23dd8aaff77d1532c SHA1 2dd9d563450ae53fd833fc4d6de9ddda288d41ec SHA256 a451ef21f95174ee1bbd78526c233d7c414efe64e66dca5b487089921d6f3055 EBUILD vlc-1.1.0.ebuild 11752 RMD160 616836aa32714977f659c48535fe853516af0c74 SHA1 fc327f31d838b05733b36b9780f7ac94bb7966c3 SHA256 4d76197ede14db58c9e63049c59fa42db01e689cfbc8f92befd7930d66a098c9 EBUILD vlc-1.1.9999.ebuild 11721 RMD160 cf95b70fe39ec11b69853ba1ef9185730393565a SHA1 982f5a94b96f889df7e6063bc9813b81f09c2715 SHA256 57a25067344f17a8a88a238851942631bdf264c788256ebd7ab16f3f43d26496 -EBUILD vlc-9999.ebuild 11574 RMD160 fa5d42d493e59eb833a41a54d481f3c752e0a55c SHA1 b955a255a850034f28cd0589d466b0774c765e56 SHA256 0b2355657cb96fc7da721faf0458e93892eb70767fcc8a85237bcdae3769c80b -MISC ChangeLog 93498 RMD160 b2dbbe2d82d38001470223abf660860f15b32ee3 SHA1 f3f9b325252a14c7d720836911474161e27326b1 SHA256 c076cef71b151d1051dbeeb07a84226330c55a32e37d05bd31b98acc0aaacb33 +EBUILD vlc-9999.ebuild 11574 RMD160 0c7d1387bd1b62bd775e402cff0c8ecebc6f5613 SHA1 53917bf08d10d0915111a475eed3dedfec06d1f1 SHA256 43a73d7614001cc5379a01bdfd8677cbed745bc7d74916dc7ae75825573e6020 +MISC ChangeLog 93629 RMD160 1a2af7fca7385e13c04f27f82a3c5f8d21716072 SHA1 7bf2f32c83b275e6f3cba1f352070bcdde9d045a SHA256 a6acb50557d2b5c40bf5b9d6bd61319521102667bc55e80fc51ee0d3ea9711ec MISC metadata.xml 4410 RMD160 a45aa6995938c863a9f9c351471392fd91d88119 SHA1 36bb27e88806dea7926b3965fb14afcdbfe5653c SHA256 7e240147c0cffdb48ac2736144e6064396c765d1627ff22c1d4fac6f2b6473a4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkxC10MACgkQvFcC4BYPU0oj1QCfc4IGy8oy9Wjvz2FTnOTcNXq+ -wv0AnjFcWIN8BmNz7Vk81PHBCXLXyZ8I -=CY5t +iEYEARECAAYFAkxC2rcACgkQvFcC4BYPU0o1NACgxk+HXdA7jl3DIMlGlrJC3y+M +oFsAoL12Huv3T4pvF6X7GfpmF788Pefr +=tcBY -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 370e89c26561..57a2fde055a3 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.83 2010/07/18 10:28:20 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.84 2010/07/18 10:43:05 aballier Exp $ EAPI="3" @@ -141,7 +141,7 @@ RDEPEND=" " DEPEND="${RDEPEND} - !!<=media-video/vlc-1.0.99999 + !!<=media-video/vlc-1.1.99999 dvb? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) v4l? ( sys-kernel/linux-headers ) -- 2.26.2