12 files changed, 148 insertions, 6 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index ed9a0502dc9a..be4a4057cf8d 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-filter-repo/Manifest b/dev-vcs/git-filter-repo/Manifest
new file mode 100644
index 000000000000..a041b07420a9
--- /dev/null
+++ b/dev-vcs/git-filter-repo/Manifest
@@ -0,0 +1,3 @@
+DIST git-filter-repo-2.33.0.tar.xz 148024 BLAKE2B d23b47575cad60db2c42fe794d6b648ee14b0c126cc832b267030e6c8b4edb0acd6fe7e2666da086b3c79184a7e4362b585dfab8966102552f8317e3027d5d32 SHA512 9a4fc3e95c9b6bd399925bb8554acf93711a015756cc826a9f9ed06e91538addb78b3120876c46af4245892adfca7428d915a33d6d2890d9c0196cef5d4faa0f
+EBUILD git-filter-repo-2.33.0.ebuild 712 BLAKE2B 63b2280eab89b700ac09414d093974135d9f7f29b6eb27eb58ecb9bb11c450d1a7c980e9e8e42c1486c84a5cff145c7193e194de811bd18fbe520d13220dc05a SHA512 08109d66461f634658c2e0037ceef91b36d393d88eee2ca1459cbb8f4c9e468bea1e97993617f017fe4476eed6188d93be58e4e7e9995a6834c496dc90873054
+MISC metadata.xml 334 BLAKE2B bd5285f5c361e2e7d8a9fd7abc0e92b657e301d4d3674ea09e98db0c621ed769a7f009fb14693c655eef3af7c1ba71b9c7d84ff18f998c732867ef8f586b2d23 SHA512 66e76189541c836c5c9d08287e1bf872f61a775b642b28997a47440a1c7522fb49ccd6f5ba4975a74121e51d615aafa66cc7a920a30e45c6ce07195eeb625413
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.33.0.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.33.0.ebuild
new file mode 100644
index 000000000000..dfc0b43cc287
--- /dev/null
+++ b/dev-vcs/git-filter-repo/git-filter-repo-2.33.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit python-single-r1
+
+DESCRIPTION="Quickly rewrite git repository history (filter-branch replacement)"
+HOMEPAGE="https://github.com/newren/git-filter-repo/"
+SRC_URI="
+	https://github.com/newren/git-filter-repo/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-vcs/git-2.24.0"
+
+src_compile() {
+	:
+}
+
+src_test() {
+	bash t/run_tests || die
+}
+
+src_install() {
+	python_fix_shebang git-filter-repo
+	dobin git-filter-repo
+	doman Documentation/man1/git-filter-repo.1
+}
diff --git a/dev-vcs/git-filter-repo/metadata.xml b/dev-vcs/git-filter-repo/metadata.xml
new file mode 100644
index 000000000000..8cb46cff61f8
--- /dev/null
+++ b/dev-vcs/git-filter-repo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">newren/git-filter-repo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 2e2efa14989a..e8a883f1f09d 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,8 +1,11 @@
 AUX rcs-5.10.0-glibc-2.34.patch 1276 BLAKE2B b254af7dd5c8fa14211b0501be41a1e9411bf67a2d9351bf1e375eba9ea3cc118be989f0fe7ce4504329c40ba3a36eb84ba2b66897317328e90108e1190fb238 SHA512 3d398005e3d9bf2143a4590abfb82094287810e7bc6274869d64b3800ff15faabfa12a3cc5b5d087fb1831adb1394b22324d3d80d7e0dad47e3d1a2263573361
