gentoo (valentine's day) resync : 14.02.2021

29 files changed, 1244 insertions, 145 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 8f90fb967e81..47b31ae9c54b 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cssc/Manifest b/dev-vcs/cssc/Manifest
index 7f3defc5919b..330e76e41240 100644
--- a/dev-vcs/cssc/Manifest
+++ b/dev-vcs/cssc/Manifest
@@ -1,7 +1,3 @@
-AUX cssc-1.3.0-gcc47.patch 187 BLAKE2B 4dd734c33914267c8f4441184316c33bea299c2ef09d6a6d98a7dfa2c57349885ac83df79362bc5b7f496f99da1aaa6801cb69d8409a3878869df6bdd418b4f2 SHA512 75706187dccd2cfbf0ef0f95eb6520bdf8134da0f6414e4e7e1ee92d54835f5d857320cfc81eb1f4ebf8584ea6da4e4a26e3a5990d60d7b7609b9bf19b6dec74
-AUX cssc-1.4.0-config.patch 317 BLAKE2B 05b55dca021fdc37ad9ade846c633c7f83935f46332cdebea9c7efff7bace6a175202239d240521bdb9cccbd725a077922c33494abac0d00792db7704b969b24 SHA512 c5bab5de20fa978100009f462434df586d9951850459b41aa70f290bebbcfbb2164b31eada89d6b55151bfd1e852b402ccd822d97cd0b898ce501f925e3c7e53
-AUX cssc-1.4.0-m4.patch 356 BLAKE2B b1e79296c96a1fc281e3a481d6a0fbaff697db87317b185bd795740fed75bd755dc2af147d1335d57f2b58d82c56ef9f75875175700b72c543cdb6e7adc8d6ec SHA512 8dd984f1d98a943fbed14db43840b18f63a48bc71fb8e537031761bdd59639a4af554de9eda8d5aa0a5f1afe04169a752f3e281381a15fe91cc9f53e7195db9e
-AUX cssc-1.4.0-test-large.patch 455 BLAKE2B 98891f0f6ce149a7ca7d8ee8aa373bc28e05f8a4a397d1f4067e9c3589fac701b46585b629965125e140eabc02c9ad4a2d09976f8752909e8176018d85cc69e2 SHA512 8e28f6b6cb9c9e15f5000e89722aa9aa66cb578faa136aa229947eae66e185a07a2b528dea418e0cef43027cce705a269214a2b6f4ec2c355450f13417c2c3e1
 AUX cssc-1.4.1-m4.patch 351 BLAKE2B dde4c1f2876f8e84587ad531a094431d1854652f901a2875a7fdd758a6780570dfbf9e629e3c00f2f41644a063bba08b4d201e215c4945baaa2cbd2a5649e736 SHA512 57639a4ec54f9e2dfb594de179e7e8539385890ab6d58fc5bb39f44497f530e2a9182edbd51c5d815244c76fc80e401f002e60d9ba29c8dee0e229cea7174153
 DIST CSSC-1.4.1.tar.gz 2269725 BLAKE2B 264e996280ff23818332dda62d80adc61fd6a2e924af26a044168bf136c22b22bb591d37157030dbe8e2360a2687b0dcbf843f3af8683b08593fded4ef982739 SHA512 b843bd636b15830b2751c423ff2f2e7292e0942d750ca57425d9674b74c7291fe34db33cbbc4b87d27f80d3b54b0074207ceda612faa651b6f01486e0b2485d5
 EBUILD cssc-1.4.1.ebuild 856 BLAKE2B c735021a9fca1f594648cce481cde1d941cfc67ec1d270ebbc10369426ed5f547b6882c27250ef2068537071bc341fde0564b94954fff8d63446d283dfde6078 SHA512 44980aa7e9704907bdb6b9551629c6d51b9ec72ee36d9cc60a126df641d277eb42598da0824b9f9afcc343e0ea3ca3db9fd63e854caf982023b5b82f0d1cf5f1
diff --git a/dev-vcs/cssc/files/cssc-1.3.0-gcc47.patch b/dev-vcs/cssc/files/cssc-1.3.0-gcc47.patch
deleted file mode 100644
index 4c319016eccd..000000000000
--- a/dev-vcs/cssc/files/cssc-1.3.0-gcc47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/file.h
-+++ b/src/file.h
-@@ -31,6 +31,7 @@
- #define CSSC__FILE_H__
- 
- #include "filelock.h"
-+#include <unistd.h> /* gid_t */
- 
- enum create_mode {
- 	CREATE_EXCLUSIVE     =  001,
diff --git a/dev-vcs/cssc/files/cssc-1.4.0-config.patch b/dev-vcs/cssc/files/cssc-1.4.0-config.patch
deleted file mode 100644
index c5790489a9a7..000000000000
--- a/dev-vcs/cssc/files/cssc-1.4.0-config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-In file included from file.h:36:0,
-	from delta.cc:36:
-	../gl/lib/unistd.h:135:3: error: #error "Please include config.h first."
-
-
---- a/src/delta.h
-+++ b/src/delta.h
-@@ -25,6 +25,7 @@
- #ifndef CSSC_DELTA_H
- #define CSSC_DELTA_H 1
- 
-+#include "config.h"
- #include "sid.h"
- #include "sccsdate.h"
- #include "mystring.h"
diff --git a/dev-vcs/cssc/files/cssc-1.4.0-m4.patch b/dev-vcs/cssc/files/cssc-1.4.0-m4.patch
deleted file mode 100644
index 91c163f14104..000000000000
--- a/dev-vcs/cssc/files/cssc-1.4.0-m4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-libtoolize chokes on this line
-
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,7 +33,6 @@
- 
- # Changes to AC_CONFIG_MACRO_DIR shoulld be reflected in ACLOCAL_AMFLAGS in Makefile.am.
- AC_CONFIG_MACRO_DIR([m4])
--AC_CONFIG_MACRO_DIR([unit-tests/googletest/m4])
- 
- AM_INIT_AUTOMAKE([gnits readme-alpha check-news tar-ustar 1.11.6])
- AC_CONFIG_HEADERS(config.h)
diff --git a/dev-vcs/cssc/files/cssc-1.4.0-test-large.patch b/dev-vcs/cssc/files/cssc-1.4.0-test-large.patch
deleted file mode 100644
index c7c23fb6a074..000000000000
--- a/dev-vcs/cssc/files/cssc-1.4.0-test-large.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Takes a very long time.
-
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -136,7 +136,7 @@
-                 test-rmdel \
-                 test-admin test-delta test-get test-prs test-prt test-unget \
-                 test-cdc  test-sact test-val \
--                test-large test-sccsdiff test-binary test-bsd-sccs test-what \
-+                test-sccsdiff test-binary test-bsd-sccs test-what \
-                 test-year-2000
- 	echo Tests passed.
- 
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index b448aa908a1d..2a98335737d3 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -3,4 +3,4 @@ DIST git-lfs-2.13.1.tar.gz 2526962 BLAKE2B 3f3af1c0f976a17c108159fff15a065600f32
 EBUILD git-lfs-2.11.0.ebuild 1392 BLAKE2B d6e33aa99c265dd3e2fd889c5bd9a70b751e15cc9757343e1e1bd7bec432e8015611e7b3009d1cd291eaa6b69e0a6fb7581d50f744f1a164d52936095ee5c03d SHA512 497ae5f9fa85cc412cb1708f13e75acaafc4087c5243aee8bdc9ff4567756cd60602cda6092ea1f98fe560a7ae9a6a05f69ffbb862136d2782b2850d8512ad15
 EBUILD git-lfs-2.13.1.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69
 EBUILD git-lfs-9999.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69
-MISC metadata.xml 558 BLAKE2B 307387b4326dd3982b949f3dc06f69efa31fcd70cbb03b1c68a5557965fdc14bb32f638a644c951ec06bf979baf8046228bf0820c9dac96a3d984c3cec3b32eb SHA512 8ae42faa56a37e9ebbd3c6fba90e4e87b44f8022ffb2bc3fb2eb7128c5bf7c34497c7a13c73252db5b5096135ed153a61c74382a54870c32c36eba7af23f7cbe
+MISC metadata.xml 446 BLAKE2B f6678414b5292ac89330446f6e140a70f998e9932dc0852a0de0bdcfd6406fa9bbc0aa479973ef0cebedf6bfa6a041bf9c3deb94df0e58c2bf57655b0d5f30aa SHA512 f63de45e71c0b09ef762289665523c39f5d89687b1d92e8ef632e8fa74af3a2150ef29a05e30846a8378f100360ddd275f4a0f63f57c480abf21adfa60b81d81
diff --git a/dev-vcs/git-lfs/metadata.xml b/dev-vcs/git-lfs/metadata.xml
index 427f1c497f19..0b79785e6d58 100644
--- a/dev-vcs/git-lfs/metadata.xml
+++ b/dev-vcs/git-lfs/metadata.xml
@@ -1,11 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>holgersson@posteo.de</email>
 		<name>Nils Freydank</name>
 	</maintainer>
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index d889b568ba16..f5acfd113748 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -14,20 +14,24 @@ DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d
 DIST git-2.28.0.tar.xz 6117608 BLAKE2B 81c834dfda5b8e3065d098e411eb2408a1e7ccfde9c447a4164c131c9c2c32dcfd888980bcd180952435c05976a4fa18c155830432170deff70aa1aa2989cd2a SHA512 a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a
 DIST git-2.29.2.tar.xz 6187988 BLAKE2B 15c2446a266d7cc3032e4b3bd32f57a2c2ff3d377848f307225ea585883c993ed835c8ffe02202386360b94f5a1f4bd3124322f0034c0d65ed15aa28b7e45ffa SHA512 34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62
 DIST git-2.30.0.tar.xz 6325652 BLAKE2B c5a67ccb7790f1747d714b402f22de6bd5cf783de8765fade7af0ad51ac780c80d43ab22b33431b57db246a11ef073dfd291961476a3c9414339f133221cbea6 SHA512 2ce154d6e224e78d7da2ea9b954d8cf56bdfe43636b93dd5045a950a7362d3943866b4949eb5ed03528d6e5f0466c33c233b502d84430ed9d90326bcc696101d
+DIST git-2.30.1.tar.xz 6327976 BLAKE2B 3b459d10a2b8d601e0882da8346bba1c0fb9aa01823e9cf9f6d50557d7cd6b6b89eea17209a5b3bfb199c37ae8bf33b730784686a166d7ed9ef36dd0975d5624 SHA512 b3567d251c73807857f05f46cae3acb4e0d876590d122229c05509d5eb17fc3eee0ba97a1b2068070b399085f7a92aa2493c4833b98f65b8ef15fc279798caa3
 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2 SHA512 b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396
 DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde SHA512 bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0
 DIST git-htmldocs-2.29.2.tar.xz 1364856 BLAKE2B 76498ef5bfdc058ad1e7c3b2c0c5ba715fa2682c7429db837cfeb7abe64ae3561e8b3f2dc032dd193514778271a040b1b120071d12ae5082a415db5084c7b6aa SHA512 d7223160af9bc97201bff59b94c8c09d331cdb9f979c878698230bb579b3f4751b6a455d8413ce09a507799744d7e3c77a2ad4d265386de7ef3ba9e11fb20445
 DIST git-htmldocs-2.30.0.tar.xz 1340536 BLAKE2B 2204b276b941497e0ff5f1710c55b42f573b4eebd96619041db7afabb5a5d36252b2582b29e3d083abaf5da478810d056df83bdfa1d08c5396ffe03d0d858820 SHA512 3fc53a508497621c8af5ea26337407ed9489e768160c7063cfcc4bb53f51631ef968057f1498e37a901313aa08b4153533ca15a9bdfcbd04d2ed11256007db3e
+DIST git-htmldocs-2.30.1.tar.xz 1341796 BLAKE2B b282d16af234256ccb4e1099d42800d674b5ff4ea1e365557aa6672aac573b4e98e43ddbeb02291cd6925bfd217d2e8e99aae47e9f46fd06ad013fec87b8d3fe SHA512 e2debb0dde49f1e6a5944ed35dfa62d6d2e6f71d745e6f6adfb477513f21004f04cd5de8e8444d4a24d9818c3cb85f5720848991a763fbc3541e89cfdf21dd49
 DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f5596548f076f5fec5dfc6c752e8b3caa5f64ba182c1566b67878b19fbb115297e08def1bf9d2711c7334cbb8e1b20fc039a1 SHA512 9591e94683a6b49d8b9f2afddc826576023fdfa6de6db4af3a28a2af00b175d5be710d86a31d0f1b8320cc38b6f27698e17fb3e8c1f2b0c5ced37296ef1109b6
 DIST git-manpages-2.28.0.tar.xz 472524 BLAKE2B 84752bee094eb879be8905dd561593e9f2a71d91971be7be83ed421bdeef83f7165f9506297bf23127a46a1d05c718999dab6b3ac3bda0ce0fba95ca64145de8 SHA512 ba4d41c2c2efd1eb5ab8ccf00efcebbc2fbbd31ab325da66b05181d15f677c2fc97c9eefd58c3b1c75a07276b399214f398df8d084c1a5092f982ce392876a2f
 DIST git-manpages-2.29.2.tar.xz 478516 BLAKE2B d9a9840a8c869e2f7f9dade12c780032a7eeff59314b4d45c8c65e3f076e0335f0674c484fe7cebbc70d13b51a17b5fcf69b1bd51dca7ff226d76b1fed33d8bf SHA512 f2af31f8b2242961a0633258dd4668dbf21b26eff440e302608bc5bee2ed45a3e573528cdd0f11503d0ac4745e03cb457d99f5529fc96c105ce441ece07e4fe8
 DIST git-manpages-2.30.0.tar.xz 481792 BLAKE2B 9f6273e36e06a0296506d43b25a826cef9e459fdd25ad2f844de323b998fe9b5a7e5181b21257e7b297ea4ce2e16cfaacf7f1c7486ce26b59e39e643361d4745 SHA512 9593d9bef8b3bdcd5645cf89e0f0c53989342414363ce85cfd46da181750c92e8f6dbd860c6badc9d871b383bb9cf273b4fb3af7f6d46a8df6b95fddeab578ae
-EBUILD git-2.26.2.ebuild 19080 BLAKE2B 86f681cbc13c2f28e6aff955387c162e9726e47699a8e2d51738d11a42eab83dff8ab71815550c308879d4bc5c1adf5bd19cd7aa1109a3acbd4c9ce2e5b48e35 SHA512 39e20c5cb57cf7e1153cfcfc5996b344c1dbdb7bf8db0e74ebda46365e1be59a80d98e648a725992fc46a4d6a88dbba593afc011fe94759ce9c91b299ddcfd9c
-EBUILD git-2.28.0.ebuild 19089 BLAKE2B 5157c70fc316d871d0bca91be92b83ec8eb5195e34f6f485220e4149e67498f1ace9f0b2b5503422661e775230f29c88f640a413f913c0b823660495de60b50a SHA512 7dcfa19947945b0e0a1bf81fc603a29f0fbf3b90edcd14ec83ca597e958def0db9fbfa9ab6ab094824f429a490ce4cb1f10dee061e3da5d7ff61edc54e56b79f
-EBUILD git-2.29.2.ebuild 18146 BLAKE2B 0d627bf8e21edc0505691c7b55beb8797873df4aeb8da822058adb06f697b25af8dfd2f2bbb01d6d21d63112e20318e0b49affefe5d64e42e53ed4b992bfcc81 SHA512 215fdf541ea8e031ce2a9b472a1d516d8bd49f5c1bc0876e091f8c1b780de1a425a697fd10fd21fa78f67b92bab73df7ecc0b37a1f3bff8c77eadf177e0bb51e
-EBUILD git-2.30.0.ebuild 18146 BLAKE2B 0d627bf8e21edc0505691c7b55beb8797873df4aeb8da822058adb06f697b25af8dfd2f2bbb01d6d21d63112e20318e0b49affefe5d64e42e53ed4b992bfcc81 SHA512 215fdf541ea8e031ce2a9b472a1d516d8bd49f5c1bc0876e091f8c1b780de1a425a697fd10fd21fa78f67b92bab73df7ecc0b37a1f3bff8c77eadf177e0bb51e
-EBUILD git-9999-r1.ebuild 18116 BLAKE2B eaecab70bf36bfc139222c4a759d18ee51c4b8e6ffa27ebce723fb72c0135a194e63b71bdb53bb5634e3f809df2871d1b0a47ded3ed3fb63fb70d63563d2146b SHA512 bd1f3e358e0d2fc7053ddf05ae808df60148585e74cc3a1a9c8864face04d481b4c5223287508f0757af6812b186d7fee71cf95d0202075a8172311179f1db25
-EBUILD git-9999-r2.ebuild 18116 BLAKE2B eaecab70bf36bfc139222c4a759d18ee51c4b8e6ffa27ebce723fb72c0135a194e63b71bdb53bb5634e3f809df2871d1b0a47ded3ed3fb63fb70d63563d2146b SHA512 bd1f3e358e0d2fc7053ddf05ae808df60148585e74cc3a1a9c8864face04d481b4c5223287508f0757af6812b186d7fee71cf95d0202075a8172311179f1db25
-EBUILD git-9999-r3.ebuild 18146 BLAKE2B 0d627bf8e21edc0505691c7b55beb8797873df4aeb8da822058adb06f697b25af8dfd2f2bbb01d6d21d63112e20318e0b49affefe5d64e42e53ed4b992bfcc81 SHA512 215fdf541ea8e031ce2a9b472a1d516d8bd49f5c1bc0876e091f8c1b780de1a425a697fd10fd21fa78f67b92bab73df7ecc0b37a1f3bff8c77eadf177e0bb51e
-EBUILD git-9999.ebuild 18116 BLAKE2B eaecab70bf36bfc139222c4a759d18ee51c4b8e6ffa27ebce723fb72c0135a194e63b71bdb53bb5634e3f809df2871d1b0a47ded3ed3fb63fb70d63563d2146b SHA512 bd1f3e358e0d2fc7053ddf05ae808df60148585e74cc3a1a9c8864face04d481b4c5223287508f0757af6812b186d7fee71cf95d0202075a8172311179f1db25
+DIST git-manpages-2.30.1.tar.xz 482128 BLAKE2B 2e7f3943b5e95a3b00dda95f74c519889218e908aa3872f5ae93d88ac9602ad389e9be9df99ec7daafb0a324c03a3a50c7f3c697a1a7e9f35f795682ba85fb4c SHA512 1cd535fff2a658d9ecb99c1f26663e2b37df429dfcff417c298e00fb5de107ef54848447ad63c2f78d8621f431f8f8b92bc871474a701db48deff04a0b595d07
+EBUILD git-2.26.2.ebuild 19084 BLAKE2B 4348be0cbf86af5f34de7b2ee0dcf3b02df62d195f65c5ce7eb09076702300e0d333217c4864b14ac6df705380d2a7b619834f0b13e60494bdd2246ece72a22a SHA512 f27c49be5bc8a168f6adc14694d638fe4c1fbf52308f25d28a11879d9c6e5c68e4a06636587fa3956d905a72cbeb24d4f179249c0266d89cfc6a0eac025a926a
+EBUILD git-2.28.0.ebuild 19093 BLAKE2B ef265e1ff00542f4a2aa454b6151dfc5d01f1632b4456026734543a545b0f7917f5c59a659092dce86e23a6e3726a7b23c2691c60faf67dbacc22c85e7dc7e19 SHA512 08fb8198ba4e1971ae039bd8a692ff6a44f6f5e1bcc3389532bca9abf39db43165bd91a28fd11c1e2b74cfefa4a670dd534525d2dd74c755a31720d9b91e045a
+EBUILD git-2.29.2.ebuild 18150 BLAKE2B 1c9f0d4c815f9bcc7c1f1c166de9863873198d4da153105c299643ea2e6df5c37b489262f6ca9b8d4edd3d636f4169cd4448d85e0ac513962611a7b4be936976 SHA512 a1972288de7428427235d9dbc4b24fb833f45277804eec16ca6acd0831ef6f8e54a2e1e9ed3acc44d20aada6c3e95745fae0562278542dc478c5e1711ddef7d4
+EBUILD git-2.30.0.ebuild 18150 BLAKE2B 1c9f0d4c815f9bcc7c1f1c166de9863873198d4da153105c299643ea2e6df5c37b489262f6ca9b8d4edd3d636f4169cd4448d85e0ac513962611a7b4be936976 SHA512 a1972288de7428427235d9dbc4b24fb833f45277804eec16ca6acd0831ef6f8e54a2e1e9ed3acc44d20aada6c3e95745fae0562278542dc478c5e1711ddef7d4
+EBUILD git-2.30.1.ebuild 18151 BLAKE2B 6ba45e94301a2afcca08655687cc6c4cb11952123ecde80fb4ae33d8531789252427644487cc0e7d5a131661681bb939ceb3a9534ffbd4519809f1fcc48d09a7 SHA512 4185e7e4daa69b3c92a6760b27eec108589276a9aa73b376212f4b5d194999c07927acb5312b2eac20d8e6fb9b25006d02c3bb2e43909b5d9ca8fc7942b14f45
+EBUILD git-9999-r1.ebuild 18121 BLAKE2B a70ee9a3d2ff8e75a5c670a25e783bc9e6f8a0924b4a23c3401109f871bff222964e3dd74ca042afb7afc2553f0ea2871bd6f4fe2d445d8eb8e48e7d803a51b5 SHA512 cf46fe949a11812666cf45dcc0717aa73e633cc22635d4623d6d9ea92da44d1244e59930a58ad2dde28b548860b30a701ff344238b83e87880803b616c7d214f
+EBUILD git-9999-r2.ebuild 18121 BLAKE2B a70ee9a3d2ff8e75a5c670a25e783bc9e6f8a0924b4a23c3401109f871bff222964e3dd74ca042afb7afc2553f0ea2871bd6f4fe2d445d8eb8e48e7d803a51b5 SHA512 cf46fe949a11812666cf45dcc0717aa73e633cc22635d4623d6d9ea92da44d1244e59930a58ad2dde28b548860b30a701ff344238b83e87880803b616c7d214f
+EBUILD git-9999-r3.ebuild 18151 BLAKE2B 6ba45e94301a2afcca08655687cc6c4cb11952123ecde80fb4ae33d8531789252427644487cc0e7d5a131661681bb939ceb3a9534ffbd4519809f1fcc48d09a7 SHA512 4185e7e4daa69b3c92a6760b27eec108589276a9aa73b376212f4b5d194999c07927acb5312b2eac20d8e6fb9b25006d02c3bb2e43909b5d9ca8fc7942b14f45
+EBUILD git-9999.ebuild 18121 BLAKE2B a70ee9a3d2ff8e75a5c670a25e783bc9e6f8a0924b4a23c3401109f871bff222964e3dd74ca042afb7afc2553f0ea2871bd6f4fe2d445d8eb8e48e7d803a51b5 SHA512 cf46fe949a11812666cf45dcc0717aa73e633cc22635d4623d6d9ea92da44d1244e59930a58ad2dde28b548860b30a701ff344238b83e87880803b616c7d214f
 MISC metadata.xml 2277 BLAKE2B 49819fd1ea6ca2a1cf2043fde6d4cd9197db5ef44543fae528475524a35ee52d31a04f20c638b892a6d8c4dd757d302bfd43efb41242e98351d01db7654c2a05 SHA512 65b8ef639ddbec202cc7bcbed31c109d8f6fc64e52d47522eb38955401bea86a846390cfddbebd946f5f5941be83c401a1028d6721e12c6317f92a63568b56cb
diff --git a/dev-vcs/git/git-2.26.2.ebuild b/dev-vcs/git/git-2.26.2.ebuild
index 364b8295dddb..c4ac2f48da97 100644
--- a/dev-vcs/git/git-2.26.2.ebuild
+++ b/dev-vcs/git/git-2.26.2.ebuild
@@ -20,12 +20,12 @@ if [[ ${PV} == *9999 ]]; then
 	# 9999-r0: maint
 	# 9999-r1: master
 	# 9999-r2: next
-	# 9999-r3: pu
+	# 9999-r3: seen
 	case "${PVR}" in
 		9999) EGIT_BRANCH=maint ;;
 		9999-r1) EGIT_BRANCH=master ;;
 		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
+		9999-r3) EGIT_BRANCH=seen ;;
 	esac
 fi
 
diff --git a/dev-vcs/git/git-2.28.0.ebuild b/dev-vcs/git/git-2.28.0.ebuild
index f82b03b5140c..d725b8e79c39 100644
--- a/dev-vcs/git/git-2.28.0.ebuild
+++ b/dev-vcs/git/git-2.28.0.ebuild
@@ -20,12 +20,12 @@ if [[ ${PV} == *9999 ]]; then
 	# 9999-r0: maint
 	# 9999-r1: master
 	# 9999-r2: next
-	# 9999-r3: pu
+	# 9999-r3: seen
 	case "${PVR}" in
 		9999) EGIT_BRANCH=maint ;;
 		9999-r1) EGIT_BRANCH=master ;;
 		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
+		9999-r3) EGIT_BRANCH=seen ;;
 	esac
 fi
 
diff --git a/dev-vcs/git/git-2.29.2.ebuild b/dev-vcs/git/git-2.29.2.ebuild
index 7b5b5846318d..d73a1120a380 100644
--- a/dev-vcs/git/git-2.29.2.ebuild
+++ b/dev-vcs/git/git-2.29.2.ebuild
@@ -20,12 +20,12 @@ if [[ ${PV} == *9999 ]]; then
 	# 9999-r0: maint
 	# 9999-r1: master
 	# 9999-r2: next
