gentoo auto-resync : 05:09:2022 - 16:24:39

20 files changed, 174 insertions, 532 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d96b1b7c51fa..880bc2f7f451 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index 90952e489911..14818ed6cf21 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1,3 +1,5 @@
 DIST qstylizer-0.2.1.tar.gz 20687 BLAKE2B ad158ac0f88c4a0a7c6d9fe9adc611f69cb946c28be8c414dbb40532901b53faee281e7c0a798c9f680d8e5cd8a04179b16df796041133a8dd65d117964e9905 SHA512 c5e4a4194b4282a6d2782c0636ed74e9885409570466765c6e2aee0a176175bb688854244828c56ffbd00e76d297a33de211dedae8d984021c816522ea2b6085
+DIST qstylizer-0.2.2.gh.tar.gz 20752 BLAKE2B c5442821389863bc03bb0659b528322cc12f5be8137f74746e3ec7a18bf89d2822d533d13cc23842daf32a0077ad84d0e7b5dc62f231e75e57388064bd08e5fc SHA512 682f10462965a93b36f0e44b75885b9d60b4d3cd03369976b977c9b928afed4e930b6b7ef26850bdb7b40ef2a31db35a9778738582dae8715f54c1f00a957fb3
 EBUILD qstylizer-0.2.1-r1.ebuild 1569 BLAKE2B a142ea81c24235a68602ea7711ba47078fc1749fa7cb42c8562681c140f09cfd83ee74d93543f346c6ac6c438fa34d2e738fad0ffcd062a25cefc06e57905e50 SHA512 a0a382c0292119c8c684db0151a4615ac2a52ff213bcd8859e8be8ad19455959786d3efc11353dcbe039aebf43072932c05a34dd80823c2b85418dd109f48b51
+EBUILD qstylizer-0.2.2.ebuild 1572 BLAKE2B 2559416329605f75f6f38d23fa4f0f9869c88038233a68fd6703b9d85763de94065d4b865151b6efb1952de1d92ed5a769d9114147495eae7dc5ae4c6399e5eb SHA512 5902178ad1de4bece2dcb7191fdf868f606d9df1b619b9bd6940d0082b3d9d27fef9f2f49f1a4634df184601b4671c45007ebb782d4feb15a3a461d97247529c
 MISC metadata.xml 355 BLAKE2B bbd0a92b969f24330e934a3fb9db82c99d4e0f4daeb6a4fadaa5cefa0caa2d4eab393f2743664ea7bf685df3deed81ffd3e4eb8f12089d395c4c6b231bec9d58 SHA512 504b904577a9f891df117d1ca79a0041463cef7fcadb8c2dbfcf2f88abf2c26bc08a976dff5d8e51a563d6a6070b354fa2c1918051aeccf3ea5a359a3ea04694
