Adding metadata

22 files changed, 287 insertions, 297 deletions

diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 6a2527b1eb84..2f24e8f02f2a 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,3 +1,2 @@
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c SHA512 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
-DIST PyQt5-5.15.5.dev2107091435.tar.gz 3264477 BLAKE2B 8289bcce9ebef9b8c289992d508ee1d365c86a127b03e175bb14382ad72150aea396d8358d560ce62b9ff33f3b54f3ebb0bbad8ab26a23edc73217c8325d9853 SHA512 5baf434f57c72a0e01753c69f8b40bc37321441efb652e002e3fff330edb8b7b318af3803fc8702897545763a952f99b68a0043a08e364e6fc1feb1e5d8520f5
 DIST PyQt5-5.15.5.tar.gz 3239628 BLAKE2B 8992eb9293bb823f1298108a48d0c8578d0acfcccbabc6cb7c209bb591bfed61caf3ab8b8717205698149b5e4b59b4181e67491332e38ae87856b8169d74ba86 SHA512 67600668c769deb37052e6099a35756519987a0796045cdc291add1763bad103df1226f1b6e304e74808279d6ce56231e614617011ce238e1cf91a302981dd26
diff --git a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild b/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
deleted file mode 100644
index f43d9dfe2658..000000000000
--- a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/ https://pypi.org/project/PyQt5/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-# TODO: QtNfc, QtQuick3D, QtRemoteObjects
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
-	multimedia network opengl positioning printsupport sensors serialport speech
-	sql svg testlib webchannel websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from the qmake_QT declarations
-# in project.py and from the output of 'grep -r "%Import " ${S}/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.15:5"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl] )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	speech? ( >=dev-qt/qtspeech-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-RDEPEND="${DEPEND}
-	>=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	dbus? ( virtual/pkgconfig )
-"
-
-src_prepare() {
-	default
-
-	if use gles2-only; then
-		# sip-build doesn't have a command line option for this
-		cat >> pyproject.toml <<-_EOF_ || die
-			[tool.sip.bindings.QtCore]
-			disabled-features = ["PyQt_Desktop_OpenGL"]
-		_EOF_
-	fi
-}
-
-src_configure() {
-	pyqt_use_enable() {
-		use "$1" || return
-
-		if [[ $# -eq 1 ]]; then
-			echo --enable=Qt${1^}
-		else
-			shift
-			echo ${@/#/--enable=}
-		fi
-	}
-
-	configuration() {
-		local myconf=(
-			sip-build
-			--verbose
-			--confirm-license
-			--build-dir="${BUILD_DIR}"
-			--scripts-dir="$(python_get_scriptdir)"
-			--qmake="$(qt5_get_bindir)"/qmake
-			--no-make
-			$(usev debug '--debug --qml-debug --tracing')
-			--enable=Qt
-			$(pyqt_use_enable bluetooth)
-			--enable=QtCore
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-dbus-python)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usev widgets QtQuickWidgets))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usev widgets QtMultimediaWidgets))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable speech QtTextToSpeech)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			--enable=QtXml
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-			--enable=pylupdate
-			--enable=pyrcc
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain and build flags
-		run_in_build_dir eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-
-		local exe
-		for exe in "${D}$(python_get_scriptdir)"/*; do
-			python_doexe "${exe}"
-		done
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 39b6be5766b3..8ec2d4ebdc60 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,3 +1,2 @@
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b SHA512 25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
-DIST PyQtWebEngine-5.15.5.dev2108100905.tar.gz 49043 BLAKE2B 01b75db0d9fa973ccd0a85f9336e16b7c1fb2a303a0d004d247f91744dc642edb836597877fce6c4f038afa6f87ba066eeaca1e3d467bc15689dbe82e8a9809e SHA512 1ea407832f062dc9b9a6c6312feb4c8f3553b55972e5a32c70c9d1c278918d32934791d60c022a56ab507b6215d5f78e1b4244b9fffa3256aad1f5f4afebd47a
 DIST PyQtWebEngine-5.15.5.tar.gz 48610 BLAKE2B ea266c09965a6ee62e33d3970b145068271c9e1eb87839782e0100b5db2e90a0c002fc4d6f3d22ef9a5cb8c42a067bb45008b0392a0d8557bc6c5c9d77e6b75a SHA512 20eecd479ea757e3bf9855c7dafe0bbbc0cbc61be26509605a5c9a8026e54bb6e362069ecf4be74733dcf6eec154f6ed13933e334e4455b080e687abfd2659fa
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5_pre2108100905.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5_pre2108100905.ebuild
deleted file mode 100644
index 11dc343ab680..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5_pre2108100905.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/ https://pypi.org/project/PyQtWebEngine/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.15.5_pre2107091435[gui,network,printsupport,webchannel,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwebengine:5[widgets]
-"
-RDEPEND="${DEPEND}
-	>=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-"
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			sip-build
-			--verbose
-			--build-dir="${BUILD_DIR}"
-			--scripts-dir="$(python_get_scriptdir)"
-			--qmake="$(qt5_get_bindir)"/qmake
-			--no-make
-			$(usev debug '--debug --qml-debug --tracing')
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain and build flags
-		run_in_build_dir eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 5d63f26a4add..d9af38073ded 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,3 +6,4 @@ DIST boto3-1.18.63.tar.gz 429243 BLAKE2B 67b61ebe0d5a7c4d83922a3ec110e5d4e33c705
 DIST boto3-1.18.64.tar.gz 429469 BLAKE2B c0e423871631017ef9aa5f1e89ada9c82c4c81762f724f7919005cca7078cfb008fd489cf1498a3011b2de0a4b0ac8da1ab0a5aeb8cd54667f4607d8e9fa1168 SHA512 1d56868fb8d6699aa118d1296ae9535d08143329e1df5281b29f6e4b9b7452846d3988ffb6fb66eace93e605e6bac9e04cf2e67f0a25b2b90dde27b02212587a
 DIST boto3-1.18.65.tar.gz 429858 BLAKE2B fbc80e0d8d10f6d02fcf9b86c6b4be03a9c908318c507a7cde1eef0c36d8fe3a5d3be0f8c6178edfdd8bc82adf112f297a5f127cd2b442ce10fe4d37b3a21fa4 SHA512 631d8f618fb6d55b338b563e72e1ccc751b8937bb2660d033b885951ea5ec3ac6902f8c7b9918664d764be84fdef5af4e7a87d444cbc154ebf5ae06908f90714
 DIST boto3-1.19.0.tar.gz 430753 BLAKE2B 24b18d5ac312cac54952e6abc0da80e09c7618ba7c24903d5539d182ce7deb71a5f4198dd66f71650a35192d2146aa6754a25c8ba30138476e8b16b822eb3969 SHA512 4c127d2503e48a3c74367b13831fb5907aa398a173e2793362f070136092e6f2c37e3c4c0e1aed21c11b02d9ada31a22b842d83ef4d47ac78e3d4541a0afe717
+DIST boto3-1.19.1.tar.gz 430897 BLAKE2B fad3df04ce3dd909684dae90d7b83f4c06bb33fd488e6916179bb886f2753890e82b53c38fcceb3a3342be0681f112bb836f65e293b762431abd2ab1b2b71061 SHA512 cefa3cd811559cba4bd8b39b5d9ed1b2f45d4cce45a537bcde32b808872d8d48828562f6226a128c0befc842777fb07b1ad81b4abbe7b45113b748d4086bb289
diff --git a/dev-python/boto3/boto3-1.19.1.ebuild b/dev-python/boto3/boto3-1.19.1.ebuild
new file mode 100644
index 000000000000..30a0b44d3f8c
--- /dev/null
+++ b/dev-python/boto3/boto3-1.19.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5fa124c5d88f..f774d851cd44 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,3 +6,4 @@ DIST botocore-1.21.63.tar.gz 8256427 BLAKE2B 7b6a4d29005cdf127881a88b51ffb316269
 DIST botocore-1.21.64.tar.gz 8258628 BLAKE2B 5a335085224ed86eb2364a67198f1fe8d745102e38ed3cab47821d5bd03c6163ccd7754fc2201384d16d28c9aaf2c0ad447f97374e1b6414739688c788b3b122 SHA512 f40aca854103d97f8d36d178cd5a8fc19e1bde63476c570ae357f2526a82054c3e26a4db26a996df23d66a09bb4ef9354372010b726499cce0021d2dd48c7bb6
 DIST botocore-1.21.65.tar.gz 8261668 BLAKE2B c955019d06aa1b2f4503673b7d9009e5d6e07ee4348e730e6b4d11285f3030f676f0efda58a72dd92cac8c6ba0cb57f8f879eb5298009ecbd227904d18a453bf SHA512 955d24d2d486524af7bee57a56e2e903458030420198f3e6ab49d61be52b812a98444a9d0f86503b121270d6642345ffad6053ad143374dc56ab908b385afb0a
 DIST botocore-1.22.0.tar.gz 8275754 BLAKE2B f0acbccf0c451f6cdd75495c15140c8c65bad567ab9f43c0cf77de8b1736689865688816f3b60ab697552f872f7027d26046050828dc0ad7666d5567b3b613ae SHA512 7f39cb16573d9ae4649ad67bb402f2d2fbd371f8818ec2573f7826e71828c559e37e6759e2c6ab8a05d6fa97ce53bac0a94f6d30dea0c184a079e97d1fba3597
+DIST botocore-1.22.1.tar.gz 8276879 BLAKE2B 91b339fa62d5faf808273c26187d86e1c855b140a22d348d04b95a21be47e2d83081d25e97efb1f7fae899a8abb98311250062e43e998199aff90486c154b178 SHA512 95ac5c5a0ff4cc31cd4fc0973cef45c5a6bce5b82091bde2f2c0cd8215c65c11be6d4fc62ef76110287e01dc54eb9b69e5bda0f2ce39b728d36097834afd47ac
diff --git a/dev-python/botocore/botocore-1.22.1.ebuild b/dev-python/botocore/botocore-1.22.1.ebuild
new file mode 100644
index 000000000000..9cd77a5ad4d0
--- /dev/null
+++ b/dev-python/botocore/botocore-1.22.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index d3064141947a..af1afdf8544b 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,2 +1 @@
-DIST jsmin-2.2.2.tar.gz 12705 BLAKE2B ff14d28c753443c4a17e19b7205b739d5a177eeb8074e4b16c7ae7e5f816758e1f54e07ceddf90dde70cc2752f9dadee0dc71754b2de3343256f3b1695187bba SHA512 e4fea940d7b5e1c0d7dacad70d90a242a8ba178423c886eb60ed7a36b1fba9ca67b5118f26e9a96058b86d3f612d40a21e62cdccd5858a2012a8f222fad3277d
 DIST jsmin-3.0.0.tar.gz 11519 BLAKE2B 192a3c8e325e9c3f56b39be983272a7f5d0c6e241bfff41ce3b064cfb60541d150041ee58e7c033b0afb56252573c3a6f10ff6e74658a9e7647e06672308c86f SHA512 46c42d1306fbda1d37324b514650e1ede50db40219dcb54b9b845bc91c23eeb865b2fcfec70cb44ade61439d1c4f96d35bfb15279ec25e0e39ab6023ef58c4cf
diff --git a/dev-python/jsmin/jsmin-2.2.2.ebuild b/dev-python/jsmin/jsmin-2.2.2.ebuild
deleted file mode 100644
index a180bbd26724..000000000000
--- a/dev-python/jsmin/jsmin-2.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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="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"
-LICENSE="MIT"
-SLOT="0"
-
-BDEPEND="<dev-python/setuptools-58[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" -m jsmin.test -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 6f2a74b2b861..9115442dd1d0 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1 +1,2 @@
 DIST oslo.concurrency-4.4.1.tar.gz 58399 BLAKE2B ea28cdd53ae124fe458c0d901b305d99b7a5b5525835e6a04ca856177876fa6c6a1eff74842dcf260c78c205d95f353cd1b70f0cb6205e7bec841bae2d6ecd0d SHA512 1b7e6a2cb2e3ee0710f652489522c7a9e47a5292c46041f21a2ffe4c61a6bbae48b43e93507465013704b89778deec860da06fec32b4d3778e05cade9a6d39a1
+DIST oslo.concurrency-4.5.0.tar.gz 58979 BLAKE2B 9e2eb4a233985a33994aeaf335c195c980e1e9dd8b48a7c4e53ae502599f12c0dc65466ee45569a97b72f1face0e80ce166922ca3e42f6ad28fd5b27bdf884a3 SHA512 13a2f4d39d3241370374e6fe4ea6047dfc4d20da6116aaebd27f085fdbce089d58b0ebab4f1224234c88237cdefafc2f96229e6527bf5cda13ef1e471e25a50c
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.5.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.5.0.ebuild
new file mode 100644
index 000000000000..ddc173159c64
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.5.0.ebuild
@@ -0,0 +1,32 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Oslo Concurrency library"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/ https://github.com/openstack/oslo.concurrency"
+SRC_URI="mirror://pypi/o/${PN/-/.}/${PN/-/.}-${PV}.tar.gz"
+S="${WORKDIR}/${PN/-/.}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND=">dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.19.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index fd8b54b44802..66219d0cfd3b 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1 +1,2 @@
 DIST oslo.context-3.3.1.tar.gz 32676 BLAKE2B 38d5eaf7a3162fdb6a8887f2c627ee192950d743a9de929ea332495099bcc76e27a192ce6e8a3b010e190ef749ea67dcf168476bc84ede99d43c1ec8b11e1734 SHA512 40f3418020246066841e62e5579ac4a1c761c92c5f439b07059cd0b6b2e8984d2e1dacfa57af7c6d9c97c2fda8eeb5cfde76f2110a36ef21513b42d0d3bffc73
+DIST oslo.context-3.4.0.tar.gz 32954 BLAKE2B 9f22ce6af5efcfec8ab92bdb6c806e420b09037bce08b68fd43684fd459cb12b8196a1e6ee48dcb41ae7aa5d4679851fbed2058709d17e5bb7efc85c9b6d04ea SHA512 bf31c01237352a296e46fdb533ea921dce24cd3c3a918e39f7ff17305104d8f033527738fe562dfe61c8700dbce96e26433068503ca8c5cf9dffb0780e42ec53
diff --git a/dev-python/oslo-context/oslo-context-3.4.0.ebuild b/dev-python/oslo-context/oslo-context-3.4.0.ebuild
new file mode 100644
index 000000000000..87eaaea6e915
--- /dev/null
+++ b/dev-python/oslo-context/oslo-context-3.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Helpers to maintain useful information about a request context"
+HOMEPAGE="https://pypi.org/project/oslo.context/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
+S="${WORKDIR}/oslo.context-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/openstackdocstheme
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 4bbf45e676c0..674633d74ede 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1 +1,2 @@
 DIST oslo.log-4.6.0.tar.gz 92331 BLAKE2B 974f8fef0f132c5429b6512c39b770206947eae9e7a195d7a570b9da6b5bdca675440c800b6ec969ab950e375d4d4ae722d08cf662fe644949322ddc80df01df SHA512 991b661be12b2d16060b621e743fb65809f753b240d5039cd4d51f13a95d6852404156d46507fc611b612cb656d68960026c8735f4f91b32caf89e09499a3c7b
+DIST oslo.log-4.6.1.tar.gz 92280 BLAKE2B d85cfde57e8ae094a81ad5e28e9a715bdb484272da1aab7dbb29c71e24ed24a5090448da8787a4083bef8ed0018bfb954aecda85f548cb35cf6ca2a9aa5b229a SHA512 8e34133096a011d24396990ed904f1efa5a46e7aec471ab36553b7b0e6736fc3bc22e7d628d6f304f584ea3a162e2945652d9bd0a82c0a1a53efb8e58824ea33
diff --git a/dev-python/oslo-log/oslo-log-4.6.1.ebuild b/dev-python/oslo-log/oslo-log-4.6.1.ebuild
new file mode 100644
index 000000000000..855cc0e08a53
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-4.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
+BDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/openstackdocstheme \
+	dev-python/oslo-config
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 256031a39fad..ad1f2617369f 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1 +1,2 @@
 DIST oslo.utils-4.10.0.tar.gz 100481 BLAKE2B 45bb815943912b08256cfba943fb729202346eb8b2ec4b3d2ec5ca8ffed55e321f2abe2a579202240b529e4520bbd70a23ec0dec760f74aaffdd236ee2769723 SHA512 ff51fcd4d12701bf9e729d7bc1e8d6091a7768e7583fcf7ba879e69ad53c6425216c76fef783012f3d9f7cc5947179c4470225416e314c9c0836d201a6d76c14
+DIST oslo.utils-4.11.0.tar.gz 100897 BLAKE2B a020682e89ba86a4b8390c842ffabcfd3d923168c89071c380d50de289e91a5c0247ce47dea3f17675ac14fe7e8129744bf7f5aa8a4aad6ff90d1d01cbd2b589 SHA512 837d111bec78364501a4d92039f76cdfc761b9302eae4badf3700d983f2ff19ffa3497835fef81c28b28760b9aa0325aecafa559b00b3d7593c1d1b2ca916702
diff --git a/dev-python/oslo-utils/oslo-utils-4.11.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.11.0.ebuild
new file mode 100644
index 000000000000..8e1700c3447c
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-4.11.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	>dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# spurious rdep
+	sed -i -e '/pbr/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index dad46cd26535..35c87346aeee 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,2 +1,3 @@
 DIST prompt_toolkit-3.0.19.tar.gz 3034818 BLAKE2B d1f0741931d4711952cfaabd992e64aa3fd252627c50f2a0ad8ad1aef5882bd4ae054c0d281b141595488fda6328c102f900445a42bc32cf018d37663deb2cb5 SHA512 0f3f7c5a2d12e03e06e900a4239f86f27d959fa7337d072dae8c79bbcd2ffd4c1026d1531210e34a4f4669d483b20b9d2f49c7625d0d7aa1fcb1e3f9f3894349
 DIST prompt_toolkit-3.0.20.tar.gz 3037349 BLAKE2B 52773f9c277d1a16adca007c19d087e46a0dd4ec154076525ea7bb59523762513bb137534bc18f17aa249fdc7ad07327e400b3bb730b32a614929f0a48d9cdfb SHA512 3f2a0edb4c7756cdcfd0ddf19f6016910aaa5de3ca8ee0dac11bd0fdece301b4d562681294b7cf9e6d5eb20937106f771ffaf312961cda4477ce534cce8d8db4
+DIST prompt_toolkit-3.0.21.tar.gz 3041438 BLAKE2B 67ce3749404135a16e8b3d032e088e93aa12c851142b74e3ddddcf66713aa1fbce17231935bb22f7e0fda3f86af3da7dfefea612dd0fde7f1da407e2a72cf26d SHA512 46e43329e35b3eadb39c7f83501577cc776a2899005f9a7c299ee9e31eb6fba5e3bf8da33e0092fb1c20367f01518a3079fc4ca92ddbad0e3dfcbcfb1fd3be03
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild
new file mode 100644
index 000000000000..f84406e99f0c
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 31ba2a34aeaf..8247ffec01ab 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,2 +1,2 @@
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
-DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
+DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
index 3e1bc554c213..b58eb1cbd727 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
 "
 
 DEPEND="${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.15.5_pre2107091435[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.15.5[gui,printsupport,widgets,${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.2[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 "