11 files changed, 44 insertions, 26 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 86fd724d4bd6..50de680a2235 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index 84d6dbbcfa64..f709b2ffb6d7 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 904 BLAKE2B 96c62507b55ef9f1f506c76b7d2a66746e390dc9736c9915f8b2c8bd2f96b769dd4c119c0c872f3912962882a0cd9b1fde1b3f6b6b39b9abf42f2e76db6ea733 SHA512 4fb361e3183f1274d67cc4cc4b317e1ca35b9baa0b35bb04d1e00b1893a6ba76404ae468257a07b47a6184449c6a6990fec90474d0b64c9a5cd64ab2bf500065
-EBUILD cvsps-3.13-r2.ebuild 994 BLAKE2B 4f1bbaa9121d7ba23b7456c599955808f6f4ccd2caea692528aa7fbf6eedf7456a8c9265422754be8c68befb16fbb0cbd3419b766016866e8565dbcf6018741b SHA512 2f73e96bb7e3c3f12a259dfba05096d846ee06cb4269c89afcc7e8716058864bd4930122ceb9a787716f6ac58033eba5c9d84bfb20ae4ea883735206e129f09e
+EBUILD cvsps-2.2_beta1-r1.ebuild 910 BLAKE2B 0d200cea90e523416b5a4d88ddbe337b47ca0e40a2b37ffe857319d60b0133360cd3b4ff132bd4fc59f29d05d27bfd7559474ece15c2246fa3de17872ac2ed50 SHA512 728b0bfa09087bc6bb8f3f16c299bae9e6451eeb96a15f8172ff476682c592cd1f409812c683186f63b32c6c44235da0b258668fa1ee4df79cba0d80bab5e975
+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 41a453738252..7177b069d6a2 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
@@ -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 ~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 ~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/cvsps/cvsps-3.13-r2.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
index 1cfad7729221..0a04cf1d0dbb 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~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/git-pw/Manifest b/dev-vcs/git-pw/Manifest
index 6e395ae3278f..43b2c57c0dcc 100644
--- a/dev-vcs/git-pw/Manifest
+++ b/dev-vcs/git-pw/Manifest
@@ -1,3 +1,4 @@
-DIST git-pw-2.0.0.tar.gz 32151 BLAKE2B f8ef04b31cb4457ac9bae333bae65deb7d17469cd25a3724a27201dab0c05f98151a5ec1066cb9d2de81d82360f4e46eaa59ebd08904dfa0d16106f589e17e4c SHA512 83ac4d56091bfe9b03733939fb3e4feab22ce4455eebe8508bc730705b69054a2f060cfb8a1ea469476d9519809a89116ff56210efe4cd76e50df5a5d40886fc
-EBUILD git-pw-2.0.0.ebuild 1037 BLAKE2B 8733ba74e1410b1646ffef903050bf536911d4b24150156775c594f5b9a58d84dc7e5d6d73e0a315a90cad6d8ce9d488b7425d49173a7f4c2830333cc292f46a SHA512 805faf949e13acfc57ee862dc8c57aea69425d2b9c2cfe8d2e6501907a940f1930d88b24aae803e999a97d3c595cc1c6301cd6efbc6196277c8e62302f585c40
+AUX git-pw-2.1.1-test.patch 1048 BLAKE2B e44d85ed1b0073a0c4b3e9f044e5f6d79612f9acc2a3b65dab9d4bf653c3364935203741346ca56cf6d3b0b75550954616289ed6a86f49cab7ab5fbc84cdf3a7 SHA512 6b5741a95c35cc19afac0d5f1485fb85290d2a9eb9938f65eed83b0bf016101e0321262685687d57c52abe4cdd18a1d33ab632df5c37b59a26386161ecc17956
+DIST git-pw-2.1.1.tar.gz 32489 BLAKE2B 516eb3b81c3798a455b7122a3b0ad9bf0d9722eb6f301ea58ed766cca94137f4da4eaf34a40ec7c5e108368aa6099f9401aba6d71d463913cd2b7fd9dc7aef09 SHA512 3cbf0670bf811d6b6ef0d4c5c7ad4321380d442c62fd15869758b26b4fc375c2d4bd2bdbf693a41d0cbe862bdef15fc02d04124a089f7786bd1b2e56f818e0c2
+EBUILD git-pw-2.1.1.ebuild 1080 BLAKE2B 82442c41df4c20dadbb231d982367eadc0372ab9b3e275344dad5ccf4e1b92731c69cd3d16df200272415abcffd2717239840f9ccf48fa33b739c4a8a70c57c6 SHA512 62efae093f24d7c0ffeba0a3bd9503e92185c3d7596c2c6e98cdbe2051379a74b8044e519d673e2fd57e68b6fae6c6bd4e71d191f9de1bdebfc56c9c91e74b06
 MISC metadata.xml 573 BLAKE2B ea8a1646462b2ff59f05531d1964c160216b7c19b17e261a75940e591106195050ad9ba65f3b5ea594d4a4ad53cfda7cf7dbb1894c6ac850a6b5c9e189093432 SHA512 cc0a718a6d9bd29c5a77dc3f23a4f4b691ab0c954c6c2a7266126c2cbc312aab73e5484120bad031e77abcf0c1cbff2c7af998700e45eebc51fd73facc988f8c
