Updating liguros repo

37 files changed, 110 insertions, 403 deletions

diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index eacb778f78b6..92bee65c44e9 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1 +1,2 @@
 DIST doit-0.32.0.tar.gz 1437939 BLAKE2B 39134341582cd964630a1667c78b0e44eeb32406a06e3567123b820fb61cbee0f6a7c8879a84eed750860a365aa4c792e461bb1534c66e4f20a6289522dc8183 SHA512 d5c28a0c6a38648aeef58027b2246fc26360e133e91933f2244bd484f70d6d26110acbfec19c74d53c796e0bbae07a4bf6d76542d45e8b1a6b503c186bf2a68a
+DIST doit-0.33.1.tar.gz 1436620 BLAKE2B be294246447d36011274d57b5300b4451847751f228622bcd5a45f91367371ed5dd9c40a2476e558be8137b16fefda4bf6f1795108d0c982990abc62db5560e6 SHA512 852efa3b770ec5de7def1fad1167b8cdce1de7435b2ba5e4af43a84c84df0cbf960d8d5c4c9f526f303d19c7536f745c2c7700daaced984ec86fb4202f894170
diff --git a/dev-python/doit/doit-0.32.0-r1.ebuild b/dev-python/doit/doit-0.33.1.ebuild
index e48effe24945..794501c0c0a1 100644
--- a/dev-python/doit/doit-0.32.0-r1.ebuild
+++ b/dev-python/doit/doit-0.33.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="
 	test? (
-		${RDEPEND}
 		$(python_gen_impl_dep sqlite)
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pyflakes[${PYTHON_USEDEP}]
@@ -33,11 +32,6 @@ PDEPEND=">=dev-python/doit-py-0.4.0[${PYTHON_USEDEP}]"
 distutils_enable_tests pytest
 distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
 
-PATCHES=(
-	"${FILESDIR}/${P}_pytest5.4.patch"
-	"${FILESDIR}/${P}_unpickable.patch"
-)
-
 src_prepare() {
 	default
 	# Replace custom theme with builtin for documentation
diff --git a/dev-python/elementpath/elementpath-2.0.0.ebuild b/dev-python/elementpath/elementpath-2.0.0.ebuild
index 063ecddcd3b2..5b25767981fe 100644
--- a/dev-python/elementpath/elementpath-2.0.0.ebuild
+++ b/dev-python/elementpath/elementpath-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/maintboot/Manifest b/dev-python/maintboot/Manifest
deleted file mode 100644
index 6d5da199c714..000000000000
--- a/dev-python/maintboot/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maintboot-0.1.0.tar.gz 2090 BLAKE2B e20c7f478b83de1eaa7c8abde5f7c308c58b41eb8b7a02b3896c7d050d3d54ec55bdc518648fb5c7187d3626bbbe0093f6a191ec7e9a29ffdf4497d0da50fe18 SHA512 dc63c59718a3c66a2128f36ad495c42d94bba08d6b16c40f470b0a0cc00388b5ec5977326ac258c858113e4d6c3f1ff246c5a1dfbd3d417aea181d381d7ae28f
diff --git a/dev-python/maintboot/maintboot-0.1.0.ebuild b/dev-python/maintboot/maintboot-0.1.0.ebuild
deleted file mode 100644
index e6c450c0f0b3..000000000000
--- a/dev-python/maintboot/maintboot-0.1.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Run maintenance tasks outside the OS"
-HOMEPAGE="https://pypi.org/project/maintboot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/maintboot/metadata.xml b/dev-python/maintboot/metadata.xml
deleted file mode 100644
index 78637e5074c6..000000000000
--- a/dev-python/maintboot/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">maintboot</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/mem_top/Manifest b/dev-python/mem_top/Manifest
deleted file mode 100644
index a8e6953a9c5f..000000000000
--- a/dev-python/mem_top/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mem_top-0.1.6.tar.gz 2520 BLAKE2B 427ce48da7b16e08bc6fd0943beafe9ebb42cea65ac550f5cbda1f4a1dfa9dfe10c0700a3e9f155d158dd9049944f23e24f01d4888843acef16215c6fce34799 SHA512 0feb736c154fbe5e1b81bf12ca183b1dedf4ad5037388bfde5b32d2c077724af98b81e6c069075c606eda7121ed20e8b71c4c6039e0c558698db58e2d0a7a1c6
diff --git a/dev-python/mem_top/mem_top-0.1.6.ebuild b/dev-python/mem_top/mem_top-0.1.6.ebuild
deleted file mode 100644
index 3dbd82fba231..000000000000
--- a/dev-python/mem_top/mem_top-0.1.6.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Shows top suspects for memory leaks in your Python program"
-HOMEPAGE="https://github.com/denis-ryzhkov/mem_top https://pypi.org/project/mem_top/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/mem_top/metadata.xml b/dev-python/mem_top/metadata.xml
deleted file mode 100644
index ff84317ec71e..000000000000
--- a/dev-python/mem_top/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">mem_top</remote-id>
-		<remote-id type="github">denis-ryzhkov/mem_top</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/notify-python/Manifest b/dev-python/notify-python/Manifest
deleted file mode 100644
index dc3478786ed2..000000000000
--- a/dev-python/notify-python/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST notify-python-0.1.1.tar.bz2 214514 BLAKE2B 7e7496b817abedc5577751a6525ca928c6f7e8cc51aeac810a0927e46533d93d4da73b5f76846a68cde025dae24000601a5745eb93037b149177d4941cbdaffc SHA512 67021af81d77b6a1ead4ee2a0ab4e8684c2b60c672ab7aa09a8f89d71cf646453d9be76455ac28616d70645019946db1731a7021fbb91fe66d9e057fcb3815a0
diff --git a/dev-python/notify-python/files/notify-python-0.1.1-libnotify-0.7.patch b/dev-python/notify-python/files/notify-python-0.1.1-libnotify-0.7.patch
deleted file mode 100644
index ee146cb6fd84..000000000000
--- a/dev-python/notify-python/files/notify-python-0.1.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=notify-python.git;a=blob_plain;f=libnotify07.patch;hb=HEAD
-
---- src/pynotify.defs
-+++ src/pynotify.defs
-@@ -38,7 +38,6 @@
-     '("const-gchar*" "summary")
-     '("const-gchar*" "message" (null-ok) (default "NULL"))
-     '("const-gchar*" "icon" (null-ok) (default "NULL"))
--    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
-   )
- )
- 
-@@ -53,24 +52,6 @@
-   )
- )
- 
--(define-method attach_to_widget
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_widget")
--  (return-type "none")
--  (parameters
--    '("GtkWidget*" "attach")
--  )
--)
--
--(define-method attach_to_status_icon
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_status_icon")
--  (return-type "none")
--  (parameters
--    '("GtkStatusIcon*" "attach")
--  )
--)
--
- (define-method show
-   (of-object "NotifyNotification")
-   (c-name "notify_notification_show")
diff --git a/dev-python/notify-python/metadata.xml b/dev-python/notify-python/metadata.xml
deleted file mode 100644
index 36d2114697c0..000000000000
--- a/dev-python/notify-python/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
deleted file mode 100644
index 12f0750a02c1..000000000000
--- a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils eutils ltprune python-r1
-
-DESCRIPTION="Python bindings for libnotify"
-HOMEPAGE="https://www.galago-project.org/"
-SRC_URI="http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pygtk-2.24:2[${PYTHON_USEDEP}]
-	>=x11-libs/libnotify-0.7"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-libnotify-0.7.patch )
-
-src_prepare() {
-	# Remove the old pynotify.c to ensure it's properly regenerated #212128.
-	rm -f src/pynotify.c || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	python_foreach_impl autotools-utils_src_configure
-}
-
-src_compile() {
-	python_foreach_impl autotools-utils_src_compile
-}
-
-src_test() {
-	python_foreach_impl autotools-utils_src_test
-}
-
-src_install() {
-	python_foreach_impl autotools-utils_src_install
-	prune_libtool_files --all
-
-	# Requested from bug 351879.
-	if use examples; then
-		docinto examples
-		dodoc tests/*.{png,py}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/parsedatetime/Manifest b/dev-python/parsedatetime/Manifest
index 81559fb22ecd..3be3ef370821 100644
--- a/dev-python/parsedatetime/Manifest
+++ b/dev-python/parsedatetime/Manifest
@@ -1 +1,2 @@
 DIST parsedatetime-2.4.tar.gz 63598 BLAKE2B 864e40311b56d28f5b1eed5ea069d40f7bd06b99a365530466ec0d16e99ce61d64d2c0bf78f1653aafa936a4fa91b2145e76f4da288dd3d1ff69ec8ccdc00174 SHA512 0fd8bfa3411476a20d8874b44036bc162735fb7865d39ca98b0a608daec39daac47100314279dbf66229ec333821492744f7505315d955f58216fdaa75cbf046
+DIST parsedatetime-2.6.tar.gz 70732 BLAKE2B 099b2d4d434fabf3e3d587923a037608a982eee7986f5843f7a463acc52a736a0661261da557a16cfb310414778ef49b1d2bcde62bbf53807132004b526aa175 SHA512 ed7649feb8773fdb33d609ef0abe4d20f555744bd70e9766aba6b9a79d8415c7e2efea1d7ef5c6b5906f3bc90bff124ef92992ce17d83fe70575da2db918e543
diff --git a/dev-python/parsedatetime/metadata.xml b/dev-python/parsedatetime/metadata.xml
index 0310eb5b5ed9..34b772a3bb3d 100644
--- a/dev-python/parsedatetime/metadata.xml
+++ b/dev-python/parsedatetime/metadata.xml
@@ -7,6 +7,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">bear/parsedatetime</remote-id>
+		<remote-id type="pypi">parsedatetime</remote-id>
+		<bugs-to>https://github.com/bear/parsedatetime/issues</bugs-to>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/parsedatetime/parsedatetime-2.6.ebuild b/dev-python/parsedatetime/parsedatetime-2.6.ebuild
new file mode 100644
index 000000000000..26073b4ba9e2
--- /dev/null
+++ b/dev-python/parsedatetime/parsedatetime-2.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parse human-readable date/time strings"
+HOMEPAGE="https://github.com/bear/parsedatetime"
+# Tests aren't detected in PyPI tarballs
+# https://github.com/bear/parsedatetime/pull/252
+SRC_URI="https://github.com/bear/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
deleted file mode 100644
index 70a3de46e66f..000000000000
--- a/dev-python/pyblake2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyblake2-1.1.2.tar.gz 126693 BLAKE2B 01690ec32a07b7ea59d7d040523ce8cb523f18927044f2d38c0a143a344fde661498e1a4b35a0f161be7b761a324677f80e88c4a0045dc324f0d588997e884f2 SHA512 26297d788208a80c8102602135332d5ee1424711d9c693828af232b5546301c5d144680367a954d8d9765998a23b82046b157b0072fdc63305ff0088feb16e55
diff --git a/dev-python/pyblake2/metadata.xml b/dev-python/pyblake2/metadata.xml
deleted file mode 100644
index 5e66aefa1fef..000000000000
--- a/dev-python/pyblake2/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dchest/pyblake2</remote-id>
-		<remote-id type="pypi">pyblake2</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pyblake2/pyblake2-1.1.2.ebuild b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
deleted file mode 100644
index 3f1ec1e6fe0b..000000000000
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-# pyblake2 itself allows more licenses but blake2 allows the following three
-LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pygpu/Manifest b/dev-python/pygpu/Manifest
deleted file mode 100644
index 95554ae2bb41..000000000000
--- a/dev-python/pygpu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pygpu-0.6.7.tar.gz 256440 BLAKE2B cc0880259c368c02fe0fca1a7f9424ad78f057540426d28179ee2cb20a2559853566c9ebb7de3488d5fdf0fa0eefb4e9f16db198cda2727370d567fd16363480 SHA512 39cdb67ec12d0f939d7a3ebef9726c40e64387413200addbeaf205db4151d09efd90118fec4a71b9d1f81fdde9b52e37d2d97763bf2cc9efa1667c5b9ff716b2
diff --git a/dev-python/pygpu/metadata.xml b/dev-python/pygpu/metadata.xml
deleted file mode 100644
index 0c9a6de2561d..000000000000
--- a/dev-python/pygpu/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">Theano/libgpuarray</remote-id>
-  </upstream>
-  <use>
-    <flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
-    <flag name="opencl">Enable OpenCL support</flag>
-  </use>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pygpu/pygpu-0.6.7.ebuild b/dev-python/pygpu/pygpu-0.6.7.ebuild
deleted file mode 100644
index 99417a5cac6e..000000000000
--- a/dev-python/pygpu/pygpu-0.6.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-MYPV=${PV/_/-}
-
-DESCRIPTION="Python bindings to libgpuarray"
-HOMEPAGE="https://deeplearning.net/software/libgpuarray/"
-SRC_URI="https://github.com/Theano/libgpuarray/archive/v${MYPV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda opencl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-libs/libgpuarray:=[cuda?,opencl?]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/libgpuarray-${MYPV}"
-
-python_test() {
-	local DEVICE=cuda
-	use opencl && DEVICE=opencl
-	nosetests -svw "${BUILD_DIR}/lib/" || die
-}
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
deleted file mode 100644
index 5f0014d630a9..000000000000
--- a/dev-python/pysha3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pysha3-1.0.2.tar.gz 829192 BLAKE2B ff0c0e1cc35f5e2efc0a7d3074022aaa1e05fa72cc151560180fe08958c8f83ec2b0f50f9e1bf772fd386647f3d44e8b4139f5593f6d0d678412eabe4829e939 SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720
diff --git a/dev-python/pysha3/metadata.xml b/dev-python/pysha3/metadata.xml
deleted file mode 100644
index 4d646a1e768d..000000000000
--- a/dev-python/pysha3/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tiran/pysha3</remote-id>
-		<remote-id type="pypi">pysha3</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
deleted file mode 100644
index 0cf36c52aeb3..000000000000
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="SHA-3 (Keccak) for Python 2.7 - 3.5"
-HOMEPAGE="https://github.com/tiran/pysha3 https://pypi.org/project/pysha3/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Remove meaningless AttributeError checks. They don't really test
-	# the implementation but Python implementation behavior, and they
-	# fail with PyPy. Oh yes, and this doesn't affect correctly written
-	# programs.
-	sed -i -e '/AttributeError/d' tests.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/robotbackgroundlogger/Manifest b/dev-python/robotbackgroundlogger/Manifest
deleted file mode 100644
index 259eaec35000..000000000000
--- a/dev-python/robotbackgroundlogger/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST robotbackgroundlogger-1.2.tar.gz 3910 BLAKE2B c79d848f8fb0767b966d5e152755a37c28bcb37af45a90a5583176a243c8a7258562c6be34aaaf6c8063d3c757b104d0a846fa2e5bae4c01ba166e2305eb7414 SHA512 29546cc810b30a4c87ccf2e0a5b1fc186d176d8b50d1fcf18076d97042e7f0123070d9988a795d9befedbe201007dbca30dc8b83d9543f30e5036e9f8795dcee
diff --git a/dev-python/robotbackgroundlogger/metadata.xml b/dev-python/robotbackgroundlogger/metadata.xml
deleted file mode 100644
index 308a047e0045..000000000000
--- a/dev-python/robotbackgroundlogger/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="github">robotframework/robotbackgroundlogger</remote-id>
-		<remote-id type="pypi">robotbackgroundlogger</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/robotbackgroundlogger/robotbackgroundlogger-1.2.ebuild b/dev-python/robotbackgroundlogger/robotbackgroundlogger-1.2.ebuild
deleted file mode 100644
index 139f1f80bb90..000000000000
--- a/dev-python/robotbackgroundlogger/robotbackgroundlogger-1.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helper module for logging to Robot Framework log from background threads"
-HOMEPAGE="https://github.com/robotframework/robotbackgroundlogger https://pypi.org/project/robotbackgroundlogger/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/robotframework[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/robotframework/Manifest b/dev-python/robotframework/Manifest
deleted file mode 100644
index db526da8c2f1..000000000000
--- a/dev-python/robotframework/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST robotframework-3.0.4.tar.gz 443354 BLAKE2B 1b9b048cc0e5ce9d13a7bbe54e659f5010236a84771f391ad4ff7f9c98d5ffa9d6e6f4974572b901a1804d8c12f5c2b135f03b2d1ae3a4e840103ee2f39e411e SHA512 be975099e54e265131b94431347d093a5b844bcbd24ecde7d4af4ccc97b51184e4b60572d8a1187691eacd73e8e566fda56a200ad30c7438a557752414524bbc
diff --git a/dev-python/robotframework/metadata.xml b/dev-python/robotframework/metadata.xml
deleted file mode 100644
index 0ed5ff77d227..000000000000
--- a/dev-python/robotframework/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="github">robotframework/robotframework</remote-id>
-    <remote-id type="pypi">robotframework</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/robotframework/robotframework-3.0.4.ebuild b/dev-python/robotframework/robotframework-3.0.4.ebuild
deleted file mode 100644
index 18b968a5cf54..000000000000
--- a/dev-python/robotframework/robotframework-3.0.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Test automation framework for acceptance testing & test-driven development"
-HOMEPAGE="https://robotframework.org/ https://pypi.org/project/robotframework/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/sleekxmpp/Manifest b/dev-python/sleekxmpp/Manifest
deleted file mode 100644
index bb3a8150683c..000000000000
--- a/dev-python/sleekxmpp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sleekxmpp-1.3.1.tar.gz 1014004 BLAKE2B 19eb8a38f91410b266a8b2a1667993a44f619591bd2ed98e4c9ad23da4f9aa2eed6e662ed6e367cc1444aa70835a8a02ca946de996923a078e94bc10e6800267 SHA512 1f3c68672536da0d20cd8717f7835096003019f03a05fb08ce87f784b0636d781aa78691ee54927d4755e71a57956972af0a653deb6eff0f7eb16b9a236baa65
diff --git a/dev-python/sleekxmpp/metadata.xml b/dev-python/sleekxmpp/metadata.xml
deleted file mode 100644
index b5c2a2ccc7f7..000000000000
--- a/dev-python/sleekxmpp/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="github">fritzy/SleekXMPP</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild b/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
deleted file mode 100644
index 05c61aad0612..000000000000
--- a/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit eutils distutils-r1
-
-MY_PN=SleekXMPP
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python library for XMPP"
-HOMEPAGE="https://sleekxmpp.com/ https://github.com/fritzy/SleekXMPP/"
-SRC_URI="https://github.com/fritzy/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/tempita/files/tempita-0.5.3-cgi-escape.patch b/dev-python/tempita/files/tempita-0.5.3-cgi-escape.patch
new file mode 100644
index 000000000000..d411d28ced48
--- /dev/null
+++ b/dev-python/tempita/files/tempita-0.5.3-cgi-escape.patch
@@ -0,0 +1,31 @@
+diff --git a/tempita/__init__.py b/tempita/__init__.py
+index 137ba2d..acc2fd9 100755
+--- a/tempita/__init__.py
++++ b/tempita/__init__.py
+@@ -31,12 +31,12 @@ can use ``__name='tmpl.html'`` to set the name of the template.
+ If there are syntax errors ``TemplateError`` will be raised.
+ """
+ 
+-import cgi
+ import os
+ import re
+ import sys
+ import tokenize
+ from cStringIO import StringIO
++from html import escape
+ from urllib import quote as url_quote
+ from tempita._looper import looper
+ from tempita.compat3 import bytes, basestring_, next, is_unicode, coerce_text
+@@ -445,10 +445,10 @@ def html_quote(value, force=True):
+     if not isinstance(value, basestring_):
+         value = coerce_text(value)
+     if sys.version >= "3" and isinstance(value, bytes):
+-        value = cgi.escape(value.decode('latin1'), 1)
++        value = escape(value.decode('latin1'), 1)
+         value = value.encode('latin1')
+     else:
+-        value = cgi.escape(value, 1)
++        value = escape(value, 1)
+     if sys.version < "3":
+         if is_unicode(value):
+             value = value.encode('ascii', 'xmlcharrefreplace')
diff --git a/dev-python/tempita/tempita-0.5.3-r3.ebuild b/dev-python/tempita/tempita-0.5.3-r3.ebuild
new file mode 100644
index 000000000000..ab6d1f23dbf2
--- /dev/null
+++ b/dev-python/tempita/tempita-0.5.3-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+# The package uses pkg_resources
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+MY_COMMIT="97392d008cc8"
+
+DESCRIPTION="A very small text templating language"
+HOMEPAGE="https://pypi.org/project/Tempita/"
+# Tests are not published on PyPI
+SRC_URI="https://bitbucket.org/ianb/${PN}/get/${MY_COMMIT}.tar.gz -> ${P}-bitbucket.tar.gz"
+S="${WORKDIR}/ianb-${PN}-${MY_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-pypy-tests.patch"
+	# cgi.escape has been removed in Python 3.9
+	"${FILESDIR}/${P}-cgi-escape.patch"
+)
+
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# Remove reference to a non-existent CSS file
+	# in order to make sphinx use its default theme.
+	sed -i '/^html_style =/d' docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# We need to append to sys.path, otherwise pytest imports
+	# the module from ${S} (before it was 2to3'd)
+	pytest --import-mode=append -vv tests/test_template.txt docs/index.txt \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild b/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
index cb27d35bd7b0..208220f014fd 100644
--- a/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"