Switch to CPU_FLAGS_X86.

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

9 files changed, 81 insertions, 30 deletions

diff --git a/sci-libs/arprec/ChangeLog b/sci-libs/arprec/ChangeLog
index 9dfd5502ab6c..ccf52fc5343c 100644
--- a/sci-libs/arprec/ChangeLog
+++ b/sci-libs/arprec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/arprec
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/ChangeLog,v 1.18 2014/04/05 23:39:34 bicatali Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/ChangeLog,v 1.19 2015/01/29 23:05:55 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> arprec-2.2.16.ebuild,
+  arprec-2.2.17.ebuild, metadata.xml:
+  Switch to CPU_FLAGS_X86.
 
 *arprec-2.2.17 (05 Apr 2014)
 
diff --git a/sci-libs/arprec/Manifest b/sci-libs/arprec/Manifest
index a624ff455d01..c65b18ccd6a6 100644
--- a/sci-libs/arprec/Manifest
+++ b/sci-libs/arprec/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST arprec-2.2.16.tar.gz 830227 SHA256 cf71f2a7f3530b57900e67d1282c4a114830d2c00a0fba90819aa8313f11653f SHA512 278bf96402179566d4f2b9a6d69e42d726c81c814f96cd31c19df2c3b61941f3a1858e4a56577548d0fcf526b7db7caca2b7ea7ec57e834e7768d21788e7e672 WHIRLPOOL c55a875af752dfe6700cd714e2d6d34d3100676b8c41d4271065ddb0e754b3c5333cffd7432b45f2dfa0efed8f93dfd3448ac87038b18941a27f6bed1468131c
 DIST arprec-2.2.17.tar.gz 900043 SHA256 87977981c1145465da51f252d04f11d16ee009d9dc7e8d0da71e4ef56b9fc5eb SHA512 d10f7d3e3d61274a36d253d2b50004bbf15447be3ffbd37bb0334ba62bd624e27fb9e26364fa1b89c1d4dfbb4136ab93d865f990ce123ecf94d9614e3ac567d1 WHIRLPOOL 6daeff384cfc9dfbb5771a177166212370ba724850d27ae99de63d1e2f2bc5f76b2be5c28e1fa0bb1d407a29d46212b0896c5e7f6ba66f9c2830e3a53e3e8b31
