gentoo resync : 12.05.2022

41 files changed, 948 insertions, 138 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 2086e39ecf51..91dfd2d29367 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 6945af978057..29aae6b2bf09 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,5 +21,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r14.ebuild 2995 BLAKE2B 24d2ef20ef87a6bccd84fcf693112b85cb6602375eee28c052228f52ad7613b6577564bac3ce9882e32dcb07396269508a52eaa1e064bca38b58c227de2f6a7a SHA512 976b1a4b61827600815c987e1ca505fe5a6702abc39ecd2b41c2dd741b913ceecedc78162fd82b06be44b866ce50740fd2d76a05b68a81e7f431f3aabca61be5
+EBUILD cvs-1.12.12-r14.ebuild 3002 BLAKE2B 4fb8aa878eb6dc2ed99d5af7487f06e5bd595bfac988b48b1a1d0c6800db8fcd8953696cf8108f28113d31fdfb46f7f2841ca09b02e80c0b311b17f1d88b47fa SHA512 86bcbe2a209001d749127b53817c8dc1db1379f65d78b681760837c1cdcf8e78a44f2ac5e1baa4631b0ebb2e2869622c26dbb393f44e8be46be6b474daea74d6
 MISC metadata.xml 239 BLAKE2B 4512d26ef49f8be5951a62431eade863184ce1434a783b3f46e0c9d11637b1c051328f19b6b1eb072bb15eac91acd9de87ac1cb1ecc4f218fcab76a0e62809d5 SHA512 ead5297bbff4ed78327587de93404ddc4865d2390f7269ee7e63c8311644783b206a0fe7163c5696af3c319e1469a311a29b4340230ce7c0d9c84ce78f516a4e
diff --git a/dev-vcs/cvs/cvs-1.12.12-r14.ebuild b/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
index 9b525d7fb912..3c6a6e2beee6 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 RESTRICT="test"
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index f709b2ffb6d7..c2a4a00fda07 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -3,6 +3,6 @@ AUX cvsps-2.2_beta1-solaris.patch 3398 BLAKE2B 116d7988d71fd55dc4e7fa0e707f0909d
 AUX cvsps-3.13-make.patch 1126 BLAKE2B bc5c7aa08816a8cad99a05e0b20cad5de55026c056b97962a11e4aa4f56f48695fac5dbcc77b8a44cfea3f4ace27fc24a894b7968c7b843476ea78a4560ce648 SHA512 eca9b73848d4d219de2f29021f6b5376ce507ea4b4cbf17b7007c96f75b8598feebf9d18750dbd617b903cfbdfd9ed0ec2d83c6f05462e1dfc4b100bc3745ca1
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
-EBUILD cvsps-2.2_beta1-r1.ebuild 910 BLAKE2B 0d200cea90e523416b5a4d88ddbe337b47ca0e40a2b37ffe857319d60b0133360cd3b4ff132bd4fc59f29d05d27bfd7559474ece15c2246fa3de17872ac2ed50 SHA512 728b0bfa09087bc6bb8f3f16c299bae9e6451eeb96a15f8172ff476682c592cd1f409812c683186f63b32c6c44235da0b258668fa1ee4df79cba0d80bab5e975
+EBUILD cvsps-2.2_beta1-r1.ebuild 917 BLAKE2B 092ee16747a5f8ab80193ca157dc5f8da5cc094c6451a9e2781a031b2dda954e0a8346b2415a60c5dbee1d0201ea662acaa3b817296d6d16354abdd22e30924a SHA512 3b20b6be3ec35c26b9954720984b10bdd13d0797e7d8692bc8a988c38cd513457e84e42afb6db621e6ddf05cd36189a9650c6bc431729addf6e1d03c7370ed41
 EBUILD cvsps-3.13-r2.ebuild 1000 BLAKE2B 72a9d5b5d10ee83c34f8cf4f35b0a2212efeff6bb4eac69eb13d94e15c77e7dc963f8a8c7cfb20852d59168450d7be69067d106d225f638555b92d63bdd3b655 SHA512 95ff0cfc8272643aac1d8e265515172c12c1ddb98079822b20ac37a2276b0060305653db4e096bb746cd650b1752604b3e54e9f3be219a07bcfcf501b62ea4d5
 MISC metadata.xml 240 BLAKE2B 75c454379c30bb18cfb0c1be50c74635c8c16414a600b305228f7bcb9c522da69ff0b4316d3e69c569cc1ee60bba1c70c850a41ed5fe98f06443d12a74902e38 SHA512 955df4846cce9194d71505a082c2eb7ef5e2dd75506de19ba93e3b2a48d36620f77cf35fccc897ca764827a8cad58a3ef7278976e1d02f64c2c868998432f9ed
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
index 7177b069d6a2..e7ad1213b8b3 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index b3f5fda963f8..5c4fdb9ecdc1 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -2,5 +2,5 @@ AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f13
 DIST fossil-src-2.16.tar.gz 6275775 BLAKE2B 504f828f121385ec73311b340e0abfdba7da6a8571adb390c55c75fea0ef027366fb914c12552e177988bedbb735a3148d87ebdb23ffc2ce4b7bef8ef603692a SHA512 0569640a3b509c592f812a42526eec88ead034ba0ba3de93da62cfb1caa751954ae185eaa3398d411a02ee2a858ecae6cdf4e47199847527f7524fc9798a4b12
 DIST fossil-src-2.18.tar.gz 6308652 BLAKE2B 299406d365e24c139e8bfbf94dc0aee2c04aa02a9f4c48d1425d0f6d21830aece10cbc5a38cee18cec03d3d0f39db3726d4890c09ca9bfc84a5058e76756ed4d SHA512 9dfeef1cc394af7afc6b68d2ebf084d5962698123518999130162718d450d061ab286b5f4039cde1af0e17059a9c801f1ded974fdb78b0965b73a7f8c80fd277
 EBUILD fossil-2.16-r1.ebuild 1891 BLAKE2B a14d37b8d26d8078112c7e60ecb7d6f3e45becfb5e0894e0955dfacc5281aba4ba480678d99bb6a57b356ca355f37f5d3e7e8ccca5a725915b08d2923b93a919 SHA512 96e2c2f724f6a4149c279f3caf61ba8defa4a56b6a8e471d9119a7ba46fcfa35c597fd58193af6cedbfad34ea676230650e77b977bcc268a9cc6d85cf4a924c4
-EBUILD fossil-2.18.ebuild 1896 BLAKE2B 49b56feadaf9a90fa590203e8a27e7c67f364eaa8a3b1de213cd3feca1614c98ed6a885e43513cead1a34f25539ce71c9e7c28fb7173b87ea1b2caa9b668d855 SHA512 4c91538107ac6b3e340e904f45778c22368ca228de1ea29908b8a4951e90c845d85fb5d58e28e11f366065e0ddafcefd30891ea414f6ebd0dda1b3d1fbeb96f4
+EBUILD fossil-2.18.ebuild 1903 BLAKE2B 6352afedcc35bea83084bb13e332eea6b6fef23c2e8ea500ebd969e9a276870c7bc608971159c564dfff7b6665392389dd10408979de715c8e28b23a1f70c72c SHA512 b3c783706a9cc6b49b9a90bf98ae24fe2a937b0d226e443b28b63f63ade5fed98c72425790e1e4ce9524efd1a40ae6f200a3fa761dd4430bea0958edc681dd9c
 MISC metadata.xml 950 BLAKE2B 2c6fb55552dd44c01649e8f394bbd56c49b3e01857493de3ad907e1058ed9f25d7bcfbe9aea0da21a578090d5e8a2d75edcf9f25cf25f2b54ca909334a522289 SHA512 f8c769c99b4889ed79011f460e0dbf2dc7d9c6576256a5c7523abab868e2a5c4d61ca1719813584051b3a8e72051cc88b06a34316ba267415c0915f3fb30dcf4
diff --git a/dev-vcs/fossil/fossil-2.18.ebuild b/dev-vcs/fossil/fossil-2.18.ebuild
index 9caf422f5bbf..c577d1665bd5 100644
--- a/dev-vcs/fossil/fossil-2.18.ebuild
+++ b/dev-vcs/fossil/fossil-2.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fossil-scm.org/home/tarball/${MY_TAG}/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
 	  tcl-private-stubs th1-docs th1-hooks"
 
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index a81877d29261..a3155b8a11d2 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -5,5 +5,5 @@ DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630
 DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9
 EBUILD git-cola-3.10.1.ebuild 2486 BLAKE2B 8ec3e8f3737b1955a6169a2d6997d4ee9d9565fad0223955a5df1763d1e6ffb0fe839129d4eb4ea2e2986dd96e3f6a770bd472ba833234d3ca25d115643871c7 SHA512 458fe11168fcd3d839029220a5ec13731238bf24e8ae7120df3476e015d740de615e6d90c2e9cfbd22d70310a0fc6eb07bf92b96fd8301e30c84dfbb9b8659e3
 EBUILD git-cola-3.11.0.ebuild 2457 BLAKE2B dec9f6f5643428efd6eec292e86dc20f510c650f189e7ead68c0644cd91cb5b4564cf87cb2c7350d11a2972eca8b55f39b3b133e9dd3510771bb97d7dd05d3d5 SHA512 6fb7b1422d5a2dbdfad15650da60b81aea9911e47f42d11ae1da6ee6230547e7f1d7b615544f8214cf904d056e1122cf34d6b16843f65b9f18d601b89b413ac3
