gentoo resync : 18.11.2019

27 files changed, 75 insertions, 262 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 03de722caa65..09df8915ed9c 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bfg/Manifest b/dev-vcs/bfg/Manifest
index 1c97365e47ae..5c2d5b7169df 100644
--- a/dev-vcs/bfg/Manifest
+++ b/dev-vcs/bfg/Manifest
@@ -1,3 +1,3 @@
 DIST bfg-1.13.0.jar 13465496 BLAKE2B 1f9eaa44f032c182a8d50dfebaee668a2d7de2361ea48336932e5168a6a3b6970bbca742943917d4ecc392586f03d19add1d1cd9772e023389b9711874871c53 SHA512 e037be1dd52bd122a57fed18ebc4923238666e9985ad2d40174344a1ca45a05abd9a59f1c2ea743be49d094fd76a5794a0e3160a9d3be04a7986c3a444df4fa8
 EBUILD bfg-1.13.0.ebuild 648 BLAKE2B 96cfc698f88b14874af51e314bd2de26aa9c2f447243b3b3f886e4da8a4fa2f2e18874036c6a48ab36681b5ad6c0ca4119a41adc56360b90210cae3420f4b364 SHA512 abe0bb1a8025a342333a2bd0c777b88aa79d3e773bec91c3ea4bef8c385784355a9ac2d60978d5ebee6e8965ee210e3980c4f22dd16d5b9e8385898965010d0f
-MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/bfg/metadata.xml b/dev-vcs/bfg/metadata.xml
index 78e64a5cf1ad..6f49eba8f496 100644
--- a/dev-vcs/bfg/metadata.xml
+++ b/dev-vcs/bfg/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index d49792ab8fcd..82ca7efe5f71 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -10,10 +10,10 @@ DIST darcs-2.12.0.tar.gz 1465730 BLAKE2B a021796aefc38aaf355a3156f26c8f313ffbe44
 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 4718 BLAKE2B 0f818eeaa81699cf527ea3d9178055eb6459af4185cf89520ee6f6241dcf995518fd11acc7473658d20e5453d629c680c82088a2d9a0d505db6b695705e6bd49 SHA512 def0e14e55a47d37ba3a930d31f89ce952094b06b0ff945c4d927e353684885142d2cca0df635c6b560a6d587e8c66637c2846eb6eb56e8587337425f8e00e8d
