gentoo auto-resync : 14:11:2024 - 03:02:32

13 files changed, 83 insertions, 20 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b2b939f70264..9fc0b7d5271e 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index bc37e29cc459..89d4102b4bdc 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -61,7 +61,6 @@ games-util/lgogdownloader gui
 kde-apps/kde-apps-meta pim
 kde-apps/kdenetwork-meta bittorrent
 kde-apps/kleopatra pim
-kde-apps/umbrello php
 kde-misc/kio-gdrive share
 kde-plasma/plasma-nm openconnect
 net-irc/quassel urlpreview
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 7e8f93a8270b..8966d35534ab 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -122,10 +122,6 @@ media-plugins/gst-plugins-meta aac dts dv lame libvisual taglib vcd wavpack
 x11-wm/i3 test
 dev-python/ipython nbconvert
 
-# Mikle Kolyada <zlogene@gentoo,org> (2020-03-19)
-# deps not yet stable
-kde-apps/umbrello php
-
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is keyworded ~arm64
 sys-firmware/seabios debug
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 3123dca6d640..c36b38f644f8 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -168,7 +168,7 @@ app-misc/mc spell
 net-nds/openldap smbkrb5passwd
 
 # Matt Turner <mattst88@gentoo.org> (2020-12-23)
-# dev-python/subunit is not stable on hppa
+# dev-python/python-subunit is not stable on hppa
 dev-libs/check subunit
 
 # Matt Turner <mattst88@gentoo.org> (2020-12-23)
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 6da238d69422..a5ba2145c048 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,33 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Jolly <kangie@gentoo.org> (2024-11-13)
+# Force the use of the appropriate llvm_slot_x USE for Rust.
+# This is strictly papercut prevention; the ebuild will enforce the correct
+# selection via LLVM_REQUIRED_USE. This prevents users from deselecting
+# the correct slot by (e.g.) setting -llvm_slot_# globally.
+# source ../eclass/rust.eclass
+# for slot in ${_RUST_SLOTS_ORDERED[@]}; do
+#    echo "dev-lang/rust:${slot} llvm_slot_${_RUST_LLVM_MAP[${slot}]}"
+#    echo "dev-lang/rust-bin:${slot} llvm_slot_${_RUST_LLVM_MAP[${slot}]}"
+# done
+dev-lang/rust:1.82.0 llvm_slot_19
+dev-lang/rust-bin:1.82.0 llvm_slot_19
+dev-lang/rust:1.81.0 llvm_slot_18
+dev-lang/rust-bin:1.81.0 llvm_slot_18
+dev-lang/rust:1.80.1 llvm_slot_18
+dev-lang/rust-bin:1.80.1 llvm_slot_18
+dev-lang/rust:1.79.0 llvm_slot_18
+dev-lang/rust-bin:1.79.0 llvm_slot_18
+dev-lang/rust:1.77.1 llvm_slot_17
+dev-lang/rust-bin:1.77.1 llvm_slot_17
+dev-lang/rust:1.75.0 llvm_slot_17
+dev-lang/rust-bin:1.75.0 llvm_slot_17
+dev-lang/rust:1.74.1 llvm_slot_17
+dev-lang/rust-bin:1.74.1 llvm_slot_17
+dev-lang/rust:1.71.1 llvm_slot_16
+dev-lang/rust-bin:1.71.1 llvm_slot_16
+
 # Sam James <sam@gentoo.org> (2024-09-30)
 # gnat-gpl only exists for (bootstrapping) Ada. Until bug #940471 is handled,
 # force Ada on. Once it is split/moved/gutted, this won't be necessary
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 537a2a53ec8a..6aa00b80895d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -62,10 +62,6 @@ app-alternatives/yacc reference
 # Causes crashes with e.g. dlz+samba (bug #938955)
 net-dns/bind jemalloc
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-09-01)
-# Prepare for dev-util/kdevelop:5 removal
-kde-apps/umbrello:5 php
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-08-31)
 # Prepare for KDE PIM 5 removal and avoid conflicts w/ KDE PIM 6
 app-office/kmymoney:5 addressbook
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 02b9f1e3049f..2f013f1f828c 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Michał Górny <mgorny@gentoo.org> (2024-10-26)
-# Unblock the support in python-exec while the target is masked.
-dev-lang/python-exec -python_targets_python3_13
-
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-10-11)
 # No suitable version of dev-libs/protobuf available.
 =dev-java/protobuf-java-4.28.1 system-protoc
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index b4845b0b52e8..96c627eb030e 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,13 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michael Orlitzky <mjo@gentoo.org> (2024-11-13)
+# The 8.1 slot is masked, so the USE flag that pulls it in has to be
+# masked too. The bare "php8-1" is for www-servers/nginx-unit which
+# has a non-standard flag name.
+php_targets_php8-1
+php8-1
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2024-10-21)
 # Mechanism for coping with the time64 transition of 32bit arches
 # Will be unmasked in the time64 profiles
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index d1197864f26b..e474311a509b 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -14,8 +14,6 @@ llvm_slot_19
 
 # Michał Górny <mgorny@gentoo.org> (2024-05-08)
 # Python implementations without stable keywords.
-python_targets_python3_13
-python_single_target_python3_13
 python_targets_python3_13t
 python_single_target_python3_13t
 python_targets_pypy3