+AUX rcs-5.10.0-test-t632.patch 976 BLAKE2B 95837ba618cf67ffb46c58b9389933615874e318205e3e755a0d34137b8aafdde8f8772669d78c79df6e314ac958f20f97cb4953e756907a36f5db7d30cf99fc SHA512 08d4c1537d78217dbe9f0157cbb4649790d1863ee36623b2e05219ba91f83b55b20eb59149ccd98d67b7a6a59d0236c645045d613dce24a77b6b3dc9b56d8a3c
+AUX rcs-5.10.0-test-t808.patch 895 BLAKE2B 77f406a10101aac745b5ce8eef14514eb4b7722a0b8091f3e39b2ad5db8fc5e569aa51abcccbf90c7278a3dfd3a84b1e95c4c949c8140b1f84a9fe9c37cfe686 SHA512 15e81e6eb3520101237bbfd6d45fcf80155084f13f892d1ac38dc216e7f5aac1e2a469a9546dea8711dcbfba37b8079a6a9c93f50b0387bd936323aa456605e7
+AUX rcs-5.9.4-test-t810.patch 737 BLAKE2B 767a6ce0e3977bf9d982b14eb180bf222388da6408b5d943f9de13a2a2e731e50dc0af60140853fcb1f5e61cdb5cfecefc00b782dbddab29d81ff437611f4e51 SHA512 8a11c9a53be98465efefb2ac41469cc93b4caf0e2259591cef4bf3af72e0ada6d733d47a0c9e1fcf6513bf84ff6d1c1c485c85b8654a87606bcf64481fe67b67
 DIST rcs-5.10.0.tar.xz 890872 BLAKE2B 32000df00c639cec90fb9128503b67957a23c82a08651953b57434c3f14ecea555155da933d5be801ad216aa27ccf496a7aae325cecf73f9bc121f3a3c659cba SHA512 d42bded1214f27dfcbe912bbabad8479555a02bc57000a62512d63ff0672de1ed23911cd15c9d1aa4b9a53794ac3fd45937fa1cbc0fcb9d54a3ede4d831f76d0
 DIST rcs-5.9.3.tar.xz 800736 BLAKE2B aa3f17555e5b65a9d65dfa781f2e12496e282128d9412529f67a831b5d6035302a6f70c4fe0b9d9519a2bf02fc5a98d03f4aa3b86696fd27874bfa7549e8c8a3 SHA512 99b124a94f285d8c675a2a51397ca4a97468f053d42aecf543e9266f16aea6b2667613f565c3462ffd2350c28e22baa4d01d598e2cc7e1e940625086f6de0ba6
 DIST rcs-5.9.4.tar.xz 801360 BLAKE2B 18cb97aae7a70f9f12b1018d6b6b42fbc06dd96b491caa7ee5ae2a4a746339e22ffc93ead5756add62f8a08d5cd1ec589c242f0a75e9d78aff29b95114869b25 SHA512 c501a46b8d2e166ec0b54301d72687d9b38b31d84517fcc8dd560a296e7ad250962a92f019e53b2921af9045755e2e7f2f2acc9542dbe0d19ee110ef36861cd4
-EBUILD rcs-5.10.0.ebuild 936 BLAKE2B 10a4e9a116b06dc7e6a30c634e76511ccf5a5d70a42765e5906f145adf9ed112153fa3ac643bac75494592da6f521fa6e5c7036aa47f5daf195026b4c45e068b SHA512 f8b8ce48bb2a8b3f75300314e1753bd8b3a21170635dcc38e17073916b788a18fee69ec26ec230bede4705b6012efe9ef614a707aeb4b44a517e0124ded3a020
+EBUILD rcs-5.10.0.ebuild 1008 BLAKE2B 80abfa681a93dbd068a35dbd6cf2be1f4a2c5dc42020af92543d5ae5c2408e3ddf816a25d062fb120df4cd41e2c332d94f082960b262f5f7811f80bcb4624968 SHA512 087a2ffe01f55deec4aeb9b2bb72b0e7817bcc07660d7377aff612db4e62ab88f941b6e64d54f4c4155720e44306910fe9fed165d93dc61f28f4c12b1d6b5c4e
 EBUILD rcs-5.9.3.ebuild 871 BLAKE2B 4df338fe8d4879d87503149398fd97b0c57aa26ac12480c06fd427519ae00f0299fc58596e27195034cf62a9c64aefa527a1c076f217f99011cdce4119543f31 SHA512 c20b4245d22c83509e3c5d8777946aa2bcdea83a7120529ed8352330a7587504f26112a12e6f128916887894836917a43f400db31cedf4877a6d78adc83e92f5
