diff --git a/src/asciidoc/pkg.sh b/src/asciidoc/pkg.sh
index d571d8b..85c1b1e 100644
--- a/src/asciidoc/pkg.sh
+++ b/src/asciidoc/pkg.sh
@@ -1,16 +1,18 @@
 NAME="asciidoc"
-DESC="Text document format for writing notes, documentation, articles, books, ebooks, slideshows, web pages, man pages and blogs"
+DESC="Text based document generation"
 VERSION="10.2.0"
-FILES=("https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-$VERSION.tar.gz")
+
+FILES=("https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-${VERSION}.tar.gz")
 HASHES=("ecac3af818f7a65596efc6e243b520a0")
-DEPENDS=()
+
+DEPENDS=("python3" "docbook-xsl" "libxslt")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "${NAME}-${VERSION}.tar.gz"
+  cd "${NAME}-${VERSION}"
 
-  python3 setup.py build
-  python3 setup.py install --optimize=1 --root=$ROOTDIR
+  python3 -m build --wheel --no-isolation
+  python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -rf $NAME-$VERSION
+  cd .. && rm -rf "${NAME}-${VERSION}"
 }
diff --git a/src/charset-normalizer/pkg.sh b/src/charset-normalizer/pkg.sh
deleted file mode 100644
index e7c239b..0000000
--- a/src/charset-normalizer/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="charset-normalizer"
-DESC="Helps reading text from an unknown character encoding"
-VERSION="3.0.1"
-FILES=("https://files.pythonhosted.org/packages/source/c/charset-normalizer/charset-normalizer-$VERSION.tar.gz")
-HASHES=("12ee1c8bedbfba84e99db46d5d94f411")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/docutils/pkg.sh b/src/docutils/pkg.sh
deleted file mode 100644
index 3f80409..0000000
--- a/src/docutils/pkg.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-NAME="docutils"
-DESC="Set of Python modules and programs for processing plaintext docs into formats such as HTML, XML, or LaTeX"
-VERSION="0.20.1"
-FILES=("https://files.pythonhosted.org/packages/source/d/docutils/docutils-$VERSION.tar.gz")
-HASHES=("93bcfe0065cf1d0b6a0bcabeca7a2335")
-DEPENDS=()
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-  
-  python3 setup.py build
-  python3 setup.py install --optimize=1 --root=$ROOTDIR
-
-  for f in "$ROOTDIR/usr/bin/rst"*.py; do
-    ln -svf "$(basename $f)" "$ROOTDIR/usr/bin/$(basename $f .py)"
-  done
-
-  cd .. && rm -rf $NAME-$VERSION
-}
diff --git a/src/gdb/pkg.sh b/src/gdb/pkg.sh
index 4a238ad..d1f668b 100644
--- a/src/gdb/pkg.sh
+++ b/src/gdb/pkg.sh
@@ -1,13 +1,15 @@
 NAME="gdb"
 DESC="GNU Project debugger"
 VERSION="13.2"
-FILES=("https://ftp.gnu.org/gnu/gdb/gdb-$VERSION.tar.xz")
+
+FILES=("https://ftp.gnu.org/gnu/gdb/gdb-${VERSION}.tar.xz")
 HASHES=("fbd3cdae16c581e8a742cb766ba35076")
-DEPENDS=("guile" "gcc-libs" "six" "python3")
+
+DEPENDS=("guile" "gcc-libs" "pypi-six" "python3")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.xz
-  cd $NAME-$VERSION
+  tar xf "${NAME}-${VERSION}.tar.xz"
+  cd "${NAME}-${VERSION}"
 
   mkdir build
   cd    build
@@ -17,12 +19,12 @@ PACKAGE() {
              --with-python=/usr/bin/python3
   make && make -C gdb/doc doxy 
 
-  make -C gdb DESTDIR="$ROOTDIR" install
-  make -C gdbserver DESTDIR="$ROOTDIR" install
+  make -C gdb DESTDIR="${ROOTDIR}" install
+  make -C gdbserver DESTDIR="${ROOTDIR}" install
 
-  install -d "$ROOTDIR/usr/share/doc/gdb-$VERSION"
+  install -d "${ROOTDIR}/usr/share/doc/gdb-${VERSION}"
   rm -rf gdb/doc/doxy/xml
-  cp -Rv gdb/doc/doxy "$ROOTDIR/usr/share/doc/gdb-$VERSION"
+  cp -Rv gdb/doc/doxy "${ROOTDIR}/usr/share/doc/gdb-${VERSION}"
 
-  cd ../.. && rm -r $NAME-$VERSION
+  cd ../.. && rm -r "${NAME}-${VERSION}"
 }
diff --git a/src/gtk-doc/pkg.sh b/src/gtk-doc/pkg.sh
index 28e144f..9ecf313 100644
--- a/src/gtk-doc/pkg.sh
+++ b/src/gtk-doc/pkg.sh
@@ -1,20 +1,22 @@
 NAME="gtk-doc"
 DESC="Code documenter"
 VERSION="1.33.2"
-FILES=("https://download.gnome.org/sources/gtk-doc/${VERSION%.*}/gtk-doc-$VERSION.tar.xz")
+
+FILES=("https://download.gnome.org/sources/gtk-doc/${VERSION%.*}/gtk-doc-${VERSION}.tar.xz")
 HASHES=("ea6563421abe964d02135ca0d5b8dd8e")
+
 DEPENDS=(
   "docbook-xml" "docbook-xsl-nons" "itstool" 
-  "libxslt" "pygments"
+  "libxslt" "pypi-pygments"
 )
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.xz
-  cd $NAME-$VERSION
+  tar xf "${NAME}-${VERSION}.tar.xz"
+  cd "${NAME}-${VERSION}"
 
   autoreconf -fiv          
   ./configure --prefix=/usr
-  make && make DESTDIR="$ROOTDIR" install
+  make && make DESTDIR="${ROOTDIR}" install
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "${NAME}-${VERSION}"
 }
diff --git a/src/hatchling/pkg.sh b/src/hatchling/pkg.sh
deleted file mode 100644
index d00790d..0000000
--- a/src/hatchling/pkg.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-NAME="hatchling"
-DESC="Extensible, standards compliant build backend for python modules"
-VERSION="1.12.2"
-FILES=("https://files.pythonhosted.org/packages/source/h/hatchling/hatchling-$VERSION.tar.gz")
-HASHES=("5a6e2fd0c877feea7e71b9d72bbdbed9")
-DEPENDS=(
-   "editables" "packaging" "pathspec"
-   "pluggy" "python3" 
-)
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/idna/pkg.sh b/src/idna/pkg.sh
deleted file mode 100644
index f589e33..0000000
--- a/src/idna/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="idna"
-DESC="Provides support for the Internationalized Domain Names in Applications (IDNA) protocol as specified in RFC 5891"
-VERSION="3.4"
-FILES=("https://files.pythonhosted.org/packages/source/i/idna/idna-$VERSION.tar.gz")
-HASHES=("13ea24e076212b6baae1135a116d1e0e")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/mako/changes.md b/src/mako/changes.md
deleted file mode 100644
index c58c654..0000000
--- a/src/mako/changes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1.2.4
-First version
diff --git a/src/mako/pkg.sh b/src/mako/pkg.sh
deleted file mode 100644
index 36832ca..0000000
--- a/src/mako/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="mako"
-DESC="Hyperfast and lightweight templating for the Python platform"
-VERSION="1.2.4"
-FILES=("https://files.pythonhosted.org/packages/source/M/Mako/Mako-$VERSION.tar.gz")
-HASHES=("651f365616611fcd4f2702a9002e2195")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf Mako-$VERSION.tar.gz
-  cd Mako-$VERSION
-
-  python3 setup.py build
-  python3 setup.py install --optimize=1 --root=$ROOTDIR 
-
-  cd .. && rm -rf Mako-$VERSION
-}
diff --git a/src/openbox/pkg.sh b/src/openbox/pkg.sh
index 97bfe50..a0ef40f 100644
--- a/src/openbox/pkg.sh
+++ b/src/openbox/pkg.sh
@@ -1,16 +1,18 @@
 NAME="openbox"
 DESC="Highly configurable desktop window manager with extensive standards support"
 VERSION="3.6.1"
-FILES=("http://openbox.org/dist/openbox/openbox-$VERSION.tar.gz")
+
+FILES=("http://openbox.org/dist/openbox/openbox-${VERSION}.tar.gz")
 HASHES=("b72794996c6a3ad94634727b95f9d204")
+
 DEPENDS=(
   "pango" "dbus" "imlib2" "librsvg"
-  "imagemagick" "pyxdg" "startup-notification"
+  "imagemagick" "pypi-pyxdg" "startup-notification"
 )
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "${NAME}-${VERSION}.tar.gz"
+  cd "${NAME}-${VERSION}"
 
   2to3-3.11 -w data/autostart/openbox-xdg-autostart
   sed 's/python/python3/' -i data/autostart/openbox-xdg-autostart
@@ -18,9 +20,9 @@ PACKAGE() {
   ./configure --prefix=/usr     \
             --sysconfdir=/etc   \
             --disable-static    \
-            --docdir=/usr/share/doc/openbox-$VERSION
-  make && make DESTDIR="$ROOTDIR" install
-  rm -v "$ROOTDIR/usr/share/xsessions/openbox-"{gnome,kde}.desktop
+            --docdir="/usr/share/doc/openbox-${VERSION}"
+  make && make DESTDIR="${ROOTDIR}" install
+  rm -v "${ROOTDIR}/usr/share/xsessions/openbox-"{gnome,kde}.desktop
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "${NAME}-${VERSION}"
 }
diff --git a/src/packaging/changes.md b/src/packaging/changes.md
deleted file mode 100644
index b61abb9..0000000
--- a/src/packaging/changes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 23.1
-First version
diff --git a/src/packaging/pkg.sh b/src/packaging/pkg.sh
deleted file mode 100644
index b371cfb..0000000
--- a/src/packaging/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="packaging"
-DESC="Utilities that implement the interoperability specifications"
-VERSION="23.1"
-FILES=("https://files.pythonhosted.org/packages/source/p/packaging/packaging-$VERSION.tar.gz")
-HASHES=("f7d5c39c6f92cc2dfa1293ba8f6c097c")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/pluggy/changes.md b/src/pluggy/changes.md
deleted file mode 100644
index 71bc952..0000000
--- a/src/pluggy/changes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1.0.0
-First version
diff --git a/src/pluggy/pkg.sh b/src/pluggy/pkg.sh
deleted file mode 100644
index c400d76..0000000
--- a/src/pluggy/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="pluggy"
-DESC="Gives users the ability to extend or modify the behaviour of a host program by installing a plugin for that program"
-VERSION="1.0.0"
-FILES=("https://files.pythonhosted.org/packages/source/p/pluggy/pluggy-$VERSION.tar.gz")
-HASHES=("daa6fddfb6cd364f3c82e52098911e4b")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/pycairo/pkg.sh b/src/pycairo/pkg.sh
deleted file mode 100644
index 6128766..0000000
--- a/src/pycairo/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="pycairo"
-DESC="PyCairo provides bindings to Cairo"
-VERSION="1.18.2"
-FILES=("https://github.com/pygobject/pycairo/releases/download/v$VERSION/pycairo-$VERSION.tar.gz")
-HASHES=("be2ba51f234270dec340f28f1695a95e")
-DEPENDS=("python3" "cairo")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 setup.py build
-  python3 setup.py install --optimize=1 --root=$ROOTDIR
-
-  cd .. && rm -rf $NAME-$VERSION
-}
diff --git a/src/pygments/changes.md b/src/pygments/changes.md
deleted file mode 100644
index 4e1c848..0000000
--- a/src/pygments/changes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 2.16.1
-First version
diff --git a/src/pygments/pkg.sh b/src/pygments/pkg.sh
deleted file mode 100644
index bd6156f..0000000
--- a/src/pygments/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="pygments"
-DESC="General syntax highlighter written in Python, for more than 300 languages"
-VERSION="2.16.1"
-FILES=("https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-$VERSION.tar.gz")
-HASHES=("20cb967029c23389253326cf515dec8a")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf Pygments-$VERSION.tar.gz
-  cd Pygments-$VERSION
-
-  python3 -m build --wheel --no-isolation
-  python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r Pygments-$VERSION
-}
diff --git a/src/pygobject/pkg.sh b/src/pygobject/pkg.sh
index 2993c96..a995b32 100644
--- a/src/pygobject/pkg.sh
+++ b/src/pygobject/pkg.sh
@@ -1,20 +1,23 @@
 NAME="pygobject"
 DESC="Python bindings to the GObject class from GLib"
 VERSION="3.44.1"
-FILES=("https://download.gnome.org/sources/pygobject/3.44/pygobject-$VERSION.tar.xz")
+
+FILES=("https://download.gnome.org/sources/pygobject/3.44/pygobject-${VERSION}.tar.xz")
 HASHES=("def9418983594c6a3330717bb640ca4d")
-DEPENDS=("gobject-introspection" "pycairo")
+
+DEPENDS=("gobject-introspection" "pypi-pycairo")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.xz
-  cd $NAME-$VERSION
+  tar xf "${NAME}-${VERSION}.tar.xz"
+  cd "${NAME}-${VERSION}"
 
   mv -v tests/test_gdbus.py{,.nouse}
   mkdir build
   cd    build
 
   meson setup --prefix=/usr --buildtype=release .. 
-  ninja && DESTDIR="$ROOTDIR" ninja install
+  ninja
+  DESTDIR="${ROOTDIR}" ninja install
 
-  cd ../.. && rm -r $NAME-$VERSION
+  cd ../.. && rm -r "${NAME}-${VERSION}"
 }
diff --git a/src/alabaster/.gitignore b/src/pypi-alabaster/.gitignore
similarity index 100%
rename from src/alabaster/.gitignore
rename to src/pypi-alabaster/.gitignore
diff --git a/src/alabaster/changes.md b/src/pypi-alabaster/changes.md
similarity index 100%
rename from src/alabaster/changes.md
rename to src/pypi-alabaster/changes.md
diff --git a/src/alabaster/pkg.sh b/src/pypi-alabaster/pkg.sh
similarity index 53%
rename from src/alabaster/pkg.sh
rename to src/pypi-alabaster/pkg.sh
index 50d8963..0cba59c 100644
--- a/src/alabaster/pkg.sh
+++ b/src/pypi-alabaster/pkg.sh
@@ -1,16 +1,19 @@
-NAME="alabaster"
+NAME="pypi-alabaster"
 DESC="Theme for the sphinx documentation system"
 VERSION="0.7.13"
-FILES=("https://files.pythonhosted.org/packages/source/a/alabaster/alabaster-$VERSION.tar.gz")
+
+FILES=("https://files.pythonhosted.org/packages/source/a/alabaster/alabaster-${VERSION}.tar.gz")
 HASHES=("2e05a5f4fe5a8b95e5e576cbf4a5d503")
+
 DEPENDS=("python3")
+BUILD=()
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "alabaster-${VERSION}.tar.gz"
+  cd "alabaster-${VERSION}"
 
   python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "alabaster-${VERSION}"
 }
diff --git a/src/babel/.gitignore b/src/pypi-babel/.gitignore
similarity index 100%
rename from src/babel/.gitignore
rename to src/pypi-babel/.gitignore
diff --git a/src/babel/changes.md b/src/pypi-babel/changes.md
similarity index 100%
rename from src/babel/changes.md
rename to src/pypi-babel/changes.md
diff --git a/src/babel/pkg.sh b/src/pypi-babel/pkg.sh
similarity index 55%
rename from src/babel/pkg.sh
rename to src/pypi-babel/pkg.sh
index 21f6faf..daa9c41 100644
--- a/src/babel/pkg.sh
+++ b/src/pypi-babel/pkg.sh
@@ -1,16 +1,19 @@
-NAME="babel"
+NAME="pypi-babel"
 DESC="Integrated collection of utilities that assist in internationalizing and localizing Python applications"
 VERSION="2.11.0"
-FILES=("https://files.pythonhosted.org/packages/source/B/Babel/Babel-$VERSION.tar.gz")
+
+FILES=("https://files.pythonhosted.org/packages/source/B/Babel/Babel-${VERSION}.tar.gz")
 HASHES=("9ee7784fd452d456206ecd3a12694010")
-DEPENDS=("python3" "pytz")
+
+DEPENDS=("python3" "pypi-pytz")
+BUILD=()
 
 PACKAGE() {
-  tar xf Babel-$VERSION.tar.gz
-  cd Babel-$VERSION
+  tar xf "Babel-${VERSION}.tar.gz"
+  cd "Babel-${VERSION}"
 
   python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -r Babel-$VERSION
+  cd .. && rm -r "Babel-${VERSION}"
 }
diff --git a/src/charset-normalizer/.gitignore b/src/pypi-charset-normalizer/.gitignore
similarity index 100%
rename from src/charset-normalizer/.gitignore
rename to src/pypi-charset-normalizer/.gitignore
diff --git a/src/charset-normalizer/changes.md b/src/pypi-charset-normalizer/changes.md
similarity index 100%
rename from src/charset-normalizer/changes.md
rename to src/pypi-charset-normalizer/changes.md
diff --git a/src/pypi-charset-normalizer/pkg.sh b/src/pypi-charset-normalizer/pkg.sh
new file mode 100644
index 0000000..fa66e1a
--- /dev/null
+++ b/src/pypi-charset-normalizer/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-charset-normalizer"
+DESC="Helps reading text from an unknown character encoding"
+VERSION="3.0.1"
+
+FILES=("https://files.pythonhosted.org/packages/source/c/charset-normalizer/charset-normalizer-${VERSION}.tar.gz")
+HASHES=("12ee1c8bedbfba84e99db46d5d94f411")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "charset-normalizer-${VERSION}.tar.gz"
+  cd "charset-normalizer-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "charset-normalizer-${VERSION}"
+}
diff --git a/src/docutils/.gitignore b/src/pypi-docutils/.gitignore
similarity index 100%
rename from src/docutils/.gitignore
rename to src/pypi-docutils/.gitignore
diff --git a/src/docutils/changes.md b/src/pypi-docutils/changes.md
similarity index 100%
rename from src/docutils/changes.md
rename to src/pypi-docutils/changes.md
diff --git a/src/pypi-docutils/pkg.sh b/src/pypi-docutils/pkg.sh
new file mode 100644
index 0000000..9b51901
--- /dev/null
+++ b/src/pypi-docutils/pkg.sh
@@ -0,0 +1,22 @@
+NAME="pypi-docutils"
+DESC="Set of Python modules and programs for processing plaintext docs into formats such as HTML, XML, or LaTeX"
+VERSION="0.20.1"
+
+FILES=("https://files.pythonhosted.org/packages/source/d/docutils/docutils-${VERSION}.tar.gz")
+HASHES=("93bcfe0065cf1d0b6a0bcabeca7a2335")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "docutils-${VERSION}.tar.gz"
+  cd "docutils-${VERSION}"
+  
+  python3 -m build --wheel --no-isolation
+  python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  for f in "${ROOTDIR}/usr/bin/rst"*.py; do
+    ln -svf "$(basename $f)" "${ROOTDIR}/usr/bin/$(basename $f .py)"
+  done
+
+  cd .. && rm -rf "docutils-${VERSION}"
+}
diff --git a/src/editables/.gitignore b/src/pypi-editables/.gitignore
similarity index 100%
rename from src/editables/.gitignore
rename to src/pypi-editables/.gitignore
diff --git a/src/editables/changes.md b/src/pypi-editables/changes.md
similarity index 100%
rename from src/editables/changes.md
rename to src/pypi-editables/changes.md
diff --git a/src/editables/pkg.sh b/src/pypi-editables/pkg.sh
similarity index 53%
rename from src/editables/pkg.sh
rename to src/pypi-editables/pkg.sh
index b34f20e..f9b8612 100644
--- a/src/editables/pkg.sh
+++ b/src/pypi-editables/pkg.sh
@@ -1,16 +1,19 @@
-NAME="editables"
+NAME="pypi-editables"
 DESC="Python library for creating \"editable wheels\""
 VERSION="0.3"
-FILES=("https://files.pythonhosted.org/packages/source/e/editables/editables-$VERSION.tar.gz")
+
+FILES=("https://files.pythonhosted.org/packages/source/e/editables/editables-${VERSION}.tar.gz")
 HASHES=("e91709fbb0ef586cb7b785042068ab67")
