Switch to CPU_FLAGS_X86.

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

6 files changed, 43 insertions, 39 deletions

diff --git a/dev-lisp/cmucl/ChangeLog b/dev-lisp/cmucl/ChangeLog
index 2404940dc412..452a2bd830ea 100644
--- a/dev-lisp/cmucl/ChangeLog
+++ b/dev-lisp/cmucl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/cmucl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.43 2014/02/06 12:57:26 grozin Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.44 2015/01/28 19:40:59 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> cmucl-20a.ebuild,
+  cmucl-20b_p001.ebuild, cmucl-20d-r3.ebuild, cmucl-20e.ebuild:
+  Switch to CPU_FLAGS_X86.
 
 *cmucl-20e (06 Feb 2014)
 
diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index 8f6f22748aad..62465fa37efb 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -36,28 +36,28 @@ DIST cmucl_19c-release-20051115-1.diff.gz 1506111 SHA256 65ef4018294b6fed388c396
 DIST cmucl_19c-release-20051115.orig.tar.gz 4654304 SHA256 4eebac35decc23449f4cf79996c31ea674df7136e08b829210d352c5d20d2407 SHA512 ab228806e692671caeca66fd1a96c3650b3645693889c421352e919ff4df09f4a288cb384daee150a9eae30add7f86acff0fac3bebd651fea328cd34af476659 WHIRLPOOL 577ab1aaecf9d2adda04d501c2fa2ebe21274da7f037fed253d484032c3f5ffce05d722e768742667ae0feb898580e5e42f3d35ec6caf7c7449383a5cacca43a
 EBUILD cmucl-19c.ebuild 4639 SHA256 2af213fce271a3363605859ef32600d9d8eaad45ed089cecdf997845c9dda78a SHA512 834969290fffbcc5301dbd0e5e690d4425a3274eb921d9a4bc98a4ef0410be16a121a3f7cd80541665ac57d6a834d322c3159cb80819bd5ef56005f675d55029 WHIRLPOOL fc6737dbc513e6bad577d9bdceb89c24f8fb16b67a02d538c87989646d9859c2bf935f53f7451f9477310faf9de94f9a6d54da4871b204f0d2fd0c2ea497cca2
 EBUILD cmucl-19d_p2.ebuild 1824 SHA256 1e8abae1a959fbae88ea7451df34eb53b84d4f8019811ebad8968d826a70e7b3 SHA512 e5f3ae9817689b1522a1ff4d198e75ad1e4be4ab8a6f9313857a641825ca62407928844fe53071f3e20563c474c01a2254624580d6e484384892f3c0cfa5516c WHIRLPOOL b8560befede97b41a9ff20c9199905865426db639aab70cb19ef721ef966cd7abbd2933dc36ec4085b88e46467451c1811559a72d45e9654f5540fbcee9f9d16
