Enable AES-NI only when both AES-NI and sSSE3 are present. Bug #545926 and fix by...

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

diff --git a/dev-haskell/cipher-aes/ChangeLog b/dev-haskell/cipher-aes/ChangeLog
index a0901891875cd41b266f61a067ba3fccd981a7a5..a2f8418c6b3078202dd0ba60b3c0ad598c8463f5 100644 (file)
--- a/dev-haskell/cipher-aes/ChangeLog
+++ b/dev-haskell/cipher-aes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/cipher-aes
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cipher-aes/ChangeLog,v 1.13 2015/04/09 07:55:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cipher-aes/ChangeLog,v 1.14 2015/04/09 20:01:50 slyfox Exp $
+
+  09 Apr 2015; Sergei Trofimovich <slyfox@gentoo.org> cipher-aes-0.2.10.ebuild,
+  metadata.xml:
+  Enable AES-NI only when both AES-NI and sSSE3 are present. Bug #545926 and fix
+  by Luke-Jr.
 
   09 Apr 2015; Sergei Trofimovich <slyfox@gentoo.org> cipher-aes-0.2.10.ebuild,
   metadata.xml:

diff --git a/dev-haskell/cipher-aes/Manifest b/dev-haskell/cipher-aes/Manifest
index e73b3a45b0deeecf75b3716f84bb503167821e9d..f387a39c783cb457361a395181fcef8373369199 100644 (file)
--- a/dev-haskell/cipher-aes/Manifest
+++ b/dev-haskell/cipher-aes/Manifest
@@ -4,15 +4,15 @@ Hash: SHA256
 DIST cipher-aes-0.2.10.tar.gz 33340 SHA256 bf33e8226049f1bb21509d0adfb7001fd2472a718c46c8d9122bfa65cceef4e9 SHA512 d126622946bf53028d3b218781083ee9d5ee593c8ca7849496ae459137c0fb2cb4557897119135c43c29b9b3d3677ff94d37e1bcc6043db29b4941935bfc92b1 WHIRLPOOL 16313a89649ae495cf0f8b4234c12796e021ed27299a38835f284049815f7547549234a4c92df69d37fbf2030dfd3a7bf5b68ece6f681949062092a2afd11575
 DIST cipher-aes-0.2.5.tar.gz 29934 SHA256 631959ec33a333d6e8f9c346f1a58f8449c17fddd1df5652b9dd5a615dbbdeab SHA512 61a3ebcf02c9a6bb2a6ad0386414003922355bc76cdce7df915c2fe98fc1a647cf8a0a950155482564b8310c76b7b0612320e8c586c1dc08be27317dd80537e7 WHIRLPOOL e374607265a0731b0005ffe231b18c7f2410a6b5b521429172723036d06876ecaad311f1ceaad22f110ad2606f9235805c564a22f9115dd95debcbf09faf03fe
 DIST cipher-aes-0.2.9.tar.gz 33331 SHA256 985aadac75ef93b0762682a7ab20382c7108788b8e822fa1fb24c09c2b8279da SHA512 e3cc41cccdd2d7b1cef887f4a7abf4a00ffb4f4a7fc344e535349f524621b78680599a76b19098ef5963b4500564ce61416a4132551c26b944c20edc8c4525ff WHIRLPOOL c9136d67e5cc285dddd35b9d14f3124a63ee1b7ac315d9a38bffec2e23f3149cf7e29f6ab8c481b86d8a9581ba637f5689e79c240e4a6a1b7ca4361704fb623c