diff --git a/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch b/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch
new file mode 100644
index 000000000000..00df55f872d1
--- /dev/null
+++ b/dev-vcs/git-pw/files/git-pw-2.1.1-test.patch
@@ -0,0 +1,28 @@
+From 08152c86d02c36c425047fa9220d6d5ac3fcda01 Mon Sep 17 00:00:00 2001
+From: Matt Smith <matt@offtopica.uk>
+Date: Sun, 26 Sep 2021 19:55:40 +0100
+Subject: [PATCH] tests: Unset PAGER env when testing fallback
+
+Prior to this commit, the test test_echo_via_pager_env_default will
+fail when $PAGER is set to /usr/bin/less (or anything other than
+"less").  Use unittest.mock to unset the environment variable during
+the test.
+---
+ tests/test_utils.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/test_utils.py b/tests/test_utils.py
+index cf75a55..a0974f1 100644
+--- a/tests/test_utils.py
++++ b/tests/test_utils.py
+@@ -75,6 +75,7 @@ def test_echo_via_pager_env_PAGER(mock_inner, mock_tabulate, mock_config):
+ @mock.patch.object(utils, 'git_config', return_value=None)
+ @mock.patch.object(utils, '_tabulate')
+ @mock.patch.object(utils, '_echo_via_pager')
++@mock.patch.dict(os.environ, {'PAGER': ''})
+ def test_echo_via_pager_env_default(mock_inner, mock_tabulate, mock_config):
+     utils.echo_via_pager('test', ('foo',), None)
+ 
+-- 
+2.33.0
+
diff --git a/dev-vcs/git-pw/git-pw-2.0.0.ebuild b/dev-vcs/git-pw/git-pw-2.1.1.ebuild
index a27a91f9a2c5..dd63e27b733c 100644
--- a/dev-vcs/git-pw/git-pw-2.0.0.ebuild
+++ b/dev-vcs/git-pw/git-pw-2.1.1.ebuild
@@ -21,6 +21,8 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-test.patch" )
+
 RDEPEND="
 	>=dev-python/arrow-0.10[${PYTHON_USEDEP}]
 	<dev-python/click-8.0[${PYTHON_USEDEP}]
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index f9b23a016ded..ae41e0c172af 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -41,7 +41,7 @@ EBUILD git-2.29.3.ebuild 18175 BLAKE2B badfec96e42d4cfbf8327298313c381ae526efbaf
 EBUILD git-2.30.2.ebuild 18176 BLAKE2B 693b6d1f83be107234f2922a55993b66b41fb987cc2dc62f076c3a16b2d387374f44cc55c2ef3210583e4972b0783d32d1e49802fd4b5f8fc7d54a5e6d5c70e9 SHA512 5fe5ebbebef55cc29e23984ecda3c3e8814bf8c17ef4329960ff561a857058e998ee5c5f9bdb3b26e7dfe7d408dd0fce772074f17bbaf0f3a9fbbb776e3b6242
 EBUILD git-2.31.1.ebuild 18058 BLAKE2B 9c9c7530527ace419f1191e6aa671dfb0d4dcf25760ad30658ebd83889ac0df396021030d0e0499b497340c47a1a3e8b7b12575f2817fb9231c11dd5652d7bc6 SHA512 e5ae923aed189506a97512be5e87492098cdd876645f837f28035875c46745a2b2a03e7374e8d05276b7d0a76a9d47df117329dbae175386cb5ce5d0d96e4c51
 EBUILD git-2.32.0-r1.ebuild 18175 BLAKE2B d1ad748f2352b377dadad657fc7259df0e14829949e76975cd85264ceaf8cacca56298401346719d4848204489909e47d26f03034add34aefeccea3ffe46f87e SHA512 afe87968de6d6956a265ae693a2ebe6ff91d2cdf5fa0486b7735a8feb39b8eb4126e9d87fd1a0cee1fb9784ad43875913eff9494d3075d5c9070dd5ffd30e494
