1 |
commit: 4f9b1087d1a8f39ebd8673d5bb6acd8673697423 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 1 23:02:02 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 1 23:02:02 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9b1087 |
7 |
|
8 |
dev-haskell/cryptonite: switch to CPU_CLAGS_X86_* IUSEs |
9 |
|
10 |
Reported-by: Michał Górny |
11 |
Closes: https://bugs.gentoo.org/695058 |
12 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
14 |
|
15 |
dev-haskell/cryptonite/Manifest | 2 -- |
16 |
dev-haskell/cryptonite/cryptonite-0.21.ebuild | 20 ++++++------- |
17 |
dev-haskell/cryptonite/cryptonite-0.7.ebuild | 41 --------------------------- |
18 |
dev-haskell/cryptonite/cryptonite-0.8.ebuild | 41 --------------------------- |
19 |
dev-haskell/cryptonite/metadata.xml | 8 ++---- |
20 |
5 files changed, 12 insertions(+), 100 deletions(-) |
21 |
|
22 |
diff --git a/dev-haskell/cryptonite/Manifest b/dev-haskell/cryptonite/Manifest |
23 |
index dd91d1325c7..d72d3a2bd54 100644 |
24 |
--- a/dev-haskell/cryptonite/Manifest |
25 |
+++ b/dev-haskell/cryptonite/Manifest |
26 |
@@ -1,3 +1 @@ |
27 |
DIST cryptonite-0.21.tar.gz 615850 BLAKE2B df5f0273fa40b5401e4bb5df7c4cd5839ab87fdff3d2cef6be80c977433a1adbcdbf1c9d42f79987e4a7a590f8179fd998f93017af396116e10554108566b028 SHA512 7f04ad5f7411bf90f343c13b71438fdd0e1e40cc5c9a5f1553c1f396a278f81cbe3a548ee8bc03b3b63bc66485ce36dc9a93c3dc3e5884f601bbae49efa98cc3 |
28 |
-DIST cryptonite-0.7.tar.gz 324734 BLAKE2B b0eabfa2575ed4680de541b5acafa1cc7d95ed5e7faca3ea53dddfdeea98a69ca76d7ea65e6117a8f6faf3c43a0b8f3a39c200e975279a78366140d80d663aff SHA512 077b181b1563087c6c04816a36bfd2efd7a732f72b02e5277f3d987093954ca8e420814b547c7c985418e74e8c838a3c8381b4821f3ed6fa8412b63078fade0e |
29 |
-DIST cryptonite-0.8.tar.gz 325531 BLAKE2B b62d1330de4305e2a7c48063f1745d8f47ef176d356c07b2d533dbdfe02d4d76bd5699f8dda0f258108b2c16b2cf4bbe8228f4565620125839101e721310a05a SHA512 c393e7a93f8d4368ae9ee3130eb44cbc0a4937fdbe27bb918a8900716d9946bae39897717b1c2b3c2531ce69562df3d3260177fa76a6f90ee53ace206fe382a3 |
30 |
|
31 |
diff --git a/dev-haskell/cryptonite/cryptonite-0.21.ebuild b/dev-haskell/cryptonite/cryptonite-0.21.ebuild |
32 |
index 773ab90c605..dd0416afc7e 100644 |
33 |
--- a/dev-haskell/cryptonite/cryptonite-0.21.ebuild |
34 |
+++ b/dev-haskell/cryptonite/cryptonite-0.21.ebuild |
35 |
@@ -1,10 +1,10 @@ |
36 |
# Copyright 1999-2019 Gentoo Authors |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
-EAPI=6 |
40 |
+EAPI=7 |
41 |
|
42 |
-# ebuild generated by hackport 0.5.1.9999 |
43 |
-#hackport: flags: -check_alignment,-old_toolchain_inliner |
44 |
+# ebuild generated by hackport 0.6.9999 |
45 |
+#hackport: flags: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_sse:cpu_flags_x86_sse,support_rdrand:cpu-flags-x86-rdrand,support_blake2_sse:cpu_flags_x86_sse |
46 |
|
47 |
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" |
48 |
inherit haskell-cabal |
49 |
@@ -15,8 +15,8 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" |
50 |
|
51 |
LICENSE="BSD" |
52 |
SLOT="0/${PV}" |
53 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
54 |
-IUSE="+integer-gmp +support_aesni support_blake2_sse +support_deepseq support_pclmuldq +support_rdrand" |
55 |
+KEYWORDS="~amd64 ~x86" |
56 |
+IUSE="+cpu-flags-x86-rdrand +cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp" |
57 |
|
58 |
RDEPEND=">=dev-haskell/memory-0.8:=[profile?] |
59 |
>=dev-lang/ghc-7.4.1:= |
60 |
@@ -35,9 +35,9 @@ src_configure() { |
61 |
--flag=-check_alignment \ |
62 |
$(cabal_flag integer-gmp integer-gmp) \ |
63 |
--flag=-old_toolchain_inliner \ |
64 |
- $(cabal_flag support_aesni support_aesni) \ |
65 |
- $(cabal_flag support_blake2_sse support_blake2_sse) \ |
66 |
- $(cabal_flag support_deepseq support_deepseq) \ |
67 |
- $(cabal_flag support_pclmuldq support_pclmuldq) \ |
68 |
- $(cabal_flag support_rdrand support_rdrand) |
69 |
+ $(cabal_flag cpu_flags_x86_aes support_aesni) \ |
70 |
+ $(cabal_flag cpu_flags_x86_sse support_blake2_sse) \ |
71 |
+ --flag=support_deepseq \ |
72 |
+ $(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \ |
73 |
+ $(cabal_flag cpu-flags-x86-rdrand support_rdrand) |
74 |
} |
75 |
|
76 |
diff --git a/dev-haskell/cryptonite/cryptonite-0.7.ebuild b/dev-haskell/cryptonite/cryptonite-0.7.ebuild |
77 |
deleted file mode 100644 |
78 |
index bf70362d04a..00000000000 |
79 |
--- a/dev-haskell/cryptonite/cryptonite-0.7.ebuild |
80 |
+++ /dev/null |
81 |
@@ -1,41 +0,0 @@ |
82 |
-# Copyright 1999-2015 Gentoo Foundation |
83 |
-# Distributed under the terms of the GNU General Public License v2 |
84 |
- |
85 |
-EAPI=5 |
86 |
- |
87 |
-# ebuild generated by hackport 0.4.6.9999 |
88 |
- |
89 |
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" |
90 |
-inherit haskell-cabal |
91 |
- |
92 |
-DESCRIPTION="Cryptography Primitives sink" |
93 |
-HOMEPAGE="https://github.com/vincenthz/cryptonite" |
94 |
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" |
95 |
- |
96 |
-LICENSE="BSD" |
97 |
-SLOT="0/${PV}" |
98 |
-KEYWORDS="~amd64 ~x86" |
99 |
-IUSE="+integer-gmp +support_aesni +support_deepseq support_pclmuldq +support_rdrand" |
100 |
- |
101 |
-RESTRICT=test # slow |
102 |
- |
103 |
-RDEPEND=">=dev-haskell/memory-0.8:=[profile?] |
104 |
- >=dev-lang/ghc-7.4.1:= |
105 |
-" |
106 |
-DEPEND="${RDEPEND} |
107 |
- >=dev-haskell/cabal-1.10 |
108 |
- test? ( dev-haskell/byteable |
109 |
- dev-haskell/tasty |
110 |
- dev-haskell/tasty-hunit |
111 |
- dev-haskell/tasty-kat |
112 |
- dev-haskell/tasty-quickcheck ) |
113 |
-" |
114 |
- |
115 |
-src_configure() { |
116 |
- haskell-cabal_src_configure \ |
117 |
- $(cabal_flag integer-gmp integer-gmp) \ |
118 |
- $(cabal_flag support_aesni support_aesni) \ |
119 |
- $(cabal_flag support_deepseq support_deepseq) \ |
120 |
- $(cabal_flag support_pclmuldq support_pclmuldq) \ |
121 |
- $(cabal_flag support_rdrand support_rdrand) |
122 |
-} |
123 |
|
124 |
diff --git a/dev-haskell/cryptonite/cryptonite-0.8.ebuild b/dev-haskell/cryptonite/cryptonite-0.8.ebuild |
125 |
deleted file mode 100644 |
126 |
index 08d4a6767c3..00000000000 |
127 |
--- a/dev-haskell/cryptonite/cryptonite-0.8.ebuild |
128 |
+++ /dev/null |
129 |
@@ -1,41 +0,0 @@ |
130 |
-# Copyright 1999-2015 Gentoo Foundation |
131 |
-# Distributed under the terms of the GNU General Public License v2 |
132 |
- |
133 |
-EAPI=5 |
134 |
- |
135 |
-# ebuild generated by hackport 0.4.6.9999 |
136 |
- |
137 |
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" |
138 |
-inherit haskell-cabal |
139 |
- |
140 |
-DESCRIPTION="Cryptography Primitives sink" |
141 |
-HOMEPAGE="https://github.com/haskell-crypto/cryptonite" |
142 |
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" |
143 |
- |
144 |
-LICENSE="BSD" |
145 |
-SLOT="0/${PV}" |
146 |
-KEYWORDS="~amd64 ~x86" |
147 |
-IUSE="+integer-gmp +support_aesni +support_deepseq support_pclmuldq +support_rdrand" |
148 |
- |
149 |
-RESTRICT=test # slow |
150 |
- |
151 |
-RDEPEND=">=dev-haskell/memory-0.8:=[profile?] |
152 |
- >=dev-lang/ghc-7.4.1:= |
153 |
-" |
154 |
-DEPEND="${RDEPEND} |
155 |
- >=dev-haskell/cabal-1.10 |
156 |
- test? ( dev-haskell/byteable |
157 |
- dev-haskell/tasty |
158 |
- dev-haskell/tasty-hunit |
159 |
- dev-haskell/tasty-kat |
160 |
- dev-haskell/tasty-quickcheck ) |
161 |
-" |
162 |
- |
163 |
-src_configure() { |
164 |
- haskell-cabal_src_configure \ |
165 |
- $(cabal_flag integer-gmp integer-gmp) \ |
166 |
- $(cabal_flag support_aesni support_aesni) \ |
167 |
- $(cabal_flag support_deepseq support_deepseq) \ |
168 |
- $(cabal_flag support_pclmuldq support_pclmuldq) \ |
169 |
- $(cabal_flag support_rdrand support_rdrand) |
170 |
-} |
171 |
|
172 |
diff --git a/dev-haskell/cryptonite/metadata.xml b/dev-haskell/cryptonite/metadata.xml |
173 |
index 2558232f1f8..c845b334ecd 100644 |
174 |
--- a/dev-haskell/cryptonite/metadata.xml |
175 |
+++ b/dev-haskell/cryptonite/metadata.xml |
176 |
@@ -1,4 +1,4 @@ |
177 |
-<?xml version='1.0' encoding='UTF-8'?> |
178 |
+<?xml version="1.0" encoding="UTF-8"?> |
179 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
180 |
<pkgmetadata> |
181 |
<maintainer type="project"> |
182 |
@@ -29,12 +29,8 @@ |
183 |
Evaluate the security related to your requirements before using. |
184 |
</longdescription> |
185 |
<use> |
186 |
- <flag name="support_aesni">allow compilation with AESNI on system and architecture that supports it</flag> |
187 |
- <flag name="support_rdrand">allow compilation with AESNI on system and architecture that supports it</flag> |
188 |
- <flag name="support_pclmuldq">Allow compilation with pclmuldq on architecture that supports it</flag> |
189 |
+ <flag name="cpu-flags-x86-rdrand">allow compilation with RDRAND on system and architecture that supports it</flag> |
190 |
<flag name="integer-gmp">Whether or not to use GMP for some functions</flag> |
191 |
- <flag name="support_deepseq">add deepseq instances for cryptographic types</flag> |
192 |
- <flag name="support_blake2_sse">Use SSE optimized version of BLAKE2</flag> |
193 |
</use> |
194 |
<upstream> |
195 |
<remote-id type="github">haskell-crypto/cryptonite</remote-id> |