-EBUILD darcs-2.10.3-r1.ebuild 4808 BLAKE2B 18cde1ea42d8e9b5337a54cebc3c28f5db6268f6d6f7ad5c2502fd3eb43f446e65c0ebc42add5fee7f746a38015a6222839874afa824e56d853ea494b3ed5ba2 SHA512 7591fca5a971792ead68bcc5ed0e60e7bd5dab9c88910fa76d286c3b4db08117e1a288b2518621a4834522f6089307bed7628c709aafd1929e81d3f28b2cc3a0
-EBUILD darcs-2.12.0.ebuild 4848 BLAKE2B 0d383975d11f05a84f92c1d979c022dd4782d6580e3afa8ad8488c2df4a4baa27e0603981fcdd6a56b0862447aed13fa2e7bfa44eb9869b6ebf9e0ecfe5f200c SHA512 b33bd6342fc307ebbf7fe6ee4494afcf06cd6a13ae5355269728e0bda5cd2779c877cdf8795b308aa838d5095bfe406d098a86ffef217ad943601ef2d872fdaf
-EBUILD darcs-2.12.4.ebuild 4485 BLAKE2B 97b418af61478c458081a634448b4cd4457fbd29ebd52fc8d844924e3f095f598a85d7c7afeb3ff7c7e394b9969d2caafcf3d90d1e2208ad632b0796104af0b9 SHA512 01cf2fbbbc9d72093cd7e5dc00ed120e7a7c24e0e94746dc8a3daeaac7c699ba28c61d7b1459198e35789e37ec302dfd0378e9093857ed6eca6075159d977dd9
-EBUILD darcs-2.12.5.ebuild 4560 BLAKE2B e8c04c5d25a21a6984fcd6ef115bf74630c31847660740b1a81d29bc05a8a8ee22b3804326a74b8df90dad7292617d607b52991255423eac63677ed0acf01c6b SHA512 b5eff6df3f8f19e712c95de99583982f3293ab644e5ab06ca0bf04922d2c90e1c0b65fede1b50e2055129675db46522192950541222e1cbbca04309d5562e3e1
-EBUILD darcs-2.8.4-r6.ebuild 4717 BLAKE2B 43b93db417a69dd92b42e79cb101aa55138d65d06206b9b3ee3fc06b30c5484e62a07f8b4de949cf6d69ddb911eb328e47ac4dc1aef71c9808ac1c22140738ba SHA512 723f3212a05202d18f9d43b79c8a703084083fade36700dd845a5ce549e616cdde9155cd384bd1355a5fc90b1de9ad5eb8bc45680d60012e09562de90579f3df
+EBUILD darcs-2.10.1.ebuild 4710 BLAKE2B b348ad6617599555dab9098e70cecca55b80b2b5947fc2261624dbe06c8dbfdf580376ed5f194c05423b28ba7137613c15b0d415539c91c65f5a29d9ccb180cc SHA512 ef636f54dc3b5bb12b9eb5fe4a7cd0539e4e653ad62bdb4fba72575d1ec8b11ddfbfe57388951c0b1c9abd25caa0d895ca60a38019ffc576f18aff62c1d3e7e3
+EBUILD darcs-2.10.3-r1.ebuild 4800 BLAKE2B 321a292d50aa4d9ce2e64ba960a38035e9f9c6abc5730eb3ed27c9bf4d438f0fd5200f66b190cb74718504d3f93fa94442966531fab7a639c3bb16cc404b93c2 SHA512 ab6f1fd76adfb984e51ce05eb0ad37b9c26db59c3acea31fe6dc3c3c0d8eec561b91667856feec881e0a33c25563423d0ae96a73b3d05e30eeb34ddb8dd90a38
+EBUILD darcs-2.12.0.ebuild 4840 BLAKE2B 1921f86987c8ef949437bbcdd0f8682cb5dfe617cc0286268bced5dc9e80c7143d9ba936bb725dfb85635ee2373dc883cf903d228501e7ee42f2c6e3946ff8a5 SHA512 d29eb0436998ba953810fdccfbc306406d8b6c452093cf8a54ed2c0e2eb7d53877ad35b12b4c5b72a5043473c9f5a4b47b342df55a8dc3d8dd883f009bf5695a
+EBUILD darcs-2.12.4.ebuild 4477 BLAKE2B b803195ef7164c026944e943954ed3fc2f712c98a49f2aad9d01dcc4a7a2a6151d03c41b5bd1771f8017dda7b3c753a4db85450de97b6be3a5de0608045a3014 SHA512 173e6683a317a5a79f0f20f656bc7eb9be0a870871e8d6979a2db2687ad7eff35b0bcd1eff4e74d7eb55c31f2924887ffe6a6e6460f0aa24ce66fb0e427298ad
+EBUILD darcs-2.12.5.ebuild 4555 BLAKE2B aa01eda188a3e57a9dfff277d74549531ef0f98f970df24da3af24c4f6ab44c5939eedea7bbc54412ed685904c60d43f7784d2a792a0a523060cba5bef37cf1a SHA512 16e7e10dd0e3806b2dafa09791822f31fe6e34e2aacfd57c9854a8a2ec2797e226c01e4cfea4cb720c19ac83336ccea970823c58716a0469637af156b012f87f
+EBUILD darcs-2.8.4-r6.ebuild 4709 BLAKE2B 1e2def808b9723779da7d55cbab71d399b9091e35e140b28491b03e51662768125a56b27f1541526a103322110fd0e81441b21e7702872561973b9f837468edf SHA512 3fdec68fb05334b3251c9e5a6d33bb8c2ff2860338c031823d881eec92a13ce07994a50e91e33db3811eebbc2d8f0f63e5d312802fcbe704018b8b0a6271874e
 MISC metadata.xml 593 BLAKE2B c4ab655306f001cc3fe3007152e25d32d97fd3a87db76051c6c75b1d53c2c6ebd2105b2674bea5872e678b577c3cca737a3bbf6fe89923bc4f780ea2dc8642fc SHA512 cab7d36edce3f7da1742ebf086f69468f2745cb58fae83e74fa3e6016f4a7285aaa57100fed17df47940a51029ea78892147b7fe86ef2e456b7e34cc34a421bd
