Switch to CPU_FLAGS_X86.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 34 insertions, 18 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/Manifest b/media-video/mjpegtools/Manifest
index dc65db50890b..25359c05ba80 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -5,14 +5,26 @@ AUX mjpegtools-2.1.0-no_format.patch 2800 SHA256 52e16f3fbc8181fb6da424c422dad2a
 AUX mjpegtools-2.1.0-pic.patch 2282 SHA256 1b8c08c993d01838b6fe04094c00fd07220ae543c8f115c79ffaae32edc8c5c2 SHA512 3ad9d0b488a4fcc29fab8c0cc8322d99e63c755234c02a7fe7ad7efa974f67871460f43db05ca8097c358fdf7aafcc852967959a2abc83460c258aa38a448e28 WHIRLPOOL 6986af27769fa540706e7dd575b6d42f9a5c5e817929db2c08de2842d32c9cb361f97ecadc0b00bb37563a0be12727e4e4c6719b2dacfe3a684949589314c05a
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 SHA256 fcba002f1f12f1fd864179f2c9971acab1bf298d9a719f74ceacc231e7232a99 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602 WHIRLPOOL 1eb9815a12d425acc8345a825258f7e71c2e362e79cf064484edc4dfdd67164f4935c1b9de44f8460e791340e315fd9a40127d1899a45a81b74c6a7a880e24c8
 DIST mjpegtools-2.1.0.tar.gz 1844336 SHA256 864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5 WHIRLPOOL e2e869a328e95dab22331ea1f03a669553ee01682a8e76d27d33da8b1cda46e042d252ff2b1974d08b2109ab1a664f4d5247ee92d7846876d496c7e63b472af9
-EBUILD mjpegtools-2.1.0-r1.ebuild 2360 SHA256 201d2b5558ec039c603ebc2a8e7ccbc9ba95ebb0a0547ba4952d5ee3fac9249e SHA512 4383f412617e14865b0305421f4e35110c92b0db75d02506255f32cae04374ab952cc794674057e89b9568884946aeb2c55dcf142465dd4e6abe6fcee81eaafd WHIRLPOOL 2bc08ee9c62570b5f970430e6f49b0c01f67cc24a84a4853dacf69343c5e1b0efd5aa1245e5881641250c2dbce4c08ca33357a2bc64e2e2c605e74b4fec661b0
-EBUILD mjpegtools-2.1.0-r2.ebuild 3343 SHA256 cfb69fa7097c97118f40d4ae4046ef7b9cce3b0bf101638af289bd3cefedd34b SHA512 1b1d5b7d64e08abe7780c404120701ad97e93de87928671c1b6591cd983378acd0811c2a3d1fa5a86344a7f4b1d4c98b4d630a09012709f80d31b968ab8e072b WHIRLPOOL 95447a270d072d6195740e2e8dc9b1e954c2392ca8c59f2a843db7c4918632bdcd9311ff4f7b080be593aaeedb2ace0c449c5a47265c432032a0db77a747d007
-MISC ChangeLog 36875 SHA256 478ab381647c20ed70eff23e2293d7c6ef1214eed329a5269a8b3d9fb3882337 SHA512 db5780103e1670c7c4dfe3eecf1919451058fd3fd8586d50c6f4c67b2a9c7e9a8c7aef41ecd00759e1b5caea80fb902d3fd125eb70ab43c41a646cf99f81ecab WHIRLPOOL ec9bb4d655ec00b0894cdba3e0b3f4164d863dd9bda6e8204aefd36403c4bc356c345cd99b512e194d62302a3a4ff56e378f0f35f1bd00354f2318fc7c0f5bbb
+EBUILD mjpegtools-2.1.0-r1.ebuild 2402 SHA256 48ab1a137c5ec7fb29d78f89494da4916f171ba97bf0196a86c980b10766a0ac SHA512 1e3ab770066265f356dab33802f778df5eea1c659ac3831ebb551397da29873853a3e7ee692e3d76d4398e76260610ffc134153c5771b93e104274ca59d4d1cc WHIRLPOOL b7737377ae6e5e6cddd62118f3c5b29cd1f4557c4da52fdfc956753143c38bd0612e2edfdd66198f84c6f04cc6eba375a563985fddf9a656277879f23bffddf5
+EBUILD mjpegtools-2.1.0-r2.ebuild 3388 SHA256 e0822e2bbc8ce5d55a12004094163bc40a3257f2401059921ecbd795fbaf23b3 SHA512 f0e35569bed40863a0e26cdaced02b6c8d11ea3622ea8f3aa46c0b098350306a1061359a883c05a1b914babdaebd6d26df0aefaa33bfaab67db431db112c00f3 WHIRLPOOL 68c172f81012cde2fffa9186e9f3c71bd6b940c4644ed65fe90cc997930e89bb2a9d6b0bee4893bbc991fe063f32b3808b85373e779921fc5a3ca0ebbcd0cf9a
+MISC ChangeLog 37014 SHA256 672bdb9be03d4a1934e65d0f6f28bd291c1cff7dd2562ec3b552451b5eb55a99 SHA512 69d729ff85532289aa06922e7e754598f7f3164fe01b3befac5dfb548fb804dafbceb271b8b394b26c2b4bd65faddb24bfda9065f1f3b21dffe6dffabdfdeb21 WHIRLPOOL 2816c3969f8d2320612efbf500a6522e45a4b7369536800062a37a2333da337278fbd187f934792ca6f5d927ebe73921b91fa5c35303a243a10aa6ab1198747a
 MISC metadata.xml 372 SHA256 1a22854e4e0449f6e855f21962f4af646a81eeb7cfa0de905c87ffb52a7081b7 SHA512 a1b0beff78a45667fb4095c203c59c0a63f262ac486b98858f7432fe1f4295f51e9c59c056149c1408e413c5e975abb41b971d1036179ecdea48772a04a5b222 WHIRLPOOL 90544f87533aaf15dba62efcea8ebf4039f29e6e3fef86a5a6907e2245c1f443132f967d65a6651393ad3e64ecedc1b0b73365662d2e770cb74f3abe1fa09b7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSGydEACgkQVWmRsqeSphNWHACeIeQSRa5lO34tCsg+AbEWRf7x
