gentoo resync : 29.06.2021

6 files changed, 4 insertions, 62 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f44c3a8fad70..a1d9a44aa5c3 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index f6e6a78c8da7..081814d1851c 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,6 +1,6 @@
 AUX git-flow-1.12.3_scriptdir.patch 1835 BLAKE2B 911028fe6de44d1427bfb7fd59cf452ec3e3716034ac9797e8f33a8b9be80929a785670c1dbfad6e908f4f2833af2d3676c4b80b577da47f8118dfefd43ba2d3 SHA512 26e777ce7e485103224896ff50c20d7d061a27abde57296c3db36a651ed5e784b9deb8a74f4c118bbd4abd48efb42c891d21e35e74b0c33765ec5e2b10cf3722
 DIST git-flow-1.12.3.tar.gz 66173 BLAKE2B c6045fda9df8e305ccde8fac844614c840c5361f41848af6bf3394f64ffbbc5b03c20ed966960667d9aba76b0ed105f4caa2a5c0d5eab02a24720bff7b0aea48 SHA512 807cd36de7f5c9b4a7b28101de5ea8cfcbf528ff76578e4914c788b8098c7d3d91f8c19a3274e124ee7f7b4bdb6efdc5de2b74e09f374b71ae685beaa86e3e5a
 DIST git-flow-completion-0.6.0.tar.gz 7823 BLAKE2B 24dedfc0cddb5acfa57333895533f5c882a0c85db6e08539ff5c33f984eec40cb06da6d5f0ba812348c9cbf226080875de0269b295791ee5d4c8b2732a1ea1b2 SHA512 1082ad47938ec78045f4cbd12340a82960ba3de204c21a95e1166cb0b86e96dbbc3e5fc8af1945c951d5edd43b4026021761e8377795acbb87af3c1e391cb256
-EBUILD git-flow-1.12.3-r2.ebuild 1098 BLAKE2B 102b85d76401d9805ccf00eb7fdaf9aa2d38e2e76402a9ea931b9eaecb01318a9b874003fba2fbb082c1e3dc44d3b81dae610cebc17319b15c18f6493eaae54f SHA512 f431d74ec7755c8022db5f25805fffeecf159e21281aeab124f8c8e1b66440647041f86d02288cbd3b725b07ed304b86c5acb20c4544ef2430b7989546ef9129
+EBUILD git-flow-1.12.3-r2.ebuild 1105 BLAKE2B 9475959a8c34df34c7449984eef2f7a047538a0a28cb20cd3be69ca5115c5dbd301676e81d35f1cc12fe9470cf42e54933de9d1e66b7c4da28374474b0d2972e SHA512 ceece3cee9e62b241575d13239b1fac33b18dafe2b43d4653e080342cc52d25838b92fd31168a613dfd4b2223d274fffb2594ac653da5781e7b8c08440446cf2
 EBUILD git-flow-1.12.3.ebuild 947 BLAKE2B b6f1f2798e625f6d71c6096e6da68bad4520d0f1893655d2822ac3249e549cb673995d11fa184a16c5599425ba5f31a6d38f34872548eddb9e8e29765d89630a SHA512 50b73fc71b89e87b302913ed49f303212dc69746940bf7c5729b9b39650f6e2da1f7771a2f407f5598ebfde59bdd0dcf83d7dc0cdd600478461e7875c47bd7ef
 MISC metadata.xml 337 BLAKE2B 8c6ef9bdbc2954e6d4a8cb33e165708c2f988c80c836014de87cb415b0dc2b97a254727fc992b256ea34c25224d7b03e2441e9d35adb6ab051d5bacf5ef6584c SHA512 520ba0f22ab117dcc6bfa365503f3d7f11ae1e1a50864a233f06f2a63678fcf2e55ab410d54e89c47ebb8a7896a2a1a17894d657a18602c0620c832efced785a
diff --git a/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild b/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
index 95612de82ddb..7951db199734 100644
--- a/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.12.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="dev-vcs/git"
 
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 86e8a22eb368..bd222953c09f 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,5 +1,3 @@
-DIST pre-commit-2.12.1.tar.gz 246313 BLAKE2B 45ee7c8217f88eeaa2e9eb11efd79291d6577134799b328f252bd4d4283c11754b36ffeedf045a5101c6edc8cdf330d566e404ae34f1a831a830e8e0346337e9 SHA512 6dbd804e1001276e6e8cea7c31b321a05798b38c59f37d5900317c3a9ceccf5103afcbdfd29f9438be3595a18ae15eb09dd222c91c439da47d7728a0e0a55c70
 DIST pre-commit-2.13.0.tar.gz 252631 BLAKE2B 7e6b3af46dfaf9928d2cb2aa6cad05423bf6e417e2324af71b241e1aaa2eec6fcb271869f98c040cd4fb8c608a1fabd244c8286864f469a06c44684cd2bf33eb SHA512 5dfc297b3f900afef8f1c355b38ce086af7c836d1e577af8ec95ffb30e82df8b866131da4ff12933339bda63e4a90833c3852265d4f2d4a59bf92bce2b972a5e