diff --git a/dev-vcs/darcs/darcs-2.10.1.ebuild b/dev-vcs/darcs/darcs-2.10.1.ebuild
index 74d9bedab0db..da23ab5a4f93 100644
--- a/dev-vcs/darcs/darcs-2.10.1.ebuild
+++ b/dev-vcs/darcs/darcs-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ inherit haskell-cabal
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
 HOMEPAGE="http://darcs.net/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/dev-vcs/darcs/darcs-2.10.3-r1.ebuild b/dev-vcs/darcs/darcs-2.10.3-r1.ebuild
index 1006022a8160..4bbed55412c0 100644
--- a/dev-vcs/darcs/darcs-2.10.3-r1.ebuild
+++ b/dev-vcs/darcs/darcs-2.10.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ inherit haskell-cabal
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
 HOMEPAGE="http://darcs.net/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/dev-vcs/darcs/darcs-2.12.0.ebuild b/dev-vcs/darcs/darcs-2.12.0.ebuild
index f7e328a92b90..0d2bac89c4e3 100644
--- a/dev-vcs/darcs/darcs-2.12.0.ebuild
+++ b/dev-vcs/darcs/darcs-2.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit haskell-cabal
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
 HOMEPAGE="http://darcs.net/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/dev-vcs/darcs/darcs-2.12.4.ebuild b/dev-vcs/darcs/darcs-2.12.4.ebuild
index bd27cb3592a7..11b513a7cc1e 100644
--- a/dev-vcs/darcs/darcs-2.12.4.ebuild
+++ b/dev-vcs/darcs/darcs-2.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit haskell-cabal
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
 HOMEPAGE="http://darcs.net/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/dev-vcs/darcs/darcs-2.12.5.ebuild b/dev-vcs/darcs/darcs-2.12.5.ebuild
index 8a94f1a19057..a524fcf1fea2 100644
--- a/dev-vcs/darcs/darcs-2.12.5.ebuild
+++ b/dev-vcs/darcs/darcs-2.12.5.ebuild
@@ -11,7 +11,7 @@ inherit haskell-cabal
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
 HOMEPAGE="http://darcs.net/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
index a2f7a035bada..24dfff4302fd 100644
--- a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
+++ b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit eutils haskell-cabal bash-completion-r1
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
 HOMEPAGE="http://darcs.net/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 339053c75ccd..d690389670ed 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -4,6 +4,6 @@ AUX git-annex-6.20170101-crypto-api.patch 212 BLAKE2B 0e9e1fdda1a93ffd709955c472
 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 4432 BLAKE2B a11a47e9478c27d3929af73accc7b53f7e57b6c011554413cfca75a67d482ce37e3cff868d4b450dcb6929511709579cf9f2c8a0e9322433bf1ac68c06d0095b SHA512 c11f0b8dceb548f7e568ed6c14be06a8a93a0a155c682fffa3203d6eee2356bdd86bf75afc20dbb96e780c1e8623d859f3a18b41c6223c43c911fa71d9e61d1d
-EBUILD git-annex-6.20170818.ebuild 4444 BLAKE2B d02fff7a8112f721b41a85cd4f57dcc35103e891bc494cec0130b449215cdc18b6b1cb529222561ad582deead7e9375a720862d13ecf740ce27ee1c0abaeaffa SHA512 219ceefb167332eff7c24aa3733b0ca05ca3b5eef843f65b9526df73de49d67cee243835ed9613beafeb5bbef4f698799b154fd1c9d5da57137fadd61731c56f
+EBUILD git-annex-6.20170818-r1.ebuild 4424 BLAKE2B 3f8bfdcb1c4ff2e328def3aa19df4ecaf37f63af2f13abc6da4d9e5083feecb67d61693a9045fa3b7f5b0a0671140d6cad803cf1880c51e9b41d7ce792c8e7bd SHA512 cd13af30010593bd53b55711478c8941e963f76f71bb52fcef1207c0275118d2ff95d693066fab96384bbba8d7deb808f0e3ec30563d1fa917b55d02cb52e5bc
+EBUILD git-annex-6.20170818.ebuild 4436 BLAKE2B d0f7708835679700a53744352a3d7c78e4d5c7f9b4ce8072f7d0534f64b18d2acfb82c6168733116e004fc969f9c35a19309275b61bb5889548923eb1390268f SHA512 8a618c518acdb2883788bc65c5ae99fee4c2ffb92dcbc643d47c10342dc2ce6ede7422bb23b74383ffc307eb8800dfb7e5d74bfd638ad7e5eda6abcafff3c8d0
 MISC metadata.xml 1735 BLAKE2B 7722b62eae4ad8f3859262d67f6ed9223b6eb86962fa52a4d53ed9f9569dfd6045be8bd7c975fe8719a25fc13ae7c64d7be2fbd5993f77583f2b5d8a77d83c20 SHA512 33e68df57c88e73f1d1b88d051a0f9a22a84dea82e26b8b552a36f213c63680fd780bbc8c2cdf1f1c9e57b47d982218a4b096ac59e8137b019af7164fe72ea69
