Switch to CPU_FLAGS_X86.

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

4 files changed, 30 insertions, 18 deletions

diff --git a/sci-biology/raxml/ChangeLog b/sci-biology/raxml/ChangeLog
index e09c69b0a742..3adbd6fe1357 100644
--- a/sci-biology/raxml/ChangeLog
+++ b/sci-biology/raxml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/raxml
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/ChangeLog,v 1.9 2013/03/11 16:51:35 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/ChangeLog,v 1.10 2015/01/29 21:23:13 mgorny Exp $
+
+  29 Jan 2015; Michał Górny <mgorny@gentoo.org> metadata.xml,
+  raxml-7.2.6.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   11 Mar 2013; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Drop Andrey as maintainer so that bugs get assigned to sci-biology directly
@@ -45,4 +49,3 @@
   03 Sep 2009; Andrey Kislyuk <weaver@gentoo.org> +metadata.xml,
   +raxml-7.0.4.ebuild:
   New package, ebuild written by me
-
diff --git a/sci-biology/raxml/Manifest b/sci-biology/raxml/Manifest
index 3a3fad5e9595..393b4f726494 100644
--- a/sci-biology/raxml/Manifest
+++ b/sci-biology/raxml/Manifest
@@ -4,13 +4,25 @@ Hash: SHA256
 AUX raxml-7.2.5-makefile.patch 1420 SHA256 f3c9d9eaacf7a7e0d1594e3d689f938ff82c2dbdb4c4c4f2ed81a861ebd7adb5 SHA512 f905bfb638396c81ccd5f66deaf39c574bb9d97a94ff78b786214390f2ac715b7d4e251ba5d13701805f3928f450b6affefce565e7c30544d32e33ed6e5f20ca WHIRLPOOL d26222d935a8462cf10b6244ed043f1437038039c24486993c022332a7148bdd759704a9698242a1bbd60053afde0061edc31684c022085eb0e041e38818c42f
 AUX raxml-7.2.6-makefile.patch 777 SHA256 0e87b5cd6375669e660ef6e3c37e51e751ea8846de6c52060f484380c28610d5 SHA512 0cc326e8fed0882c56193fef9d1c98577f2252acc4dc25e650e0806d89ded0e2911e6967272a6d101cf830cfe63a190a8f5220fd7573864f5fa60106069ad74f WHIRLPOOL 896bb8f27d458e1d555ffb462abf89f55c487e595a604b3446c579a2e95719cfdfb1911873ca2570a73c3299ef49f0c489ee0c127fcb6e1acdcf907c748459b0
 DIST RAxML-7.2.6.tar.bz2 202803 SHA256 d45bcbe45e3ed5f8d6ba3c99b9da9b202c72a9fb196a9d32d2961ee4cb791868