-EBUILD rcs-5.9.4.ebuild 878 BLAKE2B fd4f24c0adc5dffd0f04dcb10896d32a8a06521823b7d300b6e165aac3833a323640ffe02863b5c572c244196903e6b807f9197626fb1aeb7f2332cce6c12137 SHA512 6c6d38f473af070cf0b775e0e50e65a3484b8d6ee6e4cff25385fec42cc312f1b76f5c181f3798c2fa8664e712582313b4d4b40cf7379a275ded7cb3bd82cab3
+EBUILD rcs-5.9.4.ebuild 922 BLAKE2B 54aa8f16351f580046b7cb579fd1cc301073d37ad94693a2ed29d4b26645c0cf452487947d60820eb8e390fb7a2d4b255d1f03645110216c00aa1fdde99c2a50 SHA512 5a15bf6011f8056824a884fa337b4e5f47efe190f5905d50032d8b7bc0e3503db08abf9f6d84736ffb01c909440c5270162965f76f0516212f98d3628e5a9e62
 MISC metadata.xml 615 BLAKE2B 4e00cd56075f6ac650d317e09a31bf40b3d64c098ff472f032bbeed9e30188e98e81fc0175cbf9d0a565cdc4bcdac6e6da6d551d48e6cb9fb82e45de0c840f42 SHA512 c51c417b5440c81d4517879495ba0f8b941d8201089bb09499045ba7b16a4de1c29938e9124d43e244639cbd2177cfaa3b8432686a7ce23421e7386471fa4032
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
new file mode 100644
index 000000000000..ea86af8fd022
--- /dev/null
+++ b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
@@ -0,0 +1,30 @@
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=8883c4f5a29be18e9ea09bd27a7b660830de45bb
+https://bugs.gentoo.org/820230
+
+From: Thien-Thi Nguyen <ttn@gnu.org>
+Date: Fri, 23 Oct 2020 09:23:49 -0400
+Subject: [v] Don't test signal handling if stdin not ok.
+
+<https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html>
+
+* tests/t632: If stdin is not open and connected to
+a tty, skip the signal handling portion of the test.
+--- a/tests/t632
++++ b/tests/t632
+@@ -40,6 +40,15 @@ echo | co -l -I $w \
+ # (This is skipped if GNU coreutils timeout(1) is not available.)
+ ##
+ 
++# <https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html>
++# The timeout test needs co(1) to block on input.
++# If stdin is not open and connected to a tty, skip out.
++if test -t 0 ; then
++    echo STDIN OK
++else
++    exit 0
++fi
++
+ # TODO: Don't be lame!  Pick one:
+ # (a) Mimic timeout(1) w/ sh commands.
+ # (b) Incorporate heart of timeout(1) into ./btdt and use that.
+cgit v1.2.1
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
new file mode 100644
index 000000000000..86ebab5f1475
--- /dev/null
+++ b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
@@ -0,0 +1,32 @@
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=5df4567e69fc7f46d14cfbf396525c3d05bcf970
+https://bugs.gentoo.org/820230
+
+From: Thien-Thi Nguyen <ttn@gnu.org>
+Date: Sat, 24 Oct 2020 19:14:26 -0400
+Subject: [v] Try to handle whoami(1) returning no info.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* tests/t808 (user): If whoami(1) returns no info, no longer error out.
+Instead, jam a value, and set env vars ‘LOGNAME’ and ‘USER’, as well.
+--- a/tests/t808
++++ b/tests/t808
+@@ -24,8 +24,14 @@ rerr=$wd/rerr
+ 
+ user=`whoami`
+ 
+-test "$user" \
+-    || problem 'far out, man ... whoami failed!'
++if ! test "$user" ; then
++   : 'far out, man ... whoami failed!'
++   user=jrluser
++   USER=$user
++   export USER
++   LOGNAME=$user
++   export LOGNAME
++fi
+ 
+ must 'sed -e s/ttn/trulynobody/g \
+           -e s/zurg/$user/g      \
+cgit v1.2.1
diff --git a/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch b/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch
new file mode 100644
index 000000000000..568731e1903f
--- /dev/null
+++ b/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch
@@ -0,0 +1,24 @@
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=f2330a6268d244e97f47a97f4767736fc3b31455
+https://bugs.gentoo.org/820230
+
+From: Thien-Thi Nguyen <ttn@gnu.org>
+Date: Thu, 5 Apr 2018 16:20:35 +0200
+Subject: [v] Avoid "test FILE1 -nt FILE2".
+
+* tests/t810: Use "btdt mtimecmp" instead of "test -nt".
+Thanks to both sergio and Xose Vazquez Perez
+for indirectly signalling this problem.  See 2018-04-05,
+"Add support for "btdt mtimecmp FILE1 FILE2"" for details.
+--- a/tests/t810
++++ b/tests/t810
+@@ -27,7 +27,8 @@ split_std_out_err no
+ 
+ must 'echo new line >> $w'
+ must 'ci -mm -l -d -T $w'
+-test $w -nt $v && problem "$w newer than $v"
++test 1 = `./btdt mtimecmp $w $v` \
++    && problem "$w newer than $v"
+ 
+ exit 0
+ 
+cgit v1.2.1
diff --git a/dev-vcs/rcs/rcs-5.10.0.ebuild b/dev-vcs/rcs/rcs-5.10.0.ebuild
index 4bd994b8b2e8..02c0dfa721c9 100644
--- a/dev-vcs/rcs/rcs-5.10.0.ebuild
+++ b/dev-vcs/rcs/rcs-5.10.0.ebuild
@@ -20,6 +20,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${P}-test-t808.patch
+	"${FILESDIR}"/${P}-test-t632.patch
 	"${FILESDIR}"/${P}-glibc-2.34.patch
 )
 
diff --git a/dev-vcs/rcs/rcs-5.9.4.ebuild b/dev-vcs/rcs/rcs-5.9.4.ebuild
index b5cd95399632..e00c34d58f3f 100644
--- a/dev-vcs/rcs/rcs-5.9.4.ebuild
+++ b/dev-vcs/rcs/rcs-5.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit flag-o-matic
+inherit epatch flag-o-matic
 
 DESCRIPTION="Revision Control System"
 HOMEPAGE="https://www.gnu.org/software/rcs/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="doc"
 
 RDEPEND="
