Convert to CPU_FLAGS_X86.

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

5 files changed, 26 insertions, 22 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 52db0d14fed3..e0eebda4c3aa 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/imlib2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.138 2014/11/20 00:09:49 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.139 2015/01/29 17:33:53 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> imlib2-1.4.5-r1.ebuild,
+  imlib2-1.4.6-r1.ebuild, imlib2-1.4.6-r2.ebuild, imlib2-9999.ebuild:
+  Convert to CPU_FLAGS_X86.
 
   20 Nov 2014; Mike Frysinger <vapier@gentoo.org> imlib2-1.4.6-r2.ebuild:
   Select automake-1.13 so we can run just eautomake #529740.
diff --git a/media-libs/imlib2/imlib2-1.4.5-r1.ebuild b/media-libs/imlib2/imlib2-1.4.5-r1.ebuild
index a098a1aa746c..72f47d7f065e 100644
--- a/media-libs/imlib2/imlib2-1.4.5-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.5-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-libs/imlib2/imlib2-1.4.5-r1.ebuild,v 1.2 2014/01/18 20:19:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5-r1.ebuild,v 1.3 2015/01/29 17:33:53 mgorny Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ inherit enlightenment toolchain-funcs
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
 HOMEPAGE="http://www.enlightenment.org/"
 
-IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
+IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
 
 RDEPEND="=media-libs/freetype-2*
 	bzip2? ( app-arch/bzip2 )
@@ -45,9 +45,9 @@ src_prepare() {
 src_configure() {
 	# imlib2 has diff configure options for x86/amd64 mmx
 	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
+		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
 	else
-		E_ECONF+=( --disable-amd64 $(use_enable mmx) )
+		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
 	fi
 
 	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
diff --git a/media-libs/imlib2/imlib2-1.4.6-r1.ebuild b/media-libs/imlib2/imlib2-1.4.6-r1.ebuild
index 38cca9833b2f..c50411545e7b 100644
--- a/media-libs/imlib2/imlib2-1.4.6-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.6-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-libs/imlib2/imlib2-1.4.6-r1.ebuild,v 1.2 2014/01/18 20:19:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r1.ebuild,v 1.3 2015/01/29 17:33:53 mgorny Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ inherit enlightenment toolchain-funcs
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
 HOMEPAGE="http://www.enlightenment.org/"
 
-IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
+IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
 
 RDEPEND="=media-libs/freetype-2*
 	bzip2? ( app-arch/bzip2 )
@@ -45,9 +45,9 @@ src_prepare() {
 src_configure() {
 	# imlib2 has diff configure options for x86/amd64 mmx
 	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
+		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
 	else
-		E_ECONF+=( --disable-amd64 $(use_enable mmx) )
+		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
 	fi
 
 	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
diff --git a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild b/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
index bace6350149c..db80db1a8082 100644
--- a/media-libs/imlib2/imlib2-1.4.6-r2.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.6-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-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.17 2014/11/20 00:09:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.6-r2.ebuild,v 1.18 2015/01/29 17:33:53 mgorny Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.enlightenment.org/"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
+IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
 
 RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
@@ -54,9 +54,9 @@ src_prepare() {
 multilib_src_configure() {
 	# imlib2 has diff configure options for x86/amd64 mmx
 	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
+		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
 	else
-		E_ECONF+=( --disable-amd64 $(use_enable mmx) )
+		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
 	fi
 
 	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
index 7f64169939ee..565651622998 100644
--- a/media-libs/imlib2/imlib2-9999.ebuild
+++ b/media-libs/imlib2/imlib2-9999.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-libs/imlib2/imlib2-9999.ebuild,v 1.21 2014/07/03 20:26:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.22 2015/01/29 17:33:53 mgorny Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ inherit enlightenment toolchain-funcs multilib-minimal
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
 HOMEPAGE="http://www.enlightenment.org/"
 
-IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib"
+IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
 
 RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
@@ -40,9 +40,9 @@ DEPEND="${RDEPEND}
 multilib_src_configure() {
 	# imlib2 has diff configure options for x86/amd64 mmx
 	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable mmx amd64) --disable-mmx )
+		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
 	else
-		E_ECONF+=( --disable-amd64 $(use_enable mmx) )
+		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
 	fi
 
 	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )