Updating liguros repo

18 files changed, 267 insertions, 163 deletions

diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 8ffc8cd6661b..8d1972d8698d 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -3,3 +3,4 @@ DIST importlib_resources-3.3.0.tar.gz 29000 BLAKE2B 5fb87c6e15f01733567fef060607
 DIST importlib_resources-3.3.1.tar.gz 29012 BLAKE2B ff4fc6eb6dd1ff89b873076b2709bcd6ed10c51388646560eeb929e8cb8a000329260ff093929163045ba32c0d00b9f797f9e06b9524445b1ef052e8a82a7f87 SHA512 3b484169362b7d7062655668a2035a77440a2e2b81708d41e339b6007e8140162d85cfc14fca464b059a649fcda31ef9718a08cdd2cf7c8e588ba3fafc08bb59
 DIST importlib_resources-4.0.0.tar.gz 27317 BLAKE2B 64cd01b650d82f2d3adf2a734a6da390073b190fbd8f8fd0a5be046931d78c93dcf16873477680fc14daadacdde629fcfd6f5d9cd89c7a5de56ba6c1ff4aad92 SHA512 0d5d175a814462db5bf29645f5d06e4cdff5c40ac1e022282690cba79e8f57885873956659952a086bdf7a1f3f7fbd78c1366030642ac8f6b40fa6df3056d6f1
 DIST importlib_resources-4.1.0.tar.gz 30814 BLAKE2B 50b6f9693df9ee21ae53f27f42a7aeb42e6f50ed305fa1004462bf189366b80d7dc48a40f77eafc41107de91f08015275a69e524421777a8d17e155cb867e943 SHA512 a42e4d66649b285489ea3bc0773761da19c05a03732492eefaaa008a0ddcf0696ceed380e296da9ff392529d681350ff045aeeec9cecbbafcd3bd15141920592
+DIST importlib_resources-4.1.1.tar.gz 30821 BLAKE2B 440adde5ce8604c3dddc6c59f730890b4832076f3f7d5c1f9b46ed4d4fe1d80d714a2f393ae1a1b386ef20812090c7370858ca9d3920bc115a6cedb0d2000c8f SHA512 e277d375f800e8d1be317f90344c10b2848a0f7e0b3b6f28014b71d4b92b496137aa84b8ad865a3b93c983d20d827f18c6baf0d6c540882622b0903bebaae303
diff --git a/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
new file mode 100644
index 000000000000..0f342f744d6e
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/zipp[${PYTHON_USEDEP}]
+	' pypy3 python3_{6,7})
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 8a812fbe2520..60dae7e2fbd7 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1 +1,2 @@
 DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
+DIST jaraco.collections-3.1.0.tar.gz 18206 BLAKE2B c420b3c65c048840f2957ebff0e69a7e2d3db515801a54d829bc2dd9f77b804066ef15766c915b764a148eaa945fc9a30576bb00a645f4c124c031b6ccc64184 SHA512 9a3e4e60cd497ee2ed4a092bd823ecffe0d20293dd9ba491fd2c4e5df2481042efa8ba52503b001e11908982608852a0588cd70b4957d0551c066be97389652c
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
new file mode 100644
index 000000000000..87066eb91585
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/jaraco-collections-3.0.0-pypy.patch"
+)
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 711d1beef0f6..19d71b5d79c4 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1 +1,2 @@
 DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
