Switch to CPU_FLAGS_X86.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 16 insertions, 12 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index d101303bcf17..a8eced2ac662 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.221 2014/12/09 10:07:12 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.222 2015/01/29 19:15:57 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> mjpegtools-2.1.0-r1.ebuild,
+  mjpegtools-2.1.0-r2.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   09 Dec 2014; Jeroen Roovers <jer@gentoo.org> mjpegtools-2.1.0-r2.ebuild:
   Stable for HPPA (bug #525770).
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild
index 45cd91f0524c..fd165634bc29 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild,v 1.10 2014/06/10 21:06:49 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild,v 1.11 2015/01/29 19:15:57 mgorny Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE="dga dv gtk mmx png quicktime sdl sdlgfx static-libs v4l"
+IUSE="dga dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs v4l"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
 RDEPEND="virtual/jpeg
@@ -29,7 +29,7 @@ RDEPEND="virtual/jpeg
 	)"
 
 DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )
+	cpu_flags_x86_mmx? ( dev-lang/nasm )
 	>=sys-apps/sed-4
 	virtual/awk
 	virtual/pkgconfig"
@@ -52,7 +52,7 @@ src_configure() {
 
 	econf \
 		--enable-compile-warnings \
-		$(use_enable mmx simd-accel) \
+		$(use_enable cpu_flags_x86_mmx simd-accel) \
 		$(use_enable static-libs static) \
 		--enable-largefile \
 		$(use_with quicktime libquicktime) \
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
index 356cc442e814..6bf0cee9d672 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild,v 1.5 2014/12/09 10:07:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild,v 1.6 2015/01/29 19:15:57 mgorny Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="dv gtk mmx png quicktime sdl sdlgfx static-libs v4l"
+IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs v4l"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
 RDEPEND=">=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]
@@ -27,7 +27,7 @@ RDEPEND=">=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]
 	)"
 
 DEPEND="${RDEPEND}
-	mmx? ( dev-lang/nasm )
+	cpu_flags_x86_mmx? ( dev-lang/nasm )
 	>=sys-apps/sed-4
 	virtual/awk
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
@@ -59,7 +59,7 @@ multilib_src_configure() {
 
 	local myconf=(
 		--enable-compile-warnings
-		$(use_enable mmx simd-accel)
+		$(use_enable cpu_flags_x86_mmx simd-accel)
 		$(use_enable static-libs static)
 		--enable-largefile