summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-11 22:59:17 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-11 22:59:17 +0000
commitff8645aa2c876ab4f51b6e36a342ef113b822aa2 (patch)
tree2d5d7a39243d4a91fb6b4e447fc1982739da1f64 /net-p2p
parentdepend on ffmpeg:0 (diff)
downloadgentoo-2-ff8645aa2c876ab4f51b6e36a342ef113b822aa2.tar.gz
gentoo-2-ff8645aa2c876ab4f51b6e36a342ef113b822aa2.tar.bz2
gentoo-2-ff8645aa2c876ab4f51b6e36a342ef113b822aa2.zip
depend on ffmpeg:0
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/tribler/ChangeLog6
-rw-r--r--net-p2p/tribler/tribler-6.0.3.ebuild4
-rw-r--r--net-p2p/tribler/tribler-6.1.0.ebuild4
-rw-r--r--net-p2p/tribler/tribler-6.2.0.ebuild4
4 files changed, 11 insertions, 7 deletions
diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
index b39a3fbe592f..2f452a2b3ffa 100644
--- a/net-p2p/tribler/ChangeLog
+++ b/net-p2p/tribler/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-p2p/tribler
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.48 2013/08/02 13:31:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.49 2013/08/11 22:59:17 aballier Exp $
+
+ 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> tribler-6.0.3.ebuild,
+ tribler-6.1.0.ebuild, tribler-6.2.0.ebuild:
+ depend on ffmpeg:0
*tribler-6.2.0 (02 Aug 2013)
diff --git a/net-p2p/tribler/tribler-6.0.3.ebuild b/net-p2p/tribler/tribler-6.0.3.ebuild
index cc57ab6100a9..e162d0fa85d0 100644
--- a/net-p2p/tribler/tribler-6.0.3.ebuild
+++ b/net-p2p/tribler/tribler-6.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.0.3.ebuild,v 1.5 2013/03/23 19:46:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.0.3.ebuild,v 1.6 2013/08/11 22:59:17 aballier Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -30,7 +30,7 @@ RDEPEND="
dev-python/wxpython
vlc? (
media-video/vlc
- media-video/ffmpeg
+ media-video/ffmpeg:0
)"
DEPEND="${RDEPEND}
diff --git a/net-p2p/tribler/tribler-6.1.0.ebuild b/net-p2p/tribler/tribler-6.1.0.ebuild
index d545d6d807c1..dd45274cba99 100644
--- a/net-p2p/tribler/tribler-6.1.0.ebuild
+++ b/net-p2p/tribler/tribler-6.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.1.0.ebuild,v 1.1 2013/05/10 01:32:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.1.0.ebuild,v 1.2 2013/08/11 22:59:17 aballier Exp $
EAPI="5"
PYTHON_DEPEND="2"
@@ -30,7 +30,7 @@ RDEPEND="
net-libs/rb_libtorrent
vlc? (
media-video/vlc
- media-video/ffmpeg
+ media-video/ffmpeg:0
)"
DEPEND="${RDEPEND}
diff --git a/net-p2p/tribler/tribler-6.2.0.ebuild b/net-p2p/tribler/tribler-6.2.0.ebuild
index 891c867147cd..e8038276f7dd 100644
--- a/net-p2p/tribler/tribler-6.2.0.ebuild
+++ b/net-p2p/tribler/tribler-6.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.2.0.ebuild,v 1.1 2013/08/02 13:31:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.2.0.ebuild,v 1.2 2013/08/11 22:59:17 aballier Exp $
EAPI="5"
PYTHON_DEPEND="2"
@@ -30,7 +30,7 @@ RDEPEND="
net-libs/rb_libtorrent
vlc? (
media-video/vlc
- media-video/ffmpeg
+ media-video/ffmpeg:0
)"
DEPEND="${RDEPEND}