gentoo auto-resync : 09:03:2024 - 12:44:17

8 files changed, 28 insertions, 23 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 392aa5a8b950..722da8559c8b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 9da893b04d4b..36a45fb0e33a 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -75,16 +75,6 @@ media-video/obs-studio -qsv -websocket
 # app-crypt/rpm-sequoia is keyworded here.
 app-arch/rpm -sequoia
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-11-20)
-# Qt6 is still experimental in freecad, currently the configure phase
-# gets itself stuck by importing both qt5 and qt6 cmake files.
-# Since there is no python3.12 support for shiboken2/pyside2, we have
-# to mask that flag as well.
-#
-# We have to mask this here as well as in base/package.use.mask
-# because qt6 is globally unmasked on amd64
-media-gfx/freecad qt6 python_single_target_python3_12
-
 # Florian Schmaus <flow@gentoo.org> (2023-11-10)
 # Only available for amd64.
 sys-apps/irqbalance -thermal
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 050baaf5c421..32ba064f6d92 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -69,13 +69,6 @@ sys-devel/sparse llvm
 # app-crypt/rpm-sequoia is not keyworded on most architectures.
 app-arch/rpm sequoia
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-11-20)
-# Qt6 is still experimental in freecad, currently the configure phase
-# gets itself stuck by importing both qt5 and qt6 cmake files.
-# Since there is no python3.12 support for shiboken2/pyside2, we have
-# to mask that flag as well.
-media-gfx/freecad qt6 python_single_target_python3_12
-
 # Florian Schmaus <flow@gentoo.org> (2023-11-10)
 # Only available for amd64.
 sys-apps/irqbalance thermal
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 50f5e9adaa0d..d67d95ba3979 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-03-09)
+# Unmaintained upstream. Does not build with llvm-16 and up, nor with
+# python-3.12 and up. Please port to Qt6.
+# Bug: https://bugs.gentoo.org/920544
+dev-python/pyside2
+dev-python/pyside2-tools
+dev-python/shiboken2
+
 # Michał Górny <mgorny@gentoo.org> (2024-01-23)
 # Unmaintained, very hacky package.  Its replacement, berkeleydb,
 # was so bad that we've lastrited it.
diff --git a/profiles/package.mask b/profiles/package.mask
index 89bb404b3c3c..5091fb036814 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-03-09)
+# Requires pyside2/shiboken2, which is unmaintained upstream and
+# not compatible with llvm-16 and up or python-3.12 and up.
+# No upstream activity for 2 years.
+# dev-python/QtPy is an alternative that does support Qt6.
+# Removal on: 2024-04-09.  Bug #926548
+dev-python/anyqt
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2024-03-08)
 # A library without reverse dependencies.
 # Removal on: 2024-04-07.  Bug #926486.
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 2052b98303bf..6df6ec312109 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-03-07)
+# Required by kde-frameworks/kio:6
+dev-qt/qtbase libproxy
+
 # Alfred Wingate <parona@protonmail.com> (2023-12-25)
 # Prefer X over gbm with REQUIRED_USE: ^^ ( gbm wayland X )
 >=media-tv/kodi-20.2 X -gbm
@@ -11,8 +15,8 @@
 app-text/poppler nss boost
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-11-11)
-# egl, libinput required by kde-frameworks/kwayland
-# accessibility required by kde-plasma/kwin
+# egl, libinput required by kde-plasma/kwayland:5
+# accessibility required by kde-plasma/kwin:5
 dev-qt/qtgui:5 accessibility egl libinput
 
 # Sam James <sam@gentoo.org> (2023-09-22)
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index e3eb9e4f43f6..55e470e11baa 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -29,13 +29,13 @@ dev-python/pyside6 webchannel
 # Required by sys-apps/flatpak, a dependency of kde-plasma/discover
 dev-util/ostree curl
 
-# Required by net-im/neochat:5
+# Required by <net-im/neochat-23.08.50
 dev-qt/qtmultimedia:5 gstreamer
 
-# Required by app-editors/okteta
+# Required by app-editors/okteta:5
 dev-qt/qtscript:5 scripttools
 
-# Required by kde-apps/akonadi
+# Required by kde-apps/akonadi:5
 dev-qt/qtsql:5 mysql
 
 # Required by kde-apps/ktp-text-ui
@@ -66,7 +66,7 @@ media-libs/opencv contrib contribdnn
 # Required by net-firewall/firewalld[nftables] (default enabled)
 net-firewall/nftables json python xtables
 
-# Required by dev-qt/qtwebengine:5
+# Required by dev-qt/qtwebengine
 sys-libs/zlib minizip
 
 # Keep existing defaults after dropping IUSE=phonon from make.defaults
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 01139d58127a..694a5fa5dc07 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1906,6 +1906,7 @@ dev-lang/rust:system-bootstrap - Bootstrap using installed rust compiler
 dev-lang/rust:system-llvm - Use the system LLVM installation
 dev-lang/rust:wasm - Build support for the wasm32-unknown-unknown target
 dev-lang/rust-bin:clippy - Install clippy, Rust code linter
+dev-lang/rust-bin:profiler - Build the profiler runtime and rust-demangler tool (needed for '-C profile-generate' or '-C instrument-coverage' codegen opts)
 dev-lang/rust-bin:rust-analyzer - Install rust-analyzer, A Rust compiler front-end for IDEs (language server)
 dev-lang/rust-bin:rust-src - Install rust-src, needed by developer tools and for build-std (cross)
 dev-lang/rust-bin:rustfmt - Install rustfmt, Rust code formatter
@@ -8576,6 +8577,7 @@ virtual/mysql:server - Build server (mysqld)
 virtual/pkgconfig:native-symlinks - Install generic symlinks like pkgconf and pkg-config. If this flag is disabled, only CHOST-prefixed pkg-config executables will be available to end users and ebuilds.
 virtual/podofo-build:boost - Add support for boost
 virtual/podofo-build:tools - Build and install commandline tools
+virtual/rust:profiler - Build the profiler runtime and rust-demangler tool (needed for '-C profile-generate' or '-C instrument-coverage' codegen opts)
 virtual/rust:rustfmt - Install rustfmt, Rust code formatter
 virtual/ssh:minimal - Prefer net-misc/dropbear over net-misc/openssh
 virtual/wine:proton - Enable Valve Software's fork of Wine