gentoo auto-resync : 20:05:2023 - 16:18:45

13 files changed, 78 insertions, 17 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1fb8859b29e9..e751d2c75a90 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 22086b06a912..3b67e34327e6 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,7 +1,8 @@
 AUX pipenv-2022.9.24-inject-site-packages.patch 1155 BLAKE2B 61f296dd1f8168b86f17a55359c75febfc02807dd97c750217b46bd017b7bf73cf6fde0fcd2afa95908bd3e1cd7b50f626459f1a19f47b1c34ecdbea39fcfb7c SHA512 3a26ce6217fbf86eda1bb8266928dffe5fc1a55e4f7b66d0ade5ea31deff9cb68427f424995e4c8d402737e90ca9358a3a00364a4167667fae9a4bd018100ebc
 AUX pipenv-2023.4.29-append-always-install.patch 696 BLAKE2B 61ae23b3c948358109a80b406eb83a835293b6a986a191dbb759c9ffcb7e1a22b0766d4eb1271e5d2dd849ee97747f998417c79024ef5b212e3c21ebcebc2412 SHA512 635a1cccf28b7869b06538eb668d8abc385465fa28bc708376fd7ba1dda621d12529c0843a6d545577456f46d7ec7ae5794df34b0d5b73a897b67c3fc71145a2
 AUX pipenv-2023.4.29-fix-imports.patch 946 BLAKE2B 76cc36b1a60cb600851198340f1b42bed7210f62d9aec536a8bd203e86a62a11659cccf5c328e2ebbc11c0b22f863a8c70f64932170ca2d1ac0bfee526797f0b SHA512 ff6221fe4a1876a0f4c0677243d06c9e79cd08b504b20b958ce98194f0d269bdf2bedd3558af69d03d0dd24749c73999172c83c89643d362c6e095e54f55d73d
-AUX pipenv-2023.4.29-fix-toml-in-vendor.patch 2277 BLAKE2B cfead77e428f6e72d8e10d0779861ccda6d305efee4b24c0b81be92760484ba1f528540fe724ae6bb82ac7e35386e0e9b17fa5d6971f02380b55c4187666c5b8 SHA512 79827dd35c0c1d96f70d5223d9e797a0a3191d2088110fa8b4eacd4f5bfe17077c06ee81504d41cef19bcca479dba7fd0858b08b138226eb1fd4a4a5b2842368
+AUX pipenv-2023.4.29-fix-toml-dump.patch 732 BLAKE2B 5e1a379ee851763344c642da4c3a9876e0cda4e4f1697becfec63564c404d1070c886df5b9df7e379447bb191e7ecae63fd743bde4a8de8a1ca655ac78a3a23f SHA512 8152e1650d0f2c75c810c0ab64bff9544cfabcd3ff9b342aeddbeeda27549f8a4ee4eacdb71e7ec18945a91443381b5cecc1c5ad8a885a1f162811cd8f09f396
+AUX pipenv-2023.4.29-fix-toml-in-vendor.patch 2612 BLAKE2B 8951dc3baefe0d58262d5d8c2f1952331322665f4961ced0dab5ac4109a33a4cd107646d5a9281a6b3685d6885f3f6b256fd675f9308b8c7844b065bcbde3522 SHA512 075fe3a8b69265ea41071407edec1edba945ef38123da970a6ba4553f5bd7491f8b13b07241f6ecd3e77dff1b6542f279943b0a760711c8cb0827837a7daa376
 DIST pipenv-2023.4.29.gh.tar.gz 10808706 BLAKE2B 31432b80f82b041969e75d0ec0a28ca90068395be25dac94a7f34526f0b638adfae59e9396b147fa61592ee78af2d9cfb4a1b65dedea9bbb299b2624a6d6e9a1 SHA512 870b33ced4ed909b23b9d345ec788f4b5fffde4b253755e8a41b0629e885ef49ca14e9a68b5919b70074829002603fe427e8b77f41028a7de33d269a910354ff
