gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-vcs
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
61 files changed, 1266 insertions, 1727 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 65316d41a416..cd1a6e0ab6c4 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
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>
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 775dcbeaab2e..29f5fb6b0117 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,11 +1,6 @@
 AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f134553c5b6d7b3b685959baa531071923f0611fb22ce5945ab2ecbd4d1bae3c6234c557ac2edc872363cf05a3045bf70bebe1a1b SHA512 ccc3f6cf55902748bf8a27ea1c7c1733a2e33a45b297a7f9f732dc772e021e461052e30f841c7fa83c6303e6c7d8f8aac96f248c909d824237edb17335cb3e2f
-DIST fossil-src-2.10.tar.gz 5634327 BLAKE2B 1a02ef0d32b06dd09760d6a62450ad7bc15de97b5263d50ec776dbf0e2fff6b6fba4ec944eecffdaf31737f4a45e30aa898a728590a0c6e2ae171937a349e92b SHA512 aad54e3eaa2d647257c5c723fca4e55981aac0432d3d0b4deaa9651c7db7d27cb9f26f7ff40c31c452cb8dd54b0f0663c632183dc11982bc9cc24adf78b952e5
-DIST fossil-src-2.11.tar.gz 5850256 BLAKE2B af825ca9b79360149d53001b2952259bbad50fe05e77e84e54d58b11a66e612fd8c5f7bb3a8c36dd6f1b267ede3a1ed4c6b8229d10c6f25ff4de858842e100ce SHA512 0489b5b8595a0c50c8a7d787ff2d4a30980dce83b33052f7bf8f4630320fe8a0276bc73a00f3ced2962a474df1fddb2dd2e0d70f8854e1fc83e3746ea63b6ba1
-DIST fossil-src-2.8.tar.gz 5359975 BLAKE2B 6b63eadc8cd563d646698edc9972a52ec1feb868cb362449c232c99dcb81fea2fa227d631ebf8b695417c571933784dfffd5ecbec2a5027ac9901578a054c559 SHA512 5c6a8dc1545c43b3c95fbbec343db023e27a9db58f282a881bb7e488e3e26a0f7913a41f505dedf618b884507e48956780bd0e12482e184345d68edd1e79ff8e
-DIST fossil-src-2.9.tar.gz 5440118 BLAKE2B 2817e3c88073a26ef384d45271511eaacf5394a67ba6041ba0b37f321303abcba28655daf7963b8e51a8bc9bfeee681cea1f318f5ba66e93a5317b98771ad059 SHA512 c3786d4ae5517c88917819448863e9e1e37704a7073a1c87c042660313b77ce3a63f32e35e6a56af1c681e7b8a5acc652b4447d0387b8a8a5b3b5aa04dd9a9b5
-EBUILD fossil-2.10-r1.ebuild 1785 BLAKE2B c9b8d29a0da8dc51377f3e83238b031efc61d95f3211b467229754503f11340371ea865f98f7141fad1268f123e12bf3ee1a7e2bcc58ecc4f9b8ec068b63470f SHA512 ca346dd213a307865eb7b77ae6031de1b4a7415fb7b3195c8fd06b1941ed125d91d7e48b81e4466b22c711975ffc9e70259248620345bf49838e42dc0008bbdb
-EBUILD fossil-2.10.ebuild 1532 BLAKE2B ea4e60d58501a90082b16fa9f34a2e1f1288064be2e4f31f05359a83e5673475e368b8b533221771f07abb7758d46a361537d580b52c7346d8552249d8d25411 SHA512 f7707a36961431a90c6cb39623b6d3ac681ff9a2e06729e7c3de9b980cb9d564c4262b7952c0e534d9dfa014d3d73bb969d74015102a8009244f3886b25a6d1f
-EBUILD fossil-2.11.ebuild 1808 BLAKE2B 310f26c69a11c49587ff79db06f49a7c54a7501487c85c487df6f54da38404df2d4ceafee93a700e88166187793309571880f335c75a19b836b29fd2dca752d4 SHA512 a3b413d0d0232a8925881f54e8b33b3eb85774fc09fc5847b108ec153ce8626e2b92fb5a7115fd0b6596e32f12a6b914a44b0aec55ee56e37f2ba69c23ae449b
-EBUILD fossil-2.8.ebuild 1529 BLAKE2B 8bfc18c0e98ce9838faa1fe65484bac119ec242f8085c9eaf912a1d5b65ae19598924bd4445e7717895b6e4de9ae0e50f662fc4b16a63089911d5a97a7005cc2 SHA512 b6174bcb75f9e6395b71c8b82103104b97a065af34720bc4aed358f71ac34033624022b06dfcdb0d03d583ff9c8891d21ed1073d4c21872d6a07150b20bf6306
-EBUILD fossil-2.9.ebuild 1534 BLAKE2B b56c917b54b543bc6db8bd3bc4c91e5912e97a31a7785f29c4bf2eb29750f3735f589e657e5344fc7b1b2bdac5e7282b2d67ff5d0c9ef7a5401f525cfb2330e6 SHA512 3b4ab6992cbcb3e4ef43409b2d9bd077e38130f1f8c88830f11e57c185a362d676000891d4677a2d3f7c01d5ec167c07768bb6f688db6cffad00e515afd861e6
+DIST fossil-src-2.11.1.tar.gz 5850806 BLAKE2B 640807055100888d6bfea13539efb02190f07db5edcec58025952e464d50d4bd13992e5e8f5e515b01f52eaa3409d7a536bd4b48aecb5fdcf6214e47dc4963ed SHA512 055306c0d5c2f9b536ace6385ed79b5ced56d77dfc8e08b38f51075e97dfebfffca10aa7e17d2b22b9945c71b12eb131d49f3651e2890820dc9cb04719cd0265
+DIST fossil-src-2.12.1.tar.gz 6011181 BLAKE2B f9437c4fb20314706bbbec70efbb6a53e2ac7760986baf88ea72505f03877a5d1069d0d2828aa2bfefac96c1358e4c8f824405d61fd24d490442fa8b768711e9 SHA512 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee
+EBUILD fossil-2.11.1.ebuild 1803 BLAKE2B b54945558e0ea1c47fb53bba1791c336502b4313944f1e2b136233090de7fff386bbb34fd767fd4ebbae9dd8e1e7a9f82184772f06fb57d1a4f3fd8c26ce7c6e SHA512 904b64bcd8c4d6ea15133ada565655751388fefd455e795725f883707fb41e6d9db4237307c4d725b10a78a289e997c40dcca5970fa53219eddfb7f8629c7fdc
+EBUILD fossil-2.12.1.ebuild 1808 BLAKE2B 310f26c69a11c49587ff79db06f49a7c54a7501487c85c487df6f54da38404df2d4ceafee93a700e88166187793309571880f335c75a19b836b29fd2dca752d4 SHA512 a3b413d0d0232a8925881f54e8b33b3eb85774fc09fc5847b108ec153ce8626e2b92fb5a7115fd0b6596e32f12a6b914a44b0aec55ee56e37f2ba69c23ae449b
 MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.10.ebuild b/dev-vcs/fossil/fossil-2.10.ebuild
deleted file mode 100644
index af7391ebfacf..000000000000
--- a/dev-vcs/fossil/fossil-2.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="http://www.fossil-scm.org/"
-SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
-	tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-DEPEND="
-	sys-libs/zlib
-	|| ( sys-libs/readline:0 dev-libs/libedit )
-	system-sqlite? ( >=dev-db/sqlite-3.28.0:3 )
-	ssl? ( dev-libs/openssl:0 )
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="${DEPEND}"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug         && myconf+=' --fossil-debug'
-	use json          && myconf+=' --json'
-	use system-sqlite && myconf+=' --disable-internal-sqlite'
-	use static        && myconf+=' --static'
-	use tcl           && myconf+=' --with-tcl=1'
-	use fusefs        || myconf+=' --disable-fusefs'
-
-	local u useflags
-	useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
-			   th1-docs th1-hooks )
-	for u in ${useflags[@]} ; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	tc-export CC
-	./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.10-r1.ebuild b/dev-vcs/fossil/fossil-2.11.1.ebuild
index ca988001b44d..dc00229d55ae 100644
--- a/dev-vcs/fossil/fossil-2.10-r1.ebuild
+++ b/dev-vcs/fossil/fossil-2.11.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
 	  tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
 
@@ -63,8 +63,8 @@ src_configure() {
 		use ${u} &&  myconf+=" --with-${u}"
 	done
 
-	tc-export CC
-	./configure ${myconf} || die
+	tc-export CC CXX
+	CC_FOR_BUILD=${CC} ./configure ${myconf} || die
 }
 
 src_install() {
diff --git a/dev-vcs/fossil/fossil-2.11.ebuild b/dev-vcs/fossil/fossil-2.12.1.ebuild
index e75b80518477..e75b80518477 100644
--- a/dev-vcs/fossil/fossil-2.11.ebuild
+++ b/dev-vcs/fossil/fossil-2.12.1.ebuild
diff --git a/dev-vcs/fossil/fossil-2.8.ebuild b/dev-vcs/fossil/fossil-2.8.ebuild
deleted file mode 100644
index 644099632df9..000000000000
--- a/dev-vcs/fossil/fossil-2.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="http://www.fossil-scm.org/"
-SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
-	  tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-DEPEND="
-	sys-libs/zlib
-	|| ( sys-libs/readline:0 dev-libs/libedit )
-	system-sqlite? ( >=dev-db/sqlite-3.27.1:3 )
-	ssl? ( dev-libs/openssl:0 )
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="${DEPEND}"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug         && myconf+=' --fossil-debug'
-	use json          && myconf+=' --json'
-	use system-sqlite && myconf+=' --disable-internal-sqlite'
-	use static        && myconf+=' --static'
-	use tcl           && myconf+=' --with-tcl=1'
-	use fusefs        || myconf+=' --disable-fusefs'
-
-	local u useflags
-	useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
-			   th1-docs th1-hooks )
-	for u in ${useflags[@]} ; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	tc-export CC
-	./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.9.ebuild b/dev-vcs/fossil/fossil-2.9.ebuild
deleted file mode 100644
index 209a3c8a789c..000000000000
--- a/dev-vcs/fossil/fossil-2.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="http://www.fossil-scm.org/"
-SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
-	  tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-DEPEND="
-	sys-libs/zlib
-	|| ( sys-libs/readline:0 dev-libs/libedit )
-	system-sqlite? ( >=dev-db/sqlite-3.28.0:3 )
-	ssl? ( dev-libs/openssl:0 )
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="${DEPEND}"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-src_configure() {
-	# this is not an autotools situation so don't make it seem like one
-	# --with-tcl: works
-	# --without-tcl: dies
-	local myconf="--with-openssl=$(usex ssl auto none)"
-	use debug         && myconf+=' --fossil-debug'
-	use json          && myconf+=' --json'
-	use system-sqlite && myconf+=' --disable-internal-sqlite'
-	use static        && myconf+=' --static'
-	use tcl           && myconf+=' --with-tcl=1'
-	use fusefs        || myconf+=' --disable-fusefs'
-
-	local u useflags
-	useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
-			   th1-docs th1-hooks )
-	for u in ${useflags[@]} ; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	tc-export CC
-	./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 590d14674f8e..5b56ec0df693 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1,8 +1,5 @@
-AUX git-annex-6.20160114-QC-2.8.2.patch 509 BLAKE2B 2d84231d59a062bbe3e5a2c970f8c01e7da5cea0e42ff40bedffcfea079e3e131a395a033a3c1d012bda31af2c2326dc4d75c929e8e47b2e198a7ebcc2efadc6 SHA512 2df4f294bd8e39a067cdf7adf0f44d08a7910d7954529d053fd35d35b263dc891ecb1390427783c3448d660e918b6076c86e6c01145f272226c20c8d7688cd1c
-AUX git-annex-6.20161210-directory-1.3.patch 279 BLAKE2B 7d85392d72f146c4fb7545c19b362c6f1915925570f69697f612defdcf811596e2b339d2d9a6ed4038f5fc73bf887ecea464a768d40d4616a8fc1992836b279a SHA512 6247c9d8221ec3c1090d6cd66fbf525ea429e64ade0820a54d5116d69c36ba69f7f7ce1ec46d26afdacd24ffdad813ad540abbecd50fca318c7439bd347a6533
-AUX git-annex-6.20170101-crypto-api.patch 212 BLAKE2B 0e9e1fdda1a93ffd709955c472052aa507e364c94095b6acf94f94693c23681a145f808b17c98bb5d40ddc111bb2de43f594e4333e2f6322c93ff711268916f0 SHA512 c0b69ef8dffd9df06663513233f7848e3f8abfec5f6f93656cbfc466887ac5d2bbbbe65bb07088a488616593a44456fa9aa459a1404352afa66b2b7cdc937dfe
 AUX git-annex.bash 440 BLAKE2B af7b2b47e98386cef417051a11ae4baff07ea8cd96177c95b6b49095f5b7724ecbc1c4f13a6f351afe66f0d015c7355b6a56b77c06cb1e9e5cf155268312c619 SHA512 89b6520e4be14af9032638c1153df936a7e5707d6453b4251fe762712b8956ba1d39a4623b06910e5ac5724e33e157e654b724e070b6893f6f26578df730d326
 AUX git-annex.xpm 1961 BLAKE2B 0fe6e0cf9c43b1b16db1e8394ccda5eef2fdc41727aa3aa97fef8f955e8fdd71336c29f439ed2ad46553f8d67ef8be9d3dbcc6a93c81686f5e746a08b1113c6d SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3