-EBUILD arprec-2.2.16.ebuild 1419 SHA256 fa2e2c77b089941a8efc8e527b614b6a506104ab5e2603baadd38aea300a8ce6 SHA512 c3e463ecc8c8ff41cf5507219c99d9bdea12b377d3b631ef750b1f5d33fa1326ca3f9ed1b9c090e7b4678785b6cb5f1deccc643484711e0d1d04d177b9ef45f9 WHIRLPOOL 778bd52305a2aa6647ca18d93e1154a4db7df6cd046a221c686d6af5b70b9b02e635ed3f86bdc5c774df63aad217ca597a5e481ef60edb2a5bb894e73acd7ae8
-EBUILD arprec-2.2.17.ebuild 1448 SHA256 c46d79a40a736581f17d1505ed70ea13778a6e68811e63b193bff1c66a4c51f6 SHA512 1a76114baa4df31dfb91277dc0f5293a587820470f0411f04e05d2edd2eb463318e5cab206fb904c0d1f1e294b5324858186a85ddcca8949079201d2b42889d7 WHIRLPOOL 77e5f9e1ee6303d00e69cbab9bcd009c67c121cfd1db89c9d6e64540a886f52e1b31f15157b8ea19511ae36400ccbc9875ee73a1146f77beb7a36898954b63de
-MISC ChangeLog 3282 SHA256 c343f82e911e27da2d7f173e508e63314ddefce6acd7a9cd1ccf95f54801c2aa SHA512 b2bb75cef5465fbe704c3c642d5a89fc9d8d49cacd6be74f382b34e4b4ff581805693de5146500a4f37f76fdf55352dcf9e91b735bfd38b585081d62efcdcb10 WHIRLPOOL 5f38e2b1b349e742e50b048d0b16bf8d0a8fc1d6318f1114767e8d93362f51e96a74426075ef33a23feb061a71c0a5af6963fbca3b9b7fd343fbdd1eb96f0dd8
-MISC metadata.xml 525 SHA256 f38ca40066806beb55cfbcd43a912480d96a1e5b80cdffeeb654999c5473112a SHA512 216fa2d0cbe801e96f5727a3585fbf126d79abcd4efe730b69a2b02ee4345d265854b8061bbb97ee1d52f5ae5d45090e3b874b6e183a7c955e024fffe73704d3 WHIRLPOOL 157b927e3d3ba93a3cb97d8a4a1e3983d50eed17e0f76ea734122307f6623f6fbedcb8191a43d5d08b3c1167a8f20b95be074b1742595022ac526f91d46a7359
+EBUILD arprec-2.2.16.ebuild 1501 SHA256 b4c3cfcdd68ec537f2ca7497acbe05d14acc713b00de08b068252503f9f415b5 SHA512 62a4a425042e9119e0aceeb25b25309226d7280c948e6137f3a0443392a90a62e9014e37f3ab8d5d757cb4ed116e70b4d7001062a68efcfb2891dca5f5ec8320 WHIRLPOOL ff3b1c31f2f85852bebb39e2da70f616dcd5139fa9e7540c6b3dc5c0209da006964b7f51325a9e4fc7144ee4f82f5e7eb8c751a5013f463732ff7bb6fbe810ee
+EBUILD arprec-2.2.17.ebuild 1530 SHA256 87f450b0dc35d775c7793fa9e38da2d76cfe90a7fcb9809226b012cba9a46b60 SHA512 7af8d22d365755ebcb75fdd454c6c6d784c320b0c057ae75fd610f4b1ac291a96ad99ea943cd161ecb5ff5214460b66de678947eb6ab6302808aa95c2a1e25a0 WHIRLPOOL 70a036ad6b55063c874e3b2ee97ccb1ec88b69ce03cecab0a3c5263df60216af6edb055f912a431deb983287a38d8ecf4260ff097ecc892e9bb97e5ab830a8ea
+MISC ChangeLog 3418 SHA256 cb228ef1a825030eff57ee656d4564ace5624d799957856b379d6bbe090c39c9 SHA512 822de0e218949f78df7254eee639842bd91ba3431f8dacc585459871e14ef8f39f79d1858f7f13ae20236b1ba23ed1900fb2010e9107beb7cc6980aa59264923 WHIRLPOOL 55d2045f2a085bdec0d8e4436f549bcc292ea457c04f781c8c2e013d0d6a30f0b818c0805599c42ed1391c5e4adf97439be5b869bc0be6382770878e2847fc39
+MISC metadata.xml 456 SHA256 72df8ec8832ba22dbeb2e0a73d5c32fac85dd3e8a4135df3e5f3225e4f66f7d0 SHA512 3cd5dc1458fbbe70f269645d65ac6bfc8b6e93a4cf6345ce58dbb6eccb3b4f6a99cd45f624dcc60477540a7fa1526ddcc4142dd14a59599ac9b3a25186fe6474 WHIRLPOOL 99ff03f6e45f1d932e7a2e08c9b2182932d665a090c19731a50a3deeee2a2fe48db1a6b0e6c7b5d3af8cf3697f924589130ac45ac869e7dfd941340046c05a30
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUyrzUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZmYQAJsGZGy+ZvRB9LYZD1skuQEt
++LcDfbozc26CrP7PEkjAUDL4ewjyaq2HWJ5ewHMjKd4iN4d1FpINMKO0tX8KHsWM
++LzphuVvYxtCSsf2Wni6dVgaJ5VAaINhERxatsfH8iBGIUd4VhpoPAS29ZXAclQs
+JRrauuKM/4TvTNrJG2VyOTAokjMI1nSnaCyk5wVJyoLaapeWxScW8YIsqhQwtGV0
+E1jQJAeEHJKmCogDfFS8xi5Yyea7aBisEap6+AjTP63e6I5VtDdYIa95MC7MlEnu
+K+Lc2bv5z1V6Q4o9PfsLyuWgsxtxnnH4rWxAtBSHc8iDPUmdqNDuxX4HjtaKVw25
+r0uQyJoYgPKlwLo9T2HoCFXlkDOkzLF5z/kUOWCFaEzCKyM1ie2V1WisGEhUfCen
+SZLh9cHtfaIDIdq7FSTMDB7PAT41YaQPOX6ogu1E2mlY+q1xu6WFUvl+iinlJ9TT
+gboj4ZuJKhQvu21whU43qrKD/eahyD2K4awIFAVjy1HxIKpF4L2Q0o8Boqa95Pug
+i+gOVGQ/dAfID20oZL38Ua0C/zU0Q3OJ5THC+zvEwhHj8cupb2tZ3ijoldt4qzSR
+yra5Yha03nzp+MSop6DM0sErwrK/QMjNkTXu8znTSJc/jkNqYSQC7PLXtArXNkP1
+KzcCXFTLclGL7O7C2G1V
+=+7Bz
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/arprec/arprec-2.2.16.ebuild b/sci-libs/arprec/arprec-2.2.16.ebuild
index 533e5351163c..d917acdabcdc 100644
--- a/sci-libs/arprec/arprec-2.2.16.ebuild
+++ b/sci-libs/arprec/arprec-2.2.16.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/sci-libs/arprec/arprec-2.2.16.ebuild,v 1.1 2012/12/11 00:47:27 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/arprec-2.2.16.ebuild,v 1.2 2015/01/29 23:05:55 mgorny Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fma fortran qd static-libs"
+IUSE="doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran qd static-libs"
 
 DEPEND="qd? ( sci-libs/qd[fortran=] )"
 RDEPEND="${DEPEND}"
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local myeconfargs=(
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable fma)
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
 		$(use_enable qd)
 	)
