diff --git a/main/python3-alabaster/.checksums b/main/python3-alabaster/.checksums
index a19f5a429..916ccebed 100644
--- a/main/python3-alabaster/.checksums
+++ b/main/python3-alabaster/.checksums
@@ -1 +1 @@
-0b34444e429f5c21fd077cce1808cc7f  alabaster-0.7.12.tar.gz
+0b34444e429f5c21fd077cce1808cc7f  python3-alabaster-0.7.12.tar.gz
diff --git a/main/python3-alabaster/spkgbuild b/main/python3-alabaster/spkgbuild
index 7c962dbb2..7540dd921 100644
--- a/main/python3-alabaster/spkgbuild
+++ b/main/python3-alabaster/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-alabaster
 version=0.7.12
 release=1
-source="https://github.com/bitprophet/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/bitprophet/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-appdirs/.checksums b/main/python3-appdirs/.checksums
index a6cacf4d2..3a68c9506 100644
--- a/main/python3-appdirs/.checksums
+++ b/main/python3-appdirs/.checksums
@@ -1 +1 @@
-d6bca12613174185dd9abc8a29f4f012  appdirs-1.4.4.tar.gz
+d6bca12613174185dd9abc8a29f4f012  python3-appdirs-1.4.4.tar.gz
diff --git a/main/python3-appdirs/spkgbuild b/main/python3-appdirs/spkgbuild
index 47dad3836..790019419 100644
--- a/main/python3-appdirs/spkgbuild
+++ b/main/python3-appdirs/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-appdirs
 version=1.4.4
 release=1