-EBUILD cmucl-20a.ebuild 2251 SHA256 25656df47ac8f04229cf54ccbe6ee365bc965db7cd604b54b894e81b3e2699e0 SHA512 a8684437676d3bd7c8cc43dfeecdc141ec5406281efc07efaf2ccede864712ac5b2670bb9f577019611a8e496c9e76b28a4678c340b2b3d93b829ca4aef34441 WHIRLPOOL 6a0934405b724f5146d063ca049c9101256648f84c4d19b29492ccb63dcb8a762cf83fcf43f74e468d172faf0e2c33332a97d8b227b2f8de3050bbe3ac4cfd7f
-EBUILD cmucl-20b_p001.ebuild 2902 SHA256 ff1f19f0b907b1238cf67f57b5c37e055a9dd30c664f41f73b03dcbbfb004cff SHA512 91952e9c9a89864c27ec87dbefa286d538fb28c5ae08fe8ba30bc4c2564ff54623a89f1b82edbb24745df11c413871839372bfded5a358203a0e90f25f732dca WHIRLPOOL 1e021c5f7e86bd73cefdbfd8087a4d8484de79dc23b9ee5a5dfe50d6919207cacbc4780c91b3a20a87876b3c3b2cd7abed9c66925d159e98ec26b5e677d010ea
-EBUILD cmucl-20d-r3.ebuild 2834 SHA256 949ce578086d7c01bcbc82764fbd2defe407cf18cd6552a80e427de2c75e9d7b SHA512 aa97c400f094817fb050a92d74585629a24fccd329703244d1d1e0f5f5fb294722b4683d44ea422500a4a3c4489d8456c92b2b595c3e70af3b9c7cd323610a44 WHIRLPOOL d8baf89a8f52e59235a68b044600881104ac1e5b81a5935603e5bef67ae058e3703d82c1ee52b5afb769e46377b0a8fe638f78f00c0544e21ea84024c8b44f6f
-EBUILD cmucl-20e.ebuild 2831 SHA256 92931cad026bd734589c1cc78d35985543fd171a2303d0a6a8f2ea4779fb9c0a SHA512 9627ca4ca59b081ca96e0682f2f68eea6f442d974343f40eecc60d89fdc477e7ba51d300831050f757af836ccd53cc321058b9becd4d4baa622ed829b264a654 WHIRLPOOL 4e7a88ecf9940dd124c4f5ff62b771c8eedb30f822b8558022755d7db58fbc01a2710141260b310a30ab3a8e5873919b693f1a590b8cb2ce5cd1f3c77ae1e030
-MISC ChangeLog 8558 SHA256 cde8b454ecb8a617f3b64f945d408e954142efa1d8e9c6cb3e3aea206997a4e3 SHA512 d85cf46858bcf301370482840e9e224f6c7d0eb66d10078f465599e1fef5891ac9dd2abd8928523e3645f023c4caaf2f145fb7f33f62e2e54c9aa436b010f69b WHIRLPOOL 61665ec3197b0e7584116a6fc6e77aa24e6d4ec1bd586a3c3de3c149e855fb3dcea337e83106d360a0e35c0f2bdccc5d7a35daf6b95353416c45cb9b70c8bf4b
+EBUILD cmucl-20a.ebuild 2282 SHA256 1e7c73f46933098826483d2817247e080942d4f28d06755b9c08d2523e292fa9 SHA512 21584faeac4d79824cdd455167bd79f168b9f6e0b30afb90d41071adaf4e98348cece92bf01a60e3fec473fb6786a2c8530f4daf0c0b6be3c15fce5d74af7ebe WHIRLPOOL d62523dcc2f02ca93a9be44be7489a2d0844394f04b063954b45279269b14e4202a606f880ddfc0423ea97e4d210253513518040c7726404df0f5e5ca3252e50
+EBUILD cmucl-20b_p001.ebuild 2933 SHA256 c3af1b83665e1da7ccd16e276c54bfadba6ba823b5bfa155174c7c5b253a8eeb SHA512 ed6cbd4773cd5b4b47fbd89c964b5a43dae62cc96cf109c5ee8d232aa5007bc3fcfe2fa22bd2eacd21befce404ce8b88e6c2e669203027defe0c4a11f7436cda WHIRLPOOL 71c1055e2d0d5e30e45e8af550f56536fedbbe7f36830934bd5dc88069e597e6371f98e99f425ebc13a529686c12a331bfd3944a1fab7d6629c0be3499c00171
+EBUILD cmucl-20d-r3.ebuild 2861 SHA256 f8231535ce1743b15d5f1dd0b63f52a2cfb2eb145e17172ed4e25189503f6dc4 SHA512 895de56398c4dbfdfeaed76dca79619beb1f758af8d27a2c8104d75935c427ba68b005f37bd219a21484fbb48f9a58def678e09603af5b1821abea8470c3cdf7 WHIRLPOOL 176dd087b291efec867d69ad950b5475bb7936d63ce22b8280aca136917cde61be509bc432840d50ad3941340e3a40ee9aa595884eb9db3a96006618b9dfe962
+EBUILD cmucl-20e.ebuild 2859 SHA256 fb3bd09ea8828b3e45a3c3816c6792a5a13fa701429d84811f93a1e0af77176e SHA512 dd3eeb9aa6a1b48f4ee41701ab7de7efc0e8db9df1bebf6af39c6c8e36dc902a74bc519dcdeb57198ec72a37600db50d273fe42137d5ca0d5700b203ef7a5a6f WHIRLPOOL 3a2cee5a4a7a12515e83239c058d76d7f82f126384b4fbc74e240ab1b97f3f2891e11c658e6c2f2b584997b2988dea314b29317a79713d2005ed2df861b684d7
+MISC ChangeLog 8718 SHA256 f264aab331e2154ee7fd561f1f98a6721fd2e7c71dd920e6ef3ec658748fab56 SHA512 4b36b1b76bcd6831b849a514bd06410d8dbca231514a3d57a44097b90fbe0960b84b72e18a66919616ee4d95e7c3adca4d10187c0d8f957e9a2bbe854c9e1f8f WHIRLPOOL 7f06a1813956206688cb04a79462be204da63fbf6e026ea29e36c830b517886f158910f7a6325cbb939092b977926c913284ecc2eb1f1665237c30afba5232ac
 MISC metadata.xml 1361 SHA256 f4b7f1014988c330913565e96209b71c5a765e28237c66f72cc0fb5d93b06b68 SHA512 bf5584cf3bc4f5057a7eddb34650372fbe5125520f8318c11078bcd1cec545b69fc7a6f4fa7b2f3bd0d58872b7a8793103b2348d9f0dcc02b331f4cc29086713 WHIRLPOOL a6e766d0b50ba219a3bc7d2fa6e72919eb2d259b9485f4c13df1170e10d15e1f5046e19ae1dfb54a3ba1403644c72667bb1917ac2f558ed32d4d1f99610130a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJS84TcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MKeUP/jOKKpq66wccKPdA9/IINIYC