-EBUILD pipenv-2023.4.29.ebuild 4109 BLAKE2B 684d81482a5155b84c37762b3d8ec91f76b5e779d637c48a28c4cf2256f2c14d3a9a6b6636764f55c125abfd1ce6e883523f95e12c0c48d1458e533d5439a72a SHA512 617c7367adccb957628d1e053d32d389dc46e9ea460bbce344fdfcab1cc97352c24f2e0e8b3be5dc0b770104ad6369f70158be66e41566c3175c7f86e2686f4d
+EBUILD pipenv-2023.4.29.ebuild 4161 BLAKE2B a9b5486d69f30af06517b100771280a9562399257fd599c63787cdd235d9c4e2a1d8c113592d3e61fa972487e3896982b7fe6478c456649e3f48b125437bca92 SHA512 4687a9d3ad00d71db2259615ad4f37b3503b92a742094fdc663ff9b217e3bbf7e5faf05ffe9021a189f7a80b0924a6ebd2b7dcdd3daa633d6c77a2c463e8e3b7
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch
new file mode 100644
index 000000000000..8218d0f59e1c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch
@@ -0,0 +1,18 @@
+diff --git a/pipenv/project.py b/pipenv/project.py
+index 55251bc5f..9fd46f089 100644
+--- a/pipenv/project.py
++++ b/pipenv/project.py
+@@ -183,9 +183,9 @@ class Project:
+                 "name": "pypi",
+             }
+ 
+-        default_sources_toml = f"[[source]]\n{toml.dumps(self.default_source)}"
++        default_sources_toml = f"[[source]]\n{tomlkit.dumps(self.default_source)}"
+         for pip_conf_index in pip_conf_indexes:
+-            default_sources_toml += f"\n\n[[source]]\n{toml.dumps(pip_conf_index)}"
++            default_sources_toml += f"\n\n[[source]]\n{tomlkit.dumps(pip_conf_index)}"
+         plette.pipfiles.DEFAULT_SOURCE_TOML = default_sources_toml
+ 
+         # Hack to skip this during pipenv run, or -r.
+
+
diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
index cb0f3f70d48b..e23a42e46b59 100644
--- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
@@ -1,5 +1,5 @@
 diff --git a/pipenv/project.py b/pipenv/project.py
-index ed43cf2bc..903667639 100644
+index ed43cf2bc..55251bc5f 100644
 --- a/pipenv/project.py
 +++ b/pipenv/project.py
 @@ -13,6 +13,13 @@ import urllib.parse
@@ -16,6 +16,15 @@ index ed43cf2bc..903667639 100644
  from pipenv.cmdparse import Script
  from pipenv.environment import Environment
  from pipenv.environments import Setting, is_in_virtualenv, normalize_pipfile_path
+@@ -43,8 +50,6 @@ from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
+ from pipenv.vendor import plette
+ from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
+ 
+-import click, toml, tomlkit
+-
+ try:
+     # this is only in Python3.8 and later
+     from functools import cached_property
 diff --git a/pipenv/utils/toml.py b/pipenv/utils/toml.py
 index d4157d01c..27d9975ae 100644
 --- a/pipenv/utils/toml.py
