Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.

6 files changed, 103 insertions, 29 deletions

diff --git a/dev-haskell/cryptonite/Manifest b/dev-haskell/cryptonite/Manifest
index 4a555856101f..de986ab7a4cc 100644
--- a/dev-haskell/cryptonite/Manifest
+++ b/dev-haskell/cryptonite/Manifest
@@ -1,4 +1,7 @@
-AUX cryptonite-0.21-sse2.patch 372 BLAKE2B 0aa045ffbc4153367c232a62192f6d3bdf41b514d6e6415ee9ad4b2290ad5e6126e028a39b600b14bbbc12f11a18eff2e09d0ea00e4237c7e457763b750dceff SHA512 dc4aee2ee1754936ccfd1a604a9b781a16770675bdd38cfc9fd1624feeb568fae0d30eecde625ca03e38d60fabc5bb59db51f521af890da635da5924effacdb1
 DIST cryptonite-0.21.tar.gz 615850 BLAKE2B df5f0273fa40b5401e4bb5df7c4cd5839ab87fdff3d2cef6be80c977433a1adbcdbf1c9d42f79987e4a7a590f8179fd998f93017af396116e10554108566b028 SHA512 7f04ad5f7411bf90f343c13b71438fdd0e1e40cc5c9a5f1553c1f396a278f81cbe3a548ee8bc03b3b63bc66485ce36dc9a93c3dc3e5884f601bbae49efa98cc3
-EBUILD cryptonite-0.21.ebuild 1495 BLAKE2B c421a1932ec4924d02ace3290b7f775d20f7a278924a267acece92607f61f39ff4ffd08ef09e17f88e5b63684f2853716302e26efab158b067ec0f4112e9ac78 SHA512 7b9e7fef431544dd047abcc3b776bb541eff94543a5aa1cd14a06c8a93fce332a6a277566f0f1fc260a05ab09c70e599e595c57e524bb50f92a09034acdfe8a4
-MISC metadata.xml 1375 BLAKE2B 57717826af32cc08fca8f3bfd31ff57192f557d202897b6e7feea124494b660669c03f783321e24142277235839fc3b37e2f24c1fabfb5ed690c3873f80c4670 SHA512 de4d581bb0a57ed192fcbbd64024d21fa25c34f67bb75a94e871b1ca1e320f58befee639a307c055a2405a16c9ac3b76be1bdaf2bb13f257a86829f33c431938
+DIST cryptonite-0.7.tar.gz 324734 BLAKE2B b0eabfa2575ed4680de541b5acafa1cc7d95ed5e7faca3ea53dddfdeea98a69ca76d7ea65e6117a8f6faf3c43a0b8f3a39c200e975279a78366140d80d663aff SHA512 077b181b1563087c6c04816a36bfd2efd7a732f72b02e5277f3d987093954ca8e420814b547c7c985418e74e8c838a3c8381b4821f3ed6fa8412b63078fade0e
+DIST cryptonite-0.8.tar.gz 325531 BLAKE2B b62d1330de4305e2a7c48063f1745d8f47ef176d356c07b2d533dbdfe02d4d76bd5699f8dda0f258108b2c16b2cf4bbe8228f4565620125839101e721310a05a SHA512 c393e7a93f8d4368ae9ee3130eb44cbc0a4937fdbe27bb918a8900716d9946bae39897717b1c2b3c2531ce69562df3d3260177fa76a6f90ee53ace206fe382a3
+EBUILD cryptonite-0.21.ebuild 1306 BLAKE2B 300965d26a5ff5ebd169a9e16de8e6e2cedc09e2ab1c066469f0d532df21ef3cef6655deb757d82b07ada46d0a5b58222541b260b499c2db12f29c026dd22f79 SHA512 bfc2c1788c96fbdfb9756e0a7d276c1857846106dd10c8bddff3ffb83b05bdaa844fa9e8c2039d61caa6407c30a34150da6d11d4526772236bcfb40c2e8db808
+EBUILD cryptonite-0.7.ebuild 1109 BLAKE2B 0248cc967d6ffad48a7941933b80f5bf246413ca75ffa74b088d06074a2b4b53cc9663c2cd0d808346caa6a79da9d8ed8595ca789d97f4022d77167b01baecef SHA512 68b9c87848b3c64ca0834d9ad4b1f67e668029f16a0ac41f6b7d9cbb3a44ecfa44ed98d0cdd6fab86a17bc32d4b2f4be410cf4936991433b72867d04c402289a
+EBUILD cryptonite-0.8.ebuild 1114 BLAKE2B 05cad9a54436b5c59c465365c2100e7b4c8c191a8e9e578d1ff3dd8c3f9fbbc1f64712c2b4089107b87a74184d7415a7213d92ea56c775241d8695c0622af0c4 SHA512 f470ba4e7ad2ef069da36b531f70d323fa661c8d48e9f93e2d62710db67ac9dc586918e5f0f29a5ec3e8f78d19f0aca03d9cdd2ed4b382abf8ecd8f60f13a126
+MISC metadata.xml 1742 BLAKE2B 69dc6545e0d61413e5d719fb39384815586d24a4359becfc388d3e4654b5998c59dcabfa3617846047ad467ba385b575f45e5089e8b98039778b42d20242e15d SHA512 f1dcfbb9a816fc6c7a418fb38b98f3de6fc240b694e44a3d1a5a44f06e79d1940be46ac2712e32e1fc3af29942f8a100c0a4795d7e803d28c2e76c103b179d13
diff --git a/dev-haskell/cryptonite/cryptonite-0.21.ebuild b/dev-haskell/cryptonite/cryptonite-0.21.ebuild
index c7d05d15f68b..773ab90c605c 100644
--- a/dev-haskell/cryptonite/cryptonite-0.21.ebuild
+++ b/dev-haskell/cryptonite/cryptonite-0.21.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_rdrand:cpu-flags-x86-rdrand,support_blake2_sse:cpu_flags_x86_sse2
+# ebuild generated by hackport 0.5.1.9999
+#hackport: flags: -check_alignment,-old_toolchain_inliner
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cpu-flags-x86-rdrand cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 +integer-gmp"
+IUSE="+integer-gmp +support_aesni support_blake2_sse +support_deepseq support_pclmuldq +support_rdrand"
 
 RDEPEND=">=dev-haskell/memory-0.8:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