-7tFcRSqZF4Srvjcf7GWvdPy5YlwvnxeapAg5tluwquQ0gUjxB8TWusswiln6AxEO
-OC4dRKWNk8Ms1ZuVKrN5AlCS9Y+B4zAMh8f+vvu3hbUJ98thObNbWn3/p7/pmvAI
-0L5/n1DYsjFcFvzQcfTWN/jMwfDGA2gwWt5bCYETTSQPncAHN3oBBos7nZnnWvQY
-AjmBcryzgptiyLjeW1yS+f9r79b1kqQ2Jv+U1D8Ge99jNzWCZ+2A0Q5XrEkB/zGt
-QAgaX6Y5Vi2rqv9QW89G1Cjw7MT6PrfmFOkDvuj0Y1nmo2cnZ8ikZd+GVKkx0GON
-99jzLcOO+9Ble/rcAQVMP3ERFYke1+XquTpWBL4+y3bBerhWNDhM59inI31oi6c0
-VVxmBcAOd07NJV571RX9mLlj4VL2n0M9JHXxJyFUR3gK3Rd6mgIZQFXrCfWOMQ4J
-cjo5rzdsjW3ftnwfMDQnRaWoeP/05QQenLlOGWqnYSzRwDbfNBpp+bmIqJNK1MsV
-3J4fMbgVZJA2yA47EZ/rvgBBH23IA9Laifs0ZNzahJ1mZFgFh9PAfueIvQtC+Wrl
-eo1EVDvE9CjZMFfFtTIP59NIkOzM2sM69kWBFdz9Lik6H7nsgEicsuZB/JZCWM/Z
-yhUpIUxYIYJ+kBO4X+ix
-=xq90
+iQJ8BAEBCABmBQJUyTtMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOpG8QANL52VK3WgxT+hd+ghiKURRO
+hDYOZfHGKcSN09C1k9LJImfOHNkfN2FmdJSJPS8aGcUPaAQ3X1EECN5J4nw1XPAU
+N3rHGlQT9uqphu9DGiSlJyvj+kVIN/SKpOplA3vCBOiqZEN7weewjgJSCr6Zx9k1
+zzLfH3WFm5yNqB0cn4fwR8gkRjphSacbhKGexExNhvPaDom24KAVJrj1N0qsAceJ
+XCJQwTzNspzhW17XbclDwNtFRLRc+yTv4gtL9dJfhRd6zV6pK3WU1byew/+auX7P
+0vT9Eo2Z46ssRyJPCxANsv2KCTKN4mGM1o5Dwl+SMXLwRfCPRTAGqTTq0e2o57C1
+k0Mz/SnoEdFZTNKtWPzdCW1cu9gR0BrXq7TCylKzs6bKDJ3s+srBEUI7QKITaDVg
+7YAl14ftF6Ws827NzwOw9xXFc4LZ6r/qv6K7pR3f3CTOlq/WssctqvWe/gaE2q2B
+oB5EaX6BlHZq6jzBLVJsMBIBwuAoF02Q57Xokfy9WtINZzxjOQpfTU5enKc29UjM
+pCJ8Z3f+EFz3S5XKQ0fAZfRN7e+FZ445JmrFZeNSSznFfhpJS1VTcgY8ZSZzZTrJ
+7pIsxKYt3rLjQy3/Qqnjga9ALxegqKQlFLFxP/s2Tg60QfVeO2T7PeMQadz16yr1
+xBnOD/b9oZwRCH8IG2eK
+=PHkt
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/cmucl/cmucl-20a.ebuild b/dev-lisp/cmucl/cmucl-20a.ebuild
index 36b58647d275..e4093b41c7b3 100644
--- a/dev-lisp/cmucl/cmucl-20a.ebuild
+++ b/dev-lisp/cmucl/cmucl-20a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20a.ebuild,v 1.6 2012/10/24 19:07:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20a.ebuild,v 1.7 2015/01/28 19:40:59 mgorny Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ RESTRICT="mirror"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="X source sse2"
+IUSE="X source cpu_flags_x86_sse2"
 
 RDEPEND=">=x11-libs/motif-2.3:0"
 DEPEND="${RDEPEND}
