Adding metadata

18 files changed, 137 insertions, 48 deletions

diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index c7f66fef7438..ad5ec33456df 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1 +1,2 @@
 DIST catkin_pkg-0.4.24-gh.tar.gz 65113 BLAKE2B 554848e5e34a663b29246ec1109f228361cbb010d76d54e0b27107189382843e90babf24f8660dce4063324f78dff87286e31f5f1bb7db10aaa86e056c23de2d SHA512 7c746917876d5a9d8be6f187fc3d75e322ab158ff9fd1b9c661e0802504b188c59d47ad42320613e3aff26b83a6f239bb3dec5d0ab16dadd2ff1e26f73288e61
+DIST catkin_pkg-0.5.2-gh.tar.gz 67596 BLAKE2B aec34c6f54926dee02034d542741affe9cb662b06b354062088bec1fec25381f036d59af5fa52153ba1ce1c91fdf8bb9d1484475df8a63268ca474a7acd5f285 SHA512 40e7e3839017ad430ee36dccf87a90727e5efd92e6c605cdba3e9f8850b71a6a80da79bd8760d94e356dadebdd842c8a3f8b530782fb75503d3e620add79be4a
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild
new file mode 100644
index 000000000000..4e6304e47a1d
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="https://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	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/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/catkin_prefix2.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop5.patch"
+)
+
+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 a87aec2430aa..4e6304e47a1d 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,8 +39,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/catkin_prefix2.patch"
 	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop4.patch"
-	"${FILESDIR}/summary_single_line.patch"
+	"${FILESDIR}/infinite_loop5.patch"
 )
 
 distutils_enable_tests nose