-EBUILD cipher-aes-0.2.10.ebuild 1222 SHA256 197ceb422e403eb5ba649ee049e2389e02dd274713481812450afb52e51fdd3e SHA512 7f18cee6c9c3efba30600e02868f587631d4397277dbf73c8dc2ee7420370ca31b02b1d94ae267f54ccef63185445b80a8d5b79bb24ab3304cb39f3b3263c5e0 WHIRLPOOL aefd5f6a00033bc5c0ff3e82fb2540e352f5804efff2fb8b9cdfb4b954695c4cfb5bb49de81965b738cc4d4edba8e8dfe9ab2cd78b85bcebd88dd651c857d5d4
+EBUILD cipher-aes-0.2.10.ebuild 1324 SHA256 f70b892b424edd367be8a17bfa928d651780832ce44b487d753b14f3c0d5bb46 SHA512 096f666f554d9167597cda7650b8f08add73a0653d688a1476b70d62ddbec54f1e101c64fe0332982c476c1e7f00100b2c55b7a8e0ade90da02531e6970b27fc WHIRLPOOL eac5c4b913c52afd439921f1080987faebd21e63219471b161d87b24ea7b8131caae9fe76bc405922b72928e8aa7323123a09dacb22cfd4b39578aeccc406df7
 EBUILD cipher-aes-0.2.5.ebuild 992 SHA256 3358dbf0070ea5d114c198527b4626d67471d948e5dbb7300f9bf88f9b1c3f8f SHA512 f282fadb4bbbb63214440a6bae8ff9f4c045b2de11a4b4fff1ec53a8c34f074cb971eb26e30a5dee0e49ca5445bfbc5380b43075d5ea8a6df1142e0e153929ce WHIRLPOOL ed6ab13ab9c43cc5f6729290d18113c9e3bf89ab17c4bb054aa121b92095304d9d01f9d83eec27f1a75dab923ba4be4bed73c421168e29ea748997eecead115a
 EBUILD cipher-aes-0.2.9.ebuild 1053 SHA256 1dc3e111676f34fd3e6a8be7bc8df5865a78dd96aeebcb0f71111e1312be7ce9 SHA512 3baeb311863e4abe63bec3c524d82aa3316afb81b170dade2da2ad04a3a1419b4de37542d8a3a6954fd79881d9844fa0ce6593130ac897a82d4ee6518ac3e07e WHIRLPOOL 0474d94d7687087bf2daa8c069e711f6b276475bf7299d0fa28a436921679fcfc884f113fb5052e194d7bafab3cf4e32cf33fe6b5afa605785c5b1c1c4092811
-MISC ChangeLog 2041 SHA256 82d2e6e4f1830b91a7613fbdaf689330410684a2de3d1dea8e5f20fc9920c0fd SHA512 4d421c998fcecd522d0db26d18a8f52fba2344b230f32bc680266fb2f4b6f3759e9a86c24bbaa2a504178967490c65f89be62fa62f21c89eacbf3d999434c950 WHIRLPOOL e5e8b2cb99442c2120c17ce4b53e1ae9813b05981f8ce797e7e784e030b880b78f3d8dcf3ef70f3e22f544bfdb2f88765bf60d63140cb860ddc0f173de642e6a
+MISC ChangeLog 2233 SHA256 866285ea8576e8f0b244a94ddca2c4d860fa2404e25cdc539c02d1161ac44459 SHA512 693f93df0dc25febf493887e13471ed7d00da6e664e269ed254552156df06a07cf51e7e7d1e491992a0afeb374c3dcaa0e95f43ff07575fd99aaafb6ce063b9d WHIRLPOOL 90b7bd0417fe15461283d23177662b6c1d96cf49b281f91babfe2c16941b025230d4b5d15db4fad328c534687d081591091cc63777a8f31ed7d2cb60b0f9730b
 MISC metadata.xml 266 SHA256 92145cc741d415fd9311d25786fc89543e9cf1c51c68d2e201a4a6be9dfa2615 SHA512 47aca8b15b92b3efa7c0cb278f2e32d1faaa10bb2f45912546ec08ac394d1ebc5273a80f6fe299ae3b36d6609c37d590942455d4ca344f80c97b819b73cee80e WHIRLPOOL e29bf2f215b759791f2267dbfe4a550c8b3de832dabcc97ae14edd689cb48758179b2697f234ff14dee58c609f5d753c87a4427d19c3b005c5fabff7ff7577ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUmMDkACgkQcaHudmEf86qhwgCdGl7PMwoeA2G1dQQ3l4Hgj29Y
-lngAnib8xiq6X+rjdJlz3tDchyJ6Tw1C
-=T9ea
+iEYEAREIAAYFAlUm2k4ACgkQcaHudmEf86o6vgCfUEoUliSxt7Vh6N8OnFbnqyAI
+rYgAn2gPkDsVWDpetoH021OdeJLiahXU
+=DTK5
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/cipher-aes/cipher-aes-0.2.10.ebuild b/dev-haskell/cipher-aes/cipher-aes-0.2.10.ebuild
index 071642860ae771d99467f7294e0fe228ec83cc56..e2156b8a6628de40de39948666e9920c45b19fd6 100644 (file)
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.10.ebuild
+++ b/dev-haskell/cipher-aes/cipher-aes-0.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cipher-aes/cipher-aes-0.2.10.ebuild,v 1.2 2015/04/09 07:55:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cipher-aes/cipher-aes-0.2.10.ebuild,v 1.3 2015/04/09 20:01:50 slyfox Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_aes"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_ssse3"
 
 RDEPEND="dev-haskell/byteable:=[profile?]
        >=dev-haskell/crypto-cipher-types-0.0.6:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
@@ -33,6 +33,12 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
+       local want_aes="-"
+
+       use cpu_flags_x86_aes && \
+               use cpu_flags_x86_ssse3 && \
+                       want_aes=""
+
        haskell-cabal_src_configure \
-               $(cabal_flag cpu_flags_x86_aes support_aesni)
+               --flag=${want_aes}support_aesni
 }