-	# 9999-r3: pu
+	# 9999-r3: seen
 	case "${PVR}" in
 		9999) EGIT_BRANCH=maint ;;
 		9999-r1) EGIT_BRANCH=master ;;
 		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
+		9999-r3) EGIT_BRANCH=seen ;;
 	esac
 fi
 
diff --git a/dev-vcs/git/git-2.30.0.ebuild b/dev-vcs/git/git-2.30.0.ebuild
index 7b5b5846318d..d73a1120a380 100644
--- a/dev-vcs/git/git-2.30.0.ebuild
+++ b/dev-vcs/git/git-2.30.0.ebuild
@@ -20,12 +20,12 @@ if [[ ${PV} == *9999 ]]; then
 	# 9999-r0: maint
 	# 9999-r1: master
 	# 9999-r2: next
-	# 9999-r3: pu
+	# 9999-r3: seen
 	case "${PVR}" in
 		9999) EGIT_BRANCH=maint ;;
 		9999-r1) EGIT_BRANCH=master ;;
 		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
+		9999-r3) EGIT_BRANCH=seen ;;
 	esac
 fi
 
diff --git a/dev-vcs/git/git-2.30.1.ebuild b/dev-vcs/git/git-2.30.1.ebuild
new file mode 100644
index 000000000000..f6a6fb30a9e9
--- /dev/null
+++ b/dev-vcs/git/git-2.30.1.ebuild
@@ -0,0 +1,676 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: 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 ~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 libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( >=app-editors/emacs-23.1:* )
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=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} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="${BDEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	pcre-jit? ( pcre )
+	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.22.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
+		if use pcre-jit; then
+			myopts+=( USE_LIBPCRE2=YesPlease )
+			extlibs+=( -lpcre2-8 )
+		else
+			myopts+=(
+				USE_LIBPCRE1=YesPlease
+				NO_LIBPCRE1_JIT=YesPlease
+			)
+			extlibs+=( -lpcre )
+		fi
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	if [[ "${CHOST}" == *-uclibc* ]] ; then
+		myopts+=( NO_NSEC=YesPlease )
+		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
+	fi
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; 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 || die "emake git-credential-libsecret failed"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake install || die "Failed to emake install for git-subtree"
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if test -d "${d}" ; then find "${d}" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ ${cvs} -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+	elog "completion."
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 3d31a14b4dd9..4d91e177d376 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -20,12 +20,12 @@ if [[ ${PV} == *9999 ]]; then
 	# 9999-r0: maint
 	# 9999-r1: master
 	# 9999-r2: next
