gentoo auto-resync : 24:11:2024 - 03:02:54

34 files changed, 151 insertions, 156 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index dcd5fc7613ac..8f6446dfee14 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index f0d5fdbab7ca..bf9c37c83507 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -381,10 +381,6 @@ dev-db/percona-server cjk
 app-admin/sudo sssd
 sys-auth/pambase sssd
 
-# Thomas Deutschmann <whissi@gentoo.org> (2018-06-06)
-# Needs sys-apps/fakechroot which isn't keyworded
-app-arch/rpm test
-
 # Tomáš Mózes <hydrapolic@gmail.com> (2018-06-05)
 # Unkeyworded dependencies.
 app-admin/syslog-ng amqp kafka mongodb
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 742af1c7aa8c..0aa493afbd7e 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -117,7 +117,7 @@ sys-kernel/gentoo-kernel-bin -generic-uki
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-12-02)
 # dev-qt/qtwebengine:6 and dev-qt/qtremoteobjects:6 are keyworded here.
-dev-python/PyQt6 -pdfium -remoteobjects
+dev-python/pyqt6 -pdfium -remoteobjects
 
 # Jimi Huotari <chiitoo@gentoo.org> (2023-11-22)
 # Unmask on amd64.
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index e7863a5e76a2..e51faa8535fb 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -19,7 +19,7 @@
 
 # Ionen Wolkens <ionen@gentoo.org> (2024-09-27)
 # dev-qt/qtremoteobjects:6 has not been stabilized yet.
-dev-python/PyQt6 remoteobjects
+dev-python/pyqt6 remoteobjects
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2024-07-24)
 # No stable versions of ROCm at the moment
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 6236eabf95d3..29805df0f1ee 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -66,13 +66,12 @@ media-gfx/freecad
 # reverse-dependencies.
 dev-qt/qtwebengine
 dev-qt/qtwebview
-dev-python/PyQt6-WebEngine
-dev-python/PyQtWebEngine
+dev-python/pyqt6-webengine
+dev-python/pyqtwebengine
 app-admin/calamares
 app-text/zeal
 app-editors/ghostwriter
 app-editors/retext
-app-misc/anki
 app-office/merkuro
 app-office/kmymoney
 app-office/skrooge
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 89d4102b4bdc..f0d01d3ea288 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -55,6 +55,7 @@ media-libs/libva-intel-driver hybrid
 # dev-qt/qtwebengine requires net-libs/nodejs, plus mask all
 # reverse-dependencies.
 app-i18n/fcitx-libpinyin dictionary-manager
+app-misc/anki gui
 dev-lang/idris2 test-full
 dev-python/cloudscraper test
 games-util/lgogdownloader gui
@@ -95,7 +96,7 @@ dev-ruby/tilt test
 net-analyzer/netdata nodejs
 www-apps/jekyll test
 www-apps/xpra-html5 minify
-dev-python/QtPy test
+dev-python/qtpy test
 
 # Davide Pesavento <pesa@gentoo.org> (2011-11-30)
 # The QML (V4) and JSC JITs do not work on x32 (bug #932192).
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 8d88a2633186..a394a90b2ff0 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -120,7 +120,7 @@ dev-python/nbclassic doc
 app-i18n/fcitx-libpinyin dictionary-manager
 dev-lang/idris2 test-full
 dev-python/cloudscraper test
-dev-python/QtPy test
+dev-python/qtpy test
 games-util/lgogdownloader gui
 net-irc/quassel urlpreview
 net-misc/fatrat bittorrent
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 6ed523baa513..022ae0014eb1 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -94,7 +94,6 @@ media-libs/mesa vulkan-overlay
 app-text/asciidoc test
 net-misc/openssh security-key
 dev-util/geany-plugins markdown
-app-arch/rpm test
 
 # Michał Górny <mgorny@gentoo.org> (2019-09-08)
 # virtual/jdk is not stable here.
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 99bacb2f64a4..dcfc80695b9c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -82,7 +82,7 @@ sys-kernel/gentoo-kernel-bin -generic-uki
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-12-02)
 # dev-qt/qtwebengine:6 is keyworded here.
-dev-python/PyQt6 -pdfium
+dev-python/pyqt6 -pdfium
 
 # Takuya Wakazono <pastalian46@gmail.com> (2023-11-21)
 # app-crypt/rpm-sequoia is keyworded here.
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 8966d35534ab..94fd9546f29a 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -15,7 +15,7 @@ sys-kernel/installkernel efistub
 
 # Ionen Wolkens <ionen@gentoo.org> (2024-01-27)
 # dev-python/pyside6 is not stable here yet
-dev-python/QtPy pyside6
+dev-python/qtpy pyside6
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2023-12-18)
 # This is still experimental, prebuilt images may not boot on all systems.
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 058af94660e0..a78c1a31f6f6 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -99,7 +99,7 @@ sys-kernel/gentoo-kernel-bin generic-uki
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-12-02)
 # dev-qt/qtwebengine:6 and dev-qt/qtremoteobjects:6 have few keywords.
-dev-python/PyQt6 pdfium remoteobjects
+dev-python/pyqt6 pdfium remoteobjects
 
 # Jimi Huotari <chiitoo@gentoo.org> (2023-11-22)
 # media-libs/libvpl is only keyworded for amd64 at this time.
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index c4ec60a2aa4b..1e5ffa7fd1be 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -23,7 +23,7 @@ media-libs/assimp collada
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-09-13)
 # dev-python/pyside6 isn't keyworded here
-dev-python/QtPy pyside6
+dev-python/qtpy pyside6
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-09-07)
 # kde-plasma/plasma-workspace:6 is not keyworded
@@ -245,7 +245,7 @@ net-vpn/openconnect test
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
 # dev-python/pyside2 not keyworded yet
-dev-python/QtPy pyside2
+dev-python/qtpy pyside2
 dev-python/qtconsole test
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
@@ -302,8 +302,8 @@ dev-libs/boost -context
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-02)
 # dev-qt/qtlocation:5 fails to compile with gcc-13 for now.
-dev-python/PyQt5 location
-dev-python/QtPy test
+dev-python/pyqt5 location
+dev-python/qtpy test
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-01)
 # Mask GRUB2 platforms not applicable to loong.
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 1945786362c1..1c923c402fbd 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -122,7 +122,7 @@ media-sound/snd notcurses
 # Nowa Ammerlaan <nowa@gentoo.org> (2022-09-23)
 # pyside2 is not keyworded on powerpc at the moment.
 # Mask the other Qt4Python implementations
-dev-python/QtPy pyside2 pyside6
+dev-python/qtpy pyside2 pyside6
 
 # Matt Turner <mattst88@gentoo.org> (2022-04-18)
 # app-text/nuspell is not keyworded
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index a2533a871acf..dacfb769f01e 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -60,7 +60,7 @@ x11-wm/mutter screencast
 media-sound/abcde replaygain
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-06-20)
-# dev-python/PyQt5 is not stable.
+# dev-python/pyqt5 is not stable.
 dev-python/matplotlib qt5 test
 net-print/hplip qt5
 dev-python/pyudev qt5
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index bf45205260b5..d7e7bb3f72c3 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -29,7 +29,7 @@ x11-misc/xdg-utils plasma
 # Ionen Wolkens <ionen@gentoo.org> (2024-07-02)
 # Needs dev-qt/qtquick3d:6 which itself needs media-libs/assimp that
 # is no longer keyworded here and currently fails tests (bug #935313).
-dev-python/PyQt6 quick3d
+dev-python/pyqt6 quick3d
 dev-qt/qtmultimedia:6 qml
 
 # Sam James <sam@gentoo.org> (2024-05-19)
@@ -109,7 +109,7 @@ sys-devel/clang extra
 # Nowa Ammerlaan <nowa@gentoo.org> (2022-09-23)
 # The corresponding Qt5 modules are not keyworded on ppc, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 bluetooth location speech
+dev-python/pyqt5 bluetooth location speech
 
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-08-15)
 # deps not keyworded
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 17c6e7bac2b6..48a6950381da 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -22,7 +22,7 @@ media-gfx/graphicsmagick jpeg2k
 
 # Sam James <sam@gentoo.org> (2024-03-23)
 # dev-qt/qtwebengine not available here
-dev-python/QtPy webengine test
+dev-python/qtpy webengine test
 
 # Michal Privoznik <michal.privoznik@gmail.com> (2024-01-21)
 # virtiofsd is available here
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index 4f6952a524bf..7255f28d9dd5 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -19,7 +19,7 @@
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-09-12)
 # dev-python/pyside6 is not stable here
-dev-python/QtPy pyside6
+dev-python/qtpy pyside6
 
 # Sam James <sam@gentoo.org> (2024-04-30)
 # sys-block/nbdkit is not yet marked stable here
@@ -48,7 +48,7 @@ dev-util/pkgcheck emacs
 # Nowa Ammerlaan <nowa@gentoo.org> (2022-09-23)
 # The corresponding Qt5 modules are not stable keyworded on ppc64, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 bluetooth
+dev-python/pyqt5 bluetooth
 
 # Sam James <sam@gentoo.org> (2022-03-07)
 # sys-cluster/torque not marked stable on ppc64
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 65da676a5fa1..6d27d353fb2b 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -148,7 +148,7 @@ dev-libs/cyrus-sasl berkdb
 # Avoid dragging in "heavy"  parts of dev-qt/* unless/until
 # somebody needs them. bug #816981, bug #854261.
 # Unfortunately, tests demand qtwebengine too.
-dev-python/QtPy test
+dev-python/qtpy test
 
 # Marek Szuba <marecki@gentoo.org> (2022-04-30)
 # net-wireless/sdrplay contains prebuilt binaries, currently available
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 434202e1c7de..01624e68db94 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -244,8 +244,6 @@ app-editors/vim lua
 # not keyworded yet
 media-gfx/imagemagick raw
 dev-db/mariadb numa
-# not tested yet
-app-arch/rpm test
 # no ceph keyworded
 net-analyzer/rrdtool rados
 
diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
index e056ec06816b..9fea6b67f3a7 100644
--- a/profiles/arch/x86/package.mask
+++ b/profiles/arch/x86/package.mask
@@ -4,32 +4,3 @@
 # Joshua Kinard <kumba@gentoo.org> (2024-02-27)
 # app-arch/lrzip-next does not support 32-bit arches (#925548)
 app-arch/lrzip-next
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2023-02-06)
-# Successful build of dev-qt/qtwebengine depends on 64-bit host
-# Bug #893234
-dev-qt/qtwebengine
-dev-qt/qtwebview
-dev-python/PyQtWebEngine
-app-text/zeal
-app-editors/retext
-app-misc/anki
-app-office/kmymoney:5
-app-office/skrooge:5
-app-office/texmaker
-app-text/bibletime
-app-text/cb2bib
-app-text/kchmviewer
-dev-python/spyder
-dev-python/spyder-terminal
-dev-python/spyder-unittest
-dev-python/spyder-line-profiler
-dev-python/spyder-vim
-dev-python/spyder-notebook
-kde-apps/cantor:5
-media-gfx/luminance-hdr
-media-sound/frescobaldi
-media-sound/teamspeak-client:3
-net-analyzer/nmapsi
-sci-geosciences/qmapshack
-www-client/otter
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index faf49ba677ca..a6c8ef16e947 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -137,9 +137,10 @@ media-tv/mythtv nvdec
 # Successful build of dev-qt/qtwebengine depends on 64-bit host
 # Bug #893234
 app-i18n/fcitx-libpinyin dictionary-manager
+app-misc/anki gui
 dev-lang/idris2 test-full
 dev-python/cloudscraper test
-dev-python/QtPy test
+dev-python/qtpy test
 games-util/lgogdownloader gui
 kde-apps/kde-apps-meta pim
 kde-apps/kdenetwork-meta bittorrent
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 2f0753b35a7c..f8f0a5b0f58d 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -19,7 +19,7 @@
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-09-20)
 # dev-python/pyside6 is not stable here.
-dev-python/QtPy pyside6
+dev-python/qtpy pyside6
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-09-02)
 # kde-plasma/plasma-workspace is not stable here.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index f54a92a868f9..6ee7306982b8 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -3,6 +3,11 @@
 
 # New entries go on top.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-11-23)
+# dev-python/pyside2 last-rites
+dev-python/qtpy pyside2
+media-gfx/freecad qt5
+
 # Mats Lidell <matsl@gentoo.org> (2024-11-20)
 # The dependency x11-libs/dnd blocks gcc-14, is only used by XEmacs,
 # and upstream is not sure it even works so dropping use. #908831
diff --git a/profiles/features/big-endian/package.mask b/profiles/features/big-endian/package.mask
index f37645ffb46b..f4e0f77dc13f 100644
--- a/profiles/features/big-endian/package.mask
+++ b/profiles/features/big-endian/package.mask
@@ -40,7 +40,7 @@ kde-apps/grantlee-editor
 kde-apps/akregator
 dev-util/kdevelop
 dev-qt/qtwebview
-dev-python/PyQtWebEngine
+dev-python/pyqtwebengine
 app-text/kchmviewer
 app-office/merkuro
 app-editors/ghostwriter
diff --git a/profiles/features/big-endian/package.use.mask b/profiles/features/big-endian/package.use.mask
index bbde951452d2..36f1a6524989 100644
--- a/profiles/features/big-endian/package.use.mask
+++ b/profiles/features/big-endian/package.use.mask
@@ -24,7 +24,7 @@ media-plugins/gst-plugins-meta vpx
 net-p2p/ktorrent rss webengine
 net-irc/quassel urlpreview
 kde-apps/kalarm pim
-dev-python/QtPy pyqt5
+dev-python/qtpy pyqt5
 gnome-base/gnome extras
 
 # matoro <matoro_gentoo@matoro.tk> (2023-11-16)
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 99dda9c5fafa..49140e594c95 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -23,7 +23,6 @@ net-nds/nsscache
 
 # Sam James <sam@gentoo.org> (2024-09-30)
 # Needs porting to musl (bug #940130)
-=sys-auth/elogind-255.5
 =sys-auth/elogind-255.5-r1
 
 # Sam James <sam@gentoo.org> (2024-08-31)
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index f96cd5b28b77..b2dc38f0dc27 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -130,7 +130,7 @@ dev-python/elasticsearch
 dev-python/dns-lexicon
 dev-python/dissononce
 dev-python/consonance
-dev-python/PyGithub
+dev-python/pygithub
 dev-python/adblock
 dev-python/pysnmp
 dev-python/pysnmp-mibs
@@ -151,6 +151,7 @@ app-text/fblog
 app-shells/nushell
 app-misc/rpick
 app-misc/skim
+app-misc/anki
 app-i18n/yaskkserv2
 app-emulation/cloud-init
 app-forensics/yara-x
