gentoo auto-resync : 09:11:2023 - 10:28:50

12 files changed, 21 insertions, 20 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index adb17d7a06bc..92b15a193dce 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 4c3863dc471b..d2c6e747e0da 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -361,8 +361,8 @@ sys-boot/grub:2 -grub_platforms_xen-32
 
 # Mike Gilbert <floppym@gentoo.org> (2015-09-05)
 # sd-boot is not supported on all archs.
-sys-apps/systemd -boot -gnuefi
-sys-apps/systemd-utils -boot
+sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd-utils -boot -ukify
 
 # Ben de Groot <yngwin@gentoo.org> (2015-03-15)
 # media-libs/libbdplus is keyworded on amd64, so unmask the useflag
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 3f0feffc13ce..218f56fa1c4a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -125,8 +125,8 @@ net-im/prosody selinux
 # Sam James <sam@gentoo.org> (2020-01-17)
 # gnuefi + systemd-boot works on arm
 # bug #729720
-sys-apps/systemd -boot -gnuefi
-sys-apps/systemd-utils -boot
+sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd-utils -boot -ukify
 
 # Joonas Niilola <juippis@gentoo.org> (2021-01-15)
 # Dependency not keyworded on this arch.
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index c61069180b21..fe51043769b1 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -152,8 +152,8 @@ media-sound/bluez-alsa man
 # Sam James <sam@gentoo.org> (2020-01-17)
 # gnuefi + systemd-boot works on arm64
 # bug #729720
-sys-apps/systemd -boot -gnuefi
-sys-apps/systemd-utils -boot
+sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd-utils -boot -ukify
 
 # Joonas Niilola <juippis@gentoo.org> (2021-01-15)
 # Dependency not keyworded on this arch.
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 004d9af566bb..4b0362d1f311 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -347,9 +347,9 @@ net-misc/moonlight mmal
 >=dev-db/mariadb-10.1.0 mroonga galera
 
 # Mike Gilbert <floppym@gentoo.org> (2015-09-05)
-# sd-boot is not supported on all archs.
-sys-apps/systemd boot gnuefi
-sys-apps/systemd-utils boot
+# sd-boot and ukify are not supported on all archs.
+sys-apps/systemd boot gnuefi ukify
+sys-apps/systemd-utils boot ukify
 
 # Ben de Groot <yngwin@gentoo.org> (2015-03-15)
 # Mask bdplus support and unmask on arches where libbdplus is keyworded.
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 564bceac2e36..b62bfcca47c6 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -97,8 +97,8 @@ app-accessibility/at-spi2-core dbus-broker
 
 # Mike Gilbert <floppym@gentoo.org> (2023-05-27)
 # Newer sd-boot does not use gnuefi.
->=sys-apps/systemd-254 -boot
->=sys-apps/systemd-utils-254 -boot
+>=sys-apps/systemd-254 -boot -ukify
+>=sys-apps/systemd-utils-254 -boot -ukify
 
 # WANG Xuerui <xen0n@gentoo.org> (2023-04-16)
 # dev-python/pyopengl fails tests
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index ddeda73b9834..7d3478fc343d 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -5,10 +5,6 @@
 # Requires media-libs/libva since 29.0.0.
 >=media-video/obs-studio-29.0.0
 
-# Sam James <sam@gentoo.org> (2022-10-08)
-# sys-boot/gnu-efi isn't keyworded here right now
-sys-kernel/installkernel-systemd-boot
-
 # Michał Górny <mgorny@gentoo.org> (2022-08-25)
 # Only ppc64le binpkg is provided.
 dev-python/pypy-exe-bin
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 152a754167f0..0326b4a821c9 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -39,8 +39,8 @@ media-video/mpv lua_single_target_luajit -lua_single_target_lua5-1
 
 # Mike Gilbert <floppym@gentoo.org> (2023-05-27)
 # sd-boot should work here.