diff --git a/sci-libs/arprec/arprec-2.2.17.ebuild b/sci-libs/arprec/arprec-2.2.17.ebuild
index 3472996afb09..79e7ebd427ee 100644
--- a/sci-libs/arprec/arprec-2.2.17.ebuild
+++ b/sci-libs/arprec/arprec-2.2.17.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/sci-libs/arprec/arprec-2.2.17.ebuild,v 1.1 2014/04/05 23:39:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/arprec-2.2.17.ebuild,v 1.2 2015/01/29 23:05:55 mgorny Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fma fortran qd static-libs"
+IUSE="doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran qd static-libs"
 
 DEPEND="qd? ( sci-libs/qd:0=[fortran=] )"
 RDEPEND="${DEPEND}"
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local myeconfargs=(
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable fma)
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
 		$(use_enable qd)
 	)
diff --git a/sci-libs/arprec/metadata.xml b/sci-libs/arprec/metadata.xml
index 89e643863468..f5a8029c8896 100644
--- a/sci-libs/arprec/metadata.xml
+++ b/sci-libs/arprec/metadata.xml
@@ -10,7 +10,6 @@
   Arbitrary precision library for float arithmetics and mathematical functions.
 </longdescription>
 <use>
-  <flag name="fma">Use the Fused Multiply Add instruction set</flag>
   <flag name="qd">Use <pkg>sci-libs/qd</pkg> for quad-double datatype</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-libs/lis/ChangeLog b/sci-libs/lis/ChangeLog
index 7b871956e2dd..1a49c64ba310 100644
--- a/sci-libs/lis/ChangeLog
+++ b/sci-libs/lis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/lis
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/ChangeLog,v 1.11 2014/01/15 05:38:39 bicatali Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/ChangeLog,v 1.12 2015/01/29 23:02:59 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> lis-1.4.11.ebuild,
+  lis-1.4.23.ebuild:
+  Switch to CPU_FLAGS_X86.
 
 *lis-1.4.23 (15 Jan 2014)
 
diff --git a/sci-libs/lis/Manifest b/sci-libs/lis/Manifest
index 869ad3c88848..0e14df35ff01 100644
--- a/sci-libs/lis/Manifest
+++ b/sci-libs/lis/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX lis-1.4.11-autotools.patch 13935 SHA256 4b7baebab2e05f78b110f2469159223a9eea90a59cbf7ea5575ffd56b8c48c72 SHA512 560a71d486149d3f83036340e6f6df3f8312453b3061288c103ec71c5256f2a30199012c2d319210080080090fc8e4a3a3913b27d99d8d642b2c1523dc9a118f WHIRLPOOL 81d3f14e95efa63e9d93b008f5dc7e58447a9ee890d58201fca1d1366311357d46aa436f7151b76cf82f6336b5669ba804def7bab221925c072ccd7444eea09b
 AUX lis-1.4.23-autotools.patch 13614 SHA256 4e802cbccd13a3406913bc280302ae7deb304a632991c31661d38ecf8d035a5f SHA512 e169fa7751807c626f99adbaacf324f8fa9cb94b0ca1623c91f8237d25390a42221620c85cbe21ec941b66d5059e5d33de888a5437db317fe4dbc904e12567a9 WHIRLPOOL 19497b23618f00628fffebc3d246266fd4727226c337faa125bfda8936199639b29ab235b9ae3363612dd03749577b945b033f31908328c84933c2314c4884f0
 DIST lis-1.4.11.tar.gz 2978494 SHA256 08fd7452e184b72d58c7b99985d840e9c75df1f40fa525c7a260b7d37e9bf7dd SHA512 784f6cce01197588e3c835132016d04f39c871baf4e1111ddc06116a490bae3cdbbb133a781bdf52125d3452ba448d9b0dd3420899a34b9c46f5fad2198dd0d4 WHIRLPOOL 79b66354cb81199c9bb76b1d81bb2a38a29f413d37351a507b06c95260c16a2bfca876d271a98dc4c067954ae99e1e68ea07a3011c26e68a50292ee18497b54f
 DIST lis-1.4.23.tar.gz 2977200 SHA256 f915b4e3de1fbddc655e39b2e561f1aca5456b2a0e0cdb30b2c434d4c3c4f965 SHA512 8d720e2b69aaa2a3bef96679ae2c96d640787271a38037fa79ac88c571452a1e2f8f28bcbb78633f3d885d25143fb097bbef007433461fb2e0e511e671d9d481 WHIRLPOOL 5f82c645829ee13b6c164cca5a0f739543420c9eb9c40389d7cb37560713cb2d9afdd0ebccb9a57a8a667130df300fd40015036c06e681d90dfefbaab48f5e6e