+
 DEPENDS=("python3")
+BUILD=()
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "editables-${VERSION}.tar.gz"
+  cd "editables-${VERSION}"
 
   python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "editables-${VERSION}"
 }
diff --git a/src/hatchling/.gitignore b/src/pypi-hatchling/.gitignore
similarity index 100%
rename from src/hatchling/.gitignore
rename to src/pypi-hatchling/.gitignore
diff --git a/src/hatchling/changes.md b/src/pypi-hatchling/changes.md
similarity index 100%
rename from src/hatchling/changes.md
rename to src/pypi-hatchling/changes.md
diff --git a/src/pypi-hatchling/pkg.sh b/src/pypi-hatchling/pkg.sh
new file mode 100644
index 0000000..a7830fa
--- /dev/null
+++ b/src/pypi-hatchling/pkg.sh
@@ -0,0 +1,21 @@
+NAME="pypi-hatchling"
+DESC="Extensible, standards compliant build backend for python modules"
+VERSION="1.12.2"
+
+FILES=("https://files.pythonhosted.org/packages/source/h/hatchling/hatchling-${VERSION}.tar.gz")
+HASHES=("5a6e2fd0c877feea7e71b9d72bbdbed9")
+
+DEPENDS=(
+   "pypi-editables" "pypa-packaging" "pypi-pathspec"
+   "pypi-pluggy" "python3" 
+)
+
+PACKAGE() {
+  tar xf "hatchling-${VERSION}.tar.gz"
+  cd "hatchling-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "hatchling-${VERSION}"
+}
diff --git a/src/idna/.gitignore b/src/pypi-idna/.gitignore
similarity index 100%
rename from src/idna/.gitignore
rename to src/pypi-idna/.gitignore
diff --git a/src/idna/changes.md b/src/pypi-idna/changes.md
similarity index 100%
rename from src/idna/changes.md
rename to src/pypi-idna/changes.md
diff --git a/src/pypi-idna/pkg.sh b/src/pypi-idna/pkg.sh
new file mode 100644
index 0000000..ac5ca61
--- /dev/null
+++ b/src/pypi-idna/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-idna"
+DESC="Internationalized Domain Names for Python (IDNA 2008 and UTS #46)"
+VERSION="3.4"
+
+FILES=("https://files.pythonhosted.org/packages/source/i/idna/idna-${VERSION}.tar.gz")
+HASHES=("13ea24e076212b6baae1135a116d1e0e")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "idna-${VERSION}.tar.gz"
+  cd "idna-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "idna-${VERSION}"
+}
diff --git a/src/imagesize/.gitignore b/src/pypi-imagesize/.gitignore
similarity index 100%
rename from src/imagesize/.gitignore
rename to src/pypi-imagesize/.gitignore
diff --git a/src/imagesize/changes.md b/src/pypi-imagesize/changes.md
similarity index 100%
rename from src/imagesize/changes.md
rename to src/pypi-imagesize/changes.md
diff --git a/src/imagesize/pkg.sh b/src/pypi-imagesize/pkg.sh
similarity index 54%
rename from src/imagesize/pkg.sh
rename to src/pypi-imagesize/pkg.sh
index 4855933..1c6fc80 100644
--- a/src/imagesize/pkg.sh
+++ b/src/pypi-imagesize/pkg.sh
@@ -1,16 +1,19 @@
-NAME="imagesize"
+NAME="pypi-imagesize"
 DESC="Analyzes image file headers and returns the image size and DPI"
 VERSION="1.4.1"
-FILES=("https://files.pythonhosted.org/packages/source/i/imagesize/imagesize-$VERSION.tar.gz")
+
+FILES=("https://files.pythonhosted.org/packages/source/i/imagesize/imagesize-${VERSION}.tar.gz")
 HASHES=("5a40586a25c07e1a8f16f6267252c321")
+
 DEPENDS=("python3")
+BUILD=()
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "imagesize-${VERSION}.tar.gz"
+  cd "imagesize-${VERSION}"
 
   python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "imagesize-${VERSION}"
 }
diff --git a/src/mako/.gitignore b/src/pypi-mako/.gitignore
similarity index 100%
rename from src/mako/.gitignore
rename to src/pypi-mako/.gitignore
diff --git a/src/pypi-mako/changes.md b/src/pypi-mako/changes.md
new file mode 100644
index 0000000..556cf83
--- /dev/null
+++ b/src/pypi-mako/changes.md
@@ -0,0 +1,5 @@
+# 1.3.2
+Updated to a newer upstream release
+
+# 1.2.4
+First version
diff --git a/src/pypi-mako/pkg.sh b/src/pypi-mako/pkg.sh
new file mode 100644
index 0000000..3483250
--- /dev/null
+++ b/src/pypi-mako/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-mako"
+DESC="Hyperfast and lightweight templating for the Python platform"
+VERSION="1.3.2"
+
+FILES=("https://files.pythonhosted.org/packages/source/M/Mako/Mako-${VERSION}.tar.gz")
+HASHES=("0500a3df18f02c9e53fe3a9314c1a1ae")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "Mako-${VERSION}.tar.gz"
+  cd "Mako-${VERSION}"
+
+  python3 -m build --wheel --no-isolation
+  python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -rf "Mako-${VERSION}"
+}
diff --git a/src/packaging/.gitignore b/src/pypi-pathspec/.gitignore
similarity index 100%
rename from src/packaging/.gitignore
rename to src/pypi-pathspec/.gitignore
diff --git a/src/pathspec/changes.md b/src/pypi-pathspec/changes.md
similarity index 100%
rename from src/pathspec/changes.md
rename to src/pypi-pathspec/changes.md
diff --git a/src/pathspec/pkg.sh b/src/pypi-pathspec/pkg.sh
similarity index 54%
rename from src/pathspec/pkg.sh
rename to src/pypi-pathspec/pkg.sh
index 890ddce..34f79bd 100644
--- a/src/pathspec/pkg.sh
+++ b/src/pypi-pathspec/pkg.sh
@@ -1,16 +1,19 @@
-NAME="pathspec"
+NAME="pypi-pathspec"
 DESC="Utility library for pattern matching of file paths"
 VERSION="0.10.3"
-FILES=("https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-$VERSION.tar.gz")
+
+FILES=("https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-${VERSION}.tar.gz")
 HASHES=("d89408b52aff020ac768a14c0ef1c7de")
+
 DEPENDS=("python3")
+BUILD=()
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "pathspec-${VERSION}.tar.gz"
+  cd "pathspec-${VERSION}"
 
   python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "pathspec-${VERSION}"
 }