-sys-apps/systemd -boot -gnuefi
-sys-apps/systemd-utils -boot
+sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd-utils -boot -ukify
 
 # Sam James <sam@gentoo.org> (2023-05-10)
 # sys-cluster/ceph not keyworded here
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index a9ab94eff7db..39c9627bdcd9 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -385,8 +385,8 @@ app-emulation/libvirt xen
 
 # Mike Gilbert <floppym@gentoo.org> (2015-09-05)
 # sys-boot/gnu-efi is not supported on all archs.
-sys-apps/systemd -boot -gnuefi
-sys-apps/systemd-utils -boot
+sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd-utils -boot -ukify
 
 # Ben de Groot <yngwin@gentoo.org> (2015-03-15)
 # media-libs/libbdplus is keyworded on x86, so unmask the useflag
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask
index 32df49a3a6c4..3a54bbdc93cb 100644
--- a/profiles/features/prefix/package.mask
+++ b/profiles/features/prefix/package.mask
@@ -13,6 +13,6 @@ gnome-extra/gnome-user-share
 gnome-extra/office-runner
 sys-apps/gentoo-systemd-integration
 sys-apps/systemd-readahead
-sys-kernel/installkernel-systemd-boot
+sys-kernel/installkernel-systemd
 sys-process/systemd-cron
 www-misc/profile-sync-daemon
diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index a543f3f9d4c7..a72fa0f84d1b 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -17,3 +17,4 @@ move dev-python/python-discid dev-python/discid
 move dev-python/py-amqp dev-python/amqp
 move dev-python/pyre2 dev-python/fb-re2
 move dev-python/python-sshpubkeys dev-python/sshpubkeys
+move sys-kernel/installkernel-systemd-boot sys-kernel/installkernel-systemd
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f44848cd2523..3dbdcc1ebae4 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7910,6 +7910,7 @@ sys-apps/systemd:homed - Enable portable home directories
 sys-apps/systemd:http - Enable embedded HTTP server in journald
 sys-apps/systemd:importd - Enable import daemon
 sys-apps/systemd:iptables - Use libiptc from net-firewall/iptables for NAT support in systemd-networkd; this is used only if the running kernel does not support nftables
+sys-apps/systemd:kernel-install - Enable kernel-install
 sys-apps/systemd:kmod - Enable kernel module loading via sys-apps/kmod
 sys-apps/systemd:lz4 - Enable lz4 compression for the journal
 sys-apps/systemd:openssl - Enable use of dev-libs/openssl for various features
@@ -7919,13 +7920,16 @@ sys-apps/systemd:qrcode - Enable qrcode output support in journal
 sys-apps/systemd:resolvconf - Install resolvconf symlink for systemd-resolve
 sys-apps/systemd:sysv-utils - Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown
 sys-apps/systemd:tpm - Enable TPM support
+sys-apps/systemd:ukify - Enable systemd-ukify
 sys-apps/systemd:vanilla - Disable Gentoo-specific behavior and compatibility quirks
 sys-apps/systemd:xkb - Depend on x11-libs/libxkbcommon to allow logind to control the X11 keymap
 sys-apps/systemd-utils:boot - Enable systemd-boot (UEFI boot manager)
+sys-apps/systemd-utils:kernel-install - Enable kernel-install
 sys-apps/systemd-utils:kmod - Enable kernel module loading via sys-apps/kmod
 sys-apps/systemd-utils:sysusers - Enable systemd-sysusers
 sys-apps/systemd-utils:tmpfiles - Enable systemd-tmpfiles
 sys-apps/systemd-utils:udev - Enable systemd-udev (userspace device manager)
+sys-apps/systemd-utils:ukify - Enable systemd-ukify
 sys-apps/tcp-wrappers:netgroups - Support matching NIS (host) netgroup names via the @netgroup syntax (if you don't know what this means, you most likely do not need it)
 sys-apps/texinfo:standalone - Build standalone version that survives all Portage bugs
 sys-apps/usbguard:umockdev - Enables support for dev-util/umockdev