diff --git a/dev-python/qstylizer/qstylizer-0.2.2.ebuild b/dev-python/qstylizer/qstylizer-0.2.2.ebuild
new file mode 100644
index 000000000000..7e51a4b78757
--- /dev/null
+++ b/dev-python/qstylizer/qstylizer-0.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Stylesheet Generator for PyQt5/PySide2"
+HOMEPAGE="https://github.com/blambright/qstylizer"
+SRC_URI="https://github.com/blambright/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
+	<dev-python/tinycss2-2[${PYTHON_USEDEP}]
+	>=dev-python/inflection-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/inflection-1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-vcs/git
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-autoprogram
+
+python_prepare_all() {
+	# Exception: Versioning for this project requires either an sdist tarball, or access to an
+	# upstream git repository. It's also possible that there is a mismatch between the package
+	# name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name qstylizer
+	# was given, but was not able to be found.
+	#
+	# There are no tarballs on PyPI, so we do this as a workaround
+	git init -q || die
+	git config user.email "larry@gentoo.org" || die
+	git config user.name "Larry the Cow" || die
+	git add . || die
+	git commit -m "init" || die
+	git tag -a "${PV}" -m "${PV}" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 97e986ac3de9..54e31b88077f 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,5 +1,3 @@
-DIST spyder-kernels-2.3.2.gh.tar.gz 90754 BLAKE2B 1725ab6a72c31eab7befa1b86406e92eedbc19f7afe72d78c9713cf96a57dcfd950408d11c5e4c769b5f670dd021e047c047deff446d3d609913a3f7a8118640 SHA512 d63ee48e6934679b353dd5a5d42e5faaa4b9a3a7dab8f9e00e5e08526894af23e5dc6c78fc6ce190f181ede6fd32e72d9e1c9a8bc078234d4a7a1bb19923384d
 DIST spyder-kernels-2.3.3.gh.tar.gz 91175 BLAKE2B 351852cd0eae2186f799ac329d2840ca1d427876b987a5eb0a5965020b1be38f1bf82ddd771648aa7d8e6027a1c1b1f3596fbe792fbf8e4b868bba8cbd6190db SHA512 764b935d3dffa531afc092e40aecc3d456261704703744e692a54ddf4ae22b80729912845dcc5c1b5546156efbacdc50aba84c19f9a8aa03435166cd4a4621e6
-EBUILD spyder-kernels-2.3.2.ebuild 2299 BLAKE2B 7cfdb3e34e291f0fd4a533f566ae00bd2c51aa853b6ba082c33ee45c202e23f89fca53071d7c77c21e3d55037555ac23f8cd4d35917b51119d5ef5597b0f2178 SHA512 a9ec26bc612831e27953263b2b303f686a4eb667009a55029c7f75ea14e3e29b9a6cfaef59cf6504bb0cb34f29790b15dead7e2fa6c07020946f837aaaa6dabb
 EBUILD spyder-kernels-2.3.3.ebuild 2347 BLAKE2B b77555bb0aed56fa85c7982e606173247b7873dc7acf5526b1c0db343500dc77e6f8f86be5fdbefcd60216d8d9e95ff67db10ddd7edc82ef8e234eb962968239 SHA512 af1bd8ff9097ef7b4af2c521bfd49429145d89b3c9e42e675b9969281280605bf494eccdf23594464c5ff774d713767acc9250725b63031d173bdfcdb52a82ed
 MISC metadata.xml 545 BLAKE2B 52be79edfbfdd86e7f895c53d088399b649901b76c7b69cf6363dfba6954971ce75b14624c2fc4254810112e32721e215255d59035f70850e1c1073f9784e65b SHA512 62ad725aab52d7071ccd5297bd15fcdd5e02e97854fc412a43b5c97b7995c77661251994850616743ce39eee0d0673b3bd4189b00876ed6124bf1871f6fb100c
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.3.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.3.2.ebuild
deleted file mode 100644
index 0745e08a1548..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-2.3.2.ebuild
+++ /dev/null
@@ -1,73 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/
-"
-SRC_URI="
-	https://github.com/spyder-ide/spyder-kernels/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	<dev-python/ipykernel-7[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.9.2[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.31.1[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.3.4[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
-	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/dask[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# we no longer package distributed
-	spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
-	# RuntimeError: There is no current event loop in thread 'MainThread'.
-	# https://bugs.gentoo.org/834893
-	spyder_kernels/console/tests/test_console_kernel.py::test_cwd_in_sys_path
-	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing
-	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing_2
-	spyder_kernels/console/tests/test_console_kernel.py::test_runfile
-	spyder_kernels/console/tests/test_console_kernel.py::test_np_threshold
-	spyder_kernels/console/tests/test_console_kernel.py::test_turtle_launch
-	spyder_kernels/console/tests/test_console_kernel.py::test_matplotlib_inline
-)
-
-python_prepare_all() {
-	# No additional test failures with ipython-8: 843251
-	sed -i -e "/ipython/s:,<8::" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/spyder-line-profiler/Manifest b/dev-python/spyder-line-profiler/Manifest
new file mode 100644
index 000000000000..d44e6866880a
--- /dev/null
+++ b/dev-python/spyder-line-profiler/Manifest
@@ -0,0 +1,3 @@
+DIST spyder-line-profiler-0.3.1.gh.tar.gz 44042 BLAKE2B a98c5770b44b3e11d2261b371e5a806087ebcb347b54745b5bdfe5c4fe3051ff862c79e96ab9a0048e83217cba65fd48a6368bf3e1d1a3f9ab09d2dd69f8ec7c SHA512 96ddc1817adfd58362ea766b95cd58ad521c1333a6bafe9fef1e117ef7ef602bc7e7bced3990d19b85c2882253d81d27940ab409a9daacf588513a405ae4d8fb
+EBUILD spyder-line-profiler-0.3.1.ebuild 784 BLAKE2B 6f386e12fede0472fa02882f96042477c4941564cce2d537727cc5b8bc0f3cf9ac8c0933d29254ecd3b7df116cc4389ea1259c17a1d63c122e1eda739f008468 SHA512 16325c761101c89198bbe5bbb1bfc37268358ebe9c6eeafc67c6bca78b02a334cf85aa1eb1142f5b566678b5a52a2a360d01ca272d6c0638b4cc6c0a84c82f18
+MISC metadata.xml 366 BLAKE2B c32aaf9d9bc88aad26fd4df03243c046874b2f4e7fc40cc57ac85ba72c23cec611b6d2cfacdde51968fb1c012ab9bee3179c61c0d0c28c6c8854f0bed615f022 SHA512 70265f7e2c19d3d7987f5ca4904ff691e99d261a1f5bb4ad06115e706e2f9d15b26be2af4ececa29b2e48d6ac98d56cc1ba23756d55ee0e97e5304aa3713b7b9
diff --git a/dev-python/spyder-line-profiler/metadata.xml b/dev-python/spyder-line-profiler/metadata.xml
new file mode 100644
index 000000000000..7cf2dd3db140
--- /dev/null
+++ b/dev-python/spyder-line-profiler/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-line-profiler</remote-id>
+	</upstream>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/spyder-line-profiler/spyder-line-profiler-0.3.1.ebuild b/dev-python/spyder-line-profiler/spyder-line-profiler-0.3.1.ebuild
new file mode 100644
index 000000000000..dc37126b66a1
--- /dev/null
+++ b/dev-python/spyder-line-profiler/spyder-line-profiler-0.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Plugin to run the python line profiler from within the spyder editor"
+HOMEPAGE="https://github.com/spyder-ide/spyder-line-profiler"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/line_profiler[${PYTHON_USEDEP}]
+	dev-python/qtawesome[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5.2.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-6.0.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx epytest
+}
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index 3007af6523a8..6ede223aa25a 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-unittest-0.5.0.tar.gz 80022 BLAKE2B c904196f7b0288b4d4f105037cbf75fc7ef60669ba1a24687b4f6aa672b88b139b64282c2d12340c958a3ffb65b8cf01b61256f669e167a6c15eb9471430af2a SHA512 4bea5d88b6be80435e2fa6498803ceea275b72c47bd0a54bb3be962bfe00feed2073e4d4915ea1b4dd780cb1c104f6dcd2735ee000cdedb934ed9fac059d0ca5
-EBUILD spyder-unittest-0.5.0.ebuild 1002 BLAKE2B cb333283acb99f8660a2ebb3b4c139019f9adf0593c1cf33d2d7daa55e9cded3bc558b1d183ca0ddf85d7f7736d9706b03e5441bb49c44918130b6e876c90893 SHA512 f0313c199a6dade3560edd37ffaf54f63f1c7ffb84e872785a1912eeba4913be23c397ab1a1e774c4a564d7983b6885d4d209a03ddb69a70ec3b49bc81de23b3
+DIST spyder-unittest-0.5.1.gh.tar.gz 80022 BLAKE2B c904196f7b0288b4d4f105037cbf75fc7ef60669ba1a24687b4f6aa672b88b139b64282c2d12340c958a3ffb65b8cf01b61256f669e167a6c15eb9471430af2a SHA512 4bea5d88b6be80435e2fa6498803ceea275b72c47bd0a54bb3be962bfe00feed2073e4d4915ea1b4dd780cb1c104f6dcd2735ee000cdedb934ed9fac059d0ca5
+EBUILD spyder-unittest-0.5.1.ebuild 1005 BLAKE2B 068c60e0d3f2a7155be9b932510aa2b4d1ec1bb5d0adfa715eac519a6ce0f98447ca54f839f42107a32c043a8aba41af8ad8698e4697851723d970b7f154c4c8 SHA512 448e25341687cf41bce2438c9ecd306d0b1e3a2762c5b34270fea0f2fa65dfe7970ddf549c83da382e1eae67426c278f5979ddf06132b20a5f6cbd3e8bef6f9c
 MISC metadata.xml 361 BLAKE2B 9d9ab5a6fcc2bd47042aaca2342fe7603ccf68929f35e45d2f4435b62bdbee2fcfc8ebf236b3e6930154387a2c83b775cb9782d50db13343ac96f7a325bb9a82 SHA512 4227a170633b961a20a045cdbd39dd2438d02fdfe94b41e9801198f126fe4578285bc16097a8377357ea70ff625b7e47e5a2573af88ca6dd27ab1fac0235d05c
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.5.0.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.5.1.ebuild
index dbb35f3719d4..abd29d2cb968 100644
--- a/dev-python/spyder-unittest/spyder-unittest-0.5.0.ebuild
+++ b/dev-python/spyder-unittest/spyder-unittest-0.5.1.ebuild
@@ -11,7 +11,7 @@ COMMIT="d210d9fe6c4efbb21d680a040cc4741d76a81f49"
 
 DESCRIPTION="Plugin for Spyder to run tests and view the results"
 HOMEPAGE="https://github.com/spyder-ide/spyder-unittest"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 # AttributeError: 'NoneType' object has no attribute 'split'
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=dev-python/spyder-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5.3.1[${PYTHON_USEDEP}]
 	<dev-python/spyder-6[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder-vim/Manifest b/dev-python/spyder-vim/Manifest
new file mode 100644
index 000000000000..6318aac10aaf
--- /dev/null
+++ b/dev-python/spyder-vim/Manifest
@@ -0,0 +1,3 @@
+DIST spyder-vim-0_pre20220831.gh.tar.gz 293646 BLAKE2B 19c7ed461f924c441da3454d510e5782b66139de41febd2cbb5968a0f00a63a0751e7206328d73287dc9c64cdc22d9e4a5936a312b7775d55e95b68c26d270d8 SHA512 a55f41dca60c6ab6046d13d8a1baa8b8f565542c4d02bfdd931ad1daaaedae372853baa65374f553a6e73d22c234e753375936cf4be18dc4f0d342507e479031
+EBUILD spyder-vim-0_pre20220831.ebuild 898 BLAKE2B 9f1bf74e0ce49ccc636e55756e98ab6dc51839a15f84ea2b6f54023499c7d8ae7a28b41bc21ddc8608d61bdade0a1de7d588af69a96f1f8bbbf6b6e000bcb340 SHA512 631ca99c90c389231c1b0d737df88e49ca5fa3f5257b3307c2a203bf639f1f7c5a7f5cd5e207835a77e8858a7f2e9ec1a9cedc36437b2c66e730422784ea5abd
+MISC metadata.xml 283 BLAKE2B 496ff63603add5d83ad2236c02d387762094087edea5b495978e2e479162f95dc2d399888ff3f7a255d489b15ce46271f2e93e41c6b25db1bb7d36c24708f173 SHA512 16398e0630a435c2fa074ac8c4fe87dccfbc9ff55881ae7dbce45a3525a3ab2f273ee341f2ab6b45405aa450704c63836636a1c5a3c28c3d84381b01854b488c
diff --git a/dev-python/spyder-vim/metadata.xml b/dev-python/spyder-vim/metadata.xml
new file mode 100644
index 000000000000..8bb03f453618
--- /dev/null
+++ b/dev-python/spyder-vim/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/spyder-vim/spyder-vim-0_pre20220831.ebuild b/dev-python/spyder-vim/spyder-vim-0_pre20220831.ebuild
new file mode 100644
index 000000000000..546c6239f557
--- /dev/null
+++ b/dev-python/spyder-vim/spyder-vim-0_pre20220831.ebuild
@@ -0,0 +1,40 @@
+# 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_{8..10} )
+
+inherit distutils-r1 virtualx
+
+COMMIT="2ccf0d1e6ccaba24bd05b379065ba43bd935c7bf"
+
+DESCRIPTION="Plugin for Spyder to enable Vim keybindings"
+HOMEPAGE="https://github.com/spyder-ide/spyder-vim"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/spyder-5.3.3[${PYTHON_USEDEP}]
+	<dev-python/spyder-6[${PYTHON_USEDEP}]
+	"
+
+DEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
+
+DOCS=( "README.rst" "doc/example.gif" )
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx epytest
+}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index e752d321a0fc..10b7b5589f8c 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,9 +1,6 @@
 AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7f760f9bb5dc975053c7f8bb409c79b90eeaf06c5121ca5833442b61929cc640e4f25e6cc27f6118f0fa8f27b5e SHA512 e88cbbeca42ac2720f4e0888df9432d912d3907af267d3fe6a5e658d18d1242c998a70dee88fa0efe9edfcf87a46a40cf75685037d75fce1d596b708acc32096
 AUX spyder-5.2.0-doc-theme-renamed.patch 356 BLAKE2B 666ba289498026ab0679776b8af8f6efe7561a9a736ff19b32eaefcac87d142a55a055556c09f94373869711e81a35ef90832fbfe68acc6cee0f2023742de0be SHA512 396944e6f242bf3b6a27ac9d47f0cc07fd99a55c50f174dbee2fccd1f0b3edf355347bf6291943c3003f55996304d96ce2d2fe45ae7c4291e8425bff73a3a861
-DIST spyder-5.3.2.gh.tar.gz 24441566 BLAKE2B dae46baf1a2673ee7449d1060302a726963424c946c9a0188ab85401c9a457fe818039ce3217ccd94ee3976b3e1a4dbb4379945862dee039ebd01ca41077846f SHA512 d1e9a83ddad6e637bef9cacc8261e9097684996661f730ff2813c2bdd72b1d58e9ae75f8a54730088761750eee6ae3d622f25fb9d0e6bca70325906cf4fc9348
 DIST spyder-5.3.3.gh.tar.gz 24443628 BLAKE2B 767b3e1d59ce650d2df0d229d94eef53bc4c7b52f5d40fd62748efeb3a756a773110aa17442403a1b37777dd39fc367164ad54cd8f767d4311caa8d3e8bf05da SHA512 7d521f8367953849233538cbfd74f1fd98da87e69dbed8076718e81cd09ae66aca84523c4ecdf0e8aeb60644791754df19f09dd244ce11e3f7decc97bb050e02
 DIST spyder-docs-9156f446a9225446a2a752ecb669cc3db30094a8.gh.tar.gz 90029977 BLAKE2B 7254da77f6d9dd24d9feb8af684d064bb92400acf1561f8a2b9423c63984c22fb3ab384174f87525c3cdb0612590fb97010e9cd1a21ae1e36ffc6d6f9babe973 SHA512 1a9609baea12059fad1e65b84c1db98e15cb3d65e1c60660a1f1ebeab5723b118d6e995a4e4219391d8aafb640da20e2a4984746e9c66893dd0cef2ea3f082f9
-DIST spyder-docs-d43d6cd46b6eb7675ec690b0dff573ca03f2e301.gh.tar.gz 90037375 BLAKE2B 2faf8d2d07b10aec750534c73ebcfc9146533db4223908ecabafb214d7e0a85416aaaf4359f95768572bbd8806f13bd707124f9585299527af5bd5bc735293d4 SHA512 00f12af5298f5b90eaf9a4ea8706b5bb29445ca344b5117801dbac54508eefa29c807e0d4f36524fb5d8b6208204533dc657da63849cadaf13f4aa3652612cb1
-EBUILD spyder-5.3.2.ebuild 7390 BLAKE2B 1cd5ff8d3a151e81e4aeb18f6e6de150f407c828f1391b4b4e563f6adedb909320f5ca6ab32b9ea497cb3f8e9534dffa5e90eafc06d053e2319f99a380469441 SHA512 e065b06bd5b005c26dc9227b8192d7c26f8861fbd9a33136be75368a7561086e92b1146d1867a09f21f65deba92c107a92115bf2ffd1d1ff8a771eddcab52953
-EBUILD spyder-5.3.3.ebuild 7390 BLAKE2B d1456020cddbfed8589609056f6f363b0c3c0bbd43bc0d1a3be9186597b17fbc609981d0c7c248b5ce210937377e4532487ea0729a4b7fdc559dd55b809a0499 SHA512 b71a9ce568276cd0426cfaad9886bdb7dfd7450b7eb7f6beeb6f2e058d009d9269571d78f3c354230203790e86e45079da56d91b9a3447101cd19cdd88fe2474
-MISC metadata.xml 1316 BLAKE2B 996e794aec3c0a7f3b192fb9a66ebe7afaddc3f1ef2057d36a007770becf3d11ec0d05cf30a520cfb8537c1ae34bc9d89e8bc54224def1f4f2f4b30c657ead53 SHA512 b3cd21a16e51414d22b0f102f88da30ca1c3e596eb032ee7bde3c0d7b396659485c2565f0ed79c437eaca07b535fa3305796386e6023606ad1896edf7d347493
+EBUILD spyder-5.3.3.ebuild 7521 BLAKE2B af428ebb8d124e18968cd83eb7caeb8f39560381a26dd6e344aa5cc68c4de730c142f8be58d3be72832fe8a9f882754e49b917e16e4f61659e814024f840e359 SHA512 f0590eb53ad79f8e70882dd16f3ef8536d140f58ed9c88d4fc5e8cb5cd17e4da9db24e3f4f1209474328d2c1fc89bc1994ecfd12b9a050b24dc546647d7c8640
+MISC metadata.xml 1251 BLAKE2B 81f007eda89ddc66841771a949f76da6f015b49bfbf27b47a7557ab70f1241087f06a5c6675ea8da6aa871937cd705aea888989b468ac11d33420cbe34a27f27 SHA512 24977ed6053ad254748ba4c368bed7f8428d1e5928b586f57e48c01733934894fb1f94df077a71fcd7a00e891e24b776b9e57279f90c2f94728f709a94a90121
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index b23b17765ada..f4aa91a44bfb 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -23,7 +23,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">spyder</remote-id>
-    <remote-id type="bitbucket">spyder-ide/spyderlib</remote-id>
     <remote-id type="github">spyder-ide/spyder</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/spyder/spyder-5.3.2.ebuild b/dev-python/spyder/spyder-5.3.2.ebuild
deleted file mode 100644
index d4b8b5281e41..000000000000
--- a/dev-python/spyder/spyder-5.3.2.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit optfeature xdg distutils-r1
-
-# Commit of documentation to fetch
-DOCS_PV="d43d6cd46b6eb7675ec690b0dff573ca03f2e301"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-"
-SRC_URI="
-	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# The test suite often hangs or does not work. RESTRICTing because IMO it is
-# not worth the several hours I would have to spend every single version bump
-# checking which tests do and do not work.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jellyfish-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-black-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
-	<dev-python/qdarkstyle-3.1[${PYTHON_USEDEP}]
-	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.3.0[${PYTHON_USEDEP}]
-	<dev-python/qtconsole-5.4.0[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-2.1.0[${PYTHON_USEDEP},svg,webengine]
-	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.3.2[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-		dev-python/pytest-qt[${PYTHON_USEDEP}]
-		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0-build.patch"
-	"${FILESDIR}/${PN}-5.2.0-doc-theme-renamed.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.md"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc \
-	dev-python/sphinx-panels \
-	dev-python/pydata-sphinx-theme \
-	dev-python/sphinx-multiversion
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# these dependencies are packaged separately:
-	#    dev-python/spyder-kernels,
-	#    dev-python/python-lsp-server,
-	#    dev-python/qdarkstyle
-	rm -r external-deps/* || die
-	# runs against things packaged in external-deps dir
-	rm conftest.py || die
-
-	# Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5]
-	# Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine]
-	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
-	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
-	# Do not depend on ipython, this dependency is carried in spyder-kernels
-	# The explicit version requirements only make things more complicated, if e.g.
-	# pyls-spyder gains compatibility with a newer version of python-lsp-server
-	# in a new release it will take time for this information to propagate into
-	# the next spyder release. So just remove the dependency and let the other
-	# ebuilds handle the version requirements to speed things up and prevent
-	# issues such as Bug 803269.
-	sed -i \
-		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
-		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
-		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
-		-e "/'parso[ 0-9<=>.,]*',/d" \
-		-e "/'jedi[ 0-9<=>.,]*',/d" \
-		-e "/'pylint[ 0-9<=>.,]*',/d" \
-		-e "/'ipython[ 0-9<=>.,]*',/d" \
-			setup.py || die
-	sed -i \
-		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
-		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
-		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
-		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
-		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
-		-e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \
-			spyder/dependencies.py || die
-
-	# do not check deps, fails because we removed dependencies above
-	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# can't check for update, need network
-	rm spyder/workers/tests/test_update.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# Calling pytest directly makes the tests freeze after completing even if successful
-# Exit code is nonzero even upon success, so can't add || die here test results
-# should be checked for success manually
-python_test() {
-	"${EPYTHON}" runtests.py
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-	optfeature "Run Cython files in the IPython console" dev-python/cython
-	optfeature "The hdf5/h5py plugin" dev-python/h5py
-	# optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-	# spyder-autopep8 does not have a release (yet)
-	# and are not compatible with >=spyder-4.0.0 at the moment
-	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-	# optfeature "Vim key bindings" dev-python/spyder-vim
-	optfeature "Unittest support" dev-python/spyder-unittest
-	# optfeature "Jupyter notebook support" dev-python/spyder-notebook
-	optfeature "System terminal inside spyder" dev-python/spyder-terminal
-	# spyder-reports not yet updated to >=spyder-4.0.0
-	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-}
diff --git a/dev-python/spyder/spyder-5.3.3.ebuild b/dev-python/spyder/spyder-5.3.3.ebuild
index 09784e580309..7cacaf6d3cd9 100644
--- a/dev-python/spyder/spyder-5.3.3.ebuild
+++ b/dev-python/spyder/spyder-5.3.3.ebuild
@@ -179,15 +179,17 @@ pkg_postinst() {
 	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
 	optfeature "Run Cython files in the IPython console" dev-python/cython
 	optfeature "The hdf5/h5py plugin" dev-python/h5py
-	# optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-	# spyder-autopep8 does not have a release (yet)
-	# and are not compatible with >=spyder-4.0.0 at the moment
-	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-	# optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "Vim key bindings" dev-python/spyder-vim
 	optfeature "Unittest support" dev-python/spyder-unittest
-	# optfeature "Jupyter notebook support" dev-python/spyder-notebook
 	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-memory-profiler is not compatible with spyder-5.2+ yet
+	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-notebook is not compatible with spyder-5.2+ yet
+	# optfeature "Jupyter notebook support" dev-python/spyder-notebook
 	# spyder-reports not yet updated to >=spyder-4.0.0
 	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	# Plugins with no release yet:
+	# optfeature "Manage virtual environments and packages" dev-python/spyder-env-manager
+	# optfeature "VCS (e.g. git) integration" dev-python/spyder-vcs
 }
diff --git a/dev-python/tpm2-pytss/Manifest b/dev-python/tpm2-pytss/Manifest
index 7d7dfcb6c198..2f7b900f6abf 100644
--- a/dev-python/tpm2-pytss/Manifest
+++ b/dev-python/tpm2-pytss/Manifest
@@ -1,4 +1,3 @@
-AUX tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch 9788 BLAKE2B aa0d9ec46a92aaaa1a26ccd632ad6fae17386f31f36cd411110632507c09622f8e4fff390b787d8b33af4cbffc18b298e2829565408d14fa54deedab227688df SHA512 913170a4bafc4c059d4ea6c3d855ad2c1a10a70dfc780e493964913c26156a6f08be969b219061d8e93341279641d38aac71ddeaddaea7c341e09e30823dc4fb
-DIST tpm2-pytss-1.1.0.tar.gz 162559 BLAKE2B 2c9b34c323b96b3a8ded82a04accac9647d7f0b1cf05d269ed4bdf225d785fd8454dee82f054a5085f9d49d0feabacc8c5b72a7ee8af7bc9da8473d5689501b5 SHA512 71da9e005a3f645c0528a96bb96bafde9c262c5778646a19841af6323edaf889ede7267317ea96b7d44c7901d7bea04ca15fd1b5c86d61d33e49b34f5d0e2e94
-EBUILD tpm2-pytss-1.1.0.ebuild 989 BLAKE2B 336eb07b9c14a7395a978619c12044e59d98e3fe6ec5d3cc0cad53d8b2c88fd8a3652510437d80bd747bf335b0bf33d83aabfc55f8a785f33744c7d333d22a1f SHA512 5ecf1883c8b19953445d5da4da4e971cae8caead8356e6b6a1251143dc8ca3cf6547f4785a703e2e80f0652032a9bd08bda1a8a8ef98311c09f38f349c77797c
+DIST tpm2-pytss-1.2.0.tar.gz 178555 BLAKE2B 782f7d8194d2a9395213f39e5a17414ae2ab49f961b01c496fd54803a43f6846434a1d69a3993d16b6b51c2578f6f5e1a0d883be791cf6fb29ae23012b2090cf SHA512 688223d05a2ed5f3a5aeec47c77a02c10d40d4f23a97622e76acbf8f86b14ac2a92482869c5e04de395edb96b1e1b142c5ff53c7dbc97673ead531e4d6138184
+EBUILD tpm2-pytss-1.2.0.ebuild 942 BLAKE2B 4334a2f783ad0aa2c727466a96b6bc38214422558e9398bc09de139a6dfb82e3c85901a6ecefabf763617d5419ded4562cd06b12d994d4afffd26e534b4fcc36 SHA512 06a3187a9b42e6d6909cce0999175389b150d5ea794127a00c18f261509f80549321057854cb20b2d9cb6ee6c9cfebb45b46ea919f596e2ecb21e7782f18cb4e
 MISC metadata.xml 511 BLAKE2B b59b0da52736f7042c9357f3422cd0d3181d0dbea315b4ebdedf038c6e7c367a402a9ef4deac20940c6126977d756f6557fa5a8b2f8f4bc95b40a7510e8ea19c SHA512 6d7659472f076746cd4edae6a5413f4e34b4996ae0ac3af345ed720aabfeb991895b8dbc3f24160017bbf2633c77d8721507c14604c4cce9a8d407bf699ce635
diff --git a/dev-python/tpm2-pytss/files/tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch b/dev-python/tpm2-pytss/files/tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch
deleted file mode 100644
index 6e6342cac5b6..000000000000
--- a/dev-python/tpm2-pytss/files/tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From a03b66dd73a2ff58ebf847864102585aa3d11af7 Mon Sep 17 00:00:00 2001
-From: William Roberts <william.c.roberts@intel.com>
-Date: Wed, 11 May 2022 17:07:53 -0500
-Subject: [PATCH] src: move package under src directory
-
-Issue #341 reports that building a wheel and running the tests fails. I
-was able to reproduce this behavior with the following commands:
-
-python3 -Bm build -w --no-isolation
-python3 -m installer --destdir=installation dist/*.whl
-export PYTHONPATH="/home/wcrobert/tmp/installation/usr/lib/python3.8/site-packages"
-pytest test/test_types.py
-
-Note:
-  - Current Working Directory is the repo clone, so tpm2-pytss
-  - The export command may need to be updated for your specific version
-    of python.
-
-It fails with:
-ImportError while importing test module '/home/wcrobert/workspace/tpm2-pytss/test/test_types.py'.
-<snip>
-E   ModuleNotFoundError: No module named 'tpm2_pytss._libtpm2_pytss'
-
-However, this issue is a red herring. This really has to do with the
-fact that the relative import in the test code tries to resolve to
-non-built package in that directory rather then the built one on
-PYTHONPATH.
-
-Proposed solutions to use full package names also don't work, becuase it
-has to resolve to the built package and it will still attempt to resolve
-the non-built package. The least finicky solution to fix this, was to
-match what bcrypt was doing and move it under a src directory so it
-forces the resolution to not occur on that directory and inplace (pip
-install -e .) installations still work as well.
-
-Fixes: #341
-
-Signed-off-by: William Roberts <william.c.roberts@intel.com>
----
- .gitignore                                           | 4 ++--
- MANIFEST.in                                          | 8 ++++----
- scripts/prepare_headers.py                           | 2 +-
- setup.cfg                                            | 6 ++++--
- setup.py                                             | 8 +++++---
- {tpm2_pytss => src/tpm2_pytss}/ESAPI.py              | 0
- {tpm2_pytss => src/tpm2_pytss}/FAPI.py               | 0
- {tpm2_pytss => src/tpm2_pytss}/TCTI.py               | 0
- {tpm2_pytss => src/tpm2_pytss}/TCTILdr.py            | 0
- {tpm2_pytss => src/tpm2_pytss}/TSS2_Exception.py     | 0
- {tpm2_pytss => src/tpm2_pytss}/__init__.py           | 0
- {tpm2_pytss => src/tpm2_pytss}/callbacks.py          | 0
- {tpm2_pytss => src/tpm2_pytss}/constants.py          | 0
- {tpm2_pytss => src/tpm2_pytss}/encoding.py           | 0
- {tpm2_pytss => src/tpm2_pytss}/fapi_info.py          | 0
- src/tpm2_pytss/internal/__init__.py                  | 0
- {tpm2_pytss => src/tpm2_pytss}/internal/constants.py | 0
- {tpm2_pytss => src/tpm2_pytss}/internal/crypto.py    | 0
- {tpm2_pytss => src/tpm2_pytss}/internal/templates.py | 0
- {tpm2_pytss => src/tpm2_pytss}/internal/utils.py     | 0
- {tpm2_pytss => src/tpm2_pytss}/tsskey.py             | 0
- {tpm2_pytss => src/tpm2_pytss}/types.py              | 0
- {tpm2_pytss => src/tpm2_pytss}/utils.py              | 0
- 23 files changed, 16 insertions(+), 12 deletions(-)
- rename {tpm2_pytss => src/tpm2_pytss}/ESAPI.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/FAPI.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/TCTI.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/TCTILdr.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/TSS2_Exception.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/__init__.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/callbacks.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/constants.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/encoding.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/fapi_info.py (100%)
- create mode 100644 src/tpm2_pytss/internal/__init__.py
- rename {tpm2_pytss => src/tpm2_pytss}/internal/constants.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/internal/crypto.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/internal/templates.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/internal/utils.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/tsskey.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/types.py (100%)
- rename {tpm2_pytss => src/tpm2_pytss}/utils.py (100%)
-
-diff --git a/.gitignore b/.gitignore
-index 07e277e..396cfdb 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -40,5 +40,5 @@ public/
- *.rej
- htmlcov
- /.pytest_cache/
--tpm2_pytss/internal/type_mapping.py
--tpm2_pytss/internal/versions.py
-+src/tpm2_pytss/internal/type_mapping.py
-+src/tpm2_pytss/internal/versions.py
-diff --git a/MANIFEST.in b/MANIFEST.in
-index 6bc43ab..7bbc96a 100644
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -1,8 +1,8 @@
- include README.md
- include LICENSE
--include tpm2_pytss/version
--include tpm2_pytss/config.json
--recursive-include tpm2_pytss/swig *
-+include src/tpm2_pytss/version
-+include src/tpm2_pytss/config.json
-+recursive-include src/tpm2_pytss/swig *
- recursive-include tests *
- recursive-include examples *
--exclude tpm2_pytss/internal/type_mapping.py
-+exclude src/tpm2_pytss/internal/type_mapping.py
-diff --git a/scripts/prepare_headers.py b/scripts/prepare_headers.py
-index 0864a3d..7eb0a57 100644
---- a/scripts/prepare_headers.py
-+++ b/scripts/prepare_headers.py
-@@ -11,7 +11,7 @@ import textwrap
- 
- # import tpm2_pytss.constants
- constants_spec = importlib.util.spec_from_file_location(
--    "tpm2_pytss.internal.constants", "tpm2_pytss/internal/constants.py"
-+    "tpm2_pytss.internal.constants", "src/tpm2_pytss/internal/constants.py"
- )
- constants = importlib.util.module_from_spec(constants_spec)
- constants_spec.loader.exec_module(constants)
-diff --git a/setup.cfg b/setup.cfg
-index 89a3c7a..5426a07 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -18,9 +18,11 @@ classifiers =
-     Programming Language :: Python :: 3.10
- 
- [options]
--packages =
-+package_dir=
-+    =src
-+packages=
-     tpm2_pytss
--    tpm2_pytss/internal
-+    tpm2_pytss.internal
- setup_requires =
-     setuptools_scm[toml]>=3.4.3
-     cffi>=1.0.0
-diff --git a/setup.py b/setup.py
-index f10fe73..b7f1c96 100644
---- a/setup.py
-+++ b/setup.py
-@@ -200,13 +200,15 @@ class type_generator(build_ext):
- 
-         p = os.path.join(self.build_lib, "tpm2_pytss/internal/type_mapping.py")
-         sp = os.path.join(
--            os.path.dirname(__file__), "tpm2_pytss/internal/type_mapping.py"
-+            os.path.dirname(__file__), "src/tpm2_pytss/internal/type_mapping.py"
-         )
- 
-         vp = os.path.join(self.build_lib, "tpm2_pytss/internal/versions.py")
--        svp = os.path.join(os.path.dirname(__file__), "tpm2_pytss/internal/versions.py")
-+        svp = os.path.join(
-+            os.path.dirname(__file__), "src/tpm2_pytss/internal/versions.py"
-+        )
- 
--        print(f"generated _type_map with {len(type_map)} mappings")
-+        print(f"generated _type_map with {len(type_map)} mappings in {p} and {sp}")
-         print(f"generated _element_type_map with {len(element_type_map)} mappings")
-         print(f"generated _versions with {len(versions)} versions")
- 
-diff --git a/tpm2_pytss/ESAPI.py b/src/tpm2_pytss/ESAPI.py
-similarity index 100%
-rename from tpm2_pytss/ESAPI.py
-rename to src/tpm2_pytss/ESAPI.py
-diff --git a/tpm2_pytss/FAPI.py b/src/tpm2_pytss/FAPI.py
-similarity index 100%
-rename from tpm2_pytss/FAPI.py
-rename to src/tpm2_pytss/FAPI.py
-diff --git a/tpm2_pytss/TCTI.py b/src/tpm2_pytss/TCTI.py
-similarity index 100%
-rename from tpm2_pytss/TCTI.py
-rename to src/tpm2_pytss/TCTI.py
-diff --git a/tpm2_pytss/TCTILdr.py b/src/tpm2_pytss/TCTILdr.py
-similarity index 100%
-rename from tpm2_pytss/TCTILdr.py
-rename to src/tpm2_pytss/TCTILdr.py
-diff --git a/tpm2_pytss/TSS2_Exception.py b/src/tpm2_pytss/TSS2_Exception.py
-similarity index 100%
-rename from tpm2_pytss/TSS2_Exception.py
-rename to src/tpm2_pytss/TSS2_Exception.py
-diff --git a/tpm2_pytss/__init__.py b/src/tpm2_pytss/__init__.py
-similarity index 100%
-rename from tpm2_pytss/__init__.py
-rename to src/tpm2_pytss/__init__.py
-diff --git a/tpm2_pytss/callbacks.py b/src/tpm2_pytss/callbacks.py
-similarity index 100%
-rename from tpm2_pytss/callbacks.py
-rename to src/tpm2_pytss/callbacks.py
-diff --git a/tpm2_pytss/constants.py b/src/tpm2_pytss/constants.py
-similarity index 100%
-rename from tpm2_pytss/constants.py
-rename to src/tpm2_pytss/constants.py
-diff --git a/tpm2_pytss/encoding.py b/src/tpm2_pytss/encoding.py
-similarity index 100%
-rename from tpm2_pytss/encoding.py
-rename to src/tpm2_pytss/encoding.py
-diff --git a/tpm2_pytss/fapi_info.py b/src/tpm2_pytss/fapi_info.py
-similarity index 100%
-rename from tpm2_pytss/fapi_info.py
-rename to src/tpm2_pytss/fapi_info.py
-diff --git a/src/tpm2_pytss/internal/__init__.py b/src/tpm2_pytss/internal/__init__.py
-new file mode 100644
-index 0000000..e69de29
-diff --git a/tpm2_pytss/internal/constants.py b/src/tpm2_pytss/internal/constants.py
-similarity index 100%
-rename from tpm2_pytss/internal/constants.py
-rename to src/tpm2_pytss/internal/constants.py
-diff --git a/tpm2_pytss/internal/crypto.py b/src/tpm2_pytss/internal/crypto.py
-similarity index 100%
-rename from tpm2_pytss/internal/crypto.py
-rename to src/tpm2_pytss/internal/crypto.py
-diff --git a/tpm2_pytss/internal/templates.py b/src/tpm2_pytss/internal/templates.py
-similarity index 100%
-rename from tpm2_pytss/internal/templates.py
-rename to src/tpm2_pytss/internal/templates.py
-diff --git a/tpm2_pytss/internal/utils.py b/src/tpm2_pytss/internal/utils.py
-similarity index 100%
-rename from tpm2_pytss/internal/utils.py
-rename to src/tpm2_pytss/internal/utils.py
-diff --git a/tpm2_pytss/tsskey.py b/src/tpm2_pytss/tsskey.py
-similarity index 100%
-rename from tpm2_pytss/tsskey.py
-rename to src/tpm2_pytss/tsskey.py
-diff --git a/tpm2_pytss/types.py b/src/tpm2_pytss/types.py
-similarity index 100%
-rename from tpm2_pytss/types.py
-rename to src/tpm2_pytss/types.py
-diff --git a/tpm2_pytss/utils.py b/src/tpm2_pytss/utils.py
-similarity index 100%
-rename from tpm2_pytss/utils.py
-rename to src/tpm2_pytss/utils.py
--- 
-2.35.1
-
diff --git a/dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild b/dev-python/tpm2-pytss/tpm2-pytss-1.2.0.ebuild
index d7f07c588526..b805c0e64531 100644
--- a/dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
+++ b/dev-python/tpm2-pytss/tpm2-pytss-1.2.0.ebuild
@@ -24,7 +24,8 @@ RDEPEND="app-crypt/tpm2-tss:=[fapi=]
 	dev-python/cffi[${PYTHON_USEDEP}]
 	dev-python/asn1crypto[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pycparser[${PYTHON_USEDEP}]"
+	dev-python/pycparser[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	test? ( app-crypt/swtpm )"
@@ -32,10 +33,6 @@ DEPEND="${RDEPEND}
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-src-move-package-under-src-directory.patch"
-	)
-
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
 distutils_enable_tests pytest