@@ -34,7 +34,7 @@ src_prepare() {
 
 src_compile() {
 	local cfpu="sse2"
-	if ! use sse2; then
+	if ! use cpu_flags_x86_sse2; then
 		cfpu="x87"
 	fi
 
diff --git a/dev-lisp/cmucl/cmucl-20b_p001.ebuild b/dev-lisp/cmucl/cmucl-20b_p001.ebuild
index 87819573d843..c269380c4312 100644
--- a/dev-lisp/cmucl/cmucl-20b_p001.ebuild
+++ b/dev-lisp/cmucl/cmucl-20b_p001.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20b_p001.ebuild,v 1.4 2012/10/24 19:07:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20b_p001.ebuild,v 1.5 2015/01/28 19:40:59 mgorny Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs
@@ -15,7 +15,7 @@ SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-s
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="X source sse2"
+IUSE="X source cpu_flags_x86_sse2"
 
 RDEPEND="x11-libs/motif"
 DEPEND="${RDEPEND}
@@ -51,7 +51,7 @@ src_prepare() {
 }
 
 src_compile() {
-	local cmufpu=$(glo_usev sse2 sse2 x87)
+	local cmufpu=$(glo_usev cpu_flags_x86_sse2 sse2 x87)
 	local cmuopts="$(glo_usev !X -u) -f ${cmufpu}"
 	local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core -noinit -nositeinit -batch"
 	env CC="$(tc-getCC)" src/tools/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler"
diff --git a/dev-lisp/cmucl/cmucl-20d-r3.ebuild b/dev-lisp/cmucl/cmucl-20d-r3.ebuild
index 10935fd71ac9..dcd4d7abc076 100644
--- a/dev-lisp/cmucl/cmucl-20d-r3.ebuild
+++ b/dev-lisp/cmucl/cmucl-20d-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20d-r3.ebuild,v 1.2 2013/05/12 11:06:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20d-r3.ebuild,v 1.3 2015/01/28 19:40:59 mgorny Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs multilib
@@ -16,7 +16,7 @@ RESTRICT="mirror"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="X source sse2"
+IUSE="X source cpu_flags_x86_sse2"
 
 CDEPEND=">=dev-lisp/asdf-2.33-r3:=
 		 x11-libs/motif:0"
@@ -38,7 +38,7 @@ src_prepare() {
 src_compile() {
 	local cmufpu cmuopts
 
-	if use sse2; then
+	if use cpu_flags_x86_sse2; then
 		cmufpu=sse2
 	else
 		cmufpu=x87
diff --git a/dev-lisp/cmucl/cmucl-20e.ebuild b/dev-lisp/cmucl/cmucl-20e.ebuild
index e69fb3154000..1c072f24a8d0 100644
--- a/dev-lisp/cmucl/cmucl-20e.ebuild
+++ b/dev-lisp/cmucl/cmucl-20e.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/dev-lisp/cmucl/cmucl-20e.ebuild,v 1.1 2014/02/06 12:57:26 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20e.ebuild,v 1.2 2015/01/28 19:40:59 mgorny Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs multilib
@@ -15,7 +15,7 @@ SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-s
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="X source sse2"
+IUSE="X source cpu_flags_x86_sse2"
 
 CDEPEND=">=dev-lisp/asdf-2.33-r3:=
 		 x11-libs/motif:0"
@@ -37,7 +37,7 @@ src_prepare() {
 src_compile() {
 	local cmufpu cmuopts
 
-	if use sse2; then
+	if use cpu_flags_x86_sse2; then
 		cmufpu=sse2
 	else
 		cmufpu=x87