-EBUILD lis-1.4.11.ebuild 1253 SHA256 e83d54e0767d8f47068a007b3cb44b53cd4c860bc0eedc0589d143f438265d10 SHA512 e6aaae89bfc606cd513c314e24bb6f63e4e692009cf9cbd14be77e14fa2ff8cdaad3810d5fbf393479ec21e0e3b57678843f2a99d5e9827bc3c1306caa361761 WHIRLPOOL 495345fd0c02583a6dc27a5f3d1e234c73e6725ef4b0982739dff85c637fc60aba2e7a06eb33573e7d3d2f8c8cdb3e1287d71987ebc06536529d2ec83d607584
-EBUILD lis-1.4.23.ebuild 1261 SHA256 1f2cb897fbdd69b271377cc7f12992515af19b0ff7c3eb25694df8596b97ca5e SHA512 fcbcce204d95783b65e31091ff3236220fa82d4837749c25afae26fa7555a3e7f3fb4ecbbfd08f043a6729fe211e689705397e65e67c83cdf936d59ed1256108 WHIRLPOOL 0de460f62c2aa140fb11af1489fb9a166b954070c22163de88dcf86e85163aa2c1a599c3d0e388680369566f62e90c33ecb3b88cea2ea8f574d6fcdc5b05ae94
-MISC ChangeLog 2054 SHA256 5ebfe56dca0a3299062537c291ad99ac180aefbea08a191babd0929def928e75 SHA512 635547e38dde80030fdd05fab92c24da4abb7452d9be2da8a7d05830b0142616184b7a0c7e7f66b279fd252472112fb14469895012fac1842ef9c725b1d656cb WHIRLPOOL 688b9801ec6adafebe1ea3795fc132c3a63ccc39d638f566c3dac73f474a88913dbbca5c8dbf97a38b0618f5dfe94f95ccaacadeef65b349ff4bb00a77e9bad0
+EBUILD lis-1.4.11.ebuild 1368 SHA256 8dafc048ed0c7e13ba2104f0fac321eb91d467f74256c877530d92b8a7e51101 SHA512 243911264b1a0ffe9af13c26b07a23d1655b886476f16bd1e5cea8e89ebc02e5e8235f87cd8d7c78b97f67b0af1d76ce1212753f5cb388b6da4c98a2fe4acb8f WHIRLPOOL 510e0d3917ec9664fe41c95674853ddcc080853c5072868ee1852a054e64c2b4e3358acebefd08c616743aeb47a81d68157dde138aac9bfad07fd44496b89d07
+EBUILD lis-1.4.23.ebuild 1376 SHA256 b2d53fb05f8c80c2d72fe7c803a88a1e410eb30a08555c2c6617ef3172f66fa9 SHA512 6e6e0257bb95e566ee3779a68439f5e2929b124a025a70c4105db5fd2e548a089ba45e2502f3e8cfd165781055d2eff5a7c59e133ca72d4386b04519f0e66912 WHIRLPOOL 477bca8cb505ac2369228bd6eeee78985d1f85045c4cd6589a5262afda61f75bc14cc23c19b10091b5e8adecaa8e5e80eaa5f8e40690cc1231da3a8456535eeb
+MISC ChangeLog 2170 SHA256 f57f0351accb7ac6182906ed2f19fddac036f003efd3311ba361d7518c7ebf12 SHA512 fdea2805999e0b2dcffd4baa47b3413a80a202551be77170a33d0aa2725edb1a112709d32ce7e6fa12b4dc69dc320999f1eb9d4f08205bfd63b108365aa389cf WHIRLPOOL de34ec31bfaf5754abd57c374f3db76f438374c494e3e51d6c7c21d6cd29f943c63aab5a5ab0d558e84518f11a0455492b8a55481beb4b51b7cb98f2d729f419
 MISC metadata.xml 680 SHA256 b74d10b78b48e6dd3dfd9530a833e6f9c6efa967e63b6ca83ba3eaad9d256990 SHA512 49c9c7fb584f56e917e64257127422efb49bba5899852f581aaa2abe345a84e8d976e5cf4b610e8af8d2c1bd20d2ac9ccfdafcb8db4ffb5fa19df535708f6685 WHIRLPOOL 01431b5e19774d6d2d2c86a649ca0fc8658bd83706c9a0813b24901515a295995e33be594abe284ea8aaa7b3bbba2de4453a9a283e012363f6b6799d033dabed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUyrwlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2DgQALlfxgkmWycPhM7wcOf5wLWr