-EBUILD pre-commit-2.12.1.ebuild 1711 BLAKE2B f21a7772ffedf6cfffcebae0c6e57e90c4e94e7818d210b6d961f653f2e262e75e957b4bf5ebc9e826a2ed7876dcefdf6096b0eec84008d316ad655295d6860b SHA512 f3149dde9bb2242abe4ffa32be2e3cac7041c6d36644568e98fec98c0de189ece1b4002fe14d127f34d3cbedb8b960c07d582a543986ca68394aee897f4047a4
-EBUILD pre-commit-2.13.0.ebuild 2073 BLAKE2B de50198f560d2f445d4dfc6de9ecfc915bdafe6078fb7efd6e8b9c3b226133e701b2e7174b0910eff62b975268887bff3d400c7fac90f1a8ff7b04dedb3cba32 SHA512 bbb833786557c89da7d6f5ca1a10f2b3613091a5cf643721dfa01de84ae505cef255250d0a82e982de6f399ea44ad90956fedc7c4d587437a8ef35b0759c9644
+EBUILD pre-commit-2.13.0.ebuild 2072 BLAKE2B 9ee972af0cff9c270309c02716afa63a74605b99d4b95d02a1f715f66a4a615bd489cd0b99245f288e0a6574d948d3a57114a25ef182964721f3060193c53bda SHA512 ea0583b7859da28373fe2d8f8496e06892d21d96a5e79cb6d8a7ddc5cd9c87edb1be50f21d610c6ecf7ad2f251a6b9c7bf9ca7c77830021788ad859aada5b3d7
 MISC metadata.xml 379 BLAKE2B 6224574b28f758241c6ad965ad59a423db76bd21c64c3577691104a8f45a4ee9b570f9cf1557f2ce17f00bf496b9eeb83741679dc0d6e1bb23c421f90fe9070f SHA512 f14032e386c2bb591390034086c7d4a2e8ce9aacc536574c517dff4691aa8c39bc966307ee91a5f76708f14601312fd16528a676e1918d82b2761185bc27df9f
diff --git a/dev-vcs/pre-commit/pre-commit-2.12.1.ebuild b/dev-vcs/pre-commit/pre-commit-2.12.1.ebuild
deleted file mode 100644
index 1dd37b2abb3b..000000000000
--- a/dev-vcs/pre-commit/pre-commit-2.12.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
-HOMEPAGE="https://pre-commit.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-# TODO: figure out why these tests - all of which invoke git - fail:
-#  - tests/main_test.py::test_all_cmds[autoupdate,hook-impl,install,install-hooks,migrate-config,run,uninstall]
-#     "Git failed", not much information beyond that
-#  - tests/main_test.py::test_try_repo
-#     Ditto
-#  - tests/commands/install_uninstall_test.py::test_installed_from_venv
-#     "git commit" returns 1 instead of 0, again no details
-RESTRICT="test"
-
-RDEPEND="dev-vcs/git
-	$(python_gen_cond_dep '
-		dev-python/cfgv[${PYTHON_USEDEP}]
-		dev-python/identify[${PYTHON_USEDEP}]
-		dev-python/nodeenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20.0.8[${PYTHON_USEDEP}]
-	')"
-BDEPEND="test? (
-	$(python_gen_cond_dep '
-		dev-python/pytest-env[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-	')
-)"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	default
-
-	# These tests require a boatload of dependencies (e.g. Conda, Go, R and more) in order to run
-	# and while some of them do include "skip if not found" logic, most of them do not.
-	rm -rf tests/languages tests/repository_test.py
-}
diff --git a/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
index 3d3e6ce0d2ed..802f0287c55a 100644
--- a/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="amd64 ~hppa"
 
 # TODO: figure out why these tests - all of which invoke git - fail:
 #  - tests/main_test.py::test_all_cmds[autoupdate,hook-impl,install,install-hooks,migrate-config,run,uninstall],