Adding metadata

25 files changed, 221 insertions, 528 deletions

diff --git a/dev-python/ansible-runner/metadata.xml b/dev-python/ansible-runner/metadata.xml
index 74bf6822a1f6..9387d37e9fb6 100644
--- a/dev-python/ansible-runner/metadata.xml
+++ b/dev-python/ansible-runner/metadata.xml
@@ -17,6 +17,7 @@
 		interface abstraction to Ansible.
 	</longdescription>
  <upstream>
+  <remote-id type="cpe">cpe:/aredhat:ansible_runner</remote-id>
   <bugs-to>https://github.com/ansible/ansible-runner/issues</bugs-to>
  </upstream>
  <origin>ports</origin>
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index bd40c32c6402..a529717cb763 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,2 +1,3 @@
 DIST apsw-3.38.5-r1.gh.tar.gz 338186 BLAKE2B 145e38d4057be498f85a655ad7a437ec19a895769f58505b4b99093be30e67498faf9572494009db8e20e6700fa5e514605af131d045a4e8bb41587b828f5a88 SHA512 58331ca2db993f87316a55075ee9c440d4bd6e985e8ca11079391bd9cc2a907271ffe5c21d66840e336cd9e6568f6134c8b8fa5d28bbc7c77a1dddd48e8b99b7
 DIST apsw-3.39.2.0.gh.tar.gz 345634 BLAKE2B 433455fdb0dbc6192bbb3ef47cc1d54faa310715b81312b999a84f90de61e5362e4af8d3a705816100381ae920283d84a50fb2e51308227eecf9de5b7166c4ac SHA512 4d3eb68d47cf8114e7823969277d0f42c4091632d4aeab61f66e91e99601b6a5286875515e860e27a2f736c943dad1657f5c47cbdd23a3d1479d3019bfd1c05b