diff --git a/profiles/package.mask b/profiles/package.mask
index d54d9a3a1dcd..62cfdab33e24 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,19 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2024-11-23)
+# Implementation detail of dev-python/pyproject-fmt.  New versions
+# integrate the Rust code into the main package.
+# Removal on 2024-12-07.  Bug #944782.
+dev-python/pyproject-fmt-rust
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-11-23)
+# dev-python/pyside2 last-rites, no more revdeps
+# Removal on 2024-12-23
+dev-python/pyside2
+dev-python/pyside2-tools
+dev-python/shiboken2
+
 # Ionen Wolkens <ionen@gentoo.org> (2024-11-19)
 # NVIDIA dropped support for the 470.xx branch in September 2024[1].
 #
@@ -377,8 +390,8 @@ app-i18n/kcm-fcitx
 # Masked for testing, and odds are (at this point) that 6.8.0 will
 # never be unmasked and will skip to 6.8.1 instead given the large
 # amount of regressions there's been..
-=dev-python/PyQt6-6.8.0_pre*
-=dev-python/PyQt6-WebEngine-6.8.0_pre*
+=dev-python/pyqt6-6.8.0_pre*
+=dev-python/pyqt6-webengine-6.8.0_pre*
 =dev-python/pyside6-6.8.0*
 =dev-python/pyside6-tools-6.8.0*
 =dev-python/shiboken6-6.8.0*
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index a4f089d04358..b4f3a3a296f0 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -32,7 +32,7 @@ x11-base/xwayland libei
 dev-build/cmake -gui -qt6
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-07-29)
-# Required by dev-python/PyQt5[multimedia]
+# Required by dev-python/pyqt5[multimedia]
 dev-qt/qtmultimedia:5 widgets
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-05-21)
@@ -90,7 +90,7 @@ app-text/xmlto text
 
 # Ben de Groot <yngwin@gentoo.org> (2015-02-18)
 # Enable sensible defaults for desktop users (bug #540046)
-dev-python/PyQt5 gui multimedia network printsupport widgets
+dev-python/pyqt5 gui multimedia network printsupport widgets
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2014-05-08)
 # Enable x11-libs/libxcb[xkb] as it is needed by x11-libs/libxkbcommon[X]
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 47695fff68dd..365fff912652 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -16,7 +16,7 @@ dev-libs/libjcat gpg pkcs7
 # qtwebchannel package is fairly small, and python bindings are
 # required by some popular desktop packages such as calibre,
 # qutebrowser, and freecad (or indirectly through PyQt*WebEngine).
-dev-python/PyQt6 webchannel
+dev-python/pyqt6 webchannel
 dev-python/pyside6 webchannel
 
 # Required by sys-apps/flatpak, a dependency of kde-plasma/discover
diff --git a/profiles/updates/1Q-2020 b/profiles/updates/1Q-2020
index c8acb3295398..8d1fd16d86cd 100644
--- a/profiles/updates/1Q-2020
+++ b/profiles/updates/1Q-2020
@@ -3,7 +3,7 @@ move dev-python/neovim-python-client dev-python/pynvim
 move games-action/openastromenace games-action/astromenace
 move dev-python/pyzor mail-filter/pyzor
 move dev-python/python-sqlparse dev-python/sqlparse
-move dev-python/git-python dev-python/GitPython
+move dev-python/git-python dev-python/gitpython
 move www-servers/automx2 net-mail/automx2
 move dev-python/pysnmp-apps net-analyzer/snmpclitools
 move net-im/slack-bin net-im/slack
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index c7ce81c052da..832b2195ef49 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -5,13 +5,13 @@ move kde-apps/kdesdk-kioslaves dev-util/kio-perldoc
 move kde-apps/zeroconf-ioslave net-misc/kio-zeroconf
 move net-misc/cni-plugins app-containers/cni-plugins
 move gnome-extra/chrome-gnome-shell gnome-extra/gnome-browser-connector
-move dev-python/PyQt6_sip dev-python/PyQt6-sip
-move dev-python/PyQt6_WebEngine dev-python/PyQt6-WebEngine
+move dev-python/PyQt6_sip dev-python/pyqt6-sip
+move dev-python/PyQt6_WebEngine dev-python/pyqt6-webengine
 move net-p2p/go-ipfs net-p2p/kubo
 move app-admin/ansible-base app-admin/ansible-core
 slotmove =dev-ruby/rack-test-2.0.2 1.0 2
 move app-office/gnome-todo app-office/endeavour
-move dev-python/python-levenshtein dev-python/Levenshtein
+move dev-python/python-levenshtein dev-python/levenshtein
 move mail-mta/protonmail-bridge mail-mta/proton-mail-bridge
 move app-emulation/distrobox app-containers/distrobox
 move www-servers/tornado dev-python/tornado
diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024
index 1a951df7aaf7..d8e1f112588d 100644
--- a/profiles/updates/4Q-2024
+++ b/profiles/updates/4Q-2024
@@ -45,3 +45,19 @@ move dev-python/requests_download dev-python/requests-download
 move dev-python/sphinx_selective_exclude dev-python/sphinx-selective-exclude
 move dev-python/txAMQP dev-python/txamqp
 move dev-python/textX dev-python/textx