-EBUILD raxml-7.2.6.ebuild 1104 SHA256 6c141557e09ffaac2d2d46f20b485b2ecce7ff12e319f6a47ea40289cf278e1b SHA512 4e7698a094f2b38b24ea81f4ccabbdcf63dd5e252dca889bb4fe50ffd9cd2123ad2565e265cd4663472e2a285f1682c6fac55603ef4e52a2dcda8a3f57e65c0a WHIRLPOOL 0ec5e308140d97f52c350e6c9c7ea727452b6f02139f97bc06d4415aac6d0c2a6a2132d3181b6c7996e5b2620fa3de33825bb216de5fd97e334fde3ab7071943
-MISC ChangeLog 1610 SHA256 5a7bfd23287dfe8c01913a94b7bd97a87c732823b0cd782ee4c48fcb011021e7 SHA512 ba1badfb098010e4a3621030f5b8a337820768391f91dc3ce623513cd60714f50f8c9a852a1c44feb67d2fa9854460fcdb63161179858342b01cc96ff195ecab WHIRLPOOL da8ac212145c07d491292c6b30a7254f46bee14d2d9c027a0e983f2c06d2303b97116219a1e23f0d82e068db863a326f39371ed2ea030ca8b37082d3ae581c82
-MISC metadata.xml 255 SHA256 efef11e470e8a0b8f3c364f48d5882986ea851821f72b5e6405704064b78cff7 SHA512 5175ba8b0cd526f6e1bacc5ac869e01d722133b03994f4322def1b135b5ca780b9b0bebbed9934005164dcebc79375f490fbce93bd5dd297d1b123c659fbb4b5 WHIRLPOOL 4a41cd8d6ec7637797148a53dab83386ff9b715ff261e79d7c298f8248877b40a6123de45f30bee87703df74fa487308d4679eb66c8e5caca64dd5477312f524
+EBUILD raxml-7.2.6.ebuild 1148 SHA256 050c95bdbe3c44d67e2f8c7f0ee2e1f494a929a0ab60362f83e5b3795354c658 SHA512 d7a4ee0de7613b52be93ad0d3f00bcb34f42c95bd8e8147cdfe9bea3b7495c5a0f4985bc09136f2b2a9c0ebeb32ecb3b68e3488fe157ba169d4a316198e2a25a WHIRLPOOL cee4b3a75cd89f2f950201f3d5bda20b091529b5969da905eec882eb7f786d9d6c93bc90a54b798498a30471bf40563275023d18df3f0da6ac37c126cd5e45e7
+MISC ChangeLog 1726 SHA256 13b6ddaba0ea1291a0112f04757aabb0c22edb9c89f9a4dfaf5b57884aaf0a09 SHA512 6d39e961477e5bdce29f7ff0b76ea1130e8f4afa06853f30713d5c88dcf72a2bb9f2351b98cac6f2f1dc7c87ac5e35182ab77cca46f46ac428e1a94e7e50a9a2 WHIRLPOOL 58022cd1fbae658bdc3f722c138e497d27e0fcf52ee0dea3c1e9ee5e795a0f79c54e3ae240a48cf0f39132440c36a3ecbf3b27388bd411a02687d1e0883723a7
+MISC metadata.xml 166 SHA256 29b228f683c71345323d841414e410c929a320f34536eb30910498728260c8ac SHA512 51c5345bb1c4466b73e2feac8895c64fc119365e7f2c156702f4c93664d3aba028b3da9daaabf24f61a88220345fca7806771a252e8ae906cac5dec97862c7e0 WHIRLPOOL 211bf955d94fc1d93b12388a2c597a8d440fb5d78f84d59b2549569537098c3525b1fbab707441d62fabe20edcac2fd9ebe09c5d9870f1c9558d7ee90d5db5b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlE+C5gACgkQgAnW8HDreRY8WQCfdz+g3hdOE5RANdK2QYXR8Q3u
-wv0An1kRAxc8rTmSmGhlS9rGGmn4fBjk
-=o8W7
+iQJ8BAEBCABmBQJUyqTCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOy/0QALzlbLma23A/uWbfiwSs18LY
+AbrrpgTzFGnVcoxqD0hTa0az9OjrQdTjhkHubQqGCaiVcAcY5qNuWv/vWOfiyxuO
+qsdfKT65FkpDaY6KT/Hakd9hRl2FudeZ2sW1fmTrrDlj8ISPPHo9yJT4+/alGMs5
+7PYAg/nPi5jBTMlu07tWMxi/RBHXkpRb6A8psj2qE79yZNwKiAzHTavJg3DCR3d6
+jkoi5PslhPOdXsQ3JF1fAzhWlGF0hWjWK96mc1E4RJuEQCVNEbXbCyqmrrR8+Gv2
+wqKhLIuAVsKx9i193YqX8gXtgU0Vl4aRbpsjciWOx8ltgKds/azyUSHV5nk07Kzz
+sT1VUc/6X+5jq6YLCjU3vpcNpAyW73KTtFuhsw0N3FMVlfrE2sknqiJHvz1vYVSj
+jS9X2CtgeCFlQ179CvY6VQ4YVF9PrI52j6AI85pCWa+fPpp9ROb83+GU2mms743k
+m60EpRkJMvF+vRB9x7roenKAFKt19wjhwr569Raz1q2YeAJ2NPs8YAzt0njM5M9a
+2hHy6dKqQ5w5LbGAynoHeQx7tCD/iOx+tI8wsUCRmSFeSUWeVRDJ/Va+fw129U9b
+YOZ0cLix05BM4IdHt1SWHsOjmG4dIur2oacKfpKFLM2N/JLT7RjB4EtFYcPBGjjy
+fUut3111q7D1EsnV/LPS
+=ZrhK
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/raxml/metadata.xml b/sci-biology/raxml/metadata.xml
index a3e4f8598df9..f17a827e3101 100644
--- a/sci-biology/raxml/metadata.xml
+++ b/sci-biology/raxml/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>
-  <use>
-    <flag name="sse3">Enable optimization for SSE3 capable chips</flag>
-  </use>
 </pkgmetadata>
diff --git a/sci-biology/raxml/raxml-7.2.6.ebuild b/sci-biology/raxml/raxml-7.2.6.ebuild
index 6339dd23bc1c..c8e23c50ca8b 100644
--- a/sci-biology/raxml/raxml-7.2.6.ebuild
+++ b/sci-biology/raxml/raxml-7.2.6.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-biology/raxml/raxml-7.2.6.ebuild,v 1.2 2013/02/18 12:20:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/raxml-7.2.6.ebuild,v 1.3 2015/01/29 21:23:13 mgorny Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="http://wwwkramer.in.tum.de/exelixis/software/RAxML-${PV}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="sse3 +threads"
+IUSE="cpu_flags_x86_sse3 +threads"
 
 # mpi is not supported in version 7.2.2. mpi is enabled by adding -DPARALLEL to CFLAGS
 DEPEND="" # mpi? ( virtual/mpi )"
@@ -22,13 +22,13 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/RAxML-${PV}"
 
 pkg_pretend() {
-	use sse3 || die "This package needs sse3 support in your CPU"
+	use cpu_flags_x86_sse3 || die "This package needs sse3 support in your CPU"
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
 
-	use sse3 && append-cflags -D__SIM_SSE3
+	use cpu_flags_x86_sse3 && append-cflags -D__SIM_SSE3
 	use threads && \
 		append-cflags -D_USE_PTHREADS && \
 		append-ldflags -pthread