Adding metadata

37 files changed, 168 insertions, 129 deletions

diff --git a/dev-python/GitPython/GitPython-3.1.24.ebuild b/dev-python/GitPython/GitPython-3.1.24.ebuild
index c2110d7a3845..6dbcea797b6e 100644
--- a/dev-python/GitPython/GitPython-3.1.24.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.24.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/ament_package/ament_package-0.12.0.ebuild b/dev-python/ament_package/ament_package-0.12.0.ebuild
index 91d9796c64dc..8a0b7c714662 100644
--- a/dev-python/ament_package/ament_package-0.12.0.ebuild
+++ b/dev-python/ament_package/ament_package-0.12.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
@@ -13,19 +14,7 @@ SRC_URI="https://github.com/ament/ament_package/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+BDEPEND="test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
 
-python_test() {
-	py.test || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/backrefs/backrefs-5.0.1.ebuild b/dev-python/backrefs/backrefs-5.0.1.ebuild
index d00894f39c44..205c148e299c 100644
--- a/dev-python/backrefs/backrefs-5.0.1.ebuild
+++ b/dev-python/backrefs/backrefs-5.0.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bracex/bracex-2.1.1.ebuild b/dev-python/bracex/bracex-2.1.1.ebuild
index 40473b73954f..48eb89dbb6a2 100644
--- a/dev-python/bracex/bracex-2.1.1.ebuild
+++ b/dev-python/bracex/bracex-2.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="test? ( dev-vcs/git )"
 
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
index 8fcf7848ba8b..1bbaa6d5dc82 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -24,27 +24,18 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
+	!<dev-util/catkin-0.7.14"
 BDEPEND="
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
 		dev-python/flake8[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
+
 PATCHES=(
 	"${FILESDIR}/catkin_prefix2.patch"
 	"${FILESDIR}/ros_packages.patch"
@@ -52,6 +43,4 @@ PATCHES=(
 	"${FILESDIR}/summary_single_line.patch"
 )
 
-python_test() {
-	nosetests -s --tests test || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 8fcf7848ba8b..1bbaa6d5dc82 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -24,27 +24,18 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
+	!<dev-util/catkin-0.7.14"
 BDEPEND="
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
 		dev-python/flake8[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
+
 PATCHES=(
 	"${FILESDIR}/catkin_prefix2.patch"
 	"${FILESDIR}/ros_packages.patch"
@@ -52,6 +43,4 @@ PATCHES=(
 	"${FILESDIR}/summary_single_line.patch"
 )
 
-python_test() {
-	nosetests -s --tests test || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/ddt/ddt-1.4.2.ebuild b/dev-python/ddt/ddt-1.4.2.ebuild
index fb70fbed9a16..b33a5f15a2b0 100644
--- a/dev-python/ddt/ddt-1.4.2.ebuild
+++ b/dev-python/ddt/ddt-1.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/enrich/enrich-1.2.6.ebuild b/dev-python/enrich/enrich-1.2.6.ebuild
index 214dc3323697..ce51e2432650 100644
--- a/dev-python/enrich/enrich-1.2.6.ebuild
+++ b/dev-python/enrich/enrich-1.2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="dev-python/rich[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/gitdb/gitdb-4.0.7.ebuild b/dev-python/gitdb/gitdb-4.0.7.ebuild
index 6bfaf22c9f04..0a390ada8406 100644
--- a/dev-python/gitdb/gitdb-4.0.7.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/jsmin/jsmin-3.0.0.ebuild b/dev-python/jsmin/jsmin-3.0.0.ebuild
index 6c11dae90e5e..8b20a421319e 100644
--- a/dev-python/jsmin/jsmin-3.0.0.ebuild
+++ b/dev-python/jsmin/jsmin-3.0.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="JavaScript minifier"
 HOMEPAGE="https://pypi.org/project/jsmin/ https://github.com/tikitu/jsmin/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/misaka/misaka-2.1.1.ebuild b/dev-python/misaka/misaka-2.1.1.ebuild
index f025a6583dc9..7ad1efb6daa8 100644
--- a/dev-python/misaka/misaka-2.1.1.ebuild
+++ b/dev-python/misaka/misaka-2.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="A CFFI binding for Hoedown, a markdown parsing library"
-HOMEPAGE="https://misaka.61924.nl/ https://github.com/FSX/misaka"
+HOMEPAGE="http://misaka.61924.nl/ https://github.com/FSX/misaka"
 SRC_URI="https://github.com/FSX/misaka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
index 6620d6fcd369..9367b55fe6d5 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
index 8d22623c287e..e39e4ce23c16 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 # mkdocs-material depends on this package creating a circular dep
 PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild
index 79697437936a..fab0d07b2073 100644
--- a/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-7.2.6.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
index d6402ef679b1..00844ff07ce8 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
index e82cf80e365b..85b18b14bfe9 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
index bc17d8c1c102..f26b3553ada7 100644
--- a/dev-python/olefile/olefile-0.46-r1.ebuild
+++ b/dev-python/olefile/olefile-0.46-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/podcastparser/Manifest b/dev-python/podcastparser/Manifest
index 0e02942c1b39..2fe671b397eb 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,2 +1,2 @@
-DIST 0.6.6.tar.gz 24155 BLAKE2B 3fed3a9bc49b1528db4aeb5c0daa087f5068f5912b7bb5b5246ae51e867a6c8bc7d5e50c08c13f6fd2b3b538443fef0424a6a5f12d0db36239daaa693808cbb1 SHA512 66f170fefc0b9419769705eb3f60e37b130b7add783840b03aa86b2362694b5603be69903bcf49d9429b31586764651302df5dc46ce4c52a18d51615550e4c02
 DIST 0.6.7.tar.gz 26184 BLAKE2B ab84ecfabd78576824d8fd9f2a84870c7f0696d670078cfd94c2ff0d63f98103d85dab56a1b17ea3f18f40b4ecbb8fb9d8c5b1803654302435594c35877116ab SHA512 38917f9f9f81eea8c11d9861b19ea135728ea21c3fe4a1c121e20e03e4680456c9d4db92904af20196647998faf46c92db35c83f691c6db13903948ca8d03f45
+DIST 0.6.8.tar.gz 28220 BLAKE2B b7c36b1ff4e3fa1a63fe51e69d97f6544aedef4804463cce0d2fdebe15caab79a343a3898a9e77e89d1403c30f094b55562233c7bcf7591bce959defba71a72e SHA512 66a32a72087aaafb2cec6da12f7643787297dc0d6ab4375620c5055dc250899851d6d6781930410bcb6a99cae7a01068cb255e81ed206b965a03a19bd9650d4b
diff --git a/dev-python/podcastparser/podcastparser-0.6.6.ebuild b/dev-python/podcastparser/podcastparser-0.6.8.ebuild
index a18e19544443..27e480b83363 100644
--- a/dev-python/podcastparser/podcastparser-0.6.6.ebuild
+++ b/dev-python/podcastparser/podcastparser-0.6.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2020 Liguros Authors
+# Copyright 2020-2021 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
index e5ff042678dd..fa942f5b635e 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
index 4b19be0ab257..b6cd35cbd029 100644
--- a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
+++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspelling/pyspelling-2.7.3.ebuild b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
index 0dd3b91a5410..a13786ba8c66 100644
--- a/dev-python/pyspelling/pyspelling-2.7.3.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
new file mode 100644
index 000000000000..7cb85a73456f
--- /dev/null
+++ b/dev-python/pytest-check/Manifest
@@ -0,0 +1 @@
+DIST pytest-check-1.0.4.gh.tar.gz 7738 BLAKE2B 179575dfd4f9e50715fd5a664039fe882b0e14c9369afb6f7aca65e9ab276147b2a0b7fe580d2a249721152d891c12cedfa06ae7e26027c6b7d3b34da17d4a53 SHA512 ca71295fc5a831df295c8ce40c6a57cde9a1b98ca25354a3954fc44c9094096ea0c9c6a49139659d4c9aa4e3d3d81d80893edb657bfd3f4d988c75864e843447
diff --git a/dev-python/pytest-check/metadata.xml b/dev-python/pytest-check/metadata.xml
new file mode 100644
index 000000000000..73a968fa73b8
--- /dev/null
+++ b/dev-python/pytest-check/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>arthurzam@gentoo.org</email>
+  <name>Arthur Zamarin</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">pytest_check</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pytest-check/pytest-check-1.0.4.ebuild b/dev-python/pytest-check/pytest-check-1.0.4.ebuild
new file mode 100644
index 000000000000..fdb3f097a5f3
--- /dev/null
+++ b/dev-python/pytest-check/pytest-check-1.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin that allows multiple failures per test"
+HOMEPAGE="https://github.com/okken/pytest-check https://pypi.org/project/pytest_check/"
+SRC_URI="
+	https://github.com/okken/pytest-check/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/pytest-6[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/flit_core[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	default
+	mv src/pytest_check pytest_check
+}
diff --git a/dev-python/pytest-ordering/files/pytest-ordering-0.6-fix-pytest-6.patch b/dev-python/pytest-ordering/files/pytest-ordering-0.6-fix-pytest-6.patch
new file mode 100644
index 000000000000..3a3ea15f4b8e
--- /dev/null
+++ b/dev-python/pytest-ordering/files/pytest-ordering-0.6-fix-pytest-6.patch
@@ -0,0 +1,21 @@
+From 9bfb05700386254afabb38f762e0ea860b567209 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Tue, 26 Jan 2021 20:42:14 +0100
+Subject: [PATCH] Don't use accidental pytest API, fix tests for pytest 6.2+
+
+https://github.com/ftobia/pytest-ordering/pull/76
+
+--- a/tests/test_ordering.py
++++ b/tests/test_ordering.py
+@@ -12,9 +12,9 @@ def item_names_for(testdir):
+     def _item_names_for(tests_content):
+         # some strange code to extract sorted items
+         items = testdir.getitems(tests_content)
+-        hook = testdir.config.hook
++        hook = items[0].config.hook
+         hook.pytest_collection_modifyitems(session=items[0].session,
+-                                           config=testdir.config, items=items)
++                                           config=items[0].config, items=items)
+         return [item.name for item in items]
+
+     return _item_names_for
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
index 768c96d086eb..dbc4f701f027 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -18,7 +18,11 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 
-RDEPEND="<dev-python/pytest-6[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-pytest-6.patch"
+)
 
 distutils_enable_tests --install pytest
 distutils_enable_sphinx docs/source
diff --git a/dev-python/rich/rich-10.10.0.ebuild b/dev-python/rich/rich-10.10.0.ebuild
index 901679288d88..3958bf9474a3 100644
--- a/dev-python/rich/rich-10.10.0.ebuild
+++ b/dev-python/rich/rich-10.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rosdistro/rosdistro-0.8.3.ebuild b/dev-python/rosdistro/rosdistro-0.8.3.ebuild
index 71aa7ad40053..a2b32cc26ae8 100644
--- a/dev-python/rosdistro/rosdistro-0.8.3.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.8.3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -24,31 +25,22 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/yaml.patch" )
 
+distutils_enable_tests nose
+
 src_prepare() {
 	# Requires network access
 	rm -f test/test_manifest_providers.py
 	default
 }
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index 71aa7ad40053..a2b32cc26ae8 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -24,31 +25,22 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/yaml.patch" )
 
+distutils_enable_tests nose
+
 src_prepare() {
 	# Requires network access
 	rm -f test/test_manifest_providers.py
 	default
 }
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rospkg/rospkg-1.3.0.ebuild b/dev-python/rospkg/rospkg-1.3.0.ebuild
index e656cd999ffd..7982e34c8138 100644
--- a/dev-python/rospkg/rospkg-1.3.0.ebuild
+++ b/dev-python/rospkg/rospkg-1.3.0.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -27,26 +27,16 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND} ${BDEPEND}
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" )
 
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index e656cd999ffd..7982e34c8138 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -27,26 +27,16 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND} ${BDEPEND}
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" )
 
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/smmap/smmap-4.0.0.ebuild b/dev-python/smmap/smmap-4.0.0.ebuild
index 0c034a8234cc..7c0df58df6dd 100644
--- a/dev-python/smmap/smmap-4.0.0.ebuild
+++ b/dev-python/smmap/smmap-4.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
new file mode 100644
index 000000000000..827393c4397e
--- /dev/null
+++ b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx objects.inv Inspection/Manipulation Tool"
+HOMEPAGE="
+	https://github.com/bskinn/sphobjinv/
+	https://pypi.org/project/sphobjinv/
+"
+SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/fuzzywuzzy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/dictdiffer[${PYTHON_USEDEP}]
+		dev-python/pytest-check[${PYTHON_USEDEP}]
+		dev-python/pytest-ordering[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		>=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx doc/source \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues \
+	dev-python/sphinxcontrib-programoutput
+
+python_prepare_all() {
+	# --strict option is deprecated in pytest>6
+	sed -i -e '/addopts/d' tox.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/tenacity/tenacity-8.0.1.ebuild b/dev-python/tenacity/tenacity-8.0.1.ebuild
index 80b0eafaf494..b4e75a33fa8d 100644
--- a/dev-python/tenacity/tenacity-8.0.1.ebuild
+++ b/dev-python/tenacity/tenacity-8.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild b/dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild
index 7f915f98be86..14fdb4d57c4a 100644
--- a/dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild
+++ b/dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild
@@ -13,24 +13,16 @@ SRC_URI="https://github.com/ros/urdf_parser_py/archive/${PV}.tar.gz -> ${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	)
 "
 
-python_test() {
-	nosetests --with-coverage || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/wcmatch/wcmatch-8.2.ebuild b/dev-python/wcmatch/wcmatch-8.2.ebuild
index 61272df08a67..175a724c99f3 100644
--- a/dev-python/wcmatch/wcmatch-8.2.ebuild
+++ b/dev-python/wcmatch/wcmatch-8.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]