gentoo resync : 25.08.2020

3 files changed, 16 insertions, 75 deletions

diff --git a/dev-haskell/tls/Manifest b/dev-haskell/tls/Manifest
index f5bcab2c597a..bea52ac588e1 100644
--- a/dev-haskell/tls/Manifest
+++ b/dev-haskell/tls/Manifest
@@ -1,7 +1,5 @@
-DIST tls-1.2.18.tar.gz 74115 BLAKE2B 5fda3b303d095afc079516e55dfa403cf01de4c77d5c1cb09ba39ad4604b021fae13932bf5d544f9d888aa42214c946fa1597bfb70595f8b5bb76bf9c4afe03b SHA512 34648a2f42c2a0f54b50a10daf3f9b8fb8452aa48e811122f8c69336621c45214a293fa85f8db5a9d568a5cbe7f114c8eef97968c76147d9ef016a8c3d2375ab
-DIST tls-1.3.4.tar.gz 77920 BLAKE2B d82deb31a6fc08b2c9b4ae1ae33b130f05b0de52fbded6af42ce8f503fd504951446d0ba5220281b3b27120e91ada05668177294fc1362515dc3cfb5f94ebb48 SHA512 8b90cd2e9f31ea5dabe0fc8669bea43ac144ee7dfa3fdcb465a31975c35c45fb8b82cdc6175801fce7dbb9f52aaa594b82e16ededdbb7fd697d5fa673ed7c777
 DIST tls-1.3.9.tar.gz 88354 BLAKE2B 1d3d6be5ead5074c5583a2238a2f3352ba4b1f4398a891642e3ff2e5fc4375c669a81de64f9f10f1b13ade6c3a2e57e3b6507ea0d31bae0e6a218107558115c4 SHA512 bb7d573e44707121fef65c66b83086b0bd477d3fe526d0bcc9dfa0a59059d340eea6091bb0d6b36819bd2999d2ffa581d3591dbc4b2000bf5e1ba6dd40923446
-EBUILD tls-1.2.18.ebuild 1815 BLAKE2B 3722b7327b66e624069f26ce075cc32bf9bd9941e0ce7b6dead9304dabbcbb1547950f9fab2d290a061dae70537646f6870d4321374e18e95cfcc44c9f8a9699 SHA512 f971bd462d17797c0de02ac12fd2a45c33c5bb34e8db0cf91842f5cf68d4617f2d9a9f5583aa85f97a1dc30f5d543f52d8922269355a63ae318bafe2ce47d537
-EBUILD tls-1.3.4.ebuild 1449 BLAKE2B 0a756f86ed283eb8caf8ed75804e4b20d7a3a0ae8840145e386584e265c41577d4be2d46d1056efd215948ed3ce29c3379cc03979fbd52008666a75e6dd8c4da SHA512 dc17c8a66a3ae38a421af64a63945a60419040e86153f82d061acde2ab47b17e4c34f7acad1dd3d1d2e367381674c3fd62c551ca2f0d73c3f1c18d4432c58657
+DIST tls-1.5.4.tar.gz 150171 BLAKE2B 03085bd5f0d20b27fd5ea31e5e6179a15ac5893cc585d5a274523444838e8e05e9f3f4028b44147d6bb20df2c37e293046255765c253b57d2be4584066f24f8b SHA512 fb95ab6012ed95d82a41810b83e6f779645fa56d46c57f34a954a6885c295737808edcdcdca9e88e5b3c663f5aee71f104fe1fdd9ab35fb6a8ade4a202376d4a
 EBUILD tls-1.3.9.ebuild 1376 BLAKE2B 940c148c7fe02bdaab8a815333a02ac32d937c9114eecc935b19aa41c695cdc6607699b28293a275d777658be0cca63020c3b5ea07d1c2f9bc7b5b5063e97ee9 SHA512 01c175d15ca035868beac1350b1378114a3ba0a98beabec04f5de14fec56326c5444a2f008e693f3a994a2a6bade3dcc2dda6ecba86564c561ccce2f73f10d22