+move dev-python/pyClamd dev-python/pyclamd
+move dev-python/pyDes dev-python/pydes
+move dev-python/pyxDamerauLevenshtein dev-python/pyxdameraulevenshtein
+move dev-python/PyGithub dev-python/pygithub
+move dev-python/Pyro5 dev-python/pyro5
+move dev-python/PyRSS2Gen dev-python/pyrss2gen
+move dev-python/PySDL2 dev-python/pysdl2
+move dev-python/PySocks dev-python/pysocks
+move dev-python/QtPy dev-python/qtpy
+move dev-python/PyQt-builder dev-python/pyqt-builder
+move dev-python/PyQt6-WebEngine dev-python/pyqt6-webengine
+move dev-python/PyQt6-sip dev-python/pyqt6-sip
+move dev-python/PyQtWebEngine dev-python/pyqtwebengine
+move dev-python/PyQt5-sip dev-python/pyqt5-sip
+move dev-python/PyQt5 dev-python/pyqt5
+move dev-python/PyQt6 dev-python/pyqt6
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 150fd8607146..1a266e5803d5 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -623,7 +623,6 @@ app-emulation/qemu:glusterfs - Enables GlusterFS cluster fileystem via sys-clust
 app-emulation/qemu:gnutls - Enable TLS support for the VNC console server. For 1.4 and newer this also enables WebSocket support. For 2.0 through 2.3 also enables disk quorum support.
 app-emulation/qemu:io-uring - Enable efficient I/O via sys-libs/liburing.
 app-emulation/qemu:iscsi - Enable direct iSCSI support via net-libs/libiscsi instead of indirectly via the Linux block layer that sys-block/open-iscsi does.
-app-emulation/qemu:jemalloc - Enable jemalloc allocator support
 app-emulation/qemu:jpeg - Enable jpeg image support for the VNC console server
 app-emulation/qemu:keyutils - Support Linux keyrings via sys-apps/keyutils
 app-emulation/qemu:multipath - Enable multipath persistent reservation passthrough via sys-fs/multipath-tools.
@@ -2378,83 +2377,6 @@ dev-php/pecl-memcached:igbinary - Enable support for the igbinary serializer
 dev-php/pecl-memcached:json - Enable support for json serialization
 dev-php/pecl-redis:igbinary - Enables igbinary serialisation support
 dev-php/pecl-redis:json - Enables json serializer support