diff --git a/dev-python/pipenv/pipenv-2023.4.29.ebuild b/dev-python/pipenv/pipenv-2023.4.29.ebuild
index 5fdc0ff53f40..123b4de71625 100644
--- a/dev-python/pipenv/pipenv-2023.4.29.ebuild
+++ b/dev-python/pipenv/pipenv-2023.4.29.ebuild
@@ -23,6 +23,7 @@ PATCHES=(
 	"${FILESDIR}/pipenv-2023.4.29-append-always-install.patch"
 	"${FILESDIR}/pipenv-2023.4.29-fix-imports.patch"
 	"${FILESDIR}/pipenv-2023.4.29-fix-toml-in-vendor.patch"
+	"${FILESDIR}/pipenv-2023.4.29-fix-toml-dump.patch"
 )
 
 RDEPEND="
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index 8b7d7f444030..16d11fff9723 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,3 +1,5 @@
+DIST sabctools-7.0.2.gh.tar.gz 8539819 BLAKE2B 38212656c745238f106fbc9334f6dccb02bb9e05153bc73a21a783a25a0c5a63cae2893a01fcceefe37e6f5f187fc6d762fcc632f1228410e951740c808e0e9e SHA512 05968a29afb7a041549bae9e9a4303160820da4cd10ea33ab4475fe48fd0b4cf46023c6254715161265f3e1bdf2b66ae7e62007789fbc288aa229d3a218a3df8
 DIST sabyenc-5.4.4.gh.tar.gz 19774441 BLAKE2B 945614697b59f984df1f159b64e177ee75d9b5c00cb59af21dddb92bf17f8647467b919be963a1beabfe64c4206aa6f3438b780a21e766722fad99afa38ea340 SHA512 a35a5f29b1f5586299fdfd87d4323fa8ab56f06a2f6ef3b0b95aa033a481beee886bf1834ed73e1ba65b74c5e86efc5f0307394f32803ef52a391ca4b0caedf9
 EBUILD sabyenc-5.4.4.ebuild 609 BLAKE2B 552945f82ab327464d8cce43b9729ca3ef24b87a26fe30feff4b4d58ea860cda782c5b871153b8bbc8d7e6c055a94edf165982a640cc9f73a0fea844df81d0b7 SHA512 2e50b0f10340d524bbd26e8d1418f61c45258925171dc6b024a54232b76bc8a7a35c804680ca5b781b8d5509f396f897f7a0cfdce7219e06f2b036c5d7c807fe
+EBUILD sabyenc-7.0.2.ebuild 703 BLAKE2B 97974d0d7a6c192f406fa08ec60a9145f1caace159472f9b966cc2390845b3567138093a2dcd488fb8f7998984631131782577250ed18641a026642e9ea60f13 SHA512 cdbff99550d0f222908bea73dad7468d2dbb9bdc87947fa5ec482d19fac8223de590bf4bb0c34692244d14327e739d3eb7009056bf3b9f32531564f14ca8d570
 MISC metadata.xml 524 BLAKE2B 6f50798327ad05e0f5301b0db45e23289ed7bcae8dfe923c2f7d8b025302397eec0c67cf051034a653017bedf3fc87fa369e32543b07b4dde33012d427eb5c9e SHA512 31c6225a2d530b33b0eb58292e27982e0bfeb4246b0ceda8e0b89c04e6a1b754c5afd3c383e36819d037520fe572c82503d6554ce68e1f74f7cc4171cdf0ce15
diff --git a/dev-python/sabyenc/sabyenc-7.0.2.ebuild b/dev-python/sabyenc/sabyenc-7.0.2.ebuild
new file mode 100644
index 000000000000..c3bea9d632b9
--- /dev/null
+++ b/dev-python/sabyenc/sabyenc-7.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+MY_PN="sabctools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
+HOMEPAGE="https://github.com/sabnzbd/sabctools"
+SRC_URI="
+	https://github.com/sabnzbd/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md doc/yenc-draft.1.3.txt )
+
+distutils_enable_tests pytest
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index d6e46246d265..63d7244e4528 100644
--- a/dev-python/sexpdata/Manifest
+++ b/dev-python/sexpdata/Manifest
@@ -1,3 +1,3 @@
 DIST sexpdata-1.0.0.gh.tar.gz 16540 BLAKE2B 6babe7b098d9e66bc9cbd6c8a8e91b8d9743ee93ca6745f626421ecab498fc70a02e16e5e3973b97b886feaf4042489f6903736c43f4264252122e1f190b9fc4 SHA512 1ef72d6441907ea3eae00b6d89344281930ac3ad82aee429fa45d2f876aef890019b0bae0241d1670d8f9842dd47a1be76d33dd510b38b09b904334a3924bb56
 EBUILD sexpdata-1.0.0.ebuild 519 BLAKE2B d76adb0a6947f4fa87edf02edeae30ab17e39bbe1b7f38f8688e5939e78ae13bcc617af62bcc0c12d8b37aa9a648e8bc7d724692b5228b390ee5b49c20981c83 SHA512 7ddcb2b50b0219259371ec46bc0f4c3d3552ba4e71b6163650072888ba31875f6169d22867d7990e8917f09650ae05fce1c6187f0062f60bfa3d0cc59e8a811e