-EBUILD git-cola-3.12.0.ebuild 2457 BLAKE2B 9bc8d5330b6f3093f3e5cdb74d3aa8b02d41a52cf3c024c59cbfddd9dca8ab43f7852a7c494471395094b820b91773b9729165c5ab99fed7fb25e22e14251896 SHA512 0f2c0665d62afd9288f1ecea7b3d892e5e4f063ecf6aba561b10592a1f8830a03c4905a3aa9044814659b1905e30df4c1e2e3d1857a6c4d75d3152501341907f
+EBUILD git-cola-3.12.0.ebuild 2455 BLAKE2B 9fdd4a558d45b96685efad001c2cf7c29daa9a6adf6844d7cea18a85e0a8eb28621986ba8c15f0d3e1ed0051b79faa4644284742f8eeb82bdae58a6252549609 SHA512 8ab1918ceacd575b3664b9f45aefdbdd80ac411af112ca24421ecaa1e7f72dc90251cb7373f477aba85d675e782036776862129731980ab76ee5f2be6b959662
 MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379
diff --git a/dev-vcs/git-cola/git-cola-3.12.0.ebuild b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
index 51817bdd4a3b..8e125f2c8bc9 100644
--- a/dev-vcs/git-cola/git-cola-3.12.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-vcs/git-extras/Manifest b/dev-vcs/git-extras/Manifest
index b9afecd7aa87..f305eb836fb1 100644
--- a/dev-vcs/git-extras/Manifest
+++ b/dev-vcs/git-extras/Manifest
@@ -1,4 +1,6 @@
 AUX git-extras-6.1.0-no-bash-completion-install.patch 556 BLAKE2B 9fbf1516888da9c5952fdaedf28987bcf46e62c6dd1342f810c9150625a78198224855dd18b386076a4fd689418c05d61cc8f0c5c0f747fb96ac6209a4fb402f SHA512 70d25e577174238f5fce6a3810146358904493a7ec3963eef6be8780de7b62bcda7e2c542e8f02cf2dd229acfc7368b72dfd4aff668fbc4e841eb6754b2036f2
 DIST git-extras-6.3.0.tar.gz 159258 BLAKE2B 263e192015e46da7867f131c19ae47243e60355cba02b1860b45abafdc4fc6adf916dffce58b853960d8bb22f5da067e1dca6ed0b02f108953571896d1c981c4 SHA512 2be0a6f3f3907754638ffd975b0b28908e8c9490418fa170f47a73a2cdc9d0b8fd5d11e4734440ffe3114cd63aa7decf8b1cafc78a63d2794d06f7fcd2925ead
+DIST git-extras-6.4.0.tar.gz 163508 BLAKE2B bffbc8efcf1cf030bceb20b953e1cbbc067c8383ced38b786c21eb9bd9b7d3febd3d8aae652c0dd731de688d3cfa225c3aec91d6b9c590459b576db113ca0af0 SHA512 1b28d09d294f6d060b7639401e56c8d5e762614b5f6928ee6267e49af943e349e2399558ebac60008e8240218c13f00f8aea7dc07b71fec1e2dc25487bc847a3
 EBUILD git-extras-6.3.0.ebuild 1133 BLAKE2B ddf932765927787de3c86a2bd7a09cfb6ff694c5780f30f376ab1f47ee8e420178d415c7d548b1848c4a9c5e5a5bc11bbe70b3544238f035121dd7724351c943 SHA512 4b76fad12abcab62bb43c22d676562843d728a3a146236e0dfd3823d9c28e60b6ff1fd8b4875c1e3e2f7c2206f76f6e85da567888ddf9d6cc93150ca427a7bb4
+EBUILD git-extras-6.4.0.ebuild 1133 BLAKE2B ddf932765927787de3c86a2bd7a09cfb6ff694c5780f30f376ab1f47ee8e420178d415c7d548b1848c4a9c5e5a5bc11bbe70b3544238f035121dd7724351c943 SHA512 4b76fad12abcab62bb43c22d676562843d728a3a146236e0dfd3823d9c28e60b6ff1fd8b4875c1e3e2f7c2206f76f6e85da567888ddf9d6cc93150ca427a7bb4
 MISC metadata.xml 318 BLAKE2B d62d3d04e485a54a0790bbe4390525d6f3ee34ce8ce0c863de54f80c54bfd78f60a32222c0ad101343c3ee7040d5894671a7669c8fc89082bef827cb4edff7ef SHA512 608c0ded622cf20a6d23659fd42295b4c3d70127896b35be659c6d200d649cf496eda5a217deb356754919e0e9d0b635ad38d9b23ae4badd9fdfcf9887f20258
diff --git a/dev-vcs/git-extras/git-extras-6.4.0.ebuild b/dev-vcs/git-extras/git-extras-6.4.0.ebuild
new file mode 100644
index 000000000000..5cf7cb509f5a
--- /dev/null
+++ b/dev-vcs/git-extras/git-extras-6.4.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Git utilities -- repo summary, repl, changelog population, and many more"
+HOMEPAGE="https://github.com/tj/git-extras"
+SRC_URI="https://github.com/tj/git-extras/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x64-macos"
+
+RDEPEND="
+	app-shells/bash
+	dev-vcs/git
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.0-no-bash-completion-install.patch
+)
+
+src_prepare() {
+	default
+
+	# For now, don't force including the git completion
+	# sed -i -e "1 i source $(get_bashcompdir)\/git" etc/bash_completion.sh || die
+}
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		SYSCONFDIR="${EPREFIX}/etc" \
+		install
+
+	# TODO: Unfortunately, none of the completion seems to
+	# actually work for me yet(?)
+
+	#newbashcomp "${S}"/etc/bash_completion.sh ${PN}
+
+	#insinto /usr/share/zsh/site-functions
+	#newins "${S}"/etc/${PN}-completion.zsh _${PN}
+
+	#insinto /usr/share/fish/vendor_completions.d
+	#doins "${S}"/etc/${PN}.fish
+}
diff --git a/dev-vcs/git-publish/Manifest b/dev-vcs/git-publish/Manifest
index f820a3206ccf..079babb22383 100644
--- a/dev-vcs/git-publish/Manifest
+++ b/dev-vcs/git-publish/Manifest
@@ -1,3 +1,5 @@
 DIST git-publish-1.7.0.tar.gz 21569 BLAKE2B 1438e5018ebe7d258fee2527597e56080b574765a87b03d814b6d0d41c68397cba6099866382e9f2c560d8bab58214fb9e5f54f0127433917178337df81ff789 SHA512 dbf343e0284c52edd42ba8d844a9db90810ddd02e7a98bcd1c2af72cd9f5242e9c0a9ea921edf47583bfe05943288286e57a018a7a6b2dcf25bae4f663225025
+DIST git-publish-1.8.0.tar.gz 21961 BLAKE2B b693eb798527436b17f1c100d9d9bdb045322741d72c3c0b934765a2b9db8ac2b056160db33c4786ce6410a78fc7529ce7eec9aaa1cc436675bef13bdb3bdea1 SHA512 8fe01b354b0484ead603cc8702c6d0d2702ddde50cc44d0e7d4f5c9ab490fd74ac6011281840b369925a78ee7b11355f40ed856af5456fdc46bea644a6a35206
 EBUILD git-publish-1.7.0.ebuild 913 BLAKE2B 8a95cd61903dd64675c3fcde220b41170aedd9f19e79fd6fd9a435e03c8b887717a0fcb82cf18d599adeaa82feecbf4300c00a5580a392f4469c9978bb8affe0 SHA512 7dbcfd568e2186c352f495ac27d79798df4f0aeb039acb5feb0d6df851ba028e127f636e0befa012db47907778e28a86cc7df278615d1723ed4c1c8e9bcc8bee