-	# 9999-r3: pu
+	# 9999-r3: seen
 	case "${PVR}" in
 		9999) EGIT_BRANCH=maint ;;
 		9999-r1) EGIT_BRANCH=master ;;
 		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
+		9999-r3) EGIT_BRANCH=seen ;;
 	esac
 fi
 
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 3d31a14b4dd9..4d91e177d376 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -20,12 +20,12 @@ if [[ ${PV} == *9999 ]]; then
 	# 9999-r0: maint
 	# 9999-r1: master
 	# 9999-r2: next
-	# 9999-r3: pu
+	# 9999-r3: seen
 	case "${PVR}" in
 		9999) EGIT_BRANCH=maint ;;
 		9999-r1) EGIT_BRANCH=master ;;
 		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
+		9999-r3) EGIT_BRANCH=seen ;;
 	esac
 fi
 
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 7b5b5846318d..f6a6fb30a9e9 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -20,12 +20,12 @@ if [[ ${PV} == *9999 ]]; then
 	# 9999-r0: maint
 	# 9999-r1: master
 	# 9999-r2: next
-	# 9999-r3: pu
+	# 9999-r3: seen
 	case "${PVR}" in
 		9999) EGIT_BRANCH=maint ;;
 		9999-r1) EGIT_BRANCH=master ;;
 		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
