mgorny 14/06/12 14:14:17 Modified: ffmpeg-9999.ebuild ffmpeg-2.2.3-r1.ebuild ChangeLog Log: Add missing emul-linux-x86 blocker. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.156 media-video/ffmpeg/ffmpeg-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.156&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.156&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.155&r2=1.156 Index: ffmpeg-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- ffmpeg-9999.ebuild 11 Jun 2014 20:54:53 -0000 1.155 +++ ffmpeg-9999.ebuild 12 Jun 2014 14:14:17 -0000 1.156 @@ -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/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.155 2014/06/11 20:54:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.156 2014/06/12 14:14:17 mgorny Exp $ EAPI="5" @@ -171,6 +171,11 @@ truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " + +RDEPEND="${RDEPEND} + abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" + # faac is license-incompatible with ffmpeg REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) 1.2 media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild?r1=1.1&r2=1.2 Index: ffmpeg-2.2.3-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ffmpeg-2.2.3-r1.ebuild 11 Jun 2014 20:54:53 -0000 1.1 +++ ffmpeg-2.2.3-r1.ebuild 12 Jun 2014 14:14:17 -0000 1.2 @@ -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/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v 1.1 2014/06/11 20:54:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v 1.2 2014/06/12 14:14:17 mgorny Exp $ EAPI="5" @@ -171,6 +171,11 @@ truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " + +RDEPEND="${RDEPEND} + abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" + # faac is license-incompatible with ffmpeg REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) 1.748 media-video/ffmpeg/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.748&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.748&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.747&r2=1.748 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v retrieving revision 1.747 retrieving revision 1.748 diff -u -r1.747 -r1.748 --- ChangeLog 11 Jun 2014 20:54:53 -0000 1.747 +++ ChangeLog 12 Jun 2014 14:14:17 -0000 1.748 @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.747 2014/06/11 20:54:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.748 2014/06/12 14:14:17 mgorny Exp $ + + 12 Jun 2014; Michał Górny <[email protected]> ffmpeg-2.2.3-r1.ebuild, + ffmpeg-9999.ebuild: + Add missing emul-linux-x86 blocker. *ffmpeg-2.2.3-r1 (11 Jun 2014)
