gentoo auto-resync : 17:05:2023 - 04:08:35

16 files changed, 25 insertions, 58 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index fe6ffc7dacc8..31e1abaf8d1c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index d2f6fc2a96a6..82891f189646 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,7 +1,12 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Arsen Arsenović (2023-05-14)
+# Arsen Arsenović <arsen@gentoo.org> (2023-05-17)
+# app-emulation/libguestfs pulls in a large amount of dependencies, most
+# of which aren't or can't be kw'd on SPARC.
+sys-block/nbdkit libguestfs
+
+# Arsen Arsenović <arsen@gentoo.org> (2023-05-14)
 # dev-lang/go doesn't work on SPARC.
 sys-libs/libnbd go
 
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 65b8149ada84..f227acf07c58 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -6,18 +6,17 @@
 
 # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
 IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
-USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND"
+USE_EXPAND_IMPLICIT="ELIBC KERNEL"
 USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt"
 USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt"
-USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
 
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
@@ -47,12 +46,11 @@ ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME GDK_PIXBUF_MODULE_FILE XA
 
 # Variables that are set exclusively by the profile
 # and not by user configuration files.
-PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
+PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL"
 
 # 'Sane' defaults
 ELIBC="glibc"
 KERNEL="linux"
-USERLAND="GNU"
 INPUT_DEVICES="libinput"
 
 # Accept only licenses in the FREE license group, i.e., with
diff --git a/profiles/base/use.force b/profiles/base/use.force
index d51d6c2ea56c..22123a5fe908 100644
--- a/profiles/base/use.force
+++ b/profiles/base/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Matt Turner <mattst88@gentoo.org> (2020-08-11)
@@ -10,8 +10,7 @@ libglvnd
 # Disabling this requires a migration to be performed.
 split-usr
 
-# Force the GNU/Linux ELIBC, KERNEL, and USERLAND
+# Force the GNU/Linux ELIBC and KERNEL
 # flags that apply to the majority of profiles.
 elibc_glibc
 kernel_linux
-userland_GNU
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 07ade179a443..f6587acbec12 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -61,9 +61,6 @@ packagekit
 selinux
 multilib
 
-# Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles.
-userland_BSD
-
 elibc_bionic
 elibc_Cygwin
 elibc_Darwin
diff --git a/profiles/default/linux/arm/23.0/musl/armv6j/parent b/profiles/default/linux/arm/23.0/musl/armv6j/parent
index f3229c5b9876..7648ec7e7c22 100644
--- a/profiles/default/linux/arm/23.0/musl/armv6j/parent
+++ b/profiles/default/linux/arm/23.0/musl/armv6j/parent
@@ -1 +1,2 @@
 ..
+../../../../../../arch/arm/armv6j
diff --git a/profiles/default/linux/arm/23.0/musl/armv7a/parent b/profiles/default/linux/arm/23.0/musl/armv7a/parent
index f3229c5b9876..b70a1c7befbc 100644
--- a/profiles/default/linux/arm/23.0/musl/armv7a/parent
+++ b/profiles/default/linux/arm/23.0/musl/armv7a/parent
@@ -1 +1,2 @@
 ..
+../../../../../../arch/arm/armv7a
diff --git a/profiles/desc/userland.desc b/profiles/desc/userland.desc
deleted file mode 100644
index 3b3ed55d463a..000000000000
--- a/profiles/desc/userland.desc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of USERLAND USE_EXPAND flags.
-
-# Keep it sorted.
-
-GNU - USERLAND setting for systems that use the GNU userland tools
-BSD - USERLAND setting for systems using BSDish userland (FreeBSD OpenBSD NetBSD DragonFly)
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 5b6dc2b40640..fd59da10541e 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2008-2022 Gentoo Authors
+# Copyright 2008-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 USE="kdrive minimal multicall zlib"
@@ -16,29 +16,27 @@ PORTAGE_ECLASS_WARNING_ENABLE="0"
 INPUT_DEVICES="evdev"
 VIDEO_CARDS="fbdev"
 KERNEL="linux"
-USERLAND="GNU"
 LINGUAS="en"
 
 # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
 IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
 USE_EXPAND_UNPREFIXED="ARCH"
-USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
+USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL"
 USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 hppa ia64 loong m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-linux x86-solaris x86-winnt"
 USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt"
 USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt"
-USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
 
 # Variables that are set exclusively by the profile
 # and not by user configuration files.