diff --git a/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild b/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
index 2086bf8824d8..91abe516311c 100644
--- a/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
+++ b/dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit haskell-cabal bash-completion-r1
 
 DESCRIPTION="manage files with git, without checking their contents into git"
 HOMEPAGE="http://git-annex.branchable.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 RESTRICT="test"
 
 LICENSE="GPL-3"
diff --git a/dev-vcs/git-annex/git-annex-6.20170818.ebuild b/dev-vcs/git-annex/git-annex-6.20170818.ebuild
index 29375595e8d4..ac78674adb6d 100644
--- a/dev-vcs/git-annex/git-annex-6.20170818.ebuild
+++ b/dev-vcs/git-annex/git-annex-6.20170818.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit haskell-cabal bash-completion-r1
 
 DESCRIPTION="manage files with git, without checking their contents into git"
 HOMEPAGE="http://git-annex.branchable.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 RESTRICT="test"
 
 LICENSE="GPL-3"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 89e06122aa69..f243eca68762 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -22,7 +22,7 @@ DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d4
 DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96
 DIST git-manpages-2.24.0.tar.xz 453600 BLAKE2B 9ccbbe8e18689cac078ade0f55a1ca45a7c566ee5591df3442e3499fa1e4231f91e68922a54527fd2ce6102ac0148f9a360586a7c47922b39b383895f6742ba8 SHA512 18fff078b0ddf79aca216d9e2667e7a0b474eb8876739efd3928be2347bbb8db486e0367353b4e3d48f9d0e9c1dbd6f784e55ba535a009c1f3150405abdd02d2
 EBUILD git-2.21.0.ebuild 19086 BLAKE2B e811b477104e21925db97ba057900fabc6d077717e5c386fcdbc4fffc26328545d6abd779846a51a34871859042d6c7301c482fbc5bb488843e34bc46456e657 SHA512 a39951a450928f99f2e9799f3aa0ea3ada60c2ff6b666cb1a37db9e85d99728f4a0d91db4d373409bbb72ebf0670efe2c76613daf4cbfb2054a403875ebd8561
-EBUILD git-2.23.0-r1.ebuild 19564 BLAKE2B ae505eac193a443d2797fc9cdf6f00c211f9f1a0b970b04c7e53b080f10abf4bc7c0856eea4e7b573398b54d1afdea3b7a14d5e5254f8ef2da57fafd3aba0560 SHA512 550d190bf8b39dead6dd928062804170986541df8dfdb0d977de07581f183fac9eed8e3b4744e4f2ff681f1a47c42abe780729cbe1528f9b080deea6b2576564
+EBUILD git-2.23.0-r1.ebuild 19563 BLAKE2B 8ae12fc2e91144236327ca049528d0adc3c0cd839a0e70496a5f21479dbb173d6b302a3bc745dae5705913fa5dbfe44426d2d6342c0ae93dfa0d55edaa155b92 SHA512 25cd1869df0fd30887aaeeca39415dd9f5f0f2845dabf7ab5844e4d404f2284c068dedd79c9ab602708d484516ba4b222feb273759306af51d97b438b3b9552f
 EBUILD git-2.24.0.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419
 EBUILD git-9999-r1.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419
 EBUILD git-9999-r2.ebuild 19521 BLAKE2B f5143668b8632de5954e6bd50dd632e724dffab7a0fd3801fcd4c13ba15ccc22e9e12586f6ef7288278f22d9d011160e6279eb80225a034659025d5b6e9ebda4 SHA512 24d9f633bdcf0f5756a63b5c60f9e4c70d153ffd4eedfc49fc36b089c5c77190031012ab2477b9739f6748992ab10825ff5d43ad1df26d54c110feafc99b5419