diff --git a/dev-python/catkin_pkg/files/infinite_loop5.patch b/dev-python/catkin_pkg/files/infinite_loop5.patch
new file mode 100644
index 000000000000..7f88da41a27d
--- /dev/null
+++ b/dev-python/catkin_pkg/files/infinite_loop5.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/show_bug.cgi?id=612860
+By Tim Rakowski
+We os.walk /usr with followlinks=True, but at least nodejs contains a "recursive" link in /usr/include/node
+
+Index: catkin_pkg-0.5.2/src/catkin_pkg/packages.py
+===================================================================
+--- catkin_pkg-0.5.2.orig/src/catkin_pkg/packages.py
++++ catkin_pkg-0.5.2/src/catkin_pkg/packages.py
+@@ -61,7 +61,9 @@ def find_package_paths(basepath, exclude
+     """
+     paths = []
+     real_exclude_paths = [os.path.realpath(p) for p in exclude_paths] if exclude_paths is not None else []
++    visited = set()
+     for dirpath, dirnames, filenames in os.walk(basepath, followlinks=True):
++        visited.add(dirpath)
+         if set(dirnames + filenames) & ignore_markers or \
+             os.path.realpath(dirpath) in real_exclude_paths or \
+                 (exclude_subspaces and '.catkin' in filenames):
+@@ -72,7 +74,7 @@ def find_package_paths(basepath, exclude
+             del dirnames[:]
+             continue
+         # filter out hidden directories in-place
+-        dirnames[:] = [d for d in dirnames if not d.startswith('.')]
++        dirnames[:] = [d for d in dirnames if not d.startswith('.') and not os.path.realpath(os.path.join(dirpath, d)) in visited]
+     return paths
+ 
+ 
diff --git a/dev-python/cython/cython-0.29.30.ebuild b/dev-python/cython/cython-0.29.30.ebuild
index 2acfc3594ccf..0f5d7f9d469e 100644
--- a/dev-python/cython/cython-0.29.30.ebuild
+++ b/dev-python/cython/cython-0.29.30.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gphoto2/Manifest b/dev-python/gphoto2/Manifest
index 6516dd812795..54291281ea5b 100644
--- a/dev-python/gphoto2/Manifest
+++ b/dev-python/gphoto2/Manifest
@@ -1,2 +1,2 @@
-DIST python-gphoto2-2.3.2.tar.gz 555415 BLAKE2B b13676f8ebd8cf976e26ad01d94bac1b9c35356d6d8eadecde40342b3b4b0e9b0abb6e6790ffbc2c912f130ad54be55ebd0307d1b06a386f73b966888ee9392a SHA512 70b32c6b67f66f2adba71a9ef6dfb7ac745082ab5153525a01eba00aa3b6c86953138963f67344db841a614415de16e51ca2eb0aa7194fd9aa18bd981b7b46f7
 DIST python-gphoto2-2.3.3.tar.gz 555412 BLAKE2B 39fb92ca534700dbd63149ad675f249a7dcf9d92dfe4f2585ef8c946d4f658f0c30f76de61d46c1c86b25764a972f454f55800d2d5fbaf87dbfba4735c8d7272 SHA512 be1e3ca6ae4d0a44e86a27f55dd2d46f501b69d396d5b1e586887507b93cf8491452c10bb7ca7e88f149de3f6dfe8963caa44333257557aa4f86e249d9c30ed5
+DIST python-gphoto2-2.3.4.tar.gz 556634 BLAKE2B 711e5bf84646fbee9b357e98704c892191d6c92285db534b0810ee9e75e8300efde2ffdda6b766a06a4d9e5ed2cc10e54725df35fe7e68bfe33b20d38951df02 SHA512 233a40348716ead3d664589b9294796614a8702412e282680c1fac4500848e9dff194c25365f75380886cd057104d192539998f91d3bc42415df7e65bc3711e2
diff --git a/dev-python/gphoto2/gphoto2-2.3.2.ebuild b/dev-python/gphoto2/gphoto2-2.3.4.ebuild
index f8db59410085..f8db59410085 100644
--- a/dev-python/gphoto2/gphoto2-2.3.2.ebuild
+++ b/dev-python/gphoto2/gphoto2-2.3.4.ebuild
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
index 8b2d69ba88bf..fe2a945107ce 100644
--- a/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
+++ b/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/attrs-22[${PYTHON_USEDEP}]
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
index 3da017a0b167..d16a7f55cda2 100644
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/markdown-it-py[${PYTHON_USEDEP}]
diff --git a/dev-python/mdurl/mdurl-0.1.1.ebuild b/dev-python/mdurl/mdurl-0.1.1.ebuild
index 314afb4409ec..b420dd67fa9a 100644
--- a/dev-python/mdurl/mdurl-0.1.1.ebuild
+++ b/dev-python/mdurl/mdurl-0.1.1.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pillow/pillow-9.2.0.ebuild b/dev-python/pillow/pillow-9.2.0.ebuild
index 2e8e1ecd71a0..af6448ea9cb3 100644
--- a/dev-python/pillow/pillow-9.2.0.ebuild
+++ b/dev-python/pillow/pillow-9.2.0.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
index bd8906dd3d13..8a1cf0fa1032 100644
--- a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
+++ b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 7c8fe98d2e5d..374f74230618 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,2 +1 @@
-DIST regex-2022.4.24.tar.gz 383365 BLAKE2B 743a27afa1d504e9653b56d868b076479a476108213137ae7157772d29824204eeb781f5d939debfa8da122e22acbfbea6d8c356b14ad9c1eafca2be5970fdd2 SHA512 2b9e83c7164986eceed5ae0e33aca9075afa022398684bb688064394cfa43f06b0ce72c15fb7ceee55b7793072c7b1d7709513faedce4719f0c406164e9e0593
 DIST regex-2022.6.2.tar.gz 383342 BLAKE2B 48587a91366203301c517dc9cfe4f09e70905924484b906481bc89cf376854d406871312e154ac8b5833feeb50848636a95fdf99511df4feda4f16794a70856b SHA512 ce69a058aa05c471ce8728d29d5a498e387e5661d754d13bee51558a85f5e9e059a1464cc1b7721294cab421bae7219da7fd067e331e6cd6fd3dc464fdf0ecc1
diff --git a/dev-python/regex/regex-2022.4.24.ebuild b/dev-python/regex/regex-2022.4.24.ebuild
deleted file mode 100644
index 55ff5186be12..000000000000
--- a/dev-python/regex/regex-2022.4.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://bitbucket.org/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2022.6.2.ebuild b/dev-python/regex/regex-2022.6.2.ebuild
index 929c9f3dc764..55ff5186be12 100644
--- a/dev-python/regex/regex-2022.6.2.ebuild
+++ b/dev-python/regex/regex-2022.6.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild b/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
index 0b35312ba452..f6607575c912 100644
--- a/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
+++ b/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index fb77740e695d..f7d183dd620c 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1 +1,2 @@
 DIST testfixtures-6.18.5.tar.gz 124944 BLAKE2B 6f1431b3e7201a3c12bf683cfcb123329b186f42a64fdfe3ee7897ab0c5e9ba3995deb88934ae59f0d35b64710ac04b421d07f1c496429b18a0b6a03e600885d SHA512 4d4ec7295bb056102995dc1c872b86059109b114ab921769d3aa2c2de96a3789fef30558f51826655b6d2d668ea1b1bc9f161a4584aab628f59d4da1fa95940e
+DIST testfixtures-7.0.0.tar.gz 126163 BLAKE2B e9f31180878e7645a62b93242344c6cd8335067cf8158b03dbfb46b4ab79d57380809a20d6fdc6a6d4b0aca2d22f5d7c18636607a54c70de4bea39e79a9df6b1 SHA512 5fe56e0a654586c266aab5cebcdbf1e6b9988227605395c3198c759759be0fa98ff3c0a1885711ede5ef6d262a60cd19a29dc6e7a90a1f9f8b57df3cb2d9b97b
diff --git a/dev-python/testfixtures/testfixtures-7.0.0.ebuild b/dev-python/testfixtures/testfixtures-7.0.0.ebuild
new file mode 100644
index 000000000000..60514457b1b2
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-7.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/
+	https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# kill weird way of declaring build deps
+	sed -e '/build=/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTHONPATH="."
+	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
+
+	local EPYTEST_DESELECT=(
+		# TODO
+		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_missing
+		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_present
+	)
+
+	epytest
+}