summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-11 23:17:55 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-11 23:17:55 +0000
commit354abec9a54433849c6500d255380db2b14fee62 (patch)
tree6e4ff1ffea01c2d95e3317ae787aca9e3851af08 /media-video
parentremove 3.9.11 kernel, it's obsolete and end-of-life 3.10 should be used instead (diff)
downloadgentoo-2-354abec9a54433849c6500d255380db2b14fee62.tar.gz
gentoo-2-354abec9a54433849c6500d255380db2b14fee62.tar.bz2
gentoo-2-354abec9a54433849c6500d255380db2b14fee62.zip
Only block ffmpeg:0, other slots are for binary compatibility and will have proper blockers.
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/libav/ChangeLog7
-rw-r--r--media-video/libav/libav-9.8.ebuild4
-rw-r--r--media-video/libav/libav-9.9999.ebuild4
-rw-r--r--media-video/libav/libav-9999.ebuild4
4 files changed, 12 insertions, 7 deletions
diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index f8db10acb864..bcbd0864fb76 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/libav
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.166 2013/07/27 11:32:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.167 2013/08/11 23:17:55 aballier Exp $
+
+ 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> libav-9.8.ebuild,
+ libav-9.9999.ebuild, libav-9999.ebuild:
+ Only block ffmpeg:0, other slots are for binary compatibility and will have
+ proper blockers.
*libav-9.8 (27 Jul 2013)
diff --git a/media-video/libav/libav-9.8.ebuild b/media-video/libav/libav-9.8.ebuild
index 80c8483b08a1..2963d48ed085 100644
--- a/media-video/libav/libav-9.8.ebuild
+++ b/media-video/libav/libav-9.8.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/media-video/libav/libav-9.8.ebuild,v 1.1 2013/07/27 11:32:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.8.ebuild,v 1.2 2013/08/11 23:17:55 aballier Exp $
EAPI=5
@@ -47,7 +47,7 @@ done
TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher"
RDEPEND="
- !media-video/ffmpeg
+ !media-video/ffmpeg:0
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
bzip2? ( app-arch/bzip2 )
diff --git a/media-video/libav/libav-9.9999.ebuild b/media-video/libav/libav-9.9999.ebuild
index 045946329ed3..67b6666be3df 100644
--- a/media-video/libav/libav-9.9999.ebuild
+++ b/media-video/libav/libav-9.9999.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/media-video/libav/libav-9.9999.ebuild,v 1.8 2013/07/10 03:07:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.9 2013/08/11 23:17:55 aballier Exp $
EAPI=5
@@ -47,7 +47,7 @@ done
TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher"
RDEPEND="
- !media-video/ffmpeg
+ !media-video/ffmpeg:0
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
bzip2? ( app-arch/bzip2 )
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 8362be86ab34..a2725dd6149d 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.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/media-video/libav/libav-9999.ebuild,v 1.61 2013/07/10 03:07:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.62 2013/08/11 23:17:55 aballier Exp $
EAPI=5
@@ -43,7 +43,7 @@ done
TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher"
RDEPEND="
- !media-video/ffmpeg
+ !media-video/ffmpeg:0
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
bzip2? ( app-arch/bzip2 )