+		9999-r3) EGIT_BRANCH=seen ;;
 	esac
 fi
 
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 3d31a14b4dd9..4d91e177d376 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 GENTOO_DEPEND_ON_PERL=no
 
 # bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
 
@@ -20,12 +20,12 @@ if [[ ${PV} == *9999 ]]; then
 	# 9999-r0: maint
 	# 9999-r1: master
 	# 9999-r2: next
-	# 9999-r3: pu
+	# 9999-r3: seen
 	case "${PVR}" in
 		9999) EGIT_BRANCH=maint ;;
 		9999-r1) EGIT_BRANCH=master ;;
 		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
+		9999-r3) EGIT_BRANCH=seen ;;
 	esac
 fi
 
diff --git a/dev-vcs/rsvndump/Manifest b/dev-vcs/rsvndump/Manifest
index bbaa06398f06..ea25e32e0fc5 100644
--- a/dev-vcs/rsvndump/Manifest
+++ b/dev-vcs/rsvndump/Manifest
@@ -1,6 +1,5 @@
 AUX rsvndump-0.6-asciidoc-9.patch 1245 BLAKE2B ddfeb84964f0d5f6403c2a4b91d4e0de4e0d6a8973c7560245adbfe7248e980143cd3dd6b33c44394f6ff1a5033493b20c28ae43f14f940e8852e7aa3fc9b9b0 SHA512 05a3cf888f8f0793a42c9321c2ff22c7cddc6aff9574642a05c07b6ae7a4673d4a5c50a1e60be7b3e9397baf87eacb3e8c138f272141cfbf3ac0fc7b1e8f8b2d
 AUX rsvndump-0.6-configure-ar.patch 536 BLAKE2B 7d5c4961ae636c4a7940e7c000ae44eb3342d412bcae01209bb7dd4b7512abad7ffdf958401468e278fe4e8a7d59cd3a631cc98684190ca4d1a422caf023a182 SHA512 a3d00bd5b1a40ce5861532f97053084dcd979990e90e332aaf69325af4593c0c2d592ba707a54121e824926bccfce208ef7c41cfc62c5adbef5aba229086af77
 DIST rsvndump-0.6.tar.bz2 220891 BLAKE2B 97792a13beb0a37452df941599a753297f0322d04608e86da0740cb553a9da7d1a2f9b6e712c15698ae9d5f2c8d4911d8bed45e66c58ca46b2d1b0c29ec4f275 SHA512 cadb10b48e66be1ea562fa6b96460b5c864e2f16a1e0d5fbb4be4d31023b6d5dfa978634900b1649530a12335eb712032d9d9cc82f663737581521121d3b2120
-EBUILD rsvndump-0.6-r1.ebuild 764 BLAKE2B 277ac0a028ec18717d3e8509e29d2246d891ef113b3a6bfc6a65bd90efcb9686d99b19521c622a270296188299fea1d9a2d9004666326a84d92ba8bd0f65dcd7 SHA512 92723fdbbd804b61bae9bde2135220921e2462a869a82bdd89a2eb6641f9d8c49aed70d72f8ff7c07bb96b73fa412bc28b5a539f9145b5d3bef974b68eac0635
-EBUILD rsvndump-0.6.ebuild 608 BLAKE2B 43a8bdbf78d8501eb4c134d43e42ef66d9881559e9fb4b5d773600f315e8313528ddf47ab40f40419253bd2540f1e60f8a99145b155b417270c296a7e90dd398 SHA512 5a3a6b80f598568a6763d9be4138c77149e5803b0cc8adaf5f3421aab5d13a93fe1bb89db21038c8c57c6c3c0a88399bd6217ff835ab4ecd4ab3d85826f548fe
+EBUILD rsvndump-0.6-r1.ebuild 1369 BLAKE2B 3b85a910516931392e22d54aae4c5bdde95cc524c4e603210087fe373274290c8e8c61ee3f85c03482b24b5f37f18b3e7d9e1baf23d6f5771d3de2b15b35b6c7 SHA512 68af6ef132bbca81f230bf7e84beaff3e815444df123f7ed5384f790befef50d6d611882e6535f99598dc7a44a1a15c05a1f5f647b9435009a90ea549e8faa9c
 MISC metadata.xml 327 BLAKE2B 0ca261a8df3086ea9173f80e74a58f39300002f01fe7202e6c354bc01c3beb91a0984e9151f4ac97fc3bf36db0f1281dab8fc38cee8134c93813eef2012bb3f6 SHA512 e2369924ca25cbb5c415f5aaabc86420e0a7d051a9409b9031a16bc489c3146b63d9e119b6128bb3cd82843bce740b32e9b4138a407330fc5059b4f5fe59aba2
diff --git a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
index 71017a0a6705..33cdb2cc47d0 100644
--- a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
+++ b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
+inherit autotools multilib
 
 DESCRIPTION="Dump a remote Subversion repository"
 HOMEPAGE="http://rsvndump.sourceforge.net"