diff --git a/profiles/package.mask b/profiles/package.mask
index cff399c7d462..5a897068571b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,35 @@
 
 #--- END OF EXAMPLES ---
 
+# Michael Orlitzky <mjo@gentoo.org> (2024-11-13)
+# PHP 8.1.x no longer receives bug fixes unless they address security
+# issues. That means no build fixes, no updates for modern compilers,
+# and no tweaks for newer versions of dependencies. We can't really
+# afford to maintain our own little fork of this, so it's time to
+# upgrade (sorry). With it goes any unmaintained PECL packages
+# that don't support 8.2 or newer.
+dev-lang/php:8.1
+dev-php/pecl-dbase
+dev-php/pecl-gnupg
+dev-php/pecl-http
+dev-php/pecl-lzf
+dev-php/pecl-mcrypt
+dev-php/pecl-memcache
+dev-php/pecl-oauth
+dev-php/pecl-pam
+dev-php/pecl-ps
+dev-php/pecl-psr
+dev-php/pecl-raphf
+dev-php/pecl-timezonedb
+dev-php/pecl-translit
+dev-php/pecl-uuid
+dev-php/pecl-zmq
+dev-php/realpath_turbo
+dev-php/snuffleupagus
+dev-php/swoole
+=virtual/httpd-php-8.1
+<www-apps/icingaweb2-2.12.1-r1
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2024-11-10)
 # Fails to build with gcc-14. Horrible code. Not touched by a
 # maintainer since 2010. Bugs 729134, 870541, 909625, 933773
@@ -284,9 +313,11 @@ app-i18n/kcm-fcitx
 >=net-libs/webkit-gtk-2.46.0
 
 # Ionen Wolkens <ionen@gentoo.org> (2024-10-08)
-# Masked for testing and (mostly) to avoid upgrade noise given
-# PyQt6-6.7.x is known broken with it and depends on <6.8. Feel
-# free to unmask early if not using PyQt6.
+# 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/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 0df2c18de1db..a4f089d04358 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -4,7 +4,6 @@
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-08-30)
 # Resolve conflicting REQUIRED_USE defaults (qt5 vs. qt6)
 media-libs/simage -qt5
-net-p2p/transmission -qt5
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-03-07)
 # Required by kde-frameworks/kio:6
diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024
index aedc958dd30c..8c8044455315 100644
--- a/profiles/updates/4Q-2024
+++ b/profiles/updates/4Q-2024
@@ -4,3 +4,14 @@ slotmove media-sound/kmetronome 5 0
 move net-im/sendxmpp-amm net-im/sendxmpp-scala
 move dev-python/jinja dev-python/jinja2
 move dev-python/gmpy dev-python/gmpy2
+move dev-python/tlsh dev-python/python-tlsh
+move dev-python/tappy dev-python/tap-py
+move dev-python/subunit dev-python/python-subunit
+move dev-python/rpy dev-python/rpy2
+move dev-python/qscintilla-python dev-python/qscintilla
+move dev-python/python-netlink dev-python/netlink
+move dev-python/python-lhafile dev-python/lhafile
+move dev-python/pysvg dev-python/pysvg-py3
+move dev-python/libpillowfight dev-python/pypillowfight
+move dev-python/cchardet dev-python/faust-cchardet
+move dev-python/protobuf-python dev-python/protobuf
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ce5510b6f26d..dbdf528e8f72 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3425,6 +3425,7 @@ gnome-extra/evolution-data-server:berkdb - sys-libs/db support needed to migrate
 gnome-extra/evolution-data-server:gnome-online-accounts - Enable net-libs/gnome-online-accounts based Google authentication support
 gnome-extra/evolution-data-server:oauth-gtk3 - Enable internal OAuth2 authentication for GTK+3 applications (libedataserverui-*.so) support for Google and Outlook.com. If gnome-online-accounts is enabled and used, this is not necessary, but both can be supported at the same time with different setup at runtime
 gnome-extra/evolution-data-server:oauth-gtk4 - Enable internal OAuth2 authentication for GTK 4 applications (libedataserverui4-*.so) support for Google and Outlook.com. If gnome-online-accounts is enabled and used, this is not necessary, but both can be supported at the same time with different setup at runtime
+gnome-extra/evolution-data-server:sound - Sound notification support through media-libs/libcanberra-gtk3 (does nothing without USE=gtk)
 gnome-extra/evolution-data-server:weather - Enable optional weather calendar support
 gnome-extra/gnome-commander:gsf - Add metadata support for OLE, OLE2 and ODF
 gnome-extra/gnome-commander:pdf - Add metadata support for PDF
@@ -3790,6 +3791,8 @@ mail-client/evolution:bogofilter - Build mail-filter/bogofilter plugin
 mail-client/evolution:geolocation - Enable support for displaying contacts on a map inside evolution using media-libs/libchamplain
 mail-client/evolution:highlight - Enable text highlighting plugin
 mail-client/evolution:ldap - Enable support for fetching contacts from an LDAP or Active Directory server using net-nds/openldap
+mail-client/evolution:libnotify - Enable desktop notifications through x11-libs/libnotify
+mail-client/evolution:sound - Enable sound notifications using media-libs/libcanberra-gtk3
 mail-client/evolution:spamassassin - Build mail-filter/spamassassin plugin
 mail-client/evolution:weather - Enable optional weather calendar support
 mail-client/evolution:ytnef - Enable optional TNEF attachments parser support using net-mail/ytnef