diff --git a/src/pathspec/.gitignore b/src/pypi-pluggy/.gitignore
similarity index 100%
rename from src/pathspec/.gitignore
rename to src/pypi-pluggy/.gitignore
diff --git a/src/pypi-pluggy/changes.md b/src/pypi-pluggy/changes.md
new file mode 100644
index 0000000..124f9a5
--- /dev/null
+++ b/src/pypi-pluggy/changes.md
@@ -0,0 +1,5 @@
+# 1.4.0
+Updated to a newer upstream release
+
+# 1.0.0
+First version
diff --git a/src/pypi-pluggy/pkg.sh b/src/pypi-pluggy/pkg.sh
new file mode 100644
index 0000000..94abe26
--- /dev/null
+++ b/src/pypi-pluggy/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-pluggy"
+DESC="A minimalist production ready plugin system "
+VERSION="1.4.0"
+
+FILES=("https://files.pythonhosted.org/packages/source/p/pluggy/pluggy-${VERSION}.tar.gz")
+HASHES=("ffb69741271eaeefab3f2ef2435e2d5f")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "pluggy-${VERSION}.tar.gz"
+  cd "pluggy-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "pluggy-${VERSION}"
+}
diff --git a/src/pluggy/.gitignore b/src/pypi-pycairo/.gitignore
similarity index 100%
rename from src/pluggy/.gitignore
rename to src/pypi-pycairo/.gitignore
diff --git a/src/pycairo/changes.md b/src/pypi-pycairo/changes.md
similarity index 100%
rename from src/pycairo/changes.md
rename to src/pypi-pycairo/changes.md
diff --git a/src/pypi-pycairo/pkg.sh b/src/pypi-pycairo/pkg.sh
new file mode 100644
index 0000000..0634cde
--- /dev/null
+++ b/src/pypi-pycairo/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-pycairo"
+DESC="PyCairo provides bindings to Cairo"
+VERSION="1.18.2"
+
+FILES=("https://github.com/pygobject/pycairo/releases/download/v${VERSION}/pycairo-${VERSION}.tar.gz")
+HASHES=("be2ba51f234270dec340f28f1695a95e")
+
+DEPENDS=("python3" "cairo")
+
+PACKAGE() {
+  tar xf "${NAME}-${VERSION}.tar.gz"
+  cd "${NAME}-${VERSION}"
+
+  python3 -m build --wheel --no-isolation
+  python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -rf "${NAME}-${VERSION}"
+}
diff --git a/src/pycairo/.gitignore b/src/pypi-pygments/.gitignore
similarity index 100%
rename from src/pycairo/.gitignore
rename to src/pypi-pygments/.gitignore
diff --git a/src/pypi-pygments/changes.md b/src/pypi-pygments/changes.md
new file mode 100644
index 0000000..495a92b
--- /dev/null
+++ b/src/pypi-pygments/changes.md
@@ -0,0 +1,5 @@
+# 2.18.0
+Update to new upstream release
+
+# 2.16.1
+First version
diff --git a/src/pypi-pygments/pkg.sh b/src/pypi-pygments/pkg.sh
new file mode 100644
index 0000000..e146f61
--- /dev/null
+++ b/src/pypi-pygments/pkg.sh
@@ -0,0 +1,19 @@
+NAME="pypi-pygments"
+DESC="General syntax highlighter written in Python, for more than 300 languages"
+VERSION="2.18.0"
+
+FILES=("https://pypi.org/packages/source/p/pygments/pygments-${VERSION}.tar.gz")
+HASHES=("786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199")
+
+DEPENDS=("python3")
+BUILD=("sphinx")
+
+PACKAGE() {
+  tar xf "Pygments-${VERSION}.tar.gz"
+  cd "Pygments-${VERSION}"
+
+  python3 -m build --wheel --no-isolation
+  python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "Pygments-${VERSION}"
+}
diff --git a/src/pygments/.gitignore b/src/pypi-pytz/.gitignore
similarity index 100%
rename from src/pygments/.gitignore
rename to src/pypi-pytz/.gitignore
diff --git a/src/pytz/changes.md b/src/pypi-pytz/changes.md
similarity index 100%
rename from src/pytz/changes.md
rename to src/pypi-pytz/changes.md
diff --git a/src/pypi-pytz/pkg.sh b/src/pypi-pytz/pkg.sh
new file mode 100644
index 0000000..a09b25e
--- /dev/null
+++ b/src/pypi-pytz/pkg.sh
@@ -0,0 +1,19 @@
+NAME="pypi-pytz"
+DESC="Brings the IANA tz database into Python"
+VERSION="2024.1"
+
+FILES=("https://files.pythonhosted.org/packages/source/p/pytz/pytz-${VERSION}.tar.gz")
+HASHES=("b26bb090d1fe96064019bf7068eeb801")
+
+DEPENDS=("python3")
+BUILD=()
+
+PACKAGE() {
+  tar xf "pytz-${VERSION}.tar.gz"
+  cd "pytz-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "pytz-${VERSION}"
+}
diff --git a/src/pytz/.gitignore b/src/pypi-pyxdg/.gitignore
similarity index 100%
rename from src/pytz/.gitignore
rename to src/pypi-pyxdg/.gitignore
diff --git a/src/pyxdg/changes.md b/src/pypi-pyxdg/changes.md
similarity index 100%
rename from src/pyxdg/changes.md
rename to src/pypi-pyxdg/changes.md
diff --git a/src/pyxdg/pkg.sh b/src/pypi-pyxdg/pkg.sh
similarity index 50%
rename from src/pyxdg/pkg.sh
rename to src/pypi-pyxdg/pkg.sh
index 55c1269..3d4a9b8 100644
--- a/src/pyxdg/pkg.sh
+++ b/src/pypi-pyxdg/pkg.sh
@@ -1,16 +1,19 @@
-NAME="pyxdg"
+NAME="pypi-pyxdg"
 DESC="Python library to access freedesktop.org standards"
 VERSION="0.28"
-FILES=("https://files.pythonhosted.org/packages/b0/25/7998cd2dec731acbd438fbf91bc619603fc5188de0a9a17699a781840452/pyxdg-$VERSION.tar.gz")
+
+FILES=("https://files.pythonhosted.org/packages/b0/25/7998cd2dec731acbd438fbf91bc619603fc5188de0a9a17699a781840452/pyxdg-${VERSION}.tar.gz")
 HASHES=("d9a1d04fe60c956f5e3b9de3b4ef4722")
+
 DEPENDS=("python3")
+BUILD=()
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "pyxdg-${VERSION}.tar.gz"
+  cd "pyxdg-${VERSION}"
 
   python3 -m build --wheel --no-isolation