+DIST jaraco.logging-3.1.0.tar.gz 11801 BLAKE2B 858f0930b7e04ea6f1e3d13b3d7be1056ad9efa901857ded3759e450e151c8485feb1cb6eb91c8ebf7be53c649bc818759009394b20f606fd5551c82ce0d1e61 SHA512 ce9a9cbad6d6bb448615eac986d361f9c6ff477b1209e85433f12a49055a9e30125cd49bebcf915a08b8efe0732439a8e1d336e63f6454369b3e846a9a1383ba
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
new file mode 100644
index 000000000000..5a26dfbeb340
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/lxml/lxml-4.6.2-r1.ebuild b/dev-python/lxml/lxml-4.6.2-r1.ebuild
index 8953b2aa69c7..bb7963ed029f 100644
--- a/dev-python/lxml/lxml-4.6.2-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.2-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 79ae7218d190..efe92adc2181 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,2 +1 @@
-DIST more-itertools-8.5.0.tar.gz 86861 BLAKE2B 6c5d7e0e2bfa89b65636115d5539ca5a36de24b7e0971638721d8fa13f6ad84f0fc64b297b5c3c30d380f78e271f6b6622d72a41ffb8f1941945d5918ec6c78a SHA512 f11a4443d4d5e79fe241fc6e170ae51b08cfb1f1093dddad036e1ba043c30d03c53ab9fccbfb4de97279862c6cfe44759ae88ce6027d871515b032e7d9e435e7
 DIST more-itertools-8.6.0.tar.gz 88371 BLAKE2B 79c9020c641e61d97c350ec9004fabfc4a94969d17c517e421f63f41aedf101217906d5bc1d397dc1ed7666143b15ea7ff0401a2a6b3fccc1d08f3cf9ff55eff SHA512 9fb6cbb1d303c79a1c67d1c473a161d71bc5d88c8ebaf290947c1a6e64c2a224478063c58ffc4d1dfdcb2931bcff9cd165bd8724a9e78e95c6f163000c138a5e