-MISC metadata.xml 380 BLAKE2B 531e59f20c41d7f47f34245fa53682a5b00659e8ff591762c779e82c80ab1a6d37a9ec6c22a83a35b780cb362c18b0b909702184e8865152e9a475930fcc775f SHA512 65e354095ed1f50d31db59f03308e4a5a6cfee73c74dbca59a5b0ffdd1ce7434bcea308d31f23dc8d6ea1a04c09c50f25a872fd4a7b4b6f06646ff232648c93e
+MISC metadata.xml 346 BLAKE2B 22a88cd6bbabea2591308b86fe42c68007102a2e16efca2dbffaebcf93e24cbce4d0bd87d9283a65234498b2a0a09993bbeb403d2fbeeeff6c784af9ec543b25 SHA512 8e6c01367fa9c2bc76fbe51680278974c0290148da1a791eae8378978a400a27ca4bb3bb294a547f56c01c2563d5b6817ce3346500b4d404bde8985ed453f96a
diff --git a/dev-python/sexpdata/metadata.xml b/dev-python/sexpdata/metadata.xml
index 9039b87ed051..6f1b50d360fb 100644
--- a/dev-python/sexpdata/metadata.xml
+++ b/dev-python/sexpdata/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>layman@gentoo.org</email>
-		<name>Gentoo Layman team</name>
+		<email>python@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">jd-boyd/sexpdata</remote-id>
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 37043bd29cdd..3eac416fca8e 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,4 +1,4 @@
 DIST css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz 35758 BLAKE2B d834011c3ac774eb79b35e2e74f3854ddc2bb871531a32194041d6f98bde3dc68db67baea25d5463a03e057197144237be69fee4eacfb8edb73167e6e4faf7be SHA512 ef44eb1144a6484f308fabe4187310b2ef0067f328bf5213969d87c475fccae3d716dc66640a0a554ab2a3d7da0efb3a168a288ac6eef7722f3ae46959943b49
 DIST tinycss2-1.2.1.gh.tar.gz 28351 BLAKE2B 42e1ba559e015654184be94afb02866f32bb6cfbdb0006df29ce64f8715d25a8751acd8380db7ad06bd9f5fdcc694519d2bc3c916dfd09816ba44c18a1f1d750 SHA512 59964398418fd895c6b5bdbdac47edb0bd421aeb8b3939307cb9ff864f50071fc171a9d6bb9b9b0adbbb645beedea0e14720af0d824949236e54b2d1b189bc72
-EBUILD tinycss2-1.2.1.ebuild 1097 BLAKE2B d6477607432d7ab788c44076c347347e8e90788bb0a89e13b8d99db08e28a78e6f242ea728b38ddb735854459c65cac124e21d3e07df446f6c3671c024f64e27 SHA512 517e9d1f241dfbfb7f0cbbeba05e6d46d8b06403eb16ba394c918db691aee2bd9de2f60d65f2fd1edeb91cdcbc33166c5f80c8be432322dd805233253168a869
+EBUILD tinycss2-1.2.1.ebuild 1045 BLAKE2B a4b7d2096a59db4f81454e5aa905117ac1e97aa56a8eff3f9570f37cdfb937f4d55951aab4b59ce263a196af3997f2de86d0ec2735ad7abcb5122335f5b276d0 SHA512 cd87fb5bf3c18cdfac80e75e85aae8110602201029bfd474127032cebdaa9dba33c6a57c976d85172c3950406d098e1ace341f22a161499a34adee9e20c93ee6
 MISC metadata.xml 523 BLAKE2B 1590e6af6e994f20bd2087eb2ad0d9a05736f983a123cf5a7373d0f8e2608dbdd8886fe90fd62d978e0abcdcb9deef30a9cf9622302fc2d3d20a137ce1d4b563 SHA512 04c0ea9aa7b4d9317a262bda5486c1495a7978b44e6c87c1c67a44f7846807c2ba5dae6a55f32c21237adb8d25426746da0b0c63dba6668ea2e0f35223859a6c