diff --git a/dev-vcs/git/git-2.23.0-r1.ebuild b/dev-vcs/git/git-2.23.0-r1.ebuild
index 77207b05673b..0de7012dc24e 100644
--- a/dev-vcs/git/git-2.23.0-r1.ebuild
+++ b/dev-vcs/git/git-2.23.0-r1.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh 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"
diff --git a/dev-vcs/hgview/Manifest b/dev-vcs/hgview/Manifest
index 23695d7f60c8..c005bb6122d8 100644
--- a/dev-vcs/hgview/Manifest
+++ b/dev-vcs/hgview/Manifest
@@ -1,3 +1,3 @@
 DIST hgview-1.9.0.tar.gz 181130 BLAKE2B 55b9a161d5a650e802e959c68b0b59d33679790a57067d96b58d93868de8f99fd4323a18493829b94f2e72d7f1973b1558250989787bdf682cc784896fb36e90 SHA512 604631776e096daf27241e8387d6fddfb9b3f2c54dbfccc95e770ebf2d5d27f64009c3698cf0d427f9a89e073db0d8d7623d57969ca6fcf036d5cb1dbd74eece
 EBUILD hgview-1.9.0-r1.ebuild 1155 BLAKE2B a5f5c405e136bce114fc6b1458db5def89beaff7628cab74ad4d9fad103bb623d96b595e9d2f64a84c05dedc57fd702f89f503bd98cd63ef16189835a532f002 SHA512 669caf87f8304eb4cbafa8ee67454b2d4c06dcd1d2eb456f20a615d9952b894c498c3ab1b15366e81fea32896d0c99c72a79a1b9cb41c0c1e17931f5565fc690
