6 files changed, 14 insertions, 172 deletions
diff --git a/dev-haskell/dns/Manifest b/dev-haskell/dns/Manifest
index a3096b3d4254..3c83abe3ae13 100644
--- a/dev-haskell/dns/Manifest
+++ b/dev-haskell/dns/Manifest
@@ -1,11 +1,3 @@
-DIST dns-0.3.8.tar.gz 11313 BLAKE2B 175b85129ac505414a31794c1150eefb9d8e92d36cc5348272268c32825a442f7bc68e684fd635d42471e568a60acc5a05cf5b320d85ac9453de167609c3adf3 SHA512 dbd6d042866e1861a47660c7daba1f29ee445a48eae3c25e05306878a74f9758587430296222e3f67062a3c173d96dab833a6d43b5d3237d614cfd2bad92be9d
-DIST dns-1.4.5.tar.gz 20071 BLAKE2B ec116289a4b252a504a24b9ce79dce739b8b3008d69aa00a64d6abe04e930280494767af49e5d78f28aefad3ed9c0f5431a6892c5a81b711b448a69b3c6b8545 SHA512 a5b434fa868a3254234b4ffef579e007ff7a9e41867f1d81d554573d026d4de86967dc0e313c86d603287581020163365c9f2f795084a15efca3f05ad9daf538
-DIST dns-2.0.0.tar.gz 20570 BLAKE2B 7b15a58a8b2e6c6170db4bd5886c31e111a5237c1d6c5a1297cd34f7da26248d6d51b725d5d8e631f70767db28a75ad2583817cf3d87066ce862f018e1057743 SHA512 b681b3a6eed46a98b466df0e367b44cfc964d5b0a7d22912ece0a469e79b3176a2a3674fa1cd0d458037d413f5890362c47112c7f35a5f491c67b4ec6773405c
-DIST dns-2.0.2.tar.gz 20951 BLAKE2B de4785384bbfb626dd1a315b6df3768b20091d232c8ee6626e73d87197970282a5a1a3c98d03094fceddc81ae4df3ca5ada7b2a5d9fc738cbca49d78f1ba9387 SHA512 14f444e0c1074359e84ef854d7b3d5db0d70c93412db609263f9f5897cfe7269ee2a78154614007204732a81ca09610d445ae35520b07d7e0e46895089d0d0d9
-DIST dns-2.0.6.tar.gz 21907 BLAKE2B 08e426c26fe98d034973624ff75d164b2e6334cdec9fbe08a1e2b140eb76e01665c2ff8c10d93f354cc473afe483a41aee297f9bc56253b7f3c8c5e2cc311c44 SHA512 2bc3974ac128bc4da9ae19ff3edf40dbc9b1ce42353dab40819c3ff42b3ef27204e09b552b4a885c558d5cd6af65495ac305e6ada3eb3e6291e7b32dbd929ae8
-EBUILD dns-0.3.8.ebuild 993 BLAKE2B 8de95ced6f409bda6b17faef24657945eafc47f8c77557345baf133ac15933bd56283f9cb20e5ed0cc80e98a6af8db3368adb409362382f09687555834964ef8 SHA512 1703f6c7208f66e59194fd0f2d13a1446471d541ab019b212319c350d704972103c7879c4e8d0b616576d23b8da91848d22b745bcf5e17858eb1a3ebe49afe61
-EBUILD dns-1.4.5.ebuild 1010 BLAKE2B e4ad50222eb8dd286024f9f0624ef655bafcc76235f2f5f8ea75532acd0fa842c5f5a4bfdb05eaa2204993599c69d694a8542e1e281ad21429e96cf159c48b34 SHA512 5477cea8d8f9263f4ce1078fe60a2d70500a94ca962e3faf77b10fecf6e082a5d05eefc70acf413cb49a8a73a9249624a4f83f496c87b1268bf1fa7d790bd2ee
-EBUILD dns-2.0.0.ebuild 1010 BLAKE2B e4ad50222eb8dd286024f9f0624ef655bafcc76235f2f5f8ea75532acd0fa842c5f5a4bfdb05eaa2204993599c69d694a8542e1e281ad21429e96cf159c48b34 SHA512 5477cea8d8f9263f4ce1078fe60a2d70500a94ca962e3faf77b10fecf6e082a5d05eefc70acf413cb49a8a73a9249624a4f83f496c87b1268bf1fa7d790bd2ee
-EBUILD dns-2.0.2.ebuild 1035 BLAKE2B d5dada2171a9fc983ace884352f9858ba9f531279710416f99faf3ae7ac3d64caad3a933d296c65cda46e10cac1dbe233461dc18beedab68d633313e9146ad42 SHA512 7568ff3f7e5d2bc1dc424ab51887def1ec0c2fd51aba8fa093c9681f06b7c33ef79ff34ee394ff71a364827096c49572f2602385bc06e26ebf3b37ae6fa3beb4
-EBUILD dns-2.0.6.ebuild 1064 BLAKE2B 71d842beb7298fdcfc4751957f1cc39fb61b4859300a0747865784e295f65df4c427933dce2e1e756364bc68a2623819d43150d8de5b9a6ef0dbda86cbc16889 SHA512 feefb0a49d6b9e03b5d08fa98489ff537c596e3dcdf18f61006157d4823a43d8aa7835167499d0c8df47c7c6fec4fe84b412daa7e3d61c69dc3c2cef851a1af2
+DIST dns-4.0.1.tar.gz 65645 BLAKE2B 1332522ea57fb5df7e97ebe5caaa29580e8fc9edf77064b03d1dd6f5935975e37e21cbb4f95a92c4dce53b222b51a7b46008cd6a05fed9cf3d95bd4c3b359f73 SHA512 5c3d86c95aeb61ffdf951472a18ce2878b9dad1069efdf02fd7aff4065cf88c93c13d197488af65811440c674a75601b0c3336a6de6a9bff98cca018254b6e9c
+EBUILD dns-4.0.1.ebuild 1090 BLAKE2B e11cbd9c468cb011874e71cea5111318f48c91e86ffa26af747e6e2404f3877259bc2fc0bd4bd2e4c54282a0d8272b515013b1f6340fb3f9525f366e42661049 SHA512 232d47025af7e92084a6cbeef0bea25b38b6f29d40d1602ab812ce49f8614208cc2daca37afd1d6a06fd669af44f5a1103211362de9bf3bb3eea590103f3a877
 MISC metadata.xml 327 BLAKE2B e0f718c31838efedac5b94d5d7e5d82686f9918090db7472d2e8ec6c1cb4b82507efc630c71dd0ad5c031f85c4e4e81ee7514b9a55f95e0ee058a6fbd62119ec SHA512 acef7c51be1e93c7925446f5fafa69afe7b2a41695b3750da8b390e7bc7d097d3044c1abaadfde0bffa7b3c8a2eae7176e6b3d323d582d387ef5812a181800fe