-geAAni70eaMDMAfnVfBeg5KMtNu3RrA/
-=ZlHo
+iQJ8BAEBCABmBQJUyob5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJtYP/RwqcPH25vp0l/5669P6r1aC
+bY3GGTsS0aSVFvQfScLLTaGGc38XMNbBwWN9gFvaBTvWv44cfPFvwBLB9Bo5J0b1
+EpTDc/2foHa4rtzj6QbXxsBkfEO7dwftmjbUJaYRGdNpVM8BcvrWjFlN10lHbTEU
+x8orvv/h7KEeY2gkbef8kKy87H9vNfVEaJgt9aZlbHf5PNnMePf4wLtCFDnYxBPj
+RuX20BWZcrXfgmDg+O2omHe/czcuJQDjoX9YBBDX2UeDUDyPb5FbDeOx/XkhhtGu
+yUXMVN+5MqmHBrwZcAuFA6B/5zv269/zgrrd1+ovsQRW/P8ydopst2F5tbd+1dIp
+59ym/4SdXKZ5ffe0Q6peV6UgkWDVMOOMMBBppwf5yzuD5eoOR/zBitNhS/mCLgIQ
+gFN8vKULb/Ff2wJ6bRu2ZMhoVWlSpvK3wQDpeuP8N90UG2dHD5DktUuj9gEGW9g2
+spIyQzDrAtPOdA7XEhtEso60ZIRhoP57wpPmh5dVBej1UmvUWlT5jRmi7/ZONIiM
+CdjyufkMR+L9o52NE/MIFNtFGVTmEBZ3b9Hz6uHm0KQd2wYujEax8YZQlZadpWnl
+49drdACYUHIViviNDnLKSlx2QPJXVCMdYqvAsFvxy4tVoTfF2o/U82WAdsg9U89t
+IVKNdL6yOsR/hP/cuiAo
+=Pelj
 -----END PGP SIGNATURE-----
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