-MISC metadata.xml 325 BLAKE2B 6e8ffb4a8dd14475279406140e9b2f1997773fdf290950fc00ed1948bfdfe04adc2644529b551d0af3d468af16b7be59b8b4bdf6526e7aabf659bc1483a41555 SHA512 c77434a8a447b17a0a0759e0f55ed41617fd524eacb3cfed869b6d010f6062a3bfc914c690cb11c2406f9910d30660b44cbc2ac8b4ee8b600629a3a560989c7e
+MISC metadata.xml 241 BLAKE2B e383b9fa58bf95cedc00cccbc8061b34fd371cc83ffddfa6e94c07a1e980f23769a16f18d3d8103314afd3250aafaad83fa70ad436e8bde33dea03cf111f0e53 SHA512 b185630100162fea9373e93f1d254ad910d1c1e0f939d803222f08aaa1e8175e68720c346d00f1a0efe1cb4fb2cf4b7c01a86dfd7a7c5d84679bfb84cd3eba2e
diff --git a/dev-vcs/hgview/metadata.xml b/dev-vcs/hgview/metadata.xml
index e6f47dd730bd..b94b93f5d3b7 100644
--- a/dev-vcs/hgview/metadata.xml
+++ b/dev-vcs/hgview/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">hgview</remote-id>
   </upstream>
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
new file mode 100644
index 000000000000..250963c13400
--- /dev/null
+++ b/dev-vcs/repo/Manifest
@@ -0,0 +1,3 @@
+DIST repo-1.26 29829 BLAKE2B c5dc74214d404e6c11189a3d34c9a771ed5689da14e64588b5db144b6ea3ec38a727238d7dc6e609a22edb5b84d350210564615016f6b36599cf9e3fc3b34ef9 SHA512 1398fab95b4fb4a24fda93d4054384a801b5b70e3dca3a794f458d8e19582ef833ef5a3a0f3a571121d2d9172ce0e70f8b3c6719f6c2f47643ffe6de181e34b4
+EBUILD repo-1.26.ebuild 847 BLAKE2B a86153526d1ecec7490c7a58eef44754d089dda05e9e3840d15a4747da659221f58d5b1d9fe5dbd9f2276c2e35d1022f05132324028d02ae9d4bc5cbb05097cc SHA512 0d5ecc7a9004fedb6d91693234d56d222cf0190cc4ee8c44e8a3ba3592d658f1dd54850af314db22d3a372fe69eb6e2b07651b4700aca76d365c274b33142d2a
+MISC metadata.xml 338 BLAKE2B 49e4b3e3767754bb7a0661cb388f3e18b372fa713d0e3b92c742cddb2fe21e384b1689fd72b23865d7b363ab01bae90a5a11956593eccc915f1b6c99e52c2718 SHA512 0a83263d882281636f6925d20c9e8b991267a1b7d73d7bd6e545c77372424fd602e28d6c9a82668d0a73500bcb8dd8287f7891b66e3fe1517907001f3fb43cd4
diff --git a/dev-vcs/repo/metadata.xml b/dev-vcs/repo/metadata.xml
new file mode 100644
index 000000000000..de0e9961d994
--- /dev/null
+++ b/dev-vcs/repo/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>vapier@gentoo.org</email>
+</maintainer>
+<longdescription>
+Tool for managing multiple git repositories. From Google, useful for building Android.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/repo/repo-1.26.ebuild b/dev-vcs/repo/repo-1.26.ebuild
new file mode 100644
index 000000000000..d1563fd6addb
--- /dev/null
+++ b/dev-vcs/repo/repo-1.26.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 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{2_7,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 ~sh ~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/stgit/Manifest b/dev-vcs/stgit/Manifest
index e44aff29c468..5cbddc3f1f94 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,12 +1,6 @@
-AUX stgit-0.16-asciidoc-compat.patch 561 BLAKE2B a12cba6e1f07623ed82d2aa48ce9f840a4e3759040211645b3c718a29a1fca126b1493b0b154f699f4b26d08f49ecab4ce0bc506bcc33421bb75070d8fca8c8a SHA512 f5a4a260b5b732332a4157a82d7bd153971d0a41c55ce8c38beb58f85a989d7636ec3ff15dc3161d4c5775a392840d4970437abf4fd8c741cdcdf509fd826329
 AUX stgit-0.16-man-linkfix.patch 429 BLAKE2B 11cd98b7a58a55fed445be700bc492a4fd926b9bac20a54e095b9c9470d6294a4c32800622b42e87ff10908a40a2bf71e8e139dc306ade3b4989c10609dcceaa SHA512 c71e32a6e6b007ebbbe738dae93bf2109d2be1ed3f3418c98c6ff6ebb602fb8523f974160276649bb66745340d752d69e87c9f0730ca3dd595a6b2b32a0104df
-DIST stgit-0.16-missing-patches.tar.gz 1667 BLAKE2B 3aa26305b948c49bde0aec71e9698f9c1822c26e1f15ceba99c4725eaa35eee6a7a5335f0bfe6e43e89be62c304e1eebe2ffdaa0a5b7fdc0da3e13244505abaf SHA512 29d4c3e68121654153b4e5142dd70d818737b09bbc8371d644a36dd9d18afaf78fdda91bc16f953c330bcbae19084384d8bcd216cdfe674df784e33165186db1
-DIST stgit-0.16.tar.gz 362687 BLAKE2B 4d6579d39d8a22929d70268ae07bf7c5ac17eae21c615aac0ae8e9adb146aa87a3f7d1b057fd7269175c363ef5057f4ce24f6ef1087f54dfb1165f2800a813cf SHA512 782de3d5855aad4f5d040478745990517ebe2b26dc315a3ed41db95399bb46e075d63a70baa0e3aa2ab1012b59e6ad1f5940a904f296ef09d6bca60f66e417dd
-DIST stgit-0.18.tar.gz 235852 BLAKE2B ff35856c1f20a6a611a2faa22ba573b1c33636c9e913322456011c4c5a73c3207ddbd8bfe41cb81b11dffe8db8b89594c1598989ae9fb896cd686594a21d96b2 SHA512 5820cc1a8cdd5183fbe309b4b80568098844ff57934c75a43263b5cfcdac4b64e015abc9ed6a53dd856236d76bd0ebeec31e87561bca0d0d82a6e5ec7a10745f
 DIST stgit-0.19.tar.gz 246256 BLAKE2B ece625a0f78f4a80a9a20b25d0638ee71475029ebd861b28dccc444a70d631e687372031c2dee03faebc8890b8742674d6fd7c2ee1794e8a2d7044721a254847 SHA512 0edad0c600145fc779262ddae4300d4718fd04316face62cb1fb5c01e39cb0824355091863aae8d5b14bee9ebb36ac591e5e0dc9fe343c12a7c781227cac6330
 DIST stgit-0.20.tar.gz 319696 BLAKE2B 85402c84148f5ec93c65be2899240ffa143049de63f734e56438fd17d59ba32cacd279dc3d2eb306ebd11f139f2b4183be814989443401f7d696eba93228a1b7 SHA512 45c4715f7b0c8d8e7f1104694feac7bff07428a6e532ba41bf30807b715990cc1b22a1e82757bb72eb886b987b7c9126d729f9fc161c03497c4d9fa719aae599
-EBUILD stgit-0.16-r2.ebuild 1732 BLAKE2B 2be40c1d991060b15413ae0c718b7b8793c1f8458fa0c52fc45e2e62568566975ac2c15c12b1f8065b475d9753f39dd92ae8095ee8c971c638d008da64ab82d3 SHA512 015a83ab10571d9000f0394c2173a56feac071ca6680ec9b4ee6b6e7c4be3a6e098a231be71bac87ddec9dfc415808f0a86dd30c4bb142493358d8558810cc0a
-EBUILD stgit-0.18.ebuild 1883 BLAKE2B 1ccceee2fb9c6b039ac956ef85444fdca246aacb75ff5a55c6351faf909a09d6148b173eba6cd7c0b0b5f54271050b83cd059979619036b9eb703c8c8b2de837 SHA512 2557043aa518718bc489ac2004a69f155a913c9bc38520cfec8c22daf2629a76d14baf6bd4cf8fc4ade0c2ee0c35974f5f33c5bc715aee1119791d26dbe7224e
-EBUILD stgit-0.19.ebuild 1896 BLAKE2B 36a268e2e253b697a4ba0f78db47a1d24227b04229481e515261152a34e5ffe58e5a9524c00df6f9d8a388f8ad487f828b17b18580c7606a84aa165ddf061111 SHA512 cb1de37edd75469f1964609caa8802866ac7844d8c9cf876372c3bb82d0ecdf98d01a8ddbd16d285cfeb042b456a3bdc1cfa83903f18b189cb45e06f238cfbc8
+EBUILD stgit-0.19.ebuild 1894 BLAKE2B d902a77a05e307607d561424bfc414a93b45bd0068abcfc98cdf922fb5c53acba2efa80c7635fb7a3040c81b6ae7f50a2ca68aadbdf245de95c86ced0d64bcb9 SHA512 bb81b115afc9083bdc74b2ec8397766d15c31e9ab13ce91764f3acccd448c0e470b8cf4f0357446678ea1fcf579b34797a1311014900472ca2911e281ad8331c
 EBUILD stgit-0.20.ebuild 1899 BLAKE2B 59d2b542ca22397c97c4451e52cc552427c930d834484d17f235a99ce96ed0352a8ca5706d81f7beadeebe6668c969072667ff07c88a2cdf1a2f297eab131d48 SHA512 bcfccf034ba5fd8ad0e14fb73090c14a9fa16c2e8d2b66585410ec13a86a46ade50ad40682d0672ad189f4b32ad9136c79be13cd5643bbff162e260c1e953872
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/dev-vcs/stgit/files/stgit-0.16-asciidoc-compat.patch b/dev-vcs/stgit/files/stgit-0.16-asciidoc-compat.patch
deleted file mode 100644
index 4386953a3ef6..000000000000
--- a/dev-vcs/stgit/files/stgit-0.16-asciidoc-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN stgit-0.16.orig/Documentation/asciidoc.conf stgit-0.16/Documentation/asciidoc.conf
---- stgit-0.16.orig/Documentation/asciidoc.conf	2012-01-09 13:12:42.000000000 -0800
-+++ stgit-0.16/Documentation/asciidoc.conf	2012-07-06 04:31:38.279051055 -0700
-@@ -100,3 +100,9 @@
- [linkstgsub-inlinemacro]
- <a href="stg-{target}.html">{target}</a>
- endif::backend-xhtml11[]
-+
-+[macros]
-+# regexen to match macro templates above
-+(?P<name>linkman):(?P<target>\w+)\[(?P<attrlist>\d+)]=
-+(?P<name>linkstgsub):(?P<target>\w+)\[]=
-+(?P<name>linkstg):(?P<target>\w+)\[]=
diff --git a/dev-vcs/stgit/stgit-0.16-r2.ebuild b/dev-vcs/stgit/stgit-0.16-r2.ebuild
deleted file mode 100644
index 07c880d7990f..000000000000
--- a/dev-vcs/stgit/stgit-0.16-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="http://www.procode.org/stgit/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-missing-patches.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm 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
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-asciidoc-compat.patch"
-	"${FILESDIR}/${P}-man-linkfix.patch"
-)
-
-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() {
-	# this will be a noop, as we are working with a tarball,
-	# but throws git errors --> just get rid of it
-	sed -i -e 's/version\.write_builtin_version()//' setup.py || die
-
-	# Workaround hardcoded prefix
-	sed -i -e "/prefix/s|/usr|${EPREFIX}/usr|" setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			doc
-	fi
-}
-
-python_install_all() {
-	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_python_install_all
-
-	newbashcomp stgit-completion.bash 'stg'
-}
diff --git a/dev-vcs/stgit/stgit-0.18.ebuild b/dev-vcs/stgit/stgit-0.18.ebuild
deleted file mode 100644
index 11e95e4ec16f..000000000000
--- a/dev-vcs/stgit/stgit-0.18.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-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
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.16-man-linkfix.patch"
-)
-
-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 stgit-completion.bash 'stg'
-}
diff --git a/dev-vcs/stgit/stgit-0.19.ebuild b/dev-vcs/stgit/stgit-0.19.ebuild
index 3b518b6124e6..62681c37655c 100644
--- a/dev-vcs/stgit/stgit-0.19.ebuild
+++ b/dev-vcs/stgit/stgit-0.19.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-vcs/git-1.6.3.3"
diff --git a/dev-vcs/tkcvs/Manifest b/dev-vcs/tkcvs/Manifest
index 9090226d0488..49550a9edbd9 100644
--- a/dev-vcs/tkcvs/Manifest
+++ b/dev-vcs/tkcvs/Manifest
@@ -1,5 +1,3 @@
 DIST tkcvs-8.2.3.tar.gz 570910 BLAKE2B e612fb2fa01ad0205973eef48eaa6c11677d3aec8f1a5344b1d1719aafde79e830f550f990a7bceb8063edb530de807b7878937015bcd0175aef038031663bb0 SHA512 42fb03acf6367e02f6f7b3e1ad66232be4825f152b3e4d123080e0ce7d2f53b5eacb71ac95fbc15224fb4c4c2cae979b612dbb11d0cd0b8fc4a0222a8cd40c8a