-DIST git-annex-6.20170818.tar.gz 1111837 BLAKE2B ff18ffd101b3f9dc2b74caaed57c8f8f568fc51beeedddccf7f76ef5a27a99801cb994a52f09e5467be2f030842f4fa3b38bfd0a19a207057ffe269dfc8f240c SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0
-EBUILD git-annex-6.20170818-r1.ebuild 4424 BLAKE2B 3f8bfdcb1c4ff2e328def3aa19df4ecaf37f63af2f13abc6da4d9e5083feecb67d61693a9045fa3b7f5b0a0671140d6cad803cf1880c51e9b41d7ce792c8e7bd SHA512 cd13af30010593bd53b55711478c8941e963f76f71bb52fcef1207c0275118d2ff95d693066fab96384bbba8d7deb808f0e3ec30563d1fa917b55d02cb52e5bc
-MISC metadata.xml 1661 BLAKE2B 356d0921a762cfb657a0da795457c4016c2b131d0465e214cd24ca1b61b6b2666d0d4d3888abcaad00c70bae8f45b25400abfcba669aaa0e6f136f7e782424f0 SHA512 711b59db225918c774489ce308f16fd372377ff64c1449030bc75c4ae17212515ddeac741ee11978a6e3212b3edc75fd45d730664bd625a54d7887bc12dab928
+DIST git-annex-8.20200810.tar.gz 1312890 BLAKE2B 63226ee6b2150dd48dae3e52e70502e64e89d73185500c1cea201f2be98760ed9b3cd173b75b5603b49ca63f316163273a7c6d7eaddd68e548d903c845925713 SHA512 e6a4ad3169582f65284218c75f2679105a52d2f22310b10436796c439e031c5ad6f4d2dff1772f4cfc670d8956ae4a68d4d98e1dabd48bf06bcafda97676321f
+EBUILD git-annex-8.20200810.ebuild 4802 BLAKE2B 04e6958e4dab5428427e0ae4990b962500103ef6b856b0e68f7657115a93e4bcd05d64d8ba34eb156c662263f4750adfcd845956fd9df835bc66e1724702685e SHA512 20200d3f9c9b4ebbf5e375c75d1e001b45d4adf1b310d5cfc51f4d26867aca044558cafcfda4a5381505553480ea20f576f8cda3cb07e745716970698b037439
+MISC metadata.xml 2190 BLAKE2B bc99f8444bdf97aa1cf12abaa871454c84c928ae2938c1a9d37121bc8249bbf818ac875a7db7ed737ef80fc2421899f152c1cf6be869dc84fe071bf8626cbe21 SHA512 6b343a22a16b3466676f9a493da11a645e7b593eb9fe99b13198a8845e213526371deb03464256142c2ba3bdea4dd1e71092bc84e4fe45fcc18165d3ef89886f
diff --git a/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch b/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
deleted file mode 100644
index 2f232782de02..000000000000
--- a/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
-index cd408dd..9f60f23 100644
---- a/Utility/QuickCheck.hs
-+++ b/Utility/QuickCheck.hs
-@@ -9,2 +9,3 @@
- {-# LANGUAGE TypeSynonymInstances #-}
-+{-# LANGUAGE CPP #-}
- 
-@@ -23,2 +24,3 @@ import Prelude
- 
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v) where
-@@ -28,2 +30,3 @@ instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v) where
- 	arbitrary = S.fromList <$> arbitrary
-+#endif
- 
diff --git a/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch b/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
deleted file mode 100644
index 1e9bb57f9eec..000000000000
--- a/dev-vcs/git-annex/files/git-annex-6.20161210-directory-1.3.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Common.hs b/Common.hs
-index 5213863..74b054e 100644
---- a/Common.hs
-+++ b/Common.hs
-@@ -27,3 +27,3 @@ import Utility.Process as X
- import Utility.Path as X
--import Utility.Directory as X
-+import Utility.Directory as X hiding (getFileSize)
- import Utility.Monad as X
diff --git a/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch b/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
deleted file mode 100644
index c517c651ce47..000000000000
--- a/dev-vcs/git-annex/files/git-annex-6.20170101-crypto-api.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/git-annex.cabal b/git-annex.cabal
-index 5b95a16..f03024d 100644
---- a/git-annex.cabal
-+++ b/git-annex.cabal
-@@ -326,2 +326,3 @@ Executable git-annex
-    case-insensitive,
-+   crypto-api,
-    random,
diff --git a/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild b/dev-vcs/git-annex/git-annex-8.20200810.ebuild
index 91abe516311c..c80e75b51846 100644
--- a/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
+++ b/dev-vcs/git-annex/git-annex-8.20200810.ebuild
@@ -1,54 +1,62 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.3.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: -production,-android,-androidsplice,-testsuite
 
 CABAL_FEATURES=""
-inherit haskell-cabal bash-completion-r1
+inherit haskell-cabal bash-completion-r1 desktop
 
 DESCRIPTION="manage files with git, without checking their contents into git"
 HOMEPAGE="http://git-annex.branchable.com/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-RESTRICT="test"
 
-LICENSE="GPL-3"
+LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+assistant benchmark +concurrentoutput +dbus doc +magic +network-uri +pairing s3 +torrentparser +webapp +webdav"
+IUSE="+assistant benchmark +dbus debuglocks doc +gitlfs +httpclientrestricted +magicmime +networkbsd +pairing +s3 +torrentparser +webapp +webdav" # NOTE: add local USE flag 'doc' when bumping
+
+RESTRICT=test
 
 RDEPEND="dev-haskell/aeson:=
 	dev-haskell/async:=
-	dev-haskell/bloomfilter:=
+	dev-haskell/attoparsec:=
+	>=dev-haskell/bloomfilter-2.0.0:=
 	dev-haskell/byteable:=
 	dev-haskell/case-insensitive:=
+	>=dev-haskell/concurrent-output-1.10:=
+	dev-haskell/conduit:=
+	>=dev-haskell/connection-0.2.6:=
 	dev-haskell/crypto-api:=
-	dev-haskell/cryptonite:=
+	>=dev-haskell/cryptonite-0.23:=
 	dev-haskell/data-default:=
 	dev-haskell/disk-free-space:=
 	dev-haskell/dlist:=
 	dev-haskell/edit-distance:=
-	dev-haskell/esqueleto:=
 	>=dev-haskell/exceptions-0.6:=
-	>=dev-haskell/feed-0.3.9:=
+	>=dev-haskell/feed-1.0.0:=
+	>=dev-haskell/filepath-bytestring-1.4.2.1.1:=
 	dev-haskell/free:=
 	dev-haskell/hslogger:=
-	dev-haskell/http-client:=
-	>=dev-haskell/http-conduit-2.0:=
+	>=dev-haskell/http-client-0.5.3:=
+	dev-haskell/http-client-tls:=
+	>=dev-haskell/http-conduit-2.3.0:=
 	>=dev-haskell/http-types-0.7:=
 	dev-haskell/ifelse:=
 	dev-haskell/memory:=
+	dev-haskell/microlens:=
 	dev-haskell/monad-control:=
 	dev-haskell/monad-logger:=
 	>=dev-haskell/mtl-2:=
+	>=dev-haskell/network-uri-2.6:=
 	dev-haskell/old-locale:=
-	>=dev-haskell/optparse-applicative-0.11.0:=
-	dev-haskell/persistent:=
-	dev-haskell/persistent-sqlite:=
+	>=dev-haskell/optparse-applicative-0.14.1:=
+	>=dev-haskell/persistent-2.8.1:=
+	>=dev-haskell/persistent-sqlite-2.8.1:=
 	dev-haskell/persistent-template:=
-	>=dev-haskell/quickcheck-2.1:2=
+	>=dev-haskell/quickcheck-2.10.0:2=
 	dev-haskell/random:=
 	dev-haskell/regex-tdfa:=
 	dev-haskell/resourcet:=
@@ -59,76 +67,71 @@ RDEPEND="dev-haskell/aeson:=
 	dev-haskell/split:=
 	>=dev-haskell/stm-2.3:=
 	dev-haskell/stm-chans:=
+	dev-haskell/tagsoup:=
+	>=dev-haskell/tasty-0.7:=
+	dev-haskell/tasty-hunit:=
+	dev-haskell/tasty-quickcheck:=
+	dev-haskell/tasty-rerun:=
 	dev-haskell/text:=
-	dev-haskell/unix-compat:=
+	>=dev-haskell/unix-compat-0.5:=
+	dev-haskell/unliftio-core:=
 	dev-haskell/unordered-containers:=
 	dev-haskell/utf8-string:=
 	>=dev-haskell/uuid-1.2.6:=
-	>=dev-lang/ghc-7.8.2:=
-	assistant? ( >=dev-haskell/dns-1.0.0:=
-			dev-haskell/hinotify:=
-			dev-haskell/mountpoints:=
-			sys-process/lsof )
+	dev-haskell/vector:=
+	>=dev-lang/ghc-8.4.3:=
+	assistant? ( >=dev-haskell/hinotify-0.3.10:=
+			dev-haskell/mountpoints:= )
 	benchmark? ( dev-haskell/criterion:= )
-	concurrentoutput? ( >=dev-haskell/concurrent-output-1.6:= )
 	dbus? ( >=dev-haskell/dbus-0.10.7:=
 		>=dev-haskell/fdo-notify-0.3:= )
-	magic? ( dev-haskell/magic:= )
-	network-uri? ( >=dev-haskell/network-2.6:=
-			>=dev-haskell/network-uri-2.6:= )
-	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
+	gitlfs? ( >=dev-haskell/git-lfs-1.1.0:= )
+	httpclientrestricted? ( >=dev-haskell/http-client-restricted-0.0.2:= )
+	magicmime? ( dev-haskell/magic:= )
+	networkbsd? ( >=dev-haskell/network-3.0.0.0:=
+			dev-haskell/network-bsd:= )
+	!networkbsd? ( >=dev-haskell/network-2.6.3.0:= <dev-haskell/network-3.0.0.0:= )
 	pairing? ( dev-haskell/network-info:=
 			dev-haskell/network-multicast:= )
-	s3? ( >=dev-haskell/aws-0.9.2:=
-		dev-haskell/conduit:=
-		dev-haskell/conduit-extra:= )
+	s3? ( >=dev-haskell/aws-0.20:= )
 	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
 	webapp? ( dev-haskell/blaze-builder:=
 			dev-haskell/clientsession:=
-			>=dev-haskell/path-pieces-0.1.4:=
-			>=dev-haskell/shakespeare-2.0.0:=
+			>=dev-haskell/path-pieces-0.2.1:=
+			>=dev-haskell/shakespeare-2.0.11:=
 			dev-haskell/wai:=
 			dev-haskell/wai-extra:=
-			>=dev-haskell/warp-3.0.0.5:=
-			>=dev-haskell/warp-tls-1.4:=
-			>=dev-haskell/yesod-1.2.6:=
-			>=dev-haskell/yesod-core-1.2.19:=
-			>=dev-haskell/yesod-default-1.2.0:=
-			>=dev-haskell/yesod-form-1.3.15:=
-			>=dev-haskell/yesod-static-1.2.4:= )
+			>=dev-haskell/warp-3.2.8:=
+			>=dev-haskell/warp-tls-3.2.2:=
+			>=dev-haskell/yesod-1.4.3:=
+			>=dev-haskell/yesod-core-1.6.0:=
+			>=dev-haskell/yesod-form-1.4.8:=
+			>=dev-haskell/yesod-static-1.5.1:= )
 	webdav? ( >=dev-haskell/dav-1.0:= )
 "
 # not generated by hackport:
-RDEPEND="${RDEPEND}
-	dev-vcs/git
+RDEPEND+=" dev-vcs/git
 "
-
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 "
-
 # not generated by hackport:
-DEPEND="${DEPEND}
-	dev-lang/perl
+DEPEND+=" dev-lang/perl
 	doc? ( www-apps/ikiwiki net-misc/rsync )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
-	"${FILESDIR}"/${PN}-6.20161210-directory-1.3.patch
-	"${FILESDIR}"/${PN}-6.20170101-crypto-api.patch
-)
-
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-android \
 		--flag=-androidsplice \
 		$(cabal_flag assistant assistant) \
 		$(cabal_flag benchmark benchmark) \
-		$(cabal_flag concurrentoutput concurrentoutput) \
 		$(cabal_flag dbus dbus) \
-		$(cabal_flag magic magicmime) \
-		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag debuglocks debuglocks) \
+		$(cabal_flag gitlfs gitlfs) \
+		$(cabal_flag httpclientrestricted httpclientrestricted) \
+		$(cabal_flag magicmime magicmime) \
+		$(cabal_flag networkbsd networkbsd) \
 		$(cabal_flag pairing pairing) \
 		--flag=-production \
 		$(cabal_flag s3 s3) \
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index 556f1c584b7f..58517e95d4ad 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -5,29 +5,38 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		git-annex allows managing files with git, without checking the file
-		contents into git. While that may seem paradoxical, it is useful when
-		dealing with files larger than git can currently easily handle, whether due
-		to limitations in memory, checksumming time, or disk space.
-		
-		Even without file content tracking, being able to manage files with git,
-		move files around and delete files with versioned directory trees, and use
-		branches and distributed clones, are all very handy reasons to use git. And
-		annexed files can co-exist in the same git repository with regularly
-		versioned files, which is convenient for maintaining documents, Makefiles,
-		etc that are associated with annexed files but that benefit from full
-		revision control.
-	</longdescription>
 	<use>
 		<flag name="assistant">Enable git-annex assistant and watch command</flag>
 		<flag name="benchmark">Enable benchmarking</flag>
-		<flag name="concurrentoutput">Use concurrent-output library (experimental)</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-		<flag name="pairing">Enable pairing of git annex repositories</flag>
-		<flag name="s3">Enable Amazon S3 remote</flag>
+		<flag name="dbus">Enable dbus support</flag>
+		<flag name="debuglocks">Debug location of MVar/STM deadlocks</flag>
+		<flag name="gitlfs">Build with git-lfs library (rather than vendored copy)</flag>
+		<flag name="httpclientrestricted">Build with http-client-restricted library (rather than vendored copy)</flag>
+		<flag name="magicmime">Use libmagic to determine file MIME types</flag>
+		<flag name="networkbsd">Build with network-3.0 which split out network-bsd</flag>
+		<flag name="pairing">Enable pairing</flag>
+		<flag name="s3">Enable S3 support</flag>
 		<flag name="torrentparser">Use haskell torrent library to parse torrent files</flag>
 		<flag name="webapp">Enable git-annex webapp</flag>
-		<flag name="webdav">Enable webdav remote</flag>
+		<flag name="webdav">Enable WebDAV support</flag>
 	</use>
+	<longdescription>
+		git-annex allows managing files with git, without checking the file
+		contents into git. While that may seem paradoxical, it is useful when
+		dealing with files larger than git can currently easily handle, whether due
+		to limitations in memory, time, or disk space.
+		
+		It can store large files in many places, from local hard drives, to a
+		large number of cloud storage services, including S3, WebDAV,
+		and rsync, with a dozen cloud storage providers usable via plugins.
+		Files can be stored encrypted with gpg, so that the cloud storage
+		provider cannot see your data. git-annex keeps track of where each file
+		is stored, so it knows how many copies are available, and has many
+		facilities to ensure your data is preserved.
+		
+		git-annex can also be used to keep a folder in sync between computers,
+		noticing when files are changed, and automatically committing them
+		to git and transferring them to other computers. The git-annex webapp
+		makes it easy to set up and use git-annex this way.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index f7e55d37b13a..6c86fc60f503 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,93 +1,4 @@
-DIST git-lfs-2.10.0.tar.gz 2771571 BLAKE2B 02818efcadd3915a283bcea9c50baa305d1a325e9832ac6613f3b221e27c26cf5c6c5b54b2dd7ee8e0247e41924d4f1a2b02e1ea6400a2f5c2255c2125057ef0 SHA512 a4bfb3f674ef93e903e815ab0721f25ac78f772df416c865a7c57f7d19790b9efa8d4662723f2e3d87f294346d7924942d05cbfcdd8a010316e8b0420bd71e8a
 DIST git-lfs-2.11.0.tar.gz 2839623 BLAKE2B e9d0e8ea37f19617a4f727abdc93c3c937052ad98b6ac40de27ced6b250789701797d04f1bf795b259e83155e5d8a1ca122dbf8b40503c2c41d6d891a3ecf096 SHA512 2117b425864a36f773c14d34c78999636d836646184cf8d89045ef6de90cbded873d4de4613ecfafb0fa2ea8ae068e11f5ae22eed6af01715b5fac9be70f033b