-source="https://pypi.io/packages/source/a/appdirs/appdirs-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.io/packages/source/a/appdirs/appdirs-$version.tar.gz"
 
 build() {
 	cd appdirs-$version
diff --git a/main/python3-atspi/spkgbuild b/main/python3-atspi/spkgbuild
index 7f628be5f..1403075ec 100755
--- a/main/python3-atspi/spkgbuild
+++ b/main/python3-atspi/spkgbuild
@@ -7,7 +7,7 @@ _n=${_name%${_name#?}}
 version=2.38.2
 release=1
 #source="https://ftp.gnome.org/pub/gnome/sources/pyatspi/$_n/pyatspi-$version.tar.xz"
-source="https://download-fallback.gnome.org/sources/pyatspi/${version%.*}/pyatspi-$version.tar.xz"
+source="$name-$version.tar.gz::https://download-fallback.gnome.org/sources/pyatspi/${version%.*}/pyatspi-$version.tar.xz"
 
 build() {
 	cd pyatspi-$version
diff --git a/main/python3-attrs/.checksums b/main/python3-attrs/.checksums
index 8bb8635f8..7866b8ce3 100644
--- a/main/python3-attrs/.checksums
+++ b/main/python3-attrs/.checksums
@@ -1 +1 @@
-0487081b7ead8753fc46cf7c6d1e28e3  attrs-22.1.0.tar.gz
+0487081b7ead8753fc46cf7c6d1e28e3  python3-attrs-22.1.0.tar.gz
diff --git a/main/python3-attrs/spkgbuild b/main/python3-attrs/spkgbuild
index b1337e34e..d1a078f1f 100644
--- a/main/python3-attrs/spkgbuild
+++ b/main/python3-attrs/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-attrs
 version=22.1.0
 release=1
-source="https://pypi.io/packages/source/a/attrs/attrs-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.io/packages/source/a/attrs/attrs-$version.tar.gz"
 
 build() {
 	cd attrs-$version
diff --git a/main/python3-build/.checksums b/main/python3-build/.checksums
index 2802bdb48..2ec272611 100644
--- a/main/python3-build/.checksums
+++ b/main/python3-build/.checksums
@@ -1 +1 @@
-f2dc1823b0eff7037e19be18e354b2f1  build-0.9.0.tar.gz
+f2dc1823b0eff7037e19be18e354b2f1  hpython3-build-0.9.0.tar.gz
diff --git a/main/python3-build/spkgbuild b/main/python3-build/spkgbuild
index 81b0a53ca..5138b5a29 100644
--- a/main/python3-build/spkgbuild
+++ b/main/python3-build/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-build
 version=0.9.0
 release=1
-source="https://pypi.python.org/packages/source/b/build/build-$version.tar.gz"
+source="h$name-$version.tar.gz::https://pypi.python.org/packages/source/b/build/build-$version.tar.gz"
 
 build() {
   cd build-$version
diff --git a/main/python3-cairo/.checksums b/main/python3-cairo/.checksums
index ad08c48be..ca8711cb3 100644
--- a/main/python3-cairo/.checksums
+++ b/main/python3-cairo/.checksums
@@ -1 +1 @@
-19b0d49b04b5bc179d3df2498836f26d  pycairo-1.22.0.tar.gz
+19b0d49b04b5bc179d3df2498836f26d  python3-cairo-1.22.0.tar.gz
diff --git a/main/python3-cairo/spkgbuild b/main/python3-cairo/spkgbuild
index 348b05ed2..e620771b5 100755
--- a/main/python3-cairo/spkgbuild
+++ b/main/python3-cairo/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-cairo
 version=1.22.0
 release=1
-source="https://github.com/pygobject/pycairo/releases/download/v$version/pycairo-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/pygobject/pycairo/releases/download/v$version/pycairo-$version.tar.gz"
 
 build() {
 	cd pycairo-$version
diff --git a/main/python3-cffi/.checksums b/main/python3-cffi/.checksums
index 06f35d958..9cb6c40a7 100644
--- a/main/python3-cffi/.checksums
+++ b/main/python3-cffi/.checksums
@@ -1 +1 @@
-f493860a6e98cd0c4178149568a6b4f6  cffi-1.15.1.tar.gz
+f493860a6e98cd0c4178149568a6b4f6  python3-cffi-1.15.1.tar.gz
diff --git a/main/python3-cffi/spkgbuild b/main/python3-cffi/spkgbuild
index 0c2317502..c95c14f62 100644
--- a/main/python3-cffi/spkgbuild
+++ b/main/python3-cffi/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-cffi
 version=1.15.1
 release=1
-source="https://files.pythonhosted.org/packages/source/c/${name#*-}/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/c/${name#*-}/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-chardet/.checksums b/main/python3-chardet/.checksums
index 2fb0378d0..d801abe8b 100644
--- a/main/python3-chardet/.checksums
+++ b/main/python3-chardet/.checksums
@@ -1 +1 @@
-8013c248c098e165ac53d900e1a1278a  chardet-5.0.0.tar.gz
+8013c248c098e165ac53d900e1a1278a  python3-chardet-5.0.0.tar.gz
diff --git a/main/python3-chardet/spkgbuild b/main/python3-chardet/spkgbuild
index 2a0c64b16..ea5e1baf7 100644
--- a/main/python3-chardet/spkgbuild
+++ b/main/python3-chardet/spkgbuild
@@ -6,7 +6,7 @@ _name=${name#*-}
 _n=${_name%${_name#?}}
 version=5.0.0
 release=1
-source="https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-dbus/.checksums b/main/python3-dbus/.checksums
index a7207819c..e2837798f 100644
--- a/main/python3-dbus/.checksums
+++ b/main/python3-dbus/.checksums
@@ -1 +1 @@
-33be8a4a766e1c7c9a377b8f934ce21a  dbus-python-1.3.2.tar.gz
+33be8a4a766e1c7c9a377b8f934ce21a  python3-dbus-1.3.2.tar.gz
diff --git a/main/python3-dbus/spkgbuild b/main/python3-dbus/spkgbuild
index 2e154dc13..c4477b520 100755
--- a/main/python3-dbus/spkgbuild
+++ b/main/python3-dbus/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-dbus
 version=1.3.2
 release=1
-source="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-$version.tar.gz"
+source="$name-$version.tar.gz::http://dbus.freedesktop.org/releases/dbus-python/dbus-python-$version.tar.gz"
 
 build() {
 	cd dbus-python-$version
diff --git a/main/python3-distro/.checksums b/main/python3-distro/.checksums
index 796a69b13..52bbdf43f 100644
--- a/main/python3-distro/.checksums
+++ b/main/python3-distro/.checksums
@@ -1 +1 @@
-6b97136f88a0549a98dfc46dc0b99281  python-distro-1.8.0.tar.gz
+6b97136f88a0549a98dfc46dc0b99281  python3-distro-1.8.0.tar.gz
diff --git a/main/python3-distro/spkgbuild b/main/python3-distro/spkgbuild
index 92ce5a7d3..575bbbf64 100644
--- a/main/python3-distro/spkgbuild
+++ b/main/python3-distro/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-distro
 version=1.8.0
 release=1
-source="https://github.com/nir0s/distro/archive/v${version}/python-distro-${version}.tar.gz"
+source="$name-$version.tar.gz::https://github.com/nir0s/distro/archive/v${version}/python-distro-${version}.tar.gz"
 
 build() {
 	cd distro-$version
diff --git a/main/python3-distutils-extra/.checksums b/main/python3-distutils-extra/.checksums
index 43727f0e8..3d81406f8 100644
--- a/main/python3-distutils-extra/.checksums
+++ b/main/python3-distutils-extra/.checksums
@@ -1 +1 @@
-16e06db0ef73a35b4bff4b9eed5699b5  python-distutils-extra-2.39.tar.gz
+16e06db0ef73a35b4bff4b9eed5699b5  python3-distutils-extra-2.39.tar.gz
diff --git a/main/python3-distutils-extra/spkgbuild b/main/python3-distutils-extra/spkgbuild
index bc0768956..e3538334f 100644
--- a/main/python3-distutils-extra/spkgbuild
+++ b/main/python3-distutils-extra/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-distutils-extra
 version=2.39
 release=1
-source="http://launchpad.net/python-distutils-extra/trunk/$version/+download/python-distutils-extra-$version.tar.gz"
+source="$name-$version.tar.gz::http://launchpad.net/python-distutils-extra/trunk/$version/+download/python-distutils-extra-$version.tar.gz"
 
 build() {
 	cd python-distutils-extra-$version
diff --git a/main/python3-docopt/.checksums b/main/python3-docopt/.checksums
index 06126b89b..33266b33f 100644
--- a/main/python3-docopt/.checksums
+++ b/main/python3-docopt/.checksums
@@ -1 +1 @@
-4bc74561b37fad5d3e7d037f82a4c3b1  docopt-0.6.2.tar.gz
+4bc74561b37fad5d3e7d037f82a4c3b1  python3-docopt-0.6.2.tar.gz
diff --git a/main/python3-docopt/spkgbuild b/main/python3-docopt/spkgbuild
index def798c4a..1e69965c2 100644
--- a/main/python3-docopt/spkgbuild
+++ b/main/python3-docopt/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-docopt
 version=0.6.2
 release=1
-source="https://files.pythonhosted.org/packages/a2/55/8f8cab2afd404cf578136ef2cc5dfb50baa1761b68c9da1fb1e4eed343c9/docopt-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/a2/55/8f8cab2afd404cf578136ef2cc5dfb50baa1761b68c9da1fb1e4eed343c9/docopt-$version.tar.gz"
 
 build() {
 	cd docopt-$version
diff --git a/main/python3-docutils/.checksums b/main/python3-docutils/.checksums
index e9f0bf2ae..c8fd30088 100644
--- a/main/python3-docutils/.checksums
+++ b/main/python3-docutils/.checksums
@@ -1 +1 @@
-0afa992a6e93db892107c3f087d0d9df  docutils-0.19.tar.gz
+0afa992a6e93db892107c3f087d0d9df  python3-docutils-0.19.tar.gz
diff --git a/main/python3-docutils/spkgbuild b/main/python3-docutils/spkgbuild
index c70f0fa31..59abdee70 100644
--- a/main/python3-docutils/spkgbuild
+++ b/main/python3-docutils/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-docutils
 version=0.19
 release=1
-source="https://files.pythonhosted.org/packages/source/d/docutils/docutils-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/d/docutils/docutils-$version.tar.gz"
 
 build() {
 	cd docutils-$version
diff --git a/main/python3-evdev/.checksums b/main/python3-evdev/.checksums
index 67a3916a7..1f8f574c4 100644
--- a/main/python3-evdev/.checksums
+++ b/main/python3-evdev/.checksums
@@ -1 +1 @@
-d370ad8dc228c0c2cc5a33894a6f310b  python3-evdev.zip
+d370ad8dc228c0c2cc5a33894a6f310b  python3-evdev-1.6.0.zip
diff --git a/main/python3-evdev/spkgbuild b/main/python3-evdev/spkgbuild
index 1d9e1b255..674508282 100644
--- a/main/python3-evdev/spkgbuild
+++ b/main/python3-evdev/spkgbuild
@@ -5,7 +5,7 @@ name=python3-evdev
 version=1.6.0
 release=1
 _commit=5adc2abf1ec8a02c05c80cb1b3e34ba1d4237803  # tags/v1.4.0^0
-source="$name.zip::https://github.com/gvalkov/python-evdev/archive/$_commit.zip"
+source="$name-$version.zip::https://github.com/gvalkov/python-evdev/archive/$_commit.zip"
 
 build() {
   cd python-evdev-$_commit
diff --git a/main/python3-flit-core/.checksums b/main/python3-flit-core/.checksums
index bf99542a8..e6e829653 100644
--- a/main/python3-flit-core/.checksums
+++ b/main/python3-flit-core/.checksums
@@ -1 +1 @@
-85cc010ddfa15094e910c99666c29775  flit-3.8.0.tar.gz
+85cc010ddfa15094e910c99666c29775  python3-flit-core-3.8.0.tar.gz
diff --git a/main/python3-flit-core/spkgbuild b/main/python3-flit-core/spkgbuild
index 5beabff14..07d9c96af 100644
--- a/main/python3-flit-core/spkgbuild
+++ b/main/python3-flit-core/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-flit-core
 version=3.8.0
 release=1
-source="https://github.com/takluyver/flit/archive/$version/flit-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/takluyver/flit/archive/$version/flit-$version.tar.gz"
 
 build() {
   rm flit-$version/tests/test_sdist.py
diff --git a/main/python3-gobject3/.checksums b/main/python3-gobject3/.checksums
index 8b47e692d..b276361a2 100644
--- a/main/python3-gobject3/.checksums
+++ b/main/python3-gobject3/.checksums
@@ -1 +1 @@
-c5b31bb58156661c0954f1dbfc950fc9  pygobject-3.42.2.tar.xz
+c5b31bb58156661c0954f1dbfc950fc9  python3-gobject3-3.42.2.tar.gz
diff --git a/main/python3-gobject3/spkgbuild b/main/python3-gobject3/spkgbuild
index 89b9cc051..697c2e4a0 100755
--- a/main/python3-gobject3/spkgbuild
+++ b/main/python3-gobject3/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-gobject3
 version=3.42.2
 release=1
-source="https://ftp.gnome.org/pub/gnome/sources/pygobject/${version%.*}/pygobject-$version.tar.xz"
+source="$name-$version.tar.gz::https://ftp.gnome.org/pub/gnome/sources/pygobject/${version%.*}/pygobject-$version.tar.xz"
 
 build() {
 
diff --git a/main/python3-greenlet/.checksums b/main/python3-greenlet/.checksums
index dece742b4..b9fe01cac 100644
--- a/main/python3-greenlet/.checksums
+++ b/main/python3-greenlet/.checksums
@@ -1 +1 @@
-8d0f10b807144a86b54841cfab2620a9  greenlet-2.0.1.tar.gz
+8d0f10b807144a86b54841cfab2620a9  python3-greenlet-2.0.1.tar.gz
diff --git a/main/python3-greenlet/spkgbuild b/main/python3-greenlet/spkgbuild
index 7b749f8d5..7e0a23731 100644
--- a/main/python3-greenlet/spkgbuild
+++ b/main/python3-greenlet/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-greenlet
 version=2.0.1
 release=1
-source="https://files.pythonhosted.org/packages/source/g/greenlet/greenlet-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/g/greenlet/greenlet-$version.tar.gz"
 
 build() {
 	cd greenlet-$version
diff --git a/main/python3-html5lib/.checksums b/main/python3-html5lib/.checksums
index 87c7ad5cf..b28ea1438 100644
--- a/main/python3-html5lib/.checksums
+++ b/main/python3-html5lib/.checksums
@@ -1 +1 @@
-b8baa02ebda99413697041aab7bf198b  html5lib-python-1.1.tar.gz
+b8baa02ebda99413697041aab7bf198b  python3-html5lib-1.1.tar.gz
diff --git a/main/python3-html5lib/spkgbuild b/main/python3-html5lib/spkgbuild
index 3de251269..f142df6ff 100644
--- a/main/python3-html5lib/spkgbuild
+++ b/main/python3-html5lib/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-html5lib
 version=1.1
 release=2
-source="https://github.com/html5lib/html5lib-python/archive/$version/html5lib-python-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/html5lib/html5lib-python/archive/$version/html5lib-python-$version.tar.gz"
 
 build() {
 	cd html5lib-python-$version
diff --git a/main/python3-idna/.checksums b/main/python3-idna/.checksums
index 52ead0bb0..0f936b5cf 100644
--- a/main/python3-idna/.checksums
+++ b/main/python3-idna/.checksums
@@ -1 +1 @@
-13ea24e076212b6baae1135a116d1e0e  idna-3.4.tar.gz
+13ea24e076212b6baae1135a116d1e0e  python3-idna-3.4.tar.gz
diff --git a/main/python3-idna/spkgbuild b/main/python3-idna/spkgbuild
index 14482eabc..840fd7b45 100644
--- a/main/python3-idna/spkgbuild
+++ b/main/python3-idna/spkgbuild
@@ -6,7 +6,7 @@ _name=${name#*-}
 _n=${_name%${_name#?}}
 version=3.4
 release=1
-source="https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-imagesize/.checksums b/main/python3-imagesize/.checksums
index a4250742d..d9397941e 100644
--- a/main/python3-imagesize/.checksums
+++ b/main/python3-imagesize/.checksums
@@ -1 +1 @@
-5a40586a25c07e1a8f16f6267252c321  imagesize-1.4.1.tar.gz
+5a40586a25c07e1a8f16f6267252c321  python3-imagesize-1.4.1.tar.gz
diff --git a/main/python3-imagesize/spkgbuild b/main/python3-imagesize/spkgbuild
index 3341e63be..d07d050f8 100644
--- a/main/python3-imagesize/spkgbuild
+++ b/main/python3-imagesize/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-imagesize
 version=1.4.1
 release=1
-source="https://files.pythonhosted.org/packages/source/i/imagesize/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/i/imagesize/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-installer/.checksums b/main/python3-installer/.checksums
index 4f6a8fc2d..082b38e8c 100644
--- a/main/python3-installer/.checksums
+++ b/main/python3-installer/.checksums
@@ -1 +1 @@
-bf17db5e6b58c4cfa33642f5348d3814  installer-0.5.1.tar.gz
+bf17db5e6b58c4cfa33642f5348d3814  python3-installer-0.5.1.tar.gz
diff --git a/main/python3-installer/spkgbuild b/main/python3-installer/spkgbuild
index 3315c2664..a158d84b4 100644
--- a/main/python3-installer/spkgbuild
+++ b/main/python3-installer/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-installer
 version=0.5.1
 release=1
-source="https://pypi.org/packages/source/i/installer/installer-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.org/packages/source/i/installer/installer-$version.tar.gz"
 
 build() {
   cd installer-$version
diff --git a/main/python3-iso-639/.checksums b/main/python3-iso-639/.checksums
index b13e58b01..ae9bd16f2 100644
--- a/main/python3-iso-639/.checksums
+++ b/main/python3-iso-639/.checksums
@@ -1 +1 @@
-cc282daf57f57061a9309f2567bff052  iso-639-0.4.5.tar.gz
+cc282daf57f57061a9309f2567bff052  python3-iso-639-0.4.5.tar.gz
diff --git a/main/python3-iso-639/spkgbuild b/main/python3-iso-639/spkgbuild
index 1a12d9ea8..a53f9a849 100644
--- a/main/python3-iso-639/spkgbuild
+++ b/main/python3-iso-639/spkgbuild
@@ -6,7 +6,7 @@ _name=${name#*-}
 _n=${_name%${_name#?}}
 version=0.4.5
 release=1
-source="https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-iso3166/.checksums b/main/python3-iso3166/.checksums
index beb9b3a28..fa850caed 100644
--- a/main/python3-iso3166/.checksums
+++ b/main/python3-iso3166/.checksums
@@ -1 +1 @@
-b1661b2e68fea5a248d02ef00e59c369  iso3166-2.1.1.tar.gz
+b1661b2e68fea5a248d02ef00e59c369  python3-iso3166-2.1.1.tar.gz
diff --git a/main/python3-iso3166/spkgbuild b/main/python3-iso3166/spkgbuild
index dabf19760..52316d2da 100644
--- a/main/python3-iso3166/spkgbuild
+++ b/main/python3-iso3166/spkgbuild
@@ -6,7 +6,7 @@ _name=${name#*-}
 _n=${_name%${_name#?}}
 version=2.1.1
 release=1
-source="https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-isodate/.checksums b/main/python3-isodate/.checksums
index e8304f90c..037db340e 100644
--- a/main/python3-isodate/.checksums
+++ b/main/python3-isodate/.checksums
@@ -1 +1 @@
-1a310658b30a48641bafb5652ad91c40  isodate-0.6.1.tar.gz
+1a310658b30a48641bafb5652ad91c40  python3-isodate-0.6.1.tar.gz
diff --git a/main/python3-isodate/spkgbuild b/main/python3-isodate/spkgbuild
index 5fdcf87a0..d1f092e0c 100644
--- a/main/python3-isodate/spkgbuild
+++ b/main/python3-isodate/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-isodate
 version=0.6.1
 release=1
-source="https://files.pythonhosted.org/packages/source/i/isodate/isodate-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/i/isodate/isodate-$version.tar.gz"
 
 build() {
 	cd isodate-$version
diff --git a/main/python3-jinja2/.checksums b/main/python3-jinja2/.checksums
index a2cf65a5f..62d4bb323 100644
--- a/main/python3-jinja2/.checksums
+++ b/main/python3-jinja2/.checksums
@@ -1 +1 @@
-d31148abd89c1df1cdb077a55db27d02  Jinja2-3.1.2.tar.gz
+d31148abd89c1df1cdb077a55db27d02  python3-jinja2-3.1.2.tar.gz
diff --git a/main/python3-jinja2/spkgbuild b/main/python3-jinja2/spkgbuild
index 6bac8a57e..bd0e69a71 100644
--- a/main/python3-jinja2/spkgbuild
+++ b/main/python3-jinja2/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-jinja2
 version=3.1.2
 release=1
-source="https://pypi.org/packages/source/J/Jinja2/Jinja2-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.org/packages/source/J/Jinja2/Jinja2-$version.tar.gz"
 
 build() {
 	cd Jinja2-$version
diff --git a/main/python3-libxml2/.checksums b/main/python3-libxml2/.checksums
index 646b764e8..458dd72f3 100644
--- a/main/python3-libxml2/.checksums
+++ b/main/python3-libxml2/.checksums
@@ -1 +1 @@
-f9edac7fac232b3657a003fd9a5bbe42  libxml2-2.10.3.tar.xz
+f9edac7fac232b3657a003fd9a5bbe42  python3-libxml2-2.10.3.tar.gz
diff --git a/main/python3-libxml2/spkgbuild b/main/python3-libxml2/spkgbuild
index 24bfd46b2..f19f758c4 100644
--- a/main/python3-libxml2/spkgbuild
+++ b/main/python3-libxml2/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-libxml2
 version=2.10.3
 release=2
-source="https://download.gnome.org/sources/libxml2/2.10/libxml2-$version.tar.xz"
+source="$name-$version.tar.gz::https://download.gnome.org/sources/libxml2/2.10/libxml2-$version.tar.xz"
 
 build() {
 	cd libxml2-$version
diff --git a/main/python3-lxml/.checksums b/main/python3-lxml/.checksums
index 0706fd17c..4fb10a053 100644
--- a/main/python3-lxml/.checksums
+++ b/main/python3-lxml/.checksums
@@ -1 +1 @@
-e27240a7319d80d0c1e5390ca31eb1d8  lxml-4.9.1.tar.gz
+e27240a7319d80d0c1e5390ca31eb1d8  python3-lxml-4.9.1.tar.gz
diff --git a/main/python3-lxml/spkgbuild b/main/python3-lxml/spkgbuild
index b0f0605f9..f2b1cae0a 100644
--- a/main/python3-lxml/spkgbuild
+++ b/main/python3-lxml/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-lxml
 version=4.9.1
 release=1
-source="https://files.pythonhosted.org/packages/source/l/lxml/lxml-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/l/lxml/lxml-$version.tar.gz"
 
 build() {
 	cd lxml-$version
diff --git a/main/python3-msgpack/.checksums b/main/python3-msgpack/.checksums
index 97a00e7ba..54fe21ce3 100644
--- a/main/python3-msgpack/.checksums
+++ b/main/python3-msgpack/.checksums
@@ -1 +1 @@
-1822cdb939e7531f7ad0f7f09b434f22  msgpack-1.0.4.tar.gz
+1822cdb939e7531f7ad0f7f09b434f22  python3-msgpack-1.0.4.tar.gz
diff --git a/main/python3-msgpack/spkgbuild b/main/python3-msgpack/spkgbuild
index 0b04aa454..85a96d123 100644
--- a/main/python3-msgpack/spkgbuild
+++ b/main/python3-msgpack/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-msgpack
 version=1.0.4
 release=1
-source="https://files.pythonhosted.org/packages/source/m/msgpack/msgpack-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/m/msgpack/msgpack-$version.tar.gz"
 
 build() {
 	cd msgpack-$version
diff --git a/main/python3-packaging/.checksums b/main/python3-packaging/.checksums
index 26042e457..dc39d5652 100644
--- a/main/python3-packaging/.checksums
+++ b/main/python3-packaging/.checksums
@@ -1 +1 @@
-e713c1939f294fd729af4a7be40dd141  packaging-21.3.tar.gz
+e713c1939f294fd729af4a7be40dd141  python3-packaging-21.3.tar.gz
diff --git a/main/python3-packaging/spkgbuild b/main/python3-packaging/spkgbuild
index 911d7812c..d0ebd84af 100644
--- a/main/python3-packaging/spkgbuild
+++ b/main/python3-packaging/spkgbuild
@@ -6,7 +6,7 @@ _name=${name#*-}
 _n=${_name%${_name#?}}
 version=21.3
 release=1
-source="https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-pafy/.checksums b/main/python3-pafy/.checksums
index e89c9778d..fb1a5edbb 100644
--- a/main/python3-pafy/.checksums
+++ b/main/python3-pafy/.checksums
@@ -1 +1 @@
-5ba84e1911ef95a5dc30a88da31567b4  pafy-0.5.5.tar.gz
+5ba84e1911ef95a5dc30a88da31567b4  python3-pafy-0.5.5.tar.gz
diff --git a/main/python3-pafy/spkgbuild b/main/python3-pafy/spkgbuild
index d12cc8f4b..6a3c268c9 100644
--- a/main/python3-pafy/spkgbuild
+++ b/main/python3-pafy/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-pafy
 version=0.5.5
 release=1
-source="https://github.com/mps-youtube/pafy/archive/v$version/pafy-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/mps-youtube/pafy/archive/v$version/pafy-$version.tar.gz"
 
 build() {
 	cd pafy-$version
diff --git a/main/python3-pep517/.checksums b/main/python3-pep517/.checksums
index ede5c8610..845c9d226 100644
--- a/main/python3-pep517/.checksums
+++ b/main/python3-pep517/.checksums
@@ -1 +1 @@
-7fd08b11215256601a8a4940c1ba3d34  pep517-0.13.0.tar.gz
+7fd08b11215256601a8a4940c1ba3d34  python3-pep517-0.13.0.tar.gz
diff --git a/main/python3-pep517/spkgbuild b/main/python3-pep517/spkgbuild
index aa8970b17..21334b26c 100644
--- a/main/python3-pep517/spkgbuild
+++ b/main/python3-pep517/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-pep517
 version=0.13.0
 release=1
-source="https://pypi.python.org/packages/source/p/pep517/pep517-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.python.org/packages/source/p/pep517/pep517-$version.tar.gz"
 
 build() {
   cd pep517-$version
diff --git a/main/python3-pillow/.checksums b/main/python3-pillow/.checksums
index d0c8e040e..7c04da262 100644
--- a/main/python3-pillow/.checksums
+++ b/main/python3-pillow/.checksums
@@ -1 +1 @@
-a6507c1e811a51071d2d6de83070e703  python3-pillow-.tar.gz
+a6507c1e811a51071d2d6de83070e703  python3-pillow-9.3.0.tar.gz
diff --git a/main/python3-pillow/spkgbuild b/main/python3-pillow/spkgbuild
index b34ea6692..b6e93a287 100644
--- a/main/python3-pillow/spkgbuild
+++ b/main/python3-pillow/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-pillow
 version=9.3.0
 release=1
-source="$name-$source.tar.gz::https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-$version.tar.gz"
 
 build() {
 	cd Pillow-$version
diff --git a/main/python3-pip/.checksums b/main/python3-pip/.checksums
index cbaf45f8a..eaaad9b5b 100644
--- a/main/python3-pip/.checksums
+++ b/main/python3-pip/.checksums
@@ -1 +1 @@
-996f58a94fe0b8b82b6795c42bd171ba  pip-22.3.1.tar.gz
+996f58a94fe0b8b82b6795c42bd171ba  python3-pip-22.3.1.tar.gz
diff --git a/main/python3-pip/spkgbuild b/main/python3-pip/spkgbuild
index aa32b840a..034913b3a 100644
--- a/main/python3-pip/spkgbuild
+++ b/main/python3-pip/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-pip
 version=22.3.1
 release=1
-source="https://pypi.io/packages/source/p/pip/pip-${version}.tar.gz"
+source="$name-$version.tar.gz::https://pypi.io/packages/source/p/pip/pip-${version}.tar.gz"
 
 build() {
 	cd pip-$version
diff --git a/main/python3-ply/.checksums b/main/python3-ply/.checksums
index 0adbc9a3f..53cbb6677 100644
--- a/main/python3-ply/.checksums
+++ b/main/python3-ply/.checksums
@@ -1 +1 @@
-6465f602e656455affcd7c5734c638f8  ply-3.11.tar.gz
+6465f602e656455affcd7c5734c638f8  python3-ply-3.11.tar.gz
diff --git a/main/python3-ply/spkgbuild b/main/python3-ply/spkgbuild
index 4d6ce0888..57a9ec673 100644
--- a/main/python3-ply/spkgbuild
+++ b/main/python3-ply/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-ply
 version=3.11
 release=1
-source="https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da/ply-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da/ply-$version.tar.gz"
 
 build () {
 	cd ${name##python3-}-$version
diff --git a/main/python3-pycparser/.checksums b/main/python3-pycparser/.checksums
index 1d7ac233e..851f0ca93 100644
--- a/main/python3-pycparser/.checksums
+++ b/main/python3-pycparser/.checksums
@@ -1 +1 @@
-cf4b60f0beca2a25bb599e9e858a8223  release_v2.21.tar.gz
+cf4b60f0beca2a25bb599e9e858a8223  python3-pycparser-2.21.tar.gz
diff --git a/main/python3-pycparser/spkgbuild b/main/python3-pycparser/spkgbuild
index 594746c16..26489de76 100644
--- a/main/python3-pycparser/spkgbuild
+++ b/main/python3-pycparser/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-pycparser
 version=2.21
 release=1
-source="https://github.com/eliben/${name#*-*}/archive/release_v$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/eliben/${name#*-*}/archive/release_v$version.tar.gz"
 
 build() {	
 	cd ${name#*-}-release_v$version
diff --git a/main/python3-pycryptodome/.checksums b/main/python3-pycryptodome/.checksums
index a01ce99b9..42ed87e29 100644
--- a/main/python3-pycryptodome/.checksums
+++ b/main/python3-pycryptodome/.checksums
@@ -1 +1 @@
-5d81ee8d6f1a8aa52e5ad218386775d6  pycryptodome-3.15.0.tar.gz
+5d81ee8d6f1a8aa52e5ad218386775d6  python3-pycryptodome-3.15.0.tar.gz
diff --git a/main/python3-pycryptodome/spkgbuild b/main/python3-pycryptodome/spkgbuild
index 924ea2e80..822c019b8 100644
--- a/main/python3-pycryptodome/spkgbuild
+++ b/main/python3-pycryptodome/spkgbuild
@@ -6,7 +6,7 @@ _name=${name#*-}
 _n=${_name%${_name#?}}
 version=3.15.0
 release=1
-source="https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-pyparsing/.checksums b/main/python3-pyparsing/.checksums
index 54b340eef..7841707dd 100644
--- a/main/python3-pyparsing/.checksums
+++ b/main/python3-pyparsing/.checksums
@@ -1 +1 @@
-fadc2f3bf5872bf6310576a86c3566e0  pyparsing-3.0.9.tar.gz
+fadc2f3bf5872bf6310576a86c3566e0  python3-pyparsing-3.0.9.tar.gz
diff --git a/main/python3-pyparsing/spkgbuild b/main/python3-pyparsing/spkgbuild
index 2fba3c4a5..0b02c2b2e 100644
--- a/main/python3-pyparsing/spkgbuild
+++ b/main/python3-pyparsing/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-pyparsing
 version=3.0.9
 release=1
-source="https://files.pythonhosted.org/packages/source/p/${name#*-}/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/p/${name#*-}/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-pyproject2setuppy/.checksums b/main/python3-pyproject2setuppy/.checksums
index 7e2aff5cf..e11472a71 100644
--- a/main/python3-pyproject2setuppy/.checksums
+++ b/main/python3-pyproject2setuppy/.checksums
@@ -1 +1 @@
-4a13bf7bc5be0d6f8b01856059e284cc  pyproject2setuppy-22.tar.gz
+4a13bf7bc5be0d6f8b01856059e284cc  python3-pyproject2setuppy-22.tar.gz
diff --git a/main/python3-pyproject2setuppy/spkgbuild b/main/python3-pyproject2setuppy/spkgbuild
index 82c3e185c..fffc7d97b 100644
--- a/main/python3-pyproject2setuppy/spkgbuild
+++ b/main/python3-pyproject2setuppy/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-pyproject2setuppy
 version=22
 release=1
-source="https://github.com/mgorny/pyproject2setuppy/archive/v$version/pyproject2setuppy-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/mgorny/pyproject2setuppy/archive/v$version/pyproject2setuppy-$version.tar.gz"
 
 build() {
 	cd pyproject2setuppy-$version
diff --git a/main/python3-pytz/.checksums b/main/python3-pytz/.checksums
index 9144709ca..172f01239 100644
--- a/main/python3-pytz/.checksums
+++ b/main/python3-pytz/.checksums
@@ -1 +1 @@
-bf46b54a7e9bcb65ea38f54646181979  pytz-2022.6.tar.gz
+bf46b54a7e9bcb65ea38f54646181979  python3-pytz-2022.6.tar.gz
diff --git a/main/python3-pytz/spkgbuild b/main/python3-pytz/spkgbuild
index 037dd523b..d17b1caee 100644
--- a/main/python3-pytz/spkgbuild
+++ b/main/python3-pytz/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-pytz
 version=2022.6
 release=1
-source="https://pypi.io/packages/source/p/pytz/pytz-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.io/packages/source/p/pytz/pytz-$version.tar.gz"
 
 build() {
   cd pytz-$version
diff --git a/main/python3-pyxdg/.checksums b/main/python3-pyxdg/.checksums
index 39310b76d..0aa52e3a1 100644
--- a/main/python3-pyxdg/.checksums
+++ b/main/python3-pyxdg/.checksums
@@ -1 +1 @@
-d9a1d04fe60c956f5e3b9de3b4ef4722  pyxdg-0.28.tar.gz
+d9a1d04fe60c956f5e3b9de3b4ef4722  python3-pyxdg-0.28.tar.gz
diff --git a/main/python3-pyxdg/spkgbuild b/main/python3-pyxdg/spkgbuild
index 075348b1b..94c46fccf 100644
--- a/main/python3-pyxdg/spkgbuild
+++ b/main/python3-pyxdg/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-pyxdg
 version=0.28
 release=1
-source="https://files.pythonhosted.org/packages/source/p/pyxdg/pyxdg-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/p/pyxdg/pyxdg-$version.tar.gz"
 
 build() {
 	cd pyxdg-$version
diff --git a/main/python3-requests/.checksums b/main/python3-requests/.checksums
index 77e7606f7..7af810aaf 100644
--- a/main/python3-requests/.checksums
+++ b/main/python3-requests/.checksums
@@ -1,2 +1,2 @@
 8701cd93ae4c4448cca368243d9b86f5  certs.patch
-796ea875cdae283529c03b9203d9c454  requests-2.28.1.tar.gz
+796ea875cdae283529c03b9203d9c454  python3-requests-2.28.1.tar.gz
diff --git a/main/python3-requests/spkgbuild b/main/python3-requests/spkgbuild
index 046fccf5e..ae5666d13 100644
--- a/main/python3-requests/spkgbuild
+++ b/main/python3-requests/spkgbuild
@@ -6,7 +6,7 @@ _name=${name#*-}
 _n=${_name%${_name#?}}
 version=2.28.1
 release=1
-source="https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz
 	certs.patch"
 
 build() {
diff --git a/main/python3-scour/.checksums b/main/python3-scour/.checksums
index 9bce52e8a..733b60474 100644
--- a/main/python3-scour/.checksums
+++ b/main/python3-scour/.checksums
@@ -1 +1 @@
-ae30f52602802f8c7df3a32e1f72b325  scour-v0.38.2.tar.gz
+ae30f52602802f8c7df3a32e1f72b325  python3-scour-0.38.2.tar.gz
diff --git a/main/python3-scour/spkgbuild b/main/python3-scour/spkgbuild
index a4fcaac36..2bc4968b5 100644
--- a/main/python3-scour/spkgbuild
+++ b/main/python3-scour/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-scour
 version=0.38.2
 release=1
-source="https://github.com/scour-project/scour/archive/v$version/scour-v$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/scour-project/scour/archive/v$version/scour-v$version.tar.gz"
 
 build() {
 	cd scour-$version
diff --git a/main/python3-setproctitle/.checksums b/main/python3-setproctitle/.checksums
index 1f6678716..6d042b3d1 100644
--- a/main/python3-setproctitle/.checksums
+++ b/main/python3-setproctitle/.checksums
@@ -1 +1 @@
-fa9771540422a59a8dee1331ad6fd3a9  setproctitle-1.3.2.tar.gz
+fa9771540422a59a8dee1331ad6fd3a9  python3-setproctitle-1.3.2.tar.gz
diff --git a/main/python3-setproctitle/spkgbuild b/main/python3-setproctitle/spkgbuild
index ce01ffd65..5d934d891 100644
--- a/main/python3-setproctitle/spkgbuild
+++ b/main/python3-setproctitle/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-setproctitle
 version=1.3.2
 release=1
-source="https://files.pythonhosted.org/packages/source/s/setproctitle/setproctitle-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/s/setproctitle/setproctitle-$version.tar.gz"
 
 build() {
 	cd setproctitle-$version
diff --git a/main/python3-setuptools-scm/.checksums b/main/python3-setuptools-scm/.checksums
index 859f72c0f..31de0b3fe 100644
--- a/main/python3-setuptools-scm/.checksums
+++ b/main/python3-setuptools-scm/.checksums
@@ -1 +1 @@
-0df4e7fd923e4983cd65786efaa0e0d0  setuptools_scm-7.0.5.tar.gz
+0df4e7fd923e4983cd65786efaa0e0d0  python3-setuptools-scm-7.0.5.tar.gz
diff --git a/main/python3-setuptools-scm/spkgbuild b/main/python3-setuptools-scm/spkgbuild
index f5460e5cd..8f0c363c1 100644
--- a/main/python3-setuptools-scm/spkgbuild
+++ b/main/python3-setuptools-scm/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-setuptools-scm
 version=7.0.5
 release=1
-source="https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-$version.tar.gz"
 
 build() {
 	cd setuptools_scm-$version
diff --git a/main/python3-setuptools/.checksums b/main/python3-setuptools/.checksums
index d6c2b9b59..fd365f7ca 100644
--- a/main/python3-setuptools/.checksums
+++ b/main/python3-setuptools/.checksums
@@ -1 +1 @@
-c2f54b9d5282984416a9ca08a4f338ba  setuptools-65.6.0.tar.gz
+c2f54b9d5282984416a9ca08a4f338ba  python3-setuptools-65.6.0.tar.gz
diff --git a/main/python3-setuptools/spkgbuild b/main/python3-setuptools/spkgbuild
index 1bbe0bd9d..be83c37e7 100644
--- a/main/python3-setuptools/spkgbuild
+++ b/main/python3-setuptools/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-setuptools
 version=65.6.0
 release=1
-source="https://files.pythonhosted.org/packages/source/s/${name#*-}/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/s/${name#*-}/${name#*-}-$version.tar.gz"
 
 build() {
 	cd setuptools-$version
diff --git a/main/python3-sip-pyqt5/.checksums b/main/python3-sip-pyqt5/.checksums
index 597b1f4da..93dbc1683 100644
--- a/main/python3-sip-pyqt5/.checksums
+++ b/main/python3-sip-pyqt5/.checksums
@@ -1 +1 @@
-190c585ed6fcb5730f550b1330cd473f  PyQt5_sip-12.11.0.tar.gz
+190c585ed6fcb5730f550b1330cd473f  python3-sip-pyqt5-12.11.0.tar.gz
diff --git a/main/python3-sip-pyqt5/spkgbuild b/main/python3-sip-pyqt5/spkgbuild
index f91fc2ba5..706e18a23 100644
--- a/main/python3-sip-pyqt5/spkgbuild
+++ b/main/python3-sip-pyqt5/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-sip-pyqt5
 version=12.11.0
 release=1
-source="https://pypi.python.org/packages/source/P/PyQt5-sip/PyQt5_sip-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.python.org/packages/source/P/PyQt5-sip/PyQt5_sip-$version.tar.gz"
 
 build() {
 	cd PyQt5_sip-$version
diff --git a/main/python3-sip/.checksums b/main/python3-sip/.checksums
index 8179ac96d..2b479afbc 100644
--- a/main/python3-sip/.checksums
+++ b/main/python3-sip/.checksums
@@ -1 +1 @@
-ea2c62c6eb150dafea08eca0bc682dc7  sip-6.7.1.tar.gz
+ea2c62c6eb150dafea08eca0bc682dc7  python3-sip-6.7.1.tar.gz
diff --git a/main/python3-sip/spkgbuild b/main/python3-sip/spkgbuild
index e61d11793..7d9615c2e 100644
--- a/main/python3-sip/spkgbuild
+++ b/main/python3-sip/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-sip
 version=6.7.1
 release=1
-source="https://pypi.python.org/packages/source/s/sip/sip-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.python.org/packages/source/s/sip/sip-$version.tar.gz"
 
 build() {
 	cd sip-$version
diff --git a/main/python3-six/.checksums b/main/python3-six/.checksums
index a9951afd2..5d2317d74 100644
--- a/main/python3-six/.checksums
+++ b/main/python3-six/.checksums
@@ -1 +1 @@
-a7c927740e4964dd29b72cebfc1429bb  six-1.16.0.tar.gz
+a7c927740e4964dd29b72cebfc1429bb  python3-six-1.16.0.tar.gz
diff --git a/main/python3-six/spkgbuild b/main/python3-six/spkgbuild
index 115ed4db6..2ef9f05c5 100644
--- a/main/python3-six/spkgbuild
+++ b/main/python3-six/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-six
 version=1.16.0
 release=1
-source="https://pypi.io/packages/source/s/six/six-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.io/packages/source/s/six/six-$version.tar.gz"
 
 build() {
 	cd six-$version
diff --git a/main/python3-snowballstemmer/.checksums b/main/python3-snowballstemmer/.checksums
index d3bd7492f..67dd9db48 100644
--- a/main/python3-snowballstemmer/.checksums
+++ b/main/python3-snowballstemmer/.checksums
@@ -1 +1 @@
-4332ddc7bbee0f344a03915b2ad59a54  snowballstemmer-2.2.0.tar.gz
+4332ddc7bbee0f344a03915b2ad59a54  python3-snowballstemmer-2.2.0.tar.gz
diff --git a/main/python3-snowballstemmer/spkgbuild b/main/python3-snowballstemmer/spkgbuild
index efdc31490..ce74db523 100644
--- a/main/python3-snowballstemmer/spkgbuild
+++ b/main/python3-snowballstemmer/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-snowballstemmer
 version=2.2.0
 release=1
-source="https://pypi.org/packages/source/S/Snowballstemmer/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.org/packages/source/S/Snowballstemmer/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-sphinxcontrib-applehelp/.checksums b/main/python3-sphinxcontrib-applehelp/.checksums
index b21c99124..c2a040fdb 100644
--- a/main/python3-sphinxcontrib-applehelp/.checksums
+++ b/main/python3-sphinxcontrib-applehelp/.checksums
@@ -1 +1 @@
-4b813df230e3c615fc16b88d3faecbd5  sphinxcontrib-applehelp-1.0.2.tar.gz
+4b813df230e3c615fc16b88d3faecbd5  python3-sphinxcontrib-applehelp-1.0.2.tar.gz
diff --git a/main/python3-sphinxcontrib-applehelp/spkgbuild b/main/python3-sphinxcontrib-applehelp/spkgbuild
index 8628ec067..081f2b474 100644
--- a/main/python3-sphinxcontrib-applehelp/spkgbuild
+++ b/main/python3-sphinxcontrib-applehelp/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-sphinxcontrib-applehelp
 version=1.0.2
 release=1
-source="https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-sphinxcontrib-devhelp/.checksums b/main/python3-sphinxcontrib-devhelp/.checksums
index 89db0bb56..a20ab1c3f 100644
--- a/main/python3-sphinxcontrib-devhelp/.checksums
+++ b/main/python3-sphinxcontrib-devhelp/.checksums
@@ -1 +1 @@
-5ff568fed7b7e2a1ab0e09b874c413de  sphinxcontrib-devhelp-1.0.2.tar.gz
+5ff568fed7b7e2a1ab0e09b874c413de  python3-sphinxcontrib-devhelp-1.0.2.tar.gz
diff --git a/main/python3-sphinxcontrib-devhelp/spkgbuild b/main/python3-sphinxcontrib-devhelp/spkgbuild
index febfb1f1d..c5fefa999 100644
--- a/main/python3-sphinxcontrib-devhelp/spkgbuild
+++ b/main/python3-sphinxcontrib-devhelp/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-sphinxcontrib-devhelp
 version=1.0.2
 release=1
-source="https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-sphinxcontrib-htmlhelp/.checksums b/main/python3-sphinxcontrib-htmlhelp/.checksums
index 308755508..ccf1e797d 100644
--- a/main/python3-sphinxcontrib-htmlhelp/.checksums
+++ b/main/python3-sphinxcontrib-htmlhelp/.checksums
@@ -1 +1 @@
-70765b55395a3c20233631802902c840  sphinxcontrib-htmlhelp-2.0.0.tar.gz
+70765b55395a3c20233631802902c840  python3-sphinxcontrib-htmlhelp-2.0.0.tar.gz
diff --git a/main/python3-sphinxcontrib-htmlhelp/spkgbuild b/main/python3-sphinxcontrib-htmlhelp/spkgbuild
index 6804358bb..7fbb35f97 100644
--- a/main/python3-sphinxcontrib-htmlhelp/spkgbuild
+++ b/main/python3-sphinxcontrib-htmlhelp/spkgbuild
@@ -6,7 +6,7 @@ name=python3-sphinxcontrib-htmlhelp
 _name=sphinxcontrib-htmlhelp
 version=2.0.0
 release=2
-source="https://files.pythonhosted.org/packages/source/s/$_name/$_name-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/s/$_name/$_name-$version.tar.gz"
 
 build() {
 	cd $_name-$version
diff --git a/main/python3-sphinxcontrib-jsmath/.checksums b/main/python3-sphinxcontrib-jsmath/.checksums
index 833c56193..ff87fdc9c 100644
--- a/main/python3-sphinxcontrib-jsmath/.checksums
+++ b/main/python3-sphinxcontrib-jsmath/.checksums
@@ -1 +1 @@
-63b128d164e727722f48d388a1b57dde  sphinxcontrib-jsmath-1.0.1.tar.gz
+63b128d164e727722f48d388a1b57dde  python3-sphinxcontrib-jsmath-1.0.1.tar.gz
diff --git a/main/python3-sphinxcontrib-jsmath/spkgbuild b/main/python3-sphinxcontrib-jsmath/spkgbuild
index bb79cd8b0..c6ea4a8df 100644
--- a/main/python3-sphinxcontrib-jsmath/spkgbuild
+++ b/main/python3-sphinxcontrib-jsmath/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-sphinxcontrib-jsmath
 version=1.0.1
 release=1
-source="https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-sphinxcontrib-qthelp/.checksums b/main/python3-sphinxcontrib-qthelp/.checksums
index 31e34784b..4c2c60a05 100644
--- a/main/python3-sphinxcontrib-qthelp/.checksums
+++ b/main/python3-sphinxcontrib-qthelp/.checksums
@@ -1 +1 @@
-2cf0be6419124f8ed6dc72e39f73da8c  sphinxcontrib-qthelp-1.0.3.tar.gz
+2cf0be6419124f8ed6dc72e39f73da8c  python3-sphinxcontrib-qthelp-1.0.3.tar.gz
diff --git a/main/python3-sphinxcontrib-qthelp/spkgbuild b/main/python3-sphinxcontrib-qthelp/spkgbuild
index 383dad481..6d6c1d89f 100644
--- a/main/python3-sphinxcontrib-qthelp/spkgbuild
+++ b/main/python3-sphinxcontrib-qthelp/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-sphinxcontrib-qthelp
 version=1.0.3
 release=1
-source="https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-sphinxcontrib-serializinghtml/.checksums b/main/python3-sphinxcontrib-serializinghtml/.checksums
index 3a4dabcb3..ebc775dd8 100644
--- a/main/python3-sphinxcontrib-serializinghtml/.checksums
+++ b/main/python3-sphinxcontrib-serializinghtml/.checksums
@@ -1 +1 @@
-0196750dd6e4669ae5c9e32b77c35915  sphinxcontrib-serializinghtml-1.1.5.tar.gz
+0196750dd6e4669ae5c9e32b77c35915  python3-sphinxcontrib-serializinghtml-1.1.5.tar.gz
diff --git a/main/python3-sphinxcontrib-serializinghtml/spkgbuild b/main/python3-sphinxcontrib-serializinghtml/spkgbuild
index 7aa41899f..b7631e205 100644
--- a/main/python3-sphinxcontrib-serializinghtml/spkgbuild
+++ b/main/python3-sphinxcontrib-serializinghtml/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-sphinxcontrib-serializinghtml
 version=1.1.5
 release=1
-source="https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-sphinxcontrib-websupport/.checksums b/main/python3-sphinxcontrib-websupport/.checksums
index 3d333f1eb..ba3c8c547 100644
--- a/main/python3-sphinxcontrib-websupport/.checksums
+++ b/main/python3-sphinxcontrib-websupport/.checksums
@@ -1 +1 @@
-ecbee6a0a33d0bb305963a101d1ee8df  sphinxcontrib-websupport-1.2.4.tar.gz
+ecbee6a0a33d0bb305963a101d1ee8df  python3-sphinxcontrib-websupport-1.2.4.tar.gz
diff --git a/main/python3-sphinxcontrib-websupport/spkgbuild b/main/python3-sphinxcontrib-websupport/spkgbuild
index 193f9a5a8..b1b9ebfd2 100644
--- a/main/python3-sphinxcontrib-websupport/spkgbuild
+++ b/main/python3-sphinxcontrib-websupport/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-sphinxcontrib-websupport
 version=1.2.4
 release=1
-source="https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/sphinx-doc/${name#*-}/archive/$version/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#python3-}-$version
diff --git a/main/python3-toml/.checksums b/main/python3-toml/.checksums
index 6d5a694ac..e6ba1d47f 100644
--- a/main/python3-toml/.checksums
+++ b/main/python3-toml/.checksums
@@ -1 +1 @@
-59bce5d8d67e858735ec3f399ec90253  toml-0.10.2.tar.gz
+59bce5d8d67e858735ec3f399ec90253  python3-toml-0.10.2.tar.gz
diff --git a/main/python3-toml/spkgbuild b/main/python3-toml/spkgbuild
index 01aa2b8c3..475728e42 100644
--- a/main/python3-toml/spkgbuild
+++ b/main/python3-toml/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-toml
 version=0.10.2
 release=1
-source="https://files.pythonhosted.org/packages/source/t/toml/toml-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/t/toml/toml-$version.tar.gz"
 
 build() {
 	cd toml-$version
diff --git a/main/python3-tomli/.checksums b/main/python3-tomli/.checksums
index a6ea3fa12..be15a981b 100644
--- a/main/python3-tomli/.checksums
+++ b/main/python3-tomli/.checksums
@@ -1 +1 @@
-b32f504876fd88ea1ca0c2fab4ce8e27  tomli-2.0.1.tar.gz
+b32f504876fd88ea1ca0c2fab4ce8e27  python3-tomli-2.0.1.tar.gz
diff --git a/main/python3-tomli/spkgbuild b/main/python3-tomli/spkgbuild
index 253341f0e..2f73414a8 100644
--- a/main/python3-tomli/spkgbuild
+++ b/main/python3-tomli/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-tomli
 version=2.0.1
 release=1
-source="https://github.com/hukkin/tomli/archive/$version/tomli-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/hukkin/tomli/archive/$version/tomli-$version.tar.gz"
 
 build() {
 	cd tomli-$version
diff --git a/main/python3-urllib3/.checksums b/main/python3-urllib3/.checksums
index 74741b9cf..22aae096e 100644
--- a/main/python3-urllib3/.checksums
+++ b/main/python3-urllib3/.checksums
@@ -1 +1 @@
-ba308b52b9092184cf4905bc59a88fc0  urllib3-1.26.12.tar.gz
+ba308b52b9092184cf4905bc59a88fc0  python3-urllib3-1.26.12.tar.gz
diff --git a/main/python3-urllib3/spkgbuild b/main/python3-urllib3/spkgbuild
index 6435f4627..3bc4a1deb 100644
--- a/main/python3-urllib3/spkgbuild
+++ b/main/python3-urllib3/spkgbuild
@@ -6,7 +6,7 @@ _name=${name#*-}
 _n=${_name%${_name#?}}
 version=1.26.12
 release=1
-source="https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
+source="$name-$version.tar.gz::https://files.pythonhosted.org/packages/source/$_n/${name#*-}/${name#*-}-$version.tar.gz"
 
 build() {
 	cd ${name#*-}-$version
diff --git a/main/python3-urwid/.checksums b/main/python3-urwid/.checksums
index 4a91f48ba..0b526c0b9 100644
--- a/main/python3-urwid/.checksums
+++ b/main/python3-urwid/.checksums
@@ -1 +1 @@
-f7f4e6bed9ba38965dbd619520f39287  urwid-2.1.2.tar.gz
+f7f4e6bed9ba38965dbd619520f39287  python3-urwid-2.1.2.tar.gz
diff --git a/main/python3-urwid/spkgbuild b/main/python3-urwid/spkgbuild
index 91bf93f87..dda67324e 100644
--- a/main/python3-urwid/spkgbuild
+++ b/main/python3-urwid/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-urwid
 version=2.1.2
 release=1
-source="https://pypi.python.org/packages/source/u/urwid/urwid-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.python.org/packages/source/u/urwid/urwid-$version.tar.gz"
 
 build() {
 	cd urwid-$version
diff --git a/main/python3-webencodings/spkgbuild b/main/python3-webencodings/spkgbuild
index 6ea1b1097..02e411ffa 100644
--- a/main/python3-webencodings/spkgbuild
+++ b/main/python3-webencodings/spkgbuild
@@ -5,7 +5,7 @@
 name=python3-webencodings
 version=0.5.1
 release=1
-source="https://github.com/gsnedders/python-webencodings/archive/v$version/$name-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/gsnedders/python-webencodings/archive/v$version/$name-$version.tar.gz"
 
 build() {
   cd python-webencodings-$version
diff --git a/main/python3-websocket-client/.checksums b/main/python3-websocket-client/.checksums
index 6b92c104d..b11cf9eb3 100644
--- a/main/python3-websocket-client/.checksums
+++ b/main/python3-websocket-client/.checksums
@@ -1 +1 @@
-8fc86b13dc97dc032855c6257f9168df  websocket_client-0.58.0.tar.gz
+8fc86b13dc97dc032855c6257f9168df  python3-websocket-client-0.58.0.tar.gz
diff --git a/main/python3-websocket-client/spkgbuild b/main/python3-websocket-client/spkgbuild
index a35da748a..9fb92ad50 100644
--- a/main/python3-websocket-client/spkgbuild
+++ b/main/python3-websocket-client/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-websocket-client
 version=0.58.0
 release=1
-source="https://pypi.io/packages/source/w/websocket-client/websocket_client-$version.tar.gz"
+source="$name-$version.tar.gz::https://pypi.io/packages/source/w/websocket-client/websocket_client-$version.tar.gz"
 
 build() {
 	cd websocket_client-$version
diff --git a/main/python3-xdg/.checksums b/main/python3-xdg/.checksums
index 3825cdab0..f8825629b 100644
--- a/main/python3-xdg/.checksums
+++ b/main/python3-xdg/.checksums
@@ -1 +1 @@
-bedcdb3a0ed85986d40044c87f23477c  pyxdg-0.25.tar.gz
+bedcdb3a0ed85986d40044c87f23477c  python3-xdg-0.25.tar.gz
diff --git a/main/python3-xdg/spkgbuild b/main/python3-xdg/spkgbuild
index 6ca98ebdd..f9e8ac23b 100755
--- a/main/python3-xdg/spkgbuild
+++ b/main/python3-xdg/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-xdg
 version=0.25
 release=1
-source="https://people.freedesktop.org/~takluyver/pyxdg-$version.tar.gz"
+source="$name-$version.tar.gz::https://people.freedesktop.org/~takluyver/pyxdg-$version.tar.gz"
 
 build() {
 	cd pyxdg-$version
diff --git a/main/python3-xlib/.checksums b/main/python3-xlib/.checksums
index 5a3b04d25..7d241ac0e 100644
--- a/main/python3-xlib/.checksums
+++ b/main/python3-xlib/.checksums
@@ -1 +1 @@
-772eab6a5baf0fa4659c7ec02474872b  python-0.32.tar.gz
+772eab6a5baf0fa4659c7ec02474872b  python3-xlib-0.32.tar.gz
diff --git a/main/python3-xlib/spkgbuild b/main/python3-xlib/spkgbuild
index cde4df400..d26d07492 100644
--- a/main/python3-xlib/spkgbuild
+++ b/main/python3-xlib/spkgbuild
@@ -4,7 +4,7 @@
 name=python3-xlib
 version=0.32
 release=1
-source="https://github.com/python-xlib/python-xlib/archive/$version/python-$version.tar.gz"
+source="$name-$version.tar.gz::https://github.com/python-xlib/python-xlib/archive/$version/python-$version.tar.gz"
 
 build() {
 	cd python-xlib-$version