+d+Gszb9Vd8QnsPdu7uTcoTUKkkF0Gxda8lf3wwAVR95kX++IMjS2bd67yo340A4g
+rAgxHNMBoCag/krZjimW7NChfZ+BZT/j9oSoERBStNSM0jkOpu/ly5PmoYmZ3xH4
+CXpfRXX7Z+74lHQWNh+snttSUQTRau5H4zlC2bJHNIfrxV5IHzQLoH0dD35iJyZ+
+9IjIeXtzlZ4mjlZyg5z7aayJGagA6dIgfSH6vTNqZ8DPRzWyFRm5wxmsLIxdpvaG
+juvNz+maFtPSfSYpLHBFewY5GeU1lp4k3vRS6UN4fsEl1CaHp+H0gENaT8vMYtfd
+aU7bFHyniyHv8HSC4txgQsELJsAVI17L2JvB+D/xIrlvWo2r5v01NesDCeJ79Dt9
+V7kvJvJslwOLb8xCswEfcXgHXM/WEhutRdhO4jBHhyfQWMT/Y3gUCcMrngi48hYt
+YytNx3zaQuElwCKEUNs0GotM6FaDKDNWDkW2pxEw+++bI0oE1Zlj5IXF1ohiUrc6
+CR6PGAGHlCb36jdInhFLR5dTlr8WHpPGbHBl5DT3NhcYBV54nN6yTGyHaVwhfsXM
+dxni6QghCDnrMejjfgVAZz4GYb76B7OYqQ0PgMr/cjhOXE+vO1MTfyrbgaxHtP5G
+7AHWGHtY+yWPYQxcMNTu
+=28ZM
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/lis/lis-1.4.11.ebuild b/sci-libs/lis/lis-1.4.11.ebuild
index bfac885bc36d..4bad79504b41 100644
--- a/sci-libs/lis/lis-1.4.11.ebuild
+++ b/sci-libs/lis/lis-1.4.11.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/sci-libs/lis/lis-1.4.11.ebuild,v 1.1 2013/07/22 20:40:53 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/lis-1.4.11.ebuild,v 1.2 2015/01/29 23:02:59 mgorny Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.ssisc.org/lis/dl/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fma fortran mpi openmp quad saamg sse2 static-libs"
+IUSE="doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi openmp quad saamg cpu_flags_x86_sse2 static-libs"
 
 RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}"
@@ -37,8 +37,8 @@ src_configure() {
 		$(use_enable fortran)
 		$(use_enable openmp omp)
 		$(use_enable quad)
-		$(use_enable fma)
-		$(use_enable sse2)
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable cpu_flags_x86_sse2 sse2)
 		$(use_enable saamg)
 		$(use_enable mpi)
 	)
diff --git a/sci-libs/lis/lis-1.4.23.ebuild b/sci-libs/lis/lis-1.4.23.ebuild
index 49d442ac9c83..46b87b528466 100644
--- a/sci-libs/lis/lis-1.4.23.ebuild
+++ b/sci-libs/lis/lis-1.4.23.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/sci-libs/lis/lis-1.4.23.ebuild,v 1.1 2014/01/15 05:38:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lis/lis-1.4.23.ebuild,v 1.2 2015/01/29 23:02:59 mgorny Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.ssisc.org/lis/dl/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fma fortran mpi openmp quad saamg sse2 static-libs"
+IUSE="doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi openmp quad saamg cpu_flags_x86_sse2 static-libs"
 
 RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}"
@@ -37,8 +37,8 @@ src_configure() {
 		$(use_enable fortran)
 		$(use_enable openmp omp)
 		$(use_enable quad)
-		$(use_enable fma)
-		$(use_enable sse2)
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable cpu_flags_x86_sse2 sse2)
 		$(use_enable saamg)
 		$(use_enable mpi)
 	)