+EBUILD git-publish-1.8.0.ebuild 919 BLAKE2B f72d22f1baf407866325c2250a64b68e164bb965027f4843e6f9a5406a75240acb8dbff6441e08857dcf2c82784566ea21d13661053d33f0497a02ebff2c39ba SHA512 660a3a796db8b6f16c0f3ada7db102ba4a7a10442f3b5c796a27e63f67ada7b4a74cbfe2e7f7d6d0bae12f430b377b90eb40d2f775989a95cba98c6098ed366e
 MISC metadata.xml 577 BLAKE2B 2d017406877f13e6470b989b1806809bfd67a5d4a6ab54518e17a12294877e80a8eb88ef90adab72145740982b38a47677276707ad1670f2ee33d5d028903f7a SHA512 ebbbe9e1c883a579b79134915661c65176951e001f5c847887b458802fdd0975536f7ec867d7ea7454eb0ea231d6166eee6baf7222af4eccdcefa5adff2c89b3
diff --git a/dev-vcs/git-publish/git-publish-1.8.0.ebuild b/dev-vcs/git-publish/git-publish-1.8.0.ebuild
new file mode 100644
index 000000000000..e88b6924fa56
--- /dev/null
+++ b/dev-vcs/git-publish/git-publish-1.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-single-r1
+
+DESCRIPTION="Tool for preparing and storing patch revisions as git tag"
+HOMEPAGE="https://github.com/stefanha/git-publish"
+SRC_URI="https://github.com/stefanha/git-publish/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+man"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-vcs/git
+"
+BDEPEND="${PYTHON_DEPS}
+	man? ( dev-lang/perl )
+"
+
+src_prepare() {
+	default
+	python_fix_shebang git-publish
+}
+
+src_compile() {
+	if use man; then
+		pod2man --center "git-publish Documentation" --release "${PV}" \
+			git-publish.pod git-publish.1 || die
+	fi
+}
+
+src_install() {
+	dobin git-publish
+	use man && doman git-publish.1
+	insinto /usr/share/${PN}/hooks
+	doins hooks/pre-publish-send-email.example
+}
diff --git a/dev-vcs/git-pw/Manifest b/dev-vcs/git-pw/Manifest
index 9dedef7ce17d..b3a00fcf8641 100644
--- a/dev-vcs/git-pw/Manifest
+++ b/dev-vcs/git-pw/Manifest
@@ -1,3 +1,3 @@
-DIST git-pw-2.2.3.tar.gz 33605 BLAKE2B 6f8b72b1ef8cda3f5dea568ad0e872d3c8f1795bf9889b76cd281bc19b303a903baa38a89036511b2d1496b258b37e843fcbc333f5a86735bcae6f3d22f3a320 SHA512 06a34e1cc3a7b32b44a6042abf17d00f5b648039ce091885bf19638457f3800f2daecbcd03ae9da2f48166bac53a2219735e251145302bcc98a9cd29fab7450f
-EBUILD git-pw-2.2.3.ebuild 1081 BLAKE2B 604bb491fb2de2b9d8286744a78f27c45c0948c6f5557386851e235d166fb5a388eb3479b30974b9cf679791fec33851eb0f309a24346999f724c3003c768eaa SHA512 2b3f4e26686531002ac1b7e8a4203d2394e16dca72a73be67973295fc30025168e9dc20d9765aff2c34069bf72b28218ed0e19814834970c0ac6fe312c7b7829
+DIST git-pw-2.3.0.tar.gz 34301 BLAKE2B b1bba3696c1d658ee76900d0787121dd5f89143774c7f7e79971f89b391d66c454a3f3f4103c35bc6a0bd77113e990f915b8313b855f7946518c033222e26419 SHA512 b83d7ad5c8e4f7f28e6df09ea286cef41940b76d8ac0eedf1993a7beeefd8a62298f4a4f9e6c0988c68811091f1740548e85ba1b689464447fa7fe74d31eb7b6
+EBUILD git-pw-2.3.0.ebuild 1087 BLAKE2B 459298b7449d9f98d02fc0acf672ba1ee0acf92729ddd7fbcf6cd9e8156fe04da92d8a53d67d11ed495b232944363d7d69eadbc413266a7a3e7a60144b2076a0 SHA512 85ab605d8703f63b9ff1e3b38912f75987b827a1dd8688bc624dc7e6d0ebadeb9f714bf87deea1c8ea1e0e4cbf57db4ba57bf5f6b9df500206c66a6117ca6dc0
 MISC metadata.xml 573 BLAKE2B ea8a1646462b2ff59f05531d1964c160216b7c19b17e261a75940e591106195050ad9ba65f3b5ea594d4a4ad53cfda7cf7dbb1894c6ac850a6b5c9e189093432 SHA512 cc0a718a6d9bd29c5a77dc3f23a4f4b691ab0c954c6c2a7266126c2cbc312aab73e5484120bad031e77abcf0c1cbff2c7af998700e45eebc51fd73facc988f8c
diff --git a/dev-vcs/git-pw/git-pw-2.2.3.ebuild b/dev-vcs/git-pw/git-pw-2.3.0.ebuild
index e7caa3775a7f..340a2c3bdb5a 100644
--- a/dev-vcs/git-pw/git-pw-2.2.3.ebuild
+++ b/dev-vcs/git-pw/git-pw-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ IUSE=""
 
 RDEPEND="
 	>=dev-python/arrow-0.10[${PYTHON_USEDEP}]