-  python3 -m installer --destdir="$ROOTDIR" dist/*.whl
+  python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "pyxdg-${VERSION}"
 }
diff --git a/src/pyxdg/.gitignore b/src/pypi-requests/.gitignore
similarity index 100%
rename from src/pyxdg/.gitignore
rename to src/pypi-requests/.gitignore
diff --git a/src/requests/changes.md b/src/pypi-requests/changes.md
similarity index 100%
rename from src/requests/changes.md
rename to src/pypi-requests/changes.md
diff --git a/src/pypi-requests/pkg.sh b/src/pypi-requests/pkg.sh
new file mode 100644
index 0000000..85ff2d2
--- /dev/null
+++ b/src/pypi-requests/pkg.sh
@@ -0,0 +1,29 @@
+NAME="pypi-requests"
+DESC="Elegant and simple HTTP library for Python"
+VERSION="2.31.0"
+
+FILES=(
+  "https://files.pythonhosted.org/packages/source/r/requests/requests-${VERSION}.tar.gz"
+  "requests-${VERSION}-use_system_certs-1.patch"
+)
+HASHES=(
+  "941e175c276cd7d39d098092c56679a4"
+  "ec8a2cc4f3f7a0df4ed5f576367017010276c59d57260ac7b0060238b2324904"
+)
+
+DEPENDS=(
+  "pypi-urllib3" "pypi-idna" "pypi-charset-normalizer"
+  "python3" "make-ca" "p11-kit"
+)
+BUILD=()
+
+PACKAGE() {
+  tar xf "requests-${VERSION}.tar.gz"
+  cd "requests-${VERSION}"
+
+  patch -Np1 -i "../requests-${VERSION}-use_system_certs-1.patch"
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "requests-${VERSION}"
+}
diff --git a/src/requests/requests-2.31.0-use_system_certs-1.patch b/src/pypi-requests/requests-2.31.0-use_system_certs-1.patch
similarity index 100%
rename from src/requests/requests-2.31.0-use_system_certs-1.patch
rename to src/pypi-requests/requests-2.31.0-use_system_certs-1.patch
diff --git a/src/requests/.gitignore b/src/pypi-six/.gitignore
similarity index 100%
rename from src/requests/.gitignore
rename to src/pypi-six/.gitignore
diff --git a/src/six/changes.md b/src/pypi-six/changes.md
similarity index 100%
rename from src/six/changes.md
rename to src/pypi-six/changes.md
diff --git a/src/six/pkg.sh b/src/pypi-six/pkg.sh
similarity index 51%
rename from src/six/pkg.sh
rename to src/pypi-six/pkg.sh
index 56d7318..7ca2cd8 100644
--- a/src/six/pkg.sh
+++ b/src/pypi-six/pkg.sh
@@ -1,16 +1,19 @@
-NAME="six"
+NAME="pypi-six"
 DESC="Python 2 to 3 compatibility library"
 VERSION="1.16.0"
-FILES=("https://files.pythonhosted.org/packages/source/s/six/six-$VERSION.tar.gz")
+
+FILES=("https://files.pythonhosted.org/packages/source/s/six/six-${VERSION}.tar.gz")
 HASHES=("a7c927740e4964dd29b72cebfc1429bb")
-DEPENDS=()
+
+DEPENDS=("python3")
+BUILD=()
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "six-${VERSION}.tar.gz"
+  cd "six-${VERSION}"
 
   python3 -m build --wheel --no-isolation
-  python3 -m installer --destdir="$ROOTDIR" dist/*.whl
+  python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "six-${VERSION}"
 }
diff --git a/src/six/.gitignore b/src/pypi-snowballstemmer/.gitignore
similarity index 100%
rename from src/six/.gitignore
rename to src/pypi-snowballstemmer/.gitignore
diff --git a/src/snowballstemmer/changes.md b/src/pypi-snowballstemmer/changes.md
similarity index 100%
rename from src/snowballstemmer/changes.md
rename to src/pypi-snowballstemmer/changes.md
diff --git a/src/snowballstemmer/pkg.sh b/src/pypi-snowballstemmer/pkg.sh
similarity index 54%
rename from src/snowballstemmer/pkg.sh
rename to src/pypi-snowballstemmer/pkg.sh
index 383b765..61411cd 100644
--- a/src/snowballstemmer/pkg.sh
+++ b/src/pypi-snowballstemmer/pkg.sh
@@ -1,16 +1,19 @@
-NAME="snowballstemmer"
+NAME="pypi-snowballstemmer"
 DESC="Small string processing language for creating stemming algorithms for use in Information Retrieval"
 VERSION="2.2.0"
-FILES=("https://files.pythonhosted.org/packages/source/s/snowballstemmer/snowballstemmer-$VERSION.tar.gz")
+
+FILES=("https://files.pythonhosted.org/packages/source/s/snowballstemmer/snowballstemmer-${VERSION}.tar.gz")
 HASHES=("4332ddc7bbee0f344a03915b2ad59a54")
+
 DEPENDS=("python3")
+BUILD=()
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "snowballstemmer-${VERSION}.tar.gz"
+  cd "snowballstemmer-${VERSION}"
 
   python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "snowballstemmer-${VERSION}"
 }
diff --git a/src/snowballstemmer/.gitignore b/src/pypi-sphinxcontrib-applehelp/.gitignore
similarity index 100%
rename from src/snowballstemmer/.gitignore
rename to src/pypi-sphinxcontrib-applehelp/.gitignore
diff --git a/src/sphinxcontrib-applehelp/changes.md b/src/pypi-sphinxcontrib-applehelp/changes.md
similarity index 100%
rename from src/sphinxcontrib-applehelp/changes.md
rename to src/pypi-sphinxcontrib-applehelp/changes.md
diff --git a/src/pypi-sphinxcontrib-applehelp/pkg.sh b/src/pypi-sphinxcontrib-applehelp/pkg.sh
new file mode 100644
index 0000000..2b91f93
--- /dev/null
+++ b/src/pypi-sphinxcontrib-applehelp/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-sphinxcontrib-applehelp"
+DESC="Sphinx extension which outputs Apple help books"
+VERSION="1.0.4"
+
+FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-${VERSION}.tar.gz")
+HASHES=("8d52173d3d5c7bd9c0e3da26cd217916")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "sphinxcontrib-applehelp-${VERSION}.tar.gz"
+  cd "sphinxcontrib-applehelp-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "sphinxcontrib-applehelp-${VERSION}"
+}
diff --git a/src/sphinxcontrib-applehelp/.gitignore b/src/pypi-sphinxcontrib-devhelp/.gitignore
similarity index 100%
rename from src/sphinxcontrib-applehelp/.gitignore
rename to src/pypi-sphinxcontrib-devhelp/.gitignore
diff --git a/src/sphinxcontrib-devhelp/changes.md b/src/pypi-sphinxcontrib-devhelp/changes.md
similarity index 100%
rename from src/sphinxcontrib-devhelp/changes.md
rename to src/pypi-sphinxcontrib-devhelp/changes.md
diff --git a/src/pypi-sphinxcontrib-devhelp/pkg.sh b/src/pypi-sphinxcontrib-devhelp/pkg.sh
new file mode 100644
index 0000000..f4bcbfd
--- /dev/null
+++ b/src/pypi-sphinxcontrib-devhelp/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-sphinxcontrib-devhelp"
+DESC="Sphinx extension which outputs Devhelp documents"
+VERSION="1.0.2"
+
+FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-${VERSION}.tar.gz")
+HASHES=("94069c5cdb5079c445f5477fa6107016")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "sphinxcontrib-devhelp-${VERSION}.tar.gz"
+  cd "sphinxcontrib-devhelp-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "sphinxcontrib-devhelp-${VERSION}"
+}
diff --git a/src/sphinxcontrib-devhelp/.gitignore b/src/pypi-sphinxcontrib-htmlhelp/.gitignore
similarity index 100%
rename from src/sphinxcontrib-devhelp/.gitignore
rename to src/pypi-sphinxcontrib-htmlhelp/.gitignore
diff --git a/src/sphinxcontrib-htmlhelp/changes.md b/src/pypi-sphinxcontrib-htmlhelp/changes.md
similarity index 100%
rename from src/sphinxcontrib-htmlhelp/changes.md
rename to src/pypi-sphinxcontrib-htmlhelp/changes.md
diff --git a/src/pypi-sphinxcontrib-htmlhelp/pkg.sh b/src/pypi-sphinxcontrib-htmlhelp/pkg.sh
new file mode 100644
index 0000000..4090c8e
--- /dev/null
+++ b/src/pypi-sphinxcontrib-htmlhelp/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-sphinxcontrib-htmlhelp"
+DESC="Sphinx extension which renders HTML help files"
+VERSION="2.0.1"
+
+FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-${VERSION}.tar.gz")
+HASHES=("e85e6970dc25fbf5fd0f4fa66b897fab")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "sphinxcontrib-htmlhelp-${VERSION}.tar.gz"
+  cd "sphinxcontrib-htmlhelp-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "sphinxcontrib-htmlhelp-${VERSION}"
+}
diff --git a/src/sphinxcontrib-htmlhelp/.gitignore b/src/pypi-sphinxcontrib-jsmath/.gitignore
similarity index 100%
rename from src/sphinxcontrib-htmlhelp/.gitignore
rename to src/pypi-sphinxcontrib-jsmath/.gitignore
diff --git a/src/sphinxcontrib-jsmath/changes.md b/src/pypi-sphinxcontrib-jsmath/changes.md
similarity index 100%
rename from src/sphinxcontrib-jsmath/changes.md
rename to src/pypi-sphinxcontrib-jsmath/changes.md
diff --git a/src/pypi-sphinxcontrib-jsmath/pkg.sh b/src/pypi-sphinxcontrib-jsmath/pkg.sh
new file mode 100644
index 0000000..686cf75
--- /dev/null
+++ b/src/pypi-sphinxcontrib-jsmath/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-sphinxcontrib-jsmath"
+DESC="Sphinx extension which renders display math in HTML via JavaScript"
+VERSION="1.0.1"
+
+FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-${VERSION}.tar.gz")
+HASHES=("e45179f0a3608b6766862e0f34c23b62")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "sphinxcontrib-jsmath-${VERSION}.tar.gz"
+  cd "sphinxcontrib-jsmath-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "sphinxcontrib-jsmath-${VERSION}"
+}
diff --git a/src/sphinxcontrib-jsmath/.gitignore b/src/pypi-sphinxcontrib-qthelp/.gitignore
similarity index 100%
rename from src/sphinxcontrib-jsmath/.gitignore
rename to src/pypi-sphinxcontrib-qthelp/.gitignore
diff --git a/src/sphinxcontrib-qthelp/changes.md b/src/pypi-sphinxcontrib-qthelp/changes.md
similarity index 100%
rename from src/sphinxcontrib-qthelp/changes.md
rename to src/pypi-sphinxcontrib-qthelp/changes.md
diff --git a/src/pypi-sphinxcontrib-qthelp/pkg.sh b/src/pypi-sphinxcontrib-qthelp/pkg.sh
new file mode 100644
index 0000000..2db9b6a
--- /dev/null
+++ b/src/pypi-sphinxcontrib-qthelp/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-sphinxcontrib-qthelp"
+DESC="Sphinx extension which outputs QtHelp documents"
+VERSION="1.0.3"
+
+FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-${VERSION}.tar.gz")
+HASHES=("93216721f3e154cce12d1e9c3307b415")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "sphinxcontrib-qthelp-${VERSION}.tar.gz"
+  cd "sphinxcontrib-qthelp-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "sphinxcontrib-qthelp-${VERSION}"
+}
diff --git a/src/sphinxcontrib-qthelp/.gitignore b/src/pypi-sphinxcontrib-serializinghtml/.gitignore
similarity index 100%
rename from src/sphinxcontrib-qthelp/.gitignore
rename to src/pypi-sphinxcontrib-serializinghtml/.gitignore
diff --git a/src/sphinxcontrib-serializinghtml/changes.md b/src/pypi-sphinxcontrib-serializinghtml/changes.md
similarity index 100%
rename from src/sphinxcontrib-serializinghtml/changes.md
rename to src/pypi-sphinxcontrib-serializinghtml/changes.md
diff --git a/src/pypi-sphinxcontrib-serializinghtml/pkg.sh b/src/pypi-sphinxcontrib-serializinghtml/pkg.sh
new file mode 100644
index 0000000..cad07fb
--- /dev/null
+++ b/src/pypi-sphinxcontrib-serializinghtml/pkg.sh
@@ -0,0 +1,18 @@
+NAME="pypi-sphinxcontrib-serializinghtml"
+DESC="Sphinx extension which outputs \"serialized\" HTML files (json and pickle)"
+VERSION="1.1.9"
+
+FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-${VERSION}.tar.gz")
+HASHES=("84957dfa6d85d2e509181281082c11ee")
+
+DEPENDS=("python3")
+
+PACKAGE() {
+  tar xf "sphinxcontrib-serializinghtml-${VERSION}.tar.gz"
+  cd "sphinxcontrib-serializinghtml-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "sphinxcontrib-serializinghtml-${VERSION}"
+}
diff --git a/src/sphinxcontrib-serializinghtml/.gitignore b/src/pypi-urllib3/.gitignore
similarity index 100%
rename from src/sphinxcontrib-serializinghtml/.gitignore
rename to src/pypi-urllib3/.gitignore
diff --git a/src/urllib3/changes.md b/src/pypi-urllib3/changes.md
similarity index 100%
rename from src/urllib3/changes.md
rename to src/pypi-urllib3/changes.md
diff --git a/src/urllib3/pkg.sh b/src/pypi-urllib3/pkg.sh
similarity index 50%
rename from src/urllib3/pkg.sh
rename to src/pypi-urllib3/pkg.sh
index f8e9d20..745ccd7 100644
--- a/src/urllib3/pkg.sh
+++ b/src/pypi-urllib3/pkg.sh
@@ -1,16 +1,18 @@
-NAME="urllib3"
+NAME="pypi-urllib3"
 DESC="Powerful, user-friendly HTTP client for Python"
 VERSION="2.0.2"
-FILES=("https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-$VERSION.tar.gz")
+
+FILES=("https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-${VERSION}.tar.gz")
 HASHES=("92d23af401c19da3daec9934f60c8575")
-DEPENDS=("hatchling")
+
+DEPENDS=("python3" "pypi-hatchling")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "urllib3-${VERSION}.tar.gz"
+  cd "urllib3-${VERSION}"
 
   python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "urllib3-${VERSION}"
 }
diff --git a/src/pytz/pkg.sh b/src/pytz/pkg.sh
deleted file mode 100644
index 09abf60..0000000
--- a/src/pytz/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="pytz"
-DESC="Brings the IANA tz database into Python"
-VERSION="2022.7.1"
-FILES=("https://files.pythonhosted.org/packages/source/p/pytz/pytz-$VERSION.tar.gz")
-HASHES=("5acd981a81dcdc6aadddf4d7e5116b98")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/requests/pkg.sh b/src/requests/pkg.sh
deleted file mode 100644
index 1216705..0000000
--- a/src/requests/pkg.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-NAME="requests"
-DESC="Elegant and simple HTTP library for Python"
-VERSION="2.31.0"
-FILES=(
-  "https://files.pythonhosted.org/packages/source/r/requests/requests-$VERSION.tar.gz"
-  "requests-$VERSION-use_system_certs-1.patch"
-)
-HASHES=(
-  "941e175c276cd7d39d098092c56679a4"
-  "ec8a2cc4f3f7a0df4ed5f576367017010276c59d57260ac7b0060238b2324904"
-)
-DEPENDS=(
-  "make-ca" "p11-kit" "urllib3"
-  "idna" "charset-normalizer" "python3"
-)
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  patch -Np1 -i ../requests-$VERSION-use_system_certs-1.patch
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/sphinx/pkg.sh b/src/sphinx/pkg.sh
index 8223a2a..401cafe 100644
--- a/src/sphinx/pkg.sh
+++ b/src/sphinx/pkg.sh
@@ -1,22 +1,23 @@
 NAME="sphinx"
 DESC="Set of tools for translating some structured text formats into pretty documentation in various formats"
 VERSION="7.1.2"
-FILES=("https://github.com/sphinx-doc/sphinx/archive/v$VERSION/sphinx-$VERSION.tar.gz")
+FILES=("https://github.com/sphinx-doc/sphinx/archive/v${VERSION}/sphinx-${VERSION}.tar.gz")
 HASHES=("ae8427a2035ebd4359c3df8f5436c4b9")
 DEPENDS=(
-  "alabaster" "babel" "docutils"
-  "imagesize" "packaging" "pygments" 
-  "requests" "snowballstemmer" "sphinxcontrib-applehelp" 
-  "sphinxcontrib-devhelp" "sphinxcontrib-htmlhelp" "sphinxcontrib-jsmath"
-  "sphinxcontrib-qthelp" "sphinxcontrib-serializinghtml"
+  "pypi-alabaster" "pypi-babel" "pypi-docutils"
+  "pypi-imagesize" "pypa-packaging" "pypi-pygments" 
+  "pypi-requests" "pypi-snowballstemmer"
+  
+  "pypi-sphinxcontrib-applehelp" "pypi-sphinxcontrib-devhelp" "pypi-sphinxcontrib-htmlhelp"
+  "pypi-sphinxcontrib-jsmath" "pypi-sphinxcontrib-qthelp" "pypi-sphinxcontrib-serializinghtml"
 )
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
+  tar xf "${NAME}-${VERSION}.tar.gz"
+  cd "${NAME}-${VERSION}"
 
   python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "${NAME}-${VERSION}"
 }
diff --git a/src/sphinxcontrib-applehelp/pkg.sh b/src/sphinxcontrib-applehelp/pkg.sh
deleted file mode 100644
index 0b8c7bb..0000000
--- a/src/sphinxcontrib-applehelp/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="sphinxcontrib-applehelp"
-DESC="Sphinx extension which outputs Apple help books"
-VERSION="1.0.4"
-FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-$VERSION.tar.gz")
-HASHES=("8d52173d3d5c7bd9c0e3da26cd217916")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/sphinxcontrib-devhelp/pkg.sh b/src/sphinxcontrib-devhelp/pkg.sh
deleted file mode 100644
index 99f416d..0000000
--- a/src/sphinxcontrib-devhelp/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="sphinxcontrib-devhelp"
-DESC="Sphinx extension which outputs Devhelp documents"
-VERSION="1.0.2"
-FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-$VERSION.tar.gz")
-HASHES=("94069c5cdb5079c445f5477fa6107016")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/sphinxcontrib-htmlhelp/pkg.sh b/src/sphinxcontrib-htmlhelp/pkg.sh
deleted file mode 100644
index c5a5f65..0000000
--- a/src/sphinxcontrib-htmlhelp/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="sphinxcontrib-htmlhelp"
-DESC="Sphinx extension which renders HTML help files"
-VERSION="2.0.1"
-FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-$VERSION.tar.gz")
-HASHES=("e85e6970dc25fbf5fd0f4fa66b897fab")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/sphinxcontrib-jsmath/pkg.sh b/src/sphinxcontrib-jsmath/pkg.sh
deleted file mode 100644
index 7d8de30..0000000
--- a/src/sphinxcontrib-jsmath/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="sphinxcontrib-jsmath"
-DESC="Sphinx extension which renders display math in HTML via JavaScript"
-VERSION="1.0.1"
-FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-$VERSION.tar.gz")
-HASHES=("e45179f0a3608b6766862e0f34c23b62")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/sphinxcontrib-qthelp/pkg.sh b/src/sphinxcontrib-qthelp/pkg.sh
deleted file mode 100644
index 26917c0..0000000
--- a/src/sphinxcontrib-qthelp/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="sphinxcontrib-qthelp"
-DESC="Sphinx extension which outputs QtHelp documents"
-VERSION="1.0.3"
-FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-$VERSION.tar.gz")
-HASHES=("93216721f3e154cce12d1e9c3307b415")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/sphinxcontrib-serializinghtml/pkg.sh b/src/sphinxcontrib-serializinghtml/pkg.sh
deleted file mode 100644
index 8f16da8..0000000
--- a/src/sphinxcontrib-serializinghtml/pkg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME="sphinxcontrib-serializinghtml"
-DESC="Sphinx extension which outputs \"serialized\" HTML files (json and pickle)"
-VERSION="1.1.5"
-FILES=("https://files.pythonhosted.org/packages/source/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-$VERSION.tar.gz")
-HASHES=("d99d2edc7b26988dc5fa92163857bfbf")
-DEPENDS=("python3")
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-$VERSION
-
-  python3 -m build --wheel --skip-dependency-check --no-isolation
-  PYTHONPATH=src python3 -m installer --destdir="$ROOTDIR" dist/*.whl
-
-  cd .. && rm -r $NAME-$VERSION
-}
diff --git a/src/urllib3/.gitignore b/src/urllib3/.gitignore
deleted file mode 100644
index 8b56c9f..0000000
--- a/src/urllib3/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.cache/
-dist/
-root/