-DIST github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180125232955-4729b3d4d858.mod 36 BLAKE2B 63449f57a292772e178e1064008cd63f520a7cf20095c51ef6ff88075129828019e66734f79b6a0b81c0873b0ddce10d941f62c7b9951f716ccb251967201087 SHA512 be9b456cad78b6194afa1fa9d6df1a77331706d03102e092a36d7efaa19a9d708fc72245ad224ea1cd87ccd59087b6024f949176aa76e4547f6bd9e7f98231f1
-DIST github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180125232955-4729b3d4d858.zip 29798 BLAKE2B 36bab471360ec0ac95260e34c348ad7958f5946c88a00ba1799fafd8a783a6f0bf07d97f2c6157a277cccbc6986da66b98d8e5569f37a5d6862e9b018b2fc319 SHA512 cb56fca8c7b386039e9437fe029a05b5fca8f4e47d9066d05227ba5b27c9c5b3029aadde3930a2748ae8f1e1c0dafbece73339e5077819d61b8b4046cdf6f4a1
-DIST github.com%2Favast%2Fretry-go%2F@v%2Fv2.4.2+incompatible.mod 33 BLAKE2B aa9ff95903d70d79a59246a577ffd5a06778c11ef2595294b4aad0023e7b1d5d0a94caf09d6332371719c1564b5e8d31710dc6d38ffef08f73456d84d4851f76 SHA512 87e9e766f71571384f11693b81a8ae95f2a603f9fa26e3159616ed9a5c2a18723d0a9512e2d9d14273a19fb3347ca4efa912d64e2303944d6fc9ef6dcadc0a73
-DIST github.com%2Favast%2Fretry-go%2F@v%2Fv2.4.2+incompatible.zip 12642 BLAKE2B 7c02212c6dd25c75415a1b5268bcfc313a667ef298c4d0b3940405cede2fcb159a91088a33cb32a482653aa10391afbe9ddcdeda78351fc31838747b80087140 SHA512 c6b98e24e642f21ce0551f974c55711066a36e77b66201a085ab728bb4b9614aa7ec35b01cd7225f945d0a32d069d974eb542d6eddb2e5681fa11c2f13d35a94
-DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
-DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.zip 19233 BLAKE2B 72d5eb2b25cc20e8f22d29948913981975ad9b19669e4bc898b380e946e73b2ae7791c9bb14ac69a6949a28fa4b64f0cf8e2d8c08c5b647119b33856f8b00d51 SHA512 e2c2738bf03022c96e739fbfb9a43c19988d49a54e45eade73ab9b8deaa9f94bbcbbeed910051eb370699de1519da9d5d2ce7c42e22b9d15784b599daf393d4a
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fdpotapov%2Fgo-spnego%2F@v%2Fv0.0.0-20190506202455-c2c609116ad0.mod 435 BLAKE2B dcea8c3add36f7ecb313d92e11d39f5264d16d271381a19baed85a0fc9d249e1883a9c5647383f127f60382a67a859acdd4f6041b39761e97d1dc34c1b2b493a SHA512 ca651f150aff45faa479ae01e4b1395e2b99410a67db085dd0ed83baf2a2cf4afb44e3b82e5bd3949c1fb54891cf1101ca9dc6dd2dc35269ef4216d2d12cbdc6
-DIST github.com%2Fdpotapov%2Fgo-spnego%2F@v%2Fv0.0.0-20190506202455-c2c609116ad0.zip 6840 BLAKE2B 700a0608fad677bb63ec5d2b62d48751a34abc8a859615bb36b339f6b2bdf2c6a69c8335a4afd0d765d430c06ab598662818d695c4742d41ae8a7a478aaa3044 SHA512 e7a6e0be8f9334f75dca8e5597a7245ac122f4eb292a91efec9dda1db5e574287fac2bf40fa5aaa46510748a7f2ca27434aad23d525db194c94d5b9afff2457d
-DIST github.com%2Fgit-lfs%2Fgitobj%2F@v%2Fv1.4.1.mod 188 BLAKE2B 2100922969411d51d69c6a2ac413d40c5cd052f77fa7613e271395b10826fd23566ea127750ac3eb6baeae49065564845bd9dc9547ce79add2a054fa32ddacaa SHA512 a5b15632aee28801c4936e007690e79d6cfaa5774a1dfcbfca097a887eb32c69f6e9d37b0ad482d553407efff311c1ac8d1103b1a462f0a585616f703776e2d5
-DIST github.com%2Fgit-lfs%2Fgitobj%2F@v%2Fv1.4.1.zip 74183 BLAKE2B b482ac58262d037545d40f546998497263f0cab2f529bf9003c515bd35c8f89b5e3602d554bf742032eac8eb41a2b0364dc0074fa94be740518e96343263775d SHA512 f5de6a5528af1da18ecbb175c0e3f441ed82f3ed60a519c82cb2d039616e1ce83f5d9faa562aea59360c9009e4a7f8f7f38859f7f292f4c7462d9da3d102d165
-DIST github.com%2Fgit-lfs%2Fgo-netrc%2F@v%2Fv0.0.0-20180525200031-e0e9ca483a18.mod 35 BLAKE2B 43066e606442ae213bb16491e41fe4d5bb2d2b362e0ef20025cd002200363632b4a3169ff571292e2f46b7a9996393a534f4bacdfca59f1fe62dbda2e81ee119 SHA512 768f54e3986f35c9a5acf9aaaf9b55b3e12ada7fb6c602303542709e1dd8ce3e03c40837949f07f943f2ac9f59b7affe8cd14d1e57b1de5fbe488ab2e6f13f90
-DIST github.com%2Fgit-lfs%2Fgo-netrc%2F@v%2Fv0.0.0-20180525200031-e0e9ca483a18.zip 10433 BLAKE2B bee92ebd9cccc446b4460200f6a18348d0c0b1b6ba40ea531c4d01c367e0943ea9701122929186133570929b6b875dfe56b0d79d636c14d8df210655a527e386 SHA512 9c173f6dc2e5e67212499b5c93d7e3a48c17ed3913c5d430593120e5da2698e65647f2a3195324bc7b77ce177432395723226558f369378fb95a4e5d4d314441
-DIST github.com%2Fgit-lfs%2Fgo-ntlm%2F@v%2Fv0.0.0-20190307203151-c5056e7fa066.mod 34 BLAKE2B f8dadc50a4ab22fd40d808c626939e31e6f690efb9635ade663b260c733d9362bff4dd90b6650d603a15edc0911d45db27bf994fe15760b8feae4a5d3d46f50b SHA512 f15829aff2bf18e2143bebec19f4954d14d4c6daec7dc94314d6349715efd4af00e818f6dea04cf482edafb6a61aa84967aeadd6dcf6792de73bf7277aa71fc9
-DIST github.com%2Fgit-lfs%2Fgo-ntlm%2F@v%2Fv0.0.0-20190307203151-c5056e7fa066.zip 52531 BLAKE2B d48ecd448cf4efd735162f903f0c2bfc85af931a3ba21341c11506f438d7678bd79abe9da9c800ffcec8d615bd984f00c5c9df578ba1b097d2a222695c79aae8 SHA512 4c5007a58dc642fff9028bc1f62afe1e6db9d80ea26c58dce2d7895de2b1e175a339a4f8ff2302cc8a4c3a38c8c9bd29d5967b1f996cac702a8ce51b90e1242d
-DIST github.com%2Fgit-lfs%2Fgo-ntlm%2F@v%2Fv0.0.0-20190401175752-c5056e7fa066.mod 34 BLAKE2B f8dadc50a4ab22fd40d808c626939e31e6f690efb9635ade663b260c733d9362bff4dd90b6650d603a15edc0911d45db27bf994fe15760b8feae4a5d3d46f50b SHA512 f15829aff2bf18e2143bebec19f4954d14d4c6daec7dc94314d6349715efd4af00e818f6dea04cf482edafb6a61aa84967aeadd6dcf6792de73bf7277aa71fc9
-DIST github.com%2Fgit-lfs%2Fgo-ntlm%2F@v%2Fv0.0.0-20190401175752-c5056e7fa066.zip 52531 BLAKE2B 9944d8eb2cf6b2b563400f148878b5a2d52021b122e90801cf3e865e13fb2c3e933e4d932607efd9fb3628293381dd6b22f2242d8e6eae02d015d61004fd6417 SHA512 c72344a9bb059d69ab817e4ff0edde7f8bd8f3c997bdc9aac4309505e8448857d5e2ef05f1ddc96b164ed3656c71b4aaa823ce952d1b7ef2045d1ee55760233f
-DIST github.com%2Fgit-lfs%2Fwildmatch%2F@v%2Fv1.0.2.mod 36 BLAKE2B 89773b60ff9f0acd76a9d44c161f0450641660a70a5525c5a3b33a2a9c736e94ebb17142c71ed26fb265104286ac151671b2a37b6ca46069be5cc25616752329 SHA512 a3c7c83c46a232a865065dac86772048d18e170c4e1c2a0f032cb398a280bf2aec45ace671c0a814fd5827c9ab152beb5fceeba8bc208c84571720e2cd7b6257
-DIST github.com%2Fgit-lfs%2Fwildmatch%2F@v%2Fv1.0.2.zip 11224 BLAKE2B b97eed19670371b600909a81d7495cdc4d165019911f0d21856f70d9f6245c3dc19bb38f3d762fb1d997789118ca3cf383fe708e904a99c0453f8cde531a4560 SHA512 c19b7eb82e5185e33031b3744764eb7ef9709df557add63422d3fd87bd96f6c1077f568cb9e01e65ca150126a820e5827529dddd3783cba1e1ca597c33488036
-DIST github.com%2Fgit-lfs%2Fwildmatch%2F@v%2Fv1.0.4.mod 36 BLAKE2B 89773b60ff9f0acd76a9d44c161f0450641660a70a5525c5a3b33a2a9c736e94ebb17142c71ed26fb265104286ac151671b2a37b6ca46069be5cc25616752329 SHA512 a3c7c83c46a232a865065dac86772048d18e170c4e1c2a0f032cb398a280bf2aec45ace671c0a814fd5827c9ab152beb5fceeba8bc208c84571720e2cd7b6257
-DIST github.com%2Fgit-lfs%2Fwildmatch%2F@v%2Fv1.0.4.zip 11268 BLAKE2B e4cdcd3d6a40ed2ea5f6d77500f9a2246fe8a966256704254d95545a1a0b4035f5e196877b285c6c764161310e8a896e9a53c2f0bbd7eea927eb72dcaa76ce78 SHA512 fbdd73f1c7c09792a7b040ce8625bd84edf7dc5539425c94fd32dcc2ea38c3dd0b83dc03051520e97be9b3c9a96e1d8291a67715e5d4562d85383df24166e3c3
-DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
-DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
-DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
-DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
-DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
-DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
-DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip 31175 BLAKE2B 17e0ba33bedb9809d12ffefe034baf727e7c2a66aa19adeb87de3e3659c085f176fa48951f1afff4e5fe132c73d4520ac7061deb0e24d86520936e6ed6b63845 SHA512 d1717086c3d429838c88ad276d3bebda858fb4afafff46a204cf252685d9c7f1e2b15916f3cf7f8c03fd54e68d2d1c3ecb64e9d73975ebe9ae188039f0aa4570
-DIST github.com%2Fjcmturner%2Fgokrb5%2F@v%2Fv7.3.0+incompatible.mod 35 BLAKE2B 44663b670e1c572c79b294c3397a4b7dc73407959179930c0e5c10624ccb894b7832361602773eff578f0a9529e988d092e760394d8f5e7e53d33da1181bb4bd SHA512 ffa712356c1dc8863a74ad99539e7cbbec4b69cf3f4cadd4105a957292ef1d66c6a24da5ccbb45bff01230b2c9e93ced4bcc1d486eafecc1802b96d242e5c23b
-DIST github.com%2Fjcmturner%2Fgokrb5%2F@v%2Fv7.3.0+incompatible.zip 55269161 BLAKE2B 9eaffa5814fc5a212bb538b74265f228291a1742910175ad205d6b5c1072e4e22d8c148c1248c0a47d37085f336971f43c35dc7b2aa288c55b5bb1395f17f299 SHA512 99d171582a103624d7e5fc3e30b0028b5f2493104c0c3ca6abb8e09bed997db9a76454989cb52b5f94f8e33f031f2f27a43aacafde34826d537769c2871019a6
-DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod 72 BLAKE2B 796a88b0b7d88f469e90e59f66d12a3c515e0230eb2a7ec83f00f5266266d93eea475b752677f2ec81a7c99243a5034ec1a2e9f4e23a83b61bfe6e855246b6d3 SHA512 9c13eb40018d27bb2f5623251df11cee7b8c08eaee681b4678f854d7c023bfd3885bf04ae085183c7501e637d86386a00e3a979088aaf2c37a03f732d7655a5a
-DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.zip 2820 BLAKE2B 5346e57c8be648f632bd459638c3c76412875e92d6f9a64c1a3c6a0da1eb91c29e3366bb1341b23d921a34b04f4bfeae69ccefd7caf36357bae18ea9fb688894 SHA512 7215285ec564e6b4985d2b46646b46927a7c642c4637541277bfff94032c67423d5d22e3dfb07c2f4a658ffc7772c4e4a33661d327eb16cc65f634bdec169e9e
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251
-DIST github.com%2Folekukonko%2Fts%2F@v%2Fv0.0.0-20171002115256-78ecb04241c0.mod 32 BLAKE2B ce8c7a373f3b37f9a8a0bb7239780b9d6ca07647f00a3b40222d7835a5d3b9e2256357c03431d9cc8e156ef3ec8c6b2805c045eb7c0f731d0245f4dc6d88b612 SHA512 730b63cc1eec7cb9428b4baf631a2be2a33d1f862a6608812d8629db81f58f01531e4e6a3199de4b26cebb0dd21c4c962c5d589ac383a5e9d667820e809d5fcf
-DIST github.com%2Folekukonko%2Fts%2F@v%2Fv0.0.0-20171002115256-78ecb04241c0.zip 8361 BLAKE2B 22e84fe7da572d8425a57b43db4b4a12e5187de2a9a6b94b2d3a12e288c80c941a320d189c2acb600b91b9f8c7c1c46e7f457646b014c4e982bf39043067c74f SHA512 a4826c1622c94e81dff76dbca28e35230b07bd66849b816491d573be139905562747ae00f2e57a79d0246adca6ee059cccacccba068aec67a0f0a3aea6139305
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.0.0-20170505043639-c605e284fe17.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.0.0-20170505043639-c605e284fe17.zip 15552 BLAKE2B 52e02a4451147e9ff6a1fe36c5a7bf0828fd3ed7a39eb0aa4c5232edd0ea67adb4c86c2c3eef31de62ed7d986297244c8c5a80300529876e9cb346bd098cda19 SHA512 71e05b6feec8687b143da3d966a31cf26325550d482afe49dcfa7cc31a71d31d48d849138aba53982e5bb40b3be4f7420af7d6c6f441bc557d85bff69f450de4
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
-DIST github.com%2Frubyist%2Ftracerx%2F@v%2Fv0.0.0-20170927163412-787959303086.mod 34 BLAKE2B 6677a842c35332fccff0bdd56bf1fa95d9bfce605963135fde6155c7192805bf2c527635c699cf04a56661f08ff6b927c35fd3f308bf5c40f91f5a5cadf5b3f1 SHA512 c5c45a7c08d1dec68894c3667dd087e1dc650595f3a676ab6d5f835e0660fdfd0d9c2d34cec0922c736fb274d974aa61a452b8f1ec919ba0ee42d63e5e66c8fd
-DIST github.com%2Frubyist%2Ftracerx%2F@v%2Fv0.0.0-20170927163412-787959303086.zip 3452 BLAKE2B acd1eff5e4192c4d51b390ada100f99e04c32427d763f95ef5e42808acac6ebf682f3b6e4712fa34587e7568974a77c7048619fc075a406b261a957c94b4fe06 SHA512 ff524efebe039e9ee8156b7fd9f0bde6f26acef8b8ef788d2d18451380edf8ddb947d1ebfdb7bbc0d27762ddecdc320b15a8b937a09e5acb8f01e48499e0525a
-DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
-DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip 139997 BLAKE2B c20d7292a69fd548bf0dbd62751dc08a41c66f120bd8b5142e96f498aafd208328ed4888d7ac59404b64dace96bcad210f64734e432f15ae63ce6d39dd308cf4 SHA512 1476716a98d5aa26c34af6d85eb93886cae211beac7cdc8f886d2030bf7f83802409aa56510ba09cbdb609dcd2faf87d3490c4e5392922e0e034edcd3d9fb1bf
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
-DIST github.com%2Fssgelm%2Fcookiejarparser%2F@v%2Fv1.0.1.mod 111 BLAKE2B d7ae50b4cb2613d12853bbdcd1f753df7a5f928da1ae830ef87893c79db32849493b84e77cf8785befa9e18d9b4e61a106014f1aee125273f171f828c7a20e1e SHA512 9072c355893740098181558167e4c6a7c5f19d035dbff17cae61a239bd14da0ae572325eb6f6be650c5a45d5c884ecd2be2a090886e267f78bca513ec7e438a5
-DIST github.com%2Fssgelm%2Fcookiejarparser%2F@v%2Fv1.0.1.zip 4705 BLAKE2B e3bcdf0cefa570d0a42ee139ac506334723562a247b84702b373e91ee80c2cc1ba7670bf33767fadacaec5520c7754c71e7684fb19e8dfdaf4e3a59f591525a4 SHA512 951817c4a30d818dad335fe79950c4a47f0d9b9986f3b6f61c530fda59136140b7062b9b1bcde06f362a26c09b654e72a19ef538a6284be37de898532358d897
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88
-DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
-DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip 9425 BLAKE2B b18ec4a4e021332404866950e4839e8b00db652a3bc196fee5f7ea928085d25b44584baa3b8e65f5a26edc4a84450152fb40c8eb11dabe82641c2f569d6de126 SHA512 41675a07bc201e97344136fb7afab6afc3974a7d4252068311c5f24968f6a46b979e763865e61586c5d3c8f2478a046915e62b5a7829785c703d180f4c2af58f
-DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod 42 BLAKE2B c2d6fb272d8ae4e541c98023713bcf0b7f47f334d09ad7f9f375ed13eb14d27ee2995745782ecea40d31a561e28702fddeae4b5e32750726c7188118d741cf82 SHA512 14c839017eebd5dcf49dd3495a1ef6421d522389a2943c010d7869d214f757fe7d19d6ac3482fb3d8cbaaeb3977c5c311523aba90e9f7909fb1ba593ba57ae8a
-DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip 8632 BLAKE2B db207b3c4a00178e3a2fd24a1c453ff54e8714792d5ae2ab324bebf8efdac9bf1492e3c1f6360a99459c4e88970395bc74dddc4611acec4478ce8a287dc872f9 SHA512 84eca639af26023555a96ac40edc73c5607712c4cbb42f9e9ea80c5e63c3a145e43e10d920891bb7553ddf39ada40f3b7e8cdb72891ac363a609964a3067eceb
-DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20170210233622-6b67b3fab74d.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
-DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20170210233622-6b67b3fab74d.zip 169335 BLAKE2B bf00103293e4987a9698b217eff2c28b6d91659c2b9e648d752d802f80bb44d5ac413976263f097561faee690041ea9b8a0c2e97a5b73cde18b211f0efcc2489 SHA512 9a651c2c7228e4a18b917b1dc9e0a4e84a81149f52a05d9adca01b2215e1c2f999088c8a715016d5508d4748323d6144226539ae2610fb1d95303d2e244a7d12
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip 1776515 BLAKE2B 5833fc2a16dec541a1362c9df7c02abe04a54e92e04eaafd5767c1a923e3a9cf90bc8d8ae0ee3c60b9745f5f0e3234350be1cafd984052353594d6e6b9fba041 SHA512 a1418dbc50d1e41495fd68ccba2ac84fed5edfd3e613c68850068afcce1136c3456e99d226674908a77c9648f16d7861edacb70afebcf3a7e73ea3dcdf8edbe7
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.zip 1806150 BLAKE2B 55682fbe3693b848335acdd64fe896a8a61bb63423192160926bf89ac20435d96b3743f1409fdf423a93352fead9ada4be631f5d319c730d0067f6af6acbe12d SHA512 4e3dc4ab13b622a0941b1417c47b572b7850fc225ef8614d287e2f2532d03e8da4b6f13ef1d002323ccf1b14e1b3af206efea7a5550c0a64dbbc29705120972f
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip 1277629 BLAKE2B becbc737f58b56645d8b449a7cdaf786a6bf70ab4db8d1876a4825b2f3d52b85e506fc9caf6a23a5857f992104b662e0f824e6fa23e7c92e27ba0ada574b255d SHA512 0d740cd05300d902cf60f54692cbdf91758457ac21a66738beac133b3a31930b3833b10978750efb59450d75f0b750985e28218d04e1d8e3e68c4c883fadab58
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191027093000-83d349e8ac1a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191027093000-83d349e8ac1a.zip 1427877 BLAKE2B 52bd4b9622823732749728095a61afa43750c1c64d5413c208081aec044e7005225b55af0e4a6ae34d73830cd1671ea5128f2626180fb274d7ba144b20692053 SHA512 c1ccb61c4d8de2f493419cdba154f758641e07ac385f0e286344b2b2265a4e6ac58ebc5609ffaf79c27d117da4f41adcc4e4da733e4211f2c3ea45c6411f3915
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip 24746 BLAKE2B 743f3b4641f002cdfec6805ead87d196b43a4de1ec59c788f8516f4bc78ef2d58fc8f0cc34a52e8762f39f0845470dfe4e50f269036576d021d65a5f30aaf08a SHA512 f7622fbf44dcdf894cd397edc8399e38b734cdfc6a6ef4f8e81af9408c9d912a1b96544e713c42237fb3116e70678755e829da8f5f628bc1cbf6767921cd380e
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip 1584596 BLAKE2B 2d891f4ee749bbf528b0a44acc8cc71a56432961fc47864ec9dd47543a8a1a97d55399dbb95a0654b0588ca2dc95289ae31746ada83afd9a667662c371b6747d SHA512 8431fd78425186e55e07be9cfdb81d294b517d1695f99da3612477b8275d9a64038b60097658a02f399ed99d2f399197e572f3c307f70fa075b4995943caddb8
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.zip 1697094 BLAKE2B 72e52dab100cd79a22a5f8adaa1af24cf245d193dcdfbfa10c25b440d23eda9a1e0f3c1f2b9684b5fbc9159055f482ff8eae12732c40d9d4dbcdfbf5ae93ca88 SHA512 a981d025dbb8bc8d3b48cbe7327076531e614f9bb9662f24b5f89997d8f9612d750ac53b9191e7df42dc326a36913b29350acaf7fe2f4bf2f08b986a510e95da
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
-DIST gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod 36 BLAKE2B 1f653e0e7fe93701b9e5c212697ee615f635c03fad64811a4741f57b9df6e53a632cd6665c12d2d56b5788639c386ec8461cafb4c5721610787e63b82579c539 SHA512 508e5b91b64eda9f137bdeb45512ca617294a48b9078670938190231eac59f96169462ab6dba748b9344df62479a48588db73c1d211977514f1e9baec3013167
-DIST gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip 8138 BLAKE2B d74df3115a331373ed39003d512a89a9c6fe59d571d74bbf1a6ff3ebb06b87a71bc9ec11df8105c1dccf58226fa9a354d5ebfec11a74c05d5a9b689cd6ca20c2 SHA512 a4583a6b2c3a476459184ae8890109d36594a37ed9884fcdb42a8c6985c17edaa20179233750116bb262a851aee59520030c9f4ef36639d56219e6df7f250489
-DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod 38 BLAKE2B d1cedc414de193540de5ac312000e4304212ba989a9b7bbe10b1a2db5effa33c82ec01cfd5ac4cb9d826460a1a0dd11c4f932c8649831d9b0ca3c21db602effe SHA512 894183b8527a1a4b541f8e5dc359e62d05dfa8aa66fabe8438db3f376e4075af51e781717e6ad01b3266384719bade2bf85dbb161c3c6468a40b9640f50d1cd8
-DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip 7425 BLAKE2B e25afce5349dcf85fff01c6282db6db594626bb20a021e77330868d666cd283306b5efacf2f8d8cc9627380e81763a50477b4ffdf1c0a0f4a71f2b2ba7d8f4ba SHA512 1aac5cca82fd087586924f69e49ecd68c7401a46368fa980c2e1ddcd3e59e170d8e2dc067d96c235442db9fac53817b631c0ded1b75557217385a3888ab5833e
-DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod 40 BLAKE2B 3e77c43f0108e2eb7585bd5558385a198b301e2adc7f813cce7981d0979567808d015e60cfd7ac7c6a17e9c0a5d616642c4b9bec919cd5de8d2fd6f86dd00845 SHA512 c498fb321f358d43c35d98913d17242517c415fc3c26d497fd821f30e6c656ca9ba3ce3a73657c43c677d35eab70c90065a7f93dab73214502e604efbc44a180
-DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip 7069 BLAKE2B db430bd56c95cb5a40e95368be1f8b23ffa067e4f491ba6a641c12f78855bbd691268f60b4d57307aeede99671a23c437171a446a47ca6ebc1eeaf9defb0755d SHA512 4972724984d58b174b50c1ea81842bc5baa1fca3d74ea5163b6339c2f4a9fee1731eae3dd19f8cb67bca9465a762e44f856537bdc907bbf37394dfc656b2edbc
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v5%2F@v%2Fv5.3.0.mod 36 BLAKE2B 54c17ea419af77ec0df0606dd637ed36bae1e216c7f102fe803c3833433ec94aa1912c1505f2589ab9a5025c68ab7243359b3332d52e9a27c638cdf54a9213de SHA512 4d64e2ce7fa9b6df45e713638f40e1eb6216f7fff2415dd87972c3eba424fdd72afcf3481664646835e1f969596113a175fe9db5e91b51883650dd19e4d26bea
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v5%2F@v%2Fv5.3.0.zip 55249420 BLAKE2B 82e8f06a955fae9f309db731e84f16dd9f3ed1fea25d71c78d9fc14e50a7b26f2abfb9abf64840bc0ea06df206c1a932577c4d5a13df728ef41c363cf4e9fe91 SHA512 3618e0d68ddc0f36a11df43c797cbb4d7ddfbfa6fb7c5753dd5ae04b90216aac733fb02d17d6e31ec81e3c206452cd77d932ba0efee1797d140d98ae88fcecc4
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.zip 55262753 BLAKE2B 42ecb6953d818d5b70bb6ca430ffbb5ee9d2e66feca01d89c41856b99c5d3738b031a1c743cd45860499ae6dd8c0fbe6e949c4954f969dc6bf20be39744f5afd SHA512 8d24dac1e8429af5d26697bb75407490f5a36860cfe5fcb4303c17e931c37454b17d51dd54d6b70112475704da0cdbcb851ed21e1303bde950768192749a822b
-DIST gopkg.in%2Fjcmturner%2Frpc.v0%2F@v%2Fv0.0.2.mod 33 BLAKE2B feb586b107a0b480aae5583b8a92b996ea6b17d7ba9830e375f87b26481b0f3d912dfe6dc79c73f1544781d56e9c6e20a2c7dac8160705b06f170dce55c33074 SHA512 39b339953dbcae89f53b4af25fcd1973d415408db0c224b03881e557ad35f8e8b754dfa75a8975cdd0c6593e9fb8afc4b31faae173ebe86900b28a010562c25f
-DIST gopkg.in%2Fjcmturner%2Frpc.v0%2F@v%2Fv0.0.2.zip 10299 BLAKE2B 6c10b7e229e214a8e3e5a00a626a1e037f347db0c8bfa508bad0da273c51bc9a78560b6703441f629e30bfad1888aa35b71cda3aeb7a422d65581e2b5f69c39d SHA512 79b4d6764407e85c1428716bf49992d90effd46fcce43092305ce9a3ae4c2f577eba1d61ce990a470b083c367c91b1307699c20f3aad99c5d7bf6aedb6594bbd
-DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod 33 BLAKE2B 0c256369010fa14f2dd95100b3f1b75357816012d226e52588c91c6615eb5b56459061d3bdc8201a84985136912c4d8e62dc281600cb53fd2e9e2a545eb3f35d SHA512 0513089b977716c7cb885b4edced551183b397858963f74f002a078920fd1e2178376261abad2c1c475e7de7ba262670de9d25e8a6e801b4c78385370cd0a489
-DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip 42124 BLAKE2B 172da6e6ccc58989dc4827d113bc8b93dfefef6321344bc9f569786ca152dd50369e98e7fdf718096d42eec90c1cd14d05cf908afbcc12dce8de6e2248d8463d SHA512 056ad239cc4831d56ef60f0e36c7cfe78a3a4d67160ee81619f63f27ff975247eb53e2b3461b8ee461f8aeee2fe8c37131832304e3eafadbc5ed5a4fb90a994a
-EBUILD git-lfs-2.10.0.ebuild 5709 BLAKE2B b9628b26354006865d385233395d467b715cdee931496e1ed37437d383693a5314d338d05dc0551f3d96ad2c25e4b6391909a1669f8ab2c9c58175f69e573b59 SHA512 c1b09d100a0a8f6be01f9e3ff21ac28fe51b5bc0c9a6eb9d256654ec19ccf2a97e571bf80c4328605233c360e34971b4918be5fbf79f7beed7bc357813447b78
-EBUILD git-lfs-2.11.0.ebuild 1161 BLAKE2B 229b2f495bd19729ecf9694eefbf3a50f3fa3f8a48549e4da428fb15dee847936c9c17dd0b92496f4cdbbb1c377a1b3343d9199ac189dbb7c62bc9907b9eef6e SHA512 4ebcf2cf46a8c9d4612724a3e7a25f3374ecad24ad3c3e57050efe8599db6b8381ecf02f46133b9d3ce049192b8f8802a1253385f69bad504157ac2c2f8490e0
-EBUILD git-lfs-9999.ebuild 1162 BLAKE2B edc19dd9bb3591e62c08cbd6dfa2863e04a45a0616b07f9fa84ea9c79ad3fc8ca30600e65d998398e2a3ac9088663585d28368bd9bb863cb085ccd0e939d2f9b SHA512 5c6c8c0936b10a6e3067baa607fc3ef7f2ff43511038ad3064420affbc0c62931d1d9ec718569835f7fff8460ea198e6fa848c6ca3e50afddbd68687e762ecef
+EBUILD git-lfs-2.11.0.ebuild 1392 BLAKE2B d6e33aa99c265dd3e2fd889c5bd9a70b751e15cc9757343e1e1bd7bec432e8015611e7b3009d1cd291eaa6b69e0a6fb7581d50f744f1a164d52936095ee5c03d SHA512 497ae5f9fa85cc412cb1708f13e75acaafc4087c5243aee8bdc9ff4567756cd60602cda6092ea1f98fe560a7ae9a6a05f69ffbb862136d2782b2850d8512ad15
+EBUILD git-lfs-9999.ebuild 1388 BLAKE2B 5ba84f64abbf39b34d4c68498507880b5581d9497a22e1d0fcb5101de896fdfa5ef77f94470a50c42769c1effb9500edcc3d7f304f7e750720f19a104cd99b90 SHA512 e79fb26dd99c369c2877eba3f1d0bd5b4e8797bacd5eba4424a055696a0f3968f481c19b18acd8ff320df8b56901f738b04cdd30d2b0ad313a3495833a9a0462
 MISC metadata.xml 558 BLAKE2B 307387b4326dd3982b949f3dc06f69efa31fcd70cbb03b1c68a5557965fdc14bb32f638a644c951ec06bf979baf8046228bf0820c9dac96a3d984c3cec3b32eb SHA512 8ae42faa56a37e9ebbd3c6fba90e4e87b44f8022ffb2bc3fb2eb7128c5bf7c34497c7a13c73252db5b5096135ed153a61c74382a54870c32c36eba7af23f7cbe
