diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-07-04 07:14:41 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-07-04 07:14:41 +0000 |
| commit | b5449833f65f9d6397b0be7839a4203d47927699 (patch) | |
| tree | 8015484f27060b942eb8431dd7933cf6e64246d8 /media-video | |
| parent | Add sys-boot/vboot-utils. (diff) | |
| download | gentoo-2-b5449833f65f9d6397b0be7839a4203d47927699.tar.gz gentoo-2-b5449833f65f9d6397b0be7839a4203d47927699.tar.bz2 gentoo-2-b5449833f65f9d6397b0be7839a4203d47927699.zip | |
Block <media-video/ffmpeg-1.2.1 even more.
(Portage version: 2.1.12.10/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/handbrake/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/handbrake/handbrake-0.9.9.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog index a296f24fd6c6..ab3b09cd994a 100644 --- a/media-video/handbrake/ChangeLog +++ b/media-video/handbrake/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/handbrake # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.8 2013/06/29 20:35:06 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.9 2013/07/04 07:14:41 tomwij Exp $ + + 04 Jul 2013; Tom Wijsman <TomWij@gentoo.org> handbrake-0.9.9.ebuild: + Block <media-video/ffmpeg-1.2.1 even more. 29 Jun 2013; Tom Wijsman <TomWij@gentoo.org> handbrake-0.9.9.ebuild, handbrake-0.9.9_pre5441-r1.ebuild, handbrake-9999.ebuild: diff --git a/media-video/handbrake/handbrake-0.9.9.ebuild b/media-video/handbrake/handbrake-0.9.9.ebuild index 13bb6ce2197a..1b89931deb32 100644 --- a/media-video/handbrake/handbrake-0.9.9.ebuild +++ b/media-video/handbrake/handbrake-0.9.9.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/handbrake/handbrake-0.9.9.ebuild,v 1.3 2013/06/29 20:35:06 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.4 2013/07/04 07:14:41 tomwij Exp $ EAPI="5" @@ -42,7 +42,7 @@ RDEPEND=" media-libs/libvorbis media-libs/x264 media-sound/lame - ffmpeg? ( =virtual/ffmpeg-9 !<media-video/ffmpeg-1.2.1 ) + ffmpeg? ( =virtual/ffmpeg-9 !!<media-video/ffmpeg-1.2.1 ) sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 |