-	<dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.0[${PYTHON_USEDEP}]
 	dev-python/pbr[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0[${PYTHON_USEDEP}]
 	>=dev-python/tabulate-0.8[${PYTHON_USEDEP}]
diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
index e7e438c791b2..c8abb6d1c1dd 100644
--- a/dev-vcs/git-tools/Manifest
+++ b/dev-vcs/git-tools/Manifest
@@ -1,5 +1,5 @@
 DIST git-tools-2019.11.tar.gz 28769 BLAKE2B 97dc7dd238b921075cd82cce9a0368309c9cbfd946715063cc05d0638987c81ae81dda10a6a24f8753a6e84bd558c86efea0bbc743d0a63265187924b66536d7 SHA512 091186d78f69bbc5c7b4673d1a3018d642aaf1b6820d7d995712bb41e9da861576f1ad780c5d2380ba75f80843e7cf101bc9e2409bd36f7dcbdb78fe923a8736
 DIST git-tools-2020.09.tar.gz 30365 BLAKE2B 90c6b00b6c88037a90a0987f78ce28e6a9568a05cc750a8a2722fae74e7f7ad63ded5365677446cd19dd9a219c0dce550f8a63c591350cbba7af46837369d981 SHA512 48a6f36aab3e51c2ea3513473b2fe80107d19f131abf89f607492b6fb117419e11c522322beadae5802a1d1388b3430bf48e5dcfec53597453275f62bf13b05b
 EBUILD git-tools-2019.11.ebuild 912 BLAKE2B b8e05e09e7d620ab035d77613cd627585c890e813f2a2c0d1f2d148e5f45a4ef84b523b65f7203e39afaf131a6a8b6bf47381483bbe5d37136178ffbd1e8f949 SHA512 ba5bfc34897187c9526c6c1dc83cb07744e0b9bb212985b0991eec4c283e4ae7a7f26728268d438460744ed6226ced2a87521bbe72e7aa3a70dc4f85c64070f6
-EBUILD git-tools-2020.09.ebuild 912 BLAKE2B b8e05e09e7d620ab035d77613cd627585c890e813f2a2c0d1f2d148e5f45a4ef84b523b65f7203e39afaf131a6a8b6bf47381483bbe5d37136178ffbd1e8f949 SHA512 ba5bfc34897187c9526c6c1dc83cb07744e0b9bb212985b0991eec4c283e4ae7a7f26728268d438460744ed6226ced2a87521bbe72e7aa3a70dc4f85c64070f6
+EBUILD git-tools-2020.09.ebuild 912 BLAKE2B b5f50f7b697d008163a4d0efd380ca537555fd9366e441736a3154e5de94ddd1fc8eb8adf14014112c113f5b8fcfea249c3a1bfa7028613780417a3bf35bf347 SHA512 3a4f97a547451f1b052e1ece3ff5290422331b517bd2eef2bfbfef26bed966b4fbc63e1fe7154325f50c3736d0a0c91061d559a0d5b81c68c3ce74aa567db960
 MISC metadata.xml 328 BLAKE2B 540d0e55302adfe743eca2fbc024a3f31c4fe8e22051600c02fbf23976e10ee2beee5dc1de6afb57838a26144476e972848b88456afd1ceb834a7a222d3333bf SHA512 f8fe766051f8efd0a1efb00faf0c46741db7a74d60c60f85d3776f5ea5cab5ddd4e731879f026fec82fe60146da6325cbf08593ce7a3f75d713c9f36e403233d
diff --git a/dev-vcs/git-tools/git-tools-2020.09.ebuild b/dev-vcs/git-tools/git-tools-2020.09.ebuild
index 33ea09d600da..30e717967233 100644
--- a/dev-vcs/git-tools/git-tools-2020.09.ebuild
+++ b/dev-vcs/git-tools/git-tools-2020.09.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1
 
 DESCRIPTION="Assorted git-related scripts"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 14bf43bf2f6a..8e8fdaa944d5 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -19,31 +19,35 @@ DIST git-2.34.1.tar.xz 6623760 BLAKE2B 9b5d7a450ec495898bcc0e1f6ae87c0ad102d039c
 DIST git-2.35.1.tar.xz 6874520 BLAKE2B 028ff97b47748871da145720d0d258a0dcf4acc60b10c787dee5703fcab5f6e621c5671ee9e7a25009e82a2830400f35fa232d88c62606a6687260c744680025 SHA512 926c6813ef61931e1a1c43dfd7b15e20dc5878c1752876bd08f039249c9ed09f20f096b2f01947de9c9522c942e9fa8c1363d7d31a488bbe3f93c0cff31fcbcb
 DIST git-2.35.2.tar.xz 6876028 BLAKE2B 2d59f0ef195770b3bd57ef8160ab24da5e14025316bb0cce30048116c71e9c45f0818a12a95a84f680071454ef80e3071b615c64a165771c1c8720c20ff4dba8 SHA512 fac143daf547f4f1952101bc0006b53ac50c1741394a8c75dc517f595ce58b183c7daabcb23a7f9fc87fe22250e298441b0b7cc7af93820110877d65c036b76a
 DIST git-2.35.3.tar.xz 6876328 BLAKE2B f584e9d94d167ba19bd2a00377f04eb4edf69cddbd2993a324178338b2e20e7fd126b51882ac7c7914c5118d0eab1ff9beddeb96a901a18fdfe027e21351ab61 SHA512 c92f8663988c57702bb5ee542ac8f36e8a43d377d16106ee462ce0b0a575b9d51baaafc654bf1821fbea2fe476ffd64d7fb87084c7de4dd8065b01d5083492c5
-DIST git-2.36.0.rc2.tar.xz 6960596 BLAKE2B 72373db94576a96aafacf3eb63c2041ca0577c647e07d2f23187b29507245fbf5f5a000726d6d61037be14b762f3bebbee1b2997ac4bf265ddf840c2e6c91055 SHA512 dfdd49fc7d25c6e2c4291afd5e9c234f4180226d9219cb6e70328dfdeb585a982a2f3b375ede578570825fff9f68ea126b3342512644906dc4333f9f953fe4a3
+DIST git-2.36.0.tar.xz 7003024 BLAKE2B 72bb148fc5fded2976554788eaf599d20fe9f200ac1dd1ddd4ed89f7f5c8d6c1025907080620bab477b4efadf41d883e890dff73c80d0ff5f0becd83f13ebd88 SHA512 dce0d7dbe684af070271830a01bf1b9cc289182f5106f6e3303b1b3a0d5dc74bebf6ac0174373db05a28f5acc62acb095bc9385dabeeecc1d6e8567dce29b766
+DIST git-2.36.1.tar.xz 7004044 BLAKE2B 99f54efb4ea1d8db0e3afd3dc9780cb37fc853e4757f4b37d68a6badd90eeed3e2943c97393eaed6adf61c82b97b5d01ca8d015784f5425072b1db14d39144ce SHA512 459432bd0c1d5a87c828a6fbf6d3473f14bf6b95783b3f27ea4f3af1ba9fd0e712a96a41276a16c6ebeb7ac3583a5f445eedd0a9e19fe160c2c8e309ec58818e
 DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f
 DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74
 DIST git-htmldocs-2.34.1.tar.xz 1406464 BLAKE2B 6ee2f58df3c1622d96ac4b1a70d4dc3d0c973635774dd6bb89fea3e502dd82d99d676e2f9cb33c14c429c3d4680cd6020213154099b3f7fe71ad67602ca9bc6c SHA512 cf9fa952d43e477528deece9f22d1bb63fa50b3a831fae20812c6af31c1dbaf193abe2fed48ac9966bcf1787442ceed19f00c00e524a1911f0ea31952a52fc8f
 DIST git-htmldocs-2.35.1.tar.xz 1410148 BLAKE2B 68c3d12341271b861f42135bd4bd6e68ebcc6466931d383378b49aac42f77187f3fadc237974349cb0b50e4c5fb7a8ab185114341dd3012d159e420405d9ef91 SHA512 52a40644a7cd38caddecc43182863ca2f456644fff918ed4c8f826cbf269352c73d6bdc9119d25fcf537bc2fa38750791013329e4b0e32c8d14f0769dab85804
 DIST git-htmldocs-2.35.2.tar.xz 1411248 BLAKE2B d4f318f6277015bb6aef3a556bbf7a9a6b02a7cf2f1ed696bb730b6a5fb32fe3dbdf01cf1737e2931f182bf451589349de53e7d02a868d40b013018973c5fe89 SHA512 118576bfeafd92b8b0dd92318504d74341a003358d937545c16fefcfde6b956fbaee0601e50b9a21719d2575a5a37585e36628b4ade8e42d9d0fec4ae616eaa0
 DIST git-htmldocs-2.35.3.tar.xz 1411664 BLAKE2B c7d849b9573a257de47fc8d654f7f791d21917cf65315b4ae6909ba2ebbe90970bc9e6c9949266913b1e529e662bfc375acee26ebf9304162eeccc87ce3da067 SHA512 52b97dab838fff1a865ae4d449fbb77fbac3c528666d1b936c73bffac856f16583d1b182379bc4e6851f78bccab519c3ea7e5902fc502b2e8ab7bb85043c7eea
-DIST git-htmldocs-2.36.0.rc2.tar.xz 1425784 BLAKE2B 9fe3f1e24c063776bb84fdbea6e624dc1c6ea22e88602dbcb3879861610bb75c497b93c6a795041c2da55829345682312fbb3a513359abe67c5ad056b332cca3 SHA512 cd7dfe6169e2c4818a4aa9bd561b564a4ef9e1c199301e55ddc11bb8608e6195a9258aea7b90d6e512dd99c38997ff0c3bf847f02740d8f60261d685aec8f042
+DIST git-htmldocs-2.36.0.tar.xz 1426148 BLAKE2B ba121e8f7d6a232f3df2b5a50c0f4a798c80808562c710f306f26fa79c124e5e1580c0626a2fce04f4a17b96d40a2683809550f37028cbc436b359de91100599 SHA512 62ee14c2f1ff34c0fbdf281ea2bb08bf6a24850d1d8dc68ffb12ae15e343c167ac869559395769fb352bd441baa8f2d45d696923a04e2f04bca921c990d75a9d
+DIST git-htmldocs-2.36.1.tar.xz 1426284 BLAKE2B 2213f870b7fe35cc76ce8654ed8c50c0e9694c58acac4aa2350f826422db6bf2fc238fbd12075f98e84539fdf6ca5624984e21844d1d1c1ceb90e3b090438a7d SHA512 3aa2ca197a789161571a6961dae8c2723ff5ba05a2d8ce7443f7fd9ef46fe5a3d001364831345f3fc4e028140022d20afefbabdf4a82cdeb311167793b292c1f
 DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
 DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
 DIST git-manpages-2.34.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
 DIST git-manpages-2.35.1.tar.xz 497284 BLAKE2B 2d0d633320982243316575cc278df6c6a9ef181bf45ea9c1c8288e2677e4e71a33af96bada9bd90b03310be7dd33f2762b6b95489e267e2c191dcc7d1a715fe7 SHA512 0f4c46880f0e6d493112dcd4753fbe3702c06aa68be09bcbfc90263a355deba080995a08916b1f2404e4e17d720ee0de46a55e450c6cabeb1c147dcb2cd919d5
 DIST git-manpages-2.35.2.tar.xz 497548 BLAKE2B 5e7c9e85879e57e5b157dc8d0a8b836d86e56e91c512079e46869b6e251cfd40d3a7016996cdb2d2323ca47180e50eb5d5f4bc93ce87713d61b34dcf714ba90e SHA512 70d483f2b14f5957c0b71cfc1131b0cfd8038e824ed93dea4b866fa539d582eb531edc284d89b70c188c85d0bd74096c171bbe42f0be550c6c14711b101a4046
 DIST git-manpages-2.35.3.tar.xz 497672 BLAKE2B aef5a7c579392f55fa63f1ce36c03579f4fcce443e867ac2a162a3d72344639ee11949748a51547315579b37e0fc6d5915ea203ddc556b2511125781428ce001 SHA512 25ac8f1690ccbc0e36b7d05115aebde1911909307ac29d930158b61ecd68972b8a9c3af018d73f34251d42cabf8d3d392173a448ec948df0a3119c2a2b87bd60
-DIST git-manpages-2.36.0.rc2.tar.xz 503736 BLAKE2B b376ab4d805b574ade1201daef6af7b06d16d0e742418a28410b7627ec3752679327d622e1ea436ac2dace0e3549254e310acd9bb79608b37a70595caf60c016 SHA512 f19669a46f3f0a44d850689029ef489592154271c519d3c2feac68bca9aefd97dadaa81e59f7c20689134656d447341e3a876aa7b5fbefd17789654edbc2e8d2
+DIST git-manpages-2.36.0.tar.xz 503604 BLAKE2B 438f533dce6628143c0ca348bc372017f049126933bf07a63ce9150114632a048778d8e0876970b406144aa584d512470ae4426be9c5bb8a3a581680ac9443a1 SHA512 67c2fb1c974ffe15aa09b9c36338f3ae9805573b35291e128210fc99c9fd97b1e26be571819d6b073c5adfe4c6f688c15e31790aa9eb62c1effacfb8aa21eb1c
+DIST git-manpages-2.36.1.tar.xz 503680 BLAKE2B d43fc90584b2f9e3bae30460f0c545b4fb96a5c70ad03c73d655481e5737b75a8d7a293db5bfdd752aabfc835a4a11e77474a5a0f144c8791b2dd433a3e45b70 SHA512 dd2fd6c5186aac53d7834ccf0cb6c380758624bb4583c6c5703b5b7a24c65d4199403fbcf7033c69bd3dcfbe048baaef3e886b9ba99c8afeb375e18e5b3e6e40
 EBUILD git-2.32.0-r1.ebuild 17992 BLAKE2B 703f1d8fb18c0ec56be69c58bdf6a9048d551b76cf62f914f3f888992c34c394f131d1e104238af55c276170b34f5687e0fa664f8fbd880fdbe70bb00fd749dd SHA512 8d3a490eb7ca1b2202ff4d45453ea1e57631c7abf2d6973f1b24150a6461b880c80702bc0dec756e7cdc4cb6d0102005b346f6b5653d932d046f1a7c68495547
 EBUILD git-2.33.1.ebuild 17888 BLAKE2B 76bf11b57727a9c2a8d9cf30f75a13f9ae5fd6942c974dc53e651e24a3069da5fa311cc44d9c98bcfbb4c07eae50e8910d8903e70eae82d52bb621d9d314886f SHA512 9649794b74c0ab250996806b5336878c44865175b5f81528b9f68992f732b4fe2c45a57826882722b78c1313b6285447b85f48671bb84a981e025d92684c125c
 EBUILD git-2.34.1-r1.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
 EBUILD git-2.34.1.ebuild 17887 BLAKE2B 3823133aa91e9fb11e7ed1f4094cbdc27b94cc8e45bbed46c82d671ada31ec698984cddfd05c81f829ff58b041e5c43bc908e876a2f71ca117d3c00636ef65fa SHA512 2ae6cff9fbbcf4c6b00a5f623685236a41651b17a45d6b850962846202d147702c4aac7c46120b7772464d2b318994a3c68c4bf3323f4b6f01e8f799a5a414ed
-EBUILD git-2.35.1.ebuild 17887 BLAKE2B f954f4628bcc4598087a907102c2f3cb2d051be920a81082716cc03905ea2958cd3fef7eaa8f2aef79bf0676177d1dbf6b70c618de43d8f9f8fc0063e2b59c76 SHA512 982d67956645aec48902194c7c91d3beed89ffe7f009e3e85ba7bbb0f92eb6b9e862252e38f2396396a0094cc121562f00cf94b8948dd2ce1660a16d653107ee
-EBUILD git-2.35.2.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
-EBUILD git-2.35.3.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
-EBUILD git-2.36.0_rc2.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
-EBUILD git-9999-r1.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
-EBUILD git-9999-r2.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
-EBUILD git-9999-r3.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
-EBUILD git-9999.ebuild 17895 BLAKE2B 93a38c9adc4d3c681e7c5a03ae541e1369d3dc46bc247bb40d3f82ea30e21cd29dbf54efc492b533541bece6080dac5194d01eb9b4995e223a31cd8ecbe48b4a SHA512 c3c4b9c28775d43a9353a4987a89d28565bfb7b171bfb058086db85635ec75df45f69f3d325e260a6472f0f449f21a49cfd38b02ebbebf61f461bd4f17392478
+EBUILD git-2.35.1.ebuild 17939 BLAKE2B 83fd9db7a6f1077a5832cbbe56e36f5ae789552cd77df9b630189570be3e4de417bf6d7fdb3b853fe2f439a6d727c47b4f51abb5b147c206a4117b0457de3fb0 SHA512 94cc5c3b5c44e8c75a39805b26505789b35d7b7266b3bec5ee294ca0dc2e1868b10bb8ba48b4fcb47c772fe5c16855f1fe759e2ac62402e178d801c2bf113ce9
+EBUILD git-2.35.2.ebuild 17902 BLAKE2B f9899b344ec0a193a7b4a1293be31028acc3958e208ca64ef0ac668351e9f705b6ac2ce04c5160062a1c0e2791c2e9027f4e841d3728d08e129b7e509a2ab984 SHA512 b44aec4f5330fcd3481d03956069573fadcfb0c2cd7e4ba4d569b70465f61f9fa4c95b1d009d9c0006759c6596b13895d6f711f99cae10b54076f4ce1f82f86f
+EBUILD git-2.35.3.ebuild 17947 BLAKE2B fc84f4baafea48c1115ad1bdbca3019283ce65dde0a9c0789661712efb0db6037b15c577d02ee0d348e175000e9b2c00bf47bd6164f21c9da414b32959766953 SHA512 871fb9478d8897d529e4a894c88f1faff594e9ab2473ffd069632e1e1543c8e047bbf9fb37c462ec54da943e0311482498060fecebcea77367285f8d054ee768
+EBUILD git-2.36.0.ebuild 17947 BLAKE2B fc84f4baafea48c1115ad1bdbca3019283ce65dde0a9c0789661712efb0db6037b15c577d02ee0d348e175000e9b2c00bf47bd6164f21c9da414b32959766953 SHA512 871fb9478d8897d529e4a894c88f1faff594e9ab2473ffd069632e1e1543c8e047bbf9fb37c462ec54da943e0311482498060fecebcea77367285f8d054ee768
+EBUILD git-2.36.1.ebuild 17947 BLAKE2B fc84f4baafea48c1115ad1bdbca3019283ce65dde0a9c0789661712efb0db6037b15c577d02ee0d348e175000e9b2c00bf47bd6164f21c9da414b32959766953 SHA512 871fb9478d8897d529e4a894c88f1faff594e9ab2473ffd069632e1e1543c8e047bbf9fb37c462ec54da943e0311482498060fecebcea77367285f8d054ee768
+EBUILD git-9999-r1.ebuild 17947 BLAKE2B fc84f4baafea48c1115ad1bdbca3019283ce65dde0a9c0789661712efb0db6037b15c577d02ee0d348e175000e9b2c00bf47bd6164f21c9da414b32959766953 SHA512 871fb9478d8897d529e4a894c88f1faff594e9ab2473ffd069632e1e1543c8e047bbf9fb37c462ec54da943e0311482498060fecebcea77367285f8d054ee768
+EBUILD git-9999-r2.ebuild 17947 BLAKE2B fc84f4baafea48c1115ad1bdbca3019283ce65dde0a9c0789661712efb0db6037b15c577d02ee0d348e175000e9b2c00bf47bd6164f21c9da414b32959766953 SHA512 871fb9478d8897d529e4a894c88f1faff594e9ab2473ffd069632e1e1543c8e047bbf9fb37c462ec54da943e0311482498060fecebcea77367285f8d054ee768
+EBUILD git-9999-r3.ebuild 17947 BLAKE2B fc84f4baafea48c1115ad1bdbca3019283ce65dde0a9c0789661712efb0db6037b15c577d02ee0d348e175000e9b2c00bf47bd6164f21c9da414b32959766953 SHA512 871fb9478d8897d529e4a894c88f1faff594e9ab2473ffd069632e1e1543c8e047bbf9fb37c462ec54da943e0311482498060fecebcea77367285f8d054ee768
+EBUILD git-9999.ebuild 17947 BLAKE2B fc84f4baafea48c1115ad1bdbca3019283ce65dde0a9c0789661712efb0db6037b15c577d02ee0d348e175000e9b2c00bf47bd6164f21c9da414b32959766953 SHA512 871fb9478d8897d529e4a894c88f1faff594e9ab2473ffd069632e1e1543c8e047bbf9fb37c462ec54da943e0311482498060fecebcea77367285f8d054ee768
 MISC metadata.xml 2225 BLAKE2B 3744d602bb87d31fa9da5a4f6cc78e1d7251024323d1c2ad3f3e0b2ef78de61041fecf7026f0ada5d856139852776e8539b0a9f9fb5b32b3ae742ae6a9d09cda SHA512 3629e08d8ecfe05cc194f3ba03656308da2c7bcac5bd33cbc967b5a4269a60538ff4e119fb9d1a4e59c5d53c31659c55d5fdd0ee52473175147f8fae73a4cd22
diff --git a/dev-vcs/git/git-2.35.1.ebuild b/dev-vcs/git/git-2.35.1.ebuild
index 7460fffd2d2b..cf75fd8cdeb0 100644
--- a/dev-vcs/git/git-2.35.1.ebuild
+++ b/dev-vcs/git/git-2.35.1.ebuild
@@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
 		)
 	)
 	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
 "
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-2.35.2.ebuild b/dev-vcs/git/git-2.35.2.ebuild
index 075208f7ce0d..69ecee409630 100644
--- a/dev-vcs/git/git-2.35.2.ebuild
+++ b/dev-vcs/git/git-2.35.2.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.35.3.ebuild b/dev-vcs/git/git-2.35.3.ebuild
index 075208f7ce0d..2193ea335c7a 100644
--- a/dev-vcs/git/git-2.35.3.ebuild
+++ b/dev-vcs/git/git-2.35.3.ebuild
@@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
 		)
 	)
 	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
 "
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-2.36.0_rc2.ebuild b/dev-vcs/git/git-2.36.0.ebuild
index 075208f7ce0d..2193ea335c7a 100644
--- a/dev-vcs/git/git-2.36.0_rc2.ebuild
+++ b/dev-vcs/git/git-2.36.0.ebuild
@@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
 		)
 	)
 	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
 "
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-2.36.1.ebuild b/dev-vcs/git/git-2.36.1.ebuild
new file mode 100644
index 000000000000..2193ea335c7a
--- /dev/null
+++ b/dev-vcs/git/git-2.36.1.ebuild
@@ -0,0 +1,661 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale 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="https://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: seen
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		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} )
+	selinux? ( sec-policy/selinux-git )
+"
+
+# 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
+	)
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gnome-keyring? ( virtual/pkgconfig )
+	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 )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.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=
+	)
+
+	# 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
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -Fq 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
+
+	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
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
+	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 || 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 \
+		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* ]] && tc-is-clang ; 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 gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree || die
+	# 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 || die
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake || die
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; 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 DESTDIR="${D}" 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 DESTDIR="${D}" 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 DESTDIR="${D}" 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
+
+	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 [[ -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-r2.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
+	}
+	plocale_for_each_disabled_locale 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
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	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/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 075208f7ce0d..2193ea335c7a 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
 		)
 	)
 	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
 "
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 075208f7ce0d..2193ea335c7a 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
 		)
 	)
 	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
 "
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 075208f7ce0d..2193ea335c7a 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
 		)
 	)
 	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
 "
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 075208f7ce0d..2193ea335c7a 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
 
 # Common to both DEPEND and RDEPEND
 DEPEND="