@@ -20,6 +20,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-test-t810.patch
+
 	sed -i -e '/gets is a security hole/d' \
 		lib/stdio.in.h || die
 }
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 835bb7a9302c..585e4c571edd 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -4,7 +4,7 @@ DIST tortoisehg-5.9.1.tar.gz 8637928 BLAKE2B 57687359eb00018a811e28449dccce26056
 DIST tortoisehg-5.9.tar.gz 8637690 BLAKE2B 818b866314a04857838ea971d9a26df6604fc97a7968ee1419337fccc413d228e5597bef80256b35a2084956f356e9015c2c9c00181ab600ee75b5a86f8ec358 SHA512 14b91a2193f0eaeb39d49b131ec9214732b6898e7ee2a57091cf5be61a37ec5a0b71d8eea5d67b30ea8796565c25aa1bd1fd23ff178ae1a7dcdbfd5b333e525f
 EBUILD tortoisehg-5.8.1.ebuild 2164 BLAKE2B 14da93c64160f5a6c91f149c7a288d5a881d434475ebf7fd3ea3a083d9ff4979351a4cbe6c0aa63d80a54c3ce4add40ced1740455ca7f070af601283055487d9 SHA512 242b69d6694fe007cf99c22a815add13e177243475d03006272a4757d7fc0e1892be03986626cc00aada6d8fb316dd0bfa2738197ab8ed50f60eca033eeb04b5
 EBUILD tortoisehg-5.8.ebuild 2166 BLAKE2B 203d7f67301c454e992646afa656365f0bd8f220a7865f3da4f48d2440de4f34d371e9f39c728955bd694dab7d34862d9b52f48be448dedea5b98f40709cdfda SHA512 f0634d3da8794c73e8b2e55e8043ff9077d59162f00e2ce8d1fb617f4fdba81765d4180c0caae55ee085f230c2c1b064e43473404d13cbfb0bab7f77460a7051
-EBUILD tortoisehg-5.9.1.ebuild 2167 BLAKE2B 0db967048dd3e537aa34ce16f37036b3abaa8f2a1739c3f3052e1cc0d942a371ccf23921a6b3ef68ade9cbfcb050577338a3c79aeda4f1cf6a249737abc7c925 SHA512 c20e463fb00fe718821073f8a5fb3c913cdaba4bf1a64d8348109b25213ea81cc2202e2a26c5eb816d059058592c3068ff9d78ca332a5675d8e5a14267478600
+EBUILD tortoisehg-5.9.1.ebuild 2166 BLAKE2B 37f3f4cceb3c06419e6e8748e4275d1dd1a7016c487ff84896214cdd38b846c65ef670df8d9edf1b0f50c55644424bcf54777965efc57e78a514fde0fe540ff2 SHA512 7428b10790d699dfeef38a0113e3310ba5c7a30799e47799fca9d9183658ca8ca0d9c6797f2cddb5b37e1c6f2ac8fa55384dbbc6d03bac0c7e1e4e56c2e67229
 EBUILD tortoisehg-5.9.ebuild 2167 BLAKE2B 0c1237de6a4b74cf252937f5d47abc8485f14931a4a3d88f7c7eee133402bbd039cefdfc25319c72aea6e077c188234c567123e5f0fbe6f48d609d9576a432d7 SHA512 b94e7458441b661d61feb203812ba903d5f2f3c8d43681a8878137f8fe8965f2ac712868cd860e7229d8a134bd42e272c9e74c9e355693a701047603d86cfcb9
 EBUILD tortoisehg-9999.ebuild 2167 BLAKE2B 0c1237de6a4b74cf252937f5d47abc8485f14931a4a3d88f7c7eee133402bbd039cefdfc25319c72aea6e077c188234c567123e5f0fbe6f48d609d9576a432d7 SHA512 b94e7458441b661d61feb203812ba903d5f2f3c8d43681a8878137f8fe8965f2ac712868cd860e7229d8a134bd42e272c9e74c9e355693a701047603d86cfcb9
 MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc
diff --git a/dev-vcs/tortoisehg/tortoisehg-5.9.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.9.1.ebuild
index 8f087458c5b7..965665fea182 100644
--- a/dev-vcs/tortoisehg/tortoisehg-5.9.1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-5.9.1.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_SETUPTOOLS=no
 inherit desktop distutils-r1 optfeature xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
 	HG_DEPEND=">=dev-vcs/mercurial-5.8[${PYTHON_USEDEP}]
 		<dev-vcs/mercurial-5.10[${PYTHON_USEDEP}]"