-dev-python/PyQt5:bluetooth - Build bindings for the QtBluetooth module
-dev-python/PyQt5:dbus - Build bindings for the QtDBus module
-dev-python/PyQt5:declarative - Build bindings for the QtQml and QtQuick modules and enable the qmlscene plugin
-dev-python/PyQt5:designer - Build bindings for the QtDesigner module and enable the designer plugin
-dev-python/PyQt5:gui - Build bindings for the QtGui module
-dev-python/PyQt5:help - Build bindings for the QtHelp module
-dev-python/PyQt5:location - Build bindings for the QtLocation module
-dev-python/PyQt5:multimedia - Build bindings for the QtMultimedia module
-dev-python/PyQt5:network - Build bindings for the QtNetwork module
-dev-python/PyQt5:opengl - Build bindings for the QtOpenGL module
-dev-python/PyQt5:positioning - Build bindings for the QtPositioning module
-dev-python/PyQt5:printsupport - Build bindings for the QtPrintSupport module
-dev-python/PyQt5:sensors - Build bindings for the QtSensors module
-dev-python/PyQt5:serialport - Build bindings for the QtSerialPort module
-dev-python/PyQt5:speech - Build bindings for the QtTextToSpeech module
-dev-python/PyQt5:sql - Build bindings for the QtSql module
-dev-python/PyQt5:svg - Build bindings for the QtSvg module
-dev-python/PyQt5:testlib - Build bindings for the QtTest module
-dev-python/PyQt5:webchannel - Build bindings for the QtWebChannel module
-dev-python/PyQt5:websockets - Build bindings for the QtWebSockets module
-dev-python/PyQt5:widgets - Build bindings for the QtWidgets module
-dev-python/PyQt5:x11extras - Build bindings for the QtX11Extras module
-dev-python/PyQt5:xmlpatterns - Build bindings for the QtXmlPatterns module
-dev-python/PyQt6:bluetooth - Build bindings for the QtBluetooth module
-dev-python/PyQt6:dbus - Build bindings for the QtDBus module
-dev-python/PyQt6:designer - Build bindings for the QtDesigner module and enable the designer plugin
-dev-python/PyQt6:gui - Build bindings for the QtGui module
-dev-python/PyQt6:help - Build bindings for the QtHelp module
-dev-python/PyQt6:multimedia - Build bindings for the QtMultimedia module
-dev-python/PyQt6:network - Build bindings for the QtNetwork module
-dev-python/PyQt6:nfc - Build bindings for the QtNfc module
-dev-python/PyQt6:opengl - Build bindings for the QtOpenGL module
-dev-python/PyQt6:pdfium - Build bindings for the QtPdf module (uses pdfium from dev-qt/qtwebengine)
-dev-python/PyQt6:positioning - Build bindings for the QtPositioning module
-dev-python/PyQt6:printsupport - Build bindings for the QtPrintSupport module
-dev-python/PyQt6:qml - Build bindings for the QtQml module and enable the qml plugin
-dev-python/PyQt6:quick - Build bindings for the QtQuick module
-dev-python/PyQt6:quick3d - Build bindings for the QtQuick3D module
-dev-python/PyQt6:remoteobjects - Build bindings for the QtRemoteObjects module
-dev-python/PyQt6:sensors - Build bindings for the QtSensors module
-dev-python/PyQt6:serialport - Build bindings for the QtSerialPort module
-dev-python/PyQt6:spatialaudio - Build bindings for the QtSpatialAudio module
-dev-python/PyQt6:speech - Build bindings for the QtTextToSpeech module
-dev-python/PyQt6:sql - Build bindings for the QtSql module
-dev-python/PyQt6:svg - Build bindings for the QtSvg module
-dev-python/PyQt6:testlib - Build bindings for the QtTest module
-dev-python/PyQt6:webchannel - Build bindings for the QtWebChannel module
-dev-python/PyQt6:websockets - Build bindings for the QtWebSockets module
-dev-python/PyQt6:widgets - Build bindings for the QtWidgets module
-dev-python/PyQt6:xml - Build bindings for the QtXml module
-dev-python/PyQt6-WebEngine:quick - Build bindings for the QtWebEngineQuick module
-dev-python/PyQt6-WebEngine:widgets - Build bindings for the QtWebEngineWidgets module
-dev-python/QtPy:designer - Pull in bindings for the QtDesigner module and enable the designer plugin
-dev-python/QtPy:gui - Pull in bindings for the QtGui module
-dev-python/QtPy:help - Pull in bindings for the QtHelp module
-dev-python/QtPy:multimedia - Pull in QtMultimedia and QtMultimediaWidgets modules
-dev-python/QtPy:network - Pull in bindings for the QtNetwork module
-dev-python/QtPy:opengl - Pull in bindings for the QtOpenGL module
-dev-python/QtPy:positioning - Pull in bindings for the QtPositioning module
-dev-python/QtPy:printsupport - Pull in bindings for the QtPrintSupport module
-dev-python/QtPy:pyqt5 - Use dev-python/PyQt5 as Qt for Python implementation
-dev-python/QtPy:pyqt6 - Use dev-python/PyQt6 as Qt for Python implementation
-dev-python/QtPy:pyside2 - Use dev-python/pyside2 as Qt for Python implementation
-dev-python/QtPy:pyside6 - Use dev-python/pyside6 as Qt for Python implementation
-dev-python/QtPy:qml - Build bindings for the QtQml
-dev-python/QtPy:quick - Build bindings for the QtQuick
-dev-python/QtPy:sensors - Pull in bindings for the QtSensors module
-dev-python/QtPy:serialport - Pull in bindings for the QtSerialPort module
-dev-python/QtPy:speech - Pull in bindings for the QtTextToSpeech module
-dev-python/QtPy:sql - Pull in bindings for the QtSql module
-dev-python/QtPy:svg - Pull in bindings for the QtSvg module
-dev-python/QtPy:testlib - Pull in bindings for the QtTest module
-dev-python/QtPy:webchannel - Pull in bindings for the QtWebChannel module
-dev-python/QtPy:webengine - Pull in QtWebEngine and QtWebEngineWidgets modules
-dev-python/QtPy:websockets - Pull in bindings for the QtWebSockets module
-dev-python/QtPy:widgets - Pull in bindings for the QtWidgets module
-dev-python/QtPy:xml - Pull in QtXml module
 dev-python/amqp:extras - Install extra tools to generate initial Python mod from an AMQP XML file
 dev-python/apprise:dbus - Support sending notifications to the desktop over D-Bus
 dev-python/apprise:mqtt - Support sending notifications over MQTT
@@ -2507,6 +2429,58 @@ dev-python/pypy3:test-install - Install the test suite packages, that are requir
 dev-python/pypy3_10:ensurepip - Install the ensurepip module that uses bundled wheels to bootstrap pip and setuptools (if disabled, it will be only possible to use venv `--without-pip`)
 dev-python/pypy3_10:test-install - Install the test suite packages, that are required to run tests in a few reverse dependencies.
 dev-python/pypy3_10-exe:low-memory - Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time.