diff --git a/dev-python/tinycss2/tinycss2-1.2.1.ebuild b/dev-python/tinycss2/tinycss2-1.2.1.ebuild
index 80a1b6dc8c6d..a8d0ec9a7b3e 100644
--- a/dev-python/tinycss2/tinycss2-1.2.1.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.2.1.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="
 	https://github.com/Kozea/tinycss2/
 	https://pypi.org/project/tinycss2/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="
 	https://github.com/Kozea/tinycss2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
 	test? (
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 811fea256991..21b5b2d56fef 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -6,6 +6,6 @@ AUX wxpython-4.2.0-no-attrdict.patch 363 BLAKE2B 2ab3735103574959e069ecd647dc003
 AUX wxpython-4.2.0-no-webkit.patch 1285 BLAKE2B 19fdee2293da214b8ae318b2670298b34b745cfefd3938be1f22c810cb1bc4273d628aa34cf427c1023d90739784d8e5c8d381e6084689876bdc336a86a3d0db SHA512 fbe6825f266443b9dec68786e26d6e3842d4dec3b9927420ecaca45a834798c8ef83a95398ea498db386e7d1c659a6a3779a5b62867296cc7244401b06db9586
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
 DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
-EBUILD wxpython-4.0.7-r4.ebuild 2370 BLAKE2B e8b76a2c2a0b2153c4663a4e514d0ee6c54bd5946e92dc436f854775e410031393b8f8506ae50567490b5b709eb5ada1ab3cf24c980f0a14f2d57b91e21c780c SHA512 f8e47b0de868d90b9a9fcb33c9fa22a96c8ad7d195b35917239ec840a685fdd9fc42f5a0259c644dec17886395bc433a125539ab7b09107f4f135a1b08042b95
+EBUILD wxpython-4.0.7-r4.ebuild 2384 BLAKE2B b6f725a9c16e5a0ff0b80f6ea404a274e4b814fe91beb106c1ce90aeddf10f9c948446ec3ed1891e367ee77edaedf25518b8dadaf74bc7da15516be65a6ea194 SHA512 a2ae7848592ef501ea7eff59cef4c79cf2adae6a922913598cc9cb66dfd9c3fb665495707b7fd102da1cae915e9ed633e0572decb5f659d2087f958a125db6ab
 EBUILD wxpython-4.2.0.ebuild 3876 BLAKE2B cb7ed755149dff3baa7d70ae5fa4c1321005c0a5821725356f0a9bf3e604bc7a7254c0496cbeca6de1317391829ab7c9c7755a7e9064d3d9f04eb8044703fc6d SHA512 879176e29a4a97c569416f862363660e085a18d878e008c2e7283d58e59bd2cca27deeb0a331790403e591a2e41dcc5febf0e0293efa35de59adef53737dbbb1
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/wxpython-4.0.7-r4.ebuild b/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
index 03f66f04f701..7b34ac3aec81 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r4.ebuild
@@ -2,19 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
-WX_GTK_VER="3.0-gtk3"
 
 DISTUTILS_IN_SOURCE_BUILD="1"
+PYTHON_COMPAT=( python3_{9..10} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="wxPython"
+WX_GTK_VER="3.0-gtk3"
 
-inherit distutils-r1 multiprocessing virtualx wxwidgets
-
-MY_PN="wxPython"
-MY_PV="${PV}.post2"
+inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
 
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
 HOMEPAGE="https://www.wxpython.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
+SRC_URI="$(pypi_sdist_url --no-normalize "${PYPI_PN}" "${PV}.post2")"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
@@ -45,7 +44,7 @@ BDEPEND="${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
+S="${WORKDIR}/${PYPI_PN}-${PV}.post2"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"