summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2014-07-22 10:53:52 +0000
committerAgostino Sarubbo <ago@gentoo.org>2014-07-22 10:53:52 +0000
commit13a64a7d6d3b14020326da48e9d50ad0af67b5d2 (patch)
treebb72d8ba2a98c361094f78870c4b14f625940058 /virtual/ffmpeg
parentStable for amd64, wrt bug #512912 (diff)
downloadgentoo-2-13a64a7d6d3b14020326da48e9d50ad0af67b5d2.tar.gz
gentoo-2-13a64a7d6d3b14020326da48e9d50ad0af67b5d2.tar.bz2
gentoo-2-13a64a7d6d3b14020326da48e9d50ad0af67b5d2.zip
Stable for amd64, wrt bug #512912
(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7194459F)
Diffstat (limited to 'virtual/ffmpeg')
-rw-r--r--virtual/ffmpeg/ChangeLog6
-rw-r--r--virtual/ffmpeg/ffmpeg-9-r1.ebuild4
-rw-r--r--virtual/ffmpeg/ffmpeg-9.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index 7bc03eb26a67..a04c705fb25d 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for virtual/ffmpeg
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.55 2014/06/19 08:54:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.56 2014/07/22 10:53:52 ago Exp $
+
+ 22 Jul 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-9-r1.ebuild,
+ ffmpeg-9.ebuild:
+ Stable for amd64, wrt bug #512912
19 Jun 2014; Michał Górny <mgorny@gentoo.org> ffmpeg-9-r1.ebuild:
Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/virtual/ffmpeg/ffmpeg-9-r1.ebuild b/virtual/ffmpeg/ffmpeg-9-r1.ebuild
index 11989e52012f..7129c67ae044 100644
--- a/virtual/ffmpeg/ffmpeg-9-r1.ebuild
+++ b/virtual/ffmpeg/ffmpeg-9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-9-r1.ebuild,v 1.2 2014/06/19 08:54:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-9-r1.ebuild,v 1.3 2014/07/22 10:53:52 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="X +encode gsm jpeg2k mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
RDEPEND="
diff --git a/virtual/ffmpeg/ffmpeg-9.ebuild b/virtual/ffmpeg/ffmpeg-9.ebuild
index 37f50f7109f4..94e3576ac7d2 100644
--- a/virtual/ffmpeg/ffmpeg-9.ebuild
+++ b/virtual/ffmpeg/ffmpeg-9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-9.ebuild,v 1.6 2014/02/23 19:45:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-9.ebuild,v 1.7 2014/07/22 10:53:52 ago Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="X +encode gsm jpeg2k mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
RDEPEND="