diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-11 21:40:25 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-11 21:40:25 +0000 |
| commit | 0849277a07367cd8b74cf35d9f277947e3039d4c (patch) | |
| tree | 048c4e62423f8099eff66a8b3de78f43be972e4a /media-gfx | |
| parent | Fix issue with paths being prefixed with /usr/local. Correctly move everythin... (diff) | |
| download | gentoo-2-0849277a07367cd8b74cf35d9f277947e3039d4c.tar.gz gentoo-2-0849277a07367cd8b74cf35d9f277947e3039d4c.tar.bz2 gentoo-2-0849277a07367cd8b74cf35d9f277947e3039d4c.zip | |
depend on slot 0 for ffmpeg
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/blender/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.68.ebuild | 4 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.68a.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 638b017ca6ba..640d5d8eea3c 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.255 2013/07/23 17:04:41 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.256 2013/08/11 21:40:25 aballier Exp $ + + 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> blender-2.68.ebuild, + blender-2.68a.ebuild: + depend on slot 0 for ffmpeg *blender-2.68a (23 Jul 2013) diff --git a/media-gfx/blender/blender-2.68.ebuild b/media-gfx/blender/blender-2.68.ebuild index 117876ed6d61..a2ae90c9c55c 100644 --- a/media-gfx/blender/blender-2.68.ebuild +++ b/media-gfx/blender/blender-2.68.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-gfx/blender/blender-2.68.ebuild,v 1.2 2013/07/21 00:09:14 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.68.ebuild,v 1.3 2013/08/11 21:40:25 aballier Exp $ # TODO: # bundled-deps: bullet is modified @@ -63,7 +63,7 @@ RDEPEND=" ) ffmpeg? ( || ( - media-video/ffmpeg[x264,mp3,encode,theora,jpeg2k?] + media-video/ffmpeg:0[x264,mp3,encode,theora,jpeg2k?] >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] ) ) diff --git a/media-gfx/blender/blender-2.68a.ebuild b/media-gfx/blender/blender-2.68a.ebuild index 4e8ea2ee82be..f30b19943553 100644 --- a/media-gfx/blender/blender-2.68a.ebuild +++ b/media-gfx/blender/blender-2.68a.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-gfx/blender/blender-2.68a.ebuild,v 1.1 2013/07/23 17:04:41 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.68a.ebuild,v 1.2 2013/08/11 21:40:25 aballier Exp $ # TODO: # bundled-deps: bullet is modified @@ -63,7 +63,7 @@ RDEPEND=" ) ffmpeg? ( || ( - media-video/ffmpeg[x264,mp3,encode,theora,jpeg2k?] + media-video/ffmpeg:0[x264,mp3,encode,theora,jpeg2k?] >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] ) ) |