@@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
 		)
 	)
 	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
 "
 
 # This is how info docs are created with Git:
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 0b0c0d0cc5db..88b36029a61c 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,5 +1,7 @@
 DIST gitolite-2.3.1.tar.gz 255807 BLAKE2B b51a664d6e786702cad999fa8df6d86f80eb9cc908ed092b55272c59a4bd52145302e638612f1788d68b2445b8c665f025b24c47d50992dd3f6ef2fd6eb63ee7 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee
 DIST gitolite-3.6.11.tar.gz 198340 BLAKE2B 9daf1e2cb2ebdca652d87aaa67b433174d35ece2ad859de6c6d6295f453b6fa86d15240e964fdc58fc4ee5b1018b935b7032e6bacef9743487189857782220cd SHA512 7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212
+DIST gitolite-3.6.12.tar.gz 203704 BLAKE2B b70bd8108f6c9d0e6d8776ab4338c523b0f27db305974fa40a0e074908302f8a8803fcf2f88a4c3e9972311b400142d7e3f9569d7ebd86f7343e2b70e3701d6e SHA512 f6a7f4daf8a6f73db823a95cd677c1c436e04a05460a239b5844468cf0f3e6f8da1b1cd86d98c84bb8e80e5ca446c9afd0ca221cce622398c0d0a3ce18062c22
 EBUILD gitolite-2.3.1-r2.ebuild 1448 BLAKE2B 5635d6b5666137d57635d399edf6c9d8715f509019848cadaa69f297d7c340361ea2c12e5b22b3f5ecf877cf4e231268142a0e50da25d92defdfec6c3dd3854e SHA512 1a313c4ad8bf4dc6c61c569cdf0ca1ba3f8f566f2156756c6fd3f4881b7330b299f8e6a6e4b1b774dabfb6f271323ea686d093f928d19a69f173362c500baeb2
 EBUILD gitolite-3.6.11-r1.ebuild 2287 BLAKE2B 24af50177b11371b4fb2094c14abcaf7a956d65eb5a4c291effa16ad8e3699696e54460719f547e569309ec500ba40cd0861ff7481c8195aab6b10d848efb8a4 SHA512 7cc604adfc2640b91f55920c7fc757b29790bde29ca8c71fe2fea2614090528498e89a0f1f68b08b351312f10d84636b2f002c6624a05e04bc27fa4d80ba95cd