+dev-python/pyqt5:bluetooth - Build bindings for the QtBluetooth module
+dev-python/pyqt5:dbus - Build bindings for the QtDBus module
+dev-python/pyqt5:declarative - Build bindings for the QtQml and QtQuick modules and enable the qmlscene plugin
+dev-python/pyqt5:designer - Build bindings for the QtDesigner module and enable the designer plugin
+dev-python/pyqt5:gui - Build bindings for the QtGui module
+dev-python/pyqt5:help - Build bindings for the QtHelp module
+dev-python/pyqt5:location - Build bindings for the QtLocation module
+dev-python/pyqt5:multimedia - Build bindings for the QtMultimedia module
+dev-python/pyqt5:network - Build bindings for the QtNetwork module
+dev-python/pyqt5:opengl - Build bindings for the QtOpenGL module
+dev-python/pyqt5:positioning - Build bindings for the QtPositioning module
+dev-python/pyqt5:printsupport - Build bindings for the QtPrintSupport module
+dev-python/pyqt5:sensors - Build bindings for the QtSensors module
+dev-python/pyqt5:serialport - Build bindings for the QtSerialPort module
+dev-python/pyqt5:speech - Build bindings for the QtTextToSpeech module
+dev-python/pyqt5:sql - Build bindings for the QtSql module
+dev-python/pyqt5:svg - Build bindings for the QtSvg module
+dev-python/pyqt5:testlib - Build bindings for the QtTest module
+dev-python/pyqt5:webchannel - Build bindings for the QtWebChannel module
+dev-python/pyqt5:websockets - Build bindings for the QtWebSockets module
+dev-python/pyqt5:widgets - Build bindings for the QtWidgets module
+dev-python/pyqt5:x11extras - Build bindings for the QtX11Extras module
+dev-python/pyqt5:xmlpatterns - Build bindings for the QtXmlPatterns module
+dev-python/pyqt6:bluetooth - Build bindings for the QtBluetooth module
+dev-python/pyqt6:dbus - Build bindings for the QtDBus module
+dev-python/pyqt6:designer - Build bindings for the QtDesigner module and enable the designer plugin
+dev-python/pyqt6:gui - Build bindings for the QtGui module
+dev-python/pyqt6:help - Build bindings for the QtHelp module
+dev-python/pyqt6:multimedia - Build bindings for the QtMultimedia module
+dev-python/pyqt6:network - Build bindings for the QtNetwork module
+dev-python/pyqt6:nfc - Build bindings for the QtNfc module
+dev-python/pyqt6:opengl - Build bindings for the QtOpenGL module
+dev-python/pyqt6:pdfium - Build bindings for the QtPdf module (uses pdfium from dev-qt/qtwebengine)
+dev-python/pyqt6:positioning - Build bindings for the QtPositioning module
+dev-python/pyqt6:printsupport - Build bindings for the QtPrintSupport module
+dev-python/pyqt6:qml - Build bindings for the QtQml module and enable the qml plugin
+dev-python/pyqt6:quick - Build bindings for the QtQuick module
+dev-python/pyqt6:quick3d - Build bindings for the QtQuick3D module
+dev-python/pyqt6:remoteobjects - Build bindings for the QtRemoteObjects module
+dev-python/pyqt6:sensors - Build bindings for the QtSensors module
+dev-python/pyqt6:serialport - Build bindings for the QtSerialPort module
+dev-python/pyqt6:spatialaudio - Build bindings for the QtSpatialAudio module
+dev-python/pyqt6:speech - Build bindings for the QtTextToSpeech module
+dev-python/pyqt6:sql - Build bindings for the QtSql module
+dev-python/pyqt6:svg - Build bindings for the QtSvg module
+dev-python/pyqt6:testlib - Build bindings for the QtTest module
+dev-python/pyqt6:webchannel - Build bindings for the QtWebChannel module
+dev-python/pyqt6:websockets - Build bindings for the QtWebSockets module
+dev-python/pyqt6:widgets - Build bindings for the QtWidgets module
+dev-python/pyqt6:xml - Build bindings for the QtXml module
+dev-python/pyqt6-webengine:quick - Build bindings for the QtWebEngineQuick module
+dev-python/pyqt6-webengine:widgets - Build bindings for the QtWebEngineWidgets module
 dev-python/pyrsistent:native-extensions - Compiles native C extensions (speedups, instead of using python fallback code).
 dev-python/pyside2:3d - Build Qt3DCore, Qt3DAnimation, Qt3DExtras, Qt3DInput, Qt3DLogic, and Qt3DRender modules
 dev-python/pyside2:charts - Build QtCharts module
@@ -2575,6 +2549,31 @@ dev-python/python-stdnum:vies - Enable VIES
 dev-python/pyudev:qt5 - Install PyQt5 bindings
 dev-python/pyzmq:drafts - Enable draft API support
 dev-python/qiskit:visualization - Enable visualization modules
+dev-python/qtpy:designer - Pull in bindings for the QtDesigner module and enable the designer plugin
+dev-python/qtpy:gui - Pull in bindings for the QtGui module
+dev-python/qtpy:help - Pull in bindings for the QtHelp module
+dev-python/qtpy:multimedia - Pull in QtMultimedia and QtMultimediaWidgets modules
+dev-python/qtpy:network - Pull in bindings for the QtNetwork module
+dev-python/qtpy:opengl - Pull in bindings for the QtOpenGL module
+dev-python/qtpy:positioning - Pull in bindings for the QtPositioning module
+dev-python/qtpy:printsupport - Pull in bindings for the QtPrintSupport module
+dev-python/qtpy:pyqt5 - Use dev-python/pyqt5 as Qt for Python implementation
+dev-python/qtpy:pyqt6 - Use dev-python/pyqt6 as Qt for Python implementation
+dev-python/qtpy:pyside2 - Use dev-python/pyside2 as Qt for Python implementation
+dev-python/qtpy:pyside6 - Use dev-python/pyside6 as Qt for Python implementation
+dev-python/qtpy:qml - Build bindings for the QtQml
+dev-python/qtpy:quick - Build bindings for the QtQuick
+dev-python/qtpy:sensors - Pull in bindings for the QtSensors module
+dev-python/qtpy:serialport - Pull in bindings for the QtSerialPort module
+dev-python/qtpy:speech - Pull in bindings for the QtTextToSpeech module
+dev-python/qtpy:sql - Pull in bindings for the QtSql module
+dev-python/qtpy:svg - Pull in bindings for the QtSvg module
+dev-python/qtpy:testlib - Pull in bindings for the QtTest module
+dev-python/qtpy:webchannel - Pull in bindings for the QtWebChannel module
+dev-python/qtpy:webengine - Pull in QtWebEngine and QtWebEngineWidgets modules
+dev-python/qtpy:websockets - Pull in bindings for the QtWebSockets module
+dev-python/qtpy:widgets - Pull in bindings for the QtWidgets module
+dev-python/qtpy:xml - Pull in QtXml module
 dev-python/rarfile:compressed - Enables the module to support compressed v3 archives by calling the app-arch/unrar.
 dev-python/reedsolo:native-extensions - Compile native C extensions.
 dev-python/rfc3986:idna - enable support for the IDNA specification (RFC 5891)