@@ -29,6 +29,18 @@ PATCHES=(
 
 src_prepare() {
 	default
+
+	# We need to patch use of /usr/lib because it is a problem with
+	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/739028).
+	# The grep sandwich acts as a regression test so that a future
+	# version bump cannot break patching without noticing.
+	grep -wq svn_prefix/lib m4/find_svn.m4 || die
+	sed "s,svn_prefix/lib,svn_prefix/$(get_libdir)," -i m4/find_svn.m4 || die
+	grep -w svn_prefix/lib m4/find_svn.m4 && die
+	grep -wq SVN_PREFIX/lib configure.ac || die
+	sed "s,SVN_PREFIX/lib,SVN_PREFIX/$(get_libdir)," -i configure.ac || die
+	grep -w SVN_PREFIX/lib configure.ac && die
+
 	eautoreconf
 }
 
diff --git a/dev-vcs/rsvndump/rsvndump-0.6.ebuild b/dev-vcs/rsvndump/rsvndump-0.6.ebuild
deleted file mode 100644
index 0fd269ce1768..000000000000
--- a/dev-vcs/rsvndump/rsvndump-0.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dump a remote Subversion repository"
-HOMEPAGE="http://rsvndump.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3+ BSD public-domain"  # rsvndump, snappy-c, critbit89
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
-
-RDEPEND="dev-vcs/subversion
-	dev-libs/apr
-	dev-libs/apr-util
-	sys-devel/gettext"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto
-		>=app-text/asciidoc-8.4 )"
-
-src_configure() {
-	econf \
-		$(use_enable doc man) \
-		$(use_enable debug)
-}
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index fc19b1dfdc07..eb21b16941c8 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,6 +1,5 @@
-AUX stgit-0.16-man-linkfix.patch 429 BLAKE2B 11cd98b7a58a55fed445be700bc492a4fd926b9bac20a54e095b9c9470d6294a4c32800622b42e87ff10908a40a2bf71e8e139dc306ade3b4989c10609dcceaa SHA512 c71e32a6e6b007ebbbe738dae93bf2109d2be1ed3f3418c98c6ff6ebb602fb8523f974160276649bb66745340d752d69e87c9f0730ca3dd595a6b2b32a0104df
-DIST stgit-0.21.tar.gz 319605 BLAKE2B 92bb879d8b8804c8a1b2ca8038d010a0b5118970a4482d87d6bc295992849511c33acb46f376034af6609d42c0323d692bff0ea9bf217cc860e53915fb3c982e SHA512 394c2b30596819f1376bd7432be6923a8dad73f58f049022fe64d1520fd75418665af8069aac98843df051f7fbefbb367762ad4ba57f13bf747819035c7d63ee
 DIST stgit-0.23.tar.gz 303836 BLAKE2B 018e0caf74a3c449a71362e3694b2ddf030f5ee23e3212a98b378b7118bae9fd15d0e4ab2a2a746a12b34e46aa2edb86657a4a7125f3c5ca8aa0142fe3d73534 SHA512 b3c9b5c0833cb7e5137faf0df48af6a11b9508b994cdf55b587567d1c146fd4ae29e7beb6d1a34b3f87e5b3854af035dd7e5ca35338c20740e91da7b47c4568d
-EBUILD stgit-0.21.ebuild 1881 BLAKE2B a1be9c946dd4b488e0b3fd1b7d6322cc4aff1622fd214acc43f787dc1965dd4f8b838ec5b40296cc7f4a80c7944def52c6f7761d714d9b7450cd90b2765b84b7 SHA512 38c86b2a6294ef5d43c4f5d883c4c9410ce11ef2f5107b8b262623057a3c35e6346d5d7c22648e3bb9a7f9682a87b063da98a2bf78cd849a4e86e11b97894737
-EBUILD stgit-0.23.ebuild 1856 BLAKE2B cb973a49132b501b312672ca0897be0c48cc9e67cc2cf6e70528611aa3548622624879f72ccce594fad691544e26d108cba94042af11f7f028cabf67458ad88f SHA512 6742125fa192ffcbbd54b25ea4e0fdd7665175912065c5d51bb553359e726d9bd4b79e79ce4e13f5046450d22c08074e21d5ccc1526e7400580982efd9dc6dff
+DIST stgit-1.0.tar.gz 302201 BLAKE2B 2be1eb648edbefed6270e8f52039afd5d6d4140e8e16656a9f28f6b168eb5ce02c814a3e2b91bc628a80de1e15f0491b82af18fc2cad4e556bcd23ef247fe082 SHA512 e33db953d810f024ee2159ea5bb1b1367a5c673d78d789e8b20ad1d773dccaaf0fe4ccb713b8de082d4a79a3f51d421a2d3d88be24f2e0e770e070e640744894
+EBUILD stgit-0.23.ebuild 1854 BLAKE2B e728ed81a69ba796f832673c3fcbb624b19b6933d38fd24a5b40d77139d56f18a2335cf09aa17a9bd65c6d5016e5c0abe2d002a21c833cd714123aeb8fa8f492 SHA512 ac09031b4a877e88bab0c17fbc33d0d00ede445d34af66577dcd28aa5d2291dcf73de7b9c8eca67df71353d9a7947b8796f875ab4a0a03a244c69bb92a702c17
+EBUILD stgit-1.0.ebuild 1859 BLAKE2B 9cb3cf796c71fadf15d574c74f7b2d90c6f1ff61df5b82ba131754dc636b800e90b6be37ea001934186ebe1f8bda7ffeb4b5a26432aba41b353f8dd305bfacf1 SHA512 1b3f875d55438532954b29057b4dd088483eda8598685a15c9cb88045eb01b0ec673833585931d42e9b79e9f9f88f05d2941663766ebd8388db3c4526cd02504
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/dev-vcs/stgit/files/stgit-0.16-man-linkfix.patch b/dev-vcs/stgit/files/stgit-0.16-man-linkfix.patch
deleted file mode 100644
index 559cf8fa789a..000000000000
--- a/dev-vcs/stgit/files/stgit-0.16-man-linkfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Documentation/Makefile	2012-07-08 23:55:38.958779174 +0200
-+++ b/Documentation/Makefile	2012-07-08 23:56:42.638010483 +0200
-@@ -72,7 +72,7 @@
- 	$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $<
- 
- %.1 : %.xml
--	xmlto -m callouts.xsl man $<
-+	xmlto -m callouts.xsl --stringparam man.base.url.for.relative.links=$(htmldir) man $<
- 
- %.xml : %.txt
- 	$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf $<
diff --git a/dev-vcs/stgit/stgit-0.23.ebuild b/dev-vcs/stgit/stgit-0.23.ebuild
index f75523885536..a965332f360e 100644
--- a/dev-vcs/stgit/stgit-0.23.ebuild
+++ b/dev-vcs/stgit/stgit-0.23.ebuild
@@ -19,7 +19,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/stgit/stgit-0.21.ebuild b/dev-vcs/stgit/stgit-1.0.ebuild
index f6045c5d2d98..e44a2c6fd258 100644
--- a/dev-vcs/stgit/stgit-0.21.ebuild
+++ b/dev-vcs/stgit/stgit-1.0.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="http://www.procode.org/stgit/"
+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"
@@ -18,7 +19,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"
@@ -32,10 +33,6 @@ DEPEND="${RDEPEND}
 		dev-lang/perl
 	)"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.16-man-linkfix.patch"
