gentoo resync : 25.08.2020

17 files changed, 222 insertions, 933 deletions

diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 68af2979ea1a..c30987d52fe4 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -1,19 +1,6 @@
-AUX darcs-2.12.4-ghc-8.0.2_rc1.patch 540 BLAKE2B 559776da5ac9852ffde22e5f8c890ab585aa1ec7a0a63731b08c89cb12c4c170d62c6e3270afd39dd1338a7f69f657d60234c462a8e8259f895252fce92dfe97 SHA512 455b8c3b70c78eb8f59d9792b299d5d610079fef2f72090e6eb1b26fc3b97a9e6800187e73f5be17fe0d8623b4ad6e946419ceca7971590d16d42ddcb673cab4
-AUX darcs-2.8.4-fix-nonatomic-global.patch 837 BLAKE2B ae57ecf0b9a7e5947615636ddd8139c439cced522faecc653bc140fb590c065fbf6ea52c9886fa5cce92badf9a8aac48051fe36f845de4a4b7c7f0049bb0a755 SHA512 98c05960d2c5d74df7c934fc6d94f1f8367e04b07ad6189004d09ce190e9bb1799cf7cd43387dad8bc15230dbebd06ccc874e81460119c3d7b959c761e359825
-AUX darcs-2.8.4-ghc-7.8-part-1.patch 5679 BLAKE2B cbb14af7f68b362744f873859cc95184211876eedf89d34e6f5183479b51a3467b5424cc7ba36fffeecb3c61ea7fb5b87f4eadcaba7d7c3839ac17930765b51c SHA512 9c6674e835227cae04074f82777a08e7b1cedc6b42deff7c271c53e2622b14217926a52ccba7651e3b7e0cfd40e0243e10529141ceae9044895d021af8ee1599
-AUX darcs-2.8.4-ghc-7.8-part-2.patch 449 BLAKE2B b88a4334d02dfb558b9284b6396555fed7df81cd0c6769172b3a4fea6d445bd462be1687184b0b4cc553ba75283a36f7b9ae9f2c486218c4fc189e9794eae9b3 SHA512 3dd469ea3f42f2b2c5388a9a47cdd4c901af2b663c8c1cb5ae75c595915e141652d3fe9f89b898483c06d3ee9b2d7df651b401e215b8aac0c1431b6e17639e41
-AUX darcs-2.8.4-issue2364-part-2.patch 1787 BLAKE2B 64949cae0931e55b06d3ec6923e390d6058166393e92dcd73b6452f7fc33623b85e96d1fc8223b38ca4d160a713c66e8ea20baf524e6a024e748e03385396e24 SHA512 54594052d5492d98472da7aee611314bd08e3dfd3bfbe55b082cf3071048b4a066ddcdbbf445be6774255f406c8f67a6c9a76e536817354b89902ee30eeed02b
-AUX darcs-2.8.4-issue2364.patch 2955 BLAKE2B 3d129b192ebf90688c4bf2501b7e90fdb86be23d6bd0bc5e807f167dc120e61791d5f25311421553135e676338e95af4cba5cbdee2a5a35fffb43abd804aa9d9 SHA512 01c70841c53bfdc8d047bd91609a30e37dee9def3c52930709a990ad4918461f01d5467ff9a0c0771def5151fdc5198c9a883c2f25ff2a16be756f60029f1e2e
-DIST darcs-2.10.1.tar.gz 1509208 BLAKE2B 54df9e87ab5b4d49146eeaad99c4718cc38b6fb032da2fb005c1ddc8a6d5ffa725b9c7caac30eb4da394bfb0926ba76040e24a69beeacd25e810cad8987d34f3 SHA512 b8c3971da3d635a7d90e35226c2ffa6d6ca8e78ba18793c632b7509bc4d52c1bda2490d147cdaea5842fbe5d8826b0025de61e2fb4f58c441875c5858d910e47
-DIST darcs-2.10.3.tar.gz 1513296 BLAKE2B 4a900a4307f1067cb078396f28358f75107821a67104ec91653cdc0ae1c5503fd18baa3d0ae95a0476fa5917345de932411053d35d8f0cfee3782cdd84a13c7e SHA512 cf8f34df331d8a47c6a25775c465824e5d71ed00ae6bc477989b4bb0e7fad606b213a4fb4e06b02dca096df2b6b1fe36f394672a112b48c6b56188a7eae8f90e
-DIST darcs-2.12.0.tar.gz 1465730 BLAKE2B a021796aefc38aaf355a3156f26c8f313ffbe44ad5e9172883217f609c73baed49301a26bbc818574175c0e7174ad6401407ae9492584e3aed56e8fb2bf10f7a SHA512 654f9054dfe8e23e17ae00cdf22153ddaf89d114c5ee0e1ca86f373c1abf62b7bd808965f4d4df695aaba44d1d334d725cc0d57dea5df7cd1992a0ef15e49135
-DIST darcs-2.12.4.tar.gz 1462383 BLAKE2B 49827a07770da8253775649e9a72b33d4e715f7eae63c093c6d3a16f097cd9f3246e2aec4ee4782efd1629423a3d3a23d6d5350131ed4daa4fc47701fd6449ae SHA512 52a0b9b8a23b05dc29513c20c3c0fdc0b696da87156ea83a5736ea294618b993d1f3914f82a918e331db5de0746c147244f46d396ee7dbb02fee116825e1dd6a
-DIST darcs-2.12.5.tar.gz 1460698 BLAKE2B 9050b5863221d2c82e93d689b733b34a0b63fd0e7f29b0041ba3ff10e4359e4d32e1c8bca5ac4722a65fbebab66b25cba443efe23ee3e4a87d4117a7335db4de SHA512 9bda8149269dc23750321f3929e156e32c76de4f5bb8291bc248d0e326bf08b69c82ef7383f9d02dcc65ca199078f6e1ab575197fc2aee225486a8c1b9275542
-DIST darcs-2.8.4.tar.gz 1301464 BLAKE2B 748494ae1c34318c14e128a4d08667b839644dbcf2b2d8bbcc86263ee5332f859f91bc2a56f3c6ccf6a465f45a90d97d304c9c15ebdd3cdd709c251c61c15a6c SHA512 c60531bacea43bdd5a18ae461dd390fe64682cac56fa4e6b5153a5da3c003b59d8fb24827bd42b4b30f0d2c61877d36b58eb98317644f9f8a200ab7c5961c48e
-EBUILD darcs-2.10.1.ebuild 4661 BLAKE2B 6baeaff0f00e514365f325bb67d264c1eb2a793a324aa867a11bd3713a952f2e4cca38ee872ba4a588e5babe6b4f92b199fefd3fb8eda70b572f9009b48c3a20 SHA512 947f58a975cfada502261baf79ff494dc096ecc2a835ee987778216221ce690c1a0fb10f1f67aa902e47b18fe7476988a0e623348f2756e55eb468d31db93328
-EBUILD darcs-2.10.3-r1.ebuild 4751 BLAKE2B a5e2fad1a29d43c82f7e3f6f38630c3201ca374ff38436005a4c1d6338a7b05aa275f365d8acd3b77608802542fb7e2c0797f3f692e949e3995f3694c31f580e SHA512 b8ec1cba9be4ce72c654d874358d6373530e1cd4cbdab69af8c16e1f552c6d749d59fce393fc736afe11c4480a11d6ae04c439aea8bd513575ada01d1515698d
-EBUILD darcs-2.12.0.ebuild 4793 BLAKE2B 558f2d89ff6ed54f16ff484468d4ef22b1795af9fda247ba6dd541b07b485fa79aa15fae59b3596a6dc1942c58fc7426217ad497ed79d57b5688ddd99414b023 SHA512 e96ba3b3038d115244731196882984cf37775dfd4ccc89470f315b075a5dfae6627dde57c499cc23cb52650cf671d0fa5f50c8f8033a5c85819a59ffdfb90311
-EBUILD darcs-2.12.4.ebuild 4477 BLAKE2B b803195ef7164c026944e943954ed3fc2f712c98a49f2aad9d01dcc4a7a2a6151d03c41b5bd1771f8017dda7b3c753a4db85450de97b6be3a5de0608045a3014 SHA512 173e6683a317a5a79f0f20f656bc7eb9be0a870871e8d6979a2db2687ad7eff35b0bcd1eff4e74d7eb55c31f2924887ffe6a6e6460f0aa24ce66fb0e427298ad
-EBUILD darcs-2.12.5.ebuild 4557 BLAKE2B 79069ed807976f10766d6b1c7856eea63bc3ce04f0f24fc1192ff80a208fdeb92f71b01867c90620c7f7e8fefb6d41a98fa2183c2aa5d65b876bca9fbf09df00 SHA512 2dc134298a44a05d71b1932c49b09dbb2ba28955174d3fdcf857427c80013560e504f1e83cb9ad46870567f132252f6a8c55d2b97f61c9f12efd47f46a35186e
-EBUILD darcs-2.8.4-r6.ebuild 4674 BLAKE2B e5289660b80bf55eee4604e87deedf31978bd205ae46b0f8c161d4ed1cfd6f5cac3df60c0030b7fdd68c9e5b4783dd557c766612d171e7d70aaec2109a11c9e6 SHA512 3e31ed5a97205cfbc9001785c36402225ba3a3700f2f3add0da6e94951a2fef9452ad41baa40f74bc06d1813b9c01c5c9bc98b623101dd9e3763aef30857d39a
-MISC metadata.xml 593 BLAKE2B c4ab655306f001cc3fe3007152e25d32d97fd3a87db76051c6c75b1d53c2c6ebd2105b2674bea5872e678b577c3cca737a3bbf6fe89923bc4f780ea2dc8642fc SHA512 cab7d36edce3f7da1742ebf086f69468f2745cb58fae83e74fa3e6016f4a7285aaa57100fed17df47940a51029ea78892147b7fe86ef2e456b7e34cc34a421bd
+AUX darcs-2.16.1-curl.patch 563 BLAKE2B 764baffc6bcb8e64263969c037fa71ed745da2046176ba85b17edc8cb833c874e6d59b283b646c2ed894da4996b1bec1095d52293a9868a76871f7aff173b62d SHA512 9dae7654eece58a2f631a745bbe46a15c61a4e65cb5d9e29a52f12e29d3df2e1a92d94d38e54e9c4788c314507a168a39bd1ce249fcd2241e7e41bd7553e2b92
+DIST darcs-2.14.5.tar.gz 1063677 BLAKE2B 7f38aa09d5af53e68829a9181f1981eccd173e2af5a044d100758164b668297303aed947ffc579ea1977e4a1f2820d1954b5c5428e429e5ff42ee238e0043611 SHA512 75f89dc920eb9a417e86bcbf185b0ba35e284a0a0c6bbd27c7dec46c4f143f5c37f0559a1ff1b3d3bd39ebdca98fa3a7420bee5e179c1bef0b0fc203e04e0484
+DIST darcs-2.16.2.tar.gz 1242738 BLAKE2B b402c8b2987097d10c61ffd312cc58b788625759cf199a774af8efb9b001d8440705eed75f3dbdd3ca120256c5e2efb9ddda73e12da31b7b07ba9d10ca33de8b SHA512 ee43e570227a5f462e064b71323755d1179809c24ff83a904aefa32494c4655b41b4b3291411b5abc1e1e75be894cde6070aa072b51905ddf8fc2934973b25cb
+EBUILD darcs-2.14.5.ebuild 4208 BLAKE2B ab83e211185599db01ee7e05f9fe35dadee0b292602fb79f5b933fcc82082d742647b402729c97968013e02f423f07fd7a4b651a1a31823e788e90a73be0b7e7 SHA512 d08c82089cd278b4683825df57062ed9cd661d76bd53f19e51839980f302ffb67abd244eb43b6aa625a68811b46a2597000b193ff1e54fd38df8812024d02ac6
+EBUILD darcs-2.16.2.ebuild 5005 BLAKE2B a22bc498035feee9afb69970bf50fa5bf481fc2dc6bc73ee1e20524d7ab4b5daa6af127058c07f80c86e74a8bc3b74a18668cd2be19c21d1d08c5fc90f4c205b SHA512 df43a2b57e713b550bb172c808cc7f167d562c00e33a447d783bdc29c9c91e6e86507ef2d8e56e267b313be9a316af9897311572a483cbf1cbbcdaed29afcede
+MISC metadata.xml 378 BLAKE2B 13e2f65cc6ea5e9757b7ef30aa946f38daddca9a592bcce78bda172936de89aee38d0e28ac70d7e886ab12c58c5c27cf49a7c1fe6426811b696bddb8cb9989b2 SHA512 fe6b44da867aebd58b302aa0bb3dc17bc815e300cd7ddf05851fe52f1fe2c4cacebb4624e6ca96c0d8f0a28a05e96075497e9fefc96459a73ff2aea6bc40a5aa
diff --git a/dev-vcs/darcs/darcs-2.10.1.ebuild b/dev-vcs/darcs/darcs-2.10.1.ebuild
deleted file mode 100644
index 40404e1b806d..000000000000
--- a/dev-vcs/darcs/darcs-2.10.1.ebuild
+++ /dev/null
@@ -1,98 +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
-#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="a distributed, interactive, smart revision control system"
-HOMEPAGE="http://darcs.net/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl diff +http +network-uri +terminfo +threaded"
-
-RESTRICT=test # missing file 'tests/bin/renameHelper.hs'
-
-RDEPEND=">=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
-	>=dev-haskell/dataenc-0.11:=[profile?] <dev-haskell/dataenc-0.15:=[profile?]
-	>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
-	>=dev-haskell/html-1.0:=[profile?] <dev-haskell/html-1.1:=[profile?]
-	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
-	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
-	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.5:=[profile?]
-	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
-	>=dev-haskell/zlib-0.5.3.0:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/libiconv
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	curl? ( net-misc/curl )
-	diff? ( dev-haskell/lcs:=[profile?] )
-	http? ( >=dev-haskell/http-4000.2.3:=[profile?] <dev-haskell/http-4000.3:=[profile?]
-		network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-				>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-		!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) )
-	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	dev-lang/ghc
-	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
-		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
-		>=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
-		>=dev-haskell/split-0.1.4.1 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-	curl? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag curl curl) \
-		--flag=executable \
-		$(cabal_flag diff hashed-storage-diff) \
-		--flag=-hpc \
-		$(cabal_flag http http) \
-		--flag=library \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-optimize \
-		--flag=pkgconfig \
-		--flag=-rts \
-		--flag=-static \
-		$(cabal_flag terminfo terminfo) \
-		$(cabal_flag threaded threaded) \
-		--flag=-warn-as-error
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	# fixup perms in such an an awkward way
-	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-	doman "${S}/darcs.1"
-}
diff --git a/dev-vcs/darcs/darcs-2.10.3-r1.ebuild b/dev-vcs/darcs/darcs-2.10.3-r1.ebuild
deleted file mode 100644
index ecf1eda0544d..000000000000
--- a/dev-vcs/darcs/darcs-2.10.3-r1.ebuild
+++ /dev/null
@@ -1,103 +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.6.9999
-#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="a distributed, interactive, smart revision control system"
-HOMEPAGE="http://darcs.net/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl diff +http +network-uri +terminfo +threaded"
-
-RESTRICT=test # occasionally hangs on directory creation race conditions
-
-RDEPEND=">=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
-	>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
-	>=dev-haskell/html-1.0:=[profile?] <dev-haskell/html-1.1:=[profile?]
-	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
-	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
-	>=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?]
-	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?]
-	>=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3:=[profile?]
-	>=dev-haskell/zlib-0.5.3.0:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/libiconv
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	curl? ( net-misc/curl )
-	diff? ( dev-haskell/lcs:=[profile?] )
-	http? ( >=dev-haskell/http-4000.2.3:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-		network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-				>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-		!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) )
-	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
-		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
-		>=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
-		>=dev-haskell/split-0.1.4.1 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-	curl? ( virtual/pkgconfig )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.5 && < 4.9' 'base >= 4.5' \
-		'zip-archive  >= 0.2.3 && < 0.3' 'zip-archive  >= 0.2.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag curl curl) \
-		--flag=executable \
-		$(cabal_flag diff hashed-storage-diff) \
-		--flag=-hpc \
-		$(cabal_flag http http) \
-		--flag=library \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-optimize \
-		--flag=pkgconfig \
-		--flag=-rts \
-		--flag=-static \
-		$(cabal_flag terminfo terminfo) \
-		$(cabal_flag threaded threaded) \
-		--flag=-warn-as-error
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	# fixup perms in such an an awkward way
-	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-	doman "${S}/darcs.1"
-}
diff --git a/dev-vcs/darcs/darcs-2.12.0.ebuild b/dev-vcs/darcs/darcs-2.12.0.ebuild
deleted file mode 100644
index bb4e04774663..000000000000
--- a/dev-vcs/darcs/darcs-2.12.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="a distributed, interactive, smart revision control system"
-HOMEPAGE="http://darcs.net/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl +network-uri +terminfo +threaded"
-
-RESTRICT=test # occasionally hangs on directory creation race conditions
-
-RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
-	>=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
-	>=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?]
-	>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
-	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
-	>=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.5:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
-	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
-	>=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?]
-	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?]
-	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
-	>=dev-lang/ghc-7.6.2:=
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	curl? ( net-misc/curl )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
-		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
-		>=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
-		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-	curl? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag curl curl) \
-		--flag=executable \
-		--flag=-hpc \
-		--flag=http \
-		--flag=library \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-optimize \
-		--flag=pkgconfig \
-		--flag=-rts \
-		--flag=-static \
-		$(cabal_flag terminfo terminfo) \
-		$(cabal_flag threaded threaded) \
-		--flag=-warn-as-error
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	# fixup perms in such an an awkward way
-	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-	doman "${S}/darcs.1"
-}
diff --git a/dev-vcs/darcs/darcs-2.12.4.ebuild b/dev-vcs/darcs/darcs-2.12.4.ebuild
deleted file mode 100644
index 11b513a7cc1e..000000000000
--- a/dev-vcs/darcs/darcs-2.12.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="a distributed, interactive, smart revision control system"
-HOMEPAGE="http://darcs.net/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl +network-uri +terminfo +threaded"
-
-RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
-	>=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
-	>=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?]
-	>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
-	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
-	>=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
-	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
-	>=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.5:=[profile?]
-	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?]
-	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	curl? ( net-misc/curl )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
-		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
-		>=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
-		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-	curl? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag curl curl) \
-		--flag=executable \
-		--flag=-hpc \
-		--flag=http \
-		--flag=library \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-optimize \
-		--flag=pkgconfig \
-		--flag=-rts \
-		--flag=-static \
-		$(cabal_flag terminfo terminfo) \
-		$(cabal_flag threaded threaded) \
-		--flag=-warn-as-error
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	# fixup perms in such an an awkward way
-	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-	doman "${S}/darcs.1"
-}
diff --git a/dev-vcs/darcs/darcs-2.12.5.ebuild b/dev-vcs/darcs/darcs-2.12.5.ebuild
deleted file mode 100644
index c1bf7f7d2b6b..000000000000
--- a/dev-vcs/darcs/darcs-2.12.5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="a distributed, interactive, smart revision control system"
-HOMEPAGE="http://darcs.net/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+curl +network-uri +terminfo +threaded"
-
-RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
-	>=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
-	>=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?]
-	>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
-	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
-	>=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
-	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
-	>=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.5:=[profile?]
-	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?]
-	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	curl? ( net-misc/curl )
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
-		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
-		>=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
-		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-	curl? ( virtual/pkgconfig )
-"
-
-PATCHES=("${FILESDIR}"/${PN}-2.12.4-ghc-8.0.2_rc1.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag curl curl) \
-		--flag=executable \
-		--flag=-hpc \
-		--flag=http \
-		--flag=library \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-optimize \
-		--flag=pkgconfig \
-		--flag=-rts \
-		--flag=-static \
-		$(cabal_flag terminfo terminfo) \
-		$(cabal_flag threaded threaded) \
-		--flag=-warn-as-error
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	# fixup perms in such an an awkward way
-	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-	doman "${S}/darcs.1"
-}
diff --git a/dev-vcs/darcs/darcs-2.14.5.ebuild b/dev-vcs/darcs/darcs-2.14.5.ebuild
new file mode 100644
index 000000000000..16ea2a78fd89
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.14.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl +terminfo +threaded"
+
+RDEPEND=">=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/attoparsec-0.13.0.1:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
+	>=dev-haskell/fgl-5.5.2.3:=[profile?] <dev-haskell/fgl-5.8:=[profile?]
+	>=dev-haskell/graphviz-2999.18.1:=[profile?] <dev-haskell/graphviz-2999.20.1:=[profile?]
+	>=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/haskeline-0.7.2:=[profile?] <dev-haskell/haskeline-0.9:=[profile?]
+	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
+	>=dev-haskell/http-4000.2.20:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/mmap-0.5.9:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/old-time-1.1.0.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1.9:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
+	>=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.6:=[profile?]
+	>=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unix-compat-0.4.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
+	>=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/zip-archive-0.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+	>=dev-haskell/zlib-0.6.1.2:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+	curl? ( net-misc/curl )
+	terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/cmdargs-0.10.10 <dev-haskell/cmdargs-0.11
+		>=dev-haskell/findbin-0.0.5 <dev-haskell/findbin-0.1
+		>=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.8.2 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/shelly-1.6.8 <dev-haskell/shelly-1.10
+		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+	curl? ( virtual/pkgconfig )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag curl curl) \
+		--flag=executable \
+		--flag=-hpc \
+		--flag=http \
+		--flag=library \
+		--flag=-optimize \
+		--flag=pkgconfig \
+		--flag=-rts \
+		--flag=-static \
+		$(cabal_flag terminfo terminfo) \
+		$(cabal_flag threaded threaded) \
+		--flag=-warn-as-error
+}
+
+src_install() {
+		haskell-cabal_src_install
+
+		doman "${S}/dist/build/${PN}/darcs.1" || die "darcs.1 not found"
+}
diff --git a/dev-vcs/darcs/darcs-2.16.2.ebuild b/dev-vcs/darcs/darcs-2.16.2.ebuild
new file mode 100644
index 000000000000..ac19fb3449e2
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.16.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl +terminfo +threaded"
+
+RESTRICT=test # conflict-fight-failure (Darcs3) (PatienceDiff): [Failed]
+
+RDEPEND=">=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/attoparsec-0.13.0.1:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.3.3:=[profile?]
+	>=dev-haskell/constraints-0.11:=[profile?] <dev-haskell/constraints-0.13:=[profile?]
+	>=dev-haskell/cryptonite-0.24:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?]
+	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
+	>=dev-haskell/fgl-5.5.2.3:=[profile?] <dev-haskell/fgl-5.8:=[profile?]
+	>=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/haskeline-0.7.2:=[profile?] <dev-haskell/haskeline-0.9:=[profile?]
+	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
+	>=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
+	>=dev-haskell/http-types-0.12.1:=[profile?] <dev-haskell/http-types-0.12.4:=[profile?]
+	>=dev-haskell/memory-0.14:=[profile?] <dev-haskell/memory-0.16:=[profile?]
+	>=dev-haskell/mmap-0.5.9:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+	>=dev-haskell/old-time-1.1.0.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1.9:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
+	>=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.6:=[profile?]
+	>=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/temporary-1.2.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unix-compat-0.5:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
+	>=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/zip-archive-0.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+	>=dev-haskell/zlib-0.6.1.2:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+	curl? ( net-misc/curl )
+	terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2 <dev-haskell/cabal-3.3
+	test? ( >=dev-haskell/cmdargs-0.10.10 <dev-haskell/cmdargs-0.11
+		>=dev-haskell/exceptions-0.6
+		>=dev-haskell/findbin-0.0.5 <dev-haskell/findbin-0.1
+		>=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7
+		>=dev-haskell/leancheck-0.9 <dev-haskell/leancheck-0.10
+		>=dev-haskell/monad-control-0.3.2 <dev-haskell/monad-control-1.1
+		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
+		<dev-haskell/system-fileio-0.4
+		>=dev-haskell/system-filepath-0.4.7 <dev-haskell/system-filepath-0.5
+		>=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-leancheck-0.0.1 <dev-haskell/test-framework-leancheck-0.1
+		>=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4
+		dev-haskell/transformers-base )
+	curl? ( virtual/pkgconfig )
+"
+
+PATCHES=("${FILESDIR}"/${PN}-2.16.1-curl.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag curl curl) \
+		--flag=executable \
+		--flag=-hpc \
+		--flag=http \
+		--flag=library \
+		--flag=-optimize \
+		--flag=pkgconfig \
+		--flag=-rts \
+		--flag=-static \
+		$(cabal_flag terminfo terminfo) \
+		$(cabal_flag threaded threaded) \
+		--flag=-warn-as-error
+}
+
+src_install() {
+		haskell-cabal_src_install
+
+		# fixup perms in such an awkward way
+		mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
+		doman "${S}/darcs.1"
+}
diff --git a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
deleted file mode 100644
index 5f688a52aac3..000000000000
--- a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
+++ /dev/null
@@ -1,134 +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.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal bash-completion-r1
-
-DESCRIPTION="a distributed, interactive, smart revision control system"
-HOMEPAGE="http://darcs.net/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="=dev-haskell/extensible-exceptions-0.1*:=[profile?]
-		>=dev-haskell/hashed-storage-0.5.6:=[profile?]
-		<dev-haskell/hashed-storage-0.6:=[profile?]
-		>=dev-haskell/haskeline-0.6.3:=[profile?]
-		<dev-haskell/haskeline-0.8:=[profile?]
-		=dev-haskell/html-1.0*:=[profile?]
-		=dev-haskell/mmap-0.5*:=[profile?]
-		>=dev-haskell/mtl-1.0:=[profile?]
-		<dev-haskell/mtl-2.3:=[profile?]
-		>=dev-haskell/parsec-2.0:=[profile?]
-		<dev-haskell/parsec-3.2:=[profile?]
-		=dev-haskell/random-1.0*:=[profile?]
-		>=dev-haskell/regex-compat-0.95.1:=[profile?]
-		>=dev-haskell/tar-0.3:=[profile?]
-		<dev-haskell/tar-0.5:=[profile?]
-		>=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?]
-		>=dev-haskell/text-0.11.0.6:=[profile?]
-		>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
-		>=dev-haskell/vector-0.7:=[profile?]
-		>=dev-haskell/zlib-0.5.1.0:=[profile?]
-		<dev-haskell/zlib-0.6.0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		net-misc/curl"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		doc? ( virtual/latex-base
-			|| (	dev-tex/latex2html[png]
-				dev-tex/latex2html[gif]
-			)
-		)
-		test? ( >=dev-haskell/cmdlib-0.2.1[profile?]
-				<dev-haskell/cmdlib-0.4[profile?]
-				=dev-haskell/findbin-0.0*[profile?]
-				>=dev-haskell/quickcheck-2.3
-				>=dev-haskell/shellish-0.1.3[profile?]
-				<dev-haskell/shellish-0.2[profile?]
-				>=dev-haskell/test-framework-0.4.0[profile?]
-				>=dev-haskell/test-framework-hunit-0.2.2[profile?]
-				>=dev-haskell/test-framework-quickcheck2-0.2.8[profile?]
-		)
-		"
-
-src_prepare() {
-	rm "${S}/tests/add_permissions.sh" || die "Could not rm add_permissions.sh"
-	rm "${S}/tests/send-output-v1.sh" || die "Could not rm send-output-v1.sh"
-	rm "${S}/tests/send-output-v2.sh" || die "Could not rm send-output-v2.sh"
-	rm "${S}/tests/utf8.sh" || die "Could not rm utf8.sh"
-
-	epatch "${FILESDIR}"/${P}-ghc-7.8-part-1.patch
-	epatch "${FILESDIR}"/${P}-ghc-7.8-part-2.patch
-	epatch "${FILESDIR}"/${P}-fix-nonatomic-global.patch
-	epatch "${FILESDIR}"/${P}-issue2364.patch
-	epatch "${FILESDIR}"/${P}-issue2364-part-2.patch
-
-	cabal_chdeps \
-		'text       >= 0.11.0.6 && < 0.12.0.0' 'text       >= 0.11.0.6' \
-		'terminfo == 0.3.*' 'terminfo >= 0.3 && < 0.5' \
-		'array      >= 0.1 && < 0.5' 'array >= 0.1 && <0.6' \
-		'process    >= 1.0.0.0 && < 1.2.0.0' 'process    >= 1.0.0.0 && < 1.3' \
-		'unix >= 1.0 && < 2.7' 'unix >=1.0 && <2.8' \
-		'base >= 4.5 && < 4.7' 'base >= 4.5 && < 4.8' \
-		'ghc >= 6.10 && < 7.8' 'ghc >= 6.10' \
-		'mtl          >= 1.0 && < 2.2' 'mtl          >= 1.0 && < 2.3'
-}
-
-src_configure() {
-	# checking whether ghc supports -threaded flag
-	# Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker
-	# contains: 'The ability to make a foreign call that does not block all other Haskell threads.'
-	# It might have interactivity impact.
-
-	threaded_flag=""
-	if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then
-		threaded_flag="--flags=threaded"
-		einfo "$P will be built with threads support"
-	else
-		threaded_flag="--flags=-threaded"
-		einfo "$P will be built without threads support"
-	fi
-
-	# Use curl for net stuff to avoid strict version dep on HTTP and network
-	cabal_src_configure \
-		--flags=curl \
-		--flags=-http \
-		--flags=color \
-		--flags=terminfo \
-		--flags=mmap \
-		--flags=force-char8-encoding \
-		$threaded_flag \
-		$(cabal_flag test)
-}
-
-src_test() {
-	# run cabal test from haskell-cabal
-	haskell-cabal_src_test || die "cabal test failed"
-}
-
-src_install() {
-	cabal_src_install
-	newbashcomp "${S}/contrib/darcs_completion" "${PN}"
-
-	# fixup perms in such an an awkward way
-	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-	doman "${S}/darcs.1"
-}
-
-pkg_postinst() {
-	ghc-package_pkg_postinst
-
-	ewarn "NOTE: in order for the darcs send command to work properly,"
-	ewarn "you must properly configure your mail transport agent to relay"
-	ewarn "outgoing mail.  For example, if you are using ssmtp, please edit"
-	ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site."
-}
diff --git a/dev-vcs/darcs/files/darcs-2.12.4-ghc-8.0.2_rc1.patch b/dev-vcs/darcs/files/darcs-2.12.4-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 9602d1d1ccdc..000000000000
--- a/dev-vcs/darcs/files/darcs-2.12.4-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/harness/Darcs/Test/Patch.hs b/harness/Darcs/Test/Patch.hs
-index f50f6b9..f0f4e2a 100644
---- a/harness/Darcs/Test/Patch.hs
-+++ b/harness/Darcs/Test/Patch.hs
-@@ -244,3 +244,3 @@ properties :: forall thing gen. (Show1 gen, Arbitrary (Sealed gen)) =>
- properties gen prefix genname tests =
--  [ cond name condition check | (name, condition, check) <- tests ]
-+  [ cond name condition check | (name, condition :: TestCondition thing, check :: TestCheck thing testable) <- tests ]
-   where cond :: forall testable. Testable testable
diff --git a/dev-vcs/darcs/files/darcs-2.16.1-curl.patch b/dev-vcs/darcs/files/darcs-2.16.1-curl.patch
new file mode 100644
index 000000000000..8216ce2e8c4f
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.16.1-curl.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/737236
+
+--- a/src/hscurl.c
++++ b/src/hscurl.c
+@@ -11,6 +11,9 @@
+ #define ENABLE_PIPELINING
+ #endif
+ 
++/* workaround for https://bugs.gentoo.org/737236 */
++#include "cabal_macros.h"
++
+ enum RESULT_CODES
+   {
+     RESULT_OK = 0,
+@@ -46,6 +49,10 @@ struct UrlData
+ 
+ static int debug = 0;
+ #ifndef _WIN32
++#ifndef PACKAGE_VERSION
++/* workaround for https://bugs.gentoo.org/737236 */
++#    define PACKAGE_VERSION CURRENT_PACKAGE_VERSION
++#endif
+ static const char user_agent[] =
+   "darcs/" PACKAGE_VERSION " libcurl/" LIBCURL_VERSION;
+ #else
diff --git a/dev-vcs/darcs/files/darcs-2.8.4-fix-nonatomic-global.patch b/dev-vcs/darcs/files/darcs-2.8.4-fix-nonatomic-global.patch
deleted file mode 100644
index c3fce6fbc9e8..000000000000
--- a/dev-vcs/darcs/files/darcs-2.8.4-fix-nonatomic-global.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-There is a bug in speculateFileOrUrl.
-It puts downloaded file nonatomically.
-
-There is a window when copyFileOrUrl can (and does)
-copy partially downloaded file.
-
-Darcs-bug: http://bugs.darcs.net/issue2364
-diff --git a/src/Darcs/External.hs b/src/Darcs/External.hs
-index 2e0e791..d5a0b9f 100644
---- a/src/Darcs/External.hs
-+++ b/src/Darcs/External.hs
-@@ -184,7 +184,7 @@ copyFileOrUrl rd   fou out _     | isSshUrl  fou = copySSH rd (splitSshUrl fou)
- copyFileOrUrl _    fou _   _     = fail $ "unknown transport protocol: " ++ fou
- 
- speculateFileOrUrl :: String -> FilePath -> IO ()
--speculateFileOrUrl fou out | isHttpUrl fou = speculateRemote fou out
-+speculateFileOrUrl fou out | isHttpUrl fou = speculateRemote fou out >> waitUrl fou
-                            | otherwise = return ()
- 
- copyLocal  :: String -> FilePath -> IO ()
diff --git a/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-1.patch b/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-1.patch
deleted file mode 100644
index 3680c29b0440..000000000000
--- a/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-1.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff --git a/src/Crypt/SHA256.hs b/src/Crypt/SHA256.hs
-index 69a8a4c..606f2ad 100644
---- a/src/Crypt/SHA256.hs
-+++ b/src/Crypt/SHA256.hs
-@@ -20,9 +20,10 @@ import Numeric (showHex)
- import Foreign.C.String ( withCString )
- import Data.ByteString.Unsafe (unsafeUseAsCStringLen)
- import qualified Data.ByteString as B
-+import qualified System.IO.Unsafe as U
- 
- sha256sum :: B.ByteString -> String
--sha256sum p = unsafePerformIO $
-+sha256sum p = U.unsafePerformIO $
-               withCString (take 64 $ repeat 'x') $ \digestCString ->
-               unsafeUseAsCStringLen p $ \(ptr,n) ->
-               do let digest = castPtr digestCString :: Ptr Word8
-diff --git a/src/Darcs/Commands/Get.hs b/src/Darcs/Commands/Get.hs
-index e450d28..6b51915 100644
---- a/src/Darcs/Commands/Get.hs
-+++ b/src/Darcs/Commands/Get.hs
-@@ -157,7 +157,8 @@ copyRepoAndGoToChosenVersion opts repodir rfsource = do
-   copyRepo
-   withRepository opts ((RepoJob $ \repository -> goToChosenVersion repository opts) :: RepoJob ())
-   putInfo opts $ text "Finished getting."
--      where copyRepo =
-+      where copyRepo :: IO ()
-+            copyRepo =
-                 withRepository opts $ RepoJob $ \repository ->
-                   if formatHas HashedInventory rfsource
-                    then do
-diff --git a/src/Darcs/Global.hs b/src/Darcs/Global.hs
-index 9792bf0..e17f071 100644
---- a/src/Darcs/Global.hs
-+++ b/src/Darcs/Global.hs
-@@ -60,8 +60,9 @@ module Darcs.Global
- import Control.Applicative ( (<$>), (<*>) )
- import Control.Monad ( when )
- import Control.Concurrent.MVar
--import Control.Exception.Extensible ( bracket_, catch, catchJust, SomeException
--                                    , block, unblock
-+import Control.Exception.Extensible as E
-+                                    ( bracket_, catch, catchJust, SomeException
-+                                    , mask
-                                     )
- import Data.IORef ( IORef, newIORef, readIORef, writeIORef )
- import Data.IORef ( modifyIORef )
-@@ -106,12 +107,12 @@ withAtexit prog =
-         exit
-         prog
-   where
--    exit = block $ do
-+    exit = E.mask $ \restore -> do
-         Just actions <- swapMVar atexitActions Nothing
-         -- from now on atexit will not register new actions
--        mapM_ runAction actions
--    runAction action =
--        catch (unblock action) $ \(exn :: SomeException) -> do
-+        mapM_ (runAction restore) actions
-+    runAction restore action =
-+        catch (restore action) $ \(exn :: SomeException) -> do
-             hPutStrLn stderr $ "Exception thrown by an atexit registered action:"
-             hPutStrLn stderr $ show exn
- 
-diff --git a/src/Darcs/SignalHandler.hs b/src/Darcs/SignalHandler.hs
-index ac0f526..d0ef162 100644
---- a/src/Darcs/SignalHandler.hs
-+++ b/src/Darcs/SignalHandler.hs
-@@ -26,8 +26,8 @@ import Prelude hiding ( catch )
- import System.IO.Error ( isUserError, ioeGetErrorString, ioeGetFileName )
- import System.Exit ( exitWith, ExitCode ( ExitFailure ) )
- import Control.Concurrent ( ThreadId, myThreadId )
--import Control.Exception.Extensible
--            ( catch, throw, throwTo, block, unblock,
-+import Control.Exception.Extensible as E
-+            ( catch, throw, throwTo, mask,
-               Exception(..), SomeException(..), IOException )
- import System.Posix.Files ( getFdStatus, isNamedPipe )
- import System.Posix.IO ( stdOutput )
-@@ -128,8 +128,8 @@ catchUserErrors comp handler = catch comp handler'
-          | otherwise                             = throw ioe
- 
- withSignalsBlocked :: IO a -> IO a
--withSignalsBlocked job = block (job >>= \r ->
--                           unblock(return r) `catchSignal` couldnt_do r)
-+withSignalsBlocked job = E.mask $ \restore -> (job >>= \r ->
-+                           restore (return r) `catchSignal` couldnt_do r)
-     where couldnt_do r s | s == sigINT = oops "interrupt" r
-                          | s ==  sigHUP = oops "HUP" r
-                          | s ==  sigABRT = oops "ABRT" r
-diff --git a/src/Darcs/Test/Patch/Info.hs b/src/Darcs/Test/Patch/Info.hs
-index fd27fb3..b35cfef 100644
---- a/src/Darcs/Test/Patch/Info.hs
-+++ b/src/Darcs/Test/Patch/Info.hs
-@@ -28,7 +28,6 @@ import Data.Maybe ( isNothing )
- import Data.Text as T ( find, any )
- import Data.Text.Encoding ( decodeUtf8With )
- import Data.Text.Encoding.Error ( lenientDecode )
--import Foreign ( unsafePerformIO )
- import Test.QuickCheck ( Arbitrary(arbitrary), oneof, listOf, choose, shrink
-                        , Gen )
- import Test.Framework.Providers.QuickCheck2 ( testProperty )
-@@ -39,6 +38,8 @@ import Darcs.Patch.Info ( PatchInfo(..), patchinfo,
-                           piLog, piAuthor, piName )
- import ByteStringUtils ( decodeLocale, packStringToUTF8, unpackPSFromUTF8 )
- 
-+import qualified System.IO.Unsafe as U
-+
- testSuite :: Test
- testSuite = testGroup "Darcs.Patch.Info"
-   [ metadataDecodingTest
-@@ -86,7 +87,7 @@ instance Arbitrary UTF8PatchInfo where
-         sa <- shrink (piAuthor pi)
-         sl <- shrink (filter (not . isPrefixOf "Ignore-this:") (piLog pi))
-         return (UTF8PatchInfo
--                   (unsafePerformIO $ patchinfo sn
-+                   (U.unsafePerformIO $ patchinfo sn
-                                           (BC.unpack (_piDate pi)) sa sl))
- 
- instance Arbitrary UTF8OrNotPatchInfo where
-@@ -101,7 +102,7 @@ arbitraryUTF8Patch =
-        d <- arbitrary
-        a <- asString `fmap` arbitrary
-        l <- (lines . asString) `fmap` arbitrary
--       return $ unsafePerformIO $ patchinfo n d a l
-+       return $ U.unsafePerformIO $ patchinfo n d a l
- 
- -- | Generate arbitrary patch metadata that has totally arbitrary byte strings
- --   as its name, date, author and log.
diff --git a/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-2.patch b/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-2.patch
deleted file mode 100644
index 33786477b3fa..000000000000
--- a/dev-vcs/darcs/files/darcs-2.8.4-ghc-7.8-part-2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/Darcs/Test/Patch.hs b/src/Darcs/Test/Patch.hs
-index 0f7ed24..078fbc3 100644
---- a/src/Darcs/Test/Patch.hs
-+++ b/src/Darcs/Test/Patch.hs
-@@ -2,6 +2,9 @@
- #if __GLASGOW_HASKELL__ >= 700
- {-# LANGUAGE ImpredicativeTypes #-}
- #endif
-+#if __GLASGOW_HASKELL__ >= 708
-+{-# LANGUAGE AllowAmbiguousTypes #-}
-+#endif
- --  Copyright (C) 2002-2005,2007 David Roundy
- --
- --  This program is free software; you can redistribute it and/or modify
diff --git a/dev-vcs/darcs/files/darcs-2.8.4-issue2364-part-2.patch b/dev-vcs/darcs/files/darcs-2.8.4-issue2364-part-2.patch
deleted file mode 100644
index 6164a4a00074..000000000000
--- a/dev-vcs/darcs/files/darcs-2.8.4-issue2364-part-2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Tue May 13 22:07:19 FET 2014  Sergei Trofimovich <slyfox@community.haskell.org>
-  * resolve issue2364: don't break list of 'bad sources'
-  
-  This time the bug manifested on a simple operation:
-  $ darcs record -a -m "something"
-  
-  Attempt to write a patch resulted in something like:
-    Failed to record patch 'hello'
-  
-    HINT: I could not reach the following repositories:
-          http://repetae.net/repos/jhc
-          /home/st/.darcs/cache
-          /home/st/.cache/darcs
-          /home/st/dev/darcs/jhc
-        If you're not using them, you should probably delete
-  
-  The sequence should be the following:
-      1. store patch to inventory/foo
-      2. try to store to a writable cache (say, ~/.darcs/cache/patches)
-      3. fail to write
-      4. filter out bad caches
-      5. try again
-      6. copy from cache to patches/
-  
-  Due to missing NOINLINE step 4. led to
-  all caches treated as writable, thus step 5
-  failed without a chance for patch to
-  go to 'patches/'.
-  
-  As a side-effect building darcs with -O0 produced seemingly working darcs.
-  Reported-by: Ivan Miljenovic
-diff -rN -u old-darcs.net/src/Darcs/Util/Global.hs new-darcs.net/src/Darcs/Util/Global.hs
---- old-darcs.net/src/Darcs/Global.hs	2014-05-13 22:23:29.897329750 +0300
-+++ new-darcs.net/src/Darcs/Global.hs	2014-05-13 22:23:29.979329754 +0300
-@@ -135,7 +135,7 @@
- 
- _badSourcesList :: IORef [String]
- _badSourcesList = unsafePerformIO $ newIORef []
--{- NOINLINE _badSourcesList -}
-+{-# NOINLINE _badSourcesList #-}
- 
- 
- addBadSource :: String -> IO ()
-@@ -154,7 +154,7 @@
- 
- _reachableSourcesList :: IORef [String]
- _reachableSourcesList = unsafePerformIO $ newIORef []
--{- NOINLINE _reachableSourcesList -}
-+{-# NOINLINE _reachableSourcesList #-}
- 
- 
- addReachableSource :: String -> IO ()
diff --git a/dev-vcs/darcs/files/darcs-2.8.4-issue2364.patch b/dev-vcs/darcs/files/darcs-2.8.4-issue2364.patch
deleted file mode 100644
index 97c4e0f1ad2b..000000000000
--- a/dev-vcs/darcs/files/darcs-2.8.4-issue2364.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-* resolve issue2364: fix file corruption on double fetch
-
-The bug is the result of attempt to fetch the same file
-(say F) by the same URL (U) multiple times concurrently.
-
-First time U gets fetched by speculative prefetch logic.
-Second time as an ordinary file (while first fetch is not finished).
-
-The function 'copyUrlWithPriority' sends download request
-to 'urlChan' both times (it's already not a nice situation,
-fixed by this patch).
-
-Later urlThread satisfies first request, notifies receiver,
-and starts downloading exactly the same U again.
-
-I don't know exact data corruption mechanics yet, but it has
-to do with non-random intermediate file names of downloaded
-files and 'truncate' call when temp file is opened for a new
-downlaod job.
-
-All temp names are completely non-random for a single darcs run:
-
-  urlThread :: Chan UrlRequest -> IO ()
-  urlThread ch = do
-    junk <- flip showHex "" `fmap` randomRIO rrange
-    evalStateT urlThread' (UrlState Map.empty emptyQ 0 junk)
-
-  createDownloadFileName :: FilePath -> UrlState -> FilePath
-  createDownloadFileName f st = f ++ "-new_" ++ randomJunk st
-
-My theory is next download manages to step on toes of previous job.
-
-I'll try to make file names truly random in other patch.
-That way such errors should manifest as read erros instead of data
-corruption.
-
-Thanks!
-diff --git a/src/URL.hs b/src/URL.hs
-index 4cb85ee..26de278 100644
---- a/src/URL.hs
-+++ b/src/URL.hs
-@@ -18,11 +18,12 @@ module URL ( copyUrl, copyUrlFirst, setDebugHTTP,
- import Data.IORef ( newIORef, readIORef, writeIORef, IORef )
- import Data.Map ( Map )
- import qualified Data.Map as Map
-+import Data.Tuple ( swap )
- import System.Directory ( copyFile )
- import System.IO.Unsafe ( unsafePerformIO )
- import Control.Concurrent ( forkIO )
- import Control.Concurrent.Chan ( isEmptyChan, newChan, readChan, writeChan, Chan )
--import Control.Concurrent.MVar ( isEmptyMVar, modifyMVar_, newEmptyMVar, newMVar, putMVar, readMVar, withMVar, MVar )
-+import Control.Concurrent.MVar ( isEmptyMVar, modifyMVar, modifyMVar_, newEmptyMVar, newMVar, putMVar, readMVar, withMVar, MVar )
- import Control.Monad ( unless, when )
- import Control.Monad.Trans ( liftIO )
- import Control.Monad.State ( evalStateT, get, modify, put, StateT )
-@@ -196,10 +197,10 @@ copyUrlWithPriority p u f c = do
-   debugMessage ("URL.copyUrlWithPriority ("++u++"\n"++
-                 "                      -> "++f++")")
-   v <- newEmptyMVar
--  let fn _ old_val = old_val
--  modifyMVar_ urlNotifications (return . (Map.insertWith fn u v))
--  let r = UrlRequest u f c p
--  writeChan urlChan r
-+  old_mv <- modifyMVar urlNotifications (return . swap . Map.insertLookupWithKey (\_k _n old -> old) u v)
-+  case old_mv of
-+    Nothing -> writeChan urlChan $ UrlRequest u f c p -- ok, new URL
-+    Just _  -> debugMessage $ "URL.copyUrlWithPriority already in progress, skip (" ++ u ++ "\n" ++ "-> " ++ f ++ ")"
- 
- waitNextUrl :: StateT UrlState IO ()
- waitNextUrl = do
diff --git a/dev-vcs/darcs/metadata.xml b/dev-vcs/darcs/metadata.xml
index f42758756fc4..ae8985173248 100644
--- a/dev-vcs/darcs/metadata.xml
+++ b/dev-vcs/darcs/metadata.xml
@@ -5,9 +5,6 @@
   <email>haskell@gentoo.org</email>
 </maintainer>
 <use>
-  <flag name="diff">Use 'lcs' for diff building.</flag>
-  <flag name="http">Use the pure Haskell HTTP package for HTTP support.</flag>
-  <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
   <flag name="terminfo">Use the terminfo package for enhanced console support.</flag>
   <flag name="threaded">Use threading and SMP support.</flag>
 </use>