@@ -30,18 +30,14 @@ DEPEND="${RDEPEND}
 		dev-haskell/tasty-quickcheck )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-sse2.patch
-)
-
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-check_alignment \
 		$(cabal_flag integer-gmp integer-gmp) \
 		--flag=-old_toolchain_inliner \
-		$(cabal_flag cpu_flags_x86_aes support_aesni) \
-		$(cabal_flag cpu_flags_x86_sse2 support_blake2_sse) \
-		--flag=support_deepseq \
-		$(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
-		$(cabal_flag cpu-flags-x86-rdrand support_rdrand)
+		$(cabal_flag support_aesni support_aesni) \
+		$(cabal_flag support_blake2_sse support_blake2_sse) \
+		$(cabal_flag support_deepseq support_deepseq) \
+		$(cabal_flag support_pclmuldq support_pclmuldq) \
+		$(cabal_flag support_rdrand support_rdrand)
 }
diff --git a/dev-haskell/cryptonite/cryptonite-0.7.ebuild b/dev-haskell/cryptonite/cryptonite-0.7.ebuild
new file mode 100644
index 000000000000..bf70362d04a2
--- /dev/null
+++ b/dev-haskell/cryptonite/cryptonite-0.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Cryptography Primitives sink"
+HOMEPAGE="https://github.com/vincenthz/cryptonite"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+integer-gmp +support_aesni +support_deepseq support_pclmuldq +support_rdrand"
+
+RESTRICT=test # slow
+
+RDEPEND=">=dev-haskell/memory-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/byteable
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-kat
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag integer-gmp integer-gmp) \
+		$(cabal_flag support_aesni support_aesni) \
+		$(cabal_flag support_deepseq support_deepseq) \
+		$(cabal_flag support_pclmuldq support_pclmuldq) \
+		$(cabal_flag support_rdrand support_rdrand)
+}
diff --git a/dev-haskell/cryptonite/cryptonite-0.8.ebuild b/dev-haskell/cryptonite/cryptonite-0.8.ebuild
new file mode 100644
index 000000000000..08d4a6767c3b
--- /dev/null
+++ b/dev-haskell/cryptonite/cryptonite-0.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Cryptography Primitives sink"
+HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+integer-gmp +support_aesni +support_deepseq support_pclmuldq +support_rdrand"
+
+RESTRICT=test # slow
+
+RDEPEND=">=dev-haskell/memory-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/byteable
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-kat
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag integer-gmp integer-gmp) \
+		$(cabal_flag support_aesni support_aesni) \
+		$(cabal_flag support_deepseq support_deepseq) \
+		$(cabal_flag support_pclmuldq support_pclmuldq) \
+		$(cabal_flag support_rdrand support_rdrand)
+}
diff --git a/dev-haskell/cryptonite/files/cryptonite-0.21-sse2.patch b/dev-haskell/cryptonite/files/cryptonite-0.21-sse2.patch
deleted file mode 100644
index 02d2069cfd20..000000000000
--- a/dev-haskell/cryptonite/files/cryptonite-0.21-sse2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/696220
---- a/cryptonite.cabal
-+++ b/cryptonite.cabal
-@@ -276,6 +276,7 @@ Library
-                    , cbits/cryptonite_aes.c
- 
-   if arch(x86_64) || flag(support_blake2_sse)
-+    CC-options:     -msse2
-     C-sources:      cbits/blake2/sse/blake2s.c
-                   , cbits/blake2/sse/blake2sp.c
-                   , cbits/blake2/sse/blake2b.c
diff --git a/dev-haskell/cryptonite/metadata.xml b/dev-haskell/cryptonite/metadata.xml
index c845b334ecdc..2558232f1f8f 100644
--- a/dev-haskell/cryptonite/metadata.xml
+++ b/dev-haskell/cryptonite/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -29,8 +29,12 @@
 		Evaluate the security related to your requirements before using.
 	</longdescription>
 	<use>
-		<flag name="cpu-flags-x86-rdrand">allow compilation with RDRAND on system and architecture that supports it</flag>
+		<flag name="support_aesni">allow compilation with AESNI on system and architecture that supports it</flag>
+		<flag name="support_rdrand">allow compilation with AESNI on system and architecture that supports it</flag>
+		<flag name="support_pclmuldq">Allow compilation with pclmuldq on architecture that supports it</flag>
 		<flag name="integer-gmp">Whether or not to use GMP for some functions</flag>
+		<flag name="support_deepseq">add deepseq instances for cryptographic types</flag>
+		<flag name="support_blake2_sse">Use SSE optimized version of BLAKE2</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">haskell-crypto/cryptonite</remote-id>