diff --git a/packages/archive/python2/gconf/PKGBUILD b/packages/archive/python2/gconf/PKGBUILD
deleted file mode 100644
index 3276ebb6c..000000000
--- a/packages/archive/python2/gconf/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gconf
-pkgver=3.2.6+11+g07808097
-pkgrel=6
-pkgdesc='An obsolete configuration database system.'
-url="https://projects-old.gnome.org/gconf/"
-arch=('x86_64' 'aarch64')
-license=(LGPL)
-depends=(libxml2 polkit libldap dbus-glib python2)
-makedepends=(intltool gtk-doc gobject-introspection git gnome-common)
-install=gconf.install
-_commit=0780809731c8ab1c364202b1900d3df106b28626  # master
-source=("git+https://gitlab.gnome.org/Archive/gconf.git#commit=$_commit"
-        01_xml-gettext-domain.patch gconf-reload.patch
-        gconf-merge-schema gconfpkg gconf-{install,remove}.hook)
-sha256sums=('SKIP'
-            'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8'
-            '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
-            'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
-            'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
-            '2732b2a6b187c5620105a036bde12edee99669605f70cbde56fe5f39619c3dc0'
-            '436a65ff290095bc3d35d7d6297cf4d647f61e9f9922cea7ef9f1e251b447ff7')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # Patch from fedora - reloads gconf after installing schemas
-  patch -Np1 -i ../gconf-reload.patch
-
-  # http://bugzilla.gnome.org/show_bug.cgi?id=568845
-  patch -Np1 -i ../01_xml-gettext-domain.patch
-
-  # Python2 fix
-  sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib \
-    --enable-defaults-service \
-    --disable-gtk-doc \
-    --disable-static \
-    --disable-orbit
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-check() {
-  cd $pkgname
-  make check
-}
-
-package() {
-  DESTDIR="$pkgdir" make -C $pkgname install
-
-  install -d "$pkgdir/etc/gconf/gconf.xml.system"
-  install -Dt "$pkgdir/usr/bin" gconf-merge-schema gconfpkg
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
-
-  # fix dbus policy location - --with-dbusdir doens't work
-  install -dm755 ${pkgdir}/usr/share/dbus-1/system.d
-  mv ${pkgdir}/etc/dbus-1/system.d/* ${pkgdir}/usr/share/dbus-1/system.d
-  rm -rf ${pkgdir}/etc/dbus-1
-}
-
diff --git a/packages/pentesting/dizzy/PKGBUILD b/packages/archive/unmaintained/dizzy/PKGBUILD
similarity index 100%
rename from packages/pentesting/dizzy/PKGBUILD
rename to packages/archive/unmaintained/dizzy/PKGBUILD
diff --git a/packages/pentesting/nettacker/PKGBUILD b/packages/archive/unmaintained/nettacker/PKGBUILD
similarity index 100%
rename from packages/pentesting/nettacker/PKGBUILD
rename to packages/archive/unmaintained/nettacker/PKGBUILD
diff --git a/packages/libs/python/python-canari/PKGBUILD b/packages/archive/unmaintained/python-canari/PKGBUILD
similarity index 97%
rename from packages/libs/python/python-canari/PKGBUILD
rename to packages/archive/unmaintained/python-canari/PKGBUILD
index 0069f2f1b..47b94a918 100644
--- a/packages/libs/python/python-canari/PKGBUILD
+++ b/packages/archive/unmaintained/python-canari/PKGBUILD
@@ -2,7 +2,7 @@
 # See COPYING for license details.
 
 pkgname=python-canari
-_pkgname=${pkgbase#python-}
+_pkgname=${pkgname#python-}
 pkgver=3.3.10
 pkgrel=6
 groups=('athena' 'athena-forensic' 'athena-recon' 'athena-scanner')
diff --git a/packages/libs/python/python-safedexml/PKGBUILD b/packages/archive/unmaintained/python-safedexml/PKGBUILD
similarity index 62%
rename from packages/libs/python/python-safedexml/PKGBUILD
rename to packages/archive/unmaintained/python-safedexml/PKGBUILD
index 917a64ffa..6e5da2c37 100644
--- a/packages/libs/python/python-safedexml/PKGBUILD
+++ b/packages/archive/unmaintained/python-safedexml/PKGBUILD
@@ -2,37 +2,28 @@
 # See COPYING for license details.
 
 pkgname=python-safedexml
-_pkgname=safedexml
+_pkgname=${pkgname#python-}
 pkgver=0.5.1
 pkgrel=7
 pkgdesc='A defusedxml version of dead-simple Object-XML mapper for Python.'
 arch=('any')
 url='https://pypi.org/project/safedexml/#files'
 license=('MIT')
-makedepends=('python-setuptools')
+depends=('python' 'python-defusedxml')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+options=(!emptydirs)
 source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz")
 sha512sums=('3e9ebef0044d3319aae98a71cdb9790639c8eaadd9bd0775aa95c4bf56daaa1bd79614ee1600a347f757365ef447ce973e0b4e596a3d500b9c148a94efb0ee0a')
 
 build() {
   cd "$_pkgname-$pkgver"
 
-  python setup.py build
-}
-
-package_python2-safedexml() {
-  depends=('python2' 'python2-defusedxml')
-
-
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \
-    --skip-build
+  python -m build --wheel --no-isolation
 }
 
 package() {
-  depends=('python' 'python-defusedxml')
-
   cd "$_pkgname-$pkgver"
 
-  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \
-    --skip-build
+  python -m installer --destdir="$pkgdir" dist/*.whl
 }
 
diff --git a/packages/pentesting/rapidscan/PKGBUILD b/packages/archive/unmaintained/rapidscan/PKGBUILD
similarity index 100%
rename from packages/pentesting/rapidscan/PKGBUILD
rename to packages/archive/unmaintained/rapidscan/PKGBUILD
diff --git a/packages/pentesting/vulnerabilities-spider/PKGBUILD b/packages/archive/unmaintained/vulnerabilities-spider/PKGBUILD
similarity index 100%
rename from packages/pentesting/vulnerabilities-spider/PKGBUILD
rename to packages/archive/unmaintained/vulnerabilities-spider/PKGBUILD
diff --git a/packages/libs/python/python-requests-futures/PKGBUILD b/packages/libs/python/python-requests-futures/PKGBUILD
index a93947fc3..03a4bcc5d 100644
--- a/packages/libs/python/python-requests-futures/PKGBUILD
+++ b/packages/libs/python/python-requests-futures/PKGBUILD
@@ -2,37 +2,28 @@
 # See COPYING for license details.
 
 pkgname=python-requests-futures
-_pkgname=requests-futures
-pkgver=1.0.1
+_pkgname=requests_futures
+pkgver=1.0.2
 pkgrel=1
 pkgdesc='Asynchronous Python HTTP for Humans.'
 arch=('any')
 url='https://pypi.org/project/requests-futures/#files'
 license=('Apache-2.0')
-makedepends=('python-setuptools')
+depends=('python' 'python-certifi' 'python-charset-normalizer' 'python-idna' 'python-requests' 'python-urllib3')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+options=(!emptydirs)
 source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz")
-sha512sums=('e95c2ae8a97f314a6f2ec02ab1d4b456cd673599dea9cf4abd9f2c601ea7ea4b48a6595d4b52bd5c717cfcbbb378be8789d6f63dfb58fb2aa4778db408521730')
+sha512sums=('1d163ffe45a09e0160710cf8bd060f741a524e60d69318af7c03a3b5dc41f27f4f7d115faed227bb710b29ffdb230a7ef5991e33ab2ad4e25b3c52727ef76fc7')
 
 build() {
   cd "$_pkgname-$pkgver"
 
-  python setup.py build
-}
-
-package_python2-requests-futures() {
-  depends=('python2' 'python2-requests' 'python2-futures')
-
-
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \
-    --skip-build
+  python -m build --wheel --no-isolation
 }
 
 package() {
-  depends=('python' 'python-requests' 'python2-futures')
-
   cd "$_pkgname-$pkgver"
 
-  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \
-    --skip-build
+  python -m installer --destdir="$pkgdir" dist/*.whl
 }
 
diff --git a/packages/os-specific/roles/athena-dos-role/PKGBUILD b/packages/os-specific/roles/athena-dos-role/PKGBUILD
index 503f9fcc9..8eaa9da6d 100644
--- a/packages/os-specific/roles/athena-dos-role/PKGBUILD
+++ b/packages/os-specific/roles/athena-dos-role/PKGBUILD
@@ -4,8 +4,8 @@ pkgrel=2
 pkgdesc="DoS Attacker Role tools."
 arch=('any')
 license=("custom")
-depends=('blacknurse' 'davoset' 'ddosify' 'dhcpig' 'dnsdrdos' 'fhttp'
-         'goldeneye' 'habu' 'httpbog' 'hulk' 'iaxflood' 'impulse' 'inviteflood'
-         'nkiller2' 'ntpdos' 'phpstress' 'pwnloris' 'slowloris' 'slowloris-py'
-         'synflood' 'synner' 't50' 'tcgetkey' 'thc-ssl-dos' 'torshammer'
-         'ufonet' 'wifi-pumpkin' 'wreckuests')
+depends=('blacknurse' 'davoset' 'ddosify' 'dnsdrdos' 'fhttp' 'goldeneye'
+         'habu' 'httpbog' 'hulk' 'iaxflood' 'impulse' 'inviteflood' 'nkiller2'
+         'ntpdos' 'phpstress' 'pwnloris' 'slowloris' 'slowloris-py' 'synflood'
+         'synner' 't50' 'tcgetkey' 'thc-ssl-dos' 'ufonet' 'wifi-pumpkin'
+         'wreckuests')
diff --git a/packages/os-specific/roles/athena-redteamer-role/PKGBUILD b/packages/os-specific/roles/athena-redteamer-role/PKGBUILD
index 23cf14a93..4c492f7eb 100644
--- a/packages/os-specific/roles/athena-redteamer-role/PKGBUILD
+++ b/packages/os-specific/roles/athena-redteamer-role/PKGBUILD
@@ -5,6 +5,6 @@ pkgdesc="Red Teamer Role tools."
 arch=('any')
 license=("custom")
 depends=('athena-cracker' 'athena-database' 'athena-debugger'
-         'athena-decompiler' 'athena-exploitation athena-fuzzer'
+         'athena-decompiler' 'athena-exploitation' 'athena-fuzzer'
          'athena-networking' 'athena-recon' 'athena-scanner' 'athena-sniffer'
          'athena-spoof' 'athena-webapp' 'athena-windows')
diff --git a/packages/pentesting/caido-cli/PKGBUILD b/packages/pentesting/caido-cli/PKGBUILD
index bd4d8ce7d..b8e771636 100644
--- a/packages/pentesting/caido-cli/PKGBUILD
+++ b/packages/pentesting/caido-cli/PKGBUILD
@@ -1,19 +1,18 @@
 # Credits Athena OS ( https://athenaos.org/ )
 
 pkgname=caido-cli
-pkgver=0.44.1
+pkgver=0.45.1
 pkgrel=1
 groups=('athena' 'athena-webapp' 'athena-proxy' 'athena-scanner' 'athena-fuzzer')
-pkgdesc="A lightweight web security auditing toolkit."
+pkgdesc='A lightweight web security auditing toolkit.'
 arch=('x86_64' 'aarch64' 'armv7h')
-url="https://caido.io/"
+url='https://caido.io/'
 license=('private')
-depends=(gcc-libs glibc)
-conflicts=('caido-desktop')
+depends=('gcc-libs' 'glibc')
 source_x86_64=("$pkgname-$pkgver-x86_64.tar.gz::https://caido.download/releases/v${pkgver}/caido-cli-v${pkgver}-linux-x86_64.tar.gz")
 source_aarch64=("$pkgname-$pkgver-aarch64.tar.gz::https://caido.download/releases/v${pkgver}/caido-cli-v${pkgver}-linux-aarch64.tar.gz")
-sha512sums_x86_64=('c8cda43b296e13eab7e24ab3692584f9f99f75c5651daa15c2dd56efd333fece2f13c3f2c3184fa62cd2bed47e77a8c9cd43058fb5154ea8c719e77ab5ae7a31')
-sha512sums_aarch64=('b3b091907078c70f36e438563ec917c3330766392434adbd025e04e4c68f8d05c4b624bf666ceee4026782590f8f81e86654fea84c8eb952eb4a9bab052f0746')
+sha512sums_x86_64=('e3ded7b4ce03ec1d13574a3fd2fa66642d1fd2a4b8fa083616c80ab3097f1f961950b88a80cb64731c288474614efcf971b55b4c4f70e494deb3423ac08481c6')
+sha512sums_aarch64=('ec0c7d2df0123287e92e7add3c012ed9d64ca57d01badaff354a87357b24a5135fc09071eeb60283d17fcd76a577b2925f9c3c52e7cb44f32dc49776815baa3f')
 
 package() {
   install -Dm755 caido-cli -t $pkgdir/usr/bin
diff --git a/packages/pentesting/caido-desktop/PKGBUILD b/packages/pentesting/caido-desktop/PKGBUILD
index 5124e1b3e..520f8ce6c 100644
--- a/packages/pentesting/caido-desktop/PKGBUILD
+++ b/packages/pentesting/caido-desktop/PKGBUILD
@@ -1,17 +1,17 @@
 # AUR ( https://aur.archlinux.org/ )
 
 pkgname=caido-desktop
-pkgver=0.44.1
+pkgver=0.45.1
 pkgrel=1
 groups=('athena' 'athena-webapp' 'athena-proxy' 'athena-scanner' 'athena-fuzzer')
-pkgdesc="A lightweight web security auditing toolkit."
+pkgdesc='A lightweight web security auditing toolkit.'
 arch=('x86_64')
-url="https://caido.io/"
+url='https://caido.io/'
 license=('private')
-depends=(glibc gcc-libs)
+depends=('glibc' 'gcc-libs')
 provides=(caido)
 source=("https://caido.download/releases/v${pkgver}/caido-desktop-v${pkgver}-linux-x86_64.AppImage")
-sha512sums=('d69621bdf526a8260d89c9ad5eec51052d23f898bec35c7cc455864879569e5297b343d6ff9ee1742779d661854276b33243d298dc737e56065e8bc4b5f4466b')
+sha512sums=('cc83eaf715658163142c952b1c6215a70a7c99c4e4d9561051e9e6ad2e04db1cb9a47370552dcff23b69df6e3a5cbd89e04a1b6d8807e1c6c4914a82bde8527e')
 
 prepare() {
   chmod +x *.AppImage
diff --git a/packages/pentesting/frida-tools/PKGBUILD b/packages/pentesting/frida-tools/PKGBUILD
index d8d83b7d9..64958793b 100644
--- a/packages/pentesting/frida-tools/PKGBUILD
+++ b/packages/pentesting/frida-tools/PKGBUILD
@@ -1,57 +1,33 @@
 # Credits BlackArch ( https://www.blackarch.org/ ).
 # See COPYING for license details.
 
-pkgbase=frida-tools
-pkgname=('python2-frida-tools' 'python-frida-tools')
-_pkgname=frida-tools
-pkgver=11.0.0
-pkgrel=2
+pkgname=python-frida-tools
+_pkgname=${pkgname#python-}
+pkgver=13.6.1
+pkgrel=1
 pkgdesc='Frida CLI tools.'
 groups=('athena' 'athena-mobile' 'athena-binary' 'athena-reversing')
 arch=('any')
 url='https://pypi.org/project/frida-tools/#files'
 license=('custom:unknown')
-makedepends=('python2-setuptools' 'python-setuptools')
-source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$pkgbase-$pkgver.tar.gz"
+depends=('python' 'python-frida' 'python-colorama' 'python-prompt_toolkit'
+         'python-pygments' 'libimobiledevice')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+options=(!emptydirs)
+source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
         'setup.py.patch')
-sha512sums=('31ed33ea0a652f9f7c0055c1770663bbace60ef9e15446ddc71719878fee78b1907b63b7ca12527972a41f2021d770c77a4cc52ee8ed88c4c53a089f15298527'
+sha512sums=('551dbbdf5d2e7dbf2df69242ff6c5a47e1db5f887136d345bec69a7f5e28cf794b319d5be7b39ebe4ab2a234bbbe859bf6b9f38f7374003faa3df029584304e9'
             '48dc1d48f21e0d5672b7b628aca40c2431687608c4e228fbace9c88172b13103814af6ef9abebb4539fafa5700787b9af2c86b0c3b7988c805711db7458186e4')
 
-prepare() {
-  #patch -p1 < setup.py.patch
-
-  cp -a "$pkgbase-$pkgver"{,-2}
-}
-
 build() {
-  cd "$pkgbase-$pkgver-2"
+  cd "$_pkgname-$pkgver"
 
-  python2 setup.py build
-
-  cd "$srcdir/$pkgbase-$pkgver"
-
-  python setup.py build
+  python -m build --wheel --no-isolation
 }
 
-package_python2-frida-tools() {
-  depends=('python2' 'python2-frida' 'python2-colorama' 'python2-prompt_toolkit'
-           'python2-pygments' 'libimobiledevice')
-
-  cd "$pkgbase-$pkgver-2"
-
-  python2 setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build
-
-  for i in "$pkgdir/usr/bin/"* ; do
-    mv $i "${i}2"
-  done
-}
-
-package_python-frida-tools() {
-  depends=('python' 'python-frida' 'python-colorama' 'python-prompt_toolkit'
-           'python-pygments' 'libimobiledevice')
-
-  cd "$pkgbase-$pkgver"
+package() {
+  cd "$_pkgname-$pkgver"
 
-  python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build
+  python -m installer --destdir="$pkgdir" dist/*.whl
 }
 
diff --git a/packages/archive/python2/gconf/01_xml-gettext-domain.patch b/packages/pentesting/gconf/01_xml-gettext-domain.patch
similarity index 100%
rename from packages/archive/python2/gconf/01_xml-gettext-domain.patch
rename to packages/pentesting/gconf/01_xml-gettext-domain.patch
diff --git a/packages/pentesting/gconf/PKGBUILD b/packages/pentesting/gconf/PKGBUILD
new file mode 100644
index 000000000..14074182b
--- /dev/null
+++ b/packages/pentesting/gconf/PKGBUILD
@@ -0,0 +1,82 @@
+# Maintainer: João Figueiredo <islandc0der@chaotic.cx>
+# Contributor: Jan de Groot <jan@archlinux.org>
+
+pkgname=gconf
+pkgver=3.2.6+11+g07808097
+pkgrel=11
+pkgdesc='An obsolete configuration database system'
+url='https://projects-old.gnome.org/gconf/'
+arch=('x86_64' 'aarch64')
+license=('LGPL')
+depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'python')
+makedepends=('git' 'intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common' 'glib2-devel')
+install=gconf.install
+_commit=0780809731c8ab1c364202b1900d3df106b28626 # The latest and last commit, dug out from deep within the waves of time...
+source=("git+https://gitlab.gnome.org/Archive/gconf.git#commit=$_commit"
+        "01_xml-gettext-domain.patch"
+        "gconf-reload.patch"
+        "gconf-merge-schema"
+        "gconfpkg"
+        "gconf-install.hook"
+        "gconf-remove.hook"
+        "gsettings-schema-convert.patch")
+sha512sums=('1b7c0263581710f5bbe6155938b37e1bc42eb79a91e84caae3df5c3bee9adbe5225401873fc11d86f73102590d11394384b8a295e8cac613d576152009bb3e79'
+            '08c2bb7872816ec8a272bf393793167b2e2a285ede419f1385380bda34b55cdb08f9d5599714960407ad3549f1b03590ca39b3511ba33eec5aeea33d37521b5f'
+            '1af1d0c926d622794b5d2f21646783c276a8a5c2c6d8b8236804bfcaeb71ab40c6658b17eb4599ca01fb8fe33a513ebe7ec9e8c23e9a21ccae622f6d10aa5657'
+            '0d2a099c772c9fbe535b6c5c35078038987d214a2b68f2d589f46b8bf4e5a8c604624363cd32747b6447d04037d2fb0870502982425629af25ac3ef8ebb2cde4'
+            'c1a180fdbd88415f4d0277919bdd3af8c1003e44f81a6ab7f7c341a4065f9e01e320e639177ad93d53463ceecb7f1331171980edabcebdc10998d7f16c490494'
+            'b4c8f1a3dbb9edf6fde6e129a5673f4e47193fd77e4bdf669f1737e127e3aff9154ad3808780b9a983f6b2e43ff0c60a212b749d7190684b2a02cb0a4ac7dfc4'
+            '563ac014f398022ae00d1bad9518a5c3387deb4794ac12e9e88ca3b66f51d65573fd7f7737be5e0444916473c5cf47cc70b74292c3fcf3f812411a57f25af8f9'
+            '1ac33a89aa163e9e72ea88deb1afe2914f18430bda39e290815469bf86d7c516271df102d10b787b2736fb078b6ac26d06fe7de00473ebd1e6f6219cc1688477')
+
+prepare() {
+  cd $pkgname
+
+  # Patch from fedora - reloads gconf after installing schemas
+  patch -Np1 -i ../gconf-reload.patch
+
+  # http://bugzilla.gnome.org/show_bug.cgi?id=568845
+  patch -Np1 -i ../01_xml-gettext-domain.patch
+
+  # The following line copied from Fedora
+  # https://src.fedoraproject.org/rpms/GConf2/blob/70ed26d67b563d858a84505622d11f41879a6b37/f/GConf2.spec#_90
+  #2to3-2.7 --write --nobackup gsettings/gsettings-schema-convert
+  patch -Np1 -i ../gsettings-schema-convert.patch
+
+  sed -i '1s|#!/usr/bin/env python$|#!/usr/bin/python|' gsettings/gsettings-schema-convert
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib \
+    --enable-defaults-service \
+    --disable-gtk-doc \
+    --disable-static \
+    --disable-orbit
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd $pkgname
+  make check
+}
+
+package() {
+  DESTDIR="$pkgdir" make -C $pkgname install
+
+  install -d "$pkgdir/etc/gconf/gconf.xml.system"
+  install -D gconf-merge-schema gconfpkg -t "$pkgdir/usr/bin"
+  install -Dm644 ./*.hook -t "$pkgdir/usr/share/libalpm/hooks"
+
+  # fix dbus policy location - --with-dbusdir doesn't work
+  install -Dm644 "$pkgdir/etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf" -t "$pkgdir/usr/share/dbus-1/system.d"
+  rm -rf "$pkgdir/etc/dbus-1/"
+}
+
diff --git a/packages/archive/python2/gconf/gconf-install.hook b/packages/pentesting/gconf/gconf-install.hook
similarity index 100%
rename from packages/archive/python2/gconf/gconf-install.hook
rename to packages/pentesting/gconf/gconf-install.hook
diff --git a/packages/archive/python2/gconf/gconf-merge-schema b/packages/pentesting/gconf/gconf-merge-schema
old mode 100644
new mode 100755
similarity index 100%
rename from packages/archive/python2/gconf/gconf-merge-schema
rename to packages/pentesting/gconf/gconf-merge-schema
diff --git a/packages/archive/python2/gconf/gconf-reload.patch b/packages/pentesting/gconf/gconf-reload.patch
similarity index 100%
rename from packages/archive/python2/gconf/gconf-reload.patch
rename to packages/pentesting/gconf/gconf-reload.patch
diff --git a/packages/archive/python2/gconf/gconf-remove.hook b/packages/pentesting/gconf/gconf-remove.hook
similarity index 100%
rename from packages/archive/python2/gconf/gconf-remove.hook
rename to packages/pentesting/gconf/gconf-remove.hook
diff --git a/packages/archive/python2/gconf/gconf.install b/packages/pentesting/gconf/gconf.install
similarity index 100%
rename from packages/archive/python2/gconf/gconf.install
rename to packages/pentesting/gconf/gconf.install
diff --git a/packages/archive/python2/gconf/gconfpkg b/packages/pentesting/gconf/gconfpkg
old mode 100644
new mode 100755
similarity index 100%
rename from packages/archive/python2/gconf/gconfpkg
rename to packages/pentesting/gconf/gconfpkg
diff --git a/packages/pentesting/gconf/gsettings-schema-convert.patch b/packages/pentesting/gconf/gsettings-schema-convert.patch
new file mode 100644
index 000000000..77b57f615
--- /dev/null
+++ b/packages/pentesting/gconf/gsettings-schema-convert.patch
@@ -0,0 +1,113 @@
+--- a/gsettings/gsettings-schema-convert	2025-01-18 22:56:50.528053798 +0100
++++ b/gsettings/gsettings-schema-convert	2025-01-18 22:59:44.793451036 +0100
+@@ -398,7 +398,7 @@
+ 
+     def _word_to_token(self, word):
+         lower = word.lower()
+-        if lower and lower in self.allowed_tokens.keys():
++        if lower and lower in list(self.allowed_tokens.keys()):
+             return lower
+         raise GSettingsSchemaConvertException('\'%s\' is not a valid token.' % lower)
+ 
+@@ -603,7 +603,7 @@
+             for line in lines:
+                 current_line_nb += 1
+                 self.parse_line(line)
+-        except GSettingsSchemaConvertException, e:
++        except GSettingsSchemaConvertException as e:
+             raise GSettingsSchemaConvertException('%s:%s: %s' % (os.path.basename(self.file), current_line_nb, e))
+ 
+         return self.root
+@@ -711,7 +711,7 @@
+             schema = self._parse_schema(schema_node)
+ 
+             for (child_schema, child_name) in schema._children:
+-                if parent.has_key(child_schema):
++                if child_schema in parent:
+                     raise GSettingsSchemaConvertException('Child \'%s\' is declared by two different schemas: \'%s\' and \'%s\'.' % (child_schema, parent[child_schema], schema.id))
+                 parent[child_schema] = schema
+ 
+@@ -719,7 +719,7 @@
+ 
+         # now let's move all schemas where they should leave
+         for schema in schemas:
+-            if parent.has_key(schema.id):
++            if schema.id in parent:
+                 parent_schema = parent[schema.id]
+ 
+                 # check that the paths of parent and child are supported by
+@@ -1054,31 +1054,31 @@
+     (options, args) = parser.parse_args()
+ 
+     if len(args) < 1:
+-        print >> sys.stderr, 'Need a filename to work on.'
++        print('Need a filename to work on.', file=sys.stderr)
+         return 1
+     elif len(args) > 1:
+-        print >> sys.stderr, 'Too many arguments.'
++        print('Too many arguments.', file=sys.stderr)
+         return 1
+ 
+     if options.simple and options.xml:
+-        print >> sys.stderr, 'Too many output formats requested.'
++        print('Too many output formats requested.', file=sys.stderr)
+         return 1
+ 
+     if not options.gconf and options.gettext_domain:
+-        print >> sys.stderr, 'Default gettext domain can only be specified when converting a gconf schema.'
++        print('Default gettext domain can only be specified when converting a gconf schema.', file=sys.stderr)
+         return 1
+ 
+     if not options.gconf and options.schema_id:
+-        print >> sys.stderr, 'Default schema ID can only be specified when converting a gconf schema.'
++        print('Default schema ID can only be specified when converting a gconf schema.', file=sys.stderr)
+         return 1
+ 
+     if not options.gconf and options.keep_underscores:
+-        print >> sys.stderr, 'The --keep-underscores option can only be specified when converting a gconf schema.'
++        print('The --keep-underscores option can only be specified when converting a gconf schema.', file=sys.stderr)
+         return 1
+ 
+     argfile = os.path.expanduser(args[0])
+     if not os.path.exists(argfile):
+-        print >> sys.stderr, '\'%s\' does not exist.' % argfile
++        print('\'%s\' does not exist.' % argfile, file=sys.stderr)
+         return 1
+ 
+     if options.output:
+@@ -1095,7 +1095,7 @@
+             try:
+                 parser = GConfSchemaParser(argfile, options.gettext_domain, options.schema_id, options.keep_underscores)
+                 schema_root = parser.parse()
+-            except SyntaxError, e:
++            except SyntaxError as e:
+                 raise GSettingsSchemaConvertException('\'%s\' does not look like a valid gconf schema file: %s' % (argfile, e))
+         else:
+             # autodetect if file is XML or not
+@@ -1104,7 +1104,7 @@
+                 schema_root = parser.parse()
+                 if not options.simple and not options.xml:
+                     options.simple = True
+-            except SyntaxError, e:
++            except SyntaxError as e:
+                 parser = SimpleSchemaParser(argfile)
+                 schema_root = parser.parse()
+                 if not options.simple and not options.xml:
+@@ -1127,14 +1127,14 @@
+                 fout = open(options.output, 'w')
+                 fout.write(output)
+                 fout.close()
+-            except GSettingsSchemaConvertException, e:
++            except GSettingsSchemaConvertException as e:
+                 fout.close()
+                 if os.path.exists(options.output):
+                     os.unlink(options.output)
+                 raise e
+ 
+-    except GSettingsSchemaConvertException, e:
+-        print >> sys.stderr, '%s' % e
++    except GSettingsSchemaConvertException as e:
++        print('%s' % e, file=sys.stderr)
+         return 1
+ 
+     return 0
diff --git a/packages/pentesting/openscap/PKGBUILD b/packages/pentesting/openscap/PKGBUILD
index a0dd280a2..2319f4f21 100644
--- a/packages/pentesting/openscap/PKGBUILD
+++ b/packages/pentesting/openscap/PKGBUILD
@@ -2,26 +2,31 @@
 # See COPYING for license details.
 
 pkgname=openscap
-pkgver=1.3.9.r137.g80daf96f4
+pkgver=1.4.1.r4.g83709fc
 pkgrel=1
 pkgdesc='Open Source Security Compliance Solution.'
 arch=('x86_64')
 groups=('athena' 'athena-automation' 'athena-defensive'
         'athena-scanner')
 url='https://www.open-scap.org/'
-license=('GPL-2.0-or-later')
+license=('LGPL-2.1-or-later')
 depends=('acl' 'attr' 'bzip2' 'curl' 'dbus-glib' 'dbus' 'gconf' 'libcap-ng'
          'libcap' 'libgcrypt' 'libldap' 'libutil-linux' 'libxml2' 'libxslt'
          'openldap' 'pcre' 'pcre2' 'perl-xml-parser' 'perl-xml-xpath' 'perl'
          'procps-ng' 'python' 'swig' 'xmlsec')
-makedepends=('cmake' 'git')
-source=("git+https://github.com/OpenSCAP/openscap/#branch=maint-${pkgver%.[0-9].r*}")
+makedepends=('doxygen' 'cmake' 'git')
+source=("git+https://github.com/OpenSCAP/$pkgname.git")
 sha512sums=('SKIP')
 
 pkgver() {
   cd $pkgname
 
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  ( set -o pipefail
+    git describe --long --tags --abbrev=7 2>/dev/null |
+      sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "%s.%s" "$(git rev-list --count HEAD)" \
+      "$(git rev-parse --short=7 HEAD)"
+  )
 }
 
 build() {