diff --git a/dev-python/more-itertools/more-itertools-8.5.0.ebuild b/dev-python/more-itertools/more-itertools-8.5.0.ebuild
deleted file mode 100644
index c167259dfc1d..000000000000
--- a/dev-python/more-itertools/more-itertools-8.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-8.6.0.ebuild b/dev-python/more-itertools/more-itertools-8.6.0.ebuild
index a640c9948cfc..f870ee4be460 100644
--- a/dev-python/more-itertools/more-itertools-8.6.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pony/pony-0.7.13.ebuild b/dev-python/pony/pony-0.7.13.ebuild
index 106a79ec26f4..91083fe0731c 100644
--- a/dev-python/pony/pony-0.7.13.ebuild
+++ b/dev-python/pony/pony-0.7.13.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	test? ( $(python_gen_impl_dep sqlite) )"
+BDEPEND="test? ( $(python_gen_impl_dep sqlite) )"
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pony/pony-0.7.14.ebuild b/dev-python/pony/pony-0.7.14.ebuild
index f7fe943ed4a6..4a7d592fd48b 100644
--- a/dev-python/pony/pony-0.7.14.ebuild
+++ b/dev-python/pony/pony-0.7.14.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	test? ( $(python_gen_impl_dep sqlite) )"
+BDEPEND="test? ( $(python_gen_impl_dep sqlite) )"
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
new file mode 100644
index 000000000000..60de6aa07ee7
--- /dev/null
+++ b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
@@ -0,0 +1,58 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20a5e19..575c1df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,38 +55,6 @@ else()
+     set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
+ endif()
+ 
+-install(FILES "${UIC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-install(FILES "${RCC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-if (EXISTS ${DESIGNER_PATH})
+-    if (APPLE)
+-        install(DIRECTORY "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                FILE_PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    else()
+-        install(FILES "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    endif()
+-endif()
+-
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
+                "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+                IMMEDIATE @ONLY)
+@@ -113,14 +81,6 @@ endif()
+ 
+ add_subdirectory(pylupdate)
+ 
+-# pyside2-rcc, pyside2-uic, pyside2-designer, shiboken and pyside2-lupdate entrypoints
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+ if (BUILD_TESTS)
+     enable_testing()
+     add_subdirectory(tests)
diff --git a/dev-python/pyside2-tools/metadata.xml b/dev-python/pyside2-tools/metadata.xml
index b1bc0972e8bc..0367211e7125 100644
--- a/dev-python/pyside2-tools/metadata.xml
+++ b/dev-python/pyside2-tools/metadata.xml
@@ -5,8 +5,5 @@
 		<email>fordfrog@gentoo.org</email>
 		<name>Miroslav Šulc</name>
 	</maintainer>
-	<use>
-		<flag name="tools">Install supplementary tools (rcc, uic, designer)</flag>
-	</use>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
new file mode 100644
index 000000000000..113f51ca1bd5
--- /dev/null
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake python-r1
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)"
+HOMEPAGE="https://wiki.qt.io/PySide2"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	>=dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+S=${WORKDIR}/${MY_P}/sources/${PN}
+DOCS=( README.md )
+
+# the tools conflict with tools from QT
+PATCHES=(
+	"${FILESDIR}/${P}-dont-install-tools.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	# The tests are only related to the tools that we don't install
+	local mycmakeargs=(
+		-DBUILD_TESTS=OFF
+	)
+
+	pyside-tools_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		)
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
+	}
+
+	python_foreach_impl pyside-tools_configure
+}
+
+src_compile() {
+	pyside-tools_compile() {
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
+	}
+
+	python_foreach_impl pyside-tools_compile
+}
+
+src_install() {
+	pyside-tools_install() {
+		python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
+	}
+
+	python_foreach_impl pyside-tools_install
+
+	doman pylupdate/pyside2-lupdate.1
+	einstalldocs
+}
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild
deleted file mode 100644
index 8eb9086917ac..000000000000
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake python-r1 virtualx
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-
-# Though "LICENSE-uic" suggests the "pyside2uic" directory to be dual-licensed
-# under the BSD 3-clause and GPL v2 licenses, this appears to be an oversight;
-# all files in this (and every) directory are licensed only under the GPL v2.
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test tools"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note that:
-# * "pyside2uic" imports the "PySide2.QtGui" and "PySide2.QtWidgets" C
-#   extensions and hence requires "widgets", which includes "gui" as well.
-# * "dev-qt/qtchooser" installs binaries conflicting with the "tools" USE flag.
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pyside2-${PV}[widgets,${PYTHON_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	tools? ( !dev-qt/qtchooser )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}/sources/${PN}
-DOCS=( README.md )
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-
-	pyside-tools_prepare() {
-		pushd "${BUILD_DIR}" >/dev/null || die
-
-		if python_is_python3; then
-			# Remove Python 2-specific paths.
-			rm -rf pyside2uic/port_v2 || die
-
-			# Generate proper Python 3 test interfaces with the "-py3" option.
-			sed -i -e \
-				's~${PYSIDERCC_EXECUTABLE}~"${PYSIDERCC_EXECUTABLE} -py3"~' \
-				tests/rcc/CMakeLists.txt || die
-		else
-			# Remove Python 3-specific paths.
-			rm -rf pyside2uic/port_v3 || die
-		fi
-
-		# Force testing against the current Python version.
-		sed -i -e "/pkg-config/ s:shiboken2:&-${EPYTHON}:" \
-			tests/rcc/run_test.sh || die
-
-		popd >/dev/null || die
-	}
-
-	python_foreach_impl pyside-tools_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_test() {
-	# tests work only if tools USE flag enabled
-	if [ use tools ]; then
-		pyside-tools_test() {
-			local -x PYTHONDONTWRITEBYTECODE
-			CMAKE_USE_DIR="${BUILD_DIR}" virtx cmake_src_test
-		}
-
-		python_foreach_impl pyside-tools_test
-	fi
-}
-
-src_install() {
-	pyside-tools_install() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_install
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	use tools || rm "${ED}"/usr/bin/{rcc,uic,designer} || die
-
-	# Remove the broken "pyside_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../pyside_tool.py': '/usr/bin/../pyside_tool.py'
-	rm "${ED}"/usr/bin/pyside_tool.py
-}
diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml
index a56745df0223..c4e7a7e3d49d 100644
--- a/dev-python/sudsds/metadata.xml
+++ b/dev-python/sudsds/metadata.xml
@@ -8,5 +8,5 @@
 	<longdescription lang="en">
 		A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork.
 	</longdescription>
-	<origin>kit-fixups</origin>
+	<origin>calculatelinux-overlay</origin>
 </pkgmetadata>
diff --git a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
index 054a9f5306c4..ac0d6b9c7860 100644
--- a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
+++ b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
@@ -17,4 +17,4 @@ KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
+RDEPEND="${DEPEND}"