-PROFILE_ONLY_VARIABLES="IUSE_IMPLICIT USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
+PROFILE_ONLY_VARIABLES="IUSE_IMPLICIT USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL"
 
 # Accept only licenses in the FREE license group, i.e., with
 # the freedom to use, share, modify and share modifications
diff --git a/profiles/embedded/use.force b/profiles/embedded/use.force
index 5885fddb4528..c03a3a61ade5 100644
--- a/profiles/embedded/use.force
+++ b/profiles/embedded/use.force
@@ -1,2 +1 @@
 kernel_linux
-userland_GNU
diff --git a/profiles/features/prefix/make.defaults b/profiles/features/prefix/make.defaults
index 3dbb25ed7df8..5357594cb9a4 100644
--- a/profiles/features/prefix/make.defaults
+++ b/profiles/features/prefix/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (2016-04-19)
@@ -21,7 +21,3 @@ FEATURES="${FEATURES} -sandbox -usersandbox"
 # Prefix does not have user management and the security model does not apply.
 # Disable user* features by default.
 FEATURES="${FEATURES} -userpriv -userfetch -usersync"
-
-# this probably already is like this, but we assure that in prefix we
-# have a GNU userland
-USERLAND="GNU"
diff --git a/profiles/features/prefix/use.force b/profiles/features/prefix/use.force
index 843b1c7ed890..53de2c1a6799 100644
--- a/profiles/features/prefix/use.force
+++ b/profiles/features/prefix/use.force
@@ -1,8 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # force prefix flag to be set
 prefix
-
-# force GNU userland (even though base profile sets this too)
-userland_GNU
diff --git a/profiles/features/prefix/use.mask b/profiles/features/prefix/use.mask
index a273fbe66e92..482ce57f0448 100644
--- a/profiles/features/prefix/use.mask
+++ b/profiles/features/prefix/use.mask
@@ -1,12 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # prefix USE flag should always be unmasked in prefix profiles
 -prefix
 
-# re-add userland GNU
--userland_GNU
-
 # USE flags inherited by the base/use.defaults file that shouldn't be in Prefix
 gpm
 
diff --git a/profiles/package.mask b/profiles/package.mask
index f417b092a435..330a86fd43d7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -63,12 +63,6 @@ games-emulation/pcsxr
 gnome-extra/gucharmap:0
 
 # Matt Turner <mattst88@gentoo.org> (2023-05-11)
-# Console version of stardict which is masked for removal. Only reverse
-# dependencies are app-dicts/stardict-* (via stardict.eclass).
-# Bug #905901. Removal on 2023-06-11
-app-text/sdcv
-
-# Matt Turner <mattst88@gentoo.org> (2023-05-11)
 # Dictionaries for app-text/stardict which is masked for removal.
 # Bug #905901. Removal on 2023-06-11
 app-dicts/stardict-cdict-en-zh-big5
@@ -126,13 +120,6 @@ app-text/stardict
 # Bug #905954. Removal on 2023-06-08
 net-im/mcabber
 
-# Matt Turner <mattst88@gentoo.org> (2023-05-08)
-# Package is unmaintained and appears quite dead (e.g. SSL certificate for the
-# homepage expired in 2021). Only version is a snapshot from 2021. No Python
-# 3.11 support. Depends on app-text/enchant:0.
-# Bug #905955. Removal on 2023-06-08
-net-irc/kvirc
-
 # Michał Górny <mgorny@gentoo.org> (2023-05-05)
 # The Gentoo packages are severely out of date, and they haven't been
 # ported to Python 3.11.  They are hard to keep working, and there
diff --git a/profiles/prefix/use.force b/profiles/prefix/use.force
index b772df154580..c14d80f0d049 100644
--- a/profiles/prefix/use.force
+++ b/profiles/prefix/use.force
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# unforce the GNU/Linux ELIBC, KERNEL, and USERLAND
+# unforce the GNU/Linux ELIBC and KERNEL
 # flags that come from the base profile
 -elibc_glibc
 -kernel_linux
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0b8500a2cb44..8e6309e3945c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4934,6 +4934,7 @@ media-video/aravis:fast-heartbeat - Enable faster heartbeat rate.
 media-video/aravis:gstreamer - Build the GStreamer plugin.
 media-video/aravis:packet-socket - Enable packet socket support.
 media-video/aravis:viewer - Build the GTK+-based video viewer.
+media-video/bluray_info:mpv - Build bluray_player, powered by media-video/mpv
 media-video/chaplin:transcode - Enable DVD ripping and transcoding
 media-video/droidcam:gtk - Build the dev-cpp/gtkmm:3.0 client.
 media-video/dvdrip:fping - Enables fping support for cluster rendering