-DIST tkcvs_8_2_2.tar.gz 1183853 BLAKE2B 01195764b85b7f3e24f937052d1f21e969f7c060bef97664ce8fc6000dd8025064274610b0159940630dd1f8c51b92e2331793146fd44fc4b736b512118328be SHA512 7a3f76f8157601a9359382597746e7ee4ed491f94d4ba5992848d48b8c5de1c81c91e8245a88b17c68af6898f269fcd3bf6ba9c920bb083190c849ec13e7bf9f
-EBUILD tkcvs-8.2.2.ebuild 874 BLAKE2B 39cafd5706b6ebf5c6707420a6c0a43b92849db106de2344043d08330f7ad01b1b8d66f35cd9f9cbb847762e1df8c37df8ead0f84b59170d04b62773d147619e SHA512 2d917259d7c55f750eb900115b669016c5087a5d0222f8f14694023a0b364e44b6a1178cf2a07b8902a5fb266bc323840ac54702446d0aa06ade42272f228363
 EBUILD tkcvs-8.2.3.ebuild 927 BLAKE2B b4a22c3dc12c5e4d74f2ac96d1c3fc19097cd0ccf3546517fa762f56dc3a3344ceecb889f41fe7d0657fa240f3bd2b2ef732496c4133937358f938b2c27afa11 SHA512 a9d20f59ff32cfaac97caa531a2239b111d6df93ac929401f66347c2f109a24d6f72bfd57ff47345dd7ebb0a1eba1890d8277be779a7ec42a53d709ab328a6e6
 MISC metadata.xml 253 BLAKE2B 19a7f4e84d1def1f97bb3b985a4959704c25d31ff2b1b7e6527ec6867d68dc2a6b15c0399935a8311789c4fac61136dcfdebaf7c113f296ec50c9523597a74db SHA512 9881e4487c9512c1b72ff2fa72a45b82ef3bf4ade0ec982aea1222f629367ac784ef922b839224add5829cba1717a25d49c31c1481610a02658d0bb265d4eaf6
diff --git a/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild b/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild
deleted file mode 100644
index c8898cdbe2ec..000000000000
--- a/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib
-
-MY_P=${PN}_${PV//./_}
-
-DESCRIPTION="Tcl/Tk-based graphical interface to CVS with Subversion support"
-HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
-SRC_URI="http://www.twobarleycorns.net/${MY_P}.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}"/${MY_P}
-
-src_prepare() {
-	sed \
-		-e "/set MANDIR/s/man man1/share man man1/" \
-		-e "/set LIBDIR/s/lib/$(get_libdir)/" \
-		-i doinstall.tcl || die
-}
-
-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
-}