-EBUILD git-2.33.0-r1.ebuild 18182 BLAKE2B 2156858a01b4f819f5a36375b91375c8a3da26a8729c9900f20ee73d80bbf595e3c4f82fba83d1f91d38f679f9330d5ddc5811e0fe34eccb85c4c83596ce7e15 SHA512 863ec5b8a7c3d247818bbeb171ad9c1debb660d4fa7b67c417661eb92c3337ce5e1daa24159485969acd17cc3524aacff679c679ad61f6fb2f3f1baac21132f9
+EBUILD git-2.33.0-r1.ebuild 18188 BLAKE2B d919e980b85e905b7c593a3946f992e7125a294e42481af2601fc8b64a0d3ba9b4f0d17b1a7a0dc6addcb6bd851251ad71fae35c3ec5800930ef328e6c87e87d SHA512 8bd82321e7aeeb46eccd55ba0c8ca229b8b41434d2d5500f8bc3a5a453225f6485ce15897b95aa9626a04f655d7f344ea2bc45284bb36ebd66fae7d9080f2e65
 EBUILD git-9999-r1.ebuild 18041 BLAKE2B 3f44b8a8b41778e9673e3e0597ce758dbfefdb5786b3a70836de72148e2cbd641a66a9861a380bfe6b4456a5ef9eb3f89eb14fc908e2ddee407c4068daa76f59 SHA512 346e28ce1c418b2e2b89e402ba050f4b0f6847ba37614f3847b4a58eebc4e9fa8b6a8b122b4f45907568aeb3ccd5cd0000415a37a27686b0dc05dfbc50479c43
 EBUILD git-9999-r2.ebuild 18041 BLAKE2B 3f44b8a8b41778e9673e3e0597ce758dbfefdb5786b3a70836de72148e2cbd641a66a9861a380bfe6b4456a5ef9eb3f89eb14fc908e2ddee407c4068daa76f59 SHA512 346e28ce1c418b2e2b89e402ba050f4b0f6847ba37614f3847b4a58eebc4e9fa8b6a8b122b4f45907568aeb3ccd5cd0000415a37a27686b0dc05dfbc50479c43
 EBUILD git-9999-r3.ebuild 18071 BLAKE2B 4f7571d39e8cd836fd71117a34df82a092417f9543f6d165121359230e1f2b6fce8b925345d205512d372e56459c7ad4983a79da2785139b99dacba6bbac0a3f SHA512 901412cd7d3d71e67f66e0a37d2e5f9032cede4c944a04455de962fb6f681cad941839d0e60a77dc6959fbd616aac7afa556a2aab24aaaf9cd7f95802c5dcbd3
diff --git a/dev-vcs/git/git-2.33.0-r1.ebuild b/dev-vcs/git/git-2.33.0-r1.ebuild
index 776695e8922a..568fa5085e27 100644
--- a/dev-vcs/git/git-2.33.0-r1.ebuild
+++ b/dev-vcs/git/git-2.33.0-r1.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 ~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/github-pages-publish/Manifest b/dev-vcs/github-pages-publish/Manifest
index 5a83c47e83ee..08aa4f16c881 100644
--- a/dev-vcs/github-pages-publish/Manifest
+++ b/dev-vcs/github-pages-publish/Manifest
@@ -1,3 +1,3 @@
 DIST github-pages-publish-0.1.3.tar.gz 3568 BLAKE2B d19d9d218d584f92a70016b6522b1e27edecf7de8dcc1fb4ca790980ec2a4ffd4f401f11ac7cd2483e5e723f9ae088678dc3aa346eb66de536a5c10435ff1953 SHA512 a501a6fbdf10038a35b5df8add58a79813d6cc2b26b2bfed2a2db7d02740c587a60402459c2fcdeeec66c72f1d5df532023490219daba14ce60782a2018b93d6
-EBUILD github-pages-publish-0.1.3.ebuild 740 BLAKE2B 4847ca11fb9f2d28dcf4edcb31b88c4b84ee8a142308be41cfef68f75d0cf7bc13268a078787e7f1444035cf5980d4eece04dbde19fbfbbda497d9929afe7399 SHA512 eba605a649efd5b5497a73b1ef34e3a0aa10551dcc96032044b6ae2adde23eb9edac073d1436017942e70d46cefc4657f6ea03d4fde1fd9135bc47c3e79c3cd6
+EBUILD github-pages-publish-0.1.3.ebuild 495 BLAKE2B c307b92d4ba4564c70ce945f4d425af13fd39bb98781d2eaf9203ba8cf55180b638aa0620727b3b89ab07206e8dfbf1587526220cad0cc407c4b6bbcceef7f78 SHA512 a7077b80ff7fb1951babd9e410e378e207194a710225eb829b2e73524e4b02ffd5f6c030c5ea31638651d9d267bcb0662e994a1fb75ba376fbc670cdc5e3fb80
 MISC metadata.xml 449 BLAKE2B 871ecd35ccdb66151e7d175404f8c456b924df91c499c924c37dfb25bab5051b97db89b4358031997def6072583fc3a96fd154f57dff39c9621b08718ddc5bd9 SHA512 69adde21cf695adddad419b1b3261b48daab79a85207579f3d09c10df4ca06befcaf0e4a0b7b88e48087406da7a1e1110ec109c156ce44a9c6525c51e0563681
diff --git a/dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild b/dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
index 3226c0a807a2..73c53a38c1ea 100644
--- a/dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
+++ b/dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
@@ -3,30 +3,17 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-GIT_ECLASS=
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
-fi
-
-inherit distutils-r1 ${GIT_ECLASS}
+inherit distutils-r1
 
 DESCRIPTION="A script that commits files from a directory to Github Pages"
 HOMEPAGE="https://pypi.org/project/github-pages-publish/
 	https://github.com/rafaelmartins/github-pages-publish"
-
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=dev-python/pygit2-0.20.0"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-python/pygit2-0.20.0"