@@ -5671,8 +5670,6 @@ net-firewall/conntrack-tools:cthelper - Use net-libs/libnetfilter_cthelper for u
 net-firewall/conntrack-tools:cttimeout - Use net-libs/libnetfilter_cttimeout for conntrack timeout support
 net-firewall/ebtables:perl - Install the ebtables-save script which uses perl
 net-firewall/firehol:ipset - Use net-firewall/ipset.
-net-firewall/firewalld:iptables - Add support for net-firewall/iptables as firewall backend
-net-firewall/firewalld:nftables - Add support for net-firewall/nftables as firewall backend
 net-firewall/fwknop:client - Build fwknop client
 net-firewall/fwknop:extras - Install utility scripts and AppArmor policy for fwknopd
 net-firewall/fwknop:firewalld - Use net-firewall/firewalld as the default server backend
@@ -7100,7 +7097,6 @@ sci-chemistry/gromacs:double-precision - More precise calculations at the expens
 sci-chemistry/gromacs:gmxapi - Add support for gmxapi library
 sci-chemistry/gromacs:gmxapi-legacy - Enable installing lagacy headers
 sci-chemistry/gromacs:hwloc - Enable HWLoc lib support
-sci-chemistry/gromacs:lmfit - Use external sci-libs/lmfit
 sci-chemistry/gromacs:mkl - Use sci-libs/mkl for fft, blas, lapack routines
 sci-chemistry/gromacs:nnpot - Allow to use sci-libs/caffe2 for NN Potentials
 sci-chemistry/gromacs:offensive - Enable gromacs partly offensive quotes
@@ -7367,7 +7363,6 @@ sci-libs/opencascade:eigen - Enable support for eigenvalues through the header-o
 sci-libs/opencascade:freeimage - Enable support for image i/o via media-libs/freeimage
 sci-libs/opencascade:freetype - Enable media-libs/freetype support
 sci-libs/opencascade:inspector - Build Inspector tool
-sci-libs/opencascade:jemalloc - Enable jemalloc allocator support via dev-libs/jemalloc
 sci-libs/opencascade:json - Enable JSON support through dev-libs/rapidjson
 sci-libs/opencascade:optimize - Don't clear allocated memory. Use optimized memory manager unlesstbb USE flag is set.
 sci-libs/opencascade:tbb - Enable multithreading with the Intel Threads Building Block dev-cpp/tbb
@@ -7875,7 +7870,7 @@ sys-apps/portage:rsync-verify - Enable full-tree cryptographic verification of G
 sys-apps/portage:xattr - Preserve extended attributes (filesystem-stored metadata) when installing files. Usually only required for hardened systems.
 sys-apps/ppc64-diag:rtas - Add support for the Run Time Abstraction Services (RTAS)
 sys-apps/proot:care - Build dynamic CARE binary (more info - https://proot-me.github.io)
-sys-apps/razercfg:gui - Installs GUI configuration utility and status bar applet. Requires dev-python/PyQt5
+sys-apps/razercfg:gui - Installs GUI configuration utility and status bar applet. Requires dev-python/pyqt5
 sys-apps/rng-tools:jitterentropy - Enable Jitter RNG entropy support
 sys-apps/rng-tools:nistbeacon - Enable NIST beacon entropy support
 sys-apps/rng-tools:pkcs11 - Enable PKCS11 entropy support
@@ -8866,6 +8861,7 @@ x11-misc/polybar:network - Enable network support
 x11-misc/primus:libglvnd - Use media-libs/libglvnd for dispatch
 x11-misc/py3status:minimal - Don't depend on x11-misc/i3status if you don't plan to use any of its built-in modules.
 x11-misc/py3status:udev - Install extra requirement dev-python/pyudev to enable udev events monitoring on modules.
+x11-misc/qterm:ssh - Enable SSH support (requires dev-libs/openssl
 x11-misc/qtfm:dbus - Install the qtfm-tray removable device manager
 x11-misc/qtfm:shared - Install the libQtFM shared library and headers
 x11-misc/read-edid:vbe-mode - Build get-edid with support for legacy, VBE-based interface. Requires dev-libs/libx86.