diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-04-14 18:34:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-04-14 18:34:49 +0000 |
| commit | 2a98e3061d18cb6ab04d6829a2020f97943c5199 (patch) | |
| tree | 06329c02bc29310016e565bd4c8cd2abf0a62166 /media-video | |
| parent | Add net-proxy/leechcraft-xproxy, thanks to 0xd34df00d (diff) | |
| download | gentoo-2-2a98e3061d18cb6ab04d6829a2020f97943c5199.tar.gz gentoo-2-2a98e3061d18cb6ab04d6829a2020f97943c5199.tar.bz2 gentoo-2-2a98e3061d18cb6ab04d6829a2020f97943c5199.zip | |
Add ~amd64-linux keyword.
(Portage version: 2.2.0_alpha100_p7/cvs/Linux i686, RepoMan options: --force)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.10.2.ebuild | 4 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 14772a571661..a7868416926f 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.543 2012/04/12 12:21:37 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.544 2012/04/14 18:34:49 zmedico Exp $ + + 14 Apr 2012; Zac Medico <zmedico@gentoo.org> ffmpeg-0.10.2.ebuild, + ffmpeg-9999.ebuild: + Add ~amd64-linux keyword. 12 Apr 2012; Andreas Schuerch <nativemad@gentoo.org> ffmpeg-0.10.2.ebuild: x86 stable, see bug 411369 diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild b/media-video/ffmpeg/ffmpeg-0.10.2.ebuild index c863d3eaec3d..ed27836cc244 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.10.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.8 2012/04/12 12:21:37 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.9 2012/04/14 18:34:49 zmedico Exp $ EAPI="4" @@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}" LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )" SLOT="0" if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" + KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" fi IUSE=" aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index b06c9f755f96..190309cb66f9 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.85 2012/04/11 13:44:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.86 2012/04/14 18:34:49 zmedico Exp $ EAPI="4" @@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}" LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )" SLOT="0" if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" fi IUSE=" aac aacplus alsa amr ass bindist bluray +bzip2 cdio celt cpudetection debug |