+EBUILD gitolite-3.6.12.ebuild 2232 BLAKE2B 25d8c01b2be10e2cd44f34d20092ac74f5ce90f46260f3539b1a76d5e119f9873a56a1b92e07a5cec2e2cc4a4d8a13f70d037e405a17a203c637adbfabbdb625 SHA512 7fed40fe0e4002c7ef7748b0d9bb986d20f176bf01e346a8346c9a8a903c43141e74c8fc8e8976e9eba0dd14a967b5143f30247bd932757f77d5ef0b9389d740
 MISC metadata.xml 782 BLAKE2B 4200d317ed8e94aec00251d532408b25ac3b93433f136870bd2d991517eb3360064a5a2514f4d8fa12a53b699107a971aed65ee474d9391b0436c34a85625412 SHA512 e0bec70e3165fb253fa01a57133f5dc592117e8a5679a545902b18266b137bca1083998af8fa771c826a89915cd3c0bb2ea7b848c453bdc740d25a83f595dcc4
diff --git a/dev-vcs/gitolite/gitolite-3.6.12.ebuild b/dev-vcs/gitolite/gitolite-3.6.12.ebuild
new file mode 100644
index 000000000000..99fac58cfa00
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.12.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+else
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools"
+
+DEPEND="
+	dev-lang/perl
+	>=dev-vcs/git-1.6.6
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/git
+	acct-user/git[gitolite]
+	!app-vim/gitolite-syntax
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	dev-perl/JSON
+"
+
+src_prepare() {
+	default
+	echo ${PF} > src/VERSION || die
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/vim/*
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym ../libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${old_ver} -lt "3" ; then
+			ewarn
+			elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+			elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+		fi
+	done
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 9c510d6962be..6a929907ba4d 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -136,6 +136,6 @@ DIST zstd-safe-2.0.5+zstd.1.4.5.crate 9002 BLAKE2B bf92884b629d5685dd563e481e63c
 DIST zstd-sys-1.4.17+zstd.1.4.5.crate 2046794 BLAKE2B 40584094797d4cc479cff9d1b89abd1f7e800f774725dc03c531b67078027d5b82464984d4e2a76cabcd9d336234d245f93692d0111e2469ef21ca1ea6260d77 SHA512 89439b20e4e0bce6455d982fb7467c45436ee68572395db662d056eb2e09e95ad600947bf11c27ba60b161c2e2511e04cac8dcfacc5f85fcf9222d4a206bdc30
 EBUILD mercurial-5.8.1.ebuild 6854 BLAKE2B f770387e422cad977784c7e04bd012278fd38836f66e9409d5a5f6b513df6a896fb5f6d12680e7be6d4a14ef4c2016bdba5914f2746979917e5d6bd819ada8f0 SHA512 7fa4bc727d2ff7e7155a028711f8580d236be8f577475ab64d0a3f6214719f4f694a379f83989587215de3b5751fcb750299860302c3b7eeded89e330b43efa2
 EBUILD mercurial-5.8.ebuild 6676 BLAKE2B 764f960f06ce74ff16c3f958cebcec1f5c1bb1f6e61851891cb547c3d14a37a85d9a20dffdfc50fcc03d2611d5a7839a85b8162692112cd0628aff5b0f1e0377 SHA512 f8ab81447eaa6f778177c1e53480b3f98507003f69f360c14c19ad16d1a73eb1daab94db1ab3f110254b024b35151c8737d081f4db05cedefec4395ce86feb94
-EBUILD mercurial-6.0.2.ebuild 6776 BLAKE2B 2182c47c95b432ea1df957695bfaac98edac77f04d1cce52c81c723382dce356cecbc6d6240583bd1160e3b5b4f7a9c271020a7b18d015fec0fa2d06762fc66f SHA512 f84566206fd25b0b47b95ffa3e7c5377435ab23545b19805307a0ce1827d20d7eacd64bfc160be298981ced7ce168cb307d4c04652619ad504a9db3a10d9d319
+EBUILD mercurial-6.0.2.ebuild 6783 BLAKE2B d890fd7bc91fb064cc554c9a9e8111d6483eb6ee204aa72986245f962e0afd8fe2414d98df793a8ca2f4e0d7b0b97f2aa38c8a8a6880e0c50e16c198da1073d8 SHA512 94e4400da208ce0bf5506e71cd830293941d57b212d7150ac99b565d14af0295d06f045fe02ae57a30599ee1ddd1a612a9ca3d962ca95817095b32bf6bf2efa6
 EBUILD mercurial-9999.ebuild 4364 BLAKE2B 4833c149a5066f4601e5241b39b86e04e9b5000899da2588c90d18891c974d94e672993c51426ee47e839e7138e733e02482248ec794417af90e6f64b6d00bf9 SHA512 538b668c903ec40e4142bffcbb3e34ce3f6cd034c2f7019c397f149010397df170406366ab12dc0cdaa200678f2aa043b87afd65150f84e7f17c233dccefeca1
 MISC metadata.xml 532 BLAKE2B c25f7820716a18cf155149294fde42126376d025fa569043d6b7fc25f6d1fe87e37b22424cde59d2437ecd6a6b75f0258b5a06282d3f2eed0b928bd858e0c0a2 SHA512 c4be6ddb455c2464ebbbffcdd0c2545b064e1a2058c41f418ddd96704688e08c48c7ee71cdf005a8b9b90f6deaab595c938a6ba9c8c788559dfc62e6b65a76ba
diff --git a/dev-vcs/mercurial/mercurial-6.0.2.ebuild b/dev-vcs/mercurial/mercurial-6.0.2.ebuild
index 2950dfdbe4ba..0f99427a0149 100644
--- a/dev-vcs/mercurial/mercurial-6.0.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.0.2.ebuild
@@ -134,7 +134,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
 LICENSE="GPL-2+
 	rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index de7676c55546..7724ec7ae148 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -3,6 +3,6 @@ AUX rcs-5.10.0-test-t632.patch 976 BLAKE2B 95837ba618cf67ffb46c58b9389933615874e
 AUX rcs-5.10.0-test-t808.patch 895 BLAKE2B 77f406a10101aac745b5ce8eef14514eb4b7722a0b8091f3e39b2ad5db8fc5e569aa51abcccbf90c7278a3dfd3a84b1e95c4c949c8140b1f84a9fe9c37cfe686 SHA512 15e81e6eb3520101237bbfd6d45fcf80155084f13f892d1ac38dc216e7f5aac1e2a469a9546dea8711dcbfba37b8079a6a9c93f50b0387bd936323aa456605e7
 DIST rcs-5.10.0.tar.xz 890872 BLAKE2B 32000df00c639cec90fb9128503b67957a23c82a08651953b57434c3f14ecea555155da933d5be801ad216aa27ccf496a7aae325cecf73f9bc121f3a3c659cba SHA512 d42bded1214f27dfcbe912bbabad8479555a02bc57000a62512d63ff0672de1ed23911cd15c9d1aa4b9a53794ac3fd45937fa1cbc0fcb9d54a3ede4d831f76d0
 DIST rcs-5.10.1.tar.lz 917331 BLAKE2B bf439b2bbb6d5d427f28b13d739f2a5902aa3113e958528028ff553007ad124a8c386141e10ff2d0157468d893e1da4a19240acb373a3f375aa21d97c187a4dd SHA512 4d3755d704a05da8582acb78a83845885f34b3144af6d19c568e6707831563b077ec5603a12f5d4de6ec583d0886d3a8ccc7ee0e1f10070f9e6de142198cd530
-EBUILD rcs-5.10.0.ebuild 1001 BLAKE2B d3d0c7cc9781c8638507be99650af5e3960e4a332f5ef506813e6d1510d68adc1cfd773b5754aa121c1e5d058ac0092f2fd169ba1eef71bcafe1c166042bd6bd SHA512 50cae1a7336b4699daff71463a19d10d52de8fc2644925da7f51df69ed33daaf45e3142797317847a1ba0ca747945e7d816d6b3ad72849b7814f8faf1042f762
-EBUILD rcs-5.10.1.ebuild 924 BLAKE2B 20149f3d2898f7de3fd2d1d841cb9113dd46a09034f76e7cfb35e34909f48ab8eeb0001e64dd83f8200df43855f2c0f778f6b967c25ebe7ba5442ce9db401552 SHA512 da458d6b6890854dc2ace1e5dd0efdd042a4df89ea60c9f90e03129be907ad8e8bbe0cd213dbf80cd040b95b51f70c50a01a9acab2d98a1daf10b8aee9aecc5e
+EBUILD rcs-5.10.0.ebuild 1180 BLAKE2B 98558347c366a83d9facbf21c586d6e1b16cc33618c5a565e251e4708d9d2737b3ebaefb2fc747e99aa668ad3cff699bf481b342e1ab53a44edce19efe368a7c SHA512 1ffe48b9104d994e1df676adc57adb76e19da0b41bd9b192cd42c57ec63e1d6e4717ba0fa41140fd771383d1c4b558b1f585ee6e2fcb893861062f8123fdb4e3
+EBUILD rcs-5.10.1.ebuild 1103 BLAKE2B 0f095db9a0610d7bd44ee09a525a6e745349f8b55a7f940b05694d3420c91cb74a6caa5791deb416d17fe5a8b2fab028f8735d465ac181ea1b36f445bc67b8da SHA512 c27b292d770642695e2fc82d5a4ba9e8211459ea895235b9f39f61a89ba0dd4beb5b0236e3b33fb056e616a6ba9090deef992e70d21174241c508c4e77313b1f
 MISC metadata.xml 615 BLAKE2B 4e00cd56075f6ac650d317e09a31bf40b3d64c098ff472f032bbeed9e30188e98e81fc0175cbf9d0a565cdc4bcdac6e6da6d551d48e6cb9fb82e45de0c840f42 SHA512 c51c417b5440c81d4517879495ba0f8b941d8201089bb09499045ba7b16a4de1c29938e9124d43e244639cbd2177cfaa3b8432686a7ce23421e7386471fa4032
diff --git a/dev-vcs/rcs/rcs-5.10.0.ebuild b/dev-vcs/rcs/rcs-5.10.0.ebuild
index 7195ab87aef1..5bd7347fc901 100644
--- a/dev-vcs/rcs/rcs-5.10.0.ebuild
+++ b/dev-vcs/rcs/rcs-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,6 +41,14 @@ src_test() {
 	emake check
 }
 
+src_test() {
+	# Tests attempt to call rcs commands on /dev/null and /tmp.
+	# https://bugs.gentoo.org/840173
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+	default
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 
diff --git a/dev-vcs/rcs/rcs-5.10.1.ebuild b/dev-vcs/rcs/rcs-5.10.1.ebuild
index ac5f14633fd8..d004ccb4c1a6 100644
--- a/dev-vcs/rcs/rcs-5.10.1.ebuild
+++ b/dev-vcs/rcs/rcs-5.10.1.ebuild
@@ -32,6 +32,14 @@ src_configure() {
 	econf
 }
 
+src_test() {
+	# Tests attempt to call rcs commands on /dev/null and /tmp.
+	# https://bugs.gentoo.org/840173
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+	default
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 5dab27a906b1..a9274281f72a 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -5,5 +5,5 @@ DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 428
 DIST repo-v2.17-bash-completion.sh.base64 5736 BLAKE2B 59c357d76feb176b7c64791ffb838ab522179c7e05d1a1cca6e121c9c908cdbccc49f177951986470806302b881b39ab44710b66b0a6a8c9643d4a647841eddf SHA512 9bc4f57d58222297f53e6dcbed1b895e8d0a90558be58a423243c886cb5cfad11c32e7c599b2e237e3f53b2857f8441ddb476484189135b71f52ca7250dfaf62
 EBUILD repo-2.15.ebuild 1253 BLAKE2B f9a3b7eb2a335376a68519eb2d7cad7ea7765c28132b23b31ba6fde4c2a1cf81304f2d1d84d4293346f8a99e9c02934824d9db40d62f57ca4537ebfeb9a21bd4 SHA512 7706d0558c7c5d2c5975dbde52cce0710deea1b3204ff499e83f20e49bf66275481f122f7a76919abd58b23a7d565a0be89b0cedc72cd60e8301207e2063e3e2
 EBUILD repo-2.17.ebuild 1218 BLAKE2B f4876b7f1d9f953615bf4305cbfc3d98ec84976d0a694bd0f74a39995f48d42d7477d161c336301b8590f0480caa844433172228aebf38b0e0a32aff260fb997 SHA512 0b35bdcb0769f19e3abadd778e6f50de3ee59b6ebc1f6d9b4491cf025f469d3fcfc1f1ff25958905225b46ba0dd20ba83b996d42a3c0196803cc01e94c274290
-EBUILD repo-2.21.ebuild 964 BLAKE2B 4fb9d6382d8240d54102907a0abf7eb7c806700e3a78cfdccdcf4740efc710820b2141f2001b4aca025be72840d8e06e6d37dc0f77d7fd99620f4032f6a0ba0d SHA512 3c6d3c5939be9be51429d4451dac183de902d1bd00967bde131d985cfdd91989d7b3077ca69e1564b6d30061111c400993f1c8044a5565710a94c331d8517e00
+EBUILD repo-2.21.ebuild 958 BLAKE2B 39aa75e96d59ef5c82eb7c33060d1d914f0754e737d54d06d7c97a6b5dd651c25fc19967c64c96a664e164b91b9249a00d71bddeaa14b39e7652aa481a3bbc99 SHA512 d2503a35de48962aed99f6e3bb0ffc99ac43e0bf5cee4dc1c858a9c26cb2c08bc4de909a3beec0f1a84f7b2f21396d4834592aeaa4cf51fdbe26838450e55efb
 MISC metadata.xml 248 BLAKE2B 2545c58c45b8fd57a236bab059e0bd3da47a3e0d3881d141a9b2dc2e275a2d8f0663d83366b45103b48fd257d62a4a2314a8dd6b79113f8b86c91a90524918c5 SHA512 1397e06cb2ad5941988872f37df6f54100aaa06bfc7ef30ba394f95191ddaa1e9f2180d8eb856eb10f9646d9cbc4a6f020805470633c492519e66e3de788439a
diff --git a/dev-vcs/repo/repo-2.21.ebuild b/dev-vcs/repo/repo-2.21.ebuild
index 9490022de874..ab4e0a6a02d3 100644
--- a/dev-vcs/repo/repo-2.21.ebuild
+++ b/dev-vcs/repo/repo-2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.t
 
 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 07663e7914bf..ff44828c3884 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,5 +1,3 @@
-DIST stgit-1.4.tar.gz 390734 BLAKE2B a2c8b6848cacd743022318ebf9a0512c6bd02a2b8c864db2270e5075c82dfd9e6037a3a79978b2061487bf040864077b0f7836c66986d82ff3eb902331589d87 SHA512 5251dc26a7c64dcc83021399f95ea911d6b65cfb2ee5c016c886447740ed48b66d3f0bd92a45b4aed40ae2e77dfe6ba62336dbba6773a1879ab749c95bb99b4b
 DIST stgit-1.5.tar.gz 398562 BLAKE2B 922e014dcd0976a6b9ac884faa5ac6d8cb0e9efe6c56201c85675afb041e0190d07fb3cbcd366664b736d428d93188fc92c19db9a8d1fdc322054e1480b5b8f8 SHA512 6f018754f43c3ba48ce381b59f0e4033c295f0bd0acee4d07c1457f2c004caee9d8e9f6b2af1ee0d46941777639c7f5a49caa4c0dd01a72c3f3a43a34bf9b2bf
-EBUILD stgit-1.4.ebuild 1813 BLAKE2B 1505ba0218afe136851c24864fac25f85495b0a8bc2bf6e0dcec665f53e50def7a1e24ebe054e0d0b1da909ce18b0b164231e59766b2db74e062d8853ff2bc17 SHA512 cd838bcab5e06caaf2aa08fd03dbab09af2c26cb74f1aee9ecaee3de28daaa8213788da8b0f1431ef4d497075292e7b91cff3c716081867287f422656faaf645
-EBUILD stgit-1.5.ebuild 1819 BLAKE2B 097322735d473fce8c5cba1f247ba5b72d7949ea84702fb10e60baa10906f4fd86fdcc5a07fd7cd3075b665251ed5cc71890d2d82b226bf77e412e590b39b569 SHA512 bac4f938dfb1d4702d1ea0eb5d9a1a844696186e92f5d31cdf41433fc06594f8a2f5c949d8f3a2a53b988d6b69407c0260c7606f893e91a7fe992e577cd9a318
+EBUILD stgit-1.5.ebuild 1815 BLAKE2B 85437e704d4c1f75d8e46c0765c130e336b36b559c0c36199ff2602e163739c2841a61c958a0b292e3b7afc912d785ee246f53dafddb27c73e0f953b51b71896 SHA512 96873e57149a7bb5e3520dfe7d934b5e43ed7ef58b950fbad73e93395fddcdfe98732a09822ec7f163c3f5a93cfdab6e9f5a490e5dccb35f31e2c9b180f97b49
 MISC metadata.xml 347 BLAKE2B 152f011c7facd06cc1c654f388b4a44bbd8486549c07f1329d228e252a411bfb565e4f5b9e37bf9eefc23fda47a774c347d2e82070ac21c0880806bca99a6685 SHA512 04b087c0e6c6ae99128dab9c29e49d55e1cbcac3890f6324d3ea66b14530e92ca9ed32e9a6dfa23f06e23f8b79b3e57ceff2c9cc2995af4e01c91914d50361d0
diff --git a/dev-vcs/stgit/stgit-1.4.ebuild b/dev-vcs/stgit/stgit-1.4.ebuild
deleted file mode 100644
index 27a2b51f5133..000000000000
--- a/dev-vcs/stgit/stgit-1.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="https://stacked-git.github.io"
-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 ~riscv 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 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/stgit/stgit-1.5.ebuild b/dev-vcs/stgit/stgit-1.5.ebuild
index 23c4d6bccb08..ee720e163bc4 100644
--- a/dev-vcs/stgit/stgit-1.5.ebuild
+++ b/dev-vcs/stgit/stgit-1.5.ebuild
@@ -13,12 +13,12 @@ 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
+SRC_URI="https://github.com/stacked-git/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${UPSTREAM_PATCHSET_URI}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-vcs/git-1.6.3.3"
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 3cb6f6f9f0e5..b490e9a10e2e 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -4,5 +4,5 @@ AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.14.1.tar.bz2 8504612 BLAKE2B 27c6c5a9e656680b10fbc4b5c6d5fed36759d42d908e2bd5e56e19a7477c779c72314eb4a6766a13f1af047a759f9f9334b963c1d41cd48573b9800d5b671cc1 SHA512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd
-EBUILD subversion-1.14.1.ebuild 12730 BLAKE2B e48f0bfb86caee566699fe9c8d60108ae0b9c41b5240d5e342e2b3f2119181aad49b140a4168474cd20539ed8665e2c47d8fd3314304aca265c6ae34b3fb2182 SHA512 dd0b6e734d9cb71a64c78f506394fc5412ef298b6a5a366b31fcbf70c784c3d15549c8e41756dd530b2f6af1a90abdd1092c1b47841977f815b612a2c21be91f
+EBUILD subversion-1.14.1.ebuild 12737 BLAKE2B 2d6a6f4681af93c723d9534a55401c0c0f6dcc618fc37ab3a1aaae7003e084c6a4244cc9957fd41c41c129bb943ca3b92cbdba655863bd2a5773f369f158f887 SHA512 b5da50b812e11b907ca08cf41e6e83f2e2814bc657c27d9c8290c2190be4892683295afb7644fb3ef89990059ed443b468efefe9799299ebdc466df1886a0af5
 MISC metadata.xml 845 BLAKE2B 01e13e03afd275ac996834a9aae57d8b07cda38acd55f77a6b7e28533faf96f9b5091830e34298f9af68a2b712bfae82637400151e2b73e563e36348951ef23c SHA512 337bc69860f94b798dfbb957f501781fe0039407c6768a53bee9e6badad430ba080baad0edd20ede40638a0a018bf57481b049a46f4303b1a2a42d9dd3e76d1b
diff --git a/dev-vcs/subversion/subversion-1.14.1.ebuild b/dev-vcs/subversion/subversion-1.14.1.ebuild
index a9987638af1e..1a13e773974d 100644
--- a/dev-vcs/subversion/subversion-1.14.1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl plaintext-password-storage ruby sasl test"
 RESTRICT="!test? ( test )"