-)
-
 pkg_setup() {
 	if ! use doc; then
 		echo
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index add1793bc825..444a29144688 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -4,5 +4,7 @@ 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.0.tar.bz2 8497531 BLAKE2B 261f1401a96b181ccbdea9ab6e1dde301aa2c67296a0dc458a1d7e544530411b656d0d5335f985c9222c2d44fc8f962b1a960b81e4ff4883d373cb4405af2461 SHA512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b
+DIST subversion-1.14.1.tar.bz2 8504612 BLAKE2B 27c6c5a9e656680b10fbc4b5c6d5fed36759d42d908e2bd5e56e19a7477c779c72314eb4a6766a13f1af047a759f9f9334b963c1d41cd48573b9800d5b671cc1 SHA512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd
 EBUILD subversion-1.14.0-r1.ebuild 12644 BLAKE2B 4c06f988ecfff3e0bece2dc00859e2da41215901e75c94fab3f6124c806894433e7edfcfe7e904dcdf95fc0dea42a983b84727e9fb5807f19a14da7b707d5388 SHA512 40cce7df31f6a1ce2b207fc9de1f27cd102d17db0aebc6a4328e998cd9668fc215a034905cf0946a135c523654e740f44166a739d50cad27d0d8465fd7cc2321
+EBUILD subversion-1.14.1.ebuild 12651 BLAKE2B 01b0de10f5b5040c47f1cdc21601e6122cd2e1e09d8e4686bb561f6cc8baa5ff3ec4aba7cc84f56216e44a29401b83fa9fa07e09595c45b5d806ebcb2852659a SHA512 297012802fafa4787306be322f8ac8925a97cb04b568588eee9279a1878bdcbc75dee4a3d0070a186bfb8da01d4b91d73da4259ed6c17f505cdd85cbdee0aced
 MISC metadata.xml 560 BLAKE2B b6b78084ae0792c458969a47b6d1a13cf330c2b410582f39c207b585a47692a7ae86b1b8c86c77da4f289331dbec2ad114b86cc9edebb3423c7ce144458e71e7 SHA512 d10e6922066c5579a7cebb53e328ba02fd92e7919cafe96e89dfa49c6d5d40e4e9247f95c987bab16e90803b54dbb9c4229afb219428f254e7850802d0d4fce1
diff --git a/dev-vcs/subversion/subversion-1.14.1.ebuild b/dev-vcs/subversion/subversion-1.14.1.ebuild
new file mode 100644
index 000000000000..220daf07afec
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.14.1.ebuild
@@ -0,0 +1,441 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8} )
+USE_RUBY="ruby26 ruby25 ruby24"
+DISTUTILS_OPTIONAL=1
+WANT_AUTOMAKE="none"
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="https://subversion.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
+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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/lz4
+	>=dev-db/sqlite-3.7.12
+	>=dev-libs/apr-1.5:1
+	>=dev-libs/apr-util-1.5:1
+	dev-libs/expat
+	dev-libs/libutf8proc:=
+	>=net-libs/serf-1.3.4
+	sys-apps/file
+	sys-libs/zlib
+	berkdb? ( >=sys-libs/db-4.0.14:= )
+	gnome-keyring? (
+		dev-libs/glib:2
+		app-crypt/libsecret
+		sys-apps/dbus
+	)
+	kwallet? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kwallet:5
+		sys-apps/dbus
+	)
+	perl? ( dev-lang/perl:= )
+	ruby? ( ${RUBY_DEPS} )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+RDEPEND="${COMMON_DEPEND}
+	apache2? (
+		acct-group/apache
+		acct-user/apache
+		www-servers/apache[apache2_modules_dav]
+	)
+	!apache2? (
+		acct-group/svnusers
+		acct-user/svn
+	)
+	java? ( >=virtual/jre-1.8 )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )
+"
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	!!<sys-apps/sandbox-1.6
+	doc? ( app-doc/doxygen )
+	gnome-keyring? ( virtual/pkgconfig )
+	java? ( >=virtual/jdk-1.8 )
+	kwallet? (
+		kde-frameworks/kdelibs4support:5
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	test? ( ${PYTHON_DEPS} )
+"
+
+want_apache
+
+pkg_setup() {
+	if use berkdb ; then
+		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
+			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
+			| sed 's:.*b::')"
+		einfo
+		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+			if [[ -n "${apu_bdb_version}" ]] ; then
+				SVN_BDB_VERSION="${apu_bdb_version}"
+				einfo "Matching db version to apr-util"
+			else
+				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+			fi
+		fi
+		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
+		einfo
+
+		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
+			eerror "Aborting to avoid possible run-time crashes."
+			die "Berkeley DB version mismatch"
+		fi
+	fi
+
+	depend.apache_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+
+	# https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
+	append-cppflags -P
+
+	if use debug ; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
+	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
+
+	# Allow for custom repository locations.
+	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+	if use ruby ; then
+		local rbslot
+		RB_VER=""
+		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
+			if has_version dev-lang/ruby:${rbslot} ;  then
+				RB_VER="${rbslot/.}"
+				break
+			fi
+		done
+		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+	fi
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/721300
+	rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die
+
+	eapply "${WORKDIR}/patches"
+	eapply_user
+
+	chmod +x build/transform_libtool_scripts.sh || die
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+	# this bites us in particular on Solaris
+	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
+		die "/bin/sh is not POSIX shell!"
+
+	eautoconf
+	elibtoolize
+
+	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+		-i build-outputs.mk || die "sed failed"
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_with apache2 apache-libexecdir)
+		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		--without-ctypesgen
+		--disable-runtime-module-search
+		$(use_with gnome-keyring)
+		$(use_enable java javahl)
+		$(use_with java jdk "${JAVA_HOME}")
+		$(use_with kwallet)
+		$(use_enable nls)
+		$(use_with sasl)
+		--with-serf
+		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
+		--disable-experimental-libtool
+		--without-jikes
+		--disable-mod-activation
+		--disable-static
+		--enable-svnxx
+	)
+
+	if use perl || use ruby; then
+		myconf+=( --with-swig )
+	else
+		myconf+=( --without-swig )
+	fi
+
+	if use java ; then
+		myconf+=( --without-junit )
+	fi
+
+	case ${CHOST} in
+		*-aix*)
+			# avoid recording immediate path to sharedlibs into executables
+			append-ldflags -Wl,-bnoipath
+		;;
+		*-cygwin*)
+			# no LD_PRELOAD support, no undefined symbols
+			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
+			;;
+		*-interix*)
+			# loader crashes on the LD_PRELOADs...
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-solaris*)
+			# need -lintl to link
+			use nls && append-libs intl
+			# this breaks installation, on x64 echo replacement is 32-bits
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-mint*)
+			myconf+=( --enable-all-static --disable-local-library-preloading )
+		;;
+		*)
+			# inject LD_PRELOAD entries for easy in-tree development
+			myconf+=( --enable-local-library-preloading )
+		;;
+	esac
+
+	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
+	#compile for x86 on amd64, so workaround this issue again
+	#check newer versions, if this is still/again needed
+	#myconf+=( --disable-disallowing-of-undefined-references )
+
+	# for build-time scripts
+	if use test; then
+		python_setup
+	fi
+
+	# Remove when >=dev-libs/libutf8proc-2.5.0 is stable
+	# https://bugs.gentoo.org/721300
+	append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
+
+	# allow overriding Python include directory
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake local-all
+
+	if use perl ; then
+		emake swig-pl
+	fi
+
+	if use ruby ; then
+		emake swig-rb
+	fi
+
+	if use java ; then
+		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
+	fi
+
+	if use extras ; then
+		emake tools
+	fi
+
+	if use doc ; then
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			emake doc-javahl
+		fi
+	fi
+}
+
+src_test() {
+	if has_version ~${CATEGORY}/${P} ; then
+		default
+	else
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
+		ewarn "before running the test suite."
+		ewarn "Test suite skipped."
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" local-install
+
+	if use perl ; then
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
+		perl_delete_localpod
+		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
+	fi
+
+	if use ruby ; then
+		emake DESTDIR="${D}" install-swig-rb
+	fi
+
+	if use java ; then
+		emake DESTDIR="${D}" install-javahl
+		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
+		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install Apache module configuration.
+	if use apache2 ; then
+		keepdir "${APACHE_MODULES_CONFDIR}"
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}/47_mod_dav_svn.conf"
+	fi
+
+	# Install Bash Completion, bug 43179.
+	newbashcomp tools/client-side/bash_completion svn
+	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
+	rm -f tools/client-side/bash_completion
+
+	# Install hot backup script, bug 54304.
+	newbin tools/backup/hot-backup.py svn-hot-backup
+	rm -fr tools/backup
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245.
+	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+	#adjust default user and group with disabled apache2 USE flag, bug 381385
+	if ! use apache2 ; then
+		sed -e "s\USER:-apache\USER:-svn\g" \
+			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
+			-i "${ED%/}"/etc/init.d/svnserve || die
+		sed -e "0,/apache/s//svn/" \
+			-e "s:apache:svnusers:" \
+			-i "${ED%/}"/etc/xinetd.d/svnserve || die
+	fi
+
+	# Install documentation.
+	dodoc CHANGES COMMITTERS README
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	# Install extra files.
+	if use extras ; then
+		cat <<- EOF > 80subversion-extras
+			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+		EOF
+		doenvd 80subversion-extras
+
+		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
+
+		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
+		rm -fr tools/client-side/svnmucc
+		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
+		rm -fr tools/{buildbot,dev,diff,po}
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/doxygen/html/*
+
+		if use java ; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	cd "${ED%/}"/usr/share/locale
+	for i in * ; do
+		if [[ ${i} != *${LINGUAS}* ]] ; then
+			rm -r ${i} || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB, bug 122877.
+	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
+		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
+			CHANGED_BDB_VERSION="1"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
+		ewarn "You upgraded from an older version of Berkeley DB and may experience"
+		ewarn "problems with your repository. Run the following commands as root to fix it:"
+		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	fi
+
+	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
+}
+
+pkg_postrm() {
+	:
+}
+
+pkg_config() {
+	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+	# already has EPREFIX in it
+	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
+		echo "A Subversion repository already exists and I will not overwrite it."
+		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+	else
+		mkdir -p "${SVN_REPOS_LOC}/conf"
+
+		einfo "Populating repository directory..."
+		# Create initial repository.
+		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+
+		einfo "Setting repository permissions..."
+		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
+		if use apache2 ; then
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+		else
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+		fi
+		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
+		chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} "${SVN_REPOS_LOC}/repos"
+	fi
+}
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index 3be5a3a7357f..629d620135e6 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,4 +1,6 @@
 DIST tig-2.5.1.tar.gz 1144666 BLAKE2B f8e96b1e27286ebebd3e3f374b28ed31a69b10bab1e831068341a430c36418d6a412b29caa3a44e3fafb3131d93b6d8d62ade4c92dc06fe753f040957b9e64e6 SHA512 e7c27a1e6357ce3cb4c02ff409d40c0ca67d10875eedbf467b9a280d8433cca15d16860256637041003384e7c536aca743ce971e623d3000dceeda598d6d3ae0
+DIST tig-2.5.2.tar.gz 1165288 BLAKE2B 8f054f2074829b0b6b5b3b0eb533dcbd86d57ace5c12b4a5dcc32c336928889f6caf680f934c8ce12c2a27a2e6b48e7d5cee634ef936cac02ddb822b5c5b825c SHA512 9ba503d69fe52ce717bac66b4f0147b4d073cf2993083c4837b2383c6b74f5f3884e98d6f701ff1a5d434f7a898774e0243010ead0561bb119a98b52f3a10179
 EBUILD tig-2.5.1.ebuild 1290 BLAKE2B 55ac7685c1797ab2de86865e5c19f4d011ab498b23fb3f91375b7017395cf60ec66e67addf8d96ebdf09926aa0d3d94cce2d4a2513ff8fc9c93e5069699a1a76 SHA512 a6f9bb48b4b7bffaad5a8475f3f75c611c91d8d50cc9f67e8cdbf307f3c293fb4e760a36dff3c7a6919b7f4eb4c90223a64c19cf9ac698f815e4ef867d971904
+EBUILD tig-2.5.2.ebuild 1363 BLAKE2B c5cb4fc150bd302db42061346eda899787223ede2438a8dc7a62329cf1e23b6f01f914471540d9e7f4cdcc6daff22887507144069cb019c52c69aa6d8accb6c5 SHA512 a7a418f340ba17c677c672e4544d11def090f0305ce41554667c5b1433aecfed2bdbb573ec1e9781650fd3e16160c7f071bedb54e0392ffce2251171c0580757
 EBUILD tig-9999.ebuild 1295 BLAKE2B 1cc93adc21d1da03403dc196674871555a68f2e5ddf59d94a320dddbb5d03f4b49c6d9255cc64b6721e1bee791b86dd42f980ae5eb116c66e93345eff2d946d8 SHA512 54f2ce9cac3858d74ca03255654eaa9310de703311a7d10cb3aa9f1df66d5e89d051a810ff47648bbd6a2cd1b0b4aa8c9f00318d64b6f83dc83da31fa4e30f41
 MISC metadata.xml 716 BLAKE2B 646f183cc6cc5110a69304f5343a0f1dcc9f42c82d8e16d0a06102b8052589d92bfffee948c78d2d4ce0ae6f29f1df38ae034c6fa160471823bb4457bcfa6603 SHA512 ae1521940d81aa080326f070b79a8a0a01b2ec1406088695e1e8462cdd78ce046131f9542c878ab5f919fa75e3c91aff0739a12511d18693ae050183db10343d
diff --git a/dev-vcs/tig/tig-2.5.2.ebuild b/dev-vcs/tig/tig-2.5.2.ebuild
new file mode 100644
index 000000000000..56e1d461373b
--- /dev/null
+++ b/dev-vcs/tig/tig-2.5.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0=
+"
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/tig-completion.zsh _${PN}
+
+	dodoc contrib/*.tigrc
+}