+DIST apsw-3.39.2.1.gh.tar.gz 363389 BLAKE2B 001efa8904c724ec051ac18d80ce55ce646c12ea4a218536494fa0e5804781ccc6c66287575c21553c0a97f4a806a5c7ab671116667d0368c32f7e614fd32a2f SHA512 10f08320157be96ad409472b50480b1b1875ec88ccb00690851aaef5864aa2bfc8000fce10ef0f00b820cfd5cebad950f0e7bba432018524cb292a6738ff30e8
diff --git a/dev-python/apsw/apsw-3.39.2.1.ebuild b/dev-python/apsw/apsw-3.39.2.1.ebuild
new file mode 100644
index 000000000000..d5f332da9b81
--- /dev/null
+++ b/dev-python/apsw/apsw-3.39.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="
+	https://github.com/rogerbinns/apsw/
+	https://pypi.org/project/apsw/
+"
+SRC_URI="
+	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>=dev-db/sqlite-${PV%.*}:3
+"
+RDEPEND="
+	${DEPEND}
+"
+
+python_compile() {
+	# Needed for e.g. bug #851741
+	# Enable column-metadata to match dev-db/sqlite
+	distutils-r1_python_compile --enable=load_extension --enable=column_metadata
+}
+
+python_test() {
+	esetup.py build_test_extension
+	"${EPYTHON}" apsw/tests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild
index 3721af1efd5c..82b95710232c 100644
--- a/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~m68k ~riscv"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/metadata.xml b/dev-python/nbconvert/metadata.xml
index f779b78a9efd..9362b1952dd6 100644
--- a/dev-python/nbconvert/metadata.xml
+++ b/dev-python/nbconvert/metadata.xml
@@ -9,7 +9,9 @@
   <email>python@gentoo.org</email>
   <name>Python</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:jupyter:nbconvert</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild b/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild
index 10269e29a3ed..3e6529465fb3 100644
--- a/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~m68k ~riscv"
 
 distutils_enable_tests pytest
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index 6d55a1f5df45..22488df2e8cd 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1 +1,2 @@
 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
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..5249b2391615
--- /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_{7,8,9,10} )
+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/smbus2/smbus2-0.4.2.ebuild b/dev-python/smbus2/smbus2-0.4.2.ebuild
index 7da917092734..58577411561f 100644
--- a/dev-python/smbus2/smbus2-0.4.2.ebuild
+++ b/dev-python/smbus2/smbus2-0.4.2.ebuild
@@ -19,6 +19,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 distutils_enable_tests nose
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 739d4dbbdcfc..20044cedb3bd 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,2 +1 @@
-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
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 dfbea1f1084a..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_{7,8,9,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..80567234d77f
--- /dev/null
+++ b/dev-python/spyder-line-profiler/Manifest
@@ -0,0 +1 @@
+DIST spyder-line-profiler-0.3.1.gh.tar.gz 44042 BLAKE2B a98c5770b44b3e11d2261b371e5a806087ebcb347b54745b5bdfe5c4fe3051ff862c79e96ab9a0048e83217cba65fd48a6368bf3e1d1a3f9ab09d2dd69f8ec7c SHA512 96ddc1817adfd58362ea766b95cd58ad521c1333a6bafe9fef1e117ef7ef602bc7e7bced3990d19b85c2882253d81d27940ab409a9daacf588513a405ae4d8fb
diff --git a/dev-python/spyder-line-profiler/metadata.xml b/dev-python/spyder-line-profiler/metadata.xml
new file mode 100644
index 000000000000..f4c4fc90a218
--- /dev/null
+++ b/dev-python/spyder-line-profiler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
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..aa864b2fc175
--- /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_{7,8,9,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 22be279e4c0c..85e53b0801b3 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1 +1 @@
-DIST spyder-unittest-0.5.0.tar.gz 80022 BLAKE2B c904196f7b0288b4d4f105037cbf75fc7ef60669ba1a24687b4f6aa672b88b139b64282c2d12340c958a3ffb65b8cf01b61256f669e167a6c15eb9471430af2a SHA512 4bea5d88b6be80435e2fa6498803ceea275b72c47bd0a54bb3be962bfe00feed2073e4d4915ea1b4dd780cb1c104f6dcd2735ee000cdedb934ed9fac059d0ca5
+DIST spyder-unittest-0.5.1.gh.tar.gz 80022 BLAKE2B c904196f7b0288b4d4f105037cbf75fc7ef60669ba1a24687b4f6aa672b88b139b64282c2d12340c958a3ffb65b8cf01b61256f669e167a6c15eb9471430af2a SHA512 4bea5d88b6be80435e2fa6498803ceea275b72c47bd0a54bb3be962bfe00feed2073e4d4915ea1b4dd780cb1c104f6dcd2735ee000cdedb934ed9fac059d0ca5
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 49376e56352e..0079c7da0b29 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..483db2d30035
--- /dev/null
+++ b/dev-python/spyder-vim/Manifest
@@ -0,0 +1 @@
+DIST spyder-vim-0_pre20220831.gh.tar.gz 293646 BLAKE2B 19c7ed461f924c441da3454d510e5782b66139de41febd2cbb5968a0f00a63a0751e7206328d73287dc9c64cdc22d9e4a5936a312b7775d55e95b68c26d270d8 SHA512 a55f41dca60c6ab6046d13d8a1baa8b8f565542c4d02bfdd931ad1daaaedae372853baa65374f553a6e73d22c234e753375936cf4be18dc4f0d342507e479031
diff --git a/dev-python/spyder-vim/metadata.xml b/dev-python/spyder-vim/metadata.xml
new file mode 100644
index 000000000000..f4c4fc90a218
--- /dev/null
+++ b/dev-python/spyder-vim/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>andrewammerlaan@gentoo.org</email>
+  <name>Andrew Ammerlaan</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
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..8993f3342cc5
--- /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_{7,8,9,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 6758cec7f103..3b0cb80ad1a7 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,4 +1,2 @@
-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
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 259d6e93d23b..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_{7,8,9,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 bacdc4b6f569..6f2c3f9171f3 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 e64e0fbfbc18..3a37429b445d 100644
--- a/dev-python/tpm2-pytss/Manifest
+++ b/dev-python/tpm2-pytss/Manifest
@@ -1 +1 @@
-DIST tpm2-pytss-1.1.0.tar.gz 162559 BLAKE2B 2c9b34c323b96b3a8ded82a04accac9647d7f0b1cf05d269ed4bdf225d785fd8454dee82f054a5085f9d49d0feabacc8c5b72a7ee8af7bc9da8473d5689501b5 SHA512 71da9e005a3f645c0528a96bb96bafde9c262c5778646a19841af6323edaf889ede7267317ea96b7d44c7901d7bea04ca15fd1b5c86d61d33e49b34f5d0e2e94
+DIST tpm2-pytss-1.2.0.tar.gz 178555 BLAKE2B 782f7d8194d2a9395213f39e5a17414ae2ab49f961b01c496fd54803a43f6846434a1d69a3993d16b6b51c2578f6f5e1a0d883be791cf6fb29ae23012b2090cf SHA512 688223d05a2ed5f3a5aeec47c77a02c10d40d4f23a97622e76acbf8f86b14ac2a92482869c5e04de395edb96b1e1b142c5ff53c7dbc97673ead531e4d6138184
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 6b7654d22979..4cd88af34eaa 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