diff --git a/dev-vcs/git-lfs/git-lfs-2.10.0.ebuild b/dev-vcs/git-lfs/git-lfs-2.10.0.ebuild
deleted file mode 100644
index 7b2b8d5f0e57..000000000000
--- a/dev-vcs/git-lfs/git-lfs-2.10.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-base go-module
-
-EGO_SUM=(
-	"github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858"
-	"github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858/go.mod"
-	"github.com/avast/retry-go v2.4.2+incompatible"
-	"github.com/avast/retry-go v2.4.2+incompatible/go.mod"
-	"github.com/creack/pty v1.1.7"
-	"github.com/creack/pty v1.1.7/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dpotapov/go-spnego v0.0.0-20190506202455-c2c609116ad0"
-	"github.com/dpotapov/go-spnego v0.0.0-20190506202455-c2c609116ad0/go.mod"
-	"github.com/git-lfs/gitobj v1.4.1"
-	"github.com/git-lfs/gitobj v1.4.1/go.mod"
-	"github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18"
-	"github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18/go.mod"
-	"github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066"
-	"github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066/go.mod"
-	"github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066"
-	"github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066/go.mod"
-	"github.com/git-lfs/wildmatch v1.0.2"
-	"github.com/git-lfs/wildmatch v1.0.2/go.mod"
-	"github.com/git-lfs/wildmatch v1.0.4"
-	"github.com/git-lfs/wildmatch v1.0.4/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod"
-	"github.com/jcmturner/gofork v1.0.0"
-	"github.com/jcmturner/gofork v1.0.0/go.mod"
-	"github.com/jcmturner/gokrb5 v7.3.0+incompatible"
-	"github.com/jcmturner/gokrb5 v7.3.0+incompatible/go.mod"
-	"github.com/kr/pty v1.1.8"
-	"github.com/kr/pty v1.1.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.4"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/olekukonko/ts v0.0.0-20171002115256-78ecb04241c0"
-	"github.com/olekukonko/ts v0.0.0-20171002115256-78ecb04241c0/go.mod"
-	"github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17"
-	"github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/rubyist/tracerx v0.0.0-20170927163412-787959303086"
-	"github.com/rubyist/tracerx v0.0.0-20170927163412-787959303086/go.mod"
-	"github.com/spf13/cobra v0.0.3"
-	"github.com/spf13/cobra v0.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/ssgelm/cookiejarparser v1.0.1"
-	"github.com/ssgelm/cookiejarparser v1.0.1/go.mod"
-	"github.com/stretchr/testify v1.2.2"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f"
-	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
-	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
-	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
-	"github.com/xeipuuv/gojsonschema v0.0.0-20170210233622-6b67b3fab74d"
-	"github.com/xeipuuv/gojsonschema v0.0.0-20170210233622-6b67b3fab74d/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734"
-	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a"
-	"golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v5 v5.3.0"
-	"gopkg.in/jcmturner/gokrb5.v5 v5.3.0/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.3.0"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod"
-	"gopkg.in/jcmturner/rpc.v0 v0.0.2"
-	"gopkg.in/jcmturner/rpc.v0 v0.0.2/go.mod"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
-)
-go-module_set_globals
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-	# Upstream deps for testing change to fast to track them here.
-	RESTRICT="test"
-else
-	SRC_URI="
-		https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		test? ( ${EGO_SUM_SRC_URI} )
-	"
-	KEYWORDS="amd64 ~amd64-linux ~x86-linux"
-fi
-
-HOMEPAGE="https://git-lfs.github.com/"
-DESCRIPTION="Command line extension and specification for managing large files with git"
-
-LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
-SLOT="0"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/go
-	doc? ( app-text/ronn )"
-RDEPEND="dev-vcs/git"
-
-src_compile() {
-	set -- go build \
-		-ldflags="-X ${EGO_PN}/config.GitCommit=${GIT_COMMIT}" \
-		-mod vendor -v -work -x \
-		-o git-lfs git-lfs.go
-	echo "$@"
-	"$@" || die
-
-	if use doc; then
-		ronn docs/man/*.ronn || die "man building failed"
-	fi
-}
-
-src_install() {
-	dobin git-lfs
-	dodoc {CHANGELOG,CODE-OF-CONDUCT,CONTRIBUTING,README}.md
-	use doc && doman docs/man/*.1
-}
diff --git a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild b/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild
index 0b54f1e63720..6fdbdcf910e1 100644
--- a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
@@ -52,3 +52,11 @@ src_test() {
 	echo "$@"
 	"$@" || die
 }
+
+pkg_postinst () {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog ""
+		elog "Run \'git lfs install\' once for each user account manually."
+		elog "For more details see https://bugs.gentoo.org/show_bug.cgi?id=733372."
+	fi
+}
diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild
index 001d987aa95f..a48a6fe6e6c6 100644
--- a/dev-vcs/git-lfs/git-lfs-9999.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild
@@ -52,3 +52,11 @@ src_test() {
 	echo "$@"
 	"$@" || die
 }
+
+pkg_postinst () {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog ""
+		elog "Run \'git lfs install\' once for each user account manually."
+		elog "For more details see https://bugs.gentoo.org/show_bug.cgi?id=733372."
+	fi
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 9030ac869512..52eac14498ec 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -16,21 +16,25 @@ DIST git-2.24.3.tar.xz 5774192 BLAKE2B a8bea56f85a12863565325984a303ac2d964e0371
 DIST git-2.25.4.tar.xz 5880976 BLAKE2B a3ac79918ba174a93844d9518a2f1c6970abe2cd31acea260742d3c03a31a03131f53603a3bd3e525a60f8ebcfbbaa3b92228e2486717ca2d389a978e39bd5ec SHA512 ca2ecc561d06dbb393fe47d445f0d69423d114766d9bcc125ef1d6d37e350ad903c456540cea420c1a51635b750cde3901e4196f29ce95b315fda11270173450
 DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d7f0722d4dfefae830613b64b81faa41d5952400fa382b385d15d48829f8ee3b4d065e134bd38fa0e10bf570 SHA512 5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc
 DIST git-2.27.0.tar.xz 6074636 BLAKE2B 72c992ee35a50cdeb2363f04edfab65358216b8415f31f217b6e837d1f7bc28b90e49850006596a8f5f1932fd3011c4253df287d445dca58e335d2f6e7bab8c2 SHA512 8ddea44503db7caf1f6080e64555541aa64a7b8761fd6541965ee244d9c4a47befccda1a239f11d86c2ad0ff24923d084f65712f5f2d6cfa178573e3471c6c33
+DIST git-2.28.0.tar.xz 6117608 BLAKE2B 81c834dfda5b8e3065d098e411eb2408a1e7ccfde9c447a4164c131c9c2c32dcfd888980bcd180952435c05976a4fa18c155830432170deff70aa1aa2989cd2a SHA512 a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a
 DIST git-htmldocs-2.23.3.tar.xz 1295344 BLAKE2B 7a6d8198cf8285717f11731ea907ea06786c486701a729d071deedc5437a595dab355ae2d0ac2814b10503ab4161e76a1245663a9ce35ce48d03be9905315db3 SHA512 2c86c03f29f1a4fc2acb17a17a9e1a3df2ec95138895f5c8e776859772ebc7b95c24af0e328508ccf1ea85b7adaa86a9aedc4d0c353ffc91ad5810ecc9a48059
 DIST git-htmldocs-2.24.3.tar.xz 1307828 BLAKE2B 5d6dda03e2c51346326a1258a14a0ee16fab7fe83c80b4a1a0b307a6343db851d89b96afcf616e10ad5831352a90332ac602e5713444855327e11be8992a5274 SHA512 14289fb46cff48bece0cdafea9ef201facdb58eafce4b735ce50489356deb993c481ac1b6e96a2f98cfe30434280997c47f2cca0bdb2b6e85c31cb7cf17cc257
 DIST git-htmldocs-2.25.4.tar.xz 1296896 BLAKE2B 4f6469acdcd699698bd1f19bd0d911fd522c1890115f25c087a7870b855eb9354340fe17e9e6aaec7fb27cd951fe28cadbf26e1aeadc76f3c3a1cde4d23e42cd SHA512 e10c6fa52e213a2b18290fed375f6e176eef17b0a19f6906f09d6228d18bece88ff0ec97d871db0ba29fc0fbff73740312ab01eab809bd6a9a41c8b295cf8d67
 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2 SHA512 b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396
 DIST git-htmldocs-2.27.0.tar.xz 1325820 BLAKE2B a86cb62b6e42e451201a69e92c897566a78ed4965a98ef7b09f7c4674f60a334357ea8834ec5d97764f5f7e8fe580b8ac3af4da588b72a0e01f065adcd019aec SHA512 6af974ea6c8458f72c5fc7a372611e0153b705a85092a5fe37587a3165368712e077f582ce4085538f48df925d60898b96c32275182b7ef034711ab53e7ab811
+DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde SHA512 bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0
 DIST git-manpages-2.23.3.tar.xz 449464 BLAKE2B bfc0153e43724df7210110e836d47f17258e45a876aa9bf4604c3f38e690e0e5379d4394df96c3dd84ea4d7371b7843729e6fb5d4b43fd7d4a9b4c3f4062a922 SHA512 a7b5fc48a5b840eb9b668b441ad3c30f65adc73c22cda461ffaca1cfddf154bf1974cab6c372b4534fd45a43a2e2ab96513364845a7db4285b88e31bf7619f8e
 DIST git-manpages-2.24.3.tar.xz 454796 BLAKE2B b340b33593e596a7a87385110fea53a96b68f0b0c5c02e046a1aff5ff7c7a6bf3d7a55c4d33796db8e84824df72451ad51db9fc44df4840ecd0183c0ef49eba0 SHA512 22709e159196da27befc26eef3ab40dab9700c95abf6892860a81c8e5df7d85ad423c877e6c88949cfc611c4dfebd956f02a78f0340c1cd4d58c48f80e3e1cce
 DIST git-manpages-2.25.4.tar.xz 459344 BLAKE2B b0ac88f691984f39f6cfbf41d2d61ab443573974277536641daddf0e9b7755ea9cb6bc96ecf3c14479809036171e461eff72cb498c63a56eea041341b8a65af5 SHA512 a67b881f289d5b3e2187ad55c5176258c30108c73fc7c18d50c1a6b42b241ce46dba28acf2f7bfc994b044444a6678096a35ad60936ea6cba07b52ddf647da17
 DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f5596548f076f5fec5dfc6c752e8b3caa5f64ba182c1566b67878b19fbb115297e08def1bf9d2711c7334cbb8e1b20fc039a1 SHA512 9591e94683a6b49d8b9f2afddc826576023fdfa6de6db4af3a28a2af00b175d5be710d86a31d0f1b8320cc38b6f27698e17fb3e8c1f2b0c5ced37296ef1109b6
 DIST git-manpages-2.27.0.tar.xz 470724 BLAKE2B 83db9c5aaf9ada63d4e6146ffa4f20f1d21797ba7c7b27ade9d6f4dedb1091591b8afe4f368a4433cf75d2b148d68cec725f5504504c703eb7c22916d17b8069 SHA512 a4ceb7b86d67d15a52fec22e9bac5c8b1a5447041c3278710c2e24f70d6d443853d6a6ec5eb5ab7633390c5fa2494dd495096c26a6467d9cb13d9da007a73d12
+DIST git-manpages-2.28.0.tar.xz 472524 BLAKE2B 84752bee094eb879be8905dd561593e9f2a71d91971be7be83ed421bdeef83f7165f9506297bf23127a46a1d05c718999dab6b3ac3bda0ce0fba95ca64145de8 SHA512 ba4d41c2c2efd1eb5ab8ccf00efcebbc2fbbd31ab325da66b05181d15f677c2fc97c9eefd58c3b1c75a07276b399214f398df8d084c1a5092f982ce392876a2f
 EBUILD git-2.23.3.ebuild 19570 BLAKE2B 75aaef3ba36662b32abbfa30cd597265e7149a270c38188d790cbbaf64691ddbc192a3dd780e5e27c8b4bc5c2990d4278b49965f77a2bbbc7e8a4389c00b0de3 SHA512 73c26e4ba8d1b9be24d7c13eb69d1684050eb2de7be08ff32cf27769e2977897594a1cf1c7ce03262f5ed28db75bf4c6b175bc3274bc23bf560f8ba3a9423fc8
 EBUILD git-2.24.3.ebuild 19518 BLAKE2B 2a48be84a263f274d0f7c0384423ba5afbd4451145ab50bf3c61048a2443e98811b22217b47e4df15fb40745e1bec49ad648f195bdfc5eab138ec0c891db2fe6 SHA512 15a65e017b6c28610f10485f39f3012900281fec91272ab8189f56b72993befcd593459561ae0199f07ccb6bc65724feb2c9306342ed62564dad16b95324fdce
 EBUILD git-2.25.4.ebuild 19518 BLAKE2B 2a48be84a263f274d0f7c0384423ba5afbd4451145ab50bf3c61048a2443e98811b22217b47e4df15fb40745e1bec49ad648f195bdfc5eab138ec0c891db2fe6 SHA512 15a65e017b6c28610f10485f39f3012900281fec91272ab8189f56b72993befcd593459561ae0199f07ccb6bc65724feb2c9306342ed62564dad16b95324fdce
 EBUILD git-2.26.2.ebuild 19518 BLAKE2B 2a48be84a263f274d0f7c0384423ba5afbd4451145ab50bf3c61048a2443e98811b22217b47e4df15fb40745e1bec49ad648f195bdfc5eab138ec0c891db2fe6 SHA512 15a65e017b6c28610f10485f39f3012900281fec91272ab8189f56b72993befcd593459561ae0199f07ccb6bc65724feb2c9306342ed62564dad16b95324fdce
 EBUILD git-2.27.0.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
+EBUILD git-2.28.0.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
 EBUILD git-9999-r1.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
 EBUILD git-9999-r2.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
 EBUILD git-9999-r3.ebuild 19527 BLAKE2B 86f05fb5b4569a6e79ad9ed686bebe2ef2d0d119ae0061f87bb4cf291a17ea39a1c3c6241054769b89805a99ffe6dfe88612cd07418bb59ddb5aaf7899f1be9e SHA512 197d10c1f19c11b4a1e46114480a4c8773c664ea9bb05dac3567e43627c0e52750616dda16d22aa43238ed8b852b5eccd35c7e71532c0dd448ecf15e1a7475ee
diff --git a/dev-vcs/git/git-2.28.0.ebuild b/dev-vcs/git/git-2.28.0.ebuild
new file mode 100644
index 000000000000..35ba555d64a9
--- /dev/null
+++ b/dev-vcs/git/git-2.28.0.ebuild
@@ -0,0 +1,728 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( >=app-editors/emacs-23.1:* )
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="${BDEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex perforce '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads '' NO_PTHREADS=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# For svn-fe
+	extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') )
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=( -lpcre2-8 )
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=( -lpcre )
+		fi
+	fi
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=(
+#			NO_MMAP=YesPlease
+#			NO_IPV6=YesPlease
+#			NO_STRLCPY=YesPlease
+#			NO_MEMMEM=YesPlease
+#			NO_MKDTEMP=YesPlease
+#			NO_MKSTEMPS=YesPlease
+#		)
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=( NO_NSEC=YesPlease )
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=( NO_FNMATCH_CASEFOLD=YesPlease )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	if [[ "${CHOST}" == *-uclibc* ]] ; then
+		myopts+=( NO_NSEC=YesPlease )
+		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
+	fi
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=()
+		use nls && use !elibc_glibc && nlsiconv+=( -lintl )
+		use iconv && use !elibc_glibc && nlsiconv+=( -liconv )
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \
+			|| die "emake svn-fe failed"
+		if use doc ; then
+			# svn-fe.1 requires the full USE=doc dependency stack
+			git_emake svn-fe.1 \
+				|| die "emake svn-fe.1 failed"
+			git_emake svn-fe.html \
+				|| die "svn-fe.html failed"
+		fi
+		popd &>/dev/null || die
+	fi
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake install || die "Failed to emake install for git-subtree"
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	if use subversion ; then
+		pushd contrib/svn-fe &>/dev/null || die
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			# Do not move svn-fe.1 outside USE=doc!
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if test -d "${d}" ; then find "${d}" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ ${cvs} -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+	elog "completion."
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest
index 8295b473bb20..342b5c682bce 100644
--- a/dev-vcs/hg-evolve/Manifest
+++ b/dev-vcs/hg-evolve/Manifest
@@ -1,3 +1,3 @@
-DIST hg-evolve-10.0.0.tar.gz 808587 BLAKE2B ec6c5f3edf8967df9556413326d2dc66830461c65a4697963513429aeb601999461012ec19a17ed8ba0d88a7fcf9ef41749428b71819e99a39b261d6d2541157 SHA512 4c88af31584d61df7fe397015e185d0191a021f89a23630b6d71ead5acb233f4b71638f3637e12e1d04b03fb79f127a754eeac0e85ab2b8d045665645d528d13
-EBUILD hg-evolve-10.0.0.ebuild 764 BLAKE2B dad3a999e0f5a439a5a79fe42d2ef6e86672ece4b76e60c2ea42fe868002c07cce75c4837e3a6440d0df50c870689b1e91057a0e9af9247fbb21bfd053807a0a SHA512 41bb97620a8908b0e6c3d3cf5688e20a91990789fc796069cf08f9f5c2ddaf49271e2a22e646e4f0098ba58b328d38182db9368126c474abb8bdf840a5e3a502
-MISC metadata.xml 395 BLAKE2B a61ed69918c8861a242c5add3e383902abb25cd10dc6f74b59a8e02fef50fa5a4da459494f3ac720989ada3ca730bbeeecb34d412129a191b210639b0473bcd9 SHA512 1676e93039dcb739017c0c119376b9c93e8cd1f7ae3a31c48e5eb6aa2ec92662bc7b5a834c00ecfe689408f27169559eb84e8e48a004e1f87e1eb59bfbbd7d16
+DIST hg-evolve-10.0.1.tar.gz 810363 BLAKE2B 8d9de203262a90a37120f2a0fd4ec29352719f8aca6ca91138a5efa99087ec0084d4ed8b1f828f6df49dd93d2c3d3327119e8f4f17815e5fd1022af6b7a1f803 SHA512 0ab0d64962671f2a107a0b5d56d3c8ec3d29325ac425ee109c1e08d899c1c4124af5676deb60bb4e82f9786474c47f587fec267e27b741b9f73ab18fc473ecc6
+EBUILD hg-evolve-10.0.1.ebuild 764 BLAKE2B dad3a999e0f5a439a5a79fe42d2ef6e86672ece4b76e60c2ea42fe868002c07cce75c4837e3a6440d0df50c870689b1e91057a0e9af9247fbb21bfd053807a0a SHA512 41bb97620a8908b0e6c3d3cf5688e20a91990789fc796069cf08f9f5c2ddaf49271e2a22e646e4f0098ba58b328d38182db9368126c474abb8bdf840a5e3a502
+MISC metadata.xml 287 BLAKE2B 62f44642d7581105c39d8f7ce9a9e7463e14605c8b9229074ed1d9537448d07999bdc8f29ed6d635625d628d54b4656e12ca9c5f0e9c61a9cad999ba3f1cb432 SHA512 51c3ee1aeeaa5bdb8d990cbec310842a8f7901087a99384a87cedcf764cc813cbec83d822d6dfe62803cff9792aef1d718dbb8eb8537eae46c5eb5bdad119fbf
diff --git a/dev-vcs/hg-evolve/hg-evolve-10.0.0.ebuild b/dev-vcs/hg-evolve/hg-evolve-10.0.1.ebuild
index 6ac77b0d8610..6ac77b0d8610 100644
--- a/dev-vcs/hg-evolve/hg-evolve-10.0.0.ebuild
+++ b/dev-vcs/hg-evolve/hg-evolve-10.0.1.ebuild
diff --git a/dev-vcs/hg-evolve/metadata.xml b/dev-vcs/hg-evolve/metadata.xml
index 45ada20997e4..e4ba92d94778 100644
--- a/dev-vcs/hg-evolve/metadata.xml
+++ b/dev-vcs/hg-evolve/metadata.xml
@@ -4,9 +4,6 @@
 	<maintainer type="person">
 		<email>cedk@gentoo.org</email>
 	</maintainer>
-	<longdescription lang="en">
-		This package supplies the evolve extension for Mercurial
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">hg-evolve</remote-id>
 	</upstream>
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 2bff4750f25e..130e84d63cd9 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -3,5 +3,5 @@ DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c3
 DIST hg-git-0.9.0a1.tar.bz2 128165 BLAKE2B dfe415a26554d6de714b64aa79f771e08f2c7ac02ee42732524b85a6572003bd428ea29823774d5ea4fa0eee251629bcbc78d9421773c312925a0114e51098ff SHA512 43119bacd4bfc169c8403b3d67e14609ada454a7635c50af5db3683ccd36e1d3be2ec0896204f0850b0cb0c09ded24ae723ad3eb6ddc381553f8c2b2ff2c84a1
 EBUILD hg-git-0.8.13.ebuild 704 BLAKE2B d7d392beca63439af85f5e862c79e01487798d56d1958d15af5df7aa0a0fd4720cc29528b9eec17507c2862318b86e8184598d7beca0802362fd186a83085f0a SHA512 fca80ff4da4219162f8caa1af56a6b982081198a69d2663bdd97f560a869191162b0dc93320be763c9872f28cefa2d85d1c8ab57b57b6c1f63658fbc18605819
 EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2
-EBUILD hg-git-0.9.0_rc1.ebuild 812 BLAKE2B a557f0fa65ff915134724c71e56ad8e11eeaebb8bad0340bfa6310a88e9a489eb34efc48602d24a37bb4126fcb0956c5a77fe0764d70536035cf9f23d50a0876 SHA512 093127093bf151ec78792a13db12a8c1aba3f9140ad5d65a7aefef6aa6c42271fa6fbb70e34376d87e0de2312660ebdedb167acdb65aef36b410c06b0ff355d2
+EBUILD hg-git-0.9.0_rc1.ebuild 810 BLAKE2B 075e8622820d3d0f7e2f1ea07f568c1e81b4718f4e0e3d19bfbd214f96ac41c93242351542bc2edbd201567c6f849d7e64f6187de76be866ad14f6682b0e18d5 SHA512 2516ff8415ceb5bf9022ccad3eeb592a3288a4797a84cb5cd18b56e641bdd9cd7fd012e6034ae0d6ef2414d8dc97c386d19af0d9b687305c2dc3ac526993936f
 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09
diff --git a/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild b/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild
index 5db03cc9263d..e369cbc472b7 100644
--- a/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 519908726400..2cafcaeaf3c3 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -2,9 +2,9 @@ AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
 DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
 DIST mercurial-5.3.2.tar.gz 7514256 BLAKE2B 250ecd5c0a64138cbcda599513efba7b040c0fed0f020c73ade2525e0ef8a9ad06c10c5df4e16eb9bbeb3ab0f2cbb622a65f6d4827b269654c662810ef0385fb SHA512 b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99
-DIST mercurial-5.4.1.tar.gz 7725893 BLAKE2B 3205647b4a8d14ad6d02d7494d3f41b0a6d306ef039ebbcd2f62ca1f00f4a870794de968edafc9379e4e29c59da0aa4c92308facdf8f151f390ed7309782c3c5 SHA512 6173853c38f0aba59d2e29bec7da1c384c27a6004d5d00d1aee70571155122e07514fe6e56cecfdae48ec5f670823a2e6a5c9c8a36dd7041def2b8956fd35703
-EBUILD mercurial-5.2.2-r1.ebuild 4255 BLAKE2B 5c5674ed8531f928586ce757e427d993b807fd60a468cbcd20dd7808887ce08a2bc3895998defc5b710811d5da879f2f988206a77f864d2b3e30ed4656ccf494 SHA512 3f2a17bf0cfa8ab76402ffb5f125b6e8f1de461a86be0ba6ea4d59f0a9f0437118358257f29a9b05adf8101f9094764f1ce4440cb2a75f82da0ffaa837078f76
-EBUILD mercurial-5.3.2.ebuild 4262 BLAKE2B 33d5f02a567bc2ad2e408e128fc086f0cf677c43505a91a6a2cf09839bf9cf3746d066a92f53b88749f9d113e77ca7489fb4cf3b66d4a9786439c3d31b5385b7 SHA512 18bea024806a77d0c6b24c23ed87bb1de4831066abe55d6f0b385d7cf39a276399dd89400ae6b6988a70b31f4190d97b4548610c82693713264979f8d022bbc0
-EBUILD mercurial-5.4.1.ebuild 4069 BLAKE2B 29c243c2ec8289596271a0555f40cf8c3740f372279a0586cda67b8ddaf6e9d294c7b18cd777557283b0cb448d601577c2c203230d24ccd5b4c6ba1fbc9683a0 SHA512 20606c5a0b4f29e688c465954917ed7c72c51c410a5ab948262e34d9056a792aef952a611bd0da3e005579f0c73306092feb4b0c5dc80ea31c577a1ce7d318bd
+DIST mercurial-5.4.2.tar.gz 7730738 BLAKE2B 689a50e1675f678436bb805a5de1379646943f865734a85ef39187f4d90007125c33d6f8dfa6256510fc4214c82153060c671c601fe4b7810f1df77f5b542ed2 SHA512 92d730e330dcf333b2c8f6b784582e3a639759bcad594ac06b4e92f567a70c6938e33a3c322286d6b3ccccaedb634ad3febd2cf927702b3826013a76af2a9c15
+EBUILD mercurial-5.2.2-r1.ebuild 4058 BLAKE2B 34042ced46f70b449bd2b5227a6b75189fed424a0ebbe5a89aafe5fe333ad69d4fd9be38408839540a31fcc6f88bc57b9c8e6a1d9b0467a21e362df1a1c37742 SHA512 7d7d5bd4c6883256c5a5554ac31134b5bb4f78b28cbc84711a6ce70852419c9e1924cf05facc793ec0a6813bf5b6570436e30f41391873cf8e8ea272e095b3e2
+EBUILD mercurial-5.3.2.ebuild 4065 BLAKE2B fdb792f9fa429c7e2a28eed69108307ff3e90842c11a7814b2d73081170201cde11105f688dc1b3b5b561111a490f8854dcdc07bb54c450dc08dc9735378f91d SHA512 db9fd1d352cfec13b4fc5686b1d8f7e7dce992d9424a064a6f7db81c5c769d18c088fca40cc661614e6a5cc127f57bbbdc54bd756dd0c3d327ce6e76017a0b90
+EBUILD mercurial-5.4.2.ebuild 4069 BLAKE2B 29c243c2ec8289596271a0555f40cf8c3740f372279a0586cda67b8ddaf6e9d294c7b18cd777557283b0cb448d601577c2c203230d24ccd5b4c6ba1fbc9683a0 SHA512 20606c5a0b4f29e688c465954917ed7c72c51c410a5ab948262e34d9056a792aef952a611bd0da3e005579f0c73306092feb4b0c5dc80ea31c577a1ce7d318bd
 EBUILD mercurial-9999.ebuild 4032 BLAKE2B 802015b5f8f386bf38d7397aec896b4ae0557b6096295dd103adb29c75fad955e280d90032ecb8f28686fe7b7f69faa523775ce19b770c43dac17378db8ee451 SHA512 1c5cad662f4482fa1ec1f25824f367b72fd9e2a3b79b058ef852c3a30ef1a974aecdd39d0e8da19aedf7d7a92f3ac49c718d200b1699e106c685d448efe8f250
 MISC metadata.xml 483 BLAKE2B f81d3e855c41f0f5bef819cf4fbb537591f187917c76b5d153f9bf5f4cc14959c5aeef17ec9e5a0596d8e6bd2d8db0ad86dd4dea5ddfdd44a4c063acdc6a8a81 SHA512 3132d4cf6a2ba22ee8f93aef8de590bd576143dd80f56d515afb14cd5962899c0dfc4aee8552f041bac77b997055b2b407bad104591286be985de839f159fc83
diff --git a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
index b44d17881df0..79871f6f4a18 100644
--- a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
@@ -17,16 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk zsh-completion"
 
-BROKEN_PYTHON="
-	!~dev-python/python-3.5.0
-	!~dev-python/python-3.5.1
-	!~dev-python/python-3.5.2
-	!~dev-python/python-3.6.0
-	!~dev-python/python-3.6.1"
-
-BDEPEND="${BROKEN_PYTHON}"
-
-RDEPEND="${BROKEN_PYTHON}
+RDEPEND="
 	app-misc/ca-certificates
 	dev-python/zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/mercurial/mercurial-5.3.2.ebuild b/dev-vcs/mercurial/mercurial-5.3.2.ebuild
index 54d98257aa1b..aaa1c5c47161 100644
--- a/dev-vcs/mercurial/mercurial-5.3.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.3.2.ebuild
@@ -17,16 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk zsh-completion"
 
-BROKEN_PYTHON="
-	!~dev-python/python-3.5.0
-	!~dev-python/python-3.5.1
-	!~dev-python/python-3.5.2
-	!~dev-python/python-3.6.0
-	!~dev-python/python-3.6.1"
-
-BDEPEND="${BROKEN_PYTHON}"
-
-RDEPEND="${BROKEN_PYTHON}
+RDEPEND="
 	app-misc/ca-certificates
 	dev-python/zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/mercurial/mercurial-5.4.1.ebuild b/dev-vcs/mercurial/mercurial-5.4.2.ebuild
index 904d75ce7a99..904d75ce7a99 100644
--- a/dev-vcs/mercurial/mercurial-5.4.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.4.2.ebuild
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index c39f414efcd5..0df78ff1a3c4 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,9 +1,7 @@
-DIST repo-1.26 29829 BLAKE2B c5dc74214d404e6c11189a3d34c9a771ed5689da14e64588b5db144b6ea3ec38a727238d7dc6e609a22edb5b84d350210564615016f6b36599cf9e3fc3b34ef9 SHA512 1398fab95b4fb4a24fda93d4054384a801b5b70e3dca3a794f458d8e19582ef833ef5a3a0f3a571121d2d9172ce0e70f8b3c6719f6c2f47643ffe6de181e34b4
 DIST repo-1.27 29945 BLAKE2B 930fa876b8889d64c8d12444f4cd59bebbdf9848d455e114fc9306922d931aa721320db65a07c38f705c39950538a1d5ae5ca66e359d2f2e38061d144ac11cb2 SHA512 a9f651e5fd1da1c74b31aebf32d03cf868183fa529eaf2b079015f9e778a2bb7c1ef49e06564703534c45fa1bd7bc5bd3d91a91477c336e549c1208afa74ace6
-DIST repo-2.4 35152 BLAKE2B a069c095524574ee4a7d18cc5cd023f6d71b9ed9b57941180a6ec3ab3c33b2ed18b5dfc7d225a7bc849b7ebfd28bc0e672f7796eb2bb37af0685539c850cfe34 SHA512 46d7b8f699246ad625d5eb714791c29b949c40793343ba56681554040dc1d6a0a5f049e8d96f1e12ca93d77291e95ffd756f76554ebc1062f9cf6fc014aa116a
 DIST repo-2.5 38761 BLAKE2B 26d002bb7e5a24dc958bb4e0653c2cc260b2766d81fd55edf9a0373542365ed89a224805293383e2c16d8fc331038b265d3b2aca3a9a637d893f4a9c8221ce76 SHA512 36e515241fd9705c63beaf662309dc2ab6406552ba845fe020c878ac82e7eb7e1cd73924a076cf5fe4800ea70919bb5ad5d2d43566d5b0a559f81a45f9a58fe8
-EBUILD repo-1.26.ebuild 833 BLAKE2B d72c019f5e48b45f1129b6947f1823cd750d3fcc693efcbaf4ad7be2dfe41f36fdd1fb9fdbe9893b13dc6b7e8ffcbfa82c3747689f3b5ec5ac960777fe1cf2ba SHA512 5ab0f30d198d4e6225f576a348f12eef8f1485272223052311795f214d80a95db1d5f4fafebb22ef53cf8e0d775ed4703d43d8c3c30a28bff35e9979590ce640
+DIST repo-2.8 39134 BLAKE2B af52a2c06e09de83100cb297d585f89bcbe85d6e9e5c358024a371ee4d47c59992745d1088b164fc670cdd9db7394a5f3521967e3eb80840c53993af8b0172b1 SHA512 6d577fce34eb298035a7b98c24fc21521c8c9efbdf02abc37af8a54552893ecf8cdce2db5efbc5398d7f99226408f6cc9ce2f81c2961d9d5dd21fb0264194431
 EBUILD repo-1.27.ebuild 823 BLAKE2B 159755dc5fdb25fae05fa1026c3f19ccd4b93a412d6b425a541a4c6f794c7f5922d6ead911177f55ea8e298555b82447668f7439724a12647dabeeb2e8794ea8 SHA512 638ae406a07fae698242a91e4d2aad5fc723fa2236a90c914e30064f018abe4f06a4be832c88148e49eb256c6d73f6a9c961696720afbff92a09f919c37aeb1b
-EBUILD repo-2.4.ebuild 853 BLAKE2B 5123c3b627a65cf07ab9586308676a9c3edb1b5037525d6b2af702203b4223676ebf5a018239d6655aae90c2daef1358995a490b37a0c67bda6e66c000907ae0 SHA512 b5862ce4158e106a6a21138371b5471f6f70bc5844b074de0f1334daf3183238df0d81784afc448c403cdbb027ce240948c0743d9e39a2c19f053112bf578883
-EBUILD repo-2.5.ebuild 859 BLAKE2B 71c1c64a6ea18200b81a0cdd1877179f7cb5427b2e865b562a054f667782bbfd62dec4f054716693269902fb3162c9d4f9b2ad28447c4dfeb36084131432844c SHA512 a7d0f642a33d0c19d8e44ab77ab74cf9d4f913c33ce21422f08e3818ff1543dcee5c7d507063f8f9f53d1d84c865573d3e0c383ffb0f11303d4f2a0b45fe5d00
+EBUILD repo-2.5.ebuild 853 BLAKE2B 5123c3b627a65cf07ab9586308676a9c3edb1b5037525d6b2af702203b4223676ebf5a018239d6655aae90c2daef1358995a490b37a0c67bda6e66c000907ae0 SHA512 b5862ce4158e106a6a21138371b5471f6f70bc5844b074de0f1334daf3183238df0d81784afc448c403cdbb027ce240948c0743d9e39a2c19f053112bf578883
+EBUILD repo-2.8.ebuild 859 BLAKE2B fe8ad85ef67acc2ecfa5ab5a4f84ce25d5b71efda9dd5ebf5d1888e0adb0074ccb5fc5cf374e4adfcd3cd1349bb74fea53f8aeaad087f315f98004720b56b0c4 SHA512 8c12b6b3350b182241dd8b82890a3966dd99938aa344f0df3833df41ec532d09812f0f4b6dddbabcc26abb32cf567b1206a1c0ae74efa288b92e3afdeaefcb86
 MISC metadata.xml 338 BLAKE2B 49e4b3e3767754bb7a0661cb388f3e18b372fa713d0e3b92c742cddb2fe21e384b1689fd72b23865d7b363ab01bae90a5a11956593eccc915f1b6c99e52c2718 SHA512 0a83263d882281636f6925d20c9e8b991267a1b7d73d7bd6e545c77372424fd602e28d6c9a82668d0a73500bcb8dd8287f7891b66e3fe1517907001f3fb43cd4
diff --git a/dev-vcs/repo/repo-1.26.ebuild b/dev-vcs/repo/repo-1.26.ebuild
deleted file mode 100644
index 01c4dd2015d8..000000000000
--- a/dev-vcs/repo/repo-1.26.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The $PV tracks the *repo launcher version*, not the last signed release
-# of the repo project.  They are confusingly different currently.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit python-r1
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo"
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!app-admin/radmind
-	!dev-util/repo"
-
-S=${WORKDIR}
-
-src_install() {
-	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
-}
diff --git a/dev-vcs/repo/repo-2.5.ebuild b/dev-vcs/repo/repo-2.5.ebuild
index 5664a3767c19..a2713bffea7f 100644
--- a/dev-vcs/repo/repo-2.5.ebuild
+++ b/dev-vcs/repo/repo-2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/repo/repo-2.4.ebuild b/dev-vcs/repo/repo-2.8.ebuild
index a2713bffea7f..544acae9a81b 100644
--- a/dev-vcs/repo/repo-2.4.ebuild
+++ b/dev-vcs/repo/repo-2.8.ebuild
@@ -7,7 +7,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit python-r1
 
@@ -17,7 +17,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 580ec9f30944..bc377fc9b0a3 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,6 +1,8 @@
 AUX stgit-0.16-man-linkfix.patch 429 BLAKE2B 11cd98b7a58a55fed445be700bc492a4fd926b9bac20a54e095b9c9470d6294a4c32800622b42e87ff10908a40a2bf71e8e139dc306ade3b4989c10609dcceaa SHA512 c71e32a6e6b007ebbbe738dae93bf2109d2be1ed3f3418c98c6ff6ebb602fb8523f974160276649bb66745340d752d69e87c9f0730ca3dd595a6b2b32a0104df
 DIST stgit-0.21.tar.gz 319605 BLAKE2B 92bb879d8b8804c8a1b2ca8038d010a0b5118970a4482d87d6bc295992849511c33acb46f376034af6609d42c0323d692bff0ea9bf217cc860e53915fb3c982e SHA512 394c2b30596819f1376bd7432be6923a8dad73f58f049022fe64d1520fd75418665af8069aac98843df051f7fbefbb367762ad4ba57f13bf747819035c7d63ee
 DIST stgit-0.22.tar.gz 308815 BLAKE2B 46c6214012b8d6973273bec716b1ffdafde3ea17930da94de0f73e91e8753fc7ce1d890964c8fac1d32e6343f86e54057b732414fb187b5c9f50e2fa581e6321 SHA512 bfef074b952e01d9041a4ed5dfc6786c29ebb4b09a424ca09e9131ad21c418c4d79ec13eb908f5e8b015ebbc709aacb13824a1c9cad6d97e018a166b014c5e6f
+DIST stgit-0.23.tar.gz 303836 BLAKE2B 018e0caf74a3c449a71362e3694b2ddf030f5ee23e3212a98b378b7118bae9fd15d0e4ab2a2a746a12b34e46aa2edb86657a4a7125f3c5ca8aa0142fe3d73534 SHA512 b3c9b5c0833cb7e5137faf0df48af6a11b9508b994cdf55b587567d1c146fd4ae29e7beb6d1a34b3f87e5b3854af035dd7e5ca35338c20740e91da7b47c4568d
 EBUILD stgit-0.21.ebuild 1883 BLAKE2B aedcb46f09e670914d19905483f6974b36196a9d746490a9368376d06d83786754b96513ade7df8203e02286745135e8a127d7bed043f5ecd8ca84620eb50528 SHA512 f1f2a8a7ec098783ccf6061eb51a38e47adac3f5c66b473c7f8b886306951eb5f5efc6455c4460278b590ae70976a8d376ccda34be886c5cedb335cdd02d3d30
 EBUILD stgit-0.22.ebuild 1889 BLAKE2B 87652129693e5648f177bb6412fdc45d7414237f636660a9f5ad22f167626bb64e773a14ef58b0d7b66332ec24974dded6060ecf9e22384926a9396ee3ae6352 SHA512 351e7a3389ead3b879b7fa5667559c2974c08111b371291b9866590e0a90f48e18f341a4667c5157ee280af9c6e0d26663b1e0f3d17bda072b5766d591f25f81
+EBUILD stgit-0.23.ebuild 1832 BLAKE2B 0432ac276ff9f7b665131bec96025df4e9324df0f9d65e15666d9e8232148f2ecc4d3b031a98ee07c803326097e821daa1fe853a9f91ac8ed2f1e7a2d286826e SHA512 f63a40017151485c617866e27196a883423d519c6e1f931a5fe9a45e44bd0dae2069930b0d5806a2a174fc1d53a42d5c66b71cba557c384df720d7c8f74df812
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/dev-vcs/stgit/stgit-0.23.ebuild b/dev-vcs/stgit/stgit-0.23.ebuild
new file mode 100644
index 000000000000..a700e23fc3bc
--- /dev/null
+++ b/dev-vcs/stgit/stgit-0.23.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Manage a stack of patches using GIT as a backend"
+HOMEPAGE="http://www.procode.org/stgit/"
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${UPSTREAM_PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=">=dev-vcs/git-1.6.3.3"
+
+# NOTE: It seems to be quite important which asciidoc version to use.
+# So keep an eye on it for the future.
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)"
+
+pkg_setup() {
+	if ! use doc; then
+		echo
+		ewarn "Manpages will not be built and installed."
+		ewarn "Enable the 'doc' useflag, if you want them."
+		echo
+	fi
+}
+
+python_prepare_all() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && \
+		eapply "${WORKDIR}"/patches-upstream
+
+	# this will be a noop, as we are working with a tarball,
+	# but throws git errors --> just get rid of it
+	echo "version=\"${PV}\"" > "${S}"/stgit/builtin_version.py
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	# bug 526468
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+			mandir="${EPREFIX}/usr/share/man/" \
+			doc
+	fi
+}
+
+src_install() {
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+			mandir="${EPREFIX}/usr/share/man/" \
+			install-doc install-html
+	fi
+
+	distutils-r1_src_install
+
+	newbashcomp completion/stgit.bash 'stg'
+}
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index 5b4afd380148..ddfffdcc0e15 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,11 +1,5 @@
 AUX tig-2.5.1-bash-completion-qa-warning.patch 431 BLAKE2B 9a636eba13852ff8ae591b97202efda7b3e2de171903ab423914c20987e42d129adbd19fa9d3297e70ad8d8a64774210424cc01c56fb6b864bbcc716e984a874 SHA512 d56c76d1cb31db29fdf756350b7933220c9312d3e80e55abe7e44505b2e844b4609ca8966e1323205682a2ec090279445da5eacc51ee1a17d39ceff2c34b0254
-DIST tig-2.3.3.tar.gz 1082818 BLAKE2B 0e9bcd02726b004c233a5efd7f58e4fda478dc1d2b738a7f8c086a3d71807d319ac8bd296b0f7c7569ed69a5b2b1db18e5c957cc5ce890a67b8f6ee7ead29551 SHA512 1d1cdf7184eeb3fea301c1959023f4aa97c4f8e25fc96cd61933ca39cf7549b6c7e1d9517f7ffd45d212ae9542ea4be07370b41c623cf6d0db8d025634b1d6d1
-DIST tig-2.4.1.tar.gz 1181900 BLAKE2B 85bb76008e5c10e94d97ac4cd88ac4eb2a0675ef5b45e9f21a9d2219cf0b6ed55ce52b579b831bc6c6fc530c89fb99f5dfd1f62dab3e1ab329e132707dccf908 SHA512 516114ed267a9459e356ca1af35c9eba521f9a11e9462cc5120cc7ea8fba4e54ea0a2e8e0ab96263754d6516354c296df541f8e3642392eaeb205cd88428077c
-DIST tig-2.5.0.tar.gz 1143004 BLAKE2B 77ccb2e754335f2ceaf26f1885cbca093d811ca479ef21fed532e43aab710fccfab85f1b5944273f53d9ed5ab0a5917392129c5d96f2c3c20d5da5029367b308 SHA512 26736fe241dd2dac25d5133ed847a7c1dab4bfeaad83af2effc8e523f8c6d8c179fe3ff05cd4343e4b1048c3c50309908aa32e81dd0789e35afe9bd8ff8772ee
 DIST tig-2.5.1.tar.gz 1144666 BLAKE2B f8e96b1e27286ebebd3e3f374b28ed31a69b10bab1e831068341a430c36418d6a412b29caa3a44e3fafb3131d93b6d8d62ade4c92dc06fe753f040957b9e64e6 SHA512 e7c27a1e6357ce3cb4c02ff409d40c0ca67d10875eedbf467b9a280d8433cca15d16860256637041003384e7c536aca743ce971e623d3000dceeda598d6d3ae0
-EBUILD tig-2.3.3.ebuild 1302 BLAKE2B b152cfae3f3189e903484e21deaa1fc74206f4d17eee61612f15f5d3cdc0706ca6f4d952a8dd38ddd3005951d60054642a1c2633cae9e44b01744efe86699d45 SHA512 3294e1da6a32b6fe39c0f42c3b6ebae5baee8c14b7392f2011c997a16974e075f12e835a0c2e5b8f00583c90778ddcd34327ec4528f975cb372c4f49549032aa
-EBUILD tig-2.4.1.ebuild 1302 BLAKE2B b152cfae3f3189e903484e21deaa1fc74206f4d17eee61612f15f5d3cdc0706ca6f4d952a8dd38ddd3005951d60054642a1c2633cae9e44b01744efe86699d45 SHA512 3294e1da6a32b6fe39c0f42c3b6ebae5baee8c14b7392f2011c997a16974e075f12e835a0c2e5b8f00583c90778ddcd34327ec4528f975cb372c4f49549032aa
-EBUILD tig-2.5.0.ebuild 1306 BLAKE2B fe34155092cae964273fdee4ccb88c8e8f10098a34874e441ca99a6def417b1cb01ba0a4103f0cb72ce799d068996aea50e4792f4f9e4171574f5e71e54a20fc SHA512 aac678d0889cf4893aec2f3b16f8fd8a85c2d6600d58fa276672b630898a6977cc48a07cf700092d691f2000c36ff085060e00d14f30bd2219aad136c43c11b5
-EBUILD tig-2.5.1.ebuild 1377 BLAKE2B 8bbb81efefcfe75492a75ab9543580259ec7a4d2a347cf8b4514a805cb5ebc029d8b3d38b161c166a6cc43d24b9b3bd75e056e030213487ee62825dd0d493ce8 SHA512 28bd08764a36617f60206b85778728b730e29aaf828722a5cfa1a02e649f3c29a012157f100b6831e798834f1b7a0c99ea416b0e21f18c537f0685e3d94d7e5a
+EBUILD tig-2.5.1.ebuild 1372 BLAKE2B 0a31720dc4864c4979dc0102e9c8de37fea9fc688f6a07e2584d3795a88c55ff5b22f51def8cd2a4b21dd2b0ca456fc5cb643e15a22b481a5f3f710243e9a69b SHA512 c5706dd7547e0a5e428a0f02644454c24354230d87589e6f19d49518922c43d4a3b8aa52625bcc6b289b2782c324ef23e482b182cd4e2ca633284d5d012aa5e0
 EBUILD tig-9999.ebuild 1306 BLAKE2B fe34155092cae964273fdee4ccb88c8e8f10098a34874e441ca99a6def417b1cb01ba0a4103f0cb72ce799d068996aea50e4792f4f9e4171574f5e71e54a20fc SHA512 aac678d0889cf4893aec2f3b16f8fd8a85c2d6600d58fa276672b630898a6977cc48a07cf700092d691f2000c36ff085060e00d14f30bd2219aad136c43c11b5
 MISC metadata.xml 716 BLAKE2B 646f183cc6cc5110a69304f5343a0f1dcc9f42c82d8e16d0a06102b8052589d92bfffee948c78d2d4ce0ae6f29f1df38ae034c6fa160471823bb4457bcfa6603 SHA512 ae1521940d81aa080326f070b79a8a0a01b2ec1406088695e1e8462cdd78ce046131f9542c878ab5f919fa75e3c91aff0739a12511d18693ae050183db10343d
diff --git a/dev-vcs/tig/tig-2.3.3.ebuild b/dev-vcs/tig/tig-2.3.3.ebuild
deleted file mode 100644
index a30633ee366e..000000000000
--- a/dev-vcs/tig/tig-2.3.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jonas/tig.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-
-DESCRIPTION="text mode interface for git"
-HOMEPAGE="https://jonas.github.io/tig/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test unicode"
-REQUIRED_USE="test? ( unicode )"
-
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
-
-# encoding/env issues
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with unicode ncursesw)
-}
-
-src_compile() {
-	emake V=1
-	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
-}
-
-src_test() {
-	# workaround parallel test failures
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-doc-man
-	dodoc doc/manual.html README.html NEWS.html
-	newbashcomp contrib/tig-completion.bash ${PN}
-
-	docinto examples
-	dodoc contrib/*.tigrc
-}
diff --git a/dev-vcs/tig/tig-2.4.1.ebuild b/dev-vcs/tig/tig-2.4.1.ebuild
deleted file mode 100644
index a30633ee366e..000000000000
--- a/dev-vcs/tig/tig-2.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jonas/tig.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-
-DESCRIPTION="text mode interface for git"
-HOMEPAGE="https://jonas.github.io/tig/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test unicode"
-REQUIRED_USE="test? ( unicode )"
-
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
-
-# encoding/env issues
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with unicode ncursesw)
-}
-
-src_compile() {
-	emake V=1
-	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
-}
-
-src_test() {
-	# workaround parallel test failures
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-doc-man
-	dodoc doc/manual.html README.html NEWS.html
-	newbashcomp contrib/tig-completion.bash ${PN}
-
-	docinto examples
-	dodoc contrib/*.tigrc
-}
diff --git a/dev-vcs/tig/tig-2.5.0.ebuild b/dev-vcs/tig/tig-2.5.0.ebuild
deleted file mode 100644
index 9b2134288a37..000000000000
--- a/dev-vcs/tig/tig-2.5.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jonas/tig.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-
-DESCRIPTION="text mode interface for git"
-HOMEPAGE="https://jonas.github.io/tig/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test unicode"
-REQUIRED_USE="test? ( unicode )"
-
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
-
-# encoding/env issues
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with unicode ncursesw)
-}
-
-src_compile() {
-	emake V=1
-	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
-}
-
-src_test() {
-	# workaround parallel test failures
-	emake -j1 test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-doc-man
-	dodoc doc/manual.html README.html NEWS.html
-	newbashcomp contrib/tig-completion.bash ${PN}
-
-	docinto examples
-	dodoc contrib/*.tigrc
-}
diff --git a/dev-vcs/tig/tig-2.5.1.ebuild b/dev-vcs/tig/tig-2.5.1.ebuild
index a35315645636..41544b59209a 100644
--- a/dev-vcs/tig/tig-2.5.1.ebuild
+++ b/dev-vcs/tig/tig-2.5.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 fi
 
 DESCRIPTION="text mode interface for git"
diff --git a/dev-vcs/tkcvs/Manifest b/dev-vcs/tkcvs/Manifest
index 49550a9edbd9..0b3f6897cdb8 100644
--- a/dev-vcs/tkcvs/Manifest
+++ b/dev-vcs/tkcvs/Manifest
@@ -1,3 +1,5 @@
 DIST tkcvs-8.2.3.tar.gz 570910 BLAKE2B e612fb2fa01ad0205973eef48eaa6c11677d3aec8f1a5344b1d1719aafde79e830f550f990a7bceb8063edb530de807b7878937015bcd0175aef038031663bb0 SHA512 42fb03acf6367e02f6f7b3e1ad66232be4825f152b3e4d123080e0ce7d2f53b5eacb71ac95fbc15224fb4c4c2cae979b612dbb11d0cd0b8fc4a0222a8cd40c8a
+DIST tkcvs_9.3.2.tar.gz 614022 BLAKE2B dfea4c4f9cca6929b1298c73f2e446f6421a9c07a6878fd5990b55f5ee7936d5bb73fdcc3668a60bfb06c3f20353a93e4cdce96b5c4e12d382f6b5c610bf8476 SHA512 3ee52135ca49a156abf3f7abbbf123be6d95053c249168b1f9bde65b969f5c50157d6cb41fb1920d794926bce7e23bd014ef30f4a786ebb8d4a72ff67f3c21c3
 EBUILD tkcvs-8.2.3.ebuild 927 BLAKE2B b4a22c3dc12c5e4d74f2ac96d1c3fc19097cd0ccf3546517fa762f56dc3a3344ceecb889f41fe7d0657fa240f3bd2b2ef732496c4133937358f938b2c27afa11 SHA512 a9d20f59ff32cfaac97caa531a2239b111d6df93ac929401f66347c2f109a24d6f72bfd57ff47345dd7ebb0a1eba1890d8277be779a7ec42a53d709ab328a6e6
+EBUILD tkcvs-9.3.2.ebuild 1033 BLAKE2B f45a0b5ca89765f4e02f30ce8d0e8ef63bd441ea05d5267267fccd4b31b61904c125907fcd912f2b71bc813bc807da07d74dbf2adecc3b3934fbdb8367d107af SHA512 598ba7e9707f175189e6f24d56bc60cfc755937a9c30b97af2ea8897853cb2267a47126c70ee5a715157195a82436eb33cee2fef54085d391b0756ff47d8f7e9
 MISC metadata.xml 253 BLAKE2B 19a7f4e84d1def1f97bb3b985a4959704c25d31ff2b1b7e6527ec6867d68dc2a6b15c0399935a8311789c4fac61136dcfdebaf7c113f296ec50c9523597a74db SHA512 9881e4487c9512c1b72ff2fa72a45b82ef3bf4ade0ec982aea1222f629367ac784ef922b839224add5829cba1717a25d49c31c1481610a02658d0bb265d4eaf6
diff --git a/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild b/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild
new file mode 100644
index 000000000000..2809f3345297
--- /dev/null
+++ b/dev-vcs/tkcvs/tkcvs-9.3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+MYP=${PN}_${PV}
+DESCRIPTION="Tcl/Tk-based graphical interface to CVS with Subversion support"
+HOMEPAGE="https://tkcvs.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/tk"
+RDEPEND="${DEPEND}
+	dev-vcs/cvs
+	dev-vcs/subversion
+	sys-apps/diffutils
+	dev-util/tkdiff"
+
+S="${WORKDIR}"/${MYP}
+
+src_prepare() {
+	sed \
+		-e "/set MANDIR/s/man man1/share man man1/" \
+		-e "/set LIBDIR/s/lib/$(get_libdir)/" \
+		-i doinstall.tcl || die
+	sed \
+		-e "/set TclRoot/s/lib/$(get_libdir)/" \
+		-i tkcvs/tkcvs.tcl || die
+	default
+}
+
+src_install() {
+	# bug 66030
+	unset DISPLAY
+	./doinstall.tcl -nox "${D}"/usr || die
+
+	# dev-tcktk/tkdiff
+	rm "${D}"/usr/bin/tkdiff
+
+	# Add docs...this is important
+	dodoc {CHANGELOG,FAQ}.txt
+
+	make_desktop_entry ${PN} TkCVS "${EPREFIX}"/usr/$(get_libdir)/tkcvs/bitmaps/ticklefish_med.gif
+}
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index f23d318b4916..e847adc02ba9 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,3 +1,5 @@
+DIST topgit-0.19.12.tar.gz 302492 BLAKE2B 5691823e58774883d33bc96e5d10b871a40224c97e3deb90f4fef051dbcecd6a7d3c979fe6b7e6c9aac64d485b9c4324b4d666a7ae64cb82cd325498d33e0cae SHA512 cb9245fbec7a4a15822a5b70d7052be200aa8b574b528dd929121597eb7dcec97532b0fd4d6a4d6bb63676194ed0ab2129e106fb88f63561187620ec431f9efb
 DIST topgit-0.9.tar.gz 37025 BLAKE2B e28b0fd4cdf4cf063bad939c712fc9354ffc2d9c5e431f637e8306454d7a871268902253a1d2c59afa94406223b1fdc1627f3dda04586c88c0b609a72a1eaa87 SHA512 15b4ec44fb1711273155350924806f9ddce330251d3f300f5d2ecf445f4822c40b5c7309429876746ed8226c00f74292956f51f9126c8c359c3f4d589c73791c
+EBUILD topgit-0.19.12.ebuild 748 BLAKE2B a4aecf5eca106139cd3343ec418a1852a534dbef94a5655e99a92aec6b052a60f03dfecaed4767abf01502fcf932e9201665df1fe106b1ed57e8a2e5a7bba498 SHA512 3e2de52d6d464c1eb5d00cc0da38f806b7aacbc08670675c423c2611a0199726147f98cf928a78c32c96d627b1329b38cbc7c9633a7c994c5fdde6ef54c96c97
 EBUILD topgit-0.9-r1.ebuild 692 BLAKE2B d604f1d2800d5953d2d7f296b5596fee898b95d51eedb80dda8d121dbad3c3611f4ecb40a2e5f22e8143981961639f68d5086539fe08a9d0e8e67940fc5df08d SHA512 2984e19bb3c22e8d83b0c8ad85b8c9939c3dddec3844ffeffd5e5cb6b2d857c3da9e214a3e89fe16acaede8aecf20c820b68c5793080d87476bb3bf40d90f996
-MISC metadata.xml 246 BLAKE2B f9d665b30ee34751053156150dfc0251a79530710ce6db75be5f79bf681bbab29d630af66d390be6870a424eeff55679e2ad226f9d268d1ba4261381a5708262 SHA512 453ca444336afd5e9a05f704cb9228b1415a4440aeb43847b80bfbdfacc3a21bf4706efc408acbb692b5a9130051c802d23b04791cfa0d84f499a8b359c393ce
+MISC metadata.xml 455 BLAKE2B 6928af22b505988592f48120217cf6c8a9e5f4fd0a0d2040126bb730f3a4dc7b1a5d428d00ffe6fcf0abc5b00cf5c4eb847e5d4ff3288f38b79483708980aa08 SHA512 12408a1b03499ee4718189bec87eb725462c8e2d279bcaef81b18f411f86d0588bffb145dbc793fb9fb9419f7644ff2529a03db636443b157f55b2d7a9c6594e
diff --git a/dev-vcs/topgit/metadata.xml b/dev-vcs/topgit/metadata.xml
index a4bff25eb375..1c551510bec0 100644
--- a/dev-vcs/topgit/metadata.xml
+++ b/dev-vcs/topgit/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">greenrd/topgit</remote-id>
+		<remote-id type="github">mackyle/topgit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/topgit/topgit-0.19.12.ebuild b/dev-vcs/topgit/topgit-0.19.12.ebuild
new file mode 100644
index 000000000000..eab7ae62e258
--- /dev/null
+++ b/dev-vcs/topgit/topgit-0.19.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="A different patch queue manager"
+HOMEPAGE="https://mackyle.github.io/topgit/topgit.html https://github.com/mackyle/topgit"
+SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/sed
+	virtual/awk"
+RDEPEND=">=dev-vcs/git-2.10.0"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_compile() {
+	# Needed because of "hardcoded" paths
+	emake prefix="/usr" sharedir="/usr/share/doc/${PF}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" sharedir="/usr/share/doc/${PF}" install
+
+	newbashcomp contrib/tg-completion.bash tg
+	dodoc README
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-vcs
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)