diff --git a/dev-haskell/dns/dns-0.3.8.ebuild b/dev-haskell/dns/dns-0.3.8.ebuild
deleted file mode 100644
index a4dacac1bac0..000000000000
--- a/dev-haskell/dns/dns-0.3.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/dns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # relies on external network #502534
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-		dev-haskell/attoparsec-conduit:=[profile?]
-		dev-haskell/binary:=[profile?]
-		dev-haskell/blaze-builder:=[profile?]
-		dev-haskell/conduit:=[profile?]
-		>=dev-haskell/iproute-1.2.4:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/network:=[profile?]
-		dev-haskell/network-bytestring:=[profile?]
-		dev-haskell/network-conduit:=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/dns/dns-1.4.5.ebuild b/dev-haskell/dns/dns-1.4.5.ebuild
deleted file mode 100644
index 73e003e048ae..000000000000
--- a/dev-haskell/dns/dns-1.4.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 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="DNS library in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/dns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ambiguous modules
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/dns-2.0.0.ebuild b/dev-haskell/dns/dns-2.0.0.ebuild
deleted file mode 100644
index 73e003e048ae..000000000000
--- a/dev-haskell/dns/dns-2.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 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="DNS library in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/dns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ambiguous modules
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/dns-2.0.2.ebuild b/dev-haskell/dns/dns-2.0.2.ebuild
deleted file mode 100644
index aec8b7d91e55..000000000000
--- a/dev-haskell/dns/dns-2.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="DNS library in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/dns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ambiguous modules: ip-route / network-data
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/dns-2.0.6.ebuild b/dev-haskell/dns/dns-4.0.1.ebuild
index 874527cfd7b8..18e2a2d7703f 100644
--- a/dev-haskell/dns/dns-2.0.6.ebuild
+++ b/dev-haskell/dns/dns-4.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.9999
+# ebuild generated by hackport 0.6.4.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -19,21 +19,23 @@ IUSE=""
 
 RESTRICT=test # uses internet to test resolver
 
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
+RDEPEND="dev-haskell/async:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/auto-update:=[profile?]
+	dev-haskell/base16-bytestring:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	dev-haskell/hourglass:=[profile?]
 	>=dev-haskell/iproute-1.3.2:=[profile?]
 	dev-haskell/mtl:=[profile?]
 	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	dev-haskell/psqueues:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-2.0
 	test? ( dev-haskell/doctest
 		dev-haskell/hspec
+		>=dev-haskell/quickcheck-2.9
 		dev-haskell/word8 )
 "