+EBUILD tls-1.5.4.ebuild 1366 BLAKE2B f1746c3ccbc0c38ddeb33f5a1266e0930751f0e12f23ac10a5faf40ba5438092ccfce8422ef3378d31bbfaf7a6f0bc543e54fd277798c5d68a19ed67caa41c4f SHA512 c96d05c16a52fbbddd41d8d59cd7b6d37aed8dbca5a7e846fa7c466e210e1c55007d91f39c4c959fe56f8692accdc7f4b94a0d0536d74e4841fa0f5bccaae824
 MISC metadata.xml 1116 BLAKE2B 9d00bcd54e0705289cfaa53b4de66f26abe5aced518e3a2297e006c3831a47211a765fc4b67546e99ece24df406dfa27c2917bbfb886becaa9c322cc981b9fd7 SHA512 d2edc3311ce239a521e6f941e5cd4a98c25b70376b18b8700643e06e580532d7d6d1b760b5229871f3fe938c89e47cde3734a7c87de1427b83950cd22d73c590
diff --git a/dev-haskell/tls/tls-1.2.18.ebuild b/dev-haskell/tls/tls-1.2.18.ebuild
deleted file mode 100644
index b7c559d95b97..000000000000
--- a/dev-haskell/tls/tls-1.2.18.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat"
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
-	>=dev-haskell/asn1-types-0.2.0:=[profile?]
-	dev-haskell/async:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cereal-0.4:=[profile?]
-	>=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?]
-	dev-haskell/cipher-des:=[profile?]
-	dev-haskell/cipher-rc4:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.8:=[profile?]
-	dev-haskell/crypto-numbers:=[profile?]
-	>=dev-haskell/crypto-pubkey-0.2.8:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4:=[profile?]
-	>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	>=dev-haskell/cryptohash-0.6:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6.0:=[profile?]
-	>=dev-haskell/x509-store-1.5.0:=[profile?]
-	>=dev-haskell/x509-validation-1.5.1:=[profile?] <dev-haskell/x509-validation-1.6.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/cprng-aes-0.5
-		dev-haskell/hourglass
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag compat compat)
-}
diff --git a/dev-haskell/tls/tls-1.3.4.ebuild b/dev-haskell/tls/tls-1.5.4.ebuild
index 70448327f8d3..e8454a5db2c0 100644
--- a/dev-haskell/tls/tls-1.3.4.ebuild
+++ b/dev-haskell/tls/tls-1.5.4.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.6.4
 #hackport: flags: -hans
-
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
@@ -20,23 +19,22 @@ IUSE="+compat +network"
 
 RDEPEND="dev-haskell/asn1-encoding:=[profile?]
 	>=dev-haskell/asn1-types-0.2.0:=[profile?]
-	dev-haskell/async:=[profile?]
-	>=dev-haskell/cereal-0.4:=[profile?]
-	>=dev-haskell/cryptonite-0.7:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?]
+	>=dev-haskell/cereal-0.5.3:=[profile?]
+	>=dev-haskell/cryptonite-0.25:=[profile?]
 	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/memory:=[profile?]
+	dev-haskell/hourglass:=[profile?]
+	>=dev-haskell/memory-0.14.6:=[profile?]
 	>=dev-haskell/mtl-2:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/x509-1.6.2:=[profile?] <dev-haskell/x509-1.7.0:=[profile?]
+	>=dev-haskell/x509-1.7.5:=[profile?]
 	>=dev-haskell/x509-store-1.6:=[profile?]
-	>=dev-haskell/x509-validation-1.6.3:=[profile?] <dev-haskell/x509-validation-1.7.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network? ( dev-haskell/network:=[profile?] )
+	>=dev-haskell/x509-validation-1.6.5:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+	network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hourglass
-		dev-haskell/quickcheck
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/quickcheck
 		dev-haskell/tasty
 		dev-haskell/tasty-quickcheck )
 "