From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 29 Jun 2022 12:04:12 +0100
Subject: gentoo resync : 29.12.2022
---
sys-apps/Manifest.gz | Bin 48181 -> 48306 bytes
sys-apps/accountsservice/Manifest | 4 +-
.../accountsservice/accountsservice-22.07.5.ebuild | 86 ----
.../accountsservice/accountsservice-22.08.8.ebuild | 2 +-
sys-apps/acl/Manifest | 1 +
sys-apps/acl/acl-2.3.1-r1.ebuild | 79 +++
sys-apps/apmd/Manifest | 2 +
sys-apps/apmd/apmd-3.2.2_p14-r3.ebuild | 86 ++++
sys-apps/apmd/files/apmd-3.2.2-libtool.patch | 124 +++++
sys-apps/apparmor-utils/Manifest | 6 +-
.../apparmor-utils/apparmor-utils-3.0.1.ebuild | 88 ----
.../apparmor-utils/apparmor-utils-3.0.3.ebuild | 8 +-
.../apparmor-utils/apparmor-utils-3.0.4.ebuild | 87 ++++
sys-apps/apparmor/Manifest | 6 +-
sys-apps/apparmor/apparmor-3.0.1.ebuild | 83 ---
sys-apps/apparmor/apparmor-3.0.3.ebuild | 4 +-
sys-apps/apparmor/apparmor-3.0.4.ebuild | 85 ++++
sys-apps/attr/Manifest | 4 +-
sys-apps/attr/attr-2.5.1-r1.ebuild | 109 ++++
sys-apps/attr/attr-9999.ebuild | 44 +-
sys-apps/attr/files/attr-2.5.1-fix-symver.patch | 173 +++++++
sys-apps/baobab/Manifest | 2 +-
sys-apps/baobab/baobab-42.0.ebuild | 2 +-
sys-apps/baselayout/Manifest | 5 +-
sys-apps/baselayout/baselayout-2.7-r1.ebuild | 317 ------------
sys-apps/baselayout/baselayout-2.7-r2.ebuild | 318 ------------
sys-apps/baselayout/baselayout-2.7.ebuild | 312 ------------
sys-apps/baselayout/baselayout-2.8.ebuild | 2 +-
sys-apps/bat/Manifest | 23 +
sys-apps/bat/bat-0.21.0.ebuild | 204 ++++++++
sys-apps/bleachbit/Manifest | 4 +-
sys-apps/bleachbit/bleachbit-4.2.0.ebuild | 82 ---
sys-apps/bleachbit/bleachbit-4.4.2.ebuild | 4 +-
sys-apps/bubblewrap/Manifest | 6 +-
sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild | 46 --
sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild | 2 +-
sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild | 2 +-
sys-apps/ccs-tools/Manifest | 2 +-
sys-apps/ccs-tools/metadata.xml | 2 +-
sys-apps/checkpolicy/Manifest | 4 +-
sys-apps/checkpolicy/checkpolicy-3.4.ebuild | 54 ++
sys-apps/checkpolicy/checkpolicy-3.4_rc1.ebuild | 54 --
sys-apps/cpuid/Manifest | 3 +
sys-apps/cpuid/cpuid-20220620.ebuild | 35 ++
sys-apps/cpuid/files/cpuid-20220620-makefile.patch | 37 ++
sys-apps/daisydog/Manifest | 2 +
sys-apps/daisydog/daisydog-2014.05.30-r1.ebuild | 33 ++
sys-apps/daisydog/files/daisydog.init.d-r1 | 13 +
sys-apps/dbus-broker/Manifest | 7 +-
sys-apps/dbus-broker/dbus-broker-30.ebuild | 45 --
sys-apps/dbus-broker/dbus-broker-31.ebuild | 57 +++
sys-apps/dbus-broker/dbus-broker-9999.ebuild | 1 +
.../files/dbus-broker-30-user-free-assertion.patch | 64 ---
sys-apps/dbus/Manifest | 8 +-
sys-apps/dbus/dbus-1.12.20-r4.ebuild | 283 -----------
sys-apps/dbus/dbus-1.12.20-r5.ebuild | 284 +++++++++++
sys-apps/dbus/dbus-1.12.22-r1.ebuild | 289 -----------
sys-apps/dbus/dbus-1.12.22-r2.ebuild | 290 +++++++++++
sys-apps/dbus/dbus-1.14.0-r1.ebuild | 292 -----------
sys-apps/dbus/dbus-1.14.0-r2.ebuild | 293 +++++++++++
sys-apps/dbus/dbus-1.14.0-r4.ebuild | 292 +++++++++++
sys-apps/dbus/files/80-dbus-r1 | 13 +
sys-apps/dcfldd/Manifest | 2 +-
sys-apps/dcfldd/dcfldd-1.7.1.ebuild | 4 +-
sys-apps/dchroot/Manifest | 3 +-
sys-apps/dchroot/dchroot-0.12.1.ebuild | 9 +-
.../dchroot/files/dchroot-0.12.1-no-werror.patch | 13 +
sys-apps/debianutils/Manifest | 4 +-
sys-apps/debianutils/debianutils-5.5.ebuild | 53 --
sys-apps/debianutils/debianutils-5.7.ebuild | 2 +-
sys-apps/dstat/Manifest | 2 +-
sys-apps/dstat/dstat-0.7.4-r2.ebuild | 4 +-
sys-apps/dtc/Manifest | 2 +-
sys-apps/dtc/dtc-1.6.0.ebuild | 4 +-
sys-apps/ed/Manifest | 4 +-
sys-apps/ed/ed-1.17.ebuild | 36 --
sys-apps/ed/ed-1.18.ebuild | 2 +-
sys-apps/eless/Manifest | 3 +
sys-apps/eless/eless-0.7.ebuild | 30 ++
sys-apps/eless/metadata.xml | 23 +
sys-apps/etckeeper/Manifest | 5 +-
sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild | 4 +-
sys-apps/etckeeper/etckeeper-1.18.17.ebuild | 99 ++++
.../files/etckeeper-1.18.17-egrep-deprecated.patch | 85 ++++
sys-apps/ethq/Manifest | 4 +-
sys-apps/ethq/ethq-0.6.1.ebuild | 10 +-
sys-apps/ethq/ethq-9999.ebuild | 11 +-
sys-apps/ethtool/Manifest | 4 +-
sys-apps/ethtool/ethtool-5.17.ebuild | 2 +-
sys-apps/ethtool/ethtool-5.18.ebuild | 21 +
sys-apps/fakechroot/Manifest | 3 +
sys-apps/fakechroot/fakechroot-2.20.1_p2.ebuild | 41 ++
sys-apps/fakeroot/Manifest | 10 +-
sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild | 60 ---
sys-apps/fakeroot/fakeroot-1.26-r1.ebuild | 75 ---
sys-apps/fakeroot/fakeroot-1.27.ebuild | 2 +-
sys-apps/fakeroot/fakeroot-1.28.ebuild | 74 ---
sys-apps/fakeroot/fakeroot-1.29.ebuild | 74 +++
sys-apps/file/Manifest | 7 +-
sys-apps/file/file-5.41.ebuild | 2 +-
sys-apps/file/file-5.42.ebuild | 161 ++++++
sys-apps/file/file-9999.ebuild | 43 +-
sys-apps/findutils/Manifest | 4 +-
sys-apps/findutils/findutils-4.8.0-r1.ebuild | 80 ---
sys-apps/findutils/findutils-4.9.0.ebuild | 4 +-
sys-apps/firejail/Manifest | 8 +-
.../firejail/files/firejail-0.9.70-envlimits.patch | 12 +
.../files/firejail-0.9.70-firecfg.config.patch | 82 +++
sys-apps/firejail/firejail-0.9.68.ebuild | 118 -----
sys-apps/firejail/firejail-0.9.70.ebuild | 118 +++++
sys-apps/firejail/firejail-9999.ebuild | 99 ----
sys-apps/firejail/metadata.xml | 1 -
sys-apps/flatpak/Manifest | 10 +-
sys-apps/flatpak/flatpak-1.12.3.ebuild | 7 +-
sys-apps/flatpak/flatpak-1.12.7.ebuild | 7 +-
sys-apps/flatpak/flatpak-1.13.1.ebuild | 105 ----
sys-apps/flatpak/flatpak-1.13.2.ebuild | 13 +-
sys-apps/flatpak/flatpak-1.13.3.ebuild | 108 ++++
sys-apps/fwts/Manifest | 6 +-
sys-apps/fwts/files/fwts-22.03.00-slibtool.patch | 155 ++++++
sys-apps/fwts/files/fwts-22.03.00-werror.patch | 65 +++
sys-apps/fwts/fwts-20.11.00.ebuild | 49 --
sys-apps/fwts/fwts-22.03.00.ebuild | 51 ++
sys-apps/fwupd-efi/Manifest | 2 +-
sys-apps/fwupd-efi/metadata.xml | 9 +-
sys-apps/fwupd/Manifest | 6 +-
sys-apps/fwupd/fwupd-1.7.7-r2.ebuild | 2 +-
sys-apps/fwupd/fwupd-1.8.1.ebuild | 188 +++++++
sys-apps/fwupd/metadata.xml | 8 +-
sys-apps/fxload/Manifest | 2 +-
sys-apps/fxload/fxload-20081013-r1.ebuild | 4 +-
sys-apps/gawk/Manifest | 2 +-
sys-apps/gawk/gawk-5.1.1-r2.ebuild | 1 +
sys-apps/gentoo-systemd-integration/Manifest | 4 +-
.../gentoo-systemd-integration-9.ebuild | 2 +-
.../gentoo-systemd-integration-9999.ebuild | 2 +-
sys-apps/gnome-disk-utility/Manifest | 5 +-
.../gnome-disk-utility-41.0-meson-0.61-build.patch | 28 --
.../gnome-disk-utility-41.0.ebuild | 67 ---
.../gnome-disk-utility-42.0.ebuild | 2 +-
sys-apps/gpet/Manifest | 2 +-
sys-apps/gpet/metadata.xml | 2 +-
sys-apps/gptfdisk/Manifest | 8 +-
.../files/gptfdisk-1.0.7-remove_byteswap.patch | 50 --
.../gptfdisk/files/gptfdisk-1.0.9-libuuid.patch | 37 ++
sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild | 60 ---
sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild | 60 +++
sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild | 56 ---
sys-apps/gptfdisk/metadata.xml | 5 +-
sys-apps/hdparm/Manifest | 4 +-
sys-apps/hdparm/hdparm-9.62.ebuild | 43 --
sys-apps/hdparm/hdparm-9.63.ebuild | 2 +-
sys-apps/help2man/Manifest | 2 -
sys-apps/help2man/help2man-1.48.3.ebuild | 41 --
sys-apps/hponcfg/Manifest | 2 +-
sys-apps/hponcfg/metadata.xml | 5 +-
sys-apps/hw-probe/Manifest | 4 +-
sys-apps/hw-probe/hw-probe-1.6.2.ebuild | 63 ---
sys-apps/hw-probe/hw-probe-1.6.4.ebuild | 2 +-
sys-apps/hwdata/Manifest | 6 +-
sys-apps/hwdata/hwdata-0.358.ebuild | 2 +-
sys-apps/hwdata/hwdata-0.359.ebuild | 25 +
sys-apps/hwdata/hwdata-0.360.ebuild | 25 +
sys-apps/hwinfo/Manifest | 4 +-
sys-apps/hwinfo/hwinfo-21.80.ebuild | 2 +-
sys-apps/hwinfo/hwinfo-21.81.ebuild | 61 +++
sys-apps/hwloc/Manifest | 2 +-
sys-apps/hwloc/hwloc-2.7.1-r1.ebuild | 2 +-
sys-apps/inxi/Manifest | 4 +-
sys-apps/inxi/inxi-3.3.13.1.ebuild | 2 +-
sys-apps/inxi/inxi-3.3.17.1.ebuild | 32 ++
sys-apps/iproute2/Manifest | 8 +-
sys-apps/iproute2/iproute2-5.17.0.ebuild | 169 -------
sys-apps/iproute2/iproute2-5.18.0-r1.ebuild | 210 ++++++++
sys-apps/iproute2/iproute2-9999.ebuild | 85 +++-
sys-apps/iproute2/metadata.xml | 1 +
sys-apps/irqbalance/Manifest | 2 +
sys-apps/irqbalance/irqbalance-1.9.0.ebuild | 62 +++
sys-apps/kbd/Manifest | 8 +-
sys-apps/kbd/kbd-2.4.0.ebuild | 2 +-
sys-apps/kbd/kbd-2.5.1.ebuild | 83 +++
sys-apps/kbd/kbd-9999.ebuild | 45 +-
sys-apps/kbd/metadata.xml | 14 +-
sys-apps/kexec-tools/Manifest | 2 +
sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild | 124 +++++
sys-apps/kmod/Manifest | 3 +-
sys-apps/kmod/kmod-29-r2.ebuild | 205 ++++++++
sys-apps/kmod/kmod-9999.ebuild | 34 +-
sys-apps/kmscon/Manifest | 1 +
sys-apps/kmscon/kmscon-8_p20220214-r1.ebuild | 150 ++++++
sys-apps/lcdutils/Manifest | 2 +-
sys-apps/lcdutils/metadata.xml | 2 +-
sys-apps/likwid/Manifest | 2 +
sys-apps/likwid/likwid-5.2.1.ebuild | 147 ++++++
sys-apps/lm-sensors/Manifest | 5 +-
.../files/lm-sensors-3.6.0-no-which.patch | 21 +
sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild | 5 +-
sys-apps/lm-sensors/metadata.xml | 9 +-
sys-apps/logwatch/Manifest | 2 -
sys-apps/logwatch/logwatch-7.5.6.ebuild | 93 ----
sys-apps/lsb-release/Manifest | 2 +-
sys-apps/lsb-release/lsb-release-1.4-r4.ebuild | 4 +-
sys-apps/lsvpd/Manifest | 4 +-
sys-apps/lsvpd/lsvpd-1.7.14.ebuild | 35 ++
sys-apps/lsvpd/metadata.xml | 1 +
sys-apps/man-pages/Manifest | 2 +-
sys-apps/man-pages/man-pages-5.13.ebuild | 2 +-
sys-apps/mcstrans/Manifest | 4 +-
sys-apps/mcstrans/mcstrans-3.4.ebuild | 52 ++
sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild | 52 --
sys-apps/memtest86+/Manifest | 5 +-
sys-apps/memtest86+/files/39_memtest86+-r2 | 126 +++++
sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild | 71 +++
sys-apps/memtest86+/metadata.xml | 6 +
sys-apps/minijail/Manifest | 5 +-
.../minijail/files/minijail-17-no-werror.patch | 13 +
sys-apps/minijail/minijail-12.ebuild | 77 ---
sys-apps/minijail/minijail-17.ebuild | 3 +-
sys-apps/minised/Manifest | 2 +
sys-apps/minised/minised-1.16.ebuild | 19 +
sys-apps/miscfiles/Manifest | 3 +-
sys-apps/miscfiles/miscfiles-1.5-r3.ebuild | 62 ---
sys-apps/miscfiles/miscfiles-1.5-r4.ebuild | 2 +-
sys-apps/netplug/Manifest | 4 +-
sys-apps/netplug/metadata.xml | 5 +-
sys-apps/netplug/netplug-1.2.9.2-r3.ebuild | 2 +-
sys-apps/nvme-cli/Manifest | 6 +-
.../files/nvme-cli-1.16-bash-completions.patch | 72 +++
.../files/nvme-cli-2.0-bash-completions.patch | 61 +++
sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild | 55 ++
sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild | 38 ++
sys-apps/nvme-cli/nvme-cli-2.0.ebuild | 2 +-
sys-apps/onerng/Manifest | 2 +
sys-apps/onerng/onerng-3.7.ebuild | 40 ++
sys-apps/openrc/Manifest | 6 +-
sys-apps/openrc/openrc-0.44.10.ebuild | 11 +
sys-apps/openrc/openrc-0.45.1.ebuild | 164 ++++++
sys-apps/openrc/openrc-9999.ebuild | 28 +-
sys-apps/osinfo-db/Manifest | 2 +
sys-apps/osinfo-db/osinfo-db-20220516.ebuild | 25 +
sys-apps/pciutils/Manifest | 8 +-
.../pciutils/files/pciutils-3.1.9-static-pc.patch | 13 -
.../pciutils/files/pciutils-3.8.0-no-which.patch | 34 ++
.../pciutils/files/pciutils-3.8.0-pkg-config.patch | 19 +
sys-apps/pciutils/pciutils-3.7.0-r2.ebuild | 111 ----
sys-apps/pciutils/pciutils-3.8.0-r1.ebuild | 168 +++++++
sys-apps/pciutils/pciutils-3.8.0.ebuild | 63 ++-
sys-apps/pcmciautils/Manifest | 2 +-
sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild | 4 +-
sys-apps/pcsc-lite/Manifest | 14 +-
sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules | 6 -
.../files/pcsc-lite-1.9.5-no-libusb-udev.patch | 29 --
sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild | 104 ----
sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild | 104 ----
sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild | 104 ----
sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild | 105 ----
sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild | 102 ++++
sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild | 102 ++++
sys-apps/pcsc-tools/Manifest | 1 +
sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild | 62 +++
sys-apps/pkgcore/Manifest | 4 +-
sys-apps/pkgcore/metadata.xml | 15 +-
sys-apps/pkgcore/pkgcore-0.12.11.ebuild | 55 ++
sys-apps/plocate/Manifest | 4 +-
sys-apps/plocate/plocate-1.1.15.ebuild | 11 +-
sys-apps/plocate/plocate-1.1.16.ebuild | 86 ++++
sys-apps/pmount/Manifest | 5 +-
.../files/pmount-0.9.99_alpha-limits-musl.patch | 12 +
.../pmount-0.9.99_alpha-missing-includes.patch | 82 +++
sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild | 4 +-
sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild | 92 ++++
sys-apps/policycoreutils/Manifest | 6 +-
.../policycoreutils/policycoreutils-3.4.ebuild | 163 ++++++
.../policycoreutils/policycoreutils-3.4_rc1.ebuild | 163 ------
.../policycoreutils/policycoreutils-9999.ebuild | 2 +-
sys-apps/portage/Manifest | 6 +-
sys-apps/portage/metadata.xml | 1 +
sys-apps/portage/portage-3.0.30-r5.ebuild | 2 +-
sys-apps/portage/portage-9999.ebuild | 2 +-
sys-apps/ppc64-diag/Manifest | 2 +
sys-apps/ppc64-diag/ppc64-diag-2.7.8.ebuild | 73 +++
sys-apps/razercfg/Manifest | 2 +-
sys-apps/razercfg/razercfg-0.42.ebuild | 6 +-
sys-apps/restorecond/Manifest | 4 +-
sys-apps/restorecond/restorecond-3.4.ebuild | 54 ++
sys-apps/restorecond/restorecond-3.4_rc1.ebuild | 54 --
sys-apps/rng-tools/Manifest | 4 +-
sys-apps/rng-tools/rng-tools-6.14-r2.ebuild | 69 ---
sys-apps/rng-tools/rng-tools-6.15.ebuild | 2 +-
sys-apps/roccat-tools/Manifest | 2 +-
sys-apps/roccat-tools/metadata.xml | 5 +-
sys-apps/rootlesskit/Manifest | 107 +---
sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild | 110 +---
sys-apps/s6-linux-init/Manifest | 8 +-
.../s6-linux-init/s6-linux-init-1.0.4.2.ebuild | 72 ---
.../s6-linux-init/s6-linux-init-1.0.7.1.ebuild | 74 ---
.../s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild | 74 +++
.../s6-linux-init/s6-linux-init-1.0.7.3.ebuild | 74 ---
.../s6-linux-init/s6-linux-init-1.0.8.0.ebuild | 71 +++
sys-apps/s6-linux-utils/Manifest | 6 +-
.../s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild | 46 --
.../s6-linux-utils-2.5.1.7-r1.ebuild | 48 ++
.../s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild | 48 --
.../s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild | 45 ++
sys-apps/s6-portable-utils/Manifest | 8 +-
.../s6-portable-utils-2.2.3.0.ebuild | 46 --
.../s6-portable-utils-2.2.3.4.ebuild | 48 --
.../s6-portable-utils-2.2.4.0-r1.ebuild | 48 ++
.../s6-portable-utils-2.2.4.0.ebuild | 48 --
.../s6-portable-utils-2.2.5.0.ebuild | 45 ++
sys-apps/s6-rc/Manifest | 8 +-
sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild | 59 ---
sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild | 61 +++
sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild | 61 ---
sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild | 61 +++
sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild | 51 ++
sys-apps/s6/Manifest | 8 +-
sys-apps/s6/s6-2.11.0.1.ebuild | 54 --
sys-apps/s6/s6-2.11.1.0-r1.ebuild | 54 ++
sys-apps/s6/s6-2.11.1.0.ebuild | 54 --
sys-apps/s6/s6-2.11.1.1.ebuild | 51 ++
sys-apps/s6/s6-2.9.2.0.ebuild | 52 --
sys-apps/sdparm/Manifest | 2 +-
sys-apps/sdparm/sdparm-1.12.ebuild | 4 +-
sys-apps/secilc/Manifest | 4 +-
sys-apps/secilc/secilc-3.4.ebuild | 37 ++
sys-apps/secilc/secilc-3.4_rc1.ebuild | 37 --
sys-apps/selinux-python/Manifest | 6 +-
sys-apps/selinux-python/selinux-python-3.4.ebuild | 114 +++++
.../selinux-python/selinux-python-3.4_rc1.ebuild | 114 -----
sys-apps/selinux-python/selinux-python-9999.ebuild | 2 +-
sys-apps/semodule-utils/Manifest | 4 +-
sys-apps/semodule-utils/semodule-utils-3.4.ebuild | 43 ++
.../semodule-utils/semodule-utils-3.4_rc1.ebuild | 43 --
sys-apps/servicelog/Manifest | 4 +-
sys-apps/servicelog/metadata.xml | 2 +-
sys-apps/servicelog/servicelog-1.1.16.ebuild | 28 ++
sys-apps/setserial/Manifest | 2 +-
sys-apps/setserial/setserial-2.17-r5.ebuild | 4 +-
sys-apps/sg3_utils/Manifest | 2 +-
sys-apps/sg3_utils/sg3_utils-1.47.ebuild | 2 +-
sys-apps/smartmontools/Manifest | 3 -
...rtmontools-7.2-update-smart-drivedb-quiet.patch | 86 ----
sys-apps/smartmontools/smartmontools-7.2-r2.ebuild | 156 ------
sys-apps/smc-sum/Manifest | 2 +
sys-apps/smc-sum/smc-sum-2.8.1.20220506.ebuild | 73 +++
sys-apps/systemd-tmpfiles/Manifest | 2 +-
.../systemd-tmpfiles/systemd-tmpfiles-250.ebuild | 2 +-
sys-apps/systemd-utils/Manifest | 8 +-
.../systemd-utils/systemd-utils-250.4-r3.ebuild | 475 ------------------
sys-apps/systemd-utils/systemd-utils-250.5.ebuild | 475 ------------------
sys-apps/systemd-utils/systemd-utils-250.6.ebuild | 500 ++++++++++++++++++
sys-apps/systemd-utils/systemd-utils-250.7.ebuild | 500 ++++++++++++++++++
sys-apps/systemd/Manifest | 24 +-
sys-apps/systemd/files/249.9-cross-compile.patch | 23 -
sys-apps/systemd/files/251-format-string.patch | 25 +
sys-apps/systemd/files/251-rc2-colorterm.patch | 57 ---
.../files/251-revert-fortify-source-3-fix.patch | 40 ++
sys-apps/systemd/metadata.xml | 1 -
sys-apps/systemd/systemd-249.11.ebuild | 505 -------------------
sys-apps/systemd/systemd-249.9.ebuild | 506 -------------------
sys-apps/systemd/systemd-250.4-r2.ebuild | 5 +-
sys-apps/systemd/systemd-250.5-r1.ebuild | 534 --------------------
sys-apps/systemd/systemd-250.6.ebuild | 554 ++++++++++++++++++++
sys-apps/systemd/systemd-250.7.ebuild | 556 +++++++++++++++++++++
sys-apps/systemd/systemd-251.2.ebuild | 536 ++++++++++++++++++++
sys-apps/systemd/systemd-251_rc2.ebuild | 512 -------------------
sys-apps/systemd/systemd-9999.ebuild | 31 +-
sys-apps/tas/Manifest | 4 +-
sys-apps/tas/tas-1.6.0.200601-r1.ebuild | 73 ---
sys-apps/tas/tas-1.7.0.220503.ebuild | 73 +++
sys-apps/tcp-wrappers/Manifest | 2 +-
sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild | 4 +-
sys-apps/texinfo/Manifest | 2 +-
sys-apps/texinfo/texinfo-6.8.ebuild | 5 +-
sys-apps/tomoyo-tools/Manifest | 2 +-
sys-apps/tomoyo-tools/metadata.xml | 2 +-
sys-apps/usbguard/Manifest | 6 +-
sys-apps/usbguard/usbguard-1.1.0-r1.ebuild | 2 +-
sys-apps/usbguard/usbguard-1.1.1-r1.ebuild | 2 +-
sys-apps/usbguard/usbguard-1.1.1-r2.ebuild | 98 ++++
sys-apps/usbguard/usbguard-1.1.1-r3.ebuild | 99 ++++
sys-apps/usbutils/Manifest | 2 +-
sys-apps/usbutils/usbutils-014-r1.ebuild | 9 +-
sys-apps/x86info/Manifest | 2 +
sys-apps/x86info/x86info-1.31.ebuild | 71 +++
sys-apps/xdg-dbus-proxy/Manifest | 2 +
.../xdg-dbus-proxy/xdg-dbus-proxy-0.1.4.ebuild | 36 ++
sys-apps/xdg-desktop-portal-gnome/Manifest | 2 +-
.../xdg-desktop-portal-gnome-42.1.ebuild | 2 +-
sys-apps/xdg-desktop-portal-gtk/Manifest | 2 +-
.../xdg-desktop-portal-gtk-1.14.0.ebuild | 2 +-
sys-apps/xdg-desktop-portal/Manifest | 4 +-
.../xdg-desktop-portal-1.12.1.ebuild | 42 --
.../xdg-desktop-portal-1.14.4.ebuild | 2 +-
sys-apps/xinetd/Manifest | 2 +-
sys-apps/xinetd/xinetd-2.3.15.4.ebuild | 4 +-
sys-apps/yarn/Manifest | 6 +-
sys-apps/yarn/yarn-1.22.10.ebuild | 40 --
sys-apps/yarn/yarn-1.22.19.ebuild | 40 ++
sys-apps/yarn/yarn-1.22.4.ebuild | 40 --
sys-apps/zram-generator/Manifest | 2 +-
.../zram-generator/zram-generator-1.1.2.ebuild | 2 +-
403 files changed, 11557 insertions(+), 10011 deletions(-)
delete mode 100644 sys-apps/accountsservice/accountsservice-22.07.5.ebuild
create mode 100644 sys-apps/acl/acl-2.3.1-r1.ebuild
create mode 100644 sys-apps/apmd/apmd-3.2.2_p14-r3.ebuild
create mode 100644 sys-apps/apmd/files/apmd-3.2.2-libtool.patch
delete mode 100644 sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
create mode 100644 sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
delete mode 100644 sys-apps/apparmor/apparmor-3.0.1.ebuild
create mode 100644 sys-apps/apparmor/apparmor-3.0.4.ebuild
create mode 100644 sys-apps/attr/attr-2.5.1-r1.ebuild
create mode 100644 sys-apps/attr/files/attr-2.5.1-fix-symver.patch
delete mode 100644 sys-apps/baselayout/baselayout-2.7-r1.ebuild
delete mode 100644 sys-apps/baselayout/baselayout-2.7-r2.ebuild
delete mode 100644 sys-apps/baselayout/baselayout-2.7.ebuild
create mode 100644 sys-apps/bat/bat-0.21.0.ebuild
delete mode 100644 sys-apps/bleachbit/bleachbit-4.2.0.ebuild
delete mode 100644 sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild
create mode 100644 sys-apps/checkpolicy/checkpolicy-3.4.ebuild
delete mode 100644 sys-apps/checkpolicy/checkpolicy-3.4_rc1.ebuild
create mode 100644 sys-apps/cpuid/cpuid-20220620.ebuild
create mode 100644 sys-apps/cpuid/files/cpuid-20220620-makefile.patch
create mode 100644 sys-apps/daisydog/daisydog-2014.05.30-r1.ebuild
create mode 100644 sys-apps/daisydog/files/daisydog.init.d-r1
delete mode 100644 sys-apps/dbus-broker/dbus-broker-30.ebuild
create mode 100644 sys-apps/dbus-broker/dbus-broker-31.ebuild
delete mode 100644 sys-apps/dbus-broker/files/dbus-broker-30-user-free-assertion.patch
delete mode 100644 sys-apps/dbus/dbus-1.12.20-r4.ebuild
create mode 100644 sys-apps/dbus/dbus-1.12.20-r5.ebuild
delete mode 100644 sys-apps/dbus/dbus-1.12.22-r1.ebuild
create mode 100644 sys-apps/dbus/dbus-1.12.22-r2.ebuild
delete mode 100644 sys-apps/dbus/dbus-1.14.0-r1.ebuild
create mode 100644 sys-apps/dbus/dbus-1.14.0-r2.ebuild
create mode 100644 sys-apps/dbus/dbus-1.14.0-r4.ebuild
create mode 100644 sys-apps/dbus/files/80-dbus-r1
create mode 100644 sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch
delete mode 100644 sys-apps/debianutils/debianutils-5.5.ebuild
delete mode 100644 sys-apps/ed/ed-1.17.ebuild
create mode 100644 sys-apps/eless/Manifest
create mode 100644 sys-apps/eless/eless-0.7.ebuild
create mode 100644 sys-apps/eless/metadata.xml
create mode 100644 sys-apps/etckeeper/etckeeper-1.18.17.ebuild
create mode 100644 sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch
create mode 100644 sys-apps/ethtool/ethtool-5.18.ebuild
create mode 100644 sys-apps/fakechroot/fakechroot-2.20.1_p2.ebuild
delete mode 100644 sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild
delete mode 100644 sys-apps/fakeroot/fakeroot-1.26-r1.ebuild
delete mode 100644 sys-apps/fakeroot/fakeroot-1.28.ebuild
create mode 100644 sys-apps/fakeroot/fakeroot-1.29.ebuild
create mode 100644 sys-apps/file/file-5.42.ebuild
delete mode 100644 sys-apps/findutils/findutils-4.8.0-r1.ebuild
create mode 100644 sys-apps/firejail/files/firejail-0.9.70-envlimits.patch
create mode 100644 sys-apps/firejail/files/firejail-0.9.70-firecfg.config.patch
delete mode 100644 sys-apps/firejail/firejail-0.9.68.ebuild
create mode 100644 sys-apps/firejail/firejail-0.9.70.ebuild
delete mode 100644 sys-apps/firejail/firejail-9999.ebuild
delete mode 100644 sys-apps/flatpak/flatpak-1.13.1.ebuild
create mode 100644 sys-apps/flatpak/flatpak-1.13.3.ebuild
create mode 100644 sys-apps/fwts/files/fwts-22.03.00-slibtool.patch
create mode 100644 sys-apps/fwts/files/fwts-22.03.00-werror.patch
delete mode 100644 sys-apps/fwts/fwts-20.11.00.ebuild
create mode 100644 sys-apps/fwts/fwts-22.03.00.ebuild
create mode 100644 sys-apps/fwupd/fwupd-1.8.1.ebuild
delete mode 100644 sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch
delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
delete mode 100644 sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch
create mode 100644 sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch
delete mode 100644 sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild
create mode 100644 sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild
delete mode 100644 sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild
delete mode 100644 sys-apps/hdparm/hdparm-9.62.ebuild
delete mode 100644 sys-apps/help2man/help2man-1.48.3.ebuild
delete mode 100644 sys-apps/hw-probe/hw-probe-1.6.2.ebuild
create mode 100644 sys-apps/hwdata/hwdata-0.359.ebuild
create mode 100644 sys-apps/hwdata/hwdata-0.360.ebuild
create mode 100644 sys-apps/hwinfo/hwinfo-21.81.ebuild
create mode 100644 sys-apps/inxi/inxi-3.3.17.1.ebuild
delete mode 100644 sys-apps/iproute2/iproute2-5.17.0.ebuild
create mode 100644 sys-apps/iproute2/iproute2-5.18.0-r1.ebuild
create mode 100644 sys-apps/irqbalance/irqbalance-1.9.0.ebuild
create mode 100644 sys-apps/kbd/kbd-2.5.1.ebuild
create mode 100644 sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
create mode 100644 sys-apps/kmod/kmod-29-r2.ebuild
create mode 100644 sys-apps/kmscon/kmscon-8_p20220214-r1.ebuild
create mode 100644 sys-apps/likwid/likwid-5.2.1.ebuild
create mode 100644 sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch
delete mode 100644 sys-apps/logwatch/logwatch-7.5.6.ebuild
create mode 100644 sys-apps/lsvpd/lsvpd-1.7.14.ebuild
create mode 100644 sys-apps/mcstrans/mcstrans-3.4.ebuild
delete mode 100644 sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild
create mode 100644 sys-apps/memtest86+/files/39_memtest86+-r2
create mode 100644 sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
create mode 100644 sys-apps/minijail/files/minijail-17-no-werror.patch
delete mode 100644 sys-apps/minijail/minijail-12.ebuild
create mode 100644 sys-apps/minised/minised-1.16.ebuild
delete mode 100644 sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
create mode 100644 sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch
create mode 100644 sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch
create mode 100644 sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild
create mode 100644 sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
create mode 100644 sys-apps/onerng/onerng-3.7.ebuild
create mode 100644 sys-apps/openrc/openrc-0.45.1.ebuild
create mode 100644 sys-apps/osinfo-db/osinfo-db-20220516.ebuild
delete mode 100644 sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
create mode 100644 sys-apps/pciutils/files/pciutils-3.8.0-no-which.patch
create mode 100644 sys-apps/pciutils/files/pciutils-3.8.0-pkg-config.patch
delete mode 100644 sys-apps/pciutils/pciutils-3.7.0-r2.ebuild
create mode 100644 sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
delete mode 100644 sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules
delete mode 100644 sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch
delete mode 100644 sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
delete mode 100644 sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
delete mode 100644 sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
delete mode 100644 sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
create mode 100644 sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
create mode 100644 sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild
create mode 100644 sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild
create mode 100644 sys-apps/pkgcore/pkgcore-0.12.11.ebuild
create mode 100644 sys-apps/plocate/plocate-1.1.16.ebuild
create mode 100644 sys-apps/pmount/files/pmount-0.9.99_alpha-limits-musl.patch
create mode 100644 sys-apps/pmount/files/pmount-0.9.99_alpha-missing-includes.patch
create mode 100644 sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild
create mode 100644 sys-apps/policycoreutils/policycoreutils-3.4.ebuild
delete mode 100644 sys-apps/policycoreutils/policycoreutils-3.4_rc1.ebuild
create mode 100644 sys-apps/ppc64-diag/ppc64-diag-2.7.8.ebuild
create mode 100644 sys-apps/restorecond/restorecond-3.4.ebuild
delete mode 100644 sys-apps/restorecond/restorecond-3.4_rc1.ebuild
delete mode 100644 sys-apps/rng-tools/rng-tools-6.14-r2.ebuild
delete mode 100644 sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
delete mode 100644 sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
create mode 100644 sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild
delete mode 100644 sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
create mode 100644 sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
delete mode 100644 sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild
create mode 100644 sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild
delete mode 100644 sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
create mode 100644 sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
delete mode 100644 sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild
delete mode 100644 sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild
create mode 100644 sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
delete mode 100644 sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
create mode 100644 sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
delete mode 100644 sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
create mode 100644 sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
delete mode 100644 sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
create mode 100644 sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
create mode 100644 sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
delete mode 100644 sys-apps/s6/s6-2.11.0.1.ebuild
create mode 100644 sys-apps/s6/s6-2.11.1.0-r1.ebuild
delete mode 100644 sys-apps/s6/s6-2.11.1.0.ebuild
create mode 100644 sys-apps/s6/s6-2.11.1.1.ebuild
delete mode 100644 sys-apps/s6/s6-2.9.2.0.ebuild
create mode 100644 sys-apps/secilc/secilc-3.4.ebuild
delete mode 100644 sys-apps/secilc/secilc-3.4_rc1.ebuild
create mode 100644 sys-apps/selinux-python/selinux-python-3.4.ebuild
delete mode 100644 sys-apps/selinux-python/selinux-python-3.4_rc1.ebuild
create mode 100644 sys-apps/semodule-utils/semodule-utils-3.4.ebuild
delete mode 100644 sys-apps/semodule-utils/semodule-utils-3.4_rc1.ebuild
create mode 100644 sys-apps/servicelog/servicelog-1.1.16.ebuild
delete mode 100644 sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch
delete mode 100644 sys-apps/smartmontools/smartmontools-7.2-r2.ebuild
create mode 100644 sys-apps/smc-sum/smc-sum-2.8.1.20220506.ebuild
delete mode 100644 sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
delete mode 100644 sys-apps/systemd-utils/systemd-utils-250.5.ebuild
create mode 100644 sys-apps/systemd-utils/systemd-utils-250.6.ebuild
create mode 100644 sys-apps/systemd-utils/systemd-utils-250.7.ebuild
delete mode 100644 sys-apps/systemd/files/249.9-cross-compile.patch
create mode 100644 sys-apps/systemd/files/251-format-string.patch
delete mode 100644 sys-apps/systemd/files/251-rc2-colorterm.patch
create mode 100644 sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch
delete mode 100644 sys-apps/systemd/systemd-249.11.ebuild
delete mode 100644 sys-apps/systemd/systemd-249.9.ebuild
delete mode 100644 sys-apps/systemd/systemd-250.5-r1.ebuild
create mode 100644 sys-apps/systemd/systemd-250.6.ebuild
create mode 100644 sys-apps/systemd/systemd-250.7.ebuild
create mode 100644 sys-apps/systemd/systemd-251.2.ebuild
delete mode 100644 sys-apps/systemd/systemd-251_rc2.ebuild
delete mode 100644 sys-apps/tas/tas-1.6.0.200601-r1.ebuild
create mode 100644 sys-apps/tas/tas-1.7.0.220503.ebuild
create mode 100644 sys-apps/usbguard/usbguard-1.1.1-r2.ebuild
create mode 100644 sys-apps/usbguard/usbguard-1.1.1-r3.ebuild
create mode 100644 sys-apps/x86info/x86info-1.31.ebuild
create mode 100644 sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.4.ebuild
delete mode 100644 sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.12.1.ebuild
delete mode 100644 sys-apps/yarn/yarn-1.22.10.ebuild
create mode 100644 sys-apps/yarn/yarn-1.22.19.ebuild
delete mode 100644 sys-apps/yarn/yarn-1.22.4.ebuild
(limited to 'sys-apps')
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fbcc17fa1f13..fda176f5c452 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 0fcbd1bdecad..36e03ca35d7d 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,6 +1,4 @@
AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09
-DIST accountsservice-22.07.5.tar.xz 101688 BLAKE2B db8e5001f0b81b89c105d15557d5c62251ca58e4fad08f3cbfd52881b05980ccbb693766347c5cde640dcf3823a59f667fe15ec0c8e04cdd226915f91cea90a6 SHA512 9099abc9d8db58672db01e6ba9b23ba7bc8ed910ac001499d2a241089f55eafac47a482811cba80b1d6ee11df03a384e8ef2fd87df3b1125a8cf97c580177534
DIST accountsservice-22.08.8.tar.xz 102672 BLAKE2B 7c9436d3845fc1883772b434c4f9e2fba934d17e6d4452a6be65e1d790a23b331eaaa64b0e6eff6fefe79587a40cf1749a0f3de09f323b10740046bd9d145c9d SHA512 2ca3ceb1b44338d9924b86788256d4eef7ec10e0c2197bfb8cc6c31ae224fab3051f03cb406a526f90057684965bef4ba0f2cc01b26198ec1fc6baec36ad3ff8
-EBUILD accountsservice-22.07.5.ebuild 2014 BLAKE2B fe0b88fdd68bcce8774090c8c043e61aea1cbfc85b02dac1f85b08d54d3d89c2ec45d337eb357e9e53762c6e01ef4c9a258775c9de0f76837011074904b5ba30 SHA512 43b7f3e683bbafacf13ff0a87f372b3c4372091545431601558ea40ef3af91f59b1e7f66e866bfc04eba0ed47e19e551fca959efad2dc9febac2bf2b9da7c128
-EBUILD accountsservice-22.08.8.ebuild 2020 BLAKE2B 778e776279e9aaef2f96ef85f9e9f1e540090d7c9db2130a216019716d08bee5eda49d051f3744e27b3c5baafc4dbbc4325a09182b97fe409ccb2d3d0cf67190 SHA512 254de9eff3009c5cf7b37497623d7437d1b5002bedce233efc8fb59afd6650c79256a9f4a56febdf66390a50afd31967b2a69c6ed720cf3fbf697cf82ae75096
+EBUILD accountsservice-22.08.8.ebuild 2021 BLAKE2B 2164989ef876f1653b5aba751131c677512e9f38cb41a9b9a6ac1a3b4f544fee2a673e9853bb1eb2436971a0515525eac793cde9e2156d9578161b3062a48313 SHA512 1acb2dec062c3543c93e1401f6eadc4b17b442d7851cf3f27a43864a2ab7965bee5fb4374b98b50f7e01521c777cd4cbba4d0893024458267c085f1f52f60fb2
MISC metadata.xml 435 BLAKE2B 15950bf42bdf008f146f8bb89c9b8f29734eb244c7c8f664d6b9cfef3999b241de1fbec5bec7ed9cd874875a49b814001662122b488e5137a83f4ae6c8eef7aa SHA512 a5c93f2a4ab9453a20e6a6f9de924f5eff56a3e16a994c6ff09892a4739dbddc4d422bf4ad4d20c0772433932542b797277c2109bd39695588c1c02ef3d172dd
diff --git a/sys-apps/accountsservice/accountsservice-22.07.5.ebuild b/sys-apps/accountsservice/accountsservice-22.07.5.ebuild
deleted file mode 100644
index d2356b03733d..000000000000
--- a/sys-apps/accountsservice/accountsservice-22.07.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1 systemd
-
-DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="doc elogind gtk-doc +introspection selinux systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-CDEPEND="
- >=dev-libs/glib-2.63.5:2
- sys-auth/polkit
- virtual/libcrypt:=
- elogind? ( >=sys-auth/elogind-229.4 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
- systemd? ( >=sys-apps/systemd-186:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
- dev-libs/libxslt
- dev-util/gdbus-codegen
- sys-devel/gettext
- virtual/pkgconfig
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- )
- gtk-doc? (
- dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.3
- )
- test? (
- $(python_gen_any_dep '
- dev-python/python-dbusmock[${PYTHON_USEDEP}]
- ')
- )
-"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-accountsd )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch
-)
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
- fi
-}
-
-src_configure() {
- local emesonargs=(
- --localstatedir="${EPREFIX}/var"
- -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
- -Dadmin_group="wheel"
- $(meson_use elogind)
- $(meson_use introspection)
- $(meson_use doc docbook)
- $(meson_use gtk-doc gtk_doc)
- -Dvapi=false
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/90
- if use doc; then
- mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
- fi
-
- # This directories are created at runtime when needed
- rm -r "${ED}"/var/lib || die
-}
diff --git a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
index cc2ca7bb4783..a989b367b5f4 100644
--- a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
+++ b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="doc elogind gtk-doc +introspection selinux systemd test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 1c59e0873323..2edc0b6e5d4a 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,3 +1,4 @@
DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
+EBUILD acl-2.3.1-r1.ebuild 1988 BLAKE2B 54179711692fb5dde1125308338cc597143742eed53de52e818444b2bd34de8351cc65faec46bbd78778303019a1a16229c9a7573e7741b6fae33ace7cf7e1f2 SHA512 332c5221f81b6cadad66dbacf2320df2e8b61e4d354e94c332f5f615373743ac01a381837eaf5297b936d8932e823ce8d9ab9bafc9a1a24b4f1ff1a0d8bab9dd
EBUILD acl-2.3.1.ebuild 1353 BLAKE2B afbfd054f1c164665618ee2e1a7373c5158751262b3a7614799b9aaa866d9e214e8fe187f661f98d3699f670664beed2887e9689d7a4f060ddbeaa4a70ce2a74 SHA512 18575c9bcf34335fd3441d4ad9f58cfd4423d625206a40e337cadf9baf4322e953703e9fce3fc30d614f72c7d4a27072267e8af113d43caec789bb49cf4a0a2d
MISC metadata.xml 294 BLAKE2B f6827801a85f1509d29af1d248c5fa42bed4b445e4af08506afc8851a9777645ced2d5e6960257a421d793dc2c0e92b0cf485c2a855b83789c57e3b5eff0ee1b SHA512 b5a85ca1e4d407937d73ccbe5415e7ae9828ad67ce33455b1ad71e76aabaf9f51807967709c4f4b3b5b51c05181568bc26f9c00f34afa22d749a327f63077a56
diff --git a/sys-apps/acl/acl-2.3.1-r1.ebuild b/sys-apps/acl/acl-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..acc9d09b23fd
--- /dev/null
+++ b/sys-apps/acl/acl-2.3.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool multilib-minimal usr-ldscript
+
+DESCRIPTION="Access control list utilities, libraries, and headers"
+HOMEPAGE="https://savannah.nongnu.org/projects/acl"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="
+ >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ default
+
+ # bug #580792
+ elibtoolize
+}
+
+multilib_src_configure() {
+ # Filter out -flto flags as they break getfacl/setfacl binaries
+ # bug #667372
+ filter-flags -flto*
+
+ # Broken with FORTIFY_SOURCE=3
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ # Refs:
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964
+ # https://savannah.nongnu.org/bugs/index.php?62519
+ # bug #847280
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ local myeconfargs=(
+ --bindir="${EPREFIX}"/bin
+ $(use_enable static-libs static)
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)
+ $(use_enable nls)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ # Tests call native binaries with an LD_PRELOAD wrapper
+ # bug #772356
+ multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+ default
+
+ # Move shared libs to /
+ gen_usr_ldscript -a acl
+}
+
+multilib_src_install_all() {
+ if ! use static-libs ; then
+ find "${ED}" -type f -name "*.la" -delete || die
+ fi
+}
diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index 6a82c5756f95..baf57d8ec2ef 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,6 +1,8 @@
+AUX apmd-3.2.2-libtool.patch 2688 BLAKE2B 5d95c48d37370da665239ac779cc5df2d078bea84a0e5886534454068a5113964c048fcdb52066b2f20b27c3e89712c3c0ce935ca136f04525918709a3ab5a8e SHA512 8eaa7066d7dbb2788a74b3f17a97ca30d93f32dbf61dd057a00407d5cb08f50ee8c94156d672bbe54b75e8a7a276ceb5e6b234226ed12541fde2841d8b63e607
AUX apmd.confd 56 BLAKE2B 59236d42a8b27ba98ce06c61e19da23f0f131f82892e1a9907712fb384628bb1ae5a0c82a212827aad8e9ca44bfe70f2eaee24cc513af3146b16f0c211f57d24 SHA512 8e3832c3156681b8d3b69bbbf0958e3097a465364e665bee7d7cd7f696540af9b716e48e6cfc7fbdbfd6f55eb52cda965584ef44a98c011b858b32b2a7d340d3
AUX apmd.rc6 568 BLAKE2B 10519550d5ed67ecdb2ae192517ecd9c4a8943309b31371be847aef4894b5171b50eca0b7a74655cbfd6fa4aa1a7a08c3fc2700b28b3945bb75962f93e5a60f0 SHA512 ac4578dd1b49207b8d1c50f3481a3652d8cfb83ea3c1984a553aa5acefd17fee5fa71a903fa9dca4d1991c47c6b14d6901352fc03df741cae0aed337ee55cf14
DIST apmd_3.2.2-14.diff.gz 19195 BLAKE2B 554c84005fe443d3587169847b14cac186af0295e9b0dc4b9f564f014d2e717eb9c2d0ef0d6a4d701b81be26c2b0b8781f0bede008ac3bfcd2a20802a1e55ffa SHA512 a3578d0c43950f832fb437a744f8a4c3058c731649decb90f7b42c901b06f4df5f9a75599b4278e15af1c8a30d8043b0d76eb7d2cb67b05bf6bb210d5912a16d
DIST apmd_3.2.2.orig.tar.gz 72757 BLAKE2B 1b93d831c1d24cbf8c061969dd915ce219bbf62374e4e82b8fd61b7154f3a1a8bd7da740c2b6a557a335f4aeed41feea13fb85bdedad80ab9197e1355d1b20e9 SHA512 fdc74703e75a700397bb2c907986f0cf0792ee4128d7a7ae08adf090bff0ea595044ba7a935d34929745bb702eb8bfe232e0ee9156efd23a995dc087f1b20bf4
EBUILD apmd-3.2.2_p14-r2.ebuild 1903 BLAKE2B d5d0354d6de880bccf872753ebc8073d0fafd80f71612bfb3281cfc41c5c5c38b5838e96f61ff24561af5ac7d983fbfd2d9a95fba20d1da30c58b0efdaa81114 SHA512 bbbfbcdd36588bfb2971d9621b0321cfbdd2eeac009dd62e748cc639a6db120825ade0d9fb28a5ca0c3dd8a7d2b7002f26163d3ad63e1ab237a74c992465d4cf
+EBUILD apmd-3.2.2_p14-r3.ebuild 1810 BLAKE2B 348c2b195551a989a728ba85ce0cdb0a82fcbdba582dbd8d608bca18e7756b1f9c6bd54a25f1b2d87d2c74d005ca18bdc4a452910673bb613f8ac5925ccf7891 SHA512 cc393ca987588910b61e5fbb691c971d3250b6953664b7b276bd4c233cb8ef4e892f01d844b528b41170242a56ff5c9a4664b90e195e3c0e486b181d11b495c1
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-apps/apmd/apmd-3.2.2_p14-r3.ebuild b/sys-apps/apmd/apmd-3.2.2_p14-r3.ebuild
new file mode 100644
index 000000000000..1b02dedb3c54
--- /dev/null
+++ b/sys-apps/apmd/apmd-3.2.2_p14-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}_${MY_PV}"
+PATCHV="${PV#*_p}"
+
+DESCRIPTION="Advanced Power Management Daemon"
+HOMEPAGE="https://packages.qa.debian.org/a/apmd.html"
+SRC_URI="mirror://debian/pool/main/a/apmd/${MY_P}.orig.tar.gz
+ mirror://debian/pool/main/a/apmd/${MY_P}-${PATCHV}.diff.gz"
+S="${WORKDIR}/${PN}-${MY_PV}.orig"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+ >=sys-apps/debianutils-1.16
+ >=sys-power/powermgmt-base-1.31
+ X? (
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libSM
+ x11-libs/libICE
+ x11-libs/libXt
+ x11-libs/libXext
+ )"
+DEPEND="${RDEPEND}
+ virtual/os-headers"
+
+PATCHES=(
+ "${WORKDIR}"/${MY_P}-${PATCHV}.diff
+ "${FILESDIR}"/${PN}-${MY_PV}-libtool.patch # 778383
+)
+
+src_prepare() {
+ default
+
+ if ! use X; then
+ sed -i \
+ -e 's:\(EXES=.*\)xapm:\1:' \
+ -e 's:\(.*\)\$(LT_INSTALL).*xapm.*$:\1echo:' \
+ Makefile.in || die
+ fi
+
+ # use system headers and skip on_ac_power
+ rm on_ac_power* || die
+
+ sed -i \
+ -e '/on_ac_power/d' \
+ -e 's:-I/usr/src/linux/include -I/usr/X11R6/include::' \
+ -e 's:-L/usr/X11R6/lib::' \
+ Makefile.in || die
+
+ eautoreconf
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ keepdir /etc/apm/{event.d,suspend.d,resume.d,other.d,scripts.d}
+ exeinto /etc/apm
+ doexe debian/apmd_proxy
+ dodoc AUTHORS {,apmsleep.}README debian/{changelog,README.Debian}
+
+ doman *.{1,8}
+
+ # note: apmd_proxy.conf is currently disabled and not used, thus
+ # not installed - liquidx (01 Mar 2004)
+
+ newconfd "${FILESDIR}"/apmd.confd apmd
+ newinitd "${FILESDIR}"/apmd.rc6 apmd
+
+ if ! use nls; then
+ rm -r "${ED}"/usr/share/man/fr || die
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/apmd/files/apmd-3.2.2-libtool.patch b/sys-apps/apmd/files/apmd-3.2.2-libtool.patch
new file mode 100644
index 000000000000..814ff9c61679
--- /dev/null
+++ b/sys-apps/apmd/files/apmd-3.2.2-libtool.patch
@@ -0,0 +1,124 @@
+https://bugs.gentoo.org/778383
+
+From: orbea <orbea@riseup.net>
+Date: Sun, 19 Jun 2022 10:56:10 -0700
+Subject: [PATCH] build: Add minimal configure.ac
+
+This is required to generate libtool for the build which allows the
+build with rlibtool to work correctly.
+
+diff --git a/Makefile b/Makefile.in
+similarity index 86%
+rename from Makefile
+rename to Makefile.in
+index 92fc0fd..75e0a3a 100644
+--- a/Makefile
++++ b/Makefile.in
+@@ -19,7 +19,7 @@
+ # $Id: Makefile,v 1.30 2001/11/25 22:46:16 apenwarr Exp $
+ #
+
+-VERSION=3.2.1
++VERSION=@PACKAGE_VERSION@
+ LIB_VERSION=1:0
+
+ ifneq (,)
+@@ -28,37 +28,39 @@ endif
+
+ .SUFFIXES:
+
+-OBJS=apmlib.o
++OBJS=apmlib.lo
+ EXES=apm apmd xapm apmsleep
+ HEADERS=apm.h
+
+-PREFIX=/usr
+-MANDIR=$(PREFIX)/man
+-BINDIR=$(PREFIX)/bin
+-SBINDIR=$(PREFIX)/sbin
+-LIBDIR=$(PREFIX)/lib
+-INCDIR=$(PREFIX)/include
+-PROXY_DIR=/etc
+-DESTDIR=
+-
+-CC=gcc
+-CFLAGS=-O -g
++prefix := @prefix@
++exec_prefix := @exec_prefix@
++MANDIR := @mandir@
++BINDIR := @bindir@
++SBINDIR := @sbindir@
++LIBDIR := @libdir@
++INCDIR := @includedir@
++PROXY_DIR := @sysconfdir@
++
++CC := @CC@
++CFLAGS := @CFLAGS@
++LDFLAGS := @LDFLAGS@
++
+ XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include -I/usr/X11R6/include \
+ -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \
+ -DVERSION=\"$(VERSION)\" \
+ -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\"
+-LDFLAGS=
+ LIBAPM=libapm.la
+ LIBAPM_FLAGS=-rpath $(LIBDIR) -version-info $(LIB_VERSION)
+ XLDFLAGS=-L/usr/X11R6/lib
+ XLIBS=-lXaw -lXmu -lXt -lXext -lSM -lICE -lX11
+-RANLIB=ranlib
+
+ # Uncomment these lines for a production compile
+ #CFLAGS=-O3 -m486 -fomit-frame-pointer
+ #LDFLAGS=-s
+
+-LIBTOOL=libtool --quiet
++top_builddir := @top_builddir@
++
++LIBTOOL = @LIBTOOL@
+ LT_COMPILE = $(LIBTOOL) --mode=compile $(CC)
+ LT_LINK = $(LIBTOOL) --mode=link $(CC)
+ LT_INSTALL = $(LIBTOOL) --mode=install install
+@@ -68,22 +70,22 @@ all: $(EXES)
+
+ $(OBJS): $(HEADERS)
+
+-%.o: %.c
++%.lo: %.c
+ $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) $<
+
+-%: %.o $(LIBAPM)
++%: %.lo $(LIBAPM)
+ $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM)
+
+-xapm.o: xapm.c
++xapm.lo: xapm.c
+ $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) -DNARROWPROTO $<
+
+-apmd: apmd.o
++apmd: apmd.lo
+
+-apmsleep: apmsleep.o
++apmsleep: apmsleep.lo
+
+-apmexists: apmexists.o
++apmexists: apmexists.lo
+
+-xapm: xapm.o $(LIBAPM)
++xapm: xapm.lo $(LIBAPM)
+ $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) $(XLDFLAGS) $(XLIBS)
+
+ $(LIBAPM): apmlib.lo
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..1c8b7b7
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,8 @@
++AC_INIT([apmd], [3.2.2])
++AC_CONFIG_FILES([Makefile])
++
++LT_INIT
++
++AC_SUBST([top_builddir], [$abs_builddir])
++
++AC_OUTPUT
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 609124866f00..7fd694e31cfa 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,5 +1,5 @@
-DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
-EBUILD apparmor-utils-3.0.1.ebuild 2270 BLAKE2B 2f634eb96254e823dd57e77b41b756dc330914e238876bc54586452d1b215b0b46f27092bd3677f4768c20765ad9132f8578da01f9055409149b6741757757af SHA512 1be4dd0bd8adf724cb48757c3005622c8a58a07655628b4c296dbfc7aa39c9941f30780903a27dbd4f5900d5702799dfc36371df7844cace317903938fdba28b
-EBUILD apparmor-utils-3.0.3.ebuild 2253 BLAKE2B 1c00f8270847616ce07d8244aa85cf1b25a2a27ab706581012b9716839241bdd2b9a2f5411ff5efeeab32cb34d3e60175ae083c52217d31eac5a2da448910191 SHA512 4dd7b39d928040f91aae80c3f87cdca2b20b6f28c2c696f5acca124d55b0742a6997ed554494355c8a8a9220cafbc287a5544d279730b5bfd67339fc22fac925
+DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
+EBUILD apparmor-utils-3.0.3.ebuild 2264 BLAKE2B 6e929919d318c0f9ae00dee5a01a27f7fe5a3c1ee020a66d2153fb6755ee74bb6d922e4eb6dafa6145c9051ca7ac23f8ebb17eb360784fd8945dc1d466deacfd SHA512 2a9fe806c3091c1e27d3a792f6c890a33e049639892a54945d743c395bca1c0c2c58ac013e2ed4d3b8f637c8814567a132a103362f9dbdd3becadd2bb353eb43
+EBUILD apparmor-utils-3.0.4.ebuild 2265 BLAKE2B 191c173a77ce2d94cad20703a7e35ee1b5080a17d1f2176b47c9057ffa9cf03fd1bf06d180a5cca0dc73c22454fb0708bb0c434b3b1463cce5b3cb284332a4ef SHA512 2e06fbe024337c8f7146374882f3cef9e22e4df010f3e64485e283d03bbe103df6c6f2239e1771f4749022ee65c8fdb8d7e92f3fdf60377cd33d167901abb3fd
MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
deleted file mode 100644
index a60091bfffbc..000000000000
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- dev-lang/perl
- ~sys-libs/libapparmor-${PV}
- ${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
- ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
- ~sys-apps/apparmor-${PV}
- dev-perl/Locale-gettext
- dev-perl/RPC-XML
- dev-perl/TermReadKey
- dev-python/notify2[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- virtual/perl-Data-Dumper
- virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
- default
-
- sed -i binutils/Makefile \
- -e 's/Bstatic/Bdynamic/g' || die
-
- sed -i utils/aa-remove-unknown \
- -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
- python_setup
-
- pushd utils > /dev/null || die
- # launches non-make subprocesses causing "make jobserver unavailable"
- # error messages to appear in generated code
- emake -j1
- popd > /dev/null || die
-
- pushd binutils > /dev/null || die
- export EXTRA_CFLAGS="${CFLAGS}"
- emake CC="$(tc-getCC)" USE_SYSTEM=1
- popd > /dev/null || die
-}
-
-src_install() {
- pushd utils > /dev/null || die
- perl_set_version
- emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
- VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
- install_python() {
- local -x PYTHONDONTWRITEBYTECODE=
- "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
- --root="${D}" --optimize 2
- }
-
- python_foreach_impl install_python
- python_replicate_script "${D}"/usr/bin/aa-easyprof \
- "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
- popd > /dev/null || die
-
- pushd binutils > /dev/null || die
- emake install DESTDIR="${D}" USE_SYSTEM=1
- popd > /dev/null || die
-}
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
index 00aa102d612f..7db7337d04f3 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit perl-module python-r1 toolchain-funcs
MY_PV="$(ver_cut 1-2)"
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test"
@@ -73,7 +73,7 @@ src_install() {
install_python() {
local -x PYTHONDONTWRITEBYTECODE=
"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
- --root="${D}" --optimize 2
+ --root="${D}" --optimize 2 --version=${PV}
}
python_foreach_impl install_python
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
new file mode 100644
index 000000000000..26e8c7c92a7a
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+ dev-lang/perl
+ ~sys-libs/libapparmor-${PV}
+ ${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+ ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+ ~sys-apps/apparmor-${PV}
+ dev-perl/Locale-gettext
+ dev-perl/RPC-XML
+ dev-perl/TermReadKey
+ dev-python/notify2[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ virtual/perl-Data-Dumper
+ virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+ default
+
+ sed -i binutils/Makefile \
+ -e 's/Bstatic/Bdynamic/g' || die
+
+ sed -i utils/aa-remove-unknown \
+ -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+ python_setup
+
+ pushd utils > /dev/null || die
+ # launches non-make subprocesses causing "make jobserver unavailable"
+ # error messages to appear in generated code
+ emake -j1
+ popd > /dev/null || die
+
+ pushd binutils > /dev/null || die
+ export EXTRA_CFLAGS="${CFLAGS}"
+ emake CC="$(tc-getCC)" USE_SYSTEM=1
+ popd > /dev/null || die
+}
+
+src_install() {
+ pushd utils > /dev/null || die
+ perl_set_version
+ emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+ VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+ install_python() {
+ local -x PYTHONDONTWRITEBYTECODE=
+ "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
+ --root="${D}" --optimize 2 --version=${PV}
+ }
+
+ python_foreach_impl install_python
+ python_replicate_script "${D}"/usr/bin/aa-easyprof \
+ "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+ popd > /dev/null || die
+
+ pushd binutils > /dev/null || die
+ emake install DESTDIR="${D}" USE_SYSTEM=1
+ popd > /dev/null || die
+}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index fc95927621db..cd7d6046df48 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -4,8 +4,8 @@ AUX apparmor-init-1 1235 BLAKE2B dbc333d8a90ec66303594db87b1865488813ad6698a3bcf
AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31
AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
-DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
-EBUILD apparmor-3.0.1.ebuild 1737 BLAKE2B 3fbdc0897be4dba7cde237622448ce7f3678a35dcce054854a9f13c734d5eb79214928b6a452f517e438174eeac165d84686befdad4a9a82261a53eacdb68247 SHA512 40e9a056910756f9c34cad803a69da2700589a095cc940c58c155ce7efeb7eca4189921e6d031755d4272727aa2c86aae9fc1c95e4ec92efb128dc0fa7fc5998
-EBUILD apparmor-3.0.3.ebuild 1738 BLAKE2B 2eb39b0a5c07f348013fffb0c10bc3d20f4dd70b6044467cb855938dc3df44a60249d023fef948eb349ce54eb8072b5bab3d7d090032b2166517aa95c88fd1bc SHA512 9a40e928011cde60ae1bc6e3512445f4edc612fa5d540d74abbb94b5a3e683b1663dc85d4890e4788398694c424a5012b4628ac93aa096e40dec24a9397b8905
+DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
+EBUILD apparmor-3.0.3.ebuild 1737 BLAKE2B 88cc50798024505f5881cd0f4435a26af3f9aa05ee6ab9c52412a46c48e6123f15371c47b521f98c25f586de8114c530d84097e47cd23cd32b3c4646baf5e9bb SHA512 5761aba7122404eb5e0e8004176e1061e7e97b533f9fc388eb6f9baab81d70c8e2f1cf5c653faac38e702666cd625c3e598e740d41911c488378552b11955042
+EBUILD apparmor-3.0.4.ebuild 1832 BLAKE2B 8f24f750584000b1aa2cb55f5047e90199206370dac66a676203942882f3b59e4bdf3310caff39454ce58d27e2f1690a8d39f7987e8d67f611c08bf5155320fa SHA512 d8b119a8f3977f4442125b94870137c25fae4d61cb4943552dc649a056a3e4496aa0c945e8162abfba2cbb9ab4fba72879c99335190185cbf7c347177409e269
MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-apps/apparmor/apparmor-3.0.1.ebuild b/sys-apps/apparmor/apparmor-3.0.1.ebuild
deleted file mode 100644
index 5dd3f3e6c2de..000000000000
--- a/sys-apps/apparmor/apparmor-3.0.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="doc"
-
-RESTRICT="test" # bug 675854
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
- dev-lang/perl
- sys-devel/bison
- sys-devel/gettext
- sys-devel/flex
- doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.0-makefile.patch"
- "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
-)
-
-src_prepare() {
- default
-
- # remove warning about missing file that controls features
- # we don't currently support
- sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-
- # bug 634782
- sed -e "s/cpp/$(tc-getCPP) -/" \
- -i ../common/list_capabilities.sh \
- -i ../common/list_af_names.sh || die
-}
-
-src_compile() {
- emake \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- CPP="$(tc-getCPP) -" \
- CXX="$(tc-getCXX)" \
- USE_SYSTEM=1 \
- arch manpages
- use doc && emake pdf
-}
-
-src_test() {
- emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
- emake \
- CPP="$(tc-getCPP) -" \
- DESTDIR="${D}" \
- DISTRO="unknown" \
- USE_SYSTEM=1 \
- install
-
- dodir /etc/apparmor.d/disable
-
- newinitd "${FILESDIR}/${PN}-init-1" ${PN}
- systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
-
- use doc && dodoc techdoc.pdf
-
- exeinto /usr/share/apparmor
- doexe "${FILESDIR}/apparmor_load.sh"
- doexe "${FILESDIR}/apparmor_unload.sh"
-}
diff --git a/sys-apps/apparmor/apparmor-3.0.3.ebuild b/sys-apps/apparmor/apparmor-3.0.3.ebuild
index 4c5fe4d4179a..4cbc200ad95b 100644
--- a/sys-apps/apparmor/apparmor-3.0.3.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
IUSE="doc"
RESTRICT="test" # bug 675854
diff --git a/sys-apps/apparmor/apparmor-3.0.4.ebuild b/sys-apps/apparmor/apparmor-3.0.4.ebuild
new file mode 100644
index 000000000000..d1413fd5619e
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="doc"
+
+# Was restricted previously b/c needs apparmor support in kernel
+# TODO: add check to ebuild
+#RESTRICT="test" # bug 675854
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ sys-devel/bison
+ sys-devel/gettext
+ sys-devel/flex
+ doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.0-makefile.patch"
+ "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+)
+
+src_prepare() {
+ default
+
+ # remove warning about missing file that controls features
+ # we don't currently support
+ sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+
+ # bug 634782
+ sed -e "s/cpp/$(tc-getCPP) -/" \
+ -i ../common/list_capabilities.sh \
+ -i ../common/list_af_names.sh || die
+}
+
+src_compile() {
+ emake \
+ AR="$(tc-getAR)" \
+ CC="$(tc-getCC)" \
+ CPP="$(tc-getCPP) -" \
+ CXX="$(tc-getCXX)" \
+ USE_SYSTEM=1 \
+ arch manpages
+ use doc && emake pdf
+}
+
+src_test() {
+ emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+ emake \
+ CPP="$(tc-getCPP) -" \
+ DESTDIR="${D}" \
+ DISTRO="unknown" \
+ USE_SYSTEM=1 \
+ install
+
+ dodir /etc/apparmor.d/disable
+
+ newinitd "${FILESDIR}/${PN}-init-1" ${PN}
+ systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
+
+ use doc && dodoc techdoc.pdf
+
+ exeinto /usr/share/apparmor
+ doexe "${FILESDIR}/apparmor_load.sh"
+ doexe "${FILESDIR}/apparmor_unload.sh"
+}
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 23fdcad33ba1..8b667d072e12 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,5 +1,7 @@
+AUX attr-2.5.1-fix-symver.patch 5856 BLAKE2B dbff8d7cd138d962cca02c35f1ad8679f813cedf92784d075f837f0e56989a514d105cfb2c765bb382b1413aaddcd66be4a09a2fafb58172a7b98c0eecc17f63 SHA512 0d576b867e253cb63e712ff6f2cb0491f42be8214e8307bbd71f50247917ebe9236ddafad8610c2e8de2d0f33b1d0f87ad1258c8637b9ba46ad7f2b2fa1f9a24
AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
DIST attr-2.5.1.tar.xz 318188 BLAKE2B 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04 SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932
+EBUILD attr-2.5.1-r1.ebuild 2632 BLAKE2B 0626b192ef6a6f81dec7186ab4c1a9a4352d9c99b684f0872c2a1f6709d156316bbca932fba7355f9c5596a15b92bd065a56507ef5a041757b1a46daa4c2c96e SHA512 e76b292dcbe879d2d79987e00528c25c9fac831ff391fc9d0adbba51533402a068c5a01449750e22433c858c57bde5b4c2bda11d226f5be625f7df7b16d6f9d4
EBUILD attr-2.5.1.ebuild 2495 BLAKE2B 290d82c439e0096b6ac5be07258d87d3c05b56500fa81b4cf610e322505a5cb302c3e5900f59b363c7cfd3ae1bf315f19bfeed7968c95d3c9cc222b8639c5498 SHA512 201868f12414b9662b5edfdc19827c84a9cd967295b6752eeb38e4c52472ea73cc5caf04bba52c08d55b15570d71cb730e283b8f3ebebbfbc159cf0f27c20eb4
-EBUILD attr-9999.ebuild 2503 BLAKE2B 03468ca994e77b80cf198d02f4273a7ff63295b8efd0c0c1bea44ef245cd61dfb5658ecefe4662689de86f7a2c8d36ccd5c4bfd864b0f2c6cbd494e0f96a21a8 SHA512 06ca8ad0c749749a2ec94443f1862f43529e95b20e0b7eadc20ff9957c15ecf804d4bd78aef0f946a671d474a6337ded4a3c64fa29485291ed2c9553d69600d0
+EBUILD attr-9999.ebuild 2632 BLAKE2B 0626b192ef6a6f81dec7186ab4c1a9a4352d9c99b684f0872c2a1f6709d156316bbca932fba7355f9c5596a15b92bd065a56507ef5a041757b1a46daa4c2c96e SHA512 e76b292dcbe879d2d79987e00528c25c9fac831ff391fc9d0adbba51533402a068c5a01449750e22433c858c57bde5b4c2bda11d226f5be625f7df7b16d6f9d4
MISC metadata.xml 337 BLAKE2B c04cc7c99b3d9d39870605354acd4f0a4b03d47e79228f444e915ce17abd2eb075418919dc3272903fdd524f56588ef194d7cdbd43f2b040c4f6a9d5fa2eebee SHA512 e9ba5573c84dd1b2cdce5b74e53b731c1ba4b3e72bca569f3febc77e431b96982cd83a71720e021ba23e8d6fd23f9dbea43a6c8d94b2b6ce1b3d26fda038d6de
diff --git a/sys-apps/attr/attr-2.5.1-r1.ebuild b/sys-apps/attr/attr-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..c8051fdd82e4
--- /dev/null
+++ b/sys-apps/attr/attr-2.5.1-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# autotools inherit only needed for 2.5.1-r1 patch for symvers
+# hopefully in next release
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
+ inherit autotools git-r3
+else
+ inherit libtool
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="Extended attributes tools"
+HOMEPAGE="https://savannah.nongnu.org/projects/attr"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug nls static-libs"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.1-fix-symver.patch
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == 9999 ]] ; then
+ po/update-potfiles || die
+ eautopoint
+ eautoreconf
+ else
+ # bug #580792
+ #elibtoolize
+
+ # Temporarily for 2.5.1-r1 for symver patch
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ # bug #760857
+ append-lfs-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --bindir="${EPREFIX}"/bin
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)
+ --enable-shared
+ $(use_enable static-libs static)
+ $(use_enable nls)
+ $(use_enable debug)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ # Sanity check until we track down why this is happening. bug #644048
+ local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
+ if [[ -e ${lib} ]] ; then
+ local versions=$($(tc-getREADELF) -V "${lib}")
+ local symbols=$($(tc-getREADELF) -sW "${lib}")
+ if [[ "${versions}" != *"ATTR_1.0"* || \
+ "${versions}" != *"ATTR_1.1"* || \
+ "${versions}" != *"ATTR_1.2"* || \
+ "${versions}" != *"ATTR_1.3"* || \
+ "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
+ echo "# readelf -V ${lib}"
+ echo "${versions}"
+ echo "# readelf -sW ${lib}"
+ echo "${symbols}"
+ die "Symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
+ else
+ einfo "${lib} passed symbol checks"
+ fi
+ fi
+
+ if multilib_is_native_abi; then
+ # We install attr into /bin, so we need the shared lib with it
+ gen_usr_ldscript -a attr
+ fi
+
+ # Add a wrapper until people upgrade.
+ # TODO: figure out when this was added & when we can drop it!
+ insinto /usr/include/attr
+ newins "${FILESDIR}"/xattr-shim.h xattr.h
+}
+
+multilib_src_install_all() {
+ if ! use static-libs; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
+
+ einstalldocs
+}
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 58d5e41c2738..c8051fdd82e4 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -1,30 +1,34 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+# autotools inherit only needed for 2.5.1-r1 patch for symvers
+# hopefully in next release
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
-
inherit autotools git-r3
else
+ inherit libtool
+
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
fi
DESCRIPTION="Extended attributes tools"
HOMEPAGE="https://savannah.nongnu.org/projects/attr"
+
LICENSE="LGPL-2.1"
SLOT="0"
-
IUSE="debug nls static-libs"
-BDEPEND="
- sys-devel/binutils
- nls? ( sys-devel/gettext )
-"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.1-fix-symver.patch
+)
src_prepare() {
default
@@ -34,35 +38,38 @@ src_prepare() {
eautopoint
eautoreconf
else
- elibtoolize #580792
+ # bug #580792
+ #elibtoolize
+
+ # Temporarily for 2.5.1-r1 for symver patch
+ eautoreconf
fi
}
src_configure() {
- # Remove -flto* from flags as this breaks binaries (bug #644048)
- filter-flags -flto*
- append-ldflags "-Wl,--no-gc-sections" #700116
- tc-ld-force-bfd #644048
- append-lfs-flags #760857
+ # bug #760857
+ append-lfs-flags
+
multilib-minimal_src_configure
}
multilib_src_configure() {
local myeconfargs=(
--bindir="${EPREFIX}"/bin
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)
--enable-shared
$(use_enable static-libs static)
$(use_enable nls)
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)
$(use_enable debug)
)
+
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_install() {
emake DESTDIR="${D}" install
- # Sanity check until we track down why this is happening. #644048
+ # Sanity check until we track down why this is happening. bug #644048
local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
if [[ -e ${lib} ]] ; then
local versions=$($(tc-getREADELF) -V "${lib}")
@@ -76,18 +83,19 @@ multilib_src_install() {
echo "${versions}"
echo "# readelf -sW ${lib}"
echo "${symbols}"
- die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
+ die "Symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
else
einfo "${lib} passed symbol checks"
fi
fi
if multilib_is_native_abi; then
- # we install attr into /bin, so we need the shared lib with it
+ # We install attr into /bin, so we need the shared lib with it
gen_usr_ldscript -a attr
fi
# Add a wrapper until people upgrade.
+ # TODO: figure out when this was added & when we can drop it!
insinto /usr/include/attr
newins "${FILESDIR}"/xattr-shim.h xattr.h
}
diff --git a/sys-apps/attr/files/attr-2.5.1-fix-symver.patch b/sys-apps/attr/files/attr-2.5.1-fix-symver.patch
new file mode 100644
index 000000000000..55ef4506f7de
--- /dev/null
+++ b/sys-apps/attr/files/attr-2.5.1-fix-symver.patch
@@ -0,0 +1,173 @@
+https://lists.nongnu.org/archive/html/acl-devel/2022-05/msg00000.html
+Bug: https://bugs.gentoo.org/644048
+Bug: https://bugs.gentoo.org/700116
+
+From a9ca51afd2b9f68f57de3a4c3d962d1d763572ca Mon Sep 17 00:00:00 2001
+From: Alexander Miller <alex.miller@gmx.de>
+Date: Thu, 28 Nov 2019 22:17:24 +0100
+Subject: [PATCH] Better supported way to set symbol versions for legacy
+ syscalls
+
+Using a linker script to set a symbol versions is an undocumented
+hack and doesn't work reliably in many cases. It works (to some
+degree) with the bfd linker, but fails with gold or lld. And even
+with bfd it can break when using --gc-sections or LTO.
+
+The result may be a library where the code has been discarded and
+the versioned symbols are unusable, e.g.
+ 23: 00000000 0 NOTYPE GLOBAL DEFAULT ABS getxattr@ATTR_1.0
+instead of
+ 23: 000033c0 0 FUNC GLOBAL DEFAULT 11 getxattr@ATTR_1.0
+
+Remove the linker script entirely and set symbol versions with the
+symver attribute if available (in gcc >= 10, but not in clang),
+otherwise use the traditional global asm solution with a .symver
+directive.
+Those are the documented ways to do it and well supported by (almost)
+all configurations. (The exception is old gcc with LTO; a workaround
+is included, but some versions may still need -flto-partition=none).
+
+Signed-off-by: Alexander Miller <alex.miller@gmx.de>
+--- a/libattr/Makemodule.am
++++ b/libattr/Makemodule.am
+@@ -8,7 +8,7 @@ LT_CURRENT = 2
+ LT_AGE = 1
+ LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+-libattr_la_DEPENDENCIES = exports libattr/libattr.lds
++libattr_la_DEPENDENCIES = exports
+ libattr_la_SOURCES = \
+ libattr/attr_copy_action.c \
+ libattr/attr_copy_check.c \
+@@ -20,7 +20,4 @@ libattr_la_SOURCES = \
+ libattr_la_CFLAGS = -include libattr/libattr.h
+ libattr_la_LDFLAGS = \
+ -Wl,--version-script,$(top_srcdir)/exports \
+- -Wl,$(top_srcdir)/libattr/libattr.lds \
+ -version-info $(LTVERSION)
+-
+-EXTRA_DIST += libattr/libattr.lds
+--- a/libattr/libattr.lds
++++ /dev/null
+@@ -1,12 +0,0 @@
+-"fgetxattr@ATTR_1.0" = libattr_fgetxattr;
+-"flistxattr@ATTR_1.0" = libattr_flistxattr;
+-"fremovexattr@ATTR_1.0" = libattr_fremovexattr;
+-"fsetxattr@ATTR_1.0" = libattr_fsetxattr;
+-"getxattr@ATTR_1.0" = libattr_getxattr;
+-"lgetxattr@ATTR_1.0" = libattr_lgetxattr;
+-"listxattr@ATTR_1.0" = libattr_listxattr;
+-"llistxattr@ATTR_1.0" = libattr_llistxattr;
+-"lremovexattr@ATTR_1.0" = libattr_lremovexattr;
+-"lsetxattr@ATTR_1.0" = libattr_lsetxattr;
+-"removexattr@ATTR_1.0" = libattr_removexattr;
+-"setxattr@ATTR_1.0" = libattr_setxattr;
+--- a/libattr/syscalls.c
++++ b/libattr/syscalls.c
+@@ -26,6 +26,27 @@
+ #include <sys/syscall.h>
+ #include <sys/xattr.h>
+
++/*
++ * Versioning of compat symbols:
++ * prefer symver attribute if available (since gcc 10),
++ * fall back to traditional .symver asm directive otherwise.
++ */
++#ifdef __has_attribute
++# if __has_attribute(symver)
++# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((symver(vn)))
++# elif __has_attribute(no_reorder)
++ /*
++ * Avoid wrong partitioning with older gcc and LTO. May not work reliably
++ * with all versions; use -flto-partition=none if you encounter problems.
++ */
++# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((noreorder)); \
++ __asm__(".symver " #cn "," vn)
++# endif
++#endif
++#ifndef SYMVER
++# define SYMVER(cn, vn) __asm__(".symver " #cn "," vn)
++#endif
++
+ #ifdef HAVE_VISIBILITY_ATTRIBUTE
+ # pragma GCC visibility push(default)
+ #endif
+@@ -35,66 +56,78 @@ int libattr_setxattr(const char *path, const char *name,
+ {
+ return syscall(__NR_setxattr, path, name, value, size, flags);
+ }
++SYMVER(libattr_setxattr, "setxattr@ATTR_1.0");
+
+ int libattr_lsetxattr(const char *path, const char *name,
+ void *value, size_t size, int flags)
+ {
+ return syscall(__NR_lsetxattr, path, name, value, size, flags);
+ }
++SYMVER(libattr_lsetxattr, "lsetxattr@ATTR_1.0");
+
+ int libattr_fsetxattr(int filedes, const char *name,
+ void *value, size_t size, int flags)
+ {
+ return syscall(__NR_fsetxattr, filedes, name, value, size, flags);
+ }
++SYMVER(libattr_fsetxattr, "fsetxattr@ATTR_1.0");
+
+ ssize_t libattr_getxattr(const char *path, const char *name,
+ void *value, size_t size)
+ {
+ return syscall(__NR_getxattr, path, name, value, size);
+ }
++SYMVER(libattr_getxattr, "getxattr@ATTR_1.0");
+
+ ssize_t libattr_lgetxattr(const char *path, const char *name,
+ void *value, size_t size)
+ {
+ return syscall(__NR_lgetxattr, path, name, value, size);
+ }
++SYMVER(libattr_lgetxattr, "lgetxattr@ATTR_1.0");
+
+ ssize_t libattr_fgetxattr(int filedes, const char *name,
+ void *value, size_t size)
+ {
+ return syscall(__NR_fgetxattr, filedes, name, value, size);
+ }
++SYMVER(libattr_fgetxattr, "fgetxattr@ATTR_1.0");
+
+ ssize_t libattr_listxattr(const char *path, char *list, size_t size)
+ {
+ return syscall(__NR_listxattr, path, list, size);
+ }
++SYMVER(libattr_listxattr, "listxattr@ATTR_1.0");
+
+ ssize_t libattr_llistxattr(const char *path, char *list, size_t size)
+ {
+ return syscall(__NR_llistxattr, path, list, size);
+ }
++SYMVER(libattr_llistxattr, "llistxattr@ATTR_1.0");
+
+ ssize_t libattr_flistxattr(int filedes, char *list, size_t size)
+ {
+ return syscall(__NR_flistxattr, filedes, list, size);
+ }
++SYMVER(libattr_flistxattr, "flistxattr@ATTR_1.0");
+
+ int libattr_removexattr(const char *path, const char *name)
+ {
+ return syscall(__NR_removexattr, path, name);
+ }
++SYMVER(libattr_removexattr, "removexattr@ATTR_1.0");
+
+ int libattr_lremovexattr(const char *path, const char *name)
+ {
+ return syscall(__NR_lremovexattr, path, name);
+ }
++SYMVER(libattr_lremovexattr, "lremovexattr@ATTR_1.0");
+
+ int libattr_fremovexattr(int filedes, const char *name)
+ {
+ return syscall(__NR_fremovexattr, filedes, name);
+ }
++SYMVER(libattr_fremovexattr, "fremovexattr@ATTR_1.0");
+
+ #ifdef HAVE_VISIBILITY_ATTRIBUTE
+ # pragma GCC visibility pop
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index a94f01b818eb..6f7a7a2b3182 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,5 @@
DIST baobab-41.0.tar.xz 586228 BLAKE2B 8c06dd4c62dd377e2338df280dd1f78dcd6e0c13713f06bb126f96e658e42b9ed5f1cffa9f7445f2d854cf42c09b93d72f4ff82a80df5dd4a4d395978fe2ecff SHA512 4f41cac42491afb98855771a621573689f2b35c0a2602799af9f88adf901a5c62c9f8e4b70be43ed27024deba860b128bc22b8a7782ac207a5746b4df6b65aa0
DIST baobab-42.0.tar.xz 588392 BLAKE2B ec2525b6643a9ab2ecedcbb7b7a54419859116808d9287bfcc694cf22d314b5dc34e71483718353685f3a246c87b4b492e7c3fb69c7044dea605ae3e8737d0f1 SHA512 21837bfe901034ed3450f6937d3ede1e567d16a5ae308db91029dc2ff4bb523b36f9408f7489c6798140de039e928f49969a1ed741027da0ae8377be6352ba08
EBUILD baobab-41.0.ebuild 854 BLAKE2B 6e723adedb979773babe606eb4ed3052d84219d787b770048811f2740219ed5404860ee7e91d4cd97a963168e3a313d3f9135c4190e43d44a6c141fbfb2bc005 SHA512 b38a58f149cd86dbf2b34a9c541cc5d1c0dc310895792a6f86e25cf651c15667f279610826e56d7289313b46a561061af102d2392d65946abd1065a6e4956f03
-EBUILD baobab-42.0.ebuild 855 BLAKE2B 5d0b27b95e14e5bccb26592992185bc88d7028e6cc03375133e55ff7b6f75227b89fb8fa5ddbdf9a94df012197a8a574a69d728e13207b60e4abe850de13bf3c SHA512 7a2a042f49645e0f8008dc0c44020b03648cd7426ea2bbe6b08186019742e682575187494ed51c313d7513139c495137d73223fa4c3b020e25d127be95d16e6b
+EBUILD baobab-42.0.ebuild 859 BLAKE2B 0f3863b0420f9e26de47c5df7196485275b5f7d43f77796552d4593362f029c3a6f7681754d4152b33c8b61ef869153ef013be8ab3efc0709620b5b7eddb4287 SHA512 96a67fd627c121803c1ed8d272c4b1821ca9fac7dcaed8f4358b37c27f6802e0e2ad1abb65e0455c65ff830c82442922d201366553a3a327d983d2af90f40d05
MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sys-apps/baobab/baobab-42.0.ebuild b/sys-apps/baobab/baobab-42.0.ebuild
index 9418689524c1..4f8edab65309 100644
--- a/sys-apps/baobab/baobab-42.0.ebuild
+++ b/sys-apps/baobab/baobab-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-libs/glib-2.44:2
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 49fd620ddc91..f08911ba223a 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,9 +1,6 @@
DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
DIST baselayout-2.8.tar.bz2 30236 BLAKE2B 0bac62dd5585f1f550da8c99d06a7f8ab6cdd473b0499a8f0ac58a5c43e3883b42adb7f80c172d894fae93a6ddb6fec7a65cad9897f4a2532b481c82065ed96b SHA512 506d7cc8399b530eabc9ba2d16cbb6c024350f9487a2a9168c670cee9876f62e5a716942f698c4883013d6ccc9591c2d7fc2ac9d782f0ce8d724371ca94c739a
-EBUILD baselayout-2.7-r1.ebuild 10142 BLAKE2B d5fcfe38f93a7b021d8f47d2ca9b486d82c2185409a3ea97383dd7db6e4e88efdbd8f07f6a3429461f0af6d12fa2dfb3c607c2f7d9c5caf1fe34373daac2cf67 SHA512 67156fe954f8331b6ad3512ecaea06b2bb53b58088b66ed477e0dfab23f17775d88c99ebbc80fc20cb49799949a34aabef383020567a6a007d94aa368638e1fe
-EBUILD baselayout-2.7-r2.ebuild 10129 BLAKE2B a0686d516c4cdb93d71fd7fe31608ed876e7151b260a67f7632fded30249480466719cdd4b6b47b7089e85b08e4397de77cbc1dfe13b495aaab89c9af2adb2c2 SHA512 c7eab722aa5b3772fff5b6b3afcfc1895401d380a91cc2dbd27a392397efa43baa1ced9bcf195bb05c2fa990ac7b1113df5f6af094189105a7ec2692ef19ade5
EBUILD baselayout-2.7-r3.ebuild 11228 BLAKE2B 347ce18e044de38deea4d85f5409bb6987a81abea68f1cf0a4fc6374c698f4b2ffebd1fbb5becb0ac0c7c1f8572be908bde71600008246c59450e07fe5d9fe28 SHA512 768412405896189e96a4ac59303bc6e96208c04d0518e0f980714d07db25389b97c4b84c2b070623765c3be6e6e609989267a306389d32da4c420dc3d329203c
-EBUILD baselayout-2.7.ebuild 9969 BLAKE2B 36c160b617b7cc4ee7e71d193dae0af3728533c5500e02f3278946932fdbbbee7c7f613ac681fa8abb8f249f7b4b4589e531ebf550002735acc7f08a23175c78 SHA512 e9c61341751b7fd67e49e4d4dbd9317ff606b15f143be1e40ba571a36ec2fb029ef3166b50f5b5da58ed2140718f23287709a950000ee151724d4914440fc1fb
-EBUILD baselayout-2.8.ebuild 10856 BLAKE2B 5a48e3831d7127d7f9ad7e02547f29dd7b37f970a6ce72a395acec62c29b67863ef0a9a0b84cea456f07213bdcb2e6c65b1b4aecff3bbbc57ca1b923c793bc99 SHA512 d8e720850b97ab53c6576e1b554c6ee41b4b42fdda1bb550092392b8d4042abdec8736ccfc3101578b13def0d6ba191f2a4d97f82cab35d4448649eab52db16b
+EBUILD baselayout-2.8.ebuild 10848 BLAKE2B 26d38e365dbf423731b1cf35fcd2efe208961ccccdafc184b2fecc78eee79a1d73f3393cde33ea4c95baa8b834514f08d936c321d7e872372c981656c6172801 SHA512 c995e87684b5fd1c66553aeb60623d713b3eeaf6719af0d237ae4f26b3ad2e3422fb27dcb0c89d6f2b4b0e03be40985804181a045457ff4178e06d910e464102
EBUILD baselayout-9999.ebuild 10849 BLAKE2B e9cb3a4a05c4f128886fb7a0a10fbc0e1cc8f57ee9da1473b5560f664f5ad561103c5e08ad9979e10865cfbf0c9a136dce84a4ed224831a22df86666ce8406e6 SHA512 10fcfaffff8ce37bcd0a6385d2e3efcdbd7bd476571d09c75877aab384ad0af7e8cdeffcf79096b28bc62b101b7b71199e791f765c0968ee6cf796b746b75a88
MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193
diff --git a/sys-apps/baselayout/baselayout-2.7-r1.ebuild b/sys-apps/baselayout/baselayout-2.7-r1.ebuild
deleted file mode 100644
index 69b7db6825d2..000000000000
--- a/sys-apps/baselayout/baselayout-2.7-r1.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib versionator prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-pkg_setup() {
- multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
- local dir def_libdir libdir libdirs
- local prefix prefix_lst
- def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
- libdirs=$(get_all_libdirs)
- : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass...
-
- if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
- prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
- for prefix in "${prefix_lst[@]}"; do
- for libdir in ${libdirs}; do
- dir="${prefix}${libdir}"
- if [[ -e "${dir}" ]]; then
- [[ ! -d "${dir}" ]] &&
- die "${dir} exists but is not a directory"
- continue
- fi
- if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
- einfo "symlinking ${dir} to usr/${libdir}"
- ln -s usr/${libdir} ${dir} ||
- die " Unable to make ${dir} symlink"
- else
- einfo "creating directory ${dir}"
- mkdir -p "${dir}" ||
- die "Unable to create ${dir} directory"
- fi
- done
- done
- return 0
- fi
-
- [ -z "${def_libdir}" ] &&
- die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
- # figure out which paths should be symlinks and which should be directories
- local dirs syms exp d
- for libdir in ${libdirs} ; do
- if use split-usr ; then
- exp=( {,usr/,usr/local/}${libdir} )
- else
- exp=( {usr/,usr/local/}${libdir} )
- fi
- for d in "${exp[@]}" ; do
- # most things should be dirs
- if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
- [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
- else
- [ -h "${d}" ] && syms+=" ${d}"
- fi
- done
- done
- if [ -n "${syms}${dirs}" ] ; then
- ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
- ewarn "have these paths configured as follows:"
- [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
- [ -n "${syms}" ] && ewarn "directories:${syms}"
- ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
- ewarn "If things fail, you will need to manually create/move the directories."
- echo
- fi
-
- # setup symlinks and dirs where we expect them to be; do not migrate
- # data ... just fall over in that case.
- if use split-usr ; then
- prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
- else
- prefix_lst=( "${EROOT}"{usr/,usr/local/} )
- fi
- for prefix in "${prefix_lst[@]}"; do
- if [ "${SYMLINK_LIB}" = yes ] ; then
- # we need to make sure "lib" points to the native libdir
- if [ -h "${prefix}lib" ] ; then
- # it's already a symlink! assume it's pointing to right place ...
- continue
- elif [ -d "${prefix}lib" ] ; then
- # "lib" is a dir, so need to convert to a symlink
- ewarn "Converting ${prefix}lib from a dir to a symlink"
- rm -f "${prefix}lib"/.keep || die
- if rmdir "${prefix}lib" 2>/dev/null ; then
- ln -s ${def_libdir} "${prefix}lib" || die
- else
- die "non-empty dir found where we needed a symlink: ${prefix}lib"
- fi
- else
- # nothing exists, so just set it up sanely
- ewarn "Initializing ${prefix}lib as a symlink"
- mkdir -p "${prefix}" || die
- rm -f "${prefix}lib" || die
- ln -s ${def_libdir} "${prefix}lib" || die
- mkdir -p "${prefix}${def_libdir}" || die #423571
- fi
- else
- # we need to make sure "lib" is a dir
- if [ -h "${prefix}lib" ] ; then
- # "lib" is a symlink, so need to convert to a dir
- ewarn "Converting ${prefix}lib from a symlink to a dir"
- rm -f "${prefix}lib" || die
- if [ -d "${prefix}lib32" ] ; then
- ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
- mv "${prefix}lib32" "${prefix}lib" || die
- else
- mkdir -p "${prefix}lib" || die
- fi
- elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
- # make sure the old "lib" ABI location does not exist; we
- # only symlinked the lib dir on systems where we moved it
- # to "lib32" ...
- case ${CHOST} in
- *-gentoo-freebsd*) ;; # We want it the other way on fbsd.
- i?86*|x86_64*|powerpc*|sparc*|s390*)
- if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
- rm -f "${prefix}lib32"/.keep || die
- if ! rmdir "${prefix}lib32" 2>/dev/null ; then
- ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
- die "non-empty dir found where there should be none: ${prefix}lib32"
- fi
- fi
- ;;
- esac
- else
- # nothing exists, so just set it up sanely
- ewarn "Initializing ${prefix}lib as a dir"
- mkdir -p "${prefix}lib" || die
- fi
- fi
- done
- if ! use split-usr ; then
- for libdir in ${libdirs}; do
- if [[ ! -e "${EROOT}${libdir}" ]]; then
- ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
- die " Unable to make ${EROOT}${libdir} symlink"
- fi
- done
- fi
-}
-
-pkg_preinst() {
- # This is written in src_install (so it's in CONTENTS), but punt all
- # pending updates to avoid user having to do etc-update (and make the
- # pkg_postinst logic simpler).
- rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
- # We need to install directories and maybe some dev nodes when building
- # stages, but they cannot be in CONTENTS.
- # Also, we cannot reference $S as binpkg will break so we do this.
- multilib_layout
- if use build ; then
- if use split-usr ; then
- emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
- else
- emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
- fi
- fi
- rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
- default
- if use prefix; then
- hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
- hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
- echo PATH=/usr/bin:/bin >> etc/env.d/99host
- echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
- fi
-
- # don't want symlinked directories in PATH on systems with usr-merge
- if ! use split-usr; then
- sed \
- -e 's|/usr/local/sbin:||g' \
- -e 's|:/usr/sbin:|:|g' \
- -e 's|:/sbin:|:|g' \
- -e 's|:/bin:|:|g' \
- -i etc/env.d/50baselayout || die
- fi
-
- # handle multilib paths. do it here because we want this behavior
- # regardless of the C library that you're using. we do explicitly
- # list paths which the native ldconfig searches, but this isn't
- # problematic as it doesn't change the resulting ld.so.cache or
- # take longer to generate. similarly, listing both the native
- # path and the symlinked path doesn't change the resulting cache.
- local libdir ldpaths
- for libdir in $(get_all_libdirs) ; do
- use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
- ldpaths+=":${EPREFIX}/usr/${libdir}"
- ldpaths+=":${EPREFIX}/usr/local/${libdir}"
- done
- echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-
- # rc-scripts version for testing of features that *should* be present
- echo "Gentoo Base System release ${PV}" > etc/gentoo-release
-}
-
-src_install() {
- emake \
- OS=Linux \
- DESTDIR="${ED}" \
- install
- dodoc ChangeLog
- rm "${ED}"/etc/sysctl.d/README || die
-
- # need the makefile in pkg_preinst
- insinto /usr/share/${PN}
- doins Makefile
-
- # This is needed for https://bugs.gentoo.org/732142
- dodir /usr/lib
- mv "${ED}"/etc/os-release "${ED}"/usr/lib || die
- dosym ../usr/lib/os-release /etc/os-release
-}
-
-pkg_postinst() {
- local x
-
- # We installed some files to /usr/share/baselayout instead of /etc to stop
- # (1) overwriting the user's settings
- # (2) screwing things up when attempting to merge files
- # (3) accidentally packaging up personal files with quickpkg
- # If they don't exist then we install them
- for x in master.passwd passwd shadow group fstab ; do
- [ -e "${EROOT}etc/${x}" ] && continue
- [ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
- cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc || die
- done
-
- # Force shadow permissions to not be world-readable #260993
- for x in shadow ; do
- if [ -e "${EROOT}etc/${x}" ] ; then
- chmod o-rwx "${EROOT}etc/${x}" || die
- fi
- done
-
- # Take care of the etc-update for the user
- if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
- mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release || die
- fi
-
- # whine about users that lack passwords #193541
- if [[ -e "${EROOT}"etc/shadow ]] ; then
- local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
- if [[ -n ${bad_users} ]] ; then
- echo
- ewarn "The following users lack passwords!"
- ewarn ${bad_users}
- fi
- fi
-
- # whine about users with invalid shells #215698
- if [[ -e "${EROOT}"etc/passwd ]] ; then
- local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
- if [[ -n ${bad_shells} ]] ; then
- echo
- ewarn "The following users have non-existent shells!"
- ewarn "${bad_shells}"
- fi
- fi
-
- # https://bugs.gentoo.org/361349
- if use kernel_linux; then
- mkdir -p "${EROOT}"run || die
-
- local found fstype mountpoint
- while read -r _ mountpoint fstype _; do
- [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
- done < "${ROOT}"proc/mounts
- [[ -z ${found} ]] &&
- ewarn "You should reboot now to get /run mounted with tmpfs!"
- fi
-
- for x in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 2.4 ${x}; then
- ewarn "After updating ${EROOT}etc/profile, please run"
- ewarn "env-update && . /etc/profile"
- fi
-
- if ! version_is_at_least 2.6 ${x}; then
- ewarn "Please run env-update then log out and back in to"
- ewarn "update your path."
- fi
- # clean up after 2.5 typos
- # https://bugs.gentoo.org/show_bug.cgi?id=656380
- if [[ ${x} == 2.5 ]]; then
- rm -fr "${EROOT}{,usr" || die
- fi
- done
-
- if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
- ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
- ewarn "Please migrate your changes."
- fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.7-r2.ebuild b/sys-apps/baselayout/baselayout-2.7-r2.ebuild
deleted file mode 100644
index 3e57665e1bf2..000000000000
--- a/sys-apps/baselayout/baselayout-2.7-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-pkg_setup() {
- multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
- local dir def_libdir libdir libdirs
- local prefix prefix_lst
- def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
- libdirs=$(get_all_libdirs)
-
- if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
- prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
- for prefix in "${prefix_lst[@]}"; do
- for libdir in ${libdirs}; do
- dir="${prefix}${libdir}"
- if [[ -e "${dir}" ]]; then
- [[ ! -d "${dir}" ]] &&
- die "${dir} exists but is not a directory"
- continue
- fi
- if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
- libdir="${libdir%%/*}"
- dir="${prefix}${libdir}"
- einfo "symlinking ${dir} to usr/${libdir}"
- ln -s usr/${libdir} ${dir} ||
- die "Unable to make ${dir} symlink"
- else
- einfo "creating directory ${dir}"
- mkdir -p "${dir}" ||
- die "Unable to create ${dir} directory"
- fi
- done
- done
- return 0
- fi
-
- [ -z "${def_libdir}" ] &&
- die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
- # figure out which paths should be symlinks and which should be directories
- local dirs syms exp d
- for libdir in ${libdirs} ; do
- if use split-usr ; then
- exp=( {,usr/,usr/local/}${libdir} )
- else
- exp=( {usr/,usr/local/}${libdir} )
- fi
- for d in "${exp[@]}" ; do
- # most things should be dirs
- if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
- [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
- else
- [ -h "${d}" ] && syms+=" ${d}"
- fi
- done
- done
- if [ -n "${syms}${dirs}" ] ; then
- ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
- ewarn "have these paths configured as follows:"
- [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
- [ -n "${syms}" ] && ewarn "directories:${syms}"
- ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
- ewarn "If things fail, you will need to manually create/move the directories."
- echo
- fi
-
- # setup symlinks and dirs where we expect them to be; do not migrate
- # data ... just fall over in that case.
- if use split-usr ; then
- prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
- else
- prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
- fi
- for prefix in "${prefix_lst[@]}"; do
- if [ "${SYMLINK_LIB}" = yes ] ; then
- # we need to make sure "lib" points to the native libdir
- if [ -h "${prefix}lib" ] ; then
- # it's already a symlink! assume it's pointing to right place ...
- continue
- elif [ -d "${prefix}lib" ] ; then
- # "lib" is a dir, so need to convert to a symlink
- ewarn "Converting ${prefix}lib from a dir to a symlink"
- rm -f "${prefix}lib"/.keep || die
- if rmdir "${prefix}lib" 2>/dev/null ; then
- ln -s ${def_libdir} "${prefix}lib" || die
- else
- die "non-empty dir found where we needed a symlink: ${prefix}lib"
- fi
- else
- # nothing exists, so just set it up sanely
- ewarn "Initializing ${prefix}lib as a symlink"
- mkdir -p "${prefix}" || die
- rm -f "${prefix}lib" || die
- ln -s ${def_libdir} "${prefix}lib" || die
- mkdir -p "${prefix}${def_libdir}" || die #423571
- fi
- else
- # we need to make sure "lib" is a dir
- if [ -h "${prefix}lib" ] ; then
- # "lib" is a symlink, so need to convert to a dir
- ewarn "Converting ${prefix}lib from a symlink to a dir"
- rm -f "${prefix}lib" || die
- if [ -d "${prefix}lib32" ] ; then
- ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
- mv "${prefix}lib32" "${prefix}lib" || die
- else
- mkdir -p "${prefix}lib" || die
- fi
- elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
- # make sure the old "lib" ABI location does not exist; we
- # only symlinked the lib dir on systems where we moved it
- # to "lib32" ...
- case ${CHOST} in
- *-gentoo-freebsd*) ;; # We want it the other way on fbsd.
- i?86*|x86_64*|powerpc*|sparc*|s390*)
- if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
- rm -f "${prefix}lib32"/.keep || die
- if ! rmdir "${prefix}lib32" 2>/dev/null ; then
- ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
- die "non-empty dir found where there should be none: ${prefix}lib32"
- fi
- fi
- ;;
- esac
- else
- # nothing exists, so just set it up sanely
- ewarn "Initializing ${prefix}lib as a dir"
- mkdir -p "${prefix}lib" || die
- fi
- fi
- done
- if ! use split-usr ; then
- for libdir in ${libdirs}; do
- if [[ ! -e "${EROOT}${libdir}" ]]; then
- ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
- die "Unable to make ${EROOT}${libdir} symlink"
- fi
- done
- fi
-}
-
-pkg_preinst() {
- # This is written in src_install (so it's in CONTENTS), but punt all
- # pending updates to avoid user having to do etc-update (and make the
- # pkg_postinst logic simpler).
- rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
- # We need to install directories and maybe some dev nodes when building
- # stages, but they cannot be in CONTENTS.
- # Also, we cannot reference $S as binpkg will break so we do this.
- multilib_layout
- if use build ; then
- if use split-usr ; then
- emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
- else
- emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
- fi
- fi
- rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
- default
- if use prefix; then
- hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
- hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
- echo PATH=/usr/bin:/bin >> etc/env.d/99host
- echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
- fi
-
- # don't want symlinked directories in PATH on systems with usr-merge
- if ! use split-usr; then
- sed \
- -e 's|/usr/local/sbin:||g' \
- -e 's|:/usr/sbin:|:|g' \
- -e 's|:/sbin:|:|g' \
- -e 's|:/bin:|:|g' \
- -i etc/env.d/50baselayout || die
- fi
-
- # handle multilib paths. do it here because we want this behavior
- # regardless of the C library that you're using. we do explicitly
- # list paths which the native ldconfig searches, but this isn't
- # problematic as it doesn't change the resulting ld.so.cache or
- # take longer to generate. similarly, listing both the native
- # path and the symlinked path doesn't change the resulting cache.
- local libdir ldpaths
- for libdir in $(get_all_libdirs) ; do
- use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
- ldpaths+=":${EPREFIX}/usr/${libdir}"
- ldpaths+=":${EPREFIX}/usr/local/${libdir}"
- done
- echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-
- # rc-scripts version for testing of features that *should* be present
- echo "Gentoo Base System release ${PV}" > etc/gentoo-release
-}
-
-src_install() {
- emake \
- OS=Linux \
- DESTDIR="${ED}" \
- install
- dodoc ChangeLog
- rm "${ED}"/etc/sysctl.d/README || die
-
- # need the makefile in pkg_preinst
- insinto /usr/share/${PN}
- doins Makefile
-
- # This is needed for https://bugs.gentoo.org/732142
- dodir /usr/lib
- mv "${ED}"/etc/os-release "${ED}"/usr/lib || die
- dosym ../usr/lib/os-release /etc/os-release
-}
-
-pkg_postinst() {
- local x
-
- # We installed some files to /usr/share/baselayout instead of /etc to stop
- # (1) overwriting the user's settings
- # (2) screwing things up when attempting to merge files
- # (3) accidentally packaging up personal files with quickpkg
- # If they don't exist then we install them
- for x in master.passwd passwd shadow group fstab ; do
- [ -e "${EROOT}/etc/${x}" ] && continue
- [ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
- cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
- done
-
- # Force shadow permissions to not be world-readable #260993
- for x in shadow ; do
- if [ -e "${EROOT}/etc/${x}" ] ; then
- chmod o-rwx "${EROOT}/etc/${x}" || die
- fi
- done
-
- # Take care of the etc-update for the user
- if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
- mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
- fi
-
- # whine about users that lack passwords #193541
- if [[ -e "${EROOT}"/etc/shadow ]] ; then
- local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
- if [[ -n ${bad_users} ]] ; then
- echo
- ewarn "The following users lack passwords!"
- ewarn ${bad_users}
- fi
- fi
-
- # whine about users with invalid shells #215698
- if [[ -e "${EROOT}"/etc/passwd ]] ; then
- local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
- if [[ -n ${bad_shells} ]] ; then
- echo
- ewarn "The following users have non-existent shells!"
- ewarn "${bad_shells}"
- fi
- fi
-
- # https://bugs.gentoo.org/361349
- if use kernel_linux; then
- mkdir -p "${EROOT}"/run || die
-
- local found fstype mountpoint
- while read -r _ mountpoint fstype _; do
- [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
- done < "${ROOT}"/proc/mounts
- [[ -z ${found} ]] &&
- ewarn "You should reboot now to get /run mounted with tmpfs!"
- fi
-
- for x in ${REPLACING_VERSIONS}; do
- if ver_test 2.4 -lt ${x}; then
- ewarn "After updating ${EROOT}/etc/profile, please run"
- ewarn "env-update && . /etc/profile"
- fi
-
- if ver_test 2.6 -lt ${x}; then
- ewarn "Please run env-update then log out and back in to"
- ewarn "update your path."
- fi
- # clean up after 2.5 typos
- # https://bugs.gentoo.org/show_bug.cgi?id=656380
- if [[ ${x} == 2.5 ]]; then
- rm -fr "${EROOT}/{,usr" || die
- fi
- done
-
- if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
- ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
- ewarn "Please migrate your changes."
- fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
deleted file mode 100644
index b9c1e7df5282..000000000000
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib versionator prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-pkg_setup() {
- multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
- local dir def_libdir libdir libdirs
- local prefix prefix_lst
- def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
- libdirs=$(get_all_libdirs)
- : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass...
-
- if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
- prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
- for prefix in "${prefix_lst[@]}"; do
- for libdir in ${libdirs}; do
- dir="${prefix}${libdir}"
- if [[ -e "${dir}" ]]; then
- [[ ! -d "${dir}" ]] &&
- die "${dir} exists but is not a directory"
- continue
- fi
- if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
- einfo "symlinking ${dir} to usr/${libdir}"
- ln -s usr/${libdir} ${dir} ||
- die " Unable to make ${dir} symlink"
- else
- einfo "creating directory ${dir}"
- mkdir -p "${dir}" ||
- die "Unable to create ${dir} directory"
- fi
- done
- done
- return 0
- fi
-
- [ -z "${def_libdir}" ] &&
- die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
- # figure out which paths should be symlinks and which should be directories
- local dirs syms exp d
- for libdir in ${libdirs} ; do
- if use split-usr ; then
- exp=( {,usr/,usr/local/}${libdir} )
- else
- exp=( {usr/,usr/local/}${libdir} )
- fi
- for d in "${exp[@]}" ; do
- # most things should be dirs
- if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
- [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
- else
- [ -h "${d}" ] && syms+=" ${d}"
- fi
- done
- done
- if [ -n "${syms}${dirs}" ] ; then
- ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
- ewarn "have these paths configured as follows:"
- [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
- [ -n "${syms}" ] && ewarn "directories:${syms}"
- ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
- ewarn "If things fail, you will need to manually create/move the directories."
- echo
- fi
-
- # setup symlinks and dirs where we expect them to be; do not migrate
- # data ... just fall over in that case.
- if use split-usr ; then
- prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
- else
- prefix_lst=( "${EROOT}"{usr/,usr/local/} )
- fi
- for prefix in "${prefix_lst[@]}"; do
- if [ "${SYMLINK_LIB}" = yes ] ; then
- # we need to make sure "lib" points to the native libdir
- if [ -h "${prefix}lib" ] ; then
- # it's already a symlink! assume it's pointing to right place ...
- continue
- elif [ -d "${prefix}lib" ] ; then
- # "lib" is a dir, so need to convert to a symlink
- ewarn "Converting ${prefix}lib from a dir to a symlink"
- rm -f "${prefix}lib"/.keep || die
- if rmdir "${prefix}lib" 2>/dev/null ; then
- ln -s ${def_libdir} "${prefix}lib" || die
- else
- die "non-empty dir found where we needed a symlink: ${prefix}lib"
- fi
- else
- # nothing exists, so just set it up sanely
- ewarn "Initializing ${prefix}lib as a symlink"
- mkdir -p "${prefix}" || die
- rm -f "${prefix}lib" || die
- ln -s ${def_libdir} "${prefix}lib" || die
- mkdir -p "${prefix}${def_libdir}" || die #423571
- fi
- else
- # we need to make sure "lib" is a dir
- if [ -h "${prefix}lib" ] ; then
- # "lib" is a symlink, so need to convert to a dir
- ewarn "Converting ${prefix}lib from a symlink to a dir"
- rm -f "${prefix}lib" || die
- if [ -d "${prefix}lib32" ] ; then
- ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
- mv "${prefix}lib32" "${prefix}lib" || die
- else
- mkdir -p "${prefix}lib" || die
- fi
- elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
- # make sure the old "lib" ABI location does not exist; we
- # only symlinked the lib dir on systems where we moved it
- # to "lib32" ...
- case ${CHOST} in
- *-gentoo-freebsd*) ;; # We want it the other way on fbsd.
- i?86*|x86_64*|powerpc*|sparc*|s390*)
- if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
- rm -f "${prefix}lib32"/.keep || die
- if ! rmdir "${prefix}lib32" 2>/dev/null ; then
- ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
- die "non-empty dir found where there should be none: ${prefix}lib32"
- fi
- fi
- ;;
- esac
- else
- # nothing exists, so just set it up sanely
- ewarn "Initializing ${prefix}lib as a dir"
- mkdir -p "${prefix}lib" || die
- fi
- fi
- done
- if ! use split-usr ; then
- for libdir in ${libdirs}; do
- if [[ ! -e "${EROOT}${libdir}" ]]; then
- ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
- die " Unable to make ${EROOT}${libdir} symlink"
- fi
- done
- fi
-}
-
-pkg_preinst() {
- # This is written in src_install (so it's in CONTENTS), but punt all
- # pending updates to avoid user having to do etc-update (and make the
- # pkg_postinst logic simpler).
- rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
- # We need to install directories and maybe some dev nodes when building
- # stages, but they cannot be in CONTENTS.
- # Also, we cannot reference $S as binpkg will break so we do this.
- multilib_layout
- if use build ; then
- if use split-usr ; then
- emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
- else
- emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
- fi
- fi
- rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
- default
- if use prefix; then
- hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
- hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
- echo PATH=/usr/bin:/bin >> etc/env.d/99host
- echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
- fi
-
- # don't want symlinked directories in PATH on systems with usr-merge
- if ! use split-usr; then
- sed \
- -e 's|/usr/local/sbin:||g' \
- -e 's|:/usr/sbin:|:|g' \
- -e 's|:/sbin:|:|g' \
- -e 's|:/bin:|:|g' \
- -i etc/env.d/50baselayout || die
- fi
-
- # handle multilib paths. do it here because we want this behavior
- # regardless of the C library that you're using. we do explicitly
- # list paths which the native ldconfig searches, but this isn't
- # problematic as it doesn't change the resulting ld.so.cache or
- # take longer to generate. similarly, listing both the native
- # path and the symlinked path doesn't change the resulting cache.
- local libdir ldpaths
- for libdir in $(get_all_libdirs) ; do
- use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
- ldpaths+=":${EPREFIX}/usr/${libdir}"
- ldpaths+=":${EPREFIX}/usr/local/${libdir}"
- done
- echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-
- # rc-scripts version for testing of features that *should* be present
- echo "Gentoo Base System release ${PV}" > etc/gentoo-release
-}
-
-src_install() {
- emake \
- OS=Linux \
- DESTDIR="${ED}" \
- install
- dodoc ChangeLog
- rm "${ED}"/etc/sysctl.d/README || die
-
- # need the makefile in pkg_preinst
- insinto /usr/share/${PN}
- doins Makefile
-}
-
-pkg_postinst() {
- local x
-
- # We installed some files to /usr/share/baselayout instead of /etc to stop
- # (1) overwriting the user's settings
- # (2) screwing things up when attempting to merge files
- # (3) accidentally packaging up personal files with quickpkg
- # If they don't exist then we install them
- for x in master.passwd passwd shadow group fstab ; do
- [ -e "${EROOT}etc/${x}" ] && continue
- [ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
- cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc || die
- done
-
- # Force shadow permissions to not be world-readable #260993
- for x in shadow ; do
- if [ -e "${EROOT}etc/${x}" ] ; then
- chmod o-rwx "${EROOT}etc/${x}" || die
- fi
- done
-
- # Take care of the etc-update for the user
- if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
- mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release || die
- fi
-
- # whine about users that lack passwords #193541
- if [[ -e "${EROOT}"etc/shadow ]] ; then
- local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
- if [[ -n ${bad_users} ]] ; then
- echo
- ewarn "The following users lack passwords!"
- ewarn ${bad_users}
- fi
- fi
-
- # whine about users with invalid shells #215698
- if [[ -e "${EROOT}"etc/passwd ]] ; then
- local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
- if [[ -n ${bad_shells} ]] ; then
- echo
- ewarn "The following users have non-existent shells!"
- ewarn "${bad_shells}"
- fi
- fi
-
- # https://bugs.gentoo.org/361349
- if use kernel_linux; then
- mkdir -p "${EROOT}"run || die
-
- local found fstype mountpoint
- while read -r _ mountpoint fstype _; do
- [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
- done < "${ROOT}"proc/mounts
- [[ -z ${found} ]] &&
- ewarn "You should reboot now to get /run mounted with tmpfs!"
- fi
-
- for x in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 2.4 ${x}; then
- ewarn "After updating ${EROOT}etc/profile, please run"
- ewarn "env-update && . /etc/profile"
- fi
-
- if ! version_is_at_least 2.6 ${x}; then
- ewarn "Please run env-update then log out and back in to"
- ewarn "update your path."
- fi
- # clean up after 2.5 typos
- # https://bugs.gentoo.org/show_bug.cgi?id=656380
- if [[ ${x} == 2.5 ]]; then
- rm -fr "${EROOT}{,usr" || die
- fi
- done
-
- if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
- ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
- ewarn "Please migrate your changes."
- fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.8.ebuild b/sys-apps/baselayout/baselayout-2.8.ebuild
index d237814a2a9d..5767ed31ca80 100644
--- a/sys-apps/baselayout/baselayout-2.8.ebuild
+++ b/sys-apps/baselayout/baselayout-2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
inherit git-r3
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
LICENSE="GPL-2"
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 51443e967cad..8b9100439fdc 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -7,12 +7,14 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856
DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
DIST bat-0.20.0.tar.gz 1698850 BLAKE2B 99d150010b40246af8529490411a781aebeb06730dadbc10969e25a4825bf30402b2ae75a2c752b199d8212ea48a19cbb7cb5afceaf9fe0b42e3845030729d33 SHA512 22b4ad8f8a5ba55cb8b16aefda29e95fd55e60ed8c2d3f0de36f6a00b770d9ee7f86f4e5ca35bee4e9f22772ab4b3c327d21ebbec25dc0350d9fb89a9f9f22e7
+DIST bat-0.21.0.tar.gz 1786921 BLAKE2B 158d1c57723cc56adaee3e60ce0ecc2e0cb8f0f733b72ad6ae1acb53520b5bf4a13ac6fa7bd285a26ebeabfe816104eed24c2c0d871d6a14b71f927deb81db9d SHA512 113a8225bd297d9a18ad620c5509db1c4028d92387b70fb3eacc34b0ab9dabdd01a206d1b3062632830d8cf34cb12ea8ca6788a8ea985c5e5de57bf71306be70
DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
DIST bugreport-0.4.1.crate 13793 BLAKE2B 00f622bec629edf8744ca3e5cf8097ef4b6bea2516d8de5c0cc9f6aa819424e3ab49573dd7f3d00f6d406ddc077413c045d08a0d9092e44854dd2d91164d0220 SHA512 ad54c8f52169594ae010093b818255cf16b44741db6802ffb9eb4c1fe699a59183f3505f553f8345aecfe3afd518c4272625adee0e880990a38b0bd9a9db6eed
+DIST bugreport-0.5.0.crate 16149 BLAKE2B 2728559a8aa0c0c6346335eadfab93ac4b26407604e003432f4d0db1a22ae0c6c22374638482d2e879d09c9139b7da1ac67547764795d303ded1816d3513a1ae SHA512 d1418b6c8df333b4b245f428f3442968f7b75961a00523fb432ff2f904eca07cd208d417e63b2fb0a86b85a6853e4c474d30c19b80a85d8724db66ecd762da7c
DIST bytemuck-1.7.3.crate 27879 BLAKE2B b231e200fa8925f71e457a6ae3a6677366cf6a5b1a6c19845b6973f385fdaaa86b6a3d4e8b38356dbc824cde70e8f1120008d21a3d77d06575fd036b0bf20678 SHA512 03569cb6b6532ff62f406f8f6c80ea5cc3a4fc36ebe28f5a4bab32000862192eed2d26163062c62c0749d2f96ebed6968ce76d2e95a6430d9147c3648aff1f64
DIST bytesize-1.1.0.crate 9370 BLAKE2B 38fcddbdb862e82a076b7ae1339b48c776f704d25be78935d08637351ade725e86e00e07e62868e76a1a2db894f223e1f8309f8b362a46405ec6c06f6e421a96 SHA512 36f35cf53c468cf011b231d3fc5d00c5224fa3d917854e347daeaaae53ae7ee36c4d8ba26788460d56c922c9ffb0eeebc60655fef7366ae42e221950d03f6715
DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
@@ -38,6 +40,7 @@ DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e680
DIST fancy-regex-0.7.1.crate 78178 BLAKE2B c5887ef60d0427b5964cb296696749c5dff6877c0348c646c97c318739e9f1c0f517b01229de11656cc50ef702240526248ffb67e9aad91d892a39ebaec5035c SHA512 533cd4eb50a1a9665f42dfb0c6f4e8c7bbf4f45eb50abe023e44f0dee66a9e40ff82784b10dc9e1f4aebd652efebe3472fd3ba92996dec0932465cd2cfc932c5
DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
+DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
@@ -45,6 +48,7 @@ DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927
DIST git-version-0.3.5.crate 3203 BLAKE2B f73d2f076c79c10c7395e584d811b6fffc7f348954c2c142099c48ba4440d257eb1be59ff26c3a61f37a6bc119afd82105a1697c37f8d7b973f3a43108f099f6 SHA512 7017d59ec7eef1d69c333ce8bcdee355dced8e912c4b5eabcb2abb93f6075ef3d1fd9486661d472c29787b75d7866fc49835d1faf5d06e42837c95c856398629
DIST git-version-macro-0.3.5.crate 4302 BLAKE2B 39173a36199b34cec11a1924faed795334586b21e3042bb91f3d38cee2d8b97ffb5bb4dd45a3c192d8c1b8d2b2a5bf4e0d3b23927b6f4212cfeb7cb9dbb16d4e SHA512 319729646469ab6508e16e6f3b88f588580fe7089479f70522edd6ac7eadb3c4576f0a57863bd3927d1ada693c3fe3706dc6a75e6cd75723db7f23199dc69ae0
DIST git2-0.13.25.crate 194192 BLAKE2B 7286ce8f37421e5cb626c3b3d4f0005d4ddbf4f893fa4885a9bad28ba3f0e24d4b2161df8788430d909394ceff77eae586b26ffe343d6b0ca287ea0b63087068 SHA512 666f11464f34d82abd994f00a0b81e960551c4c524b4f00d28e5c728172dfa894fec65050767cc96d18d1d5de57f1e901154fe8d70e2e31b93b93790bce021ab
+DIST git2-0.14.2.crate 196856 BLAKE2B 09ed89e5eaf632b1bd9c33ff7afff78808599823804668cb6f85925a8d61359300b460db8b34e6562b8289b79b53094df4c184e013a8d4d4b58c510447fd0ec8 SHA512 7e4c0660fb7f48fda3ed73bcd577e2a40eb44005bd1130f9fbc0c515bfd155ec75a2efabdde99661a7c4590e52a749be4342397b79a47bbfe8f4fb8fe160dd22
DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
DIST grep-cli-0.1.6.crate 18949 BLAKE2B fe0c1c615cd2b1dbb8b7ad3980292308d9f06390ead08f42719b835805efed8a8243a7ab9e5bbf3cc6aa5c2890aa2bd53366a0bf65d66c19ec706f76beb58cbc SHA512 ffacb90586bb28afc3ab2a780be10c78f32b83c5ef5b28c7729ed61353ff5197bdafa485e87371d5ea10198bc9c28c46a22172a9fdb0adad0119274c503214ab
@@ -60,7 +64,9 @@ DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
+DIST libc-0.2.125.crate 589236 BLAKE2B 57ca3aa19687b5c5702b66ad690a86ec7639dca41c5846c7cc3500f2d0fffcfee95a2def7695652174862fb6b8d211e7564fef6bef6d1197c481b5b8f18a9c74 SHA512 64ea5bb20120b9893bf5a3648f28da07384972e3cbad13da40c3ecc501efe1bff0bd6b71f52d5f253f00d7a97c2f69d86fba490955e8d70ca1360b8db1e431cf
DIST libgit2-sys-0.12.26+1.3.0.crate 1476836 BLAKE2B 953756b4ed1e6f90d9eabf03dd9f3db50a085ecee4018c6f5e598b2b030e3332a6281f5e033810134356a48b92a4b910fd534813f2111cefc6de3bbf2954e1c8 SHA512 de30865b3d4ab0288e090381e5646e3e8028c341fac93014168fcfa5f166f7fbad9fc4ebd285919247cc6bac178658eb936ea1fdf168068248be07ad34ecc54d
+DIST libgit2-sys-0.13.2+1.4.2.crate 1492799 BLAKE2B 9ac165dff195d4ed18677f9cc9f85e79a219c60c3477880a35340d5bcd0308c7aca4015fa3c213ce56fc20a237c5f1d506ae936335db4eddf06617c6072146ab SHA512 54d7c11d930554dd10b112d878dc7ea473c7d45e74d394e21e99f5d4632741f49aa31746bf2594705d337b5b64e6b877e510938ceb2117837c9a6f685ef8824f
DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
@@ -70,9 +76,12 @@ DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040
DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
+DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
+DIST nix-0.24.1.crate 263506 BLAKE2B 6e89beb88a924d4bd4d4cdb8b384cb4d3b080f3594817a663038d906b1e26b044f32271d5e1cb6f17053ba2b5133b6a2ba8b748aaa08cec2855159b14160f51b SHA512 eea2346477b5acbcc7c74fc0d3f99e35bc85f8195563599423cd838f258c388561e82feb66e9793528f55eea2cb015e899a335d6da82ca0c1b8acdff1b53efaa
DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
DIST onig-6.3.1.crate 30879 BLAKE2B e371f003ee19bdbb9cf9fa0e5f18ef14841cbae40f66bfbb367401c15b1eb50b3661accc0609a43dce41f8272ffad8a4b41f75ea23267ab8c7cdf4556d67a7cd SHA512 5c487063b669532e31acce0788b690c53a8d95eb628cea970dd335bb721fa99e67bb6c531b0a9a388354b7e1a6e1621cc953e029f1791dde43736a577002d955
DIST onig_sys-69.7.1.crate 631301 BLAKE2B 4c593f3b7a83d32edc92db67d6f2f0460e43bf34611751f8a5941ad3cded459cdd582e9067291d1fa1e2dfc316b276080b99f85f0a98dc9bfcc531af2f289b7e SHA512 5be8c31049ad741fa06247bd22813374f71397481cea22be3d83bed720b512b9cb10d6028072fd92cc09ac0e9ca8fb977ca49fb59d934dd61f84c4634d28ffb3
@@ -83,36 +92,46 @@ DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb
DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
DIST plist-1.3.1.crate 44772 BLAKE2B 2e2b869b4543d06830b54a873d6d5da572502ff0409aa723a5beda5121b0ea8c8aa3656aa70299ef32532f948ed82ccde05f4bbcc9cec6a7288e7fc79eb27536 SHA512 4cf962af14b4218502eb4aae5507d93c58c4a0b716f923c3f0e53e37225940c5ab6847d7d9ad5004f77dc2dbbd28f73412cc114fd231e515f23a4ade3f969e86
DIST predicates-2.1.0.crate 23141 BLAKE2B 32dc6455d74e4188385e196f9b9042411c0c1278d12121b4aeaffd58d5adbd201ee4a3e51d908dd59528928f5751f53a125b53e1b15542ed6064c753cd8cfe52 SHA512 824cc99e8e904e5257223bba104cc705fb2e1c93ec6b638cd898dd53fb29217978de1a61c2f11caf1e4a0e076a37efbd09a2998457bcf4af1c2e7eb3c089e0af
+DIST predicates-2.1.1.crate 23150 BLAKE2B fa8b250752f8a5d6ec30ab3aec3aca2b48e903fd8d182817180633f9f2a55e4632b1e1912c9edac453ebcded9f6624c42b38dda70ef36fd710e1dce1f1ce6346 SHA512 c850fa2541265aeb23d5c19dac6c7654dc434f1239ecc8b1cfaea89bd120112e2c45f127b491fbfba1c053db8413e8b561896729a56b6588142dd9ba9a33988b
DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
DIST predicates-tree-1.0.4.crate 7682 BLAKE2B 10e32e4d316bd3bb7015a6ef6d8391381d441acdce0b54a7da2ae4f741175dad7bf92c2488809e233da45360388908f200c2a2756f17210641b0e503728cf150 SHA512 f4d4f3d58c13c9b0344832709709a677d0d1f32e80a2c1e7f38a6f214efaabfc2b8e12d4bb4ac8f0c57def9a44cfe94ce9144132cacc2b6f84002a57aeb4ae5e
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
DIST quote-1.0.14.crate 27252 BLAKE2B c744f787e311f9c42b2678f88978d68eaeae87324f07cb28042152a77244ff973e3bc93b8a277f590abe1b6b7c37f6b095ac4a75c96ef9590f7d9d397382b62f SHA512 b2879fa8ae5ca80fb8aba56da016d9b8aab0f1014cc67fe597f42999e8042b2178b98dcb09109edc74b6bd1dc542341a72d11e4880273ffaaf766da243e687e4
DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
DIST rgb-0.8.31.crate 16087 BLAKE2B c597b0961803685c80bc154b7d2fabeeb88c36bdc6f79fe6c6d99b9069bf3a3914eff0433cd6b068aa87ca608e90e408dca18a9f2deb900c1a8e5592462058a9 SHA512 a9b307c88dbe24b383e38311a411365a709d4d7fe8d5e0e35f29200af3f2b912e1251a68b268c383a2f00538a93fffd05f0bdf1ca15e5bd3f56000c789ecc144
+DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
+DIST semver-1.0.7.crate 30064 BLAKE2B 5006e6eb5f28493be476c97799bcb53009485283d114c3f4eee99f1377a5b5e4cb0de89808dc7dd4d1e47c162ff4399679fbbda7520c256673fd0e592c29ce77 SHA512 1956b173e70a9ae78d4e96d62951072879998125bf4703a2763c8cafa4e94100010d6f923afb3b7201d0a3128948b71a5cad0b82cae1239e8f7631d5e003c663
DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
DIST serde_json-1.0.74.crate 115919 BLAKE2B 230d205687c29f361705f80192e26a15e97c5dc1497a02bd56fa8399a4d562d087461729d17fbefe61af9662886381f8674aee91471b10f11f29e9ad9c14a39d SHA512 da070221e805495b9b8c56a203ded1b2651b81851ae473a73dbf46656c44375cd5ef7db01272792684abb4d7836e193c85a622e83c59125a393fb484431fb061
DIST serde_yaml-0.8.23.crate 42140 BLAKE2B 49d28913954173d1c062fe4668c2228286adde3d3e210befd09e04f8e43dcde469c6aeb86349a7a604188343d0c211078c9520c079249780923a4d70e3132d9b SHA512 7831299cedf0fa9155a76b61436ec1cbc06adfe672a102973e8cffc8b277d99b4104d70951ed16b18283f3291c8047d6af413e0438da3e6bc6745bfb6816628a
DIST serial_test-0.5.1.crate 2993 BLAKE2B c72cfcfe441d1d23128d442a3d24e83858e598dd95bccef0a462c675793db0aa1ad2cd03daa73441e84c8389b8dcef9b4698cb8eba8bb5dfbf69e524331950d7 SHA512 e1a0f7a24981698eaa6bcce8f951863f76e8a2750aff3191104d092a06021c39d4eb2e9b74e6690b0dba0d674a216ea170efe0a5367d22bdef72c2006f644a4e
+DIST serial_test-0.6.0.crate 4494 BLAKE2B d68c70c5cb079cae1a22173d90045789b578d8f50407c56df80a30ee7e4abab26445f0a304693e0c3936d466fb1778de71c9f3f9185fd690f595dc02f5a1f588 SHA512 36340e6234b44ef99d0e4f25a6f98dbe080cb0c2b0de06bdb8fe72cf7c6398110ca0489e556b7ba24be708e7fae3fc63400075e1d061a86d5d612d70b216d46f
DIST serial_test_derive-0.5.1.crate 3609 BLAKE2B 54e408dc15f15c26e116157046ac609356b6d92d3e5bd27e08c31da537ec526eef8e6e52df1f06521b98c6c0695197b0b2ed654f0e46a45cf15156db82688d08 SHA512 e3f4b3c2eed1b284dbff7447c2f912343f9b95cbd88f3387c0136ca42698b38a607c752277ee4590ded9f73f475325d2652ba67ba029ddd54711d9070ac5f43e
+DIST serial_test_derive-0.6.0.crate 5581 BLAKE2B 8757effde13525634b73466eb8a10113138248172ccd131c5de6bc8918dbbb435987e0aed5aa66580290eab316bd72f58349f029a43efe9c63df2497dce41208 SHA512 45885b6556ec89356b0db59f53cdec2f147ed71c61c072ab3d5c472bb574c3e64632668272f1b43cb10c6e3113cbbac85e58bb0e2ea589630aba6545a0d2da2b
DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
+DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
DIST std_prelude-0.2.12.crate 5066 BLAKE2B 06e592e98a78e7d4f0d40075d5c77041019264cbfb50ff2f5ac2a22655787d3f70e4b270aadaa5508e965c9a8615b98b7f3307ddc42e62de708406f2fce14980 SHA512 c929e6eed305c337c4eb52caee63c5c016394ccaf2cb36268a289bf0bc74b0a20d3e739b3b7ca87e30eb45eab503203e04399c04d48f2d69a94da75cfd5804ae
DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
DIST syn-1.0.85.crate 235056 BLAKE2B f72302314edc7a4040cc6e0c95a4b8a7105d81da0cd1788703067b01437a3cad216569d96e6871e5c26ec99bac23eaa077d871f2163ee4b501b4d57eba8502b3 SHA512 f12ac93bfc8f24b2a567485fc738a40ae8c9649515783003e07bc5d0f3e377bc324a4f649d66c7fa2d1272cb0a2fb884ecfb06f8aed98dc3c03329f62d03a44e
DIST syntect-4.6.0.crate 750938 BLAKE2B 9c53e142093f6d9fb703f4fe3f56db15c0bb7eba92cba9f31e567e9de2bcb129b7b415cbaf692c1e1021b12184bb3b064ed1996654581aab3d5f09e992c0eb5d SHA512 9e320afaf4c2adf41dd7e20c5d95e3063fe8d2774d8deec7e0df3debab050e96a1a5c85d1732c661ee4022dc5bf1abfed2982f13269689b527f35efb2c82beba
+DIST syntect-5.0.0.crate 809452 BLAKE2B d76194d2234c77decac13d1bd2036862231718ce0ee050469fbbff094a11bc8f4ae2669077f6433d59a113d058c449f6e4d091cf520a985a9ef92dcab058f136 SHA512 b444424ad5f2ff9897707d6c2d0a39cf4e48a8d9a838286fc9f7bd9db6f1b4228bd2a5c985f5f88c014e75a7ee94bffdfee1cca45bd68e6db52e624e71923dc9
DIST sys-info-0.9.1.crate 20589 BLAKE2B fb3c43a1368c9206393b28064b38a1560aeb863b9b0bc89c9bf6ccc344a46a590296df3596f421218d78c26ae90d3f869ef0457c8c34e8e8dcb9bbd92fee0450 SHA512 52e23efd5bba1ce07d7fffb8c2d6864a8056b1e8ce1b85c4d2d4b37b9d57dfa5a6c0eae9e2018e07af47469c3f7812ccbd27351cbd6c95a7b788ec87cd544b2e
DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
@@ -121,7 +140,9 @@ DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b918
DIST termtree-0.2.3.crate 6926 BLAKE2B 390aad5f90602785674fddf6dd5ffe5ddb37b5f2eea7cfd330e04e4b3f482c8ab3bca63fa595ee409a8bed3ffd27684bc6a1227ca679763f94cf5a75ad55ee93 SHA512 183a99ece5ba686e6fc9884c3dc702083a6f7918514a20e3af460195d8f171d9ec91fccb8e2a93319f844ca7164455c9490e4a6478ef096f44c1b57e532a7a76
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
+DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
+DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
DIST time-0.3.5.crate 72732 BLAKE2B 7e7e90cdaca05f60e79b0858826fc59ea6a6e3113051c0a2cb7e0b7e7963e6c410595c8c524a97281f754008f5ad3090c7cb2a5098b00b922c0e898441f02171 SHA512 751afd33abf9879b7bc524b50c63ca4722aa39d5bef3ddb371ec4d6efc9acbee9033c5813ec7d31e5e627e3c7fcd491ad4e7016130b7b09f931023e2bf395574
DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
@@ -132,6 +153,7 @@ DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd
DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
@@ -143,4 +165,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
EBUILD bat-0.20.0.ebuild 3993 BLAKE2B fd883b59fb863de36b6ede7c2fbc3a26efdb4d22f561eaeadf08f3b333f03eebed403eae16e95a51844da8e60278501094af6ab1216f514140d15d8e76a5acb3 SHA512 d157c54dc2c89021d30c97162703d1a8bc1ba59a29f55350ccd598470c9cca14553c90bd32f1d99e2705f9821c6cd2c57958d13cbd82f85689ed8bc95ae3f36a
+EBUILD bat-0.21.0.ebuild 4053 BLAKE2B 29e3a87eebc1c192747b84f88777f5201c95ac0f139a89d281206b256f66647bb9802bf8103ef0aed175cdff20b4b74620f02f7bd0c79a1441cb7b32ffaaaca2 SHA512 2925977b54345f8a6724d39978ed9cea79167cb06abf3f0affcbf0594f78f440e89c440ade86346b07c0d6630d3223d20634e5a6c1312984ce0e06fe6ce2b4e4
MISC metadata.xml 849 BLAKE2B 5c57de94ef22a5be55abec3a0fe429b40d24605bbc49322cd607baf4a3efcb34edd4ac4370ae60c377055800134722166d70d1f39a4a959f3c5f6844b2444e93 SHA512 18a02a2d6a13c23415d57c7303170413b4466c4f35138b3d9ceeba0acae94bea9b7d7443feda1d9611d8812665d915007e13fca5df3051073905050734a8b626
diff --git a/sys-apps/bat/bat-0.21.0.ebuild b/sys-apps/bat/bat-0.21.0.ebuild
new file mode 100644
index 000000000000..dac63be60bda
--- /dev/null
+++ b/sys-apps/bat/bat-0.21.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 2017-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ adler-1.0.2
+ aho-corasick-0.7.18
+ ansi_colours-1.1.1
+ ansi_term-0.12.1
+ assert_cmd-2.0.4
+ atty-0.2.14
+ autocfg-1.0.1
+ base64-0.13.0
+ bincode-1.3.3
+ bit-set-0.5.2
+ bit-vec-0.6.3
+ bitflags-1.3.2
+ bstr-0.2.17
+ bugreport-0.5.0
+ bytemuck-1.7.3
+ bytesize-1.1.0
+ cc-1.0.72
+ cfg-if-1.0.0
+ clap-2.34.0
+ clircle-0.3.0
+ console-0.15.0
+ content_inspector-0.2.4
+ crc32fast-1.3.0
+ difflib-0.4.0
+ dirs-next-2.0.0
+ dirs-sys-next-0.1.2
+ doc-comment-0.3.3
+ either-1.6.1
+ encode_unicode-0.3.6
+ encoding-0.2.33
+ encoding-index-japanese-1.20141219.5
+ encoding-index-korean-1.20141219.5
+ encoding-index-simpchinese-1.20141219.5
+ encoding-index-singlebyte-1.20141219.5
+ encoding-index-tradchinese-1.20141219.5
+ encoding_index_tests-0.1.4
+ fancy-regex-0.7.1
+ fastrand-1.7.0
+ flate2-1.0.23
+ float-cmp-0.9.0
+ fnv-1.0.7
+ form_urlencoded-1.0.1
+ getrandom-0.2.3
+ git-version-0.3.5
+ git-version-macro-0.3.5
+ git2-0.14.2
+ glob-0.3.0
+ globset-0.4.8
+ grep-cli-0.1.6
+ hashbrown-0.11.2
+ hermit-abi-0.1.19
+ idna-0.2.3
+ indexmap-1.7.0
+ instant-0.1.12
+ itertools-0.10.3
+ itoa-0.4.8
+ itoa-1.0.1
+ jobserver-0.1.24
+ lazy_static-1.4.0
+ libc-0.2.125
+ libgit2-sys-0.13.2+1.4.2
+ libz-sys-1.1.3
+ line-wrap-0.1.1
+ linked-hash-map-0.5.4
+ lock_api-0.4.5
+ log-0.4.14
+ matches-0.1.9
+ memchr-2.4.1
+ miniz_oxide-0.5.1
+ nix-0.24.1
+ normalize-line-endings-0.3.0
+ num-traits-0.2.14
+ once_cell-1.10.0
+ onig-6.3.1
+ onig_sys-69.7.1
+ parking_lot-0.11.2
+ parking_lot_core-0.8.5
+ path_abs-0.5.1
+ percent-encoding-2.1.0
+ pkg-config-0.3.24
+ plist-1.3.1
+ predicates-2.1.1
+ predicates-core-1.0.2
+ predicates-tree-1.0.4
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro-hack-0.5.19
+ proc-macro2-1.0.36
+ quote-1.0.14
+ redox_syscall-0.2.10
+ redox_users-0.4.0
+ regex-1.5.5
+ regex-automata-0.1.10
+ regex-syntax-0.6.25
+ remove_dir_all-0.5.3
+ rgb-0.8.31
+ rustversion-1.0.6
+ ryu-1.0.9
+ safemem-0.3.3
+ same-file-1.0.6
+ scopeguard-1.1.0
+ semver-1.0.7
+ serde-1.0.136
+ serde_derive-1.0.136
+ serde_json-1.0.74
+ serde_yaml-0.8.23
+ serial_test-0.6.0
+ serial_test_derive-0.6.0
+ shell-escape-0.1.5
+ shell-words-1.1.0
+ smallvec-1.7.0
+ std_prelude-0.2.12
+ strsim-0.8.0
+ syn-1.0.85
+ syntect-5.0.0
+ sys-info-0.9.1
+ tempfile-3.3.0
+ term_size-0.3.2
+ termcolor-1.1.2
+ terminal_size-0.1.17
+ termtree-0.2.3
+ textwrap-0.11.0
+ thiserror-1.0.31
+ thiserror-impl-1.0.31
+ time-0.3.5
+ tinyvec-1.5.1
+ tinyvec_macros-0.1.0
+ unicode-bidi-0.3.7
+ unicode-normalization-0.1.19
+ unicode-width-0.1.9
+ unicode-xid-0.2.2
+ url-2.2.2
+ vcpkg-0.2.15
+ vec_map-0.8.2
+ version_check-0.9.4
+ wait-timeout-0.2.0
+ walkdir-2.3.2
+ wasi-0.10.2+wasi-snapshot-preview1
+ wild-2.0.4
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
+ xml-rs-0.8.4
+ yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
+HOMEPAGE="https://github.com/sharkdp/bat"
+SRC_URI="
+ https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris)
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 LGPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ >=dev-libs/libgit2-1.1.0:=[threads]
+ dev-libs/oniguruma:=
+"
+# >app-backup/bacula-9.2[qt5] has file collisions, #686118
+RDEPEND="${DEPEND}
+ !>app-backup/bacula-9.2[qt5]
+"
+
+DOCS=( README.md CHANGELOG.md doc/alternatives.md )
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_configure() {
+ export RUSTONIG_SYSTEM_LIBONIG=1
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+ cargo_src_install
+
+ einstalldocs
+
+ local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
+ cd ${build_dir[0]} || die "Cannot change directory to ${PN} build"
+
+ doman assets/manual/bat.1
+
+ newbashcomp assets/completions/${PN}.bash ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ newins assets/completions/${PN}.zsh _${PN}
+
+ insinto /usr/share/fish/vendor_completions.d
+ doins assets/completions/${PN}.fish
+}
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 7d53f608a0e7..41b4dddb2778 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-4.2.0.tar.bz2 606223 BLAKE2B c45a11db556b9c3e3a19583bfaa633244e2ea2e374ec8b883cba486126cfb33617cd7930af79d379711980ad4b56426b39a3e68532462be1918da1386369d137 SHA512 6d43da42c6a2a328c8fb766a3f00f4511e72a00836316c279c8dc3a24468abb4c2ce909b42c568ee0b8417c08827c7cb79ae197ae693b8d6ce60faf22422effb
DIST bleachbit-4.4.2.tar.bz2 653525 BLAKE2B ae65e310d33c2e523244a32de1ff28081be940a6a2ed2aadf682218ebe7346de3b5f37ab457d4f16542730d617678effbcda461e7080c43cd81c17f6b959018d SHA512 247a1ed0e491e5e02c4bc9a5c2d11d5f1511ef9644b9edf34b1c9326e6515c33dfd60b98bb2dab59eac36ab5e1c9b5ed1e8d7c749261bde90450a2fc717dae6f
-EBUILD bleachbit-4.2.0.ebuild 1654 BLAKE2B ba53ddfd1efaf007bb5233f4bd66eab1781a8da8f4ddcc4f25e439f0443594ec471a2b1b32ce633efeb9f40ca5eab12b3c8cf563c737149cacca17c2a64d0f39 SHA512 20671f4b91425aad8b8d602e119b1bc2dba34560bc1a20e138ad454effbb78313420fe188ff25ac4b7faf463456f8af678a41c676038a98a657d3ef89fff3055
-EBUILD bleachbit-4.4.2.ebuild 1755 BLAKE2B 7619ad3b2282dd95b9ec83c826b673e6602f762a1c8ef657365154d03f9c83d55b3121492a0c8c6bbe604b8273fd3231503b8923f18cf6b3f2869f969d21f19c SHA512 7835d2ef61864898137ead092184f4e4d9d878436c21569aff4a46d89c084628466e756e982078b9e1031149d5eab5811b02bd821e874179b8fb1495771c83a7
+EBUILD bleachbit-4.4.2.ebuild 1753 BLAKE2B e244432fa4dae587e015ae1c44163c0b7f5f507b9952219e1f1f786839a7271546f060c2002a7f4143b41dfa1810031bce972badf6169adc88e0bc3aaafd7fd3 SHA512 898f9d4773481ff467d84ef9d9ce631eb78db586c4ef705138524acdaccc22c48c5fb71440b2e90175eb14ea44469d2ce3b86b8bfaae0c89b7fdc0b91e7eebcc
MISC metadata.xml 557 BLAKE2B 61de1eec1e533aea9a008403d40069d8e7fb3ca2e1217f1ebf8746adf07725bf82011ee6597961443e6474de9908e3b8a70a6aef42439b4aa62a562212846378 SHA512 dc31e0aa896798f20540c5f7119aa7cf60a8ec5e498d8a7a7baf3d73b5287b03083e33f0816d84467acfc221d8bf0dfdeea59734b3048e4194693d63ec453214
diff --git a/sys-apps/bleachbit/bleachbit-4.2.0.ebuild b/sys-apps/bleachbit/bleachbit-4.2.0.ebuild
deleted file mode 100644
index 032e1162af59..000000000000
--- a/sys-apps/bleachbit/bleachbit-4.2.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite(+)"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit desktop distutils-r1 virtualx
-
-DESCRIPTION="Clean junk to free disk space and to maintain privacy"
-HOMEPAGE="https://www.bleachbit.org"
-SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
-"
-BDEPEND="
- sys-devel/gettext
- test? (
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]')
- )
-"
-
-distutils_enable_tests unittest
-
-# tests fail under FEATURES=usersandbox
-RESTRICT="test"
-
-python_prepare_all() {
- if use test; then
- # avoid tests requiring internet access
- rm tests/Test{Chaff,Update}.py || die
-
- # fails due to non-existent $HOME/.profile
- rm tests/TestInit.py || die
-
- # these fail on upstream Travis CI as well as on Gentoo
- sed -e "s/test_notify(self)/_&/" \
- -i tests/TestGUI.py || die
-
- sed -e "s/test_get_proc_swaps(self)/_&/" \
- -i tests/TestMemory.py || die
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- emake -C po local
-}
-
-python_test() {
- virtx emake tests
-}
-
-python_install() {
- distutils-r1_python_install
- python_newscript ${PN}.py ${PN}
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- emake -C po DESTDIR="${D}" install
-
- insinto /usr/share/bleachbit/cleaners
- doins cleaners/*.xml
-
- insinto /usr/share/bleachbit
- doins data/app-menu.ui
-
- doicon ${PN}.png
- domenu org.${PN}.BleachBit.desktop
-}
diff --git a/sys-apps/bleachbit/bleachbit-4.4.2.ebuild b/sys-apps/bleachbit/bleachbit-4.4.2.ebuild
index 72fbae3d20f0..3e64868c96db 100644
--- a/sys-apps/bleachbit/bleachbit-4.4.2.ebuild
+++ b/sys-apps/bleachbit/bleachbit-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index fc0aa681a2cb..00d8151c83e1 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,8 +1,6 @@
AUX bubblewrap-0.6.1-clang-printf.patch 849 BLAKE2B 6bbe5259c1e6e80ca8547dda8df92ebc63a9807a4bafcbce02601afe1e625661a7f2f95222be72853e53d57c6e7704084641acf4644731a04fd791753cd4de6a SHA512 8c2a26a5a0814b8d1d69aa0d0790c99bde2b170dc72751b6edf6515b6457a5b7b9fa25e7f5d6fa35340f094ee125eaeec2ea0ae5273ed0d267cedc9623c17023
-DIST bubblewrap-0.5.0.tar.xz 137796 BLAKE2B 36aef94335d61ae55076a0a94cd6f2c335a87f8df9900c0c603c7ee870cf84c617a0c2ad99a5979cc1dd22740d652155fa6049e717eb210c9a83afe516daa107 SHA512 b1f5bde9562bf3176c51fdc22304b901e00e1de5189d9b5479aed7b651b84bed5539fc5bb3b1db58a05da4a57d69c9f41c40e15aa5a575746630e015674a02b7
DIST bubblewrap-0.6.1.tar.xz 145500 BLAKE2B 8f8f69c5314843be1ac8c52d462ce2b17fc88760274b71837793a3e8dbf87623b80b7ae094131cee896644b53f4761388638d21b1575d1887eb755880bb05845 SHA512 68e07812ff5e01de2b7a0ce66e8386ca3662fd071d4e9b4c4afa611c1589c0ed116e0ebb4c03eae3f707f908d86945e157f8b26ff872c2814889dde92df9c60b
DIST bubblewrap-0.6.2.tar.xz 146312 BLAKE2B bf02e9095cd1e80b84e0439d14ce57fc9bb08f9f0d3596a19eb34a55bd03b9d371368eda75f2b2106d47db29d1c2d9845fe2a12f5d0c554bbb532c9e0e53d368 SHA512 235da019cb370ea6d9328352acb38e6ff368f02f71db1ae85f2dd37655757975bd5b57bbe15f7b419b53a26b8ec3edd81b55893b420d5f42d6a9dab3471d0096
-EBUILD bubblewrap-0.5.0.ebuild 1062 BLAKE2B 9ba535294ccb822020fbf22e435ca43cc5634e3da93e7075d243a6cc5d9635d4a153a45bddfb222a43b225cc2d1f8371882e5fb69002a0155836ded53122b87f SHA512 80325583f448ead83579c1c76daa25532066c6596ca0b3b75636e30323093aa751fe12e682c440c71d0521ef68a6ed0365a9123b0bc0b721eb59cff43c04f550
-EBUILD bubblewrap-0.6.1.ebuild 1221 BLAKE2B 5e8c71cb6940903495fab06e9aaf0695bac8d90a2d6faf502f1579fe826c9b1f6fa1bf713fc4889e3adcff5867ec3b8f50fea23a02dbc8c30f92e1736e14ae70 SHA512 fb0ce3dc2d2f2f6f659f4c2daf337bd052de4dfa3885063783da97b985a17bf3b9e024b72c207fc2cba6f9b996bd5a5d7a51995c581a7d2f865e4843a6615400
-EBUILD bubblewrap-0.6.2.ebuild 1158 BLAKE2B a9be2f08496b1260d304dac11fb2a066ec7dc6cddaf8b3f4383c6794440e9c5a4b6b3e0c3b6e0e5f3cc4f73e8d2223dfdaca2002b03efc2cdbde37f25510afbf SHA512 30576d630d9b62e0a19590721bbdf3c84696a59bedd571e15da7121dd8371ebbd06c308c0687cb0ef00b3b0959aa62983c68f61599ad3c588421834c9ea54d2c
+EBUILD bubblewrap-0.6.1.ebuild 1215 BLAKE2B cf5306b6e614651fbd4e9845b4ff1dd894878e9542c09b3b9e1ddc7c857eaa799e7b83c2bb77e8a1ee6c6d1538f74890112b59f988621fa79bb2e311329c4ca7 SHA512 571ea97c9b7a97645ba364aa22c38a794a0a4ecc79b95adfe9dcfdcd646b03c0183d539246bd20210fc36d4ec1113f92f0336aaeb064de15ac39146888ecc2b8
+EBUILD bubblewrap-0.6.2.ebuild 1165 BLAKE2B 17f32d614d714566ef84a67c8dab74c32ae93ef741d7c4be9315bc906f4530e87c9f75fbde89a34cd5a6fc9f24ee2aa4dde2a9200f829a73229fc0d2eda00e27 SHA512 072b5c5ddca147b3e5e30e865d5590762e9e53f67fd8bfc73757a797685307e32c76791b4fe197d042a7f8c1e7f570c87ecf2d341d90de7e3ce9330448992775
MISC metadata.xml 453 BLAKE2B 69f1ca03c4b84f4adc2db8bbed8bf57852719c136778747e2679517afe63b1a0621ab486121b71d78c8ae235c2cd7e3077e85ed8d3ad51cc16f1838eb94bd448 SHA512 486775a479174ad72dbcd7f6a89c8001af1a8a4c5b73620153fed4da28b15fb1c481003ffd96ef68d2b49569ed0c1a9d445bc03a9901056cd29b77b3cf13a1ef
diff --git a/sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild b/sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild
deleted file mode 100644
index 6f58a64f538b..000000000000
--- a/sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info
-
-DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
-HOMEPAGE="https://github.com/containers/bubblewrap/"
-SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-IUSE="selinux +suid"
-
-RDEPEND="
- sys-libs/libseccomp
- sys-libs/libcap
- selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-text/docbook-xml-dtd:4.3
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
-"
-
-# tests require root priviledge
-RESTRICT="test"
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable selinux) \
- "--enable-man" \
- "--with-bash-completion-dir=$(get_bashcompdir)" \
- "--with-priv-mode=$(usex suid setuid none)"
-}
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
index 388a422db4d4..edb084d8d17a 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
IUSE="selinux +suid"
RDEPEND="
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
index a7941bb7f15f..1a94bd7b8c24 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="selinux +suid"
RDEPEND="
diff --git a/sys-apps/ccs-tools/Manifest b/sys-apps/ccs-tools/Manifest
index 4ccf4be6de25..afc741882999 100644
--- a/sys-apps/ccs-tools/Manifest
+++ b/sys-apps/ccs-tools/Manifest
@@ -3,4 +3,4 @@ AUX ccs-tools-1.8.3_p20130214-ncurses-underlinking.patch 3747 BLAKE2B f93a7a5bf1
AUX ccs-tools-1.8.3_p20130214-warnings.patch 814 BLAKE2B 10a9966f726a47058388773500bc06bc6cebbdcf90eaaca5ecf8b2c1159618843645e55663892a5897c6741794b49cacf823a1fcee5e0e67e9a5c7e27ec3b892 SHA512 947caa5ce7f2c80e7e0b40042b09568c4fed731b530cf70c1fa24fa0f1a382dd41443f3db82a6aa6444c0ebcd25fd7de657c0f1990d69579e4645f3efa561e10
DIST ccs-tools-1.8.3-20130214.tar.gz 227657 BLAKE2B 318e3899b85ee322b4391816d642ae855eb7cb03c345725c95e7e01a8e6acb54db900ccdd2f85b6d4ecab5ef40768e80b559979d7b37bf42679a520379d2b56c SHA512 256adf873dd99b811f5cf55e6b74e1ccdc2e54a2399724b694f22825c4d5e3167e7768bddc4952363ef835ec2b8405d5704572a9b9e214f3102bf594374325ba
EBUILD ccs-tools-1.8.3_p20130214.ebuild 1678 BLAKE2B fdf48df324b9bf0813637e5d5f24e056698c235c0d12d961d5c72616ef2a957bef8d9e19b5c68fbeea4a9b415d7305897caf93cc4cc34de97f509cc20a228d55 SHA512 6546af65eb2d1923100498745bb30b4f13f6f1f88c86b5f8678e9b9f12fad0f48191476b12756fad94ee7627f37336cbb0cee92c49915e1c79a6f1e8922a5d87
-MISC metadata.xml 247 BLAKE2B 094fdb53a7aea9a340d96e5a8142e4e414ff80e2871ba3daa8f5f38ef9783a781194d4d55e88a291dd158f8ce1871615007d8b3f909b2041c9328a69659986c4 SHA512 8d046edfd3967c4edc91d357db3a64c9a762c2ee2ea7811d4c9e4049c2ca5eca7a0e7031339c70650b124f65154e98e234eac9749f9d70f7ceb825ecbadadbca
+MISC metadata.xml 237 BLAKE2B 25a6dea71492501ab12adda6b39107acb507991144ce61a93ca882ea036af7eaa36bb9217c3323a1f2f5f3cbf7c6038ae9784f123f9094dd7f9f996af60fe2c8 SHA512 11c49187d3818253ab86ce6530dd04fb61ada9bd99c092451a959440f764ab6b0478507c54f2d7c76006fdd978aa705b72f77e93ad76bf35987c47fea0326374
diff --git a/sys-apps/ccs-tools/metadata.xml b/sys-apps/ccs-tools/metadata.xml
index 6bccea78acf3..7923bc9807dd 100644
--- a/sys-apps/ccs-tools/metadata.xml
+++ b/sys-apps/ccs-tools/metadata.xml
@@ -3,6 +3,6 @@
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
- <remote-id type="sourceforge-jp">tomoyo</remote-id>
+ <remote-id type="osdn">tomoyo</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 9f9ac398937c..a37c34cb9336 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,6 @@
DIST checkpolicy-3.3.tar.gz 69286 BLAKE2B f22cb1b0dae5a89c0abb500c2f091beda7960493bd0dc3b9cb5bc8d2d08d507870e5db46f53ad87d0ddea5e3bbdb6c721a5c5e6824b37f554049000392af6a6d SHA512 40e7ccd804aa19f229eb76bdaeb79c87ed19004ac7b91674ecfb92d543573dc26f9d456ea25ed1e0ef8e1a69538e41c68b386a0743023f3ea83aa4350fc3ce30
-DIST checkpolicy-3.4-rc1.tar.gz 69829 BLAKE2B 7d217c79b689b8d08a4d16b174ac01bbee48ced7cc0920792a7263f3143f77838ba9f75ce7a3919a7eaa5818ac7ebdd1890a5fdc050680e45341bfe06dec634b SHA512 9aac4bd862f6dcb654cdbc786e0f89f8eccf2f93e6368b3d458a4a15210a558552ffeb64be9daf57bf3309bf74661a4eb6a5a336e64357f6e99bf3b7946d9b45
+DIST checkpolicy-3.4.tar.gz 69870 BLAKE2B 891033b1d9d50a3738bb779d014d2f04d6cc5450c6f84ed43246c95b0c808f347d65c0e51c7254041e13b1c555a7e1de5092abb4fc12fabb109be7ddaa090829 SHA512 e7f7a4e987af473fd7cda0e47539061a8cb2e65a6b930f4736c538eb319129b260a3f03d2f50863e73a275ee3d58c441c33f95c80ea2bff6157e37226be54b92
EBUILD checkpolicy-3.3.ebuild 1017 BLAKE2B 0e0e91e52e8d29d930d79dd06315d5a541084fccf921fb0f4038a298d699584a21e394e8a02e4e557b9e2dd6292a0ddd854138e8e7bf2525c0563f2a64464a6a SHA512 d020aa3670ff300a88b881d03882fac22b8c52209c751beac90323ff729c90f48ee063476f68048f1ebd7ddf75d1a31017e89321fe615877f0ec6f61e48301f2
-EBUILD checkpolicy-3.4_rc1.ebuild 1093 BLAKE2B d8f9c5f8d4441478ba78fcfe77661757a48a0f5f75a155a7d14a281f084afcb49065d043c185d333a49b12aeb365da118f5686a97e66c360e27e8ce47e613bac SHA512 163991ca5b78ff9a26523cbad0f16584bfd40901f8b0c1f6bc44146be23f42caf5cf5dad854ffb78d7f2534279bc8a6f85a057848a2eb5fc9924c3b641cb860b
+EBUILD checkpolicy-3.4.ebuild 1093 BLAKE2B d8f9c5f8d4441478ba78fcfe77661757a48a0f5f75a155a7d14a281f084afcb49065d043c185d333a49b12aeb365da118f5686a97e66c360e27e8ce47e613bac SHA512 163991ca5b78ff9a26523cbad0f16584bfd40901f8b0c1f6bc44146be23f42caf5cf5dad854ffb78d7f2534279bc8a6f85a057848a2eb5fc9924c3b641cb860b
EBUILD checkpolicy-9999.ebuild 1093 BLAKE2B d8f9c5f8d4441478ba78fcfe77661757a48a0f5f75a155a7d14a281f084afcb49065d043c185d333a49b12aeb365da118f5686a97e66c360e27e8ce47e613bac SHA512 163991ca5b78ff9a26523cbad0f16584bfd40901f8b0c1f6bc44146be23f42caf5cf5dad854ffb78d7f2534279bc8a6f85a057848a2eb5fc9924c3b641cb860b
MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sys-apps/checkpolicy/checkpolicy-3.4.ebuild b/sys-apps/checkpolicy/checkpolicy-3.4.ebuild
new file mode 100644
index 000000000000..b699f09c01de
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-3.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://userspace.selinuxproject.org"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+ S="${WORKDIR}/${P}/${PN}"
+else
+ SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+BDEPEND="sys-devel/flex
+ sys-devel/bison"
+
+RDEPEND=">=sys-libs/libsepol-${PV}"
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ YACC="bison -y" \
+ LIBDIR="\$(PREFIX)/$(get_libdir)"
+}
+
+src_install() {
+ default
+
+ if use debug; then
+ dobin "${S}/test/dismod"
+ dobin "${S}/test/dispol"
+ fi
+}
+
+pkg_postinst() {
+ if ! tc-is-cross-compiler; then
+ einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+ fi
+}
diff --git a/sys-apps/checkpolicy/checkpolicy-3.4_rc1.ebuild b/sys-apps/checkpolicy/checkpolicy-3.4_rc1.ebuild
deleted file mode 100644
index b699f09c01de..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-3.4_rc1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="SELinux policy compiler"
-HOMEPAGE="http://userspace.selinuxproject.org"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
- S="${WORKDIR}/${P}/${PN}"
-else
- SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-
-DEPEND=">=sys-libs/libsepol-${PV}"
-BDEPEND="sys-devel/flex
- sys-devel/bison"
-
-RDEPEND=">=sys-libs/libsepol-${PV}"
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- YACC="bison -y" \
- LIBDIR="\$(PREFIX)/$(get_libdir)"
-}
-
-src_install() {
- default
-
- if use debug; then
- dobin "${S}/test/dismod"
- dobin "${S}/test/dispol"
- fi
-}
-
-pkg_postinst() {
- if ! tc-is-cross-compiler; then
- einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
- fi
-}
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 0762dc01f8f6..df7167b96a52 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,4 +1,7 @@
AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
+AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
DIST cpuid-20220224.src.tar.gz 130706 BLAKE2B 78e0d8296ffafa6eb5a668561bb5c1834c8cffd020f0c052438381f72cddbfe8e85c3e4d662c6aff5224a0b147cd5e20cbce2240f791f2c857c4f584c87b4359 SHA512 7cf41d2429d442b4dfd5d369e394c11916352e16fc56852ea4af71945192903482bc45c38367ff5ae3f8d386ffc65cc61a9b0bec4594589a057557daf54d8562
+DIST cpuid-20220620.src.tar.gz 134487 BLAKE2B 37beeeef5bbeed47d762f093a568e18ac06b32b4c8c4d763656c5310c78b949c60aaf4e874b15485af15be1e31c389692a0ab277a95a0dcb0b66a7dbece50a52 SHA512 e06db43fb12efa1d112267993754965b8a2b07c914766a46a0fe6fdcf023606cfb132eac575726ad9ed7d0e6fc53d728a6d3d3d7abf2f484f002825c791da7b9
EBUILD cpuid-20220224.ebuild 600 BLAKE2B 9aebdae2673da4c0d88f9178cac0366684a2ace93004c51d1868a48d0dd8c897acb4670a212df69a48b79de99d4536cbf6e488078573fe9a493a5af511e75a3f SHA512 1dde5b326b3f04775419cd24b970d0019baedd82ce2b2afa1a94afd52280ccb4233ecaf4b28a60f0810df66a113c63b1c7da08c324f583a00315c6eed4f7d9ea
+EBUILD cpuid-20220620.ebuild 602 BLAKE2B 0b44750e78eaccaa51fef6961672ee30daffe9d77ec413201a4779b94ecce53fa10539907cdd3d79d1f6dcdc5a3e542c8cfc0a10deaf6fac01d48b9bbffdf089 SHA512 7abdb0e2514f001cae3c99bd2f0e128a2d17e7ee2d38cbeb7d0043635b02747415ff3c3b3ac86fbd2313d2dc6351e1c0a0094c048fa4e4e0146e3fa5b0290d6d
MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20220620.ebuild b/sys-apps/cpuid/cpuid-20220620.ebuild
new file mode 100644
index 000000000000..0f77190b474c
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20220620.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
+HOMEPAGE="http://www.etallen.com/cpuid.html"
+SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BDEPEND="
+ app-arch/gzip
+ dev-lang/perl
+"
+
+DOCS=( "ChangeLog" "FUTURE" )
+
+PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" )
+
+src_prepare() {
+ default
+
+ tc-export CC
+}
+
+src_install() {
+ emake BUILDROOT="${ED}" install
+
+ einstalldocs
+}
diff --git a/sys-apps/cpuid/files/cpuid-20220620-makefile.patch b/sys-apps/cpuid/files/cpuid-20220620-makefile.patch
new file mode 100644
index 000000000000..301ba988f7c1
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20220620-makefile.patch
@@ -0,0 +1,37 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,11 @@
+-CFLAGS+=-g
++CFLAGS+=
+ CPPFLAGS?=
+ LDFLAGS?=
+ ifneq (,$(findstring arch=i386,$(CFLAGS)))
+ CISA=-m32
+ endif
+ CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -W -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wimplicit-fallthrough -Wunused-parameter -Wundef -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
+-INSTALL_STRIP=-s
++INSTALL_STRIP=
+
+ PACKAGE=cpuid
+ VERSION=20220620
+@@ -40,7 +40,7 @@
+
+ BUILDROOT=$(DESTDIR)
+
+-default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
++default: $(PROG) cpuinfo2cpuid
+
+ $(PROG): cpuid.c Makefile
+ $(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c
+@@ -56,9 +56,9 @@
+
+ install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
+ install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
+- install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
++ install -D -m 444 $(PROG).man $(BUILDROOT)/usr/share/man/man1/$(PROG).1
+ install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid
+- install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
++ install -D -m 444 cpuinfo2cpuid.man $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1
+
+ clean:
+ rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
diff --git a/sys-apps/daisydog/Manifest b/sys-apps/daisydog/Manifest
index 841b1bc340e3..c108d50674fc 100644
--- a/sys-apps/daisydog/Manifest
+++ b/sys-apps/daisydog/Manifest
@@ -1,5 +1,7 @@
AUX daisydog.conf.d 115 BLAKE2B 55fa6089b54a2f5b4b56a5957020d6bab3dea492551bc84170d1cedbb17cba7e8063de08bee7d18cfa39388097073193b824a68c2b8e9f51c5d52b12c84074f8 SHA512 81d9f238f4240d452e6316e0a94c489fc88eb3c8fe189958292a02dd0ce669bf957e614cd2864b7ccada8a174c94c6ee1cda7216e4fe96582a5cc266657710ea
AUX daisydog.init.d 356 BLAKE2B 0b7c59435e39e17f1afe3678f84b25ff65276ebf93664d689f38a746c5c5b2945fa86e9f0d104a5b7577f7939214e4f4f15b04470af0c843468f7a732fcb082c SHA512 1ad3cdf515777e5ba8eedc40a82177ca7cfeaecb0ac82fe5d5757c81c298e43a8fcfc5f46f6d8d31c83534793d7acf798d8b16ce8d7a6bd2868820cebf898feb
+AUX daisydog.init.d-r1 328 BLAKE2B ffaa2733df070d7c52ce64e0bdb084ec7ec3b25679e7eeb85aa9b6d1c3a7c6dda5ce8f41469a20f2ca25c76588ffab8811b9dd705f93238c11a0b218e1f647f6 SHA512 7612f31d8c83fd3b48e800576f6a16f06bb67574d294808f003980ececd565bf8bea6d2d3ce6f55593c0fa1c5ffc901ff3fcf59778115804e708324463d00178
DIST daisydog-3182aa85c087446e4358370549adc45db21ec124.tar.gz 10395 BLAKE2B e172c8cf9172e69b3c88586a6a96ec69573500101bfef981f2c2090aaf9def8f9cbafa991ef68c1e03c1c7d607f0534f92bad0b06d944f85859223b3f62ff926 SHA512 0a7312a3d9459487da8d20a80568187f51d4ae786939afbf38b8b89747831b2f7e0e32a3414b5d60863e33bcdebad9e457ff9a8f75143a7b60bf68fc9de17cd5
+EBUILD daisydog-2014.05.30-r1.ebuild 890 BLAKE2B cc637758901fbff60eea3c61d199ad84a248a8a9dc301c88239fbb689b62787e6498685e323add23809690264fee0ca043cafa3ec5feecf7a6b3a5d0e840ca38 SHA512 8bf018d63ffe4f3697e843aa3321be1c9c63180a821c967db8d274a85af389c2a8dae4fe2d5362fbfdd6f3ed5452a03da1d2c1d62f98e23c685e0eeb7993308f
EBUILD daisydog-2014.05.30.ebuild 880 BLAKE2B c9fbccaa8f7d1769019e9dd12de3f2c4d94d7a56d790667b4fb44522c4b4c228696cfd5378fa62d9f657caa5412f6410cac94f383b7e377fba6879cb10e297f2 SHA512 00e7357d2f3e0e19b3c39cd77fbb81c696423617ee6a8f85374c5e513c45449f64f34cc8bba48dd3308f2a3f918884a0057812cedd6ddfa5c838fb219c5241cc
MISC metadata.xml 248 BLAKE2B 2545c58c45b8fd57a236bab059e0bd3da47a3e0d3881d141a9b2dc2e275a2d8f0663d83366b45103b48fd257d62a4a2314a8dd6b79113f8b86c91a90524918c5 SHA512 1397e06cb2ad5941988872f37df6f54100aaa06bfc7ef30ba394f95191ddaa1e9f2180d8eb856eb10f9646d9cbc4a6f020805470633c492519e66e3de788439a
diff --git a/sys-apps/daisydog/daisydog-2014.05.30-r1.ebuild b/sys-apps/daisydog/daisydog-2014.05.30-r1.ebuild
new file mode 100644
index 000000000000..880303643aee
--- /dev/null
+++ b/sys-apps/daisydog/daisydog-2014.05.30-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs flag-o-matic
+
+GIT_SHA1="3182aa85c087446e4358370549adc45db21ec124"
+MY_P="${PN}-${GIT_SHA1}"
+
+DESCRIPTION="A very simple /dev/watchdog daemon"
+HOMEPAGE="https://chromium.googlesource.com/chromiumos/third_party/daisydog/+/master"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+ https://chromium.googlesource.com/chromiumos/third_party/daisydog/+archive/${GIT_SHA1}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static"
+
+src_configure() {
+ tc-export CC
+ use static && append-ldflags -static
+}
+
+src_install() {
+ dobin daisydog
+ dodoc README.chromiumos
+
+ newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+ newinitd "${FILESDIR}"/${PN}.init.d-r1 ${PN}
+}
diff --git a/sys-apps/daisydog/files/daisydog.init.d-r1 b/sys-apps/daisydog/files/daisydog.init.d-r1
new file mode 100644
index 000000000000..9d9efdd42772
--- /dev/null
+++ b/sys-apps/daisydog/files/daisydog.init.d-r1
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/daisydog"
+command_args="${WATCHDOG_OPTS}"
+description="watchdog daemon to pet /dev/watchdog devices"
+command_background="yes"
+pidfile="/run/daisydog.pid"
+
+depend() {
+ provide watchdog
+}
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index e6dbecad5690..3bbec643f4cb 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,4 +1,3 @@
-AUX dbus-broker-30-user-free-assertion.patch 2310 BLAKE2B 593d949c95f70ba97e1e3a7b1d809a0c27f7036d424a54f622b7a0778f41a8651e152ff91d5c93f294d02d829ef7694c5e0ccadb81ac14a9f9234ed87e935811 SHA512 f2a4da8d558c422d2b6f62a9802af233513305625d8d9d1d5902b473da3017dbe9827761a47d7f32f3d26c35f1e785d9eef5ef05226a7ffc2b2991bc0f1eb0e9
DIST c-dvar-c8ea9712a94186512c22c32f32c421d6a2db6feb.tar.gz 25212 BLAKE2B 37f02df4f0a4c7372826cd9db37de883cf40027b12f72f0d43cf08f08682d90e6c7e8c3756f90a9e6184713c98e331ad2b2c9cd3373a148b05e2a3a2305db413 SHA512 c134892b43a1b572c45f0f24d7c9c7e70b1326c8bc896995b491d86271a000e83707e5d5eeff631b66be31f3980df7146cd18c385263a3a8bd07f30840cf829c
DIST c-ini-204410a08d3a6c8221f6f0baf0355ce5af0232ed.tar.gz 13952 BLAKE2B 42c34e4ebe17d4c0904c395c72e56b0587c5f6b2cdf422cb800678844cf8516f9645718a04e9a10f6e747d1f56b2f1e563d1fa07db078e745761ae1e40ad395a SHA512 72eeaecbe0b9434b48d2ca9674dd1e722e612a730fd07ef27babb346a10ed7311b11c9d85f2aaf0cd84ddca7f926a78d76d066f453289bcbe849c4cacf72ec58
DIST c-list-a0970f12f1f406a5578a5dedf3580cd682e55812.tar.gz 10124 BLAKE2B adb0face335aaa8206e597e404dcfea2b9d22035d4297442473918878ff9928ff5d614b20cb96de8a50c1418da83da5a49837c0677fe2a5f3db4e78cf3f2bfdb SHA512 51958b4c35acd84da89e694fc58a045b28d265f77043d302fe98f3507432363d20bfa611948fad37d0e5feb36b6232f742cde80e6243bafa3cd976c8b11cfc4e
@@ -7,8 +6,8 @@ DIST c-shquote-83ccc2893385fcca1424b188f0f6c45a62f2b38d.tar.gz 10622 BLAKE2B 1c7
DIST c-stdaux-8652c488b8f1c29629a5179d4551d0a691ae5901.tar.gz 13075 BLAKE2B ef08451574ea695151cbfdad2060324423c8abcf46ac8a86b3216b85017c9b4dd8399d0561cb4f2c731e9eb2883481db59292769560cbcbfc3e96823ceb70e9a SHA512 bb669b659955ea62734f401c9745059349b23e6ddbca56e72437929b9527647ff7ac6bba4bb06506e4d8d35f3a1e7c4eacd2d5b1e7cb21098faa144c932f2bb0
DIST c-utf8-0837214a9780b7d771a3b3ce9a49196ac0a9d52f.tar.gz 9340 BLAKE2B 4bfa39c39aa8db8b7d797d78081b5f3104c659e2ceefef65aa2d3c03ffb5889d772cb78328473e3557c943b2487b7bcb7b68d7dc7f2b95940b0448b3479f1b23 SHA512 2df368af5023fac6c7f2e018c0cbfd73225bf1c4e0d0387931352909323175652bcd3739e9e6b76a099aea5d3f0290198aa70c69ecc5e9ef22df214f8c75da79
DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
-DIST dbus-broker-30.tar.xz 238688 BLAKE2B 716bdeac726e0168e09a5893f1906888c0dc63e4c5f377f2d5ba100f1a07da17bb0379053ac079e7c55e7af09c3d382368dd317df52e04eb0fe96af03aba7441 SHA512 8b7f614e18d15baa558de2c77fc65526011e75f9592d06ddb3cafa211ec9a1c45aa42a0e32122cb16bdfce8bc34407241080f37891fe5ccb6c4577f1cd4bc66c
+DIST dbus-broker-31.tar.xz 239520 BLAKE2B ba34308de7c598e72ac3874894fb90ebc6970840eb2fc193a2b3294033759b39d7d712695ddbc88c3b947842b0131e0a068ffe3cef616ce431d9a8c021f30593 SHA512 22fd53cff84e48ae1c11303b5340e16dc9b7124c9e562174c1f0af465c55d69bb8b2768063de281f6f791442126a29ab864ad6b8acf110247a500f6425eae5d9
EBUILD dbus-broker-29.ebuild 1847 BLAKE2B 8d6fb46de8ff8d95c3ea0ec5e08ac4958cff7862d2db7db767d4e722fc5c3f736607b01dfdbb1f567701a38f9d20b33a8fd44684967bce8bac57fc5d63c9dc89 SHA512 779128c4987833c4773bf37d5c0d3716c2cd4e2d7c3933883b87d198155b29145485bba2ebc21dcd3fb25562613e6b577e2001a15b8c3b84711395e2b4bc26c1
-EBUILD dbus-broker-30.ebuild 968 BLAKE2B 7665df74eb518cf4463af1a595da22127a4c02630b189341c903bf819b690938e5208758ecc8c10ccc65dcc47a87a17228d4b87f73c604b9b57b572ffbeaddf0 SHA512 973d7eb03e9c77712e9da9381f8afa023ebfc13830abe42a21f90144c03f4d309f43f62b82418143d89038701759283bc289213a66b922063d0445658cdfcf89
-EBUILD dbus-broker-9999.ebuild 1067 BLAKE2B d11477ac58576aca16f896134433666e20fa3d7f53324c9fba4e6f700ce5b9046324d72eb38e500807c36ac36e72ffbe8553eaeba18d80914c18e2f70f302699 SHA512 25181a668d2cc8114041dd1fdbfef5d17eff13c7f0e212b47b25dcedf4f26cf67dcc2a630c272698cf9ca203967105ca8142ed47a0c07136c45cf001043054b6
+EBUILD dbus-broker-31.ebuild 1142 BLAKE2B 8ad73709c37e5c7e6aa134cdafb5f9226114af6378fb90c32d2f8e509b2529377cbb3f51d3e49ddaef9bca544f5b1a368495059688d6c86a7d55d50b18f89f54 SHA512 07fdd1101c415cfbc43d9aa1ed51a9ff72db52ef1f5e8044d43af922f1d82e6c6c48c2b1eddbf6db85ae8266a25cdd4c897755d7711ab4e5ef7b9be16f511c5f
+EBUILD dbus-broker-9999.ebuild 1145 BLAKE2B 1921b4cd7bda537fecc3336c39e21378bf73ef2fa3820774bfa49ee9ca0a5a3895f2a538f00ef8a3f7c7ce35e00663887970a583443f69463fdd575896c0f3b7 SHA512 cfd7c4ebc82b1e70d56a9f1138c56115688bfe3e8d19d48f3089fb6c829037629d9b7f891a19554b1f5e5e541dd9f576257bbb7443ddb98a0496a7c29d3a19a9
MISC metadata.xml 328 BLAKE2B 8d8eea6a3d5e3309106ec3e6f248c4b5cad557ccd5095794bd153cd270c5f43de508363646afce491d5e6cc3bff1dca1ca024c2e87e656401432ac2d833cca90 SHA512 971b4214d0a9f9a68ca12a309096b7345014d2e0f57e85e6e10ff0a09b533d5cafe153fa8082ac01609e3417a31afc319cb285a822194c9c672a57ce316340c4
diff --git a/sys-apps/dbus-broker/dbus-broker-30.ebuild b/sys-apps/dbus-broker/dbus-broker-30.ebuild
deleted file mode 100644
index 6f7873290392..000000000000
--- a/sys-apps/dbus-broker/dbus-broker-30.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2017-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
-DESCRIPTION="Linux D-Bus Message Broker"
-HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="audit doc +launcher selinux"
-
-DEPEND="
- audit? (
- >=sys-process/audit-3.0
- >=sys-libs/libcap-ng-0.6
- )
- launcher? (
- >=dev-libs/expat-2.2
- >=sys-apps/systemd-230:0=
- )
- selinux? ( >=sys-libs/libselinux-3.2 )
-"
-RDEPEND="${DEPEND}
- launcher? ( sys-apps/dbus )"
-BDEPEND="
- doc? ( dev-python/docutils )
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-user-free-assertion.patch )
-
-src_configure() {
- local emesonargs=(
- -Daudit=$(usex audit true false)
- -Ddocs=$(usex doc true false)
- -Dlauncher=$(usex launcher true false)
- -Dselinux=$(usex selinux true false)
- )
- meson_src_configure
-}
diff --git a/sys-apps/dbus-broker/dbus-broker-31.ebuild b/sys-apps/dbus-broker/dbus-broker-31.ebuild
new file mode 100644
index 000000000000..e3ddd690c43e
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-31.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2017-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
+else
+ SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="amd64 arm64 ppc64 ~riscv"
+fi
+
+DESCRIPTION="Linux D-Bus Message Broker"
+HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="audit doc +launcher selinux"
+
+DEPEND="
+ audit? (
+ >=sys-process/audit-3.0
+ >=sys-libs/libcap-ng-0.6
+ )
+ launcher? (
+ >=dev-libs/expat-2.2
+ >=sys-apps/systemd-230:0=
+ )
+ selinux? ( >=sys-libs/libselinux-3.2 )
+"
+RDEPEND="${DEPEND}
+ launcher? ( sys-apps/dbus )"
+BDEPEND="
+ doc? ( dev-python/docutils )
+ virtual/pkgconfig
+"
+
+if [[ ${PV} == 9999 ]]; then
+src_unpack() {
+ git-r3_src_unpack
+ cd "${P}" || die
+ meson subprojects download || die
+}
+fi
+
+src_configure() {
+ local emesonargs=(
+ -Daudit=$(usex audit true false)
+ -Ddocs=$(usex doc true false)
+ -Dlauncher=$(usex launcher true false)
+ -Dselinux=$(usex selinux true false)
+ )
+ meson_src_configure
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index 073a8c8c8388..cf73e0592faf 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -9,6 +9,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
else
+ SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
fi
diff --git a/sys-apps/dbus-broker/files/dbus-broker-30-user-free-assertion.patch b/sys-apps/dbus-broker/files/dbus-broker-30-user-free-assertion.patch
deleted file mode 100644
index 278de1821b87..000000000000
--- a/sys-apps/dbus-broker/files/dbus-broker-30-user-free-assertion.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 608b259e25ef1348b9e4a8e022c35b5c68d3df98 Mon Sep 17 00:00:00 2001
-From: David Rheinsberg <david.rheinsberg@gmail.com>
-Date: Wed, 11 May 2022 08:41:48 +0200
-Subject: [PATCH] util/user: keep reference to user in each usage table
-
-Keep a reference to an owning user in each usage table. We want to allow
-callers to hold charges without holding on to any user references.
-
-Also fix the peer-deinitialization to be ordered correctly and free the
-user references last (in particular, after the charges). This is not
-strictly necessary, but now follows our coding style and would have
-avoided possible failures.
-
-This fixes an assertion failure when disconnecting entire groups of
-peers of the same user, due to the recent fix that actually made
-peer-accounting do something.
-
-Reported-by: Torge Matthies
-Reported-by: Mel34
-Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com>
----
- src/bus/peer.c | 2 +-
- src/util/user.c | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/bus/peer.c b/src/bus/peer.c
-index 18bd1947..69ed0fde 100644
---- a/src/bus/peer.c
-+++ b/src/bus/peer.c
-@@ -358,12 +358,12 @@ Peer *peer_free(Peer *peer) {
- name_owner_deinit(&peer->owned_names);
- policy_snapshot_free(peer->policy);
- connection_deinit(&peer->connection);
-- user_unref(peer->user);
- user_charge_deinit(&peer->charges[2]);
- user_charge_deinit(&peer->charges[1]);
- user_charge_deinit(&peer->charges[0]);
- free(peer->seclabel);
- free(peer->gids);
-+ user_unref(peer->user);
- free(peer);
-
- close(fd);
-diff --git a/src/util/user.c b/src/util/user.c
-index 7856b768..d0edb5e8 100644
---- a/src/util/user.c
-+++ b/src/util/user.c
-@@ -48,7 +48,7 @@ static int user_usage_new(UserUsage **usagep, User *user, uid_t uid) {
- return error_origin(-ENOMEM);
-
- usage->n_refs = REF_INIT;
-- usage->user = user;
-+ usage->user = user_ref(user);
- usage->uid = uid;
- usage->user_node = (CRBNode)C_RBNODE_INIT(usage->user_node);
-
-@@ -64,6 +64,7 @@ static void user_usage_free(_Atomic unsigned long *n_refs, void *userdata) {
- c_assert(!usage->slots[i]);
-
- user_usage_unlink(usage);
-+ user_unref(usage->user);
- free(usage);
- }
-
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 0df627e8290d..834c27bab333 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,4 +1,5 @@
AUX 80-dbus 341 BLAKE2B 20849eb7c526475d3ff96766ac7183608aa51e5c069f07cf282a2b4d884b2a8580aa88cff182d54ef75aaa747848f3dbcc0bd0bd5da124e4a259851878c73b00 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89
+AUX 80-dbus-r1 346 BLAKE2B 96688534aa424e7683603f2ea9afb7a762fadcc62f7af13a6be315e3467c0ea29e628547242c8e1c76c4afbf14134eeaae021ce22e7d287c4add7b7acb2306dc SHA512 a7b1ede42fc1a544568b9d663ca4068fbf9a021c728d03f81b28c7ab66df958dc5f679996d37c1cc24225dd81df445b969d83ad34c4eb6cfadfac6e6a5735084
AUX dbus-1.12.22-check-fd.patch 1055 BLAKE2B a4889677a778fe0698128b2399273adb5373a11927a5610e6a9757237226fa866ce33bb603a89c44b8c2d3e2fccd4131637821ba1bb14782276223d5fa5db337 SHA512 667e76237868c177b9299eb0259dee2a5f820fde15fed0a21823b435e34ad734ec9e850f1a1b5408a6b099a78f77564b2396c38b82d931f3b0b5b93c0e5b8c4e
AUX dbus-1.14.0-oom_score_adj.patch 3882 BLAKE2B 9b5c55d8660c7de77976026b39b76dddbc88ddc3c4810bc6114faf038401faaf162f50f8014d26182a5d5a8b6a6ba44e517a864919152ae96e7b352ab8255df4 SHA512 353beed17bf788396828c1817703bed09f8e1fe48772dce6eb1f3c601859c593c23044e4e61ec503596790a56c64e0b4bdcd2be10e337ef9ad1ec9de0dbe027c
AUX dbus-1.14.0-x-autoconf-fixes.patch 5171 BLAKE2B 6b7453397e467da695b3efd70e53f6a50dad44c44130f973037a4cb4139d62c7adab758a495ddebb97a35d068333417051adb5eb17bae86df31c998137eb6052 SHA512 e74b09c7da445c02fe84148b43ca61b21a95b67edbde4dc9f1916a9a628182097630336010f15f366063dc1432da7b1ae52e73b04185493b48ce28bf79873e54
@@ -8,7 +9,8 @@ AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e973
DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
DIST dbus-1.12.22.tar.gz 2108231 BLAKE2B 40c30ad9e48d8ac6b5f1c67726015eb17cb3501372ef2c8ffcd8ad73e4a2f186b80a7bbba094460d4093d1d0a3f1bbb8d83a27724397a8f5312bb8542237e6b7 SHA512 0a716022f9d693fcaf871b6dfb5f242b49a8dd05d3316ec3e530f5129f1d81a2fa9caec795fa62cfdcba6ed21549fdd2f896f9bf1cc9a96e2a7d04f2c7ec7be6
DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf SHA512 9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f
-EBUILD dbus-1.12.20-r4.ebuild 7533 BLAKE2B 19b9f34046bea0cbef61a641255f56bf98005c96aa61de9212e9e6ddca1957b02a217f8ff28b23b51fee6337b3fa7b48d4aebe707589bf0452ec4f987af8081e SHA512 0369f3de41131f9ea8fa6577a5fc992f62c16f3a995017fe1becf65bdbe6c9676f02a99d11e706ae9afc63dc2202a850543d69fd3bc2cd4d4d9545c73432375b
-EBUILD dbus-1.12.22-r1.ebuild 7658 BLAKE2B cafe8f95f6c8504e7cee03a14f226a0be3d8797f11e8fd8c711af3b8c249a446c99a8bed4815b3473cf150b00f6bf8accce5bca553f2798bf1424ed6431a014d SHA512 581303e1052c776ce50007825e500e69bf16d616ae7e3ea011e247b1e382b4b2211d4ba18ddf50713509cb5b7453cf2d07c7a2d8a76caa4e409125b56d308b79
-EBUILD dbus-1.14.0-r1.ebuild 7882 BLAKE2B 90cb99471a5e1a6e67031b4c5948ada9b58a267755e282c2811304a797cc777f89f12580fe47d987b7381465bd4ef82d8b5a42d1d41e8123e51476b5dd46baba SHA512 664deae60dd1f9117691749cc814a69b8559999a5eac8398f9dcf02e4c529ff0f04d9f66f06b258956969df63d6d516f9e027ede6364430f6c995f86d9538b81
+EBUILD dbus-1.12.20-r5.ebuild 7556 BLAKE2B c84cbaa05ea704e11ce4e4a30d49aab696be711c19ed1420aaabeac5e8032b122b2d5fe31ccdfff3c0348bc1100f4eb248777c92d06d83214910eb759c62d2f3 SHA512 83dae4eafd70d47f560092491ebcc024230e346c77db199346464b5cff91fc58ba08c7c7491c0c1240538cb9b7b8489179fe70e17bcb2d8b797d54e7d0d0fc32
+EBUILD dbus-1.12.22-r2.ebuild 7681 BLAKE2B 126c3b7802a3ae3d1e3f928e33249f731f43bb1ad40f4992e645b727cc35e0836bd382810ef97b9f594a7db13bfa602ea13ed7c8da8c376fb9ebccc6c0ff2f47 SHA512 db95a5f1ddb86ad4657cef1e108b429976517961c374213d9b4fb158d65568bd71c1d4a67b53b6548c4349a8ed67e0ae1d7bed547678a97ef85b4db7f9b7f97c
+EBUILD dbus-1.14.0-r2.ebuild 7905 BLAKE2B 8a68a64871afd716c57be3c8d13c18e9eeab2405b716daa913e9e723d062c2bde528f73ebf2b8e6e545b038a6108e7d08ac0f5f755590991cd399d619c484d5f SHA512 f7189dca552c555bcfe8ea1e42c0f84435a36418bc2d22f803b0d2da79ff9417cd568cce4e3d068eb339de2fbc070af6eefe7b311faa0c6cd4db45327d10f13d
+EBUILD dbus-1.14.0-r4.ebuild 7894 BLAKE2B 6c5058cbf4b736d3954e5abd95bc2bc196b945bb7b26a56ecb4a0b1721d26e7867eaaaea7649b8e15be8ea5559a4c92725807ee5ed1a9610018f71f2091726ec SHA512 738e26fa8afba39605420352f042569b01d6f121a0a19c2d7e732d05b49a5d31d1a3a5ec47f244d8878353ea4d376964981144429013f049cfa87a2e1048ab42
MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.12.20-r4.ebuild b/sys-apps/dbus/dbus-1.12.20-r4.ebuild
deleted file mode 100644
index 7eef2ae2bca3..000000000000
--- a/sys-apps/dbus/dbus-1.12.20-r4.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-TMPFILES_OPTIONAL=1
-
-inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
- acct-user/messagebus
- app-text/xmlto
- app-text/docbook-xml-dtd:4.4
- sys-devel/autoconf-archive
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-COMMON_DEPEND="
- >=dev-libs/expat-2.1.0
- elogind? ( sys-auth/elogind )
- selinux? ( sys-libs/libselinux )
- systemd? ( sys-apps/systemd:0= )
- X? (
- x11-libs/libX11
- x11-libs/libXt
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/expat
- test? (
- ${PYTHON_DEPS}
- >=dev-libs/glib-2.40:2
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-user/messagebus
- selinux? ( sec-policy/selinux-dbus )
- systemd? ( virtual/tmpfiles )
-"
-
-DOC_CONTENTS="
- Some applications require a session bus in addition to the system
- bus. Please see \`man dbus-launch\` for more information.
-"
-
-# out of sources build dir for make check
-TBD="${WORKDIR}/${P}-tests-build"
-
-PATCHES=(
- "${FILESDIR}/${PN}-enable-elogind.patch"
- "${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-
- if use kernel_linux; then
- CONFIG_CHECK="~EPOLL"
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- # Tests were restricted because of this
- sed -i \
- -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
- -e '/"dispatch"/d' \
- bus/test-main.c || die
-
- default
-
- if [[ ${CHOST} == *-solaris* ]]; then
- # fix standards conflict, due to gcc being c99 by default nowadays
- sed -i \
- -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
- configure.ac || die
- fi
-
- # required for bug 263909, cross-compile so don't remove eautoreconf
- eautoreconf
-}
-
-src_configure() {
- local rundir=$(usex kernel_linux /run /var/run)
- sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
- > "${T}"/dbus.initd || die
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local docconf myconf testconf
-
- # so we can get backtraces from apps
- case ${CHOST} in
- *-mingw*)
- # error: unrecognized command line option '-rdynamic' wrt #488036
- ;;
- *)
- append-flags -rdynamic
- ;;
- esac
-
- # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
- # not on an SELinux profile.
- myconf=(
- --localstatedir="${EPREFIX}/var"
- $(use_enable static-libs static)
- $(use_enable debug verbose-mode)
- --disable-asserts
- --disable-checks
- $(use_enable selinux)
- $(use_enable selinux libaudit)
- --disable-apparmor
- $(use_enable kernel_linux inotify)
- --disable-kqueue
- $(use_enable elogind)
- $(use_enable systemd)
- $(use_enable systemd user-session)
- --disable-embedded-tests
- --disable-modular-tests
- $(use_enable debug stats)
- --with-session-socket-dir="${EPREFIX}"/tmp
- --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
- --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- --with-systemduserunitdir="$(systemd_get_userunitdir)"
- --with-dbus-user=messagebus
- $(use_with X x)
- )
-
- if [[ ${CHOST} == *-darwin* ]]; then
- myconf+=(
- --enable-launchd
- --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
- )
- fi
-
- if multilib_is_native_abi; then
- docconf=(
- --enable-xml-docs
- $(use_enable doc doxygen-docs)
- )
- else
- docconf=(
- --disable-xml-docs
- --disable-doxygen-docs
- )
- myconf+=(
- --disable-daemon
- --disable-selinux
- --disable-libaudit
- --disable-elogind
- --disable-systemd
- --without-x
- )
- fi
-
- einfo "Running configure in ${BUILD_DIR}"
- ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
- if multilib_is_native_abi && use test; then
- mkdir "${TBD}" || die
- cd "${TBD}" || die
- testconf=(
- $(use_enable test asserts)
- $(use_enable test checks)
- $(use_enable test embedded-tests)
- $(use_enable test stats)
- $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
- )
- einfo "Running configure in ${TBD}"
- ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
- fi
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- # after the compile, it uses a selinuxfs interface to
- # check if the SELinux policy has the right support
- use selinux && addwrite /selinux/access
-
- einfo "Running make in ${BUILD_DIR}"
- emake
-
- if use test; then
- einfo "Running make in ${TBD}"
- emake -C "${TBD}"
- fi
- else
- emake -C dbus libdbus-1.la
- fi
-}
-
-src_test() {
- DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake DESTDIR="${D}" install-pkgconfigDATA
- emake DESTDIR="${D}" -C dbus \
- install-libLTLIBRARIES install-dbusincludeHEADERS \
- install-nodist_dbusarchincludeHEADERS
- fi
-}
-
-multilib_src_install_all() {
- newinitd "${T}"/dbus.initd dbus
-
- if use X; then
- # dbus X session script (#77504)
- # turns out to only work for GDM (and startx). has been merged into
- # other desktop (kdm and such scripts)
- exeinto /etc/X11/xinit/xinitrc.d
- doexe "${FILESDIR}"/80-dbus
- fi
-
- # needs to exist for dbus sessions to launch
- keepdir /usr/share/dbus-1/services
- keepdir /etc/dbus-1/{session,system}.d
- # machine-id symlink from pkg_postinst()
- keepdir /var/lib/dbus
- # let the init script create the /var/run/dbus directory
- rm -rf "${ED}"/var/run
-
- # https://bugs.gentoo.org/761763
- rm -rf "${ED}"/usr/lib/sysusers.d
-
- dodoc AUTHORS ChangeLog NEWS README doc/TODO
- readme.gentoo_create_doc
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- if use systemd; then
- tmpfiles_process dbus.conf
- fi
-
- # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
- # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
- # dependencies with hardcoded paths (although the known ones got fixed already)
- # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
- dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
- ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
- if [[ ${CHOST} == *-darwin* ]]; then
- local plist="org.freedesktop.dbus-session.plist"
- elog
- elog
- elog "For MacOS/Darwin we now ship launchd support for dbus."
- elog "This enables autolaunch of dbus at session login and makes"
- elog "dbus usable under MacOS/Darwin."
- elog
- elog "The launchd plist file ${plist} has been"
- elog "installed in ${EPREFIX}/Library/LaunchAgents."
- elog "For it to be used, you will have to do all of the following:"
- elog " + cd ~/Library/LaunchAgents"
- elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
- elog " + logout and log back in"
- elog
- elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
- elog "specified and refused to start otherwise, then export the"
- elog "the following to your environment:"
- elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
- fi
-}
diff --git a/sys-apps/dbus/dbus-1.12.20-r5.ebuild b/sys-apps/dbus/dbus-1.12.20-r5.ebuild
new file mode 100644
index 000000000000..a60671c3d11e
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.12.20-r5.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+TMPFILES_OPTIONAL=1
+
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind selinux static-libs systemd test X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+ acct-user/messagebus
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.4
+ sys-devel/autoconf-archive
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+ >=dev-libs/expat-2.1.0
+ elogind? ( sys-auth/elogind )
+ selinux? ( sys-libs/libselinux )
+ systemd? ( sys-apps/systemd:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXt
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/expat
+ test? (
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2.40:2
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-user/messagebus
+ selinux? ( sec-policy/selinux-dbus )
+ systemd? ( virtual/tmpfiles )
+ X? ( sys-apps/which )
+"
+
+DOC_CONTENTS="
+ Some applications require a session bus in addition to the system
+ bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-enable-elogind.patch"
+ "${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+
+ if use kernel_linux; then
+ CONFIG_CHECK="~EPOLL"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Tests were restricted because of this
+ sed -i \
+ -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
+ -e '/"dispatch"/d' \
+ bus/test-main.c || die
+
+ default
+
+ if [[ ${CHOST} == *-solaris* ]]; then
+ # fix standards conflict, due to gcc being c99 by default nowadays
+ sed -i \
+ -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+ configure.ac || die
+ fi
+
+ # required for bug 263909, cross-compile so don't remove eautoreconf
+ eautoreconf
+}
+
+src_configure() {
+ local rundir=$(usex kernel_linux /run /var/run)
+ sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+ > "${T}"/dbus.initd || die
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local docconf myconf testconf
+
+ # so we can get backtraces from apps
+ case ${CHOST} in
+ *-mingw*)
+ # error: unrecognized command line option '-rdynamic' wrt #488036
+ ;;
+ *)
+ append-flags -rdynamic
+ ;;
+ esac
+
+ # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+ # not on an SELinux profile.
+ myconf=(
+ --localstatedir="${EPREFIX}/var"
+ $(use_enable static-libs static)
+ $(use_enable debug verbose-mode)
+ --disable-asserts
+ --disable-checks
+ $(use_enable selinux)
+ $(use_enable selinux libaudit)
+ --disable-apparmor
+ $(use_enable kernel_linux inotify)
+ --disable-kqueue
+ $(use_enable elogind)
+ $(use_enable systemd)
+ $(use_enable systemd user-session)
+ --disable-embedded-tests
+ --disable-modular-tests
+ $(use_enable debug stats)
+ --with-session-socket-dir="${EPREFIX}"/tmp
+ --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
+ --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-systemduserunitdir="$(systemd_get_userunitdir)"
+ --with-dbus-user=messagebus
+ $(use_with X x)
+ )
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ myconf+=(
+ --enable-launchd
+ --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+ )
+ fi
+
+ if multilib_is_native_abi; then
+ docconf=(
+ --enable-xml-docs
+ $(use_enable doc doxygen-docs)
+ )
+ else
+ docconf=(
+ --disable-xml-docs
+ --disable-doxygen-docs
+ )
+ myconf+=(
+ --disable-daemon
+ --disable-selinux
+ --disable-libaudit
+ --disable-elogind
+ --disable-systemd
+ --without-x
+ )
+ fi
+
+ einfo "Running configure in ${BUILD_DIR}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+ if multilib_is_native_abi && use test; then
+ mkdir "${TBD}" || die
+ cd "${TBD}" || die
+ testconf=(
+ $(use_enable test asserts)
+ $(use_enable test checks)
+ $(use_enable test embedded-tests)
+ $(use_enable test stats)
+ $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+ )
+ einfo "Running configure in ${TBD}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ # after the compile, it uses a selinuxfs interface to
+ # check if the SELinux policy has the right support
+ use selinux && addwrite /selinux/access
+
+ einfo "Running make in ${BUILD_DIR}"
+ emake
+
+ if use test; then
+ einfo "Running make in ${TBD}"
+ emake -C "${TBD}"
+ fi
+ else
+ emake -C dbus libdbus-1.la
+ fi
+}
+
+src_test() {
+ DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ emake DESTDIR="${D}" -C dbus \
+ install-libLTLIBRARIES install-dbusincludeHEADERS \
+ install-nodist_dbusarchincludeHEADERS
+ fi
+}
+
+multilib_src_install_all() {
+ newinitd "${T}"/dbus.initd dbus
+
+ if use X; then
+ # dbus X session script (#77504)
+ # turns out to only work for GDM (and startx). has been merged into
+ # other desktop (kdm and such scripts)
+ exeinto /etc/X11/xinit/xinitrc.d
+ doexe "${FILESDIR}"/80-dbus
+ fi
+
+ # needs to exist for dbus sessions to launch
+ keepdir /usr/share/dbus-1/services
+ keepdir /etc/dbus-1/{session,system}.d
+ # machine-id symlink from pkg_postinst()
+ keepdir /var/lib/dbus
+ # let the init script create the /var/run/dbus directory
+ rm -rf "${ED}"/var/run
+
+ # https://bugs.gentoo.org/761763
+ rm -rf "${ED}"/usr/lib/sysusers.d
+
+ dodoc AUTHORS ChangeLog NEWS README doc/TODO
+ readme.gentoo_create_doc
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if use systemd; then
+ tmpfiles_process dbus.conf
+ fi
+
+ # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
+ # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+ # dependencies with hardcoded paths (although the known ones got fixed already)
+ # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ local plist="org.freedesktop.dbus-session.plist"
+ elog
+ elog
+ elog "For MacOS/Darwin we now ship launchd support for dbus."
+ elog "This enables autolaunch of dbus at session login and makes"
+ elog "dbus usable under MacOS/Darwin."
+ elog
+ elog "The launchd plist file ${plist} has been"
+ elog "installed in ${EPREFIX}/Library/LaunchAgents."
+ elog "For it to be used, you will have to do all of the following:"
+ elog " + cd ~/Library/LaunchAgents"
+ elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+ elog " + logout and log back in"
+ elog
+ elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+ elog "specified and refused to start otherwise, then export the"
+ elog "the following to your environment:"
+ elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+ fi
+}
diff --git a/sys-apps/dbus/dbus-1.12.22-r1.ebuild b/sys-apps/dbus/dbus-1.12.22-r1.ebuild
deleted file mode 100644
index 68513fcf1e9d..000000000000
--- a/sys-apps/dbus/dbus-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-TMPFILES_OPTIONAL=1
-
-inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
- acct-user/messagebus
- app-text/xmlto
- app-text/docbook-xml-dtd:4.4
- sys-devel/autoconf-archive
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-COMMON_DEPEND="
- >=dev-libs/expat-2.1.0
- elogind? ( sys-auth/elogind )
- selinux? ( sys-libs/libselinux )
- systemd? ( sys-apps/systemd:0= )
- X? (
- x11-libs/libX11
- x11-libs/libXt
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/expat
- test? (
- ${PYTHON_DEPS}
- >=dev-libs/glib-2.40:2
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-user/messagebus
- selinux? ( sec-policy/selinux-dbus )
- systemd? ( virtual/tmpfiles )
-"
-
-DOC_CONTENTS="
- Some applications require a session bus in addition to the system
- bus. Please see \`man dbus-launch\` for more information.
-"
-
-# out of sources build dir for make check
-TBD="${WORKDIR}/${P}-tests-build"
-
-PATCHES=(
- "${FILESDIR}/dbus-enable-elogind.patch"
- "${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
-
- "${FILESDIR}/dbus-1.12.22-check-fd.patch"
-
- # https://bugs.gentoo.org/836560
- "${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-
- if use kernel_linux; then
- CONFIG_CHECK="~EPOLL"
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- # Tests were restricted because of this
- sed -i \
- -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
- -e '/"dispatch"/d' \
- bus/test-main.c || die
-
- default
-
- if [[ ${CHOST} == *-solaris* ]]; then
- # fix standards conflict, due to gcc being c99 by default nowadays
- sed -i \
- -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
- configure.ac || die
- fi
-
- # required for bug 263909, cross-compile so don't remove eautoreconf
- eautoreconf
-}
-
-src_configure() {
- local rundir=$(usex kernel_linux /run /var/run)
- sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
- > "${T}"/dbus.initd || die
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local docconf myconf testconf
-
- # so we can get backtraces from apps
- case ${CHOST} in
- *-mingw*)
- # error: unrecognized command line option '-rdynamic' wrt #488036
- ;;
- *)
- append-flags -rdynamic
- ;;
- esac
-
- # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
- # not on an SELinux profile.
- myconf=(
- --localstatedir="${EPREFIX}/var"
- $(use_enable static-libs static)
- $(use_enable debug verbose-mode)
- --disable-asserts
- --disable-checks
- $(use_enable selinux)
- $(use_enable selinux libaudit)
- --disable-apparmor
- $(use_enable kernel_linux inotify)
- --disable-kqueue
- $(use_enable elogind)
- $(use_enable systemd)
- $(use_enable systemd user-session)
- --disable-embedded-tests
- --disable-modular-tests
- $(use_enable debug stats)
- --with-session-socket-dir="${EPREFIX}"/tmp
- --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
- --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- --with-systemduserunitdir="$(systemd_get_userunitdir)"
- --with-dbus-user=messagebus
- $(use_with X x)
- )
-
- if [[ ${CHOST} == *-darwin* ]]; then
- myconf+=(
- --enable-launchd
- --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
- )
- fi
-
- if multilib_is_native_abi; then
- docconf=(
- --enable-xml-docs
- $(use_enable doc doxygen-docs)
- )
- else
- docconf=(
- --disable-xml-docs
- --disable-doxygen-docs
- )
- myconf+=(
- --disable-daemon
- --disable-selinux
- --disable-libaudit
- --disable-elogind
- --disable-systemd
- --without-x
- )
- fi
-
- einfo "Running configure in ${BUILD_DIR}"
- ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
- if multilib_is_native_abi && use test; then
- mkdir "${TBD}" || die
- cd "${TBD}" || die
- testconf=(
- $(use_enable test asserts)
- $(use_enable test checks)
- $(use_enable test embedded-tests)
- $(use_enable test stats)
- $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
- )
- einfo "Running configure in ${TBD}"
- ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
- fi
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- # after the compile, it uses a selinuxfs interface to
- # check if the SELinux policy has the right support
- use selinux && addwrite /selinux/access
-
- einfo "Running make in ${BUILD_DIR}"
- emake
-
- if use test; then
- einfo "Running make in ${TBD}"
- emake -C "${TBD}"
- fi
- else
- emake -C dbus libdbus-1.la
- fi
-}
-
-src_test() {
- DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake DESTDIR="${D}" install-pkgconfigDATA
- emake DESTDIR="${D}" -C dbus \
- install-libLTLIBRARIES install-dbusincludeHEADERS \
- install-nodist_dbusarchincludeHEADERS
- fi
-}
-
-multilib_src_install_all() {
- newinitd "${T}"/dbus.initd dbus
-
- if use X; then
- # dbus X session script (#77504)
- # turns out to only work for GDM (and startx). has been merged into
- # other desktop (kdm and such scripts)
- exeinto /etc/X11/xinit/xinitrc.d
- doexe "${FILESDIR}"/80-dbus
- fi
-
- # needs to exist for dbus sessions to launch
- keepdir /usr/share/dbus-1/services
- keepdir /etc/dbus-1/{session,system}.d
- # machine-id symlink from pkg_postinst()
- keepdir /var/lib/dbus
- # let the init script create the /var/run/dbus directory
- rm -rf "${ED}"/var/run
-
- # https://bugs.gentoo.org/761763
- rm -rf "${ED}"/usr/lib/sysusers.d
-
- dodoc AUTHORS ChangeLog NEWS README doc/TODO
- readme.gentoo_create_doc
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- if use systemd; then
- tmpfiles_process dbus.conf
- fi
-
- # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
- # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
- # dependencies with hardcoded paths (although the known ones got fixed already)
- # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
- dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
- ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
- if [[ ${CHOST} == *-darwin* ]]; then
- local plist="org.freedesktop.dbus-session.plist"
- elog
- elog
- elog "For MacOS/Darwin we now ship launchd support for dbus."
- elog "This enables autolaunch of dbus at session login and makes"
- elog "dbus usable under MacOS/Darwin."
- elog
- elog "The launchd plist file ${plist} has been"
- elog "installed in ${EPREFIX}/Library/LaunchAgents."
- elog "For it to be used, you will have to do all of the following:"
- elog " + cd ~/Library/LaunchAgents"
- elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
- elog " + logout and log back in"
- elog
- elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
- elog "specified and refused to start otherwise, then export the"
- elog "the following to your environment:"
- elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
- fi
-}
diff --git a/sys-apps/dbus/dbus-1.12.22-r2.ebuild b/sys-apps/dbus/dbus-1.12.22-r2.ebuild
new file mode 100644
index 000000000000..78249a099180
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.12.22-r2.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+TMPFILES_OPTIONAL=1
+
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind selinux static-libs systemd test X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+ acct-user/messagebus
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.4
+ sys-devel/autoconf-archive
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+ >=dev-libs/expat-2.1.0
+ elogind? ( sys-auth/elogind )
+ selinux? ( sys-libs/libselinux )
+ systemd? ( sys-apps/systemd:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXt
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/expat
+ test? (
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2.40:2
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-user/messagebus
+ selinux? ( sec-policy/selinux-dbus )
+ systemd? ( virtual/tmpfiles )
+ X? ( sys-apps/which )
+"
+
+DOC_CONTENTS="
+ Some applications require a session bus in addition to the system
+ bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+ "${FILESDIR}/dbus-enable-elogind.patch"
+ "${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
+
+ "${FILESDIR}/dbus-1.12.22-check-fd.patch"
+
+ # https://bugs.gentoo.org/836560
+ "${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+
+ if use kernel_linux; then
+ CONFIG_CHECK="~EPOLL"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Tests were restricted because of this
+ sed -i \
+ -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
+ -e '/"dispatch"/d' \
+ bus/test-main.c || die
+
+ default
+
+ if [[ ${CHOST} == *-solaris* ]]; then
+ # fix standards conflict, due to gcc being c99 by default nowadays
+ sed -i \
+ -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+ configure.ac || die
+ fi
+
+ # required for bug 263909, cross-compile so don't remove eautoreconf
+ eautoreconf
+}
+
+src_configure() {
+ local rundir=$(usex kernel_linux /run /var/run)
+ sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+ > "${T}"/dbus.initd || die
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local docconf myconf testconf
+
+ # so we can get backtraces from apps
+ case ${CHOST} in
+ *-mingw*)
+ # error: unrecognized command line option '-rdynamic' wrt #488036
+ ;;
+ *)
+ append-flags -rdynamic
+ ;;
+ esac
+
+ # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+ # not on an SELinux profile.
+ myconf=(
+ --localstatedir="${EPREFIX}/var"
+ $(use_enable static-libs static)
+ $(use_enable debug verbose-mode)
+ --disable-asserts
+ --disable-checks
+ $(use_enable selinux)
+ $(use_enable selinux libaudit)
+ --disable-apparmor
+ $(use_enable kernel_linux inotify)
+ --disable-kqueue
+ $(use_enable elogind)
+ $(use_enable systemd)
+ $(use_enable systemd user-session)
+ --disable-embedded-tests
+ --disable-modular-tests
+ $(use_enable debug stats)
+ --with-session-socket-dir="${EPREFIX}"/tmp
+ --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
+ --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-systemduserunitdir="$(systemd_get_userunitdir)"
+ --with-dbus-user=messagebus
+ $(use_with X x)
+ )
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ myconf+=(
+ --enable-launchd
+ --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+ )
+ fi
+
+ if multilib_is_native_abi; then
+ docconf=(
+ --enable-xml-docs
+ $(use_enable doc doxygen-docs)
+ )
+ else
+ docconf=(
+ --disable-xml-docs
+ --disable-doxygen-docs
+ )
+ myconf+=(
+ --disable-daemon
+ --disable-selinux
+ --disable-libaudit
+ --disable-elogind
+ --disable-systemd
+ --without-x
+ )
+ fi
+
+ einfo "Running configure in ${BUILD_DIR}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+ if multilib_is_native_abi && use test; then
+ mkdir "${TBD}" || die
+ cd "${TBD}" || die
+ testconf=(
+ $(use_enable test asserts)
+ $(use_enable test checks)
+ $(use_enable test embedded-tests)
+ $(use_enable test stats)
+ $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+ )
+ einfo "Running configure in ${TBD}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ # after the compile, it uses a selinuxfs interface to
+ # check if the SELinux policy has the right support
+ use selinux && addwrite /selinux/access
+
+ einfo "Running make in ${BUILD_DIR}"
+ emake
+
+ if use test; then
+ einfo "Running make in ${TBD}"
+ emake -C "${TBD}"
+ fi
+ else
+ emake -C dbus libdbus-1.la
+ fi
+}
+
+src_test() {
+ DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ emake DESTDIR="${D}" -C dbus \
+ install-libLTLIBRARIES install-dbusincludeHEADERS \
+ install-nodist_dbusarchincludeHEADERS
+ fi
+}
+
+multilib_src_install_all() {
+ newinitd "${T}"/dbus.initd dbus
+
+ if use X; then
+ # dbus X session script (#77504)
+ # turns out to only work for GDM (and startx). has been merged into
+ # other desktop (kdm and such scripts)
+ exeinto /etc/X11/xinit/xinitrc.d
+ doexe "${FILESDIR}"/80-dbus
+ fi
+
+ # needs to exist for dbus sessions to launch
+ keepdir /usr/share/dbus-1/services
+ keepdir /etc/dbus-1/{session,system}.d
+ # machine-id symlink from pkg_postinst()
+ keepdir /var/lib/dbus
+ # let the init script create the /var/run/dbus directory
+ rm -rf "${ED}"/var/run
+
+ # https://bugs.gentoo.org/761763
+ rm -rf "${ED}"/usr/lib/sysusers.d
+
+ dodoc AUTHORS ChangeLog NEWS README doc/TODO
+ readme.gentoo_create_doc
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if use systemd; then
+ tmpfiles_process dbus.conf
+ fi
+
+ # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
+ # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+ # dependencies with hardcoded paths (although the known ones got fixed already)
+ # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ local plist="org.freedesktop.dbus-session.plist"
+ elog
+ elog
+ elog "For MacOS/Darwin we now ship launchd support for dbus."
+ elog "This enables autolaunch of dbus at session login and makes"
+ elog "dbus usable under MacOS/Darwin."
+ elog
+ elog "The launchd plist file ${plist} has been"
+ elog "installed in ${EPREFIX}/Library/LaunchAgents."
+ elog "For it to be used, you will have to do all of the following:"
+ elog " + cd ~/Library/LaunchAgents"
+ elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+ elog " + logout and log back in"
+ elog
+ elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+ elog "specified and refused to start otherwise, then export the"
+ elog "the following to your environment:"
+ elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+ fi
+}
diff --git a/sys-apps/dbus/dbus-1.14.0-r1.ebuild b/sys-apps/dbus/dbus-1.14.0-r1.ebuild
deleted file mode 100644
index 075aeffd6de9..000000000000
--- a/sys-apps/dbus/dbus-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-TMPFILES_OPTIONAL=1
-
-# At least at the moment, while a CMake port exists, it's not recommended
-# for distributions.
-# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
-inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
- acct-user/messagebus
- app-text/xmlto
- app-text/docbook-xml-dtd:4.4
- sys-devel/autoconf-archive
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-COMMON_DEPEND="
- >=dev-libs/expat-2.1.0
- elogind? ( sys-auth/elogind )
- selinux? ( sys-libs/libselinux )
- systemd? ( sys-apps/systemd:0= )
- X? (
- x11-libs/libX11
- x11-libs/libXt
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/expat
- test? (
- ${PYTHON_DEPS}
- >=dev-libs/glib-2.40:2
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-user/messagebus
- selinux? ( sec-policy/selinux-dbus )
- systemd? ( virtual/tmpfiles )
-"
-
-DOC_CONTENTS="
- Some applications require a session bus in addition to the system
- bus. Please see \`man dbus-launch\` for more information.
-"
-
-# out of sources build dir for make check
-TBD="${WORKDIR}/${P}-tests-build"
-
-PATCHES=(
- "${FILESDIR}/dbus-enable-elogind.patch"
- "${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
-
- "${FILESDIR}/dbus-1.14.0-x-autoconf-fixes.patch"
- "${FILESDIR}/dbus-1.12.22-check-fd.patch"
-
- # https://bugs.gentoo.org/836560
- "${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-
- if use kernel_linux; then
- CONFIG_CHECK="~EPOLL"
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- default
-
- if [[ ${CHOST} == *-solaris* ]]; then
- # fix standards conflict, due to gcc being c99 by default nowadays
- sed -i \
- -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
- configure.ac || die
- fi
-
- # required for bug #263909, cross-compile so don't remove eautoreconf
- eautoreconf
-}
-
-src_configure() {
- local rundir=$(usex kernel_linux /run /var/run)
-
- sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
- > "${T}"/dbus.initd || die
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local docconf myconf testconf
-
- # so we can get backtraces from apps
- case ${CHOST} in
- *-mingw*)
- # error: unrecognized command line option '-rdynamic', bug #488036
- ;;
- *)
- append-flags -rdynamic
- ;;
- esac
-
- # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
- # not on an SELinux profile.
- myconf=(
- --localstatedir="${EPREFIX}/var"
- $(use_enable static-libs static)
- $(use_enable debug verbose-mode)
- --disable-asserts
- --disable-checks
- $(use_enable selinux)
- $(use_enable selinux libaudit)
- --disable-apparmor
- $(use_enable kernel_linux inotify)
- --disable-kqueue
- $(use_enable elogind)
- $(use_enable systemd)
- $(use_enable systemd user-session)
- --disable-embedded-tests
- --disable-modular-tests
- $(use_enable debug stats)
- --with-session-socket-dir="${EPREFIX}"/tmp
- --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
- --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- --with-systemduserunitdir="$(systemd_get_userunitdir)"
- --with-dbus-user=messagebus
- $(use_with X x)
- )
-
- if [[ ${CHOST} == *-darwin* ]]; then
- myconf+=(
- --enable-launchd
- --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
- )
- fi
-
- if multilib_is_native_abi; then
- docconf=(
- --enable-xml-docs
- $(use_enable doc doxygen-docs)
- )
- else
- docconf=(
- --disable-xml-docs
- --disable-doxygen-docs
- )
- myconf+=(
- --disable-daemon
- --disable-selinux
- --disable-libaudit
- --disable-elogind
- --disable-systemd
- --without-x
- )
- fi
-
- einfo "Running configure in ${BUILD_DIR}"
- ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
- if multilib_is_native_abi && use test; then
- mkdir "${TBD}" || die
- cd "${TBD}" || die
- testconf=(
- $(use_enable test asserts)
- $(use_enable test checks)
- $(use_enable test embedded-tests)
- $(use_enable test stats)
- $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
- )
- einfo "Running configure in ${TBD}"
- ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
- fi
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- # After the compile, it uses a selinuxfs interface to
- # check if the SELinux policy has the right support
- use selinux && addwrite /selinux/access
-
- einfo "Running make in ${BUILD_DIR}"
- emake
-
- if use test; then
- einfo "Running make in ${TBD}"
- emake -C "${TBD}"
- fi
- else
- emake -C dbus libdbus-1.la
- fi
-}
-
-src_test() {
- # DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
- # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
- DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
-
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake DESTDIR="${D}" install-pkgconfigDATA
- emake DESTDIR="${D}" -C dbus \
- install-libLTLIBRARIES install-dbusincludeHEADERS \
- install-nodist_dbusarchincludeHEADERS
- fi
-}
-
-multilib_src_install_all() {
- newinitd "${T}"/dbus.initd dbus
-
- if use X; then
- # dbus X session script (bug #77504)
- # turns out to only work for GDM (and startx). has been merged into
- # other desktop (kdm and such scripts)
- exeinto /etc/X11/xinit/xinitrc.d
- doexe "${FILESDIR}"/80-dbus
- fi
-
- # Needs to exist for dbus sessions to launch
- keepdir /usr/share/dbus-1/services
- keepdir /etc/dbus-1/{session,system}.d
- # machine-id symlink from pkg_postinst()
- keepdir /var/lib/dbus
- # Let the init script create the /var/run/dbus directory
- rm -rf "${ED}"/var/run
-
- # bug #761763
- rm -rf "${ED}"/usr/lib/sysusers.d
-
- dodoc AUTHORS NEWS README doc/TODO
- readme.gentoo_create_doc
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- if use systemd; then
- tmpfiles_process dbus.conf
- fi
-
- # Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
- # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
- # dependencies with hardcoded paths (although the known ones got fixed already)
- # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
- dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
- ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
- if [[ ${CHOST} == *-darwin* ]]; then
- local plist="org.freedesktop.dbus-session.plist"
- elog
- elog
- elog "For MacOS/Darwin we now ship launchd support for dbus."
- elog "This enables autolaunch of dbus at session login and makes"
- elog "dbus usable under MacOS/Darwin."
- elog
- elog "The launchd plist file ${plist} has been"
- elog "installed in ${EPREFIX}/Library/LaunchAgents."
- elog "For it to be used, you will have to do all of the following:"
- elog " + cd ~/Library/LaunchAgents"
- elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
- elog " + logout and log back in"
- elog
- elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
- elog "specified and refused to start otherwise, then export the"
- elog "the following to your environment:"
- elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
- fi
-}
diff --git a/sys-apps/dbus/dbus-1.14.0-r2.ebuild b/sys-apps/dbus/dbus-1.14.0-r2.ebuild
new file mode 100644
index 000000000000..eb763dd3481c
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.14.0-r2.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+TMPFILES_OPTIONAL=1
+
+# At least at the moment, while a CMake port exists, it's not recommended
+# for distributions.
+# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind selinux static-libs systemd test X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+ acct-user/messagebus
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.4
+ sys-devel/autoconf-archive
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+ >=dev-libs/expat-2.1.0
+ elogind? ( sys-auth/elogind )
+ selinux? ( sys-libs/libselinux )
+ systemd? ( sys-apps/systemd:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXt
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/expat
+ test? (
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2.40:2
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-user/messagebus
+ selinux? ( sec-policy/selinux-dbus )
+ systemd? ( virtual/tmpfiles )
+ X? ( sys-apps/which )
+"
+
+DOC_CONTENTS="
+ Some applications require a session bus in addition to the system
+ bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+ "${FILESDIR}/dbus-enable-elogind.patch"
+ "${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
+
+ "${FILESDIR}/dbus-1.14.0-x-autoconf-fixes.patch"
+ "${FILESDIR}/dbus-1.12.22-check-fd.patch"
+
+ # https://bugs.gentoo.org/836560
+ "${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+
+ if use kernel_linux; then
+ CONFIG_CHECK="~EPOLL"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ default
+
+ if [[ ${CHOST} == *-solaris* ]]; then
+ # fix standards conflict, due to gcc being c99 by default nowadays
+ sed -i \
+ -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+ configure.ac || die
+ fi
+
+ # required for bug #263909, cross-compile so don't remove eautoreconf
+ eautoreconf
+}
+
+src_configure() {
+ local rundir=$(usex kernel_linux /run /var/run)
+
+ sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+ > "${T}"/dbus.initd || die
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local docconf myconf testconf
+
+ # so we can get backtraces from apps
+ case ${CHOST} in
+ *-mingw*)
+ # error: unrecognized command line option '-rdynamic', bug #488036
+ ;;
+ *)
+ append-flags -rdynamic
+ ;;
+ esac
+
+ # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+ # not on an SELinux profile.
+ myconf=(
+ --localstatedir="${EPREFIX}/var"
+ $(use_enable static-libs static)
+ $(use_enable debug verbose-mode)
+ --disable-asserts
+ --disable-checks
+ $(use_enable selinux)
+ $(use_enable selinux libaudit)
+ --disable-apparmor
+ $(use_enable kernel_linux inotify)
+ --disable-kqueue
+ $(use_enable elogind)
+ $(use_enable systemd)
+ $(use_enable systemd user-session)
+ --disable-embedded-tests
+ --disable-modular-tests
+ $(use_enable debug stats)
+ --with-session-socket-dir="${EPREFIX}"/tmp
+ --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
+ --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-systemduserunitdir="$(systemd_get_userunitdir)"
+ --with-dbus-user=messagebus
+ $(use_with X x)
+ )
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ myconf+=(
+ --enable-launchd
+ --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+ )
+ fi
+
+ if multilib_is_native_abi; then
+ docconf=(
+ --enable-xml-docs
+ $(use_enable doc doxygen-docs)
+ )
+ else
+ docconf=(
+ --disable-xml-docs
+ --disable-doxygen-docs
+ )
+ myconf+=(
+ --disable-daemon
+ --disable-selinux
+ --disable-libaudit
+ --disable-elogind
+ --disable-systemd
+ --without-x
+ )
+ fi
+
+ einfo "Running configure in ${BUILD_DIR}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+ if multilib_is_native_abi && use test; then
+ mkdir "${TBD}" || die
+ cd "${TBD}" || die
+ testconf=(
+ $(use_enable test asserts)
+ $(use_enable test checks)
+ $(use_enable test embedded-tests)
+ $(use_enable test stats)
+ $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+ )
+ einfo "Running configure in ${TBD}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ # After the compile, it uses a selinuxfs interface to
+ # check if the SELinux policy has the right support
+ use selinux && addwrite /selinux/access
+
+ einfo "Running make in ${BUILD_DIR}"
+ emake
+
+ if use test; then
+ einfo "Running make in ${TBD}"
+ emake -C "${TBD}"
+ fi
+ else
+ emake -C dbus libdbus-1.la
+ fi
+}
+
+src_test() {
+ # DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
+ DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ emake DESTDIR="${D}" -C dbus \
+ install-libLTLIBRARIES install-dbusincludeHEADERS \
+ install-nodist_dbusarchincludeHEADERS
+ fi
+}
+
+multilib_src_install_all() {
+ newinitd "${T}"/dbus.initd dbus
+
+ if use X; then
+ # dbus X session script (bug #77504)
+ # turns out to only work for GDM (and startx). has been merged into
+ # other desktop (kdm and such scripts)
+ exeinto /etc/X11/xinit/xinitrc.d
+ doexe "${FILESDIR}"/80-dbus
+ fi
+
+ # Needs to exist for dbus sessions to launch
+ keepdir /usr/share/dbus-1/services
+ keepdir /etc/dbus-1/{session,system}.d
+ # machine-id symlink from pkg_postinst()
+ keepdir /var/lib/dbus
+ # Let the init script create the /var/run/dbus directory
+ rm -rf "${ED}"/var/run
+
+ # bug #761763
+ rm -rf "${ED}"/usr/lib/sysusers.d
+
+ dodoc AUTHORS NEWS README doc/TODO
+ readme.gentoo_create_doc
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if use systemd; then
+ tmpfiles_process dbus.conf
+ fi
+
+ # Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
+ # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+ # dependencies with hardcoded paths (although the known ones got fixed already)
+ # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ local plist="org.freedesktop.dbus-session.plist"
+ elog
+ elog
+ elog "For MacOS/Darwin we now ship launchd support for dbus."
+ elog "This enables autolaunch of dbus at session login and makes"
+ elog "dbus usable under MacOS/Darwin."
+ elog
+ elog "The launchd plist file ${plist} has been"
+ elog "installed in ${EPREFIX}/Library/LaunchAgents."
+ elog "For it to be used, you will have to do all of the following:"
+ elog " + cd ~/Library/LaunchAgents"
+ elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+ elog " + logout and log back in"
+ elog
+ elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+ elog "specified and refused to start otherwise, then export the"
+ elog "the following to your environment:"
+ elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+ fi
+}
diff --git a/sys-apps/dbus/dbus-1.14.0-r4.ebuild b/sys-apps/dbus/dbus-1.14.0-r4.ebuild
new file mode 100644
index 000000000000..19c59de260f4
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.14.0-r4.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+TMPFILES_OPTIONAL=1
+
+# At least at the moment, while a CMake port exists, it's not recommended
+# for distributions.
+# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind selinux static-libs systemd test X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+ acct-user/messagebus
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.4
+ sys-devel/autoconf-archive
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+ >=dev-libs/expat-2.1.0
+ elogind? ( sys-auth/elogind )
+ selinux? ( sys-libs/libselinux )
+ systemd? ( sys-apps/systemd:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXt
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/expat
+ test? (
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2.40:2
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-user/messagebus
+ selinux? ( sec-policy/selinux-dbus )
+ systemd? ( virtual/tmpfiles )
+"
+
+DOC_CONTENTS="
+ Some applications require a session bus in addition to the system
+ bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+ "${FILESDIR}/dbus-enable-elogind.patch"
+ "${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
+
+ "${FILESDIR}/dbus-1.14.0-x-autoconf-fixes.patch"
+ "${FILESDIR}/dbus-1.12.22-check-fd.patch"
+
+ # https://bugs.gentoo.org/836560
+ "${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+
+ if use kernel_linux; then
+ CONFIG_CHECK="~EPOLL"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ default
+
+ if [[ ${CHOST} == *-solaris* ]]; then
+ # fix standards conflict, due to gcc being c99 by default nowadays
+ sed -i \
+ -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+ configure.ac || die
+ fi
+
+ # required for bug #263909, cross-compile so don't remove eautoreconf
+ eautoreconf
+}
+
+src_configure() {
+ local rundir=$(usex kernel_linux /run /var/run)
+
+ sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+ > "${T}"/dbus.initd || die
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local docconf myconf testconf
+
+ # so we can get backtraces from apps
+ case ${CHOST} in
+ *-mingw*)
+ # error: unrecognized command line option '-rdynamic', bug #488036
+ ;;
+ *)
+ append-flags -rdynamic
+ ;;
+ esac
+
+ # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+ # not on an SELinux profile.
+ myconf=(
+ --localstatedir="${EPREFIX}/var"
+ $(use_enable static-libs static)
+ $(use_enable debug verbose-mode)
+ --disable-asserts
+ --disable-checks
+ $(use_enable selinux)
+ $(use_enable selinux libaudit)
+ --disable-apparmor
+ $(use_enable kernel_linux inotify)
+ --disable-kqueue
+ $(use_enable elogind)
+ $(use_enable systemd)
+ $(use_enable systemd user-session)
+ --disable-embedded-tests
+ --disable-modular-tests
+ $(use_enable debug stats)
+ --with-session-socket-dir="${EPREFIX}"/tmp
+ --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
+ --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-systemduserunitdir="$(systemd_get_userunitdir)"
+ --with-dbus-user=messagebus
+ $(use_with X x)
+ )
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ myconf+=(
+ --enable-launchd
+ --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+ )
+ fi
+
+ if multilib_is_native_abi; then
+ docconf=(
+ --enable-xml-docs
+ $(use_enable doc doxygen-docs)
+ )
+ else
+ docconf=(
+ --disable-xml-docs
+ --disable-doxygen-docs
+ )
+ myconf+=(
+ --disable-daemon
+ --disable-selinux
+ --disable-libaudit
+ --disable-elogind
+ --disable-systemd
+ --without-x
+ )
+ fi
+
+ einfo "Running configure in ${BUILD_DIR}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+ if multilib_is_native_abi && use test; then
+ mkdir "${TBD}" || die
+ cd "${TBD}" || die
+ testconf=(
+ $(use_enable test asserts)
+ $(use_enable test checks)
+ $(use_enable test embedded-tests)
+ $(use_enable test stats)
+ $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+ )
+ einfo "Running configure in ${TBD}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ # After the compile, it uses a selinuxfs interface to
+ # check if the SELinux policy has the right support
+ use selinux && addwrite /selinux/access
+
+ einfo "Running make in ${BUILD_DIR}"
+ emake
+
+ if use test; then
+ einfo "Running make in ${TBD}"
+ emake -C "${TBD}"
+ fi
+ else
+ emake -C dbus libdbus-1.la
+ fi
+}
+
+src_test() {
+ # DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
+ DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ emake DESTDIR="${D}" -C dbus \
+ install-libLTLIBRARIES install-dbusincludeHEADERS \
+ install-nodist_dbusarchincludeHEADERS
+ fi
+}
+
+multilib_src_install_all() {
+ newinitd "${T}"/dbus.initd dbus
+
+ if use X; then
+ # dbus X session script (bug #77504)
+ # turns out to only work for GDM (and startx). has been merged into
+ # other desktop (kdm and such scripts)
+ exeinto /etc/X11/xinit/xinitrc.d
+ newexe "${FILESDIR}"/80-dbus-r1 80-dbus
+ fi
+
+ # Needs to exist for dbus sessions to launch
+ keepdir /usr/share/dbus-1/services
+ keepdir /etc/dbus-1/{session,system}.d
+ # machine-id symlink from pkg_postinst()
+ keepdir /var/lib/dbus
+ # Let the init script create the /var/run/dbus directory
+ rm -rf "${ED}"/var/run
+
+ # bug #761763
+ rm -rf "${ED}"/usr/lib/sysusers.d
+
+ dodoc AUTHORS NEWS README doc/TODO
+ readme.gentoo_create_doc
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if use systemd; then
+ tmpfiles_process dbus.conf
+ fi
+
+ # Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
+ # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+ # dependencies with hardcoded paths (although the known ones got fixed already)
+ # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ local plist="org.freedesktop.dbus-session.plist"
+ elog
+ elog
+ elog "For MacOS/Darwin we now ship launchd support for dbus."
+ elog "This enables autolaunch of dbus at session login and makes"
+ elog "dbus usable under MacOS/Darwin."
+ elog
+ elog "The launchd plist file ${plist} has been"
+ elog "installed in ${EPREFIX}/Library/LaunchAgents."
+ elog "For it to be used, you will have to do all of the following:"
+ elog " + cd ~/Library/LaunchAgents"
+ elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+ elog " + logout and log back in"
+ elog
+ elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+ elog "specified and refused to start otherwise, then export the"
+ elog "the following to your environment:"
+ elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+ fi
+}
diff --git a/sys-apps/dbus/files/80-dbus-r1 b/sys-apps/dbus/files/80-dbus-r1
new file mode 100644
index 000000000000..3499a6a12eca
--- /dev/null
+++ b/sys-apps/dbus/files/80-dbus-r1
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# launches a session dbus instance
+
+dbuslaunch=$(command -v dbus-launch 2>/dev/null)
+if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+ if [ -n "$command" ]; then
+ command="$dbuslaunch --exit-with-session $command"
+ else
+ eval "$($dbuslaunch --sh-syntax --exit-with-session)"
+ fi
+fi
+
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index d84ae839f789..42a397c4ccd9 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,5 +1,5 @@
DIST dcfldd-1.7.1.tar.gz 89413 BLAKE2B ad7572d6df51116ea71647363d50fcb03e389cbf52fc327c97ae50357290ce1aefda0ba229e167bac322edf73009fe8dc72378dab07090321e41eeaf249433c0 SHA512 d1120ef9b50e379015d50d00b6c8b24978ec58c05434580d67a1707f5e1d41d1e294ca5a7f9d1e7bfeabcb9fd7976b384db93a78f70421870d26391404ee4ae6
DIST dcfldd-1.7.tar.gz 81892 BLAKE2B bf34dcd3e0430421c36dbd9d6b3f5ea2d4a4cb41151db8f14deb48d4169d1008fee2776f2ae821ea40ca7743f2354db62520bc919206e02a6e525ed6a38a0fec SHA512 e1dc4773438914a8102a692c7b7cbf486a9b03111820facb0134b4b9d058751695d1a7c64481852026412aacbb0fa04a18f833ff77ca30f154d5067a07057f31
-EBUILD dcfldd-1.7.1.ebuild 533 BLAKE2B 3f78c9d820f2746f762b28a73ee9bd1541291a7c6e23e11253a0372e283f1db5feb36e758829360523c4b165b89a52fb92e02c878f5a151626805eb84b63d66d SHA512 07bc2d7bfaf3ae66964afa5f8d7399c12d994f49cb3a9dea1664e90f59b8ae3aaa57c6e1b4fb779f707ff8db37c3b0befd5e81e511089bca7e3438da95b42e23
+EBUILD dcfldd-1.7.1.ebuild 540 BLAKE2B 1142ca0cb9a04295291509a4a353ea3846265f2ea834fa11c0da3d42db36dd3176ef7b2aa6b5d03f2383f5e3d97dbb668c97123cbc27677cb1a61a3f92b9ac41 SHA512 35f8f27bd66f8583d48a87e6ab346fa0a19cbd8187e73fb2dd65c741e1b1802b021f0d2e5df5193035f767b6822a00c6e7256d0504d9f2d7958e4e7d4a73b453
EBUILD dcfldd-1.7.ebuild 502 BLAKE2B 3e16b7123b2fd9c9d7b5e9fb187aef04226cf8f13521864b38615b5a8ab0f4f2dc6098b21b669cfe93d9288ff8efa5442cd9dad7910d83e11e28e54ef86deb2e SHA512 65a14bc441a7c9b0841ab895ebad8773bda6ad67a11966b9031c173e664f0ff45fbb4e59e73b9f2e96df822afba40a34acbe5cdf3b30ea639c1c3a1111c9dc8f
MISC metadata.xml 326 BLAKE2B e0415cead27edbf546822569f2b36339bac12b1ef132ccbfb3fc542ef2836768bbf4ceabc2cddd17e956d9e955d517302681f3ad3408b935c57e1737c752a30e SHA512 66aa2e95ad62d77367bf2860fcc2e266495b485de8cbbfb0c16b6eacf548e946b2075f7de6cc6617dca977d03b25a693c887ec4ff8be28ec9cf86dea52075352
diff --git a/sys-apps/dcfldd/dcfldd-1.7.1.ebuild b/sys-apps/dcfldd/dcfldd-1.7.1.ebuild
index 0fb96f7e15aa..445c8b11d420 100644
--- a/sys-apps/dcfldd/dcfldd-1.7.1.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
DOCS=(
AUTHORS
CONTRIBUTING.md
diff --git a/sys-apps/dchroot/Manifest b/sys-apps/dchroot/Manifest
index 48c34609e6b1..f85f75ee82fd 100644
--- a/sys-apps/dchroot/Manifest
+++ b/sys-apps/dchroot/Manifest
@@ -1,3 +1,4 @@
+AUX dchroot-0.12.1-no-werror.patch 399 BLAKE2B eca3d10bbb230632a7c52a479e2a83e54c1181106ef62828b56028098d17e70b593046232448aa37725e43d74360e3b8eba48193d9c37d0ffcfc337c91f1621a SHA512 9cac8e139674f90cf676b46c9d51e3d2e0b291fc54a0b75931f356dce7f9501adf4314d9606ce9693773fb98407632e096b26c3c9ed94011fc22fc43d5e2514e
DIST dchroot_0.12.1.tar.gz 20287 BLAKE2B 9353817ba93ad65dd76b21d4db5e2546480850cea51efeec1918d538c25944ee40e459af2c6c4d24c5bc80c8f8611219088962b24c32ff236f9259764ab99384 SHA512 4c0b9e30c68f7ff953a259b4d21f0fab58b6a15dd8ebf0666267879114c0fce37a9fc38d71e5047003676c1ec4211feb0d2c51aa44def81d0d5a40815fd1c600
-EBUILD dchroot-0.12.1.ebuild 681 BLAKE2B e82872abaefbfe4464eea0f0aec349dc58719ccdc585187967e637ef8d2413d209d7b5d658f195113805fbd9325ac2ed5c69b42d5823e767e5fbaaad3c9bc839 SHA512 d57e2e1ae3a0ed61064cc2f5655c9e7bec854bf5fa7d0c989a0b94192dec188ff100517a44404111087f87a7d6b06cd7a5a57d70290975b075bbe1af0d06fced
+EBUILD dchroot-0.12.1.ebuild 736 BLAKE2B 2ab718c441a810ac97bc4aaeee9532fa6ce4db9e1fe2c8d4c202a4b818b9565eaea089c7eba5a3f5edd54a8b044cfaf7f4addb69e122b92faeb997b6318c55e8 SHA512 3d05031869171eb29bfc474834d5f7270215237d107bab1cb6a47ed0230091acd4063212030b6c19e5b478eaf11afabb8c82388c0abc108a87b3f5e38e85db5f
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-apps/dchroot/dchroot-0.12.1.ebuild b/sys-apps/dchroot/dchroot-0.12.1.ebuild
index eee10e8bef06..7f02674ae0ae 100644
--- a/sys-apps/dchroot/dchroot-0.12.1.ebuild
+++ b/sys-apps/dchroot/dchroot-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,13 +17,18 @@ IUSE=""
DEPEND="sys-apps/help2man"
RDEPEND="!dev-util/schroot[dchroot]"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.12.1-no-werror.patch
+)
+
src_prepare() {
- default
sed -i \
-e '/^all:/s:$: docs:' \
-e '/^CFLAGS/s:-O2:@CFLAGS@:' \
-e '/@CFLAGS@/ s:@CFLAGS@:@CFLAGS@ @LDFLAGS@:' \
Makefile.in || die "sed failed"
+
+ default
}
src_compile() {
diff --git a/sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch b/sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch
new file mode 100644
index 000000000000..4cd270190456
--- /dev/null
+++ b/sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/824542
+https://bugs.gentoo.org/722920
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,7 +3,7 @@ mandir = ${prefix}/share/man
+ sysconfdir = $(DESTDIR)/etc
+
+ INSTALL=install
+-CFLAGS=-Wl,-z,now @CFLAGS@ @LDFLAGS@ -Wall -Wstrict-prototypes -Werror -g \
++CFLAGS=-Wl,-z,now @CFLAGS@ @LDFLAGS@ -Wall -Wstrict-prototypes \
+ -DDCHROOT_VERSION="\"@DCHROOT_VERSION@\""
+
+ all: dchroot docs
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index b28c412529e9..d525b1141f26 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,6 +1,4 @@
AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
-DIST debianutils_5.5.orig.tar.xz 104448 BLAKE2B 707c9072ddf1fa0c61fc66f84aea26bac7bf6f31948880ad4711e89f8f4a665ae4104e998f27e53e288b3453a71876ef44038f8e954f19055ed1049eb9b9981c SHA512 230310428ee7c145c74bb666ae729754352295230f38ef4e22f7566970c5186d607cd827a5603a678815bd48d4a1eb2716f55c32494ec75eb665651da6a56e6a
DIST debianutils_5.7.orig.tar.gz 257231 BLAKE2B 61d2e7abcd359c5dc87b7f91e510e91e1926183c15a572c7d87cf4a590dded2e2ee8c9b4e06f7f478353139870c808927575de233200ad69e084a6f971c4bd24 SHA512 79acd8885abca93842d696167171a359011c49a40f38deeb25bc94d62905f95afa3a7b2540d3bd4b0ffd363c5c48a439a1a68139a29d6c033980b019cea75d92
-EBUILD debianutils-5.5.ebuild 1163 BLAKE2B ed67f92b1f451f64691c5f844a21ede614b9b3e9d76db478f318a47725651a006f8b0234458e287cb9a2e5ffc38307b71ba48d466fae3a824af51b677a0797a0 SHA512 340ba67bc916cce705023e6b1ec9fdbb2be02a7b42e955fd7a83817d95f69dd505896cf0a8f5b9bb3a4b17d529feb0954ab43f26bfd3f581196ef94cedf725ec
-EBUILD debianutils-5.7.ebuild 1052 BLAKE2B 65812a0006a3a8d8561cf7cfd12e9ef884955d11fb31425e02f39a6befb52230d32bc7c56964c492d4b3b6885c39e0f273771818a86d58cbae507715c1ddd6dc SHA512 014498872eb18c5017199c4ee67142459c01f1611d7b1a841b46ff40dca748d726ee61a686ed6659d21113215949ae03b337764e105fb80ebe04194fbcfe3a42
+EBUILD debianutils-5.7.ebuild 1044 BLAKE2B d8175b35f5ee63c395a7d7b87306bfd25be41c19d80890c218b8d6c61ecdc3cbea1fe5a90f17f23ce43269ec56f1252ae4c151319650fa931b6aaccf94c08a26 SHA512 8fdd414115cacc0c61ae0ce411ecaa724a0173c6d9f15c2664c900e62312bb7bcceb2175deea019d1ea374c56c66b89a43e4c2c316d88e9222495438e8d81593
MISC metadata.xml 446 BLAKE2B a681b76916f27a5d016fa34c6c6ce4abe887c1f46232cb6cd759ba699eca0cba865ff7b0d33900b1f9e858e016532815b18bf86cc211b97f57a1c0a56580d125 SHA512 c080d8ae5511a0870aa778f744518a2482e7d61ff9e653a808b3959571b8bb47dc90b1b1f2feaccc323df0521f4ae91efb43fa31bd6c8a72075c8b2e9dfeb829
diff --git a/sys-apps/debianutils/debianutils-5.5.ebuild b/sys-apps/debianutils/debianutils-5.5.ebuild
deleted file mode 100644
index bbefd848de8e..000000000000
--- a/sys-apps/debianutils/debianutils-5.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A selection of tools from Debian"
-HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
-SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${PN}_${PV}.orig.tar.xz"
-# Note: Tarball disappeared from Debian mirrors
-# SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="BSD GPL-2 SMAIL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="+installkernel static"
-
-PDEPEND="
- installkernel? (
- || (
- sys-kernel/installkernel-gentoo
- sys-kernel/installkernel-systemd-boot
- )
- )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
-
-src_prepare() {
- # Avoid adding po4a dependency, upstream refreshes manpages.
- sed -i -e '/SUBDIRS/s|po4a||' Makefile.am || die
-
- default
- eautoreconf
-}
-
-src_configure() {
- use static && append-ldflags -static
- default
-}
-
-src_install() {
- into /
- dobin run-parts
-
- into /usr
- dobin ischroot
- dosbin savelog
-
- doman ischroot.1 run-parts.8 savelog.8
-
- dodoc CHANGELOG
-}
diff --git a/sys-apps/debianutils/debianutils-5.7.ebuild b/sys-apps/debianutils/debianutils-5.7.ebuild
index ab18df1fe69b..358f820b7322 100644
--- a/sys-apps/debianutils/debianutils-5.7.ebuild
+++ b/sys-apps/debianutils/debianutils-5.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="BSD GPL-2 SMAIL"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="+installkernel static"
PDEPEND="
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index 30b4796f2543..c5c76f4153af 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -2,5 +2,5 @@ AUX dstat-0.7.4-fix-csv-output.patch 888 BLAKE2B 6aa25d7b7c2fed6986be55bf5802692
AUX dstat-0.7.4-skip-non-sandbox-tests.patch 661 BLAKE2B 31f98e58c8f23e3b6322de86bdddb83afa22b0b8bed48164378c6c071348ac2a37350b789985634017c1e338ceb73d7f9221d99e0b8b4b4d550f10d7840bde76 SHA512 0087d7fa2ce9388440bacdac52038433c1a7f0c5fd885027a4b18895c8f450cc7cae7610e6232e26393749f1b165c4ade5ee2a0e453c7e2542450f5a3d3100ac
AUX fix-collections-deprecation-warning.patch 899 BLAKE2B ec02bf38b8c40f8f018ba6da523da24f9215dfd7c967dbfc2384ea16ab9b01489a7d69cd99d81ddb1222e75e6d070e40d435e1d12ad8ea2961e447721d9656bc SHA512 4164f61a1ef97f2a4962f84138305b68cdbc9fcc5c639fade7b580c9f9904d592af9e05982536cd2bea5581c30696a0308dedbe6f739f0094c319bc85d547fea
DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5
-EBUILD dstat-0.7.4-r2.ebuild 1302 BLAKE2B 780501a45604b7a4201662fa4e4ba0474ac9c4677c86ccca0bcc064e3c39697214d59f743c4aa01d145319e2149f852ef8ab69b26263f53f6f9d56ed060c7a43 SHA512 4ff2b59b7ac8d6d5f55ad0740ef964cfc8fba7b8ce13a044aabd8efd0cbd4ba41077f8ead34a2e2ea11b2e45957d461980509ea281cad66c6882e16a4a78b433
+EBUILD dstat-0.7.4-r2.ebuild 1303 BLAKE2B f433402a14aff70eebd763aac320c6faa98f61e35886ca90b84f0f203d877f7c8739e8d9d882f283cacf16021fc3a73be74e3d27d9e1e30f06e48e4885bf809a SHA512 3bf82d8be5981235010132fb6958fd709701da271fb2ebb7450dc4d046f3e014fb9daaf556448498aea7813bb1bd0c277d3c3043421b501bcabd6fb900296dfa
MISC metadata.xml 897 BLAKE2B 23501d288b9bd4cd5fbd432bcf441ea433156717f1f940407e2dc3c1e3b7a4858fb9002d794b1acd44a5549ad9a477f506a0ac2d5cd3ec94f6959ee76c6d142b SHA512 12c6151da673209b4d679df4e47d99dbe8163462d1410e4f2f177e944f944e72aea751b07c1d105b8f7e235928a4ea690cc140b41ebf58095677fca4c652ff23
diff --git a/sys-apps/dstat/dstat-0.7.4-r2.ebuild b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
index bdaa4b1c23aa..323a3d46c5d9 100644
--- a/sys-apps/dstat/dstat-0.7.4-r2.ebuild
+++ b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit python-r1
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index e503f69d79ff..1ab1f99f826c 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -5,6 +5,6 @@ DIST dtc-1.5.0.tar.xz 152936 BLAKE2B 4ad9cf8f8fd0ccde0c7b8b66c0039eb9b012ed26e51
DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
EBUILD dtc-1.5.0-r2.ebuild 1656 BLAKE2B 50d2f998146dcd8ee69ea61d89c3c6010df74a0beee5fb9601da0d5cf350f874a50b3581590b18b0e734d245625df4747926a2e1ab51aebee909b0c18d17e9c6 SHA512 4b169ab7af760114a48d7e06226d0a7ca13be1bd3b050ed2123209ae14a6afd174b89f28c938597ff59b4826b0f5b243e405368ed4b149afca20678539ab3933
EBUILD dtc-1.5.0.ebuild 1308 BLAKE2B b71c0e6bd467077ad49a5ced32974949312b6fec4a74869d1a87bd612b1606389dbc6801d9311ecbfef1eea00d0c1e5fad882d303206c3f0e5ba8e56ad476ff2 SHA512 fe50c8c3a2afd99a77c22ffc7915612518607cc956477d6243fad40924ba70e8a7f5705f1c66507b3e7be6732dce122442f52d08d56679df4969efd02070a210
-EBUILD dtc-1.6.0.ebuild 1493 BLAKE2B 8c2466971cf6bdeb03e7d2977c4b8eedd3d0b93ce63934330186027197224ac055ac01ed502fed0f87ace2f5ee42977fff277ff9c24f40da2a0152587680518b SHA512 6cfbc8bf75bbd486d901ee86360d32229a887d47f51da004e8e13ac106354f9e4f09b2bf6dd3242c5e8c5c5cf9330f5ee75d9d7f45318ec667c5d59fc0cf64d6
+EBUILD dtc-1.6.0.ebuild 1500 BLAKE2B d3107f37a5a8857a375cf76da15d66396c16cc76e1bda6e9ea297c62b7cdf75a77f22e9e071da25fc807536cc97aebe88a10d73644693f32aee4b5830fb0bc31 SHA512 ebab37ddd5b638f9b02d3ee85b2e108a43034c20e980936f780c471029540441a137b3fe7251625cf09b3197e2ceea167c277068bb4dd72bb81388f1803c873a
EBUILD dtc-9999.ebuild 1499 BLAKE2B 0e1e0e145cdf465c12f949370dca806e0f5802e2b2124ddfc77b93bf0ba393883d8a803b8897451f05135d75dec2c3dd4e84fcc95fad759477d573809cc19d29 SHA512 a2a30c33918122552f5a81357501e46f89a716c65e0a14966a38c65db2c798db443caa87e1a70419caa49f8b642568c2e68df9ba86f3fb456f562e62482e9305
MISC metadata.xml 492 BLAKE2B dc331e157119b6db3bb419e04722511406295b39ee40bcae29dbbe3f8fa3737aa221c2d61b16b45b8361c1b6ffadd634ffa65377d33cc808d11a8128389bdfd0 SHA512 cf2441cf6ea1075cf633edf903a54a637cbaff2545ccd65290c1c1b3f5452ce3d74df5ce4ffe68ab15857eaea1ffeac7f3e80b42fb4dae3af1c3636e4b0766fb
diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
index 41acb4a8a9bc..d61376c56fb8 100644
--- a/sys-apps/dtc/dtc-1.6.0.ebuild
+++ b/sys-apps/dtc/dtc-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
fi
DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 3801a9aee9e4..d83ca5d2a396 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,6 +1,4 @@
-DIST ed-1.17.tar.xz 68516 BLAKE2B 975e6547f0062dc980bf4490bbbc98e0ac77fc18b2960e18a4c86a6c9190dbd6e1afb155678a1b7d891dc6cb1c5f5c07612365bbf3ffae15bf7575989e4b67d7 SHA512 ebe755ea7d12a7f54379ad8e03b703e9c0dd9aec26b4a79e5014db4368ab2d2926ae094f2ef1aef90cc9b2d541746a81af472578fa44cdf5bfe78aff5882451d
DIST ed-1.18.tar.lz 66019 BLAKE2B 9f2b6f00e65dc8a13dd9eba4dfae5ad1e6e3c3ffe623c8b2cc2db78e221ba140595658fd710e4651165a2475a9ed673c9f230fab64f22a7a9488973b5e227198 SHA512 e5dac94697d63fb90cc17e3e653fa56309e9652cc25b2e98a0e21f1ed41e38c48bc33b5fc746275a59e702d1644d3af88f3d82598b482f7309f4e68aab783286
DIST ed-1.18.tar.lz.sig 72 BLAKE2B 9b498f1604d625c6b32ded636e0841ef384bf59c10ff00722e03dcd890c5c1d1ccc5d99545a6c132a9ccc61b9f8da8f70a94f514db4a417d8c52128be720481a SHA512 f3df77755ac2b47825102b7c6d1774c8aee3f93e0824cebb6d7ea6cda50c1233673ed4c56c4ed135438e993399685cf45616c1fbeb85b2a8501059abe818908d
-EBUILD ed-1.17.ebuild 989 BLAKE2B 697a8d5dc80ba44a0d3b2fe6f2187f930d5c5d2100113dcb84e037872a5757884c14a38e566c01491dc55a8a0aed4ce41b7da843279c7e1b3221c7703be739c8 SHA512 227498282c7d3f349617e11e6c809e79c8eb20292fe6dc07ea68a388099d82a50f82ec157c88d5fcb704c5302278d4d001795103af5181e9a39f62566b507869
-EBUILD ed-1.18.ebuild 1191 BLAKE2B 5cd37862ccb15c336d0e5f97fdc7fafdd3cba9626d1de4598397894f9ec230cbb92d9ace9ea5ed76501b4f1322ada2a6465dd3709d4652a40e278d9d6ff7c74a SHA512 c3ab31c445bc524b5e935aff583bff4a7d441f16411ef827c1a45e56b61fba6a611346ede00c4f17e248e4a4a6ba05c542784a32ba4c4d64f5789a424ae5f96a
+EBUILD ed-1.18.ebuild 1183 BLAKE2B 23b5cb591455ad1c1dad946876f8b7b4297bc41ddc0cf7a909c83c8585a0f3144506f25495a043c0ade9f5e0501b4d2c7219b086917953059a92ae9f4f523110 SHA512 75bbec07b179c221e7399f709fca3e430a0c856f9acba11d65c5fe9c740c08526629ae85c3d302f2cedb285a071b54158341d7d63b2d6934fca3fe8bd820d5e2
MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/ed/ed-1.17.ebuild b/sys-apps/ed/ed-1.17.ebuild
deleted file mode 100644
index 36d23d4f679a..000000000000
--- a/sys-apps/ed/ed-1.17.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Your basic line editor"
-HOMEPAGE="https://www.gnu.org/software/ed/"
-#SRC_URI="mirror://gnu/ed/${P}.tar.lz"
-# Using gzip instead -- the filesize diff is small and lzip uncommon #545344
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="sys-apps/texinfo"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- # Upstream configure script is moronic.
- ./configure \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- --bindir="${EPREFIX}/bin" \
- --prefix="${EPREFIX}/usr"
-}
diff --git a/sys-apps/ed/ed-1.18.ebuild b/sys-apps/ed/ed-1.18.ebuild
index 22ec395fd4dc..fa8429159ede 100644
--- a/sys-apps/ed/ed-1.18.ebuild
+++ b/sys-apps/ed/ed-1.18.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2+"
SLOT="0"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
BDEPEND="sys-apps/texinfo
diff --git a/sys-apps/eless/Manifest b/sys-apps/eless/Manifest
new file mode 100644
index 000000000000..48f324539927
--- /dev/null
+++ b/sys-apps/eless/Manifest
@@ -0,0 +1,3 @@
+DIST eless-0.7.tar.gz 555328 BLAKE2B 1b3a30c5206ed6768f3c3b82e1ee061cb50da6ec10abbb6e02dd9a723995c39d41da742f51ff23445b4eb46e82f79a99634b9aa2c0eba62888be7ef0eacb38fb SHA512 452518dc4367222f19a59376cd31dcf8f8fa346a06158d147f5b223d8082d4d82695f6de61572161ca5dc1aafeffb520ccc44be233e2396def795ba08b0c0577
+EBUILD eless-0.7.ebuild 612 BLAKE2B eb14ea57b5fa967089f9998f6ba5c2554f4bce0e8f49ab0b487afacddda9a5d6d55f90846b6c3fe3fe60e90370d546f335e31bda217829d06ebf789bac92bc06 SHA512 a7949f393fc1795f94008fe47ce0e742ea7c5374b52583c0203afb051a5f81d2c177cd046b123d8e64f25a3152756f2796a5d0a2aa4d7360f1ca06e689ab8210
+MISC metadata.xml 1041 BLAKE2B 31488604a7bf8c8367847b5cd0fbca08b24b77b49295137e478c2b89a447d95e452c5a0a82a28473255f3c7e429def53062bb319749c7b9385ebcc8893f98c8e SHA512 1d80952918a5d7d3d88a5827f662d784f4ccb6fcf619c1c39925bfc9f3bb316f5e734ad20a0b217af52632180f6582ef492a5f6cfb555978f8c82d6ccbcb99f5
diff --git a/sys-apps/eless/eless-0.7.ebuild b/sys-apps/eless/eless-0.7.ebuild
new file mode 100644
index 000000000000..8c50f4917789
--- /dev/null
+++ b/sys-apps/eless/eless-0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Use Emacs as a paginator"
+HOMEPAGE="https://eless.scripter.co/ https://github.com/kaushalmodi/eless/"
+SRC_URI="https://github.com/kaushalmodi/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # Tests have to be run manually
+
+RDEPEND="
+ >=app-editors/emacs-25.3:*
+ app-shells/bash
+ dev-lang/perl
+"
+
+src_compile() {
+ : # Nothing to compile
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc ${PN}.org README.org
+ doinfo docs/${PN}.info
+}
diff --git a/sys-apps/eless/metadata.xml b/sys-apps/eless/metadata.xml
new file mode 100644
index 000000000000..f84decef9437
--- /dev/null
+++ b/sys-apps/eless/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <longdescription>
+ eless provides a combination of Bash script and a minimal Emacs view-mode.
+ Features: independent of a user’s Emacs config, customizable via the
+ (locate-user-emacs-file "elesscfg") config, not require an Emacs server to
+ be already running, syntax highlighting, Org-mode file rendering, man page
+ viewer, info viewer, dired, wdired, (batch edit symbolic links), colored
+ diffs, git diff, git log, ls with auto ANSI detection, filter log files
+ lines matching a regexp, auto-revert log files similar to tail -f, quickly
+ change frame and font sizes.
+ </longdescription>
+ <upstream>
+ <bugs-to>https://github.com/kaushalmodi/eless/issues/</bugs-to>
+ <remote-id type="github">kaushalmodi/eless</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 8355577910f4..aa8022d11510 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,8 +1,11 @@
AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f
AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c
+AUX etckeeper-1.18.17-egrep-deprecated.patch 3246 BLAKE2B 24d09c53fb52f1cb6115097a7a66f47b87b739190d6bdcd291fffb3059f45fd1194cee51b8ef02df18f5d505f55e10cf5011b3d0678dbfb7bc516fdac9cfcd30 SHA512 aaf9525f413d7f09139fc1c441a15f193f9625ac6428eabf10ee0e51d92ed1975839c5907e6291d062c51234de968497a33b58ca815651b51f3fe2fbee14651d
AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6
AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
-EBUILD etckeeper-1.18.16-r1.ebuild 2115 BLAKE2B b248c6c5c6f9965becb299df408b93598984867faec4c24db9303fe6f4a82b3bb0b7f5525a939a28115f9683ec31af9c54a3109240077711a40bebbd2102ecda SHA512 d3c8e2a9d7ce65836d699261ad51e5083f033b3147275412b774de2d385e0fafa07f7bedd33e1e4d94687a6aa977e180af0398372afd1967b09ce02b3c65ad60
+DIST etckeeper-1.18.17.tar.gz 100705 BLAKE2B afbd800d0d808997d1f618d81abf5b9c756384db4f4e0a9984349e9c512fc03ab04c04e9d968f99b5ff0eaf59727e4673fd107a0f6e04f14a0327c9247a39124 SHA512 6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00
+EBUILD etckeeper-1.18.16-r1.ebuild 2204 BLAKE2B 7a8bbbd23ca0abdf6c78f1ec44c888dfeff7307bbc000ebe0a06e16f4e3ed329eabd9c602697a343ec7dfb461afb98f0ac41a1b79c28745cbb6c5cb16ddae68e SHA512 9a46883c094c997623f8ae7a316c9ed526eee01dbc3b51c260b3ea3ba4b81b0fbf91e60e4c430e0a9186e3688fe305fc85df7e1318d5a40df1543e0669170ff4
+EBUILD etckeeper-1.18.17.ebuild 2271 BLAKE2B a55f09701c013ed97bf537345f08009665384bb1bdd1e15c369cf64ee239edd3446bc5acbe7769cb648e051a36b04a0a7fad940d25e810d8cb4973113cd8697e SHA512 fc794397bcd16c3927a875c6a301abda95caae227f6540163bddf50432e509c399d9c669feee0d3eda0a7ac2b436a12c4b6803a61cdbd64925a6373f9e47d3da
MISC metadata.xml 785 BLAKE2B 7a93b0ed9e98d9e3512a2be8fb0a1f9b1790ab563d6865e46348be6b05c8965937548890ff312d90cc52052c6a177922faacc53fa1eea6f35bec6924bdb69aa9 SHA512 47adfa4031df7a657b55fdf529f4465c704f278804fb9b08ab334e0f44e714b3f106c94a73cd6e0c903c2d2633243d23c93374a35a0ec15686248da6dbd33fde
diff --git a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
index e42c1c08f094..1b87e32407f4 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
@@ -35,9 +35,11 @@ PATCHES=( "${FILESDIR}"/${PN}-1.18.14-gentoo.patch )
src_prepare() {
default
hprefixify *.d/* etckeeper
+ local systemdunitdir="$(systemd_get_systemunitdir)"
+ systemdunitdir="${systemdunitdir#${EPREFIX}}"
sed -i \
-e s'@zsh/vendor-completions@zsh/site-functions@' \
- -e s"@/lib/systemd/system@"$(systemd_get_systemunitdir)"@" \
+ -e s"@/lib/systemd/system@"${systemdunitdir}"@" \
Makefile || die
rm -v init.d/60darcs-deleted-symlinks || die
}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.17.ebuild b/sys-apps/etckeeper/etckeeper-1.18.17.ebuild
new file mode 100644
index 000000000000..3e5e00bb3400
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.17.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 prefix systemd tmpfiles
+
+DESCRIPTION="A collection of tools to let /etc be stored in a repository"
+HOMEPAGE="https://etckeeper.branchable.com/"
+SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+IUSE="cron test"
+
+BDEPEND="test? (
+ dev-util/bats
+ dev-vcs/git
+)"
+
+RDEPEND="app-portage/portage-utils
+ cron? ( virtual/cron )
+ || (
+ dev-vcs/git
+ dev-vcs/mercurial
+ dev-vcs/darcs
+ )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.18.14-gentoo.patch
+
+ # Sent upstream
+ "${FILESDIR}"/${P}-egrep-deprecated.patch
+)
+
+src_prepare() {
+ default
+ hprefixify *.d/* etckeeper
+ local systemdunitdir="$(systemd_get_systemunitdir)"
+ systemdunitdir="${systemdunitdir#${EPREFIX}}"
+ sed -i \
+ -e s'@zsh/vendor-completions@zsh/site-functions@' \
+ -e s"@/lib/systemd/system@"${systemdunitdir}"@" \
+ Makefile || die
+ rm -v init.d/60darcs-deleted-symlinks || die
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install
+
+ doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
+
+ newbashcomp bash_completion ${PN}
+ dodoc doc/README.mdwn
+ newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
+
+ rm -rv "${ED}/var/cache" || die
+ newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+
+ if use cron ; then
+ exeinto /etc/cron.daily
+ newexe - etckeeper <<'_EOF_'
+#!/bin/sh
+set -e
+if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
+ . /etc/etckeeper/etckeeper.conf
+ if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
+ /etc/etckeeper/daily
+ fi
+fi
+_EOF_
+ fi
+
+ local conf_update_dir="/etc/portage/conf-update.d"
+ insinto "${conf_update_dir}"
+ newins "${FILESDIR}/${PN}-conf-update-hook" "${PN}"
+ fperms 755 "${conf_update_dir}/${PN}"
+}
+
+pkg_postinst() {
+ tmpfiles_process "${PN}.conf"
+
+ elog "${PN} supports git, mercurial and darcs"
+ elog "This ebuild just ensures at least one is installed!"
+ elog
+ elog "You may want to adjust your /etc/portage/bashrc"
+ elog "see the example file in /usr/share/doc/${PF}"
+ elog
+ elog "To initialise your etc-dir as a repository run:"
+ elog "${PN} init -d /etc"
+}
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch b/sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch
new file mode 100644
index 000000000000..c329deb0f5c4
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch
@@ -0,0 +1,85 @@
+From 0338d14862cdf5c50be451809af94232d8ca60a8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 15 May 2022 01:12:05 +0000
+Subject: [PATCH] Replace obsolete usage of 'egrep' with 'grep -E'
+
+egrep is considered deprecated (and is an alias to grep -E),
+so replace it with grep -E.
+--- a/doc/todo/regex_in_20-warn-problem-files.mdwn
++++ b/doc/todo/regex_in_20-warn-problem-files.mdwn
+@@ -1,11 +1,11 @@
+ exclude_internal () {
+- egrep -v '(^|/)(.git|.hg|.bzr|_darcs)/'
++ grep -E -v '(^|/)(.git|.hg|.bzr|_darcs)/'
+ }
+
+ should probably escape the `.`s.
+
+ exclude_internal () {
+- egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
++ grep -E -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
+ }
+
+ > [[fixed|done]] --[[Joey]]
+--- a/etckeeper
++++ b/etckeeper
+@@ -84,7 +84,7 @@ elif [ "$command" = "pre-apt" ]; then
+ command=pre-install
+ fi
+
+-if echo "$command" | LANG=C egrep -q '[^-a-z_]'; then
++if echo "$command" | LANG=C grep -E -q '[^-a-z_]'; then
+ echo "etckeeper: invalid command $command" >&2
+ exit 1
+ fi
+@@ -142,7 +142,7 @@ else
+ # fallback if perl isn't present
+ for script in $ETCKEEPER_CONF_DIR/$command.d/*; do
+ if [ ! -d "$script" -a -x "$script" ]; then
+- echo "$script" | egrep -q "/[-a-zA-Z0-9]+$"
++ echo "$script" | grep -E -q "/[-a-zA-Z0-9]+$"
+ [ $? -eq 0 ] && "$script" "$@"
+ fi
+ done
+--- a/list-installed.d/50list-installed
++++ b/list-installed.d/50list-installed
+@@ -17,7 +17,7 @@ else
+ # format "package version\n" (or something similar).
+ if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
+ dpkg-query -W -f '${Status}\t${Package} ${Version} ${Architecture}\n' | \
+- egrep '(ok installed|ok config-files)' | cut -f2,3
++ grep -E '(ok installed|ok config-files)' | cut -f2,3
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
+ rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
+--- a/post-install.d/50vcs-commit
++++ b/post-install.d/50vcs-commit
+@@ -66,7 +66,7 @@ if etckeeper unclean; then
+ get_changed_packages | sort | uniq > $pl.found-pkgs
+ if [ -s $pl.found-pkgs ]; then
+ sed -i 's/^/^[-+]/;s/$/ /' $pl.found-pkgs
+- etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages
++ etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | grep -E '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages
+ if [ -s $pl.found-packages ]; then
+ echo "Packages with configuration changes:"
+ cat $pl.found-packages || true
+@@ -74,7 +74,7 @@ if etckeeper unclean; then
+ fi
+ fi
+ echo "Package changes:"
+- etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]' || true
++ etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | grep -E '^[-+]' || true
+ ) | etckeeper commit --stdin
+ else
+ etckeeper commit "$(printf "$message")"
+--- a/pre-commit.d/20warn-problem-files
++++ b/pre-commit.d/20warn-problem-files
+@@ -2,7 +2,7 @@
+ set -e
+
+ exclude_internal () {
+- egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
++ grep -E -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
+ }
+
+ if [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then
diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest
index 03e26515023f..f3911ec9d51e 100644
--- a/sys-apps/ethq/Manifest
+++ b/sys-apps/ethq/Manifest
@@ -1,6 +1,6 @@
DIST ethq-0_5_0.tar.gz 15830 BLAKE2B b18326f1564d08f94500aa934838053a3b84b78f3d6fa90984c3730ac8922fbe3fd5141d5e9ff4a2c8db54bb8d2c2e493f5583f46b287324d4327583f29b8bf5 SHA512 989978e0dfbb553497f5325807f2d09e4e2842de9df5f5717e832312141adba3e99ef1d57dde4ac0fdd2919c9f5a0eadef5b5f76a300ab4ac7e881c8509fbbec
DIST ethq-0_6_1.tar.gz 23475 BLAKE2B 04d933294ba432ed69108022b0a2b13c47537902f66c6969bbd5afca144a977a6215a2164cbefd975d0f599bd8503feca79ef9e38856d8c9e6943c2cd2c3f99f SHA512 72c38ecb0cb6c7d6f522d99f2a6ec08bd2c42065d5f83d86890706a52420006fcdb5774a1457a66ccd5e174113e09c2a4285d311af334616a01c32ad8753126d
EBUILD ethq-0.5.0.ebuild 1163 BLAKE2B e44cdf337ce09cd74b5acd6181e42ee3770b1c0dd6208103c6124520bfd37f58a5f80ea937575cbe77f067561847b9f71c590cef9f6509aca4e84ea5ddda562b SHA512 c008cfb872f7f0521e441ee51f3da5b74ebc17529bf1eaed7a9e4d7c23e36e86421708a44f42c463e94bc945af8cb8c9b78c20a0e5cd178eb30a9d5f223e69fb
-EBUILD ethq-0.6.1.ebuild 1137 BLAKE2B 9247848c08414e60a0b838c2b3a49676e28092065b32bc848a616b701d1b90c27b92f7c596d9213d68b34c8ad8e914cebc3fe919d2b9334b0f5f56c881d3011c SHA512 ac371c13b88fa8dc7bc5e87ae5c72b96cd18627e5b8b7cba40c14292121f22a81a4dc49460bdff3927b0d6781aefccaf585b519ab69c365fa7b0813ab10900dc
-EBUILD ethq-9999.ebuild 1077 BLAKE2B 2b8d087fa0c4dd68fa10e8cef7f3edb49186a46813cf42263123309529af58cdf6a323c43a3ae08fd1b0dc1009cc9653afc5ec6cfaf17d1cdfdd2c06067b5c89 SHA512 78ceec7d190e7462bcf82a6720ceb4bf33c75451ddb22dae2c4a0e565805e8846df0b1876046159bc3026d4665efeba221c33f3fcc7b9eb14ccb8ff8e7880c8e
+EBUILD ethq-0.6.1.ebuild 1156 BLAKE2B 9a67a1ac0e32dce08d4f1f6ff1062d5ad1e7336bb4a317171a89777e77deafa7ab16e2ca2b7b4e2861c0d8f5fb17bb0fa7e3b5f9a02d42b7f0e9eb99ab4682f3 SHA512 4737c046c04429b3fab79cf3432aa6e737ef298c6d1f06f29862bd2347f622627c108d7298412dff2aec188a8c35515b20f15ba9fc50504f96633600d77f9852
+EBUILD ethq-9999.ebuild 1098 BLAKE2B c45d997f816b538b2fbe6ab67b77e53a93b2b69844b1141964e32161178735007c1a46e2bd966c18ebb58fe4cde24d4f4a180bee3cc92ad8bb29ff116b9c34dc SHA512 96cfb486a19f344a781c19820c2d99c2c3dad542d27bb18bbbf9904da8a65c89baf9c31078472c9955f91c51dbb6160a3c92ce1c76b74f6819f5c643556e4cae
MISC metadata.xml 658 BLAKE2B ba812092d01392bf05b02254be6ec098178912f90708aa8ed3384206da40f32d655782abe08bcdfb7c4ddc4520f8485c24d6328d1a53e4abf5d0c604f9cc8bd7 SHA512 6d1c05d10d30a81c6ae45173bd3e6d3b4eeaff9c2210dd80e079609df873ae6f642469ed6e77446338a28c40a76e65cd1d3f11a44df3a09a894a9a0f373df68b
diff --git a/sys-apps/ethq/ethq-0.6.1.ebuild b/sys-apps/ethq/ethq-0.6.1.ebuild
index 6749cb3094e6..172f1ef054f7 100644
--- a/sys-apps/ethq/ethq-0.6.1.ebuild
+++ b/sys-apps/ethq/ethq-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,17 +18,17 @@ KEYWORDS="~amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
-DEPEND="sys-libs/ncurses:0="
+DEPEND="sys-libs/ncurses:="
RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
src_prepare() {
default
- # Respect FLAGS
- sed -i -e '/CXXFLAGS/s/= -O3/+=/' \
+ # Respect FLAGS, remove Werror
+ sed -i -e '/CXXFLAGS/s/= -O3/+=/' \
+ -e '/CXXFLAGS/s/ -Werror//' \
-e '/LDFLAGS/s/=/+=/' Makefile || die "sed failed for Makefile"
if ! use test ; then
diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-9999.ebuild
index 76ff4fd29c74..11b6f2389400 100644
--- a/sys-apps/ethq/ethq-9999.ebuild
+++ b/sys-apps/ethq/ethq-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,17 +17,16 @@ KEYWORDS=""
IUSE="test"
RESTRICT="!test? ( test )"
-DEPEND="sys-libs/ncurses:0="
+DEPEND="sys-libs/ncurses:="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
src_prepare() {
default
- # Respect FLAGS
- sed -i \
- -e '/CXXFLAGS/s/= -O3/+=/' \
- -e 's/ -Werror//' \
+ # Respect FLAGS, remove Werror
+ sed -i -e '/CXXFLAGS/s/= -O3/+=/' \
+ -e '/CXXFLAGS/s/ -Werror//' \
-e '/LDFLAGS/s/=/+=/' Makefile || die "sed failed for Makefile"
if ! use test ; then
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 15c658b86bda..4bd9988efa98 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -3,9 +3,11 @@ DIST ethtool-5.14.tar.xz 318536 BLAKE2B 09b5c9c8103635e33b22e55caff3b0f3751bf14d
DIST ethtool-5.15.tar.xz 318864 BLAKE2B 855c07e388bfabf37637f20e2714c6ca27717f38d7f658be96e0e9ec9d4514e61f4ee29361fc0279510869606ad18126ccd2a47160f1097ab52b1e35216e9721 SHA512 28147468a92c179217b459907a3257ee4f2d2ed028cb87b074f1c7ca6eb91aca81c8a9f5c7fe74e81d16a516e6e7eb20137bf7a15b5479fd82a327c64954da12
DIST ethtool-5.16.tar.xz 320308 BLAKE2B 198d76502510e533b7f51785fd9f0848e840a6b4237bfd0496d005978ce3e638be02bd7dee971501f57c83354a1ac2f34a7ef29f2255764e900d9299bad9254c SHA512 9f0c24323b3144cbc6e684dc8c545a7c5e4804a061f10e32c937ea7420cc25c0891137fd4be4f1b9cf44907d8a59970ead9db424051ec5b4a90c225038f04025
DIST ethtool-5.17.tar.xz 321848 BLAKE2B 1695077d812b3ed8e287615d6a3aa15525a061110fa63563e4b2db3e5d4718b023415508db63e857c572fef248c6797564da596f17c80b833839899656840a5d SHA512 c9677829e3ed1f373bd993f72c710293a6e987bbd19829d437a436f42cf4e7995ee70a7db3590b1499ff6aa29c26815f4d0a3e4798ffb6992ae3f52b079cd3ff
+DIST ethtool-5.18.tar.xz 322600 BLAKE2B 5c06c74ac1453b66fa3f2a01a3face8c6483bdd6849a0b258f5a3d0c041712de4d628240843d09a54e69ec6256dfaac5fa3b08d5e1d2033b2810a01f9be04673 SHA512 bd53e64d5cfe0fe4c3fbc9ec84e64f77b72d0229bbb611575007fd1e4c5c13611440b292edc875f1916707477e1d1e19b8f46785285d6b88066e9b9aafba9753
EBUILD ethtool-5.10.ebuild 583 BLAKE2B bbce36771a7b34b2b62b533a36df3d4039b913ac36e34cbd63fc5a28e7d717cb8449d65c1cc0cd80353f55ad3380eea3fa9d9f2cfacbc574b172bcff7f7e8910 SHA512 79631f2df71aa0c831e92578dac932d49f1fa9b946b9450d7f61d8fdf14dda1a218e79bb51ffc1ebe9534505c68ddaa9d547c7c8b6c2d271c1ddc34130e5fddc
EBUILD ethtool-5.14.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9
EBUILD ethtool-5.15.ebuild 590 BLAKE2B 8850ed177a2ac5d814239e4eec4c72a216d562496cda15c1698aee52784a60ef82d245e65fa66f712c66310e2bf33967834e741c7add499ce5f1c69b9f7c0245 SHA512 919c114df09392c26db2c1ecfdc7cedb4ded632c00c4270b6f9405b51559ccb7928d55e65ef5f4cc06d177674016774ee440ea92dad88da86fdf7e3b461d3af1
EBUILD ethtool-5.16.ebuild 598 BLAKE2B baf3417913dc24fbd8d9f3bdb2e2e95f1ef4ced1d49b9a8de5e30d7658e4a84e0b4f7ffc90ffc09a1274ebb2e932b1285040e777aa7b0339acfc345975276a8f SHA512 00dec7c445440facc0a9a8008b7bc02373b6043ac0255e020db9c6715f4895d3749ef443bf7d6123c5fd1d4aefdeb416b408dfc8117e374e36be8652a313a663
-EBUILD ethtool-5.17.ebuild 598 BLAKE2B f5b61f4816ca4828528099f776c5d39aeda01c306e86fd4fc1bb7f5be84e611fc98365bbd3e1a3fda3a98baeda106b36779c618a21afbea2f4b7066af394388d SHA512 0b3cdcd71fbfc619f3ef17e2b832c2e34529b48de5f65d333c3e70a98cea2bf78055463d935e23917f6aba1bdef4c215459ee2e06814ef91cd42c05a9808f8fb
+EBUILD ethtool-5.17.ebuild 605 BLAKE2B 211cc227d19ac68d86acdf7e50e73f8833e863941e2629d48b39760be6009c6f344bea645213905ae0edcdbb11cf1a78132e04480ada3dd345b1a37aaa6295b1 SHA512 9e690eae2077bd53704fec3e5f5fd5ff9fa902e158730b77c1a5a78af774dbf40bf9811e7e9265cad6c691ce672bf7a26aec963bbe2a3d024bfee1f0d00d70c5
+EBUILD ethtool-5.18.ebuild 605 BLAKE2B 1f0b0a87665434d31c5dc09d7902c629c118db82a39cbb3d63859bcfe7a60d69ac18e5a35c0244805926d9d044777e4ac6b4474d7526975436ed733970cb06bd SHA512 39862ccb79c301109d774a13e8862cc53654ff08278ac143a4a7b8b62178a47d6b2a341fa19804afd4d8691110c1c60cd4024f99b389bc9365ce82977f4996dc
MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-5.17.ebuild b/sys-apps/ethtool/ethtool-5.17.ebuild
index 66a327a8020b..66d4d3278c3c 100644
--- a/sys-apps/ethtool/ethtool-5.17.ebuild
+++ b/sys-apps/ethtool/ethtool-5.17.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="+netlink"
RDEPEND="netlink? ( net-libs/libmnl )"
diff --git a/sys-apps/ethtool/ethtool-5.18.ebuild b/sys-apps/ethtool/ethtool-5.18.ebuild
new file mode 100644
index 000000000000..8d122a733c09
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-5.18.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+netlink"
+
+RDEPEND="netlink? ( net-libs/libmnl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils"
+
+src_configure() {
+ econf $(use_enable netlink)
+}
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index 7635d4ed06d0..980c62bed893 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,4 +1,7 @@
AUX fakechroot-2.20.1-glibc-2.33.patch 13065 BLAKE2B 3ed7c151bd07c323c3bf0e6eb925d6964dcf18fbb92c17cee3537ec0c707ce727e624a17335ad60fa74f06c86a41abd011f3c0f1f1fa50a2f58b4c35cd1bfdd7 SHA512 8cddb31f70d819ffe1058f5f764d12634b5bf290379f709e6d3a08796b7c8ba2a97157a19b7fe9c886f65f495a7e42ca84fa3f9651d3692df11b0f69e9588be0
DIST fakechroot-2.20.1.tar.gz 504343 BLAKE2B 73459895319c1fd6297ab455e0d15f4b9985f433d958598d8581a35268e4df0f631b39d026061fe5c00ec6b805f3bf4f5f261039b93176db460b6f936c0de1b8 SHA512 9ddc715ff5c550b700c2384284c9f0cf6c2a99353a06d8e4c3b8363f4affdf9a11757ed5d1c9b85c83499b3bec054544290508a20f2ee16d46e66dc824a924ed
+DIST fakechroot_2.20.1+ds-2.debian.tar.xz 16120 BLAKE2B f4fe6943ca8e0f2bc68cc9d97af1195c34b8700b37838ced773e1452352d46806ebd31dbd6439121fa625ce74148d749e5064fe347ea5b1fa2e41c4e1b1a9867 SHA512 060448526eb7ac89b53984c582bcfffb641abdf4e7696e0033610343039012e6d459fb6682b4c1caa12bfcb91d515dfc4123ff3f1be3468d9db1a58ab9a8b415
+DIST fakechroot_2.20.1+ds.orig.tar.xz 88680 BLAKE2B 5e119eb6d7acee1f45bfc267e15b228624bbc5e29ebb19bcb61c4684719df4ce751c315423c27bceb0e2f97bcd491daa16d76f6b964842dcaddb90761dca092e SHA512 c61960b4fb03e65d7678511ae01a6f977d7f5584e81ee15a283f98da102dfc85d923265936443c7e9e208b62bb2147e8ae21a0ac62acf5bd8432775a4f6e723e
EBUILD fakechroot-2.20.1.ebuild 592 BLAKE2B 3e2f4b9323b3ed118c5449cbc16fbe894e03f92640ea4a548d45d65a387ba16f509275a925d326ae219c8a446159f80c92e64a9daa4e8bca3f8bd83b566bcf83 SHA512 fc41327b742410adb4baafc2d45399b3ed36f17660ea6c6b15fd0c50c5dedf32a670eb65ca12fa1184344c53f0924a20f9f6dfbd9f7ecfbc4a6ac4f43cfb2a96
+EBUILD fakechroot-2.20.1_p2.ebuild 1080 BLAKE2B 975bc389732110493828df10665b1bd4c2f7452593e5d7e6b074c6e5a4ca2a520d1b3829d3cea91b17f78736f9db4e5740448d588df33018a33488ace9d5e9f8 SHA512 6bf4969ddd7db337aad5a933f3b4f6c9b90e02a80d700070fb6da27ba44038fd3b3ea7d4d3b770908889453a69d512bd09633f4dcbdf090125f66986833ce16d
MISC metadata.xml 250 BLAKE2B 439cdb685dbeb4302786aefff7c6285f3fe97a6b1dd5dc66d2ff8b8e640c67b7db0ad3935428e819422598f3baf2a6795435bf0ba157ee49f427424c4346ebf7 SHA512 77c38fd1709e879ba98cf21c705aa95a31e7a9068a64105e7c9bec80efda5ee0ca7ee486346ace48849deda2e54a693f248b7eaa0d97f78da31797b8a7fc6b6c
diff --git a/sys-apps/fakechroot/fakechroot-2.20.1_p2.ebuild b/sys-apps/fakechroot/fakechroot-2.20.1_p2.ebuild
new file mode 100644
index 000000000000..6e11e6023fc4
--- /dev/null
+++ b/sys-apps/fakechroot/fakechroot-2.20.1_p2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream seem to be kind of dead, so using Debian's patches.
+DESCRIPTION="Provide a faked chroot environment without requiring root privileges"
+HOMEPAGE="https://github.com/dex4er/fakechroot"
+if [[ ${PV} == *_p* ]] ; then
+ inherit autotools
+
+ SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_$(ver_cut 1-3)+ds.orig.tar.xz"
+ SRC_URI+=" mirror://debian/pool/main/f/${PN}/${PN}_$(ver_cut 1-3)+ds-$(ver_cut 5).debian.tar.xz"
+ S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
+else
+ SRC_URI="https://github.com/dex4er/${PN}/releases/download/${PV}/${P}.tar.gz"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == *_p* ]] ; then
+ if [[ -d "${WORKDIR}"/debian/patches ]] ; then
+ eapply $(sed -e 's:^:../debian/patches/:' ../debian/patches/series || die)
+ fi
+
+ eautoreconf
+ fi
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index beaea7259e83..fc3488cbb9e3 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -1,10 +1,6 @@
AUX fakeroot-1.25.3-glibc-2.33.patch 13646 BLAKE2B 1a83706a9e26f9c11d9851c24659086206df2d518c3103354971436565d59e8c5cdda47eaf40dc6645d7b09542e766593d57f731d7d8946ef96a1852b12ea2b0 SHA512 3f5402763d32a0b7461ef817e5aece42ff4807780ab886a7867d03019d0a4c501350a3520932e1ba6dcd592ae0cb9548c2cdf1da5498bfb6092f4cb6b4a09096
-DIST fakeroot_1.25.3.orig.tar.gz 126884 BLAKE2B a6a860a8714bb2a43f2820bc586cac38d25df8b8cb32b219064618c845d0308b57929108bd582b46c15b2fe4b2fc00d662ba72458a9e9ffcf7d035dce515eb55 SHA512 b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346ff72e857087243ab0efe9fa82faaa9f9c3309cac4b5af0ea00908c2e5eb6e
-DIST fakeroot_1.26.orig.tar.gz 549685 BLAKE2B d9177403d9c2be88c0949c891cde5742a405027714b07ca2c7e72813dba049157c3d994f30b9c634016a74c74745f8391ee51035cbf385ef63364d0a31291d43 SHA512 dad193b283b48a25806c5bcd06d1f5bbd183ccd40a3fc25f3e7bb88fd6579024f958321f8336654348a1d0a547d4ad19ed11aab5ec9441d6ef493ee6e4c78081
DIST fakeroot_1.27.orig.tar.gz 544301 BLAKE2B 5e887d43c8bedaecbe51eb7f606d6bace3a9f191a7cf4be32362e1ba97e438413f04ed644532d3a386a46f3a569bf0104c4f38272e5ff46e3705c17896fef972 SHA512 cd98b8cd1064a5a11c6f25bc1d9cb1fb1bf0787f50772fead301470d1769c08a89a1510402b099af334d9f126cea5d3bd5d73e27fb91b5afc1ceebeb9ec3f926
-DIST fakeroot_1.28.orig.tar.gz 546234 BLAKE2B 1182ce0d382511c92bd0d414fc43150db86753ade8ca09a371fce404afc271458626b89c5df329a5aa8911a97cac9eb4132a8f20c9ab2e4e8196c92c8f42c08e SHA512 cd55007014da5741ff336d005a80633a2f1ed856e075162acb9a4a1edd5c6d17ec74457c8a1e31edb02ae70920904c53e69365d55bd9beb7e8c6211aa8cfca8b
-EBUILD fakeroot-1.25.3-r1.ebuild 1414 BLAKE2B 91a267692babc8b0abbe427e4134da68568b4cb80394d56137e344279f372b652124d42a6f5ac62ee044588ba676a6d31f11a4d239ef67b6476eb7d3490d47f5 SHA512 64abe5083b325ee134758a0b51e25a3371757523317daffcded913024eec4b702d7c886bff4c7780605ef82d1b6ebdc005949b24780c4f3103a25d1cb9a037a6
-EBUILD fakeroot-1.26-r1.ebuild 1879 BLAKE2B 2e9df91ce0cbbe00cb6db58fcdbe40002d52b0e9078f1fe227d708d77a96a92e8444d5bde975705f14df0ab2ab86b4fd857dffe959b89879fd59530fa65d0166 SHA512 2aa0caf2cdcf10e1cfda448825800738d50682a2f52b86090638f1833e01245d79e47493787a3e0e0f49f7b6da4b218d2144f752704346af0da4387b10485d77
-EBUILD fakeroot-1.27.ebuild 1879 BLAKE2B 2e9df91ce0cbbe00cb6db58fcdbe40002d52b0e9078f1fe227d708d77a96a92e8444d5bde975705f14df0ab2ab86b4fd857dffe959b89879fd59530fa65d0166 SHA512 2aa0caf2cdcf10e1cfda448825800738d50682a2f52b86090638f1833e01245d79e47493787a3e0e0f49f7b6da4b218d2144f752704346af0da4387b10485d77
-EBUILD fakeroot-1.28.ebuild 1878 BLAKE2B c554e13742632e7e9daceeb6ee876237cca103913f2bd1c20c63df96b5c7bf48a192a8688ccc612c47ae39ba1f39d048e2e400bfe9a1da27eec879f5dfdaee8b SHA512 8a7527b6cb32ae88345b479fbfa8daf3a673b73c3d79cd980eac7871a6eded926f5925c2a90d04a90441fbe93a8f96e3a332de431efb584bd78dffae1a4f075e
+DIST fakeroot_1.29.orig.tar.gz 549383 BLAKE2B ccdc5e793ce6a6adc9ffdb9346045e144dcd802ca8ffcbd188010ab759861d0e0ae81b3baa256546398c2ddab31d1f795f327130cb1f7bb1c3eee07e7282e94b SHA512 d0f02c36cfe4e24f1588894bd732ff5a6fc0e921695236311019a63280efdca8568f2e974672145eb7c4d57f64a15a77d23658fd4aeef2ca24901fc66259e4dc
+EBUILD fakeroot-1.27.ebuild 1873 BLAKE2B 403342870cec943c9293250b47cc0c830c1bb69d5b341cacd3427c81bc9c04b39a16db8aeca88dabcdc670998bf3e2a312ea7520090c738bd450663735fa3e94 SHA512 ac5db48a976bb2ef41e03dc82c8617428ee3f923e5044085b6eac1be22c852227cd4f39d18092a776f99142de1754cb203c22971a45f304c281ce9e8a0981597
+EBUILD fakeroot-1.29.ebuild 1878 BLAKE2B c554e13742632e7e9daceeb6ee876237cca103913f2bd1c20c63df96b5c7bf48a192a8688ccc612c47ae39ba1f39d048e2e400bfe9a1da27eec879f5dfdaee8b SHA512 8a7527b6cb32ae88345b479fbfa8daf3a673b73c3d79cd980eac7871a6eded926f5925c2a90d04a90441fbe93a8f96e3a332de431efb584bd78dffae1a4f075e
MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild b/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild
deleted file mode 100644
index 1089638e5e2d..000000000000
--- a/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
-HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- sys-libs/libcap
- acl? ( sys-apps/acl )
- test? ( app-arch/sharutils )"
-BDEPEND="app-text/po4a"
-
-DOCS=( AUTHORS BUGS DEBUG README doc/README.saving )
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/fakeroot-1.25.3-glibc-2.33.patch"
- )
- default
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_header_sys_acl_h=$(usex acl)
- use acl || export ac_cv_search_acl_get_fd=no # bug 759568
- use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING
-
- # https://bugs.gentoo.org/834445
- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101270
- filter-flags -fno-semantic-interposition
-
- econf --disable-static
-}
-
-src_compile() {
- # Create translated man pages
- pushd doc >/dev/null || die
- po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die
- popd >/dev/null || die
-
- default
-}
-
-src_install() {
- default
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/fakeroot/fakeroot-1.26-r1.ebuild b/sys-apps/fakeroot/fakeroot-1.26-r1.ebuild
deleted file mode 100644
index 468f9ec15684..000000000000
--- a/sys-apps/fakeroot/fakeroot-1.26-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic plocale
-
-DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
-HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug nls test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-libs/libcap
- acl? ( sys-apps/acl )
- test? ( app-arch/sharutils )"
-BDEPEND="nls? ( app-text/po4a )"
-
-DOCS=( AUTHORS BUGS DEBUG README doc/README.saving )
-
-PLOCALES="de es fr nl pt sv"
-
-src_prepare() {
- default
-
- disable_locale() {
- local locale=${1}
-
- sed -i -e "s: ${locale}::" doc/po4a/po4a.cfg doc/Makefile.am || die
- }
-
- plocale_find_changes doc/po4a/po '' '.po'
- plocale_for_each_disabled_locale disable_locale
-
- # We could make this conditional and disable the autodependency in
- # autotools.eclass but it'd make it too easy for NLS builds to be broken
- # and us not realise.
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_header_sys_acl_h=$(usex acl)
- use acl || export ac_cv_search_acl_get_fd=no # bug 759568
- use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING
-
- # https://bugs.gentoo.org/834445
- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101270
- filter-flags -fno-semantic-interposition
-
- econf --disable-static
-}
-
-src_compile() {
- local enabled_locales=$(plocale_get_locales)
-
- if use nls && [[ -n ${enabled_locales} ]] ; then
- # Create translated man pages
- pushd doc >/dev/null || die
- po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die
- popd >/dev/null || die
- fi
-
- default
-}
-
-src_install() {
- default
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/fakeroot/fakeroot-1.27.ebuild b/sys-apps/fakeroot/fakeroot-1.27.ebuild
index 468f9ec15684..521acfa7444a 100644
--- a/sys-apps/fakeroot/fakeroot-1.27.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="acl debug nls test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/fakeroot/fakeroot-1.28.ebuild b/sys-apps/fakeroot/fakeroot-1.28.ebuild
deleted file mode 100644
index 8d511343efba..000000000000
--- a/sys-apps/fakeroot/fakeroot-1.28.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="de es fr nl pt sv"
-inherit autotools flag-o-matic plocale
-
-DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
-HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug nls test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-libs/libcap
- acl? ( sys-apps/acl )
- test? ( app-arch/sharutils )"
-BDEPEND="nls? ( app-text/po4a )"
-
-DOCS=( AUTHORS BUGS DEBUG README doc/README.saving )
-
-src_prepare() {
- default
-
- disable_locale() {
- local locale=${1}
-
- sed -i -e "s: ${locale}::" doc/po4a/po4a.cfg doc/Makefile.am || die
- }
-
- plocale_find_changes doc/po4a/po '' '.po'
- plocale_for_each_disabled_locale disable_locale
-
- # We could make this conditional and disable the autodependency in
- # autotools.eclass but it'd make it too easy for NLS builds to be broken
- # and us not realise.
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_header_sys_acl_h=$(usex acl)
- use acl || export ac_cv_search_acl_get_fd=no # bug 759568
- use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING
-
- # https://bugs.gentoo.org/834445
- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101270
- filter-flags -fno-semantic-interposition
-
- econf --disable-static
-}
-
-src_compile() {
- local enabled_locales=$(plocale_get_locales)
-
- if use nls && [[ -n ${enabled_locales} ]] ; then
- # Create translated man pages
- pushd doc >/dev/null || die
- po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die
- popd >/dev/null || die
- fi
-
- default
-}
-
-src_install() {
- default
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/fakeroot/fakeroot-1.29.ebuild b/sys-apps/fakeroot/fakeroot-1.29.ebuild
new file mode 100644
index 000000000000..8d511343efba
--- /dev/null
+++ b/sys-apps/fakeroot/fakeroot-1.29.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="de es fr nl pt sv"
+inherit autotools flag-o-matic plocale
+
+DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
+HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug nls test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/libcap
+ acl? ( sys-apps/acl )
+ test? ( app-arch/sharutils )"
+BDEPEND="nls? ( app-text/po4a )"
+
+DOCS=( AUTHORS BUGS DEBUG README doc/README.saving )
+
+src_prepare() {
+ default
+
+ disable_locale() {
+ local locale=${1}
+
+ sed -i -e "s: ${locale}::" doc/po4a/po4a.cfg doc/Makefile.am || die
+ }
+
+ plocale_find_changes doc/po4a/po '' '.po'
+ plocale_for_each_disabled_locale disable_locale
+
+ # We could make this conditional and disable the autodependency in
+ # autotools.eclass but it'd make it too easy for NLS builds to be broken
+ # and us not realise.
+ eautoreconf
+}
+
+src_configure() {
+ export ac_cv_header_sys_acl_h=$(usex acl)
+ use acl || export ac_cv_search_acl_get_fd=no # bug 759568
+ use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING
+
+ # https://bugs.gentoo.org/834445
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101270
+ filter-flags -fno-semantic-interposition
+
+ econf --disable-static
+}
+
+src_compile() {
+ local enabled_locales=$(plocale_get_locales)
+
+ if use nls && [[ -n ${enabled_locales} ]] ; then
+ # Create translated man pages
+ pushd doc >/dev/null || die
+ po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die
+ popd >/dev/null || die
+ fi
+
+ default
+}
+
+src_install() {
+ default
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index ec08faec59b2..bb27e6e5a6cd 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,6 +1,9 @@
AUX file-5.39-portage-sandbox.patch 604 BLAKE2B d755d85ae85826df5d2beb2d05f570e230af671c23f27bb1e3e811d1f2f710ae3d4f14d271f9dc4da4d1aa4e71070561d1121deaccf8781de72ff9aec059caa3 SHA512 a65368ed9225b0ca6e7341283a20b308c5d5ca38838849d5228be762d4d87de0438084af8f7cd7b6ee1a707125226940490a80cc1eafc2c817fc865a6211c890
AUX file-5.40-seccomp-fstatat64-musl.patch 723 BLAKE2B cb6e5151b863328a4764f38f49cf42420eb13444783301af5f5e380e67da932d298ed94fb64a2a1a50ca349b43d73b77d6495df090d8b3adddc2b236b7fe3a42 SHA512 b25110ca59be28ca67a972c9737315efe357c2bbb8dbae4e6ecf80283bb0e9db4184574bfef2d965087493ede4979f649a762fa9bef2415d2359db117dfdb04f
DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
-EBUILD file-5.41.ebuild 3347 BLAKE2B 4f89900b47ae417d70818d42601e25ff9977165d63f24ad47ef477a3400f73cd70496f29a60bb082a24e7c3cea6386e39b3b4101ff536c418af357babe41eb79 SHA512 3ccab3db4de1facb4cde7faf16a8186820727de98d34af0294ccbf4a913f785e931c7b5cf87baf1f4f955079aa3df0efc51076938383ec8b556d657c8b499fd6
-EBUILD file-9999.ebuild 3266 BLAKE2B 967412ca3e0b7dfff1e2104e0d859c5376f3221a8b27b7c270c38f76c02b57bee0b3dac01387f8fc006a19bac875afabfc08eec1773ef419ff33679cf911cbf9 SHA512 2575765252b959a63833187ced7094bda200a5c3fa2cb69f0135e5028fd71358c9c2aae2a685ad27731437e2aebacd23df9766f39d539ad232e92195c3a6b3a2
+DIST file-5.42.tar.gz 1105846 BLAKE2B c557facb066ae0599db832ddbbc3fed7db2e057faefe832cb4bed8f860b63456217bee39f0c82b17902c3b91426e522681216d2d3ed689501fa00d69a4a09832 SHA512 33c3c339a561c6cf787cc06a16444a971c62068b01827612c948207a9714107b617bed8148cd67e6280cb1c62ad4dfb1205fb8486ea9c042ce7e19b067d3bb05
+DIST file-5.42.tar.gz.asc 195 BLAKE2B 9b930bcd6b98878e60cd72d8d71b40201ebbf3ab1dda7d2b0e3228abdc0c1e21473a012b9799dcac8638ded1bdbe03865c5e41ed4086076a7df6bf6aadbfe29d SHA512 a7105c48f6c671638f5fb7f18f9b193d108456655b4c734208e00aca36fab54dd330ec2fdc3ff29fb78adbc16874af4fb0916c560e50228f82003a8cd258491a
+EBUILD file-5.41.ebuild 3347 BLAKE2B 413305c675ac4b0af437e2ca48d4edd3ca29bbd3cfac376ebaed000142eb5a191f7d1c85449838ae204ec6c294828af68cfd7e6fe885b82c255d0570bc16b18d SHA512 396ef33817680b5bd48d7239e455f3c798f8813267ab7ea19dae7f845ad039164b88c6600887aba4254916a4ec857baaf01b949c6276510490e089d1f5b52f9b
+EBUILD file-5.42.ebuild 3712 BLAKE2B 5f769622b69aa3836386f50da10da5f9e8ef8bc0e8ae82637686a791d6b2c20261056f8386ba896aa0d9450367127312c601d9371da1fa5c912900deeb1d505d SHA512 eac92daa30a5c84a9205498d1bf994a17f84b8d815b62b5c580c783cedf845d45a0d55d7f29a088306b4b40386bc819f13b8f929d988f1770388a1d16d42efc3
+EBUILD file-9999.ebuild 3630 BLAKE2B 7eaf1c27c8b192957a7f3ba08f6e0ba3f45e52689fdd87e98a9d2d9e955b1f43fdf2410dd48a3c8c858f0c6eb467d6c987b02fd432ec25d6be16fa6e71c89880 SHA512 28655fdb206cc8d60778f63da73cfed704c9e4c3304c76885448eac56bd9549c950a0d70102b341459834694bae87e5cdd9d9159d29f308da0f6b33690513bca
MISC metadata.xml 382 BLAKE2B 204b7440b6a18907045d7eae05e8c99d017fa57b5178462125b998d8b3af3e2be656353f5c69823f3b5ea4d86e7e6c028229af27abaf2f7ace6f181f9ebf4153 SHA512 0e56117ac1957f2393ab47dc875e5f07851f3866014388418f84668f5f9767f6ca83963547442606e1c637ed3bcbb81b317cf994de4a04cd28725d8f6cb49b5e
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index 8e64edcfcd6d..14fa1ec11ad8 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
DISTUTILS_OPTIONAL=1
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
new file mode 100644
index 000000000000..0b9cc3af8dba
--- /dev/null
+++ b/sys-apps/file/file-5.42.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/glensc/file.git"
+ inherit autotools git-r3
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc
+ inherit verify-sig
+ SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+ SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
+fi
+
+DESCRIPTION="Identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+ python? ( !dev-python/python-magic )
+ seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+BDEPEND+="
+ python? (
+ ${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
+ )"
+
+PATCHES=(
+ "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+ "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == 9999 ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+
+ # don't let python README kill main README, bug ##60043
+ mv python/README.md python/README.python.md || die
+ # bug #662090
+ sed 's@README.md@README.python.md@' -i python/setup.py || die
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(use_enable lzma xzlib)
+ $(use_enable seccomp libseccomp)
+ $(use_enable static-libs static)
+ $(use_enable zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+ local myeconfargs=(
+ --disable-shared
+ --disable-libseccomp
+ --disable-bzlib
+ --disable-xzlib
+ --disable-zlib
+ )
+
+ econf_build "${myeconfargs[@]}"
+}
+
+need_build_file() {
+ # when cross-compiling, we need to build up our own file
+ # because people often don't keep matching host/target
+ # file versions, bug #362941
+ tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+ local ECONF_SOURCE="${S}"
+
+ if need_build_file ; then
+ mkdir -p "${WORKDIR}"/build || die
+ cd "${WORKDIR}"/build || die
+ build_src_configure
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi ; then
+ emake
+ else
+ # bug #586444
+ emake -C src magic.h
+ emake -C src libmagic.la
+ fi
+}
+
+src_compile() {
+ if need_build_file ; then
+ # bug #586444
+ emake -C "${WORKDIR}"/build/src magic.h
+ emake -C "${WORKDIR}"/build/src file
+ local -x PATH="${WORKDIR}/build/src:${PATH}"
+ fi
+
+ multilib-minimal_src_compile
+
+ if use python ; then
+ cd python || die
+ distutils-r1_src_compile
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi ; then
+ default
+ else
+ emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc ChangeLog MAINT # README
+
+ # Required for `file -C`
+ insinto /usr/share/misc/magic
+ doins -r magic/Magdir/*
+
+ if use python ; then
+ cd python || die
+ distutils-r1_src_install
+ fi
+
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 75f6a558ae52..7f27cf37781f 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -3,20 +3,27 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/glensc/file.git"
inherit autotools git-r3
else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc
+ inherit verify-sig
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
+DESCRIPTION="Identify a file's format by scanning binary data for patterns"
HOMEPAGE="https://www.darwinsys.com/file/"
LICENSE="BSD-2"
@@ -35,6 +42,11 @@ DEPEND="
RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )
seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+BDEPEND+="
+ python? (
+ ${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
+ )"
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
@@ -45,13 +57,14 @@ src_prepare() {
if [[ ${PV} == 9999 ]] ; then
eautoreconf
+ else
+ elibtoolize
fi
- elibtoolize
-
- # don't let python README kill main README #60043
+ # don't let python README kill main README, bug ##60043
mv python/README.md python/README.python.md || die
- sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+ # bug #662090
+ sed 's@README.md@README.python.md@' -i python/setup.py || die
}
multilib_src_configure() {
@@ -74,13 +87,14 @@ build_src_configure() {
--disable-xzlib
--disable-zlib
)
+
econf_build "${myeconfargs[@]}"
}
need_build_file() {
# when cross-compiling, we need to build up our own file
# because people often don't keep matching host/target
- # file versions #362941
+ # file versions, bug #362941
tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
}
@@ -100,18 +114,20 @@ multilib_src_compile() {
if multilib_is_native_abi ; then
emake
else
- cd src || die
- emake magic.h #586444
- emake libmagic.la
+ # bug #586444
+ emake -C src magic.h
+ emake -C src libmagic.la
fi
}
src_compile() {
if need_build_file ; then
- emake -C "${WORKDIR}"/build/src magic.h #586444
+ # bug #586444
+ emake -C "${WORKDIR}"/build/src magic.h
emake -C "${WORKDIR}"/build/src file
local -x PATH="${WORKDIR}/build/src:${PATH}"
fi
+
multilib-minimal_src_compile
if use python ; then
@@ -139,5 +155,6 @@ multilib_src_install_all() {
cd python || die
distutils-r1_src_install
fi
+
find "${ED}" -type f -name "*.la" -delete || die
}
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 1011a482a696..9392925af593 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,6 +1,4 @@
-DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e
DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9
DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc
-EBUILD findutils-4.8.0-r1.ebuild 1930 BLAKE2B 603aa026102ebfbd9857c7b6a53750d501a021bd537ae30ecf3d6494fbc628738326bffb78a26a65efb108ee48940965890ad6bfa5e6cd6ddd4a497876eb3722 SHA512 e9aafbee0cce1b9ef2bc032126c53adafcfcbc4fe0e9e81cdfff7c964354ce7c5ef6386088eb97b8120dcb027aaddaf819d643329f735594515daa18899bf4f2
-EBUILD findutils-4.9.0.ebuild 2078 BLAKE2B ce250e20b0168e6c5c204aa5c588fa6628b438aec4c838a0a80daa2248d98180d5e3c2692613149368f09e84fce2601ec02a0d34ac498e83a8414c1347e878c2 SHA512 6f57b27ae12a49f31f7d754919621392f16499130e3c89365fe59cd42c4520a28a84e802f25bb622502f0d7fa48114ed4dc396a17e8f0e1eb0e6dde52c81cdb4
+EBUILD findutils-4.9.0.ebuild 2070 BLAKE2B 2a80eaab75713eb0d898760f244a6c4108d1891293a674ee4150515a45808d8c8560cb5dc20487ef9b6733e88f42ed4a598ccfbb2b59bf557ab4db2f7cba46c9 SHA512 0ba714bee9b15612cb8109897e43b42d776cdeb866751b5529cf5fa890371c8a655ffb4da35b7ee15366419720e73ee71c1d002de33bf415ca698a00d4f08f84
MISC metadata.xml 333 BLAKE2B 321643b5c847879de4e8c0a4abebd5534e91fc7e58313ec3258520fc1f1266f98cc1892b57589cd1427ad4a0cea39b3c03ce12741b04f75290346fddc6c245fe SHA512 b36dfd42e3af70bc1ef3c7629297a390dced3edb1dc3d7d10d7672ff532da743453d9382cb15d3102885150c2440bd85019865d61c4e4342004db2dcf993f0a2
diff --git a/sys-apps/findutils/findutils-4.8.0-r1.ebuild b/sys-apps/findutils/findutils-4.8.0-r1.ebuild
deleted file mode 100644
index 0edfed04e0ee..000000000000
--- a/sys-apps/findutils/findutils-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls selinux static test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
- nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Don't build or install locate because it conflicts with mlocate,
- # which is a secure version of locate. See bug 18729
- sed \
- -e '/^SUBDIRS/s@locate@@' \
- -e '/^built_programs/s@ frcode locate updatedb@@' \
- -i Makefile.in || die
-
- default
-}
-
-src_configure() {
- append-lfs-flags #471102
- append-cppflags -D_TIME_BITS=64
-
- if use static; then
- append-flags -pthread
- append-ldflags -static
- fi
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html
- # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html
- append-cppflags '-D__nonnull\(X\)='
- fi
-
- local myeconfargs=(
- --with-packager="Gentoo"
- --with-packager-version="${PVR}"
- --with-packager-bug-reports="https://bugs.gentoo.org/"
- $(use_enable nls)
- $(use_with selinux)
- --libexecdir='$(libdir)'/find
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
- addpredict /
- default
-}
-
-src_compile() {
- # We don't build locate, but the docs want a file in there.
- emake -C locate dblocation.texi
- default
-}
diff --git a/sys-apps/findutils/findutils-4.9.0.ebuild b/sys-apps/findutils/findutils-4.9.0.ebuild
index 8cfe270bc20e..87b3edc629d7 100644
--- a/sys-apps/findutils/findutils-4.9.0.ebuild
+++ b/sys-apps/findutils/findutils-4.9.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/findutils.asc
inherit flag-o-matic python-any-r1 verify-sig
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls selinux static test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 4ac2214afe34..a8c2c2c2a686 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,11 +1,13 @@
AUX firejail-0.9.68-envlimits.patch 669 BLAKE2B 50b2f652e317ed7cc4da53d9ab990b8b857396b7489f0b76532477cd50c0cbbd58099f42d555b12e735a8131552d5b877f9cee4cee2594e112d6bded770728ad SHA512 c91cbe09aa565123a988d44b1a243d1d6c7f501dd97c29e193d1bee36ab674eda45f55cfded4b25b50b023b3d31e7ddb034fb6ad647ad83aeb97c82c60581423
AUX firejail-0.9.68-firecfg.config.patch 1528 BLAKE2B 9d1408b5311f39fbf1de4f0ce7c3c4b60165fa5e5c6c31b3eb74970d09f1d4ff4d5de7cf8b1a5e6266a53c74ac5010d67a47f38bb565489cd6d49ddfd5323c02 SHA512 7e52918e2d076b01a87c7e420f2e4162be386c5591f8f0720c30301ceabd22c2c83e0e0bc2a94c3b4fc8d3f8f6f4c9363d54204f6a11e5b14acc7057a4497c02
+AUX firejail-0.9.70-envlimits.patch 669 BLAKE2B 315d6918b70ea06f7b7aaac95065efd11a309710fb3e23cf57b9960cfa2c8cf339c4e731f5347127c54972105cec4c956d2ff1f418a1b516fdf56ce1c7b354d5 SHA512 92cf47cc3d32f3efb5f203228af0e78cad0f55fe9954f27c4e107ed4c26f6ae39b364a8507d5fe481e92222ede7d572fbe9c0e553b7ac38d6e5b812cb6741516
+AUX firejail-0.9.70-firecfg.config.patch 1662 BLAKE2B 71f301c49c97da5794ae4af35c8e0bca20845ef41be5c1db07911cb9de4ae0b52d7e48e37f0400c24302a820f577fe284d5c86d1f19f5b96570d66e5b92dcc0f SHA512 ec10c2e401817bb2833caa01c5f689f623f69c52a5ba48704c52f942c664274ca05755c6afaab89372a2a14122113bf0bc063e121e6ab92aec3e9a30a2b8379d
AUX profile_display.local 158 BLAKE2B 7bb73bfa3d1a6556f9e4840e425e0bb2ee6a1e9510100a7d22a01978975805f7b80fde9c596147ee42dcc7d098b07e4969e67eaf857e6286ef94a2795671a37c SHA512 d2c85a8de17ffc7d0bac0252f7b6624ff9ff9280ad2e33fc51b4085b72db4b764b4ad719fdb6a95fe62faaeb9c541b9704b3ad764245bedec142c9488ef1e20d
AUX profile_patch.local 198 BLAKE2B 6a84eca54c8fa5429b171707d6d2b7617c918798f40a1ea26fd1c6778a3688aa1db2be9d74025b7b8b863969c94c22de92a610d2b872b37ba216377f50f0ceae SHA512 86829f6b4867564447d06c73119a38e4ae7b5a386253229d5d0603398b9ed4ca64714221fa8aee8a9660644c3c38d762386a7a5a161fb717e6b7d7df723aa9ad
AUX profile_pdftotext.local 132 BLAKE2B 2c98ecf386cdceae4cbaf4e3623187c66ff81540d86f978467a6a0106d57a0f41f7626f1049602fee8b7545fa413ed6ca8e21e1fb1448a374b8d80e6ae72451b SHA512 c0121f1ba4db0a737acdd250834ccd73fcd441b5d7f8d5740f75230edbb10bd6bb038dd09772ba21cb24cf4224a474749a2e0f3d0e9567b4e207f4adf67c19d0
AUX profile_wget.local 128 BLAKE2B d2069517fce414faec2b23f8704fe15683a956af210e6e39321ca9f65bde939c71a7980506fdd3b01a6b15fb6733ebb013c684a63589839c60c53616a52ca5b6 SHA512 ef0b97b11fac742464b6520c6e6293017519b84c137c4aa60976b53b3d072bc9a69588267ac0a79c9647cee1e802fb0cd0d28e1647778e30473518415ce4d699
DIST firejail-0.9.68.tar.xz 477332 BLAKE2B 4d995715caa81b69bb9a16f604a2463b2db48fad5ba869bb5f353973ce8ec273dbabe07ee340b40094d6fe15bcef7e356cd07e7e7dfd0491d2d1632f64878a0e SHA512 8c03c145bb91fe696407052968bd1069defc44d274bd74d33fccebb28324121d259973fccc1d1cdc38fb2902bb842e921adc9440596a92a4aa13c4e06963e354
+DIST firejail-0.9.70.tar.xz 485096 BLAKE2B d5164ba5ee08e80415a84999e4152f1f9c897f50def669731098126cec117aed3cf4b21603aeb13ccbdb1bffa9d48de69dcb19fe7135691e891b9b83f48a5ca1 SHA512 a790ccb711da6c3e52677011d7eb38c482ffb5066498d4586018671ab4ee533e02edb31fda872e0647fd27c00014b04305eafcb56f1f1b07f470aa4fb701cbe5
EBUILD firejail-0.9.68-r1.ebuild 3046 BLAKE2B 4cff4e74660fb224440831490502763abeaa7fdefc0e350f1480abf38ad842bd77df525effd479af9f8371a3d4c9ea95a8d663bbc95fc3022c144816c2157727 SHA512 a9f79e7f93fc9cbc9b4cce5784aa51b99c994b1262532c75fe6340d787b56fc6c85866c803a537c59909b80c53f17977de47bb1f97298e56f656d405411bdd2f
-EBUILD firejail-0.9.68.ebuild 3044 BLAKE2B d7e26bce7d9cfffa594b6a72d121ce9efab1f384b25bcd1b00b0d1cccd58c9258756bdb983f2d44a9f02522c210662e7c646900f510dd4c5ce12c7973746cb6e SHA512 16ea37dd99bbfef8bdc6b5e82788a61bd0325615ccc7d5738dee24a0d6dc4c154aa14aebfd6786a75340ff199f695cfe12eb5a664d6111bc2102347996eec5b6
-EBUILD firejail-9999.ebuild 2618 BLAKE2B 4c9aaf9b58dd8983b9e6acd92ba33d44cb0b6cd41d034f3a22cf235c92b7b12bb53b1cbc73e83cf50571bf9e42e8da9ae86ed8da6739c49ac22222f3876b618b SHA512 dae3515ea76d029b93e4e0254ab8596a3eaaf6f745919fe8a81d0d84a27cc46d7001d26bed45a93c1c8fb0d0d6f5583a54d2e71d4039d1531df01e3de82a1135
-MISC metadata.xml 1814 BLAKE2B f8216f60d54df8ced109e016f0e5cc58a59dde8e8ff79b50964274607d829245db281d342274fcf82e20750988db2f5a8dfc0c2d914e83d61ae3193c1bb5aa7b SHA512 44221d68c026110e2e457adb851c1269cc3095f1f35ac3185213f2692b2a0758b5adf5d7d5b9929b9bc63bafb5e47b3b1d836c65732a7061dd729ca62c45b956
+EBUILD firejail-0.9.70.ebuild 3047 BLAKE2B e252a0c657c1e92a2420ed26bb67203a54ea08db7c1335cca477dbd745b04e627c7b8839f22b1c07e291fc0a369bdc660c9f4b9a079bb6224c713535a82e8d78 SHA512 736281c43fca7aa3ca757c2733e9062594b0c4994c569e28a4bbe56f0a0a072b9c146b0cb5d2b5bb8cb186f8d01b28f94b46e4660171fed09010fe0e4fa3aa0e
+MISC metadata.xml 1765 BLAKE2B db5d033abde3f31c928bbf08c847cae4f9f665fb8e71e5e1a2cbe8756f6b384246c5bd771424b55479f17c86c652b13560aae1735b5c70e54ae87fb417a2a290 SHA512 de1377a8b37facd99de364c8b70895c3358cd27755ba5df4217f0e8554da978754bdb85ddd98544450ad952c41db1bcfbd46c6382f76d05afb8181204dfcf143
diff --git a/sys-apps/firejail/files/firejail-0.9.70-envlimits.patch b/sys-apps/firejail/files/firejail-0.9.70-envlimits.patch
new file mode 100644
index 000000000000..d99db424c052
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.70-envlimits.patch
@@ -0,0 +1,12 @@
+diff -urP firejail-0.9.70.orig/src/firejail/firejail.h firejail-0.9.70/src/firejail/firejail.h
+--- firejail-0.9.70.orig/src/firejail/firejail.h 2022-06-08 07:42:50.000000000 -0600
++++ firejail-0.9.70/src/firejail/firejail.h 2022-06-09 13:06:04.094034022 -0600
+@@ -706,7 +706,7 @@
+ int check_kernel_procs(void);
+ void run_no_sandbox(int argc, char **argv) __attribute__((noreturn));
+
+-#define MAX_ENVS 256 // some sane maximum number of environment variables
++#define MAX_ENVS 2048 // some sane maximum number of environment variables
+ #define MAX_ENV_LEN (PATH_MAX + 32) // FOOBAR=SOME_PATH, only applied to Firejail's own sandboxed apps
+ // env.c
+ typedef enum {
diff --git a/sys-apps/firejail/files/firejail-0.9.70-firecfg.config.patch b/sys-apps/firejail/files/firejail-0.9.70-firecfg.config.patch
new file mode 100644
index 000000000000..ff751b9dc684
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.70-firecfg.config.patch
@@ -0,0 +1,82 @@
+diff -urP firejail-0.9.70.orig/src/firecfg/firecfg.config firejail-0.9.70/src/firecfg/firecfg.config
+--- firejail-0.9.70.orig/src/firecfg/firecfg.config 2022-06-08 07:42:50.000000000 -0600
++++ firejail-0.9.70/src/firecfg/firecfg.config 2022-06-09 13:06:38.646038407 -0600
+@@ -213,7 +213,8 @@
+ electron-mail
+ electrum
+ element-desktop
+-elinks
++# Breaks emerge/portage on Gentoo: 'too many environment variables'
++#elinks
+ empathy
+ enchant
+ enchant-2
+@@ -259,7 +260,8 @@
+ flameshot
+ flashpeak-slimjet
+ flowblade
+-fontforge
++# Breaks emerge/portage on Gentoo
++#fontforge
+ font-manager
+ fossamail
+ four-in-a-row
+@@ -490,11 +492,16 @@
+ luminance-hdr
+ lximage-qt
+ lxmusic
+-lynx
++# Breaks emerge/portage on Gentoo: 'too many environment variables'
++#lynx
+ lyx
+ macrofusion
+ magicor
+-man
++# Breaks: $ man chromium-browser
++# WARNING: terminal is not fully functional
++# Press RETURN to continue
++# Manual page chromium-browser(1) byte 0/0 (END) (press h for help or q to quit)
++#man
+ manaplus
+ marker
+ masterpdfeditor
+@@ -571,7 +578,8 @@
+ musictube
+ musixmatch
+ mutool
+-mutt
++# Breaks when configs are under ~/.mutt/
++#mutt
+ mypaint
+ mypaint-ora-thumbnailer
+ natron
+@@ -635,7 +643,8 @@
+ palemoon
+ #pandoc
+ parole
+-patch
++# Breaks emerge/portage on Gentoo: 'too many environment variables', path issues
++#patch
+ pavucontrol
+ pavucontrol-qt
+ pcsxr
+@@ -761,7 +770,8 @@
+ stellarium
+ strawberry
+ straw-viewer
+-strings
++# Breaks emerge/portage on Gentoo
++#strings
+ studio.sh
+ subdownloader
+ supertux2
+@@ -880,7 +890,8 @@
+ weechat
+ weechat-curses
+ wesnoth
+-wget
++# Breaks emerge/portage on Gentoo: 'too many environment variables', path issues
++#wget
+ wget2
+ whalebird
+ whois
diff --git a/sys-apps/firejail/firejail-0.9.68.ebuild b/sys-apps/firejail/firejail-0.9.68.ebuild
deleted file mode 100644
index 50077c0d2db7..000000000000
--- a/sys-apps/firejail/firejail-0.9.68.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit toolchain-funcs python-single-r1 linux-info
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
- EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns +whitelist X"
-# Needs a lot of work to function within sandbox/portage
-# bug #769731
-RESTRICT="test"
-
-RDEPEND="!sys-apps/firejail-lts
- apparmor? ( sys-libs/libapparmor )
- contrib? ( ${PYTHON_DEPS} )
- dbusproxy? ( sys-apps/xdg-dbus-proxy )"
-
-DEPEND="${RDEPEND}
- sys-libs/libseccomp
- test? ( dev-tcltk/expect )"
-
-REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
- "${FILESDIR}/${P}-envlimits.patch"
- )
-
-pkg_setup() {
- CONFIG_CHECK="~SQUASHFS"
- local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
- check_extra_config
- use contrib && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- find -type f -name Makefile.in -exec sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
-
- sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
-
- # fix up hardcoded paths to templates and docs
- local files=$(grep -E -l -r '/usr/share/doc/firejail([^-]|$)' ./RELNOTES ./src/man/ ./etc/profile*/ ./test/ || die)
- for file in ${files[@]} ; do
- sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "${file}" || die
- done
-
- # remove compression of man pages
- sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
-
- if use contrib; then
- python_fix_shebang -f contrib/*.py
- fi
-}
-
-src_configure() {
- econf \
- --disable-firetunnel \
- --enable-suid \
- $(use_enable apparmor) \
- $(use_enable chroot) \
- $(use_enable dbusproxy) \
- $(use_enable file-transfer) \
- $(use_enable globalcfg) \
- $(use_enable network) \
- $(use_enable private-home) \
- $(use_enable userns) \
- $(use_enable whitelist) \
- $(use_enable X x11)
-
- cat > 99firejail <<-EOF || die
- SANDBOX_WRITE="/run/firejail"
- EOF
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- # Gentoo-specific profile customizations
- insinto /etc/${PN}
- local profile_local
- for profile_local in "${FILESDIR}"/profile_*local ; do
- newins "${profile_local}" "${profile_local/\/*profile_/}"
- done
-
- # Prevent sandbox violations when toolchain is firejailed
- insinto /etc/sandbox.d
- doins 99firejail
-
- rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-
- if use contrib; then
- python_scriptinto /usr/$(get_libdir)/firejail
- python_doscript contrib/*.py
- insinto /usr/$(get_libdir)/firejail
- dobin contrib/*.sh
- fi
-}
diff --git a/sys-apps/firejail/firejail-0.9.70.ebuild b/sys-apps/firejail/firejail-0.9.70.ebuild
new file mode 100644
index 000000000000..5c5a610f1024
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.70.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs python-single-r1 linux-info
+
+if [[ ${PV} != 9999 ]]; then
+ SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
+ EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns X"
+# Needs a lot of work to function within sandbox/portage
+# bug #769731
+RESTRICT="test"
+
+RDEPEND="!sys-apps/firejail-lts
+ apparmor? ( sys-libs/libapparmor )
+ contrib? ( ${PYTHON_DEPS} )
+ dbusproxy? ( sys-apps/xdg-dbus-proxy )"
+
+DEPEND="${RDEPEND}
+ sys-libs/libseccomp
+ test? ( dev-tcltk/expect )"
+
+REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-envlimits.patch"
+ "${FILESDIR}/${P}-firecfg.config.patch"
+ )
+
+pkg_setup() {
+ CONFIG_CHECK="~SQUASHFS"
+ local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
+ check_extra_config
+ use contrib && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ find -type f -name Makefile.in -exec sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
+
+ sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+
+ # fix up hardcoded paths to templates and docs
+ local files=$(grep -E -l -r '/usr/share/doc/firejail([^-]|$)' ./RELNOTES ./src/man/ ./etc/profile*/ ./test/ || die)
+ for file in ${files[@]} ; do
+ sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "${file}" || die
+ done
+
+ # remove compression of man pages
+ sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
+
+ if use contrib; then
+ python_fix_shebang -f contrib/*.py
+ fi
+}
+
+src_configure() {
+ econf \
+ --disable-firetunnel \
+ --enable-suid \
+ $(use_enable apparmor) \
+ $(use_enable chroot) \
+ $(use_enable dbusproxy) \
+ $(use_enable file-transfer) \
+ $(use_enable globalcfg) \
+ $(use_enable network) \
+ $(use_enable private-home) \
+ $(use_enable userns) \
+ $(use_enable X x11)
+
+ cat > 99firejail <<-EOF || die
+ SANDBOX_WRITE="/run/firejail"
+ EOF
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ default
+
+ # Gentoo-specific profile customizations
+ insinto /etc/${PN}
+ local profile_local
+ for profile_local in "${FILESDIR}"/profile_*local ; do
+ newins "${profile_local}" "${profile_local/\/*profile_/}"
+ done
+
+ # Prevent sandbox violations when toolchain is firejailed
+ insinto /etc/sandbox.d
+ doins 99firejail
+
+ rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+ if use contrib; then
+ python_scriptinto /usr/$(get_libdir)/firejail
+ python_doscript contrib/*.py
+ insinto /usr/$(get_libdir)/firejail
+ dobin contrib/*.sh
+ fi
+}
diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild
deleted file mode 100644
index 440d20af51ec..000000000000
--- a/sys-apps/firejail/firejail-9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit toolchain-funcs python-single-r1 linux-info
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
- EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home test +userns +whitelist X"
-# Needs a lot of work to function within sandbox/portage
-# bug #769731
-RESTRICT="test"
-
-RDEPEND="!sys-apps/firejail-lts
- apparmor? ( sys-libs/libapparmor )
- contrib? ( ${PYTHON_DEPS} )
- dbusproxy? ( sys-apps/xdg-dbus-proxy )"
-
-DEPEND="${RDEPEND}
- sys-libs/libseccomp
- test? ( dev-tcltk/expect )"
-
-REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- CONFIG_CHECK="~SQUASHFS"
- local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
- check_extra_config
- use contrib && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- find -type f -name Makefile.in -exec sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
-
- sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
-
- # fix up hardcoded paths to templates and docs
- local files=$(grep -E -l -r '/usr/share/doc/firejail([^-]|$)' ./RELNOTES ./src/man/ ./etc/profile*/ ./test/ || die)
- for file in ${files[@]} ; do
- sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "${file}" || die
- done
-
- # remove compression of man pages
- sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
-
- if use contrib; then
- python_fix_shebang -f contrib/*.py
- fi
-}
-
-src_configure() {
- econf \
- --disable-firetunnel \
- --enable-suid \
- $(use_enable apparmor) \
- $(use_enable chroot) \
- $(use_enable dbusproxy) \
- $(use_enable file-transfer) \
- $(use_enable globalcfg) \
- $(use_enable network) \
- $(use_enable private-home) \
- $(use_enable userns) \
- $(use_enable whitelist) \
- $(use_enable X x11)
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-
- if use contrib; then
- python_scriptinto /usr/$(get_libdir)/firejail
- python_doscript contrib/*.py
- insinto /usr/$(get_libdir)/firejail
- dobin contrib/*.sh
- fi
-}
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index ea3a52f878b9..91bf2e4aa95b 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -31,7 +31,6 @@
<flag name="network">Enable networking features</flag>
<flag name="private-home">Enable private home feature</flag>
<flag name="userns">Enable attaching a new user namespace to a sandbox (--noroot option)</flag>
- <flag name="whitelist">Enable whitelist</flag>
<flag name="X">Enable X11 sandboxing</flag>
</use>
</pkgmetadata>
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index b9157ebdc1f3..6a59427056fb 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,9 +1,9 @@
DIST flatpak-1.12.3.tar.xz 1555340 BLAKE2B 512b3f6abfb06d242aedad2c27c9870750254a9d0a3769999739f8885bbf1740b649e2a41f2c079532b049fcce8b58529572ea35e930437ed6b62194a73bcbb6 SHA512 2f39665457b4c3b99e32ebc88cf5b70202dba6118887617d3d7faa20f688f3f3fc14e343b70c0d11eb15ee743a68d07078e6cda14fd91aa10ca375797cfc95bc
DIST flatpak-1.12.7.tar.xz 1562920 BLAKE2B e0bd3fcf8e0bc329c237ba409f82d6bfad1734101068966c11f03c9e45302680f590162b04e2314b5ed93324e61b4c06c33496dba7ba59778c885f50dd00d9db SHA512 425f9d330c649de1079f3286cb6ad8cf7b6e5838921effa4fd6f51020b9bf7991ded9071566ec7032b9868ef3f7e14d1fb7c2be96f903e3af23a075592b78f50
-DIST flatpak-1.13.1.tar.xz 1626048 BLAKE2B 6dd02bd531a6d10d97ac94d744e7afc7c6a319fe576cd6e3ff882b41320f7ede5cf0d6d92dcf4287b19ae7d3e5ce6afeebd1ea0e517e566f5b218e05bdb2bc10 SHA512 7e0be34535d6e80a1d59bfc937b9a89c3b46acbbddd6a04583c4874a50539978bb493b5c08b083a5697615a3281346bf1770b681fbc27be682caf54ffdca937a
DIST flatpak-1.13.2.tar.xz 1626616 BLAKE2B a896c1ef5166be9085c7b66bde3df510e4d592f920795706c7d0b68f717ccfd0694b306797a862d3db35c71ced5dcdb71438119d95ff5455b4b6a6b6adfa0d0e SHA512 d7e1d0a9965332220f829caa5724d7547280db10f7428b4e9add87152da1d7dad97edcde85668501d5a50e6a7c1031bfd15e8f4cbc7196e1c0f7cc3d2e333fe1
-EBUILD flatpak-1.12.3.ebuild 2423 BLAKE2B 30c84a139de36094d67b26e0bd7a669683cb1d0e11c00957638d7e00941a3be67451824d9450260feea05a7b660582f953d51fe1a2923424795bdfa4c99c8da8 SHA512 0fb2579114cc939f1d770475196d1840493f12633082179d250de7bd5b7dacdcb641d009ce24b843049a737d460b5c64e15260684e9d426935242284a820f7e9
-EBUILD flatpak-1.12.7.ebuild 2426 BLAKE2B 17ffc286a66e3edec2a40c66bd7e0f2b7a4812a2af2630a39588f902f381a9cc369076bb10a8cefd47595596cea92a5119af7dd24eda8ecf8a4d9889b624af7c SHA512 567a8a9278fdcb48f7593cfadf02e0b111626ce0dfee0c43119cf182856b2bac42d3f49912163b36ee9e0d8a5732b407c4040ca434b0aeabeb3d447bc227c2d7
-EBUILD flatpak-1.13.1.ebuild 2455 BLAKE2B 39e092efee6773bfe2a1ab5ae0e347e610b818a424595a7fa162fdde1f821561c58dc296155635e8b60a3f12728d90c0c9ea8c1ab9a17d59b61a9c8491219bdd SHA512 4cd5664b7120f3c792e197d167e18804da963a3859baee5d9061e66c41a920bae4611b0e67201897c7fb73d3fbe4501be2e702bfb5789271f48aa59c3b4593a7
-EBUILD flatpak-1.13.2.ebuild 2455 BLAKE2B 39e092efee6773bfe2a1ab5ae0e347e610b818a424595a7fa162fdde1f821561c58dc296155635e8b60a3f12728d90c0c9ea8c1ab9a17d59b61a9c8491219bdd SHA512 4cd5664b7120f3c792e197d167e18804da963a3859baee5d9061e66c41a920bae4611b0e67201897c7fb73d3fbe4501be2e702bfb5789271f48aa59c3b4593a7
+DIST flatpak-1.13.3.tar.xz 1679196 BLAKE2B bae60931eabdf61ae7de057dcd99014c65a7eccc9ed91aa75358ee058a22c2f55bd004355e0b2c52f3668d17404dcc7083339fcce35f3920fa3953e22e0a2417 SHA512 8aeef0b0c00a958b04d3d40b9bc6fa6afd3b4875fea6aa4a64ed1fe4e5e67a6e17543fa42e20d7e0e99e22d26821fb392849206f27f1ee7c6cf4c78f8aed2cfe
+EBUILD flatpak-1.12.3.ebuild 2355 BLAKE2B f9ebfea4165e01d8dec3a1a1b951e54faa716cf60d3fabc620f81f768117e3e71afd50b3d3da92f4fef2bce0445b4a378642d5c6ffad07430286f6a609ffba48 SHA512 50a22836eaa9db267ca87d4cb9c3df095013623182abbae65dc917def226f19419960e2d78317f053dfb3b3742d2773cbb66d79fd84d41cdc4f2b78a016705f8
+EBUILD flatpak-1.12.7.ebuild 2358 BLAKE2B ed0db5c59539c85be5a111a723aadbd4882b83452d2f4d17ac9b3eae2c8b4402ce57acc5c8d0d2adaf611504b9259a99944ba7a932951a019f8be5cef5632881 SHA512 a05185ba209ac0a96101dcf6483250e8b61fe6286dd7c81757f57c91c093228d38bf461e234031c83f5860f2ea8e2eac99381be27a55b1335c83cd621b09054b
+EBUILD flatpak-1.13.2.ebuild 2532 BLAKE2B dc2d7fafbf83738f1be4bafb06d4979810c3f963df9364f24ed6d455b0f22f46db2ef28a048c0f26ee48ef81a2d52d972571fe1f00fdd6696c2e5e899145afe4 SHA512 151d99f03271e17f01b2b3966d80a136d1ecfdd7a1e2611f04d0ab0f86e10b32847f3385e07919fe9584f1deaa88b5f775d0496f3380e9dedc72799c526534d1
+EBUILD flatpak-1.13.3.ebuild 2532 BLAKE2B dc2d7fafbf83738f1be4bafb06d4979810c3f963df9364f24ed6d455b0f22f46db2ef28a048c0f26ee48ef81a2d52d972571fe1f00fdd6696c2e5e899145afe4 SHA512 151d99f03271e17f01b2b3966d80a136d1ecfdd7a1e2611f04d0ab0f86e10b32847f3385e07919fe9584f1deaa88b5f775d0496f3380e9dedc72799c526534d1
MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.12.3.ebuild b/sys-apps/flatpak/flatpak-1.12.3.ebuild
index 6917e77de079..8450f3e36916 100644
--- a/sys-apps/flatpak/flatpak-1.12.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://flatpak.org/"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd X"
+IUSE="doc introspection policykit seccomp systemd X"
RESTRICT+=" test"
RDEPEND="
@@ -64,10 +64,7 @@ BDEPEND="
$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
"
-PDEPEND="
- gtk? ( sys-apps/xdg-desktop-portal-gtk )
- kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
+PDEPEND="sys-apps/xdg-desktop-portal"
python_check_deps() {
has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
diff --git a/sys-apps/flatpak/flatpak-1.12.7.ebuild b/sys-apps/flatpak/flatpak-1.12.7.ebuild
index 8a8e2987bc67..a440306275f6 100644
--- a/sys-apps/flatpak/flatpak-1.12.7.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://flatpak.org/"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd X"
+IUSE="doc introspection policykit seccomp systemd X"
RESTRICT+=" test"
RDEPEND="
@@ -64,10 +64,7 @@ BDEPEND="
$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
"
-PDEPEND="
- gtk? ( sys-apps/xdg-desktop-portal-gtk )
- kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
+PDEPEND="sys-apps/xdg-desktop-portal"
python_check_deps() {
has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
diff --git a/sys-apps/flatpak/flatpak-1.13.1.ebuild b/sys-apps/flatpak/flatpak-1.13.1.ebuild
deleted file mode 100644
index 63cc95837935..000000000000
--- a/sys-apps/flatpak/flatpak-1.13.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd X"
-RESTRICT+=" test"
-
-RDEPEND="
- acct-group/flatpak
- acct-user/flatpak
- >=app-arch/libarchive-2.8:=
- app-arch/zstd:=
- >=app-crypt/gpgme-1.1.8:=
- >=dev-libs/appstream-0.12:=
- >=dev-libs/appstream-glib-0.5.10:=
- >=dev-libs/glib-2.56:2=
- >=dev-libs/libxml2-2.4:=
- dev-libs/json-glib:=
- dev-libs/libassuan:=
- >=dev-util/ostree-2020.8:=[gpg(+)]
- || (
- dev-util/ostree[curl]
- dev-util/ostree[soup]
- )
- >=gnome-base/dconf-0.26:=
- >=net-libs/libsoup-2.4:=
- sys-apps/bubblewrap
- sys-apps/dbus
- >=sys-fs/fuse-2.9.9:0=
- sys-apps/xdg-dbus-proxy
- X? (
- x11-apps/xauth
- x11-libs/libXau:=
- )
- x11-libs/gdk-pixbuf:2=
- policykit? ( >=sys-auth/polkit-0.98:= )
- seccomp? ( sys-libs/libseccomp:= )
- systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-# pyparsing version pinned for https://bugs.gentoo.org/825230
-BDEPEND="
- >=sys-devel/automake-1.13.4
- >=sys-devel/gettext-0.18.2
- virtual/pkgconfig
- dev-util/gdbus-codegen
- sys-devel/bison
- introspection? ( >=dev-libs/gobject-introspection-1.40 )
- doc? (
- >=dev-util/gtk-doc-1.20
- dev-libs/libxslt
- )
- $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="
- gtk? ( sys-apps/xdg-desktop-portal-gtk )
- kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
-
-python_check_deps() {
- has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- local CONFIG_CHECK="~USER_NS"
- linux-info_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- # This line fails because locales are in /usr/lib/locale/locale-archive.
- sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-sandboxed-triggers
- --localstatedir="${EPREFIX}"/var
- --with-system-bubblewrap
- --with-system-dbus-proxy
- $(use_enable X xauth)
- $(use_enable doc documentation)
- $(use_enable doc gtk-doc)
- $(use_enable introspection)
- $(use_enable policykit system-helper)
- $(use_enable seccomp)
- $(use_with systemd)
- )
-
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.13.2.ebuild b/sys-apps/flatpak/flatpak-1.13.2.ebuild
index 63cc95837935..c542d3a34349 100644
--- a/sys-apps/flatpak/flatpak-1.13.2.ebuild
+++ b/sys-apps/flatpak/flatpak-1.13.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://flatpak.org/"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd X"
+IUSE="doc introspection policykit seccomp systemd X"
RESTRICT+=" test"
RDEPEND="
@@ -65,10 +65,7 @@ BDEPEND="
$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
"
-PDEPEND="
- gtk? ( sys-apps/xdg-desktop-portal-gtk )
- kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
+PDEPEND="sys-apps/xdg-desktop-portal"
python_check_deps() {
has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
@@ -103,3 +100,9 @@ src_configure() {
econf "${myeconfargs[@]}"
}
+
+src_install() {
+ default
+ # https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/flatpak/flatpak-1.13.3.ebuild b/sys-apps/flatpak/flatpak-1.13.3.ebuild
new file mode 100644
index 000000000000..c542d3a34349
--- /dev/null
+++ b/sys-apps/flatpak/flatpak-1.13.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit linux-info python-any-r1
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+DESCRIPTION="Linux application sandboxing and distribution framework"
+HOMEPAGE="https://flatpak.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc introspection policykit seccomp systemd X"
+RESTRICT+=" test"
+
+RDEPEND="
+ acct-group/flatpak
+ acct-user/flatpak
+ >=app-arch/libarchive-2.8:=
+ app-arch/zstd:=
+ >=app-crypt/gpgme-1.1.8:=
+ >=dev-libs/appstream-0.12:=
+ >=dev-libs/appstream-glib-0.5.10:=
+ >=dev-libs/glib-2.56:2=
+ >=dev-libs/libxml2-2.4:=
+ dev-libs/json-glib:=
+ dev-libs/libassuan:=
+ >=dev-util/ostree-2020.8:=[gpg(+)]
+ || (
+ dev-util/ostree[curl]
+ dev-util/ostree[soup]
+ )
+ >=gnome-base/dconf-0.26:=
+ >=net-libs/libsoup-2.4:=
+ sys-apps/bubblewrap
+ sys-apps/dbus
+ >=sys-fs/fuse-2.9.9:0=
+ sys-apps/xdg-dbus-proxy
+ X? (
+ x11-apps/xauth
+ x11-libs/libXau:=
+ )
+ x11-libs/gdk-pixbuf:2=
+ policykit? ( >=sys-auth/polkit-0.98:= )
+ seccomp? ( sys-libs/libseccomp:= )
+ systemd? ( sys-apps/systemd:= )
+"
+
+DEPEND="${RDEPEND}"
+# pyparsing version pinned for https://bugs.gentoo.org/825230
+BDEPEND="
+ >=sys-devel/automake-1.13.4
+ >=sys-devel/gettext-0.18.2
+ virtual/pkgconfig
+ dev-util/gdbus-codegen
+ sys-devel/bison
+ introspection? ( >=dev-libs/gobject-introspection-1.40 )
+ doc? (
+ >=dev-util/gtk-doc-1.20
+ dev-libs/libxslt
+ )
+ $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+"
+
+PDEPEND="sys-apps/xdg-desktop-portal"
+
+python_check_deps() {
+ has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ local CONFIG_CHECK="~USER_NS"
+ linux-info_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ # This line fails because locales are in /usr/lib/locale/locale-archive.
+ sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-sandboxed-triggers
+ --localstatedir="${EPREFIX}"/var
+ --with-system-bubblewrap
+ --with-system-dbus-proxy
+ $(use_enable X xauth)
+ $(use_enable doc documentation)
+ $(use_enable doc gtk-doc)
+ $(use_enable introspection)
+ $(use_enable policykit system-helper)
+ $(use_enable seccomp)
+ $(use_with systemd)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ # https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index b2aa803b0ef1..d2ff8bcd0dc6 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,3 +1,5 @@
-DIST fwts_20.11.00.orig.tar.gz 3845548 BLAKE2B 3d08bf3dd339543fc67984f5da081a4ac4a0e1b413431bb0836ec2a99130f76cd717ff61128b09e9e7c24cb275b52cd2503c34daa273c8328cee7eb2453706ea SHA512 650fa21ceb4528a6d7fa40ae44c3258e01208186328fce8ca889df2809f82abf9b966c76c99791b3f40b17e5c2efda5b15dd2def4aaf494004778337f5074b55
-EBUILD fwts-20.11.00.ebuild 1160 BLAKE2B 3babb19a62e51f008dffbeec21350e6549a3857bc370e26252dcf6b9fe835723f17fd0e8cddd46b33c5ac37cfce584cc03aef2d7ab32615496a861e1d8f9152c SHA512 fb2e7c94ca9b19f36e329b7ffb9b6a4955b7eb8581cffec849e10797851e598ababfaf4dc05b3adb8ae01413cc97b66cdcc42b175a960c7595e5c4c1ad5851ba
+AUX fwts-22.03.00-slibtool.patch 4856 BLAKE2B 176ceb416d622a771e932e4178479e85d27ce26d4619c9477f0115abcb03b1ea86469ec773d97fab7e2bdfaee1b20b7e9e680e96646fc664cdccec7d51a67d7e SHA512 54fccce717a542da9dcc4ea397b9ab11e3cd4aaeec72b7d0ad988633ba7e5dde8f84dfd483d438f2eaaf0d8b74b03d9faa1214aedf7d654c3496a59d3b7fc3f2
+AUX fwts-22.03.00-werror.patch 2107 BLAKE2B 799c72604de68ea08e1aef40796dc32c6f92f6de96f4b1ef9692bcb723f94bf1c320e2eec15568c52968aa7a049e7291947ec707c53370ccc48c9c59b0f8acb3 SHA512 2143d762ccdb8b54c6f223d2666b1d829f60e0e2fe88ea665f187f2e070d058bc9be707a4dc550f3de922b0abca84923ad2766c21022b6f2d86f3a8e9d2ca362
+DIST fwts_22.03.00.orig.tar.gz 3900335 BLAKE2B 2e36392f69140b1a2d3b77cc8d57740f66ea016063644916e69bb738e20191a780a9d2ed275cfd8b871ad8c3455f96c8ae26ab7c1574c0cc8efdbbb20f4cc785 SHA512 88f183293da4f6ebc1cefc382c9b5e1b378ac7d03e0c577937db89be9e8417e0ffdf0952cdffda57ac21787c3fe02c5254ec7ce61e100e78555ffa92d6a30dc2
+EBUILD fwts-22.03.00.ebuild 1032 BLAKE2B 8a0c33304fae94974da85b1f5495db0c47ee885d0c02d80043acbdcd2bd7d570cb0c3c422404a87080ebbf4fd4db0f789d57c32506a156c0646dec3d04c0c44e SHA512 52e8cc6397a1ae80f6e4954f10ac9a62a40cde404df223fa10f8683b81d20a1ce13ea436b5bd9a3090c9ebd3cd6f8cc4993a0ab435434a346dc5b50f4ba3077a
MISC metadata.xml 242 BLAKE2B e47c432f681d2e25891ad2d50e4de125c926a8050308d1eda963e3c0e1dcc903c07104aa53e7694d617dc371d6129641230f8389a89899a3cea15ef99ad2c038 SHA512 5bf1b619b84d91ad35a836bcba1ee422b1961c9d0ad56bbe7369e752741f5aa27e48df48142835f313547772c2453fe174a586b01f1c4e74b692986a96d7a5d7
diff --git a/sys-apps/fwts/files/fwts-22.03.00-slibtool.patch b/sys-apps/fwts/files/fwts-22.03.00-slibtool.patch
new file mode 100644
index 000000000000..bc66006bf674
--- /dev/null
+++ b/sys-apps/fwts/files/fwts-22.03.00-slibtool.patch
@@ -0,0 +1,155 @@
+Upstream-ML: https://lists.ubuntu.com/archives/fwts-devel/2022-May/013515.html
+
+From 47bc82375865e2548edcb1607ca52ec60d632123 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 10 May 2022 20:35:01 -0700
+Subject: [PATCH 1/2] build: Improve linking
+
+This improves the linking enough to get the build to complete
+with slibtool and GNU libtool.
+---
+ configure.ac | 2 ++
+ src/Makefile.am | 20 ++++++++++----------
+ src/lib/src/Makefile.am | 18 ++++++++++--------
+ src/libfwtsacpica/Makefile.am | 7 ++-----
+ src/libfwtsiasl/Makefile.am | 4 ++--
+ 5 files changed, 26 insertions(+), 25 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f40c367..7ee5604 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,6 +64,8 @@
+ AC_CHECK_HEADERS([asm/opal-prd.h])
+ AC_CHECK_HEADERS([mtd/mtd-abi.h])
+ AC_CHECK_HEADERS([pci/pci.h])
++ PKG_CHECK_MODULES([GIO], [gio-2.0])
++ PKG_CHECK_MODULES([GLIB], [glib-2.0])
+ AM_CONDITIONAL([HAVE_ASM_OPAL_PRD_H],
+ [test "x$ac_cv_header_asm_opal_prd_h" = "xyes"])
+ AM_CONDITIONAL([HAVE_MTD_ABI_H],
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9a26af8..e2180e7 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/acpica/source/compiler \
+ -I$(top_srcdir)/efi_runtime \
+ -I$(top_srcdir)/smccc_test \
+- -pthread `pkg-config --cflags glib-2.0 gio-2.0` \
++ -pthread \
+ -Wall -Werror -Wextra \
+ -Wno-address-of-packed-member \
+ -Wfloat-equal -Wmissing-declarations \
+@@ -23,7 +23,11 @@ AM_CPPFLAGS = \
+
+ bin_PROGRAMS = fwts
+
+-fwts_CPPFLAGS = $(AM_CPPFLAGS) -DACPI_DEBUG_OUTPUT
++fwts_CPPFLAGS = \
++ $(AM_CPPFLAGS) \
++ @GIO_CFLAGS@ \
++ @GLIB_CFLAGS@ \
++ -DACPI_DEBUG_OUTPUT
+
+ if HAVE_LIBFDT
+ dt_tests = \
+@@ -207,16 +211,12 @@ fwts_SOURCES = main.c \
+ $(power_mgmt_tests) \
+ $(dt_tests)
+
+-fwts_LDFLAGS = -lm -lbsd `pkg-config --libs glib-2.0 gio-2.0`
++fwts_LDFLAGS = -no-undefined
+
+ fwts_LDADD = \
+- -lfwts \
+- -L$(top_builddir)/src \
+- -L$(top_builddir)/src/acpica \
+- -L$(top_builddir)/src/libfwtsiasl \
+- -L$(top_builddir)/src/libfwtsacpica \
+- -L$(top_builddir)/src/lib/src \
+- -lfwtsacpica
++ $(top_builddir)/src/lib/src/libfwts.la \
++ $(top_builddir)/src/libfwtsiasl/libfwtsiasl.la \
++ $(top_builddir)/src/libfwtsacpica/libfwtsacpica.la
+
+ man_MANS = ../doc/fwts.1 ../doc/fwts-collect.1 ../doc/fwts-frontend-text.1
+
+diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
+index 0a39882..94bfcdf 100644
+--- a/src/lib/src/Makefile.am
++++ b/src/lib/src/Makefile.am
+@@ -21,22 +21,24 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/libfwtsiasl \
+ -I$(top_srcdir)/src/acpica/source/include \
+ -I$(top_srcdir)/src/acpica/source/compiler \
+- `pkg-config --silence-errors --cflags json` \
+- `pkg-config --silence-errors --cflags json-c` \
+- `pkg-config --cflags glib-2.0 gio-2.0` \
+ -DDATAROOTDIR=\"$(datarootdir)\" \
+ -Wall -Werror -Wextra \
+ -Wno-address-of-packed-member
+
+ pkglib_LTLIBRARIES = libfwts.la
+
+-libfwts_la_LDFLAGS = \
++libfwts_la_LDFLAGS = -version-info 1:0:0
++
++libfwts_la_LIBADD = \
+ -lm -lpthread -lbsd \
+- -version-info 1:0:0 \
+- -L$(top_builddir)/src/libfwtsiasl \
+- -lfwtsiasl `pkg-config --libs glib-2.0 gio-2.0`
++ @GIO_LIBS@ \
++ @GLIB_LIBS@
+
+-libfwts_la_CPPFLAGS = $(AM_CPPFLAGS) -DACPI_DEBUG_OUTPUT
++libfwts_la_CPPFLAGS = \
++ $(AM_CPPFLAGS) \
++ @GIO_CFLAGS@ \
++ @GLIB_CFLAGS@ \
++ -DACPI_DEBUG_OUTPUT
+
+ if HAVE_LIBFDT
+ dt_sources = \
+diff --git a/src/libfwtsacpica/Makefile.am b/src/libfwtsacpica/Makefile.am
+index f37f585..62f0d8c 100644
+--- a/src/libfwtsacpica/Makefile.am
++++ b/src/libfwtsacpica/Makefile.am
+@@ -74,7 +74,8 @@ CLEANFILES = osunixxf_munged.c \
+
+ pkglib_LTLIBRARIES = libfwtsacpica.la
+
+-libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0
++libfwtsacpica_la_LDFLAGS = -version-info 1:0:0
++libfwtsacpica_la_LIBADD = -lpthread
+ libfwtsacpica_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+ #
+@@ -280,8 +281,4 @@ libfwtsacpica_la_SOURCES = \
+ ../../src/acpica/source/tools/acpiexec/aeinstall.c \
+ ../../src/acpica/source/os_specific/service_layers/osgendbg.c
+
+-libfwtsacpica_la_LIBADD = \
+- -L../../src/lib/src -lfwts -lrt
+-
+-
+ -include ../../git.mk
+diff --git a/src/libfwtsiasl/Makefile.am b/src/libfwtsiasl/Makefile.am
+index 328134c..2728780 100644
+--- a/src/libfwtsiasl/Makefile.am
++++ b/src/libfwtsiasl/Makefile.am
+@@ -104,8 +104,8 @@ BUILT_SOURCES = aslcompiler.y \
+ #
+ # Just export fwts specific API so we don't clash with core ACPICA library
+ #
+-libfwtsiasl_la_LDFLAGS = -export-symbols-regex "fwts_.*" -lpthread -version-info 1:0:0
+-
++libfwtsiasl_la_LDFLAGS = -export-symbols-regex "fwts_.*" -version-info 1:0:0
++libfwtsiasl_la_LIBADD = -lpthread
+ CLEANFILES = $(BUILT_SOURCES)
+
+ libfwtsiasl_la_CPPFLAGS = $(AM_CPPFLAGS)
+--
+2.35.1
+
diff --git a/sys-apps/fwts/files/fwts-22.03.00-werror.patch b/sys-apps/fwts/files/fwts-22.03.00-werror.patch
new file mode 100644
index 000000000000..6502c75b7413
--- /dev/null
+++ b/sys-apps/fwts/files/fwts-22.03.00-werror.patch
@@ -0,0 +1,65 @@
+From 85f27bc6dcd8c7f1479dce259713540f1d1a888c Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 10 May 2022 21:11:29 -0700
+Subject: [PATCH 2/2] build: Remove -Werror
+
+---
+ configure.ac | 2 +-
+ src/Makefile.am | 2 +-
+ src/lib/src/Makefile.am | 2 +-
+ src/utilities/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7ee5604..4d2960e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ AC_INIT([fwts],[0.1],[fwts-devel@lists.ubuntu.com])
+- AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++ AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ AC_CANONICAL_HOST
+ AC_CONFIG_MACRO_DIR([m4])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e2180e7..eee8b49 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/efi_runtime \
+ -I$(top_srcdir)/smccc_test \
+ -pthread \
+- -Wall -Werror -Wextra \
++ -Wall -Wextra \
+ -Wno-address-of-packed-member \
+ -Wfloat-equal -Wmissing-declarations \
+ -Wno-long-long -Wredundant-decls -Wshadow \
+diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
+index 94bfcdf..390326a 100644
+--- a/src/lib/src/Makefile.am
++++ b/src/lib/src/Makefile.am
+@@ -22,7 +22,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/acpica/source/include \
+ -I$(top_srcdir)/src/acpica/source/compiler \
+ -DDATAROOTDIR=\"$(datarootdir)\" \
+- -Wall -Werror -Wextra \
++ -Wall -Wextra \
+ -Wno-address-of-packed-member
+
+ pkglib_LTLIBRARIES = libfwts.la
+diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am
+index a7d9b9c..2356af3 100644
+--- a/src/utilities/Makefile.am
++++ b/src/utilities/Makefile.am
+@@ -16,7 +16,7 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+
+-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \
++AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \
+ -I$(srcdir)/../lib/include
+
+ bin_PROGRAMS = kernelscan
+--
+2.35.1
+
diff --git a/sys-apps/fwts/fwts-20.11.00.ebuild b/sys-apps/fwts/fwts-20.11.00.ebuild
deleted file mode 100644
index 0d5da91d7a1c..000000000000
--- a/sys-apps/fwts/fwts-20.11.00.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Firmware Test Suite"
-HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
- >=dev-libs/json-c-0.10-r1
- dev-libs/libbsd
- dev-libs/libpcre
- sys-apps/dmidecode
- sys-apps/dtc
- sys-apps/pciutils
- sys-power/iasl
- sys-power/pmtools
- "
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-
-S=${WORKDIR}
-
-src_prepare() {
- default
- sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
- sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
-
- # Fix json-c includes
- sed -e 's/^#include <json\//#include <json-c\//g' -i \
- configure.ac || die
- sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
- -i src/lib/include/fwts_json.h \
- src/utilities/kernelscan.c || die
- sed -e 's/-ljson/-ljson-c/'\
- -i src/Makefile.am\
- src/lib/src/Makefile.am\
- src/utilities/Makefile.am || die
-
- eautoreconf
-}
diff --git a/sys-apps/fwts/fwts-22.03.00.ebuild b/sys-apps/fwts/fwts-22.03.00.ebuild
new file mode 100644
index 000000000000..093cc1bcb881
--- /dev/null
+++ b/sys-apps/fwts/fwts-22.03.00.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Firmware Test Suite"
+HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts https://kernel.ubuntu.com/git/hwe/fwts.git"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/glib:2
+ >=dev-libs/json-c-0.10-r1
+ dev-libs/libbsd
+ dev-libs/libpcre
+ sys-apps/dmidecode
+ sys-apps/dtc
+ sys-apps/pciutils
+ sys-power/iasl
+ sys-power/pmtools
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}
+
+PATCHES=(
+ "${FILESDIR}/${P}-slibtool.patch" # 780372
+ "${FILESDIR}/${P}-werror.patch"
+)
+
+src_prepare() {
+ default
+
+ sed -e 's:/usr/bin/lspci:'$(type -p lspci)':' \
+ -e 's:/usr/sbin/dmidecode:'$(type -p dmidecode)':' \
+ -e 's:/usr/bin/iasl:'$(type -p iasl)':' \
+ -i src/lib/include/fwts_binpaths.h || die
+
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index 9cc824f391a6..1993eab77665 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -4,4 +4,4 @@ DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11
EBUILD fwupd-efi-1.1.ebuild 1067 BLAKE2B 2dd3c612da1d7fa6603aa6df5589c6d04f3d73a2256952c991114e93842bb0a9f020843416a9fecd44af2361b62a76c91a8dcec8abf97c55717bd58a26a49694 SHA512 014fb50779f0f0dced8f8a6affe6cc4b12171f1e24562f6c27539e458e9ca6396a59e9db18ac1e320cfd05d1a413674be3099b6331087e13ac2b82271ae0bc48
EBUILD fwupd-efi-1.2.ebuild 1039 BLAKE2B bbf5723c4961a0b883b8d6f48a594c665167d959fd0515bb776d9edf8de3ff48301d1ec037e937dee472f03f36c74e4c57b9ebebd9767190ab033938bd2dbe23 SHA512 7a202e3dc391e038e8083be7ee9c80043786247c9cde956019197359fa5511ed6fe9cd0fa8ca2991dea8d146b2249a4676c0923e7257806ae40299899c114a4c
EBUILD fwupd-efi-1.3.ebuild 1038 BLAKE2B 3109f7169d322bddd664356c95b22af57d85457ed232c5504ae1be5a3f045fc8ff084e4e2387ad838eb95b38b4a9aa64f78c483e3847dcb4aece7be7b29d68a4 SHA512 ec5da400eb41424ad363f873285b97f4e5dc9959e86e904b6041fbad20ecaf722a81bae9fe0b1ee149e34d975d27af54e1db181a87449ccaed31b3536e2fbd37
-MISC metadata.xml 507 BLAKE2B 247253c7682dae9c6423a8f8eb1d11eddf45f33a506bbda2cf4aae002a1bb17ece2dbe63fc1fc9a43ada46d804a9c0155889e52e7aa15427de267b1a7c94bbb7 SHA512 8ef697c8ff7316545d9aa7d00388072ed754e5add441bd05fe6cd8179b26790a3d08b9f00df14b7cc8a53a43b93714a29ce05f187f7906da86a4b320ab36e9a8
+MISC metadata.xml 311 BLAKE2B 937939dd70ed009d57242d3ae652a57c240a04a6f4f12166c1a1adc1ae314153298d78285510de9e0c2af0b6ae4d621c7a711ed4e09a7cf86a74abfb682eae80 SHA512 6b1a5f185b846742ddd389596ad0d8a471cb422c63021e71aae2c06cab257135014edc5a3a6f7e14389193a7cb2dcf5887192dd451df6abf69d0e6850a3c5ba6
diff --git a/sys-apps/fwupd-efi/metadata.xml b/sys-apps/fwupd-efi/metadata.xml
index e5cc4fab9f9f..771d90fee052 100644
--- a/sys-apps/fwupd-efi/metadata.xml
+++ b/sys-apps/fwupd-efi/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<bugs-to>https://github.com/fwupd/fwupd-efi/issues</bugs-to>
<remote-id type="github">fwupd/fwupd-efi</remote-id>
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 3f9f032738b6..79062eef803f 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,7 +2,9 @@ AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c61
DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31
DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a
DIST fwupd-1.8.0.tar.gz 4103239 BLAKE2B 15d06a261be1f529573a0f3b21a54066b1b286e1d1c68ac24f3862f7e3a8855661775b369016d67fbc9797fd13dea88000e78d1a6973e489ecaa6f7f6855b3cf SHA512 8977e0b0878e46480565a32935cc008d57d3978609c01877e3a90dc594b122bed0c94613a53f0f2d3f50d8a039b09cb93787aaf7e0b5d8cf1ec1a6247fe1610b
+DIST fwupd-1.8.1.tar.gz 4143691 BLAKE2B 1606bc35e0bf15efe202ec906161e5c526d4fdd1ef1469da6aeb141539c3196cbdd603b124e805c4eb43c020fed5049b1813d6301211fa02fa4c0c2c2b8222b3 SHA512 9f3e15b977b335058d1430049f19de8a17260cdbc4e84aa728ff4e6db3deebc8725f532e9b3edb7d51a0ddc9cc9f8272449417e7345009d447b9f4b3378a4819
EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9ea522da715e4ffa5359e2dc23315a79b823f016723b3f68507bf272fca29a8471e5c2388b1a1f1c6146231b SHA512 1899b4041033e23d658cc7991aed0c94252186a737616baa8d09595e97cf4cf16369478286ab2947441b81779227f48bf10b490ce3faae821e489f29a25053c2
-EBUILD fwupd-1.7.7-r2.ebuild 4686 BLAKE2B 91d1fc46a6e98eef134dc5e461ac120082720b32d2e01850ccd17f97862d74a0cfd794c82b2c57f901a746634d4755e0f87209e94fc9ac33ce12162a81aefd7a SHA512 d656fec93da9c68f998a6577be04bb88449dacf8ba5e43b805b16fe6e9d46d4b7bf36f1d1a2201fd7d1081fc6314ffa09c83c4e728a3293335b0e1a07592406d
+EBUILD fwupd-1.7.7-r2.ebuild 4684 BLAKE2B 2febf3c31449381b94a4c46589017fd7ba00f262a9fb22c9dfd660018ce2acdff582116984e5e21f8f7181345c013b8eb88f14df1052633a3c29a9cb6546af50 SHA512 677ee8f9c19fc7bcc016b301d0abc9277c3ec20f8fe21cf407f68acab52f2067bb6a3366afc8dfe175ebfdd71c5c701c27d8fc8f75e47a4544f5e7ce5cee2b1a
EBUILD fwupd-1.8.0-r1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
-MISC metadata.xml 1532 BLAKE2B 0b3409cd11a20e2e2d18b42bef7fee3e14b5a8c20574345ae99de9e188b91226bf07f0fd44a7e538d07750ab6b6cf2da30df2b54729d0eb405ee280aa3816f5c SHA512 36cc547eeaaf7dc325ac5c609d48f11949650353a4d4cf7b37454cdd849d58de324f718514665ff47e6d4775a318b6142a958e1de243e43ea5446f82971a4c87
+EBUILD fwupd-1.8.1.ebuild 4922 BLAKE2B 99f3888b9c3c2ce2f793f14ccfdf7a4ce725a6c9a026cf6cb9090aaad0e800d2524932fbfccd92b6f9c1753d06aa0de010beed72dec663fb384edc376accd831 SHA512 f333e07a813fd0e25d9b48731454f450f8467e60db6732a40855c4934e9e1354da4e6f6bbab6fb0991d3502445c694b329d40eabd4ce7104a27d5c54ab84a213
+MISC metadata.xml 1414 BLAKE2B 9e4efd8c10bafdd2428b579b7eb7c51d594c4e2b42560cc2022545703043bd8d31367a4fb6178a2d2b69e195a5a263fd3dcb3fabee58132304bfe4cb2bcf1ecb SHA512 4217eaee64415babf6a29eab759ead986a075c94318b58ee8a8a947c57430a691bbae34c10120289049a9a2caebd0754258d2b0fee286d3e011b332f5658b1ac
diff --git a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
index ad22abe7fcd1..dc4a17a94fad 100644
--- a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^^ ( elogind minimal systemd )
diff --git a/sys-apps/fwupd/fwupd-1.8.1.ebuild b/sys-apps/fwupd/fwupd-1.8.1.ebuild
new file mode 100644
index 000000000000..3852c4032a8d
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.8.1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 linux-info meson python-single-r1 vala udev xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ^^ ( elogind minimal systemd )
+ dell? ( uefi )
+ fastboot? ( gusb )
+ logitech? ( gusb )
+ minimal? ( !introspection )
+ spi? ( lzma )
+ synaptics? ( gnutls )
+ uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+ >=dev-util/meson-0.60.0
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ bash-completion? ( >=app-shells/bash-completion-2.0 )
+ introspection? ( dev-libs/gobject-introspection )
+ man? (
+ app-text/docbook-sgml-utils
+ sys-apps/help2man
+ )
+ test? (
+ thunderbolt? ( dev-util/umockdev )
+ net-libs/gnutls[tools]
+ )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-arch/gcab-1.0
+ app-arch/xz-utils
+ >=dev-libs/glib-2.58:2
+ dev-libs/json-glib
+ dev-libs/libgudev:=
+ >=dev-libs/libjcat-0.1.4[gpg,pkcs7]
+ >=dev-libs/libxmlb-0.1.13:=[introspection?]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ ')
+ >=net-libs/libsoup-2.51.92:2.4[introspection?]
+ net-misc/curl
+ archive? ( app-arch/libarchive:= )
+ cbor? ( dev-libs/libcbor )
+ dell? (
+ >=app-crypt/tpm2-tss-2.0
+ >=sys-libs/libsmbios-2.4.0
+ )
+ elogind? ( >=sys-auth/elogind-211 )
+ flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+ gnutls? ( net-libs/gnutls )
+ gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+ logitech? ( dev-libs/protobuf-c:= )
+ lzma? ( app-arch/xz-utils )
+ modemmanager? ( net-misc/modemmanager[qmi] )
+ policykit? ( >=sys-auth/polkit-0.114 )
+ sqlite? ( dev-db/sqlite )
+ systemd? ( >=sys-apps/systemd-211 )
+ tpm? ( app-crypt/tpm2-tss:= )
+ uefi? (
+ sys-apps/fwupd-efi
+ sys-boot/efibootmgr
+ sys-fs/udisks
+ sys-libs/efivar
+ )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ sys-apps/dbus
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango[introspection]
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ vala_setup
+ if use nvme ; then
+ kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+ fi
+}
+
+src_prepare() {
+ default
+ # c.f. https://github.com/fwupd/fwupd/issues/1414
+ sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+ -i plugins/thunderbolt/meson.build || die
+
+ sed -e '/platform-integrity/d' \
+ -i plugins/meson.build || die #753521
+
+ sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
+ -i data/builder/meson.build || die
+}
+
+src_configure() {
+ local plugins=(
+ -Dplugin_gpio="enabled"
+ $(meson_feature amt plugin_amt)
+ $(meson_feature dell plugin_dell)
+ $(meson_feature fastboot plugin_fastboot)
+ $(meson_feature flashrom plugin_flashrom)
+ $(meson_feature gusb plugin_uf2)
+ $(meson_feature logitech plugin_logitech_bulkcontroller)
+ $(meson_feature modemmanager plugin_modem_manager)
+ $(meson_feature nvme plugin_nvme)
+ $(meson_use spi plugin_intel_spi)
+ $(meson_feature synaptics plugin_synaptics_mst)
+ $(meson_feature synaptics plugin_synaptics_rmi)
+ $(meson_feature thunderbolt plugin_thunderbolt)
+ $(meson_feature tpm plugin_tpm)
+ $(meson_feature uefi plugin_uefi_capsule)
+ $(meson_use uefi plugin_uefi_capsule_splash)
+ $(meson_feature uefi plugin_uefi_pk)
+ )
+ if use ppc64 || use riscv ; then
+ plugins+=( -Dplugin_msr="disabled" )
+ fi
+
+ local emesonargs=(
+ --localstatedir "${EPREFIX}"/var
+ -Dbuild="$(usex minimal standalone all)"
+ -Dconsolekit="disabled"
+ -Dcurl="enabled"
+ -Ddocs="$(usex gtk-doc gtkdoc none)"
+ -Defi_binary="false"
+ -Dsupported_build="enabled"
+ -Dudevdir="${EPREFIX}$(get_udevdir)"
+ $(meson_feature archive libarchive)
+ $(meson_use bash-completion bash_completion)
+ $(meson_feature bluetooth bluez)
+ $(meson_feature cbor)
+ $(meson_feature elogind)
+ $(meson_feature gnutls)
+ $(meson_feature gusb)
+ $(meson_feature lzma)
+ $(meson_use man)
+ $(meson_feature introspection)
+ $(meson_feature policykit polkit)
+ $(meson_feature sqlite)
+ $(meson_feature systemd)
+ $(meson_use test tests)
+
+ ${plugins[@]}
+ )
+ use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+ export CACHE_DIRECTORY="${T}"
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if ! use minimal ; then
+ newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+
+ if ! use systemd ; then
+ # Don't timeout when fwupd is running (#673140)
+ sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+ -i "${ED}"/etc/${PN}/daemon.conf || die
+ fi
+ fi
+}
+
+pkg_postinst() {
+ use minimal || udev_reload
+}
+
+pkg_postrm() {
+ use minimal || udev_reload
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 5ad610d49abe..423c7f74be1b 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -2,12 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
</maintainer>
<use>
<flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
diff --git a/sys-apps/fxload/Manifest b/sys-apps/fxload/Manifest
index 3f3bfdbcb81f..3272b017b15b 100644
--- a/sys-apps/fxload/Manifest
+++ b/sys-apps/fxload/Manifest
@@ -1,3 +1,3 @@
DIST fxload-2008_10_13.tar.gz 23926 BLAKE2B 61401b6ea11bfafe8bdb4128dd1658123cac83c1e2b7995a1554b5c9dfa9cf25c2f261bb76a2fc0946940c64ec69fce021e187c383201f4f7a3561a68c3f8ac8 SHA512 f8a654c51a392ac95672a24962ac3b83ea4e0cb62d51a0696f6bdfdefbc7b5cfb033aa9cd80ee676a6bb00061bd635d7eb3920769f982188d8733c862838bc32
-EBUILD fxload-20081013-r1.ebuild 753 BLAKE2B 65b52c44012d1eda44aa909c9bfbf48bb759c4f0393b245e4b8bc6bb7d1f26db9f3e8a5c25d874a616902e3b0324730c5c689967f155c88537d40bb4ffa57c15 SHA512 50e15c4d3518a1bc69504db8652135660375f7c902c05732da09bef0400b0721ac54f98185e64d008a89fea91de3d0aaae76ac291e474933493b51dbe5e6a12c
+EBUILD fxload-20081013-r1.ebuild 760 BLAKE2B 59b2ee35e6970a54c28f90c1bab84c2af3e12cc15ac8ee33ad4dc4d19ac9f11cf95ba0a156ebd4aaee5a004dc4e60d959b9452133e3fed4f26176221e4c00b86 SHA512 a87d5c96e9ab22896a201bda715c817b02b6025d82485af4614d181cc2da6bc895699398dc75ea3e4e7752594c9f737b9d071ad78cb9baedf761f45b3675aa51
MISC metadata.xml 251 BLAKE2B bbf2f536abcea7b90d0e218f2e60c095b5ddec83210274e52e9ab118c12761f868c3b9231ae1eeed5ca646a2977d18357dc519c8ff6ffd7caf3fa4568dd1fe54 SHA512 2ca42f9b05e9dd47323062290543c685c6f1e77bec7e066b8c8ea729de88f44e83f58c54bf7fa2c4987a66db308578942b4bd6a401c4b1700fa92a7cf882519a
diff --git a/sys-apps/fxload/fxload-20081013-r1.ebuild b/sys-apps/fxload/fxload-20081013-r1.ebuild
index c934c82104a2..eac58ae463f0 100644
--- a/sys-apps/fxload/fxload-20081013-r1.ebuild
+++ b/sys-apps/fxload/fxload-20081013-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 sparc x86"
src_prepare() {
default
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 45c037c9a6af..68046c42657e 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,4 +1,4 @@
DIST gawk-5.1.1.tar.xz 3250860 BLAKE2B 35eec6f4c9bf52496ac16e4b0e1b98947ae0dd46d0ab1df9ec13ede24374a4917214e492182a16e25fc515fa62a765340914feac16a006d980ba1328634a5291 SHA512 794538fff03fdb9a8527a6898b26383d01988e8f8456f8d48131676387669a8bb3e706fa1a17f6b6316ddba0ebe653c24ad5dd769f357de509d6ec25f3ff1a43
DIST gawk-5.1.1.tar.xz.sig 488 BLAKE2B 1c7813753f3e982e1ef31efc7a1d78da4b977064b395e7b138ce09e68c1b9cb9a7b7de0d0b36afd6d39a2e62d5563cf7ceac6fcc73e9124ab07eceb56c0aa040 SHA512 71ecfa1b3a9e3005f033e83a75abce5c576c7941c62ed571cb6124032426db0e220bcdd577395d1af00a53c13dd1c8e6de71702cbe9c71960d3a3ff76dc026bd
-EBUILD gawk-5.1.1-r2.ebuild 2726 BLAKE2B ed5ccf5cea50c5255e7ed2485a0d7659a96148d369acf55825394e8c0fde6ca814720de9753ce2cab15bce210dd4f1b2d86fe679754eda57147fe772973f4459 SHA512 c27d728e5e07e461ddcd1644f8dfd94d08fce898d58e98668f1b484075f5775315d01e61101e39fa46e30acb15224833ef219c36271528462f2d2fc6e65014e9
+EBUILD gawk-5.1.1-r2.ebuild 2761 BLAKE2B 74c1bb46202545d260d5212e17f281d762e39fb6c687b75577f8ff776e77a4d759df71ad8b153bb27554522caa84de29044a9e49a4494a42a4189c2c064c8fa6 SHA512 f61fd217de6d8b5b1083839c5d4cc4656c7ca7fe26a3d4c4ecfd414ed2ebca3ade5621bc5076ed682d52c478b453b03ee6aa5db623910928bc1ed3426b6edbba
MISC metadata.xml 348 BLAKE2B dd212d42a4218147703b0dd20699b3040aa7fa6e214d26b7919e7e547a71d4ba22f827aa952952ad97314f90444fb27dbd79da73988f33084c457e1a358b5d1c SHA512 8a6da25157316d3caf69f2a2f68c93d98ba76e89304237b2df04032db39849349c1911e69037da4d8789d8c284792de1071e7eda66e62f2be5523806c6f13223
diff --git a/sys-apps/gawk/gawk-5.1.1-r2.ebuild b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
index 6e6db23f870b..396c6f8f74f2 100644
--- a/sys-apps/gawk/gawk-5.1.1-r2.ebuild
+++ b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
@@ -62,6 +62,7 @@ src_configure() {
export ac_cv_libsigsegv=no
local myeconfargs=(
+ --cache-file="${S}"/config.cache
--libexec='$(libdir)/misc'
$(use_with mpfr)
$(use_enable nls)
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 35c155d0cc56..78447249a0c8 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,4 +1,4 @@
DIST gentoo-systemd-integration-9.tar.gz 65696 BLAKE2B 7d2105e37ff53d48e312b78a971f16124df1d3a1f99ae37eb757e4be31663eee15ba1a9fb31ef31250c79f902f7a00e1de84030f3fb67e41ab2243d58deabcb6 SHA512 e4810e74c713793f1e5aca7f025780c32e8f0fe404bf74b65263bfaeff1ae1398551fdff7de37a4050f0e48d5e0b90525217f5b3caa18111ab1981f57f41fc18
-EBUILD gentoo-systemd-integration-9.ebuild 990 BLAKE2B 3167c9350b6d90606516ad2eec7afa2fc2c1c7ec1bbc78d125b4cefdf21750da062980733a5dcdc9db6d48f6ffc1ebfff30c985a707b79202508c977822020e0 SHA512 84063f24f86dfe9a94ebc96d9424cd0199643a4a09c5d9970ee516e74eaa7507879aded7138112a179f42ace7deb7a7b9fa27bb5e757f949fe2ecb6d694c20c1
-EBUILD gentoo-systemd-integration-9999.ebuild 991 BLAKE2B 946da0cf6ff72cdfd50555e56c4b42e8d6ccd577cd6901ebfe07dbbfe39507dfdd8ad83d4e4fed3aa14f34d73c7084257c4b1a36b79a4dc1dc4ea3725a318c66 SHA512 bbea76053dddbb7bbcea129d41cae4d4b48998fe0be995d4d30cd152837bd8c065bee81e70519f4420c485bfee39e4b0f4b03fd11049ccea6c85d582968ed026
+EBUILD gentoo-systemd-integration-9.ebuild 1002 BLAKE2B 7fb4bb0c606f5bdf1ac5f00636518ee3b987179d15cc10477b6aea687a3466764af1a6b6a069a42daaf26ae6f266fe448a9dbdedc75cc1c42a25c88b0d18dac6 SHA512 4151bdfa598c9ae80dfa1531a109defd8c367ab1f04129dccdb2f0ea381b3a6ef5ff8e9ecff18bc45998fa2aac6358dc12f745a6ad67766e454523e2d6329daa
+EBUILD gentoo-systemd-integration-9999.ebuild 1003 BLAKE2B e3b623391925b2f628ae48bb8b66d60d056d977ceb1219641e5e8e19f6b0d627826a1e851bd674b589c603a2ccfa64a191b9899e5dc8051a26939316a7bf6fb1 SHA512 447214da6d0bf9fc07fbfdc2e5a2f841e5f17d626f19500dd4cca5e7de259c581fac1b69ace46e2441a76763a43c13095085f8096defaa7c95bcdd87d256a88e
MISC metadata.xml 380 BLAKE2B c85bcefccc2876a63a0b0348c42099812d371f2893971cd3ed76726bb1c305c6d17a30814743b9db8f91f96448ea241be723bd9deb11d627ee0c3b38643f8a42 SHA512 d72a532ad36554a12da2dad9645e939f79fe67ad969850f702bfb2691e80fda2c3c7a99e5f7be992a2b0b78aac4a09aa56d04ee914d1c98f131ef29e10a91dcc
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
index 83f9b27ef1a7..ff0712f83a44 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
inherit autotools git-r3
else
SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="systemd integration files for Gentoo"
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
index bb66dd8ea452..0332820fef8a 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
inherit autotools git-r3
else
SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="systemd integration files for Gentoo"
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 79f797e1f593..86ab81e4543a 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,6 +1,3 @@
-AUX gnome-disk-utility-41.0-meson-0.61-build.patch 763 BLAKE2B e4e2732bd634635c43db1e8fb17cb7b74a9540c90b686f5d0573be452a80a4ee1fa8c7bd6adee3a1f5709c4914fc418072b74ad00f3aaccdafc02460317b3fc8 SHA512 188aa575f186e46b17f5614737f51de6a5ecce1484610b64001cc12f3dbabef041222055844f8017a9baf1b58a0931c37b1bf2f2ecabc352b6355928edee1dd3
-DIST gnome-disk-utility-41.0.tar.xz 1401088 BLAKE2B 78769a714a8e5ee5596da3502562a7a136f54c7b832f44b8b70bae60de42af9dda433c4acd3b74ca31f71e53a633f2888c4e21d6ce9d9ccf2a03485903b3985f SHA512 a78dd281c078046abef5c0986777c6a87bc27d9b1bd6e798b5be058a3352b33dead8f5fea6e8f30e8c61bdd21996ee7d784838d953a33973243faabd7b713895
DIST gnome-disk-utility-42.0.tar.xz 1740332 BLAKE2B 4d05876364a475d1e16651569862fe3e9bb97549463146e69722c55922c0609069334e198eff91208448dc0baf7fcefe6bab56612e89fd7412fea42ba20549d2 SHA512 c47c37262295ba455b483a7ebe7799e92f94b97d177327817bb088cddcc3ff1f5840c3e270651287ff6a88257ec7cfcd1abe4167bf7454bbf55e145c8f1dc7c9
-EBUILD gnome-disk-utility-41.0.ebuild 1477 BLAKE2B 4b6f5ea10814add8853d45cc956d7e2e383eaa9b69132b0ff395d449916412707f4ecc7f2c60ee379d4ae46ab786d8a0f0a9d21969b87525e74e335a444eac4f SHA512 072fb731ccf0ae6378e655649feac807b69bef10dfc74aac417629d0ac37672910b2d32ebca3680305ce275973a2e90c1c313d95152d9368bd3abd5cc19b0060
-EBUILD gnome-disk-utility-42.0.ebuild 1423 BLAKE2B d54e6d71bf98ab4fac38d1dcd127ef75cc46ed4084fef036fbfd51f41505e48f7d26322326c066c55c71d1bea67a481dceddfd32938afd8424ec16665877b55b SHA512 0ad5522f194530223695358dc03926035df7cffe81bd60fa122a291c316da16dfd87689bec62bdaa67427b01150bfa60e7c7c11175d7f425506e26d8d8c19881
+EBUILD gnome-disk-utility-42.0.ebuild 1420 BLAKE2B f49175cccf7b980232eead9e9d9c8bb88c89c6b1fbd9e80d54f1d1d74505757995c40d50c70e6cf1b70866306ebf8d138f86c9d27aa8d0f630e676a72ca1c8d1 SHA512 07e8d01b90398ec739b4a2d1d421e7b340fde1b437707312e71b0572663c91a2d4881dc7fbd95cbe44819f77d383a1c6a9f6da0d0f56ebb77282680d832cd769
MISC metadata.xml 598 BLAKE2B e9bd803739e63d5667cf9d84b27af2efeeac8e31591d022cfce00fa147f4ee267ea2c03624f43c2d822c00b853b1606f6663814a731182aaf557be259ab2fe45 SHA512 fa5f53e258f9db1447b28979f655b6794491af9eafd0d6f113d43fd2073d36fcedc126fef7fde4a21b99e2ad11e4442c7c333d9dfaeee92064b0de23c071c23e
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch
deleted file mode 100644
index c28b9002575e..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-41.0-meson-0.61-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/commit/46ed7d26873b9741dff61f9df8e7778a8dc6f5cc
-https://bugs.gentoo.org/831552
-
-From: rvalue <i@rvalue.moe>
-Date: Fri, 17 Dec 2021 12:29:30 +0000
-Subject: [PATCH] build: fix arguments of i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments for a time
-and explicitly rejects with error since meson 0.60.0
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -11,7 +11,6 @@ desktops = [
-
- foreach desktop: desktops
- i18n.merge_file (
-- desktop,
- type: 'desktop',
- input: desktop + '.in',
- output: desktop,
-@@ -38,7 +37,6 @@ install_data(
- info = 'org.gnome.DiskUtility.appdata.xml'
-
- i18n.merge_file(
-- info,
- input: info + '.in',
- output: info,
- po_dir: po_dir,
-GitLab
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
deleted file mode 100644
index e97b73b63ca4..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat elogind gnome systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-DEPEND="
- >=media-libs/libdvdread-4.2.0:0=
- >=dev-libs/glib-2.31:2
- >=x11-libs/gtk+-3.16.0:3
- >=media-libs/libcanberra-0.1[gtk3]
- >=gui-libs/libhandy-1.1.90:1=
- >=app-arch/xz-utils-5.0.5
- >=x11-libs/libnotify-0.7:=
- >=app-crypt/libsecret-0.7
- >=dev-libs/libpwquality-1.0.0
- >=sys-fs/udisks-2.7.6:2
- elogind? ( >=sys-auth/elogind-209 )
- systemd? ( >=sys-apps/systemd-209:0= )
-"
-RDEPEND="${DEPEND}
- x11-themes/adwaita-icon-theme
- fat? ( sys-fs/dosfstools )
- gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-# libxml2 for xml-stripblanks in gresource
-BDEPEND="
- dev-libs/libxml2:2
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-meson-0.61-build.patch
-)
-
-src_configure() {
- local emesonargs=(
- -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
- $(meson_use gnome gsd_plugin)
- -Dman=true
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild
index fb3a0a790e86..40d5fcad3ceb 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
SLOT="0"
IUSE="fat elogind gnome systemd"
REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
DEPEND="
>=media-libs/libdvdread-4.2.0:0=
diff --git a/sys-apps/gpet/Manifest b/sys-apps/gpet/Manifest
index a86133413586..88df11db332c 100644
--- a/sys-apps/gpet/Manifest
+++ b/sys-apps/gpet/Manifest
@@ -1,3 +1,3 @@
DIST gpet-0.4.tar.bz2 352653 BLAKE2B e9bee8cd62332101afea95f427646dfc51a0dcbb95a5807b8cbd0503594090ef2ff5428876bd7d017465d8708e7c3a282602cc48edeb6cafd2976a51568a911d SHA512 e373d57ab67d71fb750ee9af93893d036ff26f764f317328117745a4440c0559c2356866c09acfe579473e950e003744ae0a308df3b284d46097dcfe967c122e
EBUILD gpet-0.4-r1.ebuild 609 BLAKE2B 6fbcf20b2165b2c7d50889763b465cb2f37bc7cd59f349298ca8939844b3ca464b0f7b4b7a6de65a4789bee1a599668041b031ab99c8c52931a50ab2941d2de7 SHA512 99f4f90bb345bee2cb683381eee49b2f84b1fbad42a8a241b922bd00361a8c4fef30256b9473222478001e4ca84117d89b0481b22f63369341cbf1c6b3739117
-MISC metadata.xml 332 BLAKE2B 4aee879af2627c6e72620756dde2130a9843a77c3c945f8e5d1ce34cff10e0407c7974b0045e0e6547a86ade7f22adec471918c296be7ab64c38097204f1c3c1 SHA512 5423050bf8f325c28c8e8a53c81e68d70758a9ea5a5c8687034fab630a38bcb3e0df8454ede43a0af2c7ee91ee74795c6208cfd567d59fd65d5bc77f8e30a636
+MISC metadata.xml 322 BLAKE2B bcea9c595fb229b97a518a123d40d9b02a6b995a06c44ec9a919a0d5f85cf13e321f574d50b1969e022ec2ad7af9a566aeb17db8bbe243aacc903e0fd86c592e SHA512 867a9994da69716df6a8e3c4d093e3020fc5616dfe7586487ace096522041980821bd9a5f0c419254dc811e27471df240c131fa335663c7dfdf883a64c3e653b
diff --git a/sys-apps/gpet/metadata.xml b/sys-apps/gpet/metadata.xml
index 62c7cd16c9b4..7b667646cb4d 100644
--- a/sys-apps/gpet/metadata.xml
+++ b/sys-apps/gpet/metadata.xml
@@ -6,6 +6,6 @@
<name>Naohiro Aota</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge-jp">gpet</remote-id>
+ <remote-id type="osdn">gpet</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index dba836ef1ef9..394f383ca5b2 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,8 +1,6 @@
-AUX gptfdisk-1.0.7-remove_byteswap.patch 1836 BLAKE2B 2c16a9eb14c4aef96db2b3b4e5a9b4493032845234cf01b326ad17a12e2ffd2a5e27b5a32b13416dbf11c8224cee1b4a10cf0b0dfd2f95adca7faa88f2d712e8 SHA512 d91ce5ec39ed42cb87ac8a986c12ae79c1fe46340965508edb586a8aaad8e72a4227d88ce8e53d73e17d796ecc547d1c41e626bc6f897ee70badb5d74223a940
-DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c
+AUX gptfdisk-1.0.9-libuuid.patch 899 BLAKE2B 534038452a7184945486b8435099adf7f1992c4bb8618a0ed5432c7675eb653374b25417b2b21c8fc2ec0b0860303e054fb0dc71f880941712e6230ddb029358 SHA512 590b6e7c5b16762abffe68767f255414a56f7fbd691a47837a93b288bde5210a3ab4addf93725c313134c48e6d6bc69701ad3742455f48de793412616be51df3
DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331
DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
-EBUILD gptfdisk-1.0.7-r2.ebuild 1290 BLAKE2B 789fed2d6991ebbb1bc8707dd17ed86449e6c2d22db73d8ec7451fa0f9c8d13dac65752295109010ce3332c63f0aab16bbd55cd757c959a8ef57f89543645569 SHA512 0d9b32e690c1e6d477b4009cbf55dc2361f00c6c99b289b8e927b516787770351f751f6226bd6cbd68dda4edd6450d0c55e5db6b9834356830d6e4bb464c4fa3
EBUILD gptfdisk-1.0.8-r1.ebuild 1225 BLAKE2B 2f0960a54787e83b4f4cdef9b33ea0bafac5423f80c4db6e0a6fb2bbcc898b0cb5bdb1054769a92601b7ff2ae7a1974554ce89793242096f29d8596e55d12a0d SHA512 5d24033c201ac8f3fa66c0137e2de032fa2cafdddfa3ea740c04f651b268e59541de831bdd84f191397ca2ed395338bc33ed6fcb2c91430c8f27c9b00d3831b5
-EBUILD gptfdisk-1.0.9.ebuild 1232 BLAKE2B f5e5b583fb8449d46e87be7918e4112fa7d419160140bf4203219b84ef9c92d6fc52d48fe54a3b83dbd3763ae0fb7332a4267b60f13e19c3bba7e6031f462988 SHA512 b6d08bd889289a2a16f2bbe1d01430647c0a9ad246bce6217db91b5fe63d86b171114bc53587ab49017d134481d0633b0999b2489e935c5d1bc0a4d6cd7b7b5d
-MISC metadata.xml 340 BLAKE2B 1934da4cf8289a324846642f69ba53d6e0988eb37c4a56019bae8094935efc1ff485f7f6746d58a72efcf81b1a017baca1f48e3a47d321fd8c87fb756b2e5419 SHA512 6074f7a7c0ada7deacf252c2bd7be3b5aacc3402e88b13bfbbf085b7760956a1ec35e52c22d49663d358dd837319815e4b1d5071ea0119f9890d31eca9ef84ed
+EBUILD gptfdisk-1.0.9-r1.ebuild 1294 BLAKE2B 9d2e55ba094c6ad72cbebf6dbec62362b7bb52d97fef07630431072612b81eb2f88544c5eff11381414ad5e4eebf6118f80e3f043aee8a401055c991369d613d SHA512 99325ad00459979e59c1451110b50213edbb8ead7fb0c3675a304192273c994dc3e347a78514adb02bdf368307f87946df9c38ab6bc106eb57bef9e69f416c1f
+MISC metadata.xml 251 BLAKE2B b8bc44bb2f871b081084b3fb8c2e6e21117ead330c29676827bb826d45336e245550e9cf4641bb82aecb4730dbc7aca2aeaa893d348856be1fec24e33d112564 SHA512 c06acf5ad3f44c17b239560351b5ab60a23e5d834e84ce84be90aa980e1230efe0817df5a821db9091806dcb0d774e472f5c74bf36c014826e6c387c88f485c4
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch
deleted file mode 100644
index c1874d6edd7c..000000000000
--- a/sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From fded770b55fdb3a201ad515d785c17ac35705652 Mon Sep 17 00:00:00 2001
-From: Erik Larsson <catacombae@gmail.com>
-Date: Tue, 8 Jun 2021 16:11:21 +0300
-Subject: [PATCH] gptpart.cc: Remove byteswap commands in
- GPTPart::SetName(const string&).
-
-The byteswapping done in GPTPart::SetName(const string&) was reversed
-later when GPTPart::ReversePartBytes() was called.
-
-The intended design seems to have been to keep the fields in native
-endianness until just before the partition is written to disk when all
-the GPTPart data is byteswapped all at once with a call to
-GPTPart::ReversePartBytes().
-However this was defeated by leaving the original byteswaps in there and
-effectively the name was swapped back to the native-endian form. For big
-endian systems this meant that a UTF-16BE string was written to disk,
-violating the specification and causing interoperability problems.
-
-Fixed by removing these inline byteswaps in GPTPart::SetName(const
-string&).
----
- gptpart.cc | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/gptpart.cc b/gptpart.cc
-index 81bbcf0..841140a 100644
---- a/gptpart.cc
-+++ b/gptpart.cc
-@@ -242,7 +242,6 @@ void GPTPart::SetName(const string & theName) {
- // then to utf16le
- if ( uni < 0x10000 ) {
- name[ pos ] = (uint16_t) uni ;
-- if ( ! IsLittleEndian() ) ReverseBytes( name + pos , 2 ) ;
- pos ++ ;
- } // if
- else {
-@@ -252,10 +251,8 @@ void GPTPart::SetName(const string & theName) {
- } // if
- uni -= 0x10000 ;
- name[ pos ] = (uint16_t)( uni >> 10 ) | 0xd800 ;
-- if ( ! IsLittleEndian() ) ReverseBytes( name + pos , 2 ) ;
- pos ++ ;
- name[ pos ] = (uint16_t)( uni & 0x3ff ) | 0xdc00 ;
-- if ( ! IsLittleEndian() ) ReverseBytes( name + pos , 2 ) ;
- pos ++ ;
- }
- } // for
---
-2.32.0
-
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch
new file mode 100644
index 000000000000..e7a5f68e19ee
--- /dev/null
+++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch
@@ -0,0 +1,37 @@
+From e67faca2c0ca955f56cbd22e90941cdcbdc12597 Mon Sep 17 00:00:00 2001
+From: Rod Smith <rodsmith@rodsbooks.com>
+Date: Sat, 16 Apr 2022 09:32:04 -0400
+Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid
+
+---
+ NEWS | 3 +++
+ guid.cc | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/NEWS b/NEWS
+index c7add56..3d90d9a 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,6 @@
++
++- Updated guid.cc to deal with minor change in libuuid.
++
+ 1.0.9 (4/14/2022):
+ ------------------
+
+diff --git a/guid.cc b/guid.cc
+index 1e73ab7..d3e4fd5 100644
+--- a/guid.cc
++++ b/guid.cc
+@@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
+ void GUIDData::Randomize(void) {
+ int i, uuidGenerated = 0;
+
+-#ifdef _UUID_UUID_H
++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
+ uuid_generate(uuidData);
+ ReverseBytes(&uuidData[0], 4);
+ ReverseBytes(&uuidData[4], 2);
+--
+2.36.1
+
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild
deleted file mode 100644
index df490f526b5e..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
- dev-libs/popt
- ncurses? ( sys-libs/ncurses:=[unicode(+)] )
- kernel_linux? ( sys-apps/util-linux )
- )"
-DEPEND="
- ${RDEPEND}
- static? (
- dev-libs/popt[static-libs(+)]
- ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
- kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
- )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-remove_byteswap.patch" #797412
-)
-
-src_prepare() {
- default
-
- tc-export CXX PKG_CONFIG
-
- if ! use ncurses ; then
- sed -i \
- -e '/^all:/s: cgdisk::' \
- Makefile || die
- fi
-
- sed \
- -e '/g++/s:=:?=:g' \
- -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
- -i Makefile || die
-
- use static && append-ldflags -static
-}
-
-src_install() {
- dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
- doman *.8
- dodoc NEWS README
-}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..6a445a77fe7a
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+ dev-libs/popt
+ ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+ kernel_linux? ( sys-apps/util-linux )
+ )"
+DEPEND="
+ ${RDEPEND}
+ static? (
+ dev-libs/popt[static-libs(+)]
+ ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
+ kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+ )
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-libuuid.patch" #844073
+)
+
+src_prepare() {
+ default
+
+ tc-export CXX PKG_CONFIG
+
+ if ! use ncurses ; then
+ sed -i \
+ -e '/^all:/s: cgdisk::' \
+ Makefile || die
+ fi
+
+ sed \
+ -e '/g++/s:=:?=:g' \
+ -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+ -i Makefile || die
+
+ use static && append-ldflags -static
+}
+
+src_install() {
+ dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+ doman *.8
+ dodoc NEWS README
+}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild
deleted file mode 100644
index 62367d7e3bbc..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
- dev-libs/popt
- ncurses? ( sys-libs/ncurses:=[unicode(+)] )
- kernel_linux? ( sys-apps/util-linux )
- )"
-DEPEND="
- ${RDEPEND}
- static? (
- dev-libs/popt[static-libs(+)]
- ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
- kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
- )
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
-
- tc-export CXX PKG_CONFIG
-
- if ! use ncurses ; then
- sed -i \
- -e '/^all:/s: cgdisk::' \
- Makefile || die
- fi
-
- sed \
- -e '/g++/s:=:?=:g' \
- -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
- -i Makefile || die
-
- use static && append-ldflags -static
-}
-
-src_install() {
- dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
- doman *.8
- dodoc NEWS README
-}
diff --git a/sys-apps/gptfdisk/metadata.xml b/sys-apps/gptfdisk/metadata.xml
index c19d1a32c6d0..2da27ac6ad8d 100644
--- a/sys-apps/gptfdisk/metadata.xml
+++ b/sys-apps/gptfdisk/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">gptfdisk</remote-id>
</upstream>
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 18f23987b92a..7c23f4eb1ad2 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,8 +1,6 @@
AUX hdparm-9.60-build.patch 1153 BLAKE2B c3eb037e0576a066fe2a2c6e00406dcfd3e99e23b468a4fbc0f5ac545d8a1b214168769da94271242b2119d480e34dbcaa734b636231021c03e2a57f585426cc SHA512 d3f76575074806c7981aacdf7a5a4e1e97a2afbcd09e8821cf1c064f8960b397e2ccdd534fb95b91f43f35c481f94463fb1fe485189436bd5de8178823d7c9eb
AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
-DIST hdparm-9.62.tar.gz 139976 BLAKE2B 83ea59e35eeec7fa2a9e2f9f4b7a9a0d44cd4366d95e529c08bf38b04f6d78862bfefdfb905d4fceadbb81453ee92a60aa55db8d4c0bd164ec67181b46f197bf SHA512 ac6c4d285d081ecd8c7b231192a5a0fc268d934eeeb59794ae9a9db01ecbdd0afa0cade6ed42a1fd26ad543c52a3b380ac4f1b679992d167becb4ed6251fd369
DIST hdparm-9.63.tar.gz 140252 BLAKE2B 41ee3dda11f17ec9c125b7d680f07ca2d88c3692e2436b8d2550dbd58546b1dde8e61cdf5312c5b09d687dad81826bd848c8eabcb3e01ab09ac6cfb082699238 SHA512 1d09dc2c79c31f45fa242dd5bf259e84281d1464e49ada9fd53bb6d58cb0458046e534a93f9d6de18478ca5db50b6d36ecbe5b784c0c681a1db29f15fadd525c
-EBUILD hdparm-9.62.ebuild 980 BLAKE2B efb0726d73386d05a2ec18b14736b6f25592f8688c03be87840ec0c83f963ad7282ce42a7944da425e12f7c1e77f9771372bdea942854c932ce2d3ddc1391b74 SHA512 975faa5c62117f10feab032e416601e075e65ab6c44b828eefb9fe7465c6475c3593e4c0ca70c171198b7f0aeb922b7ac1c010b3fcb05498a6f5cf424ca8617b
-EBUILD hdparm-9.63.ebuild 980 BLAKE2B 51fa0af24af6f3a27f55175de7801defa2c8d924f036693f9806170fe2a9b816bc928c712bf7f653dfb5cdac9d11ad885bd146a77f07a4afe6258923ad4f4c3d SHA512 2979c140f66c3032444e17a3c25f08aa0b4bb2ef0e0420257f26a672dac369e64df9c4225a66b4fbb253968a6a18c12458e6cf28c49ff0e8ce4a936ee77c2e4e
+EBUILD hdparm-9.63.ebuild 994 BLAKE2B d018ce0b5ea5343f6cfa431973e1ed2f421fd52747b0a6415360ff18a7c951e7f2b218a271bd8631a55ed333753fcf3647fdb2491d161e648a6981a6f8c2c5dc SHA512 65cde99243246548e77d69ab2a72af7ac77070dd9c5aedbbb77de05ccc79dc681072959c21872f26c3f5e70d8414e0e64b9fc3abe70c2d54fc468d38970ef771
MISC metadata.xml 327 BLAKE2B 9cd0640be1e5123d4bfa4c7de8fd6b9bf20cfe3a238d6e271ad979efe74540708e55b9af9b134092c2db90e68550e479f8a1cf2b5a3cee5bd7e2f0bc7f719960 SHA512 2d7160e374e48c59585903e354ae7d910cdb43916fc3285d076a0e77437a864b595f1713ad05fd9146aa43a6d0b36597a76e2a096ef27129a3727e899e27caab
diff --git a/sys-apps/hdparm/hdparm-9.62.ebuild b/sys-apps/hdparm/hdparm-9.62.ebuild
deleted file mode 100644
index 55ee7b72540d..000000000000
--- a/sys-apps/hdparm/hdparm-9.62.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9.60-build.patch
-)
-
-src_prepare() {
- default
- use static && append-ldflags -static
-}
-
-src_configure() {
- tc-export CC
- export STRIP=:
-}
-
-src_install() {
- into /
- dosbin hdparm contrib/idectl
-
- newinitd "${FILESDIR}"/hdparm-init-8 hdparm
- newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
- doman hdparm.8
- dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
- docinto wiper
- dodoc wiper/{README.txt,wiper.sh}
- docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
-}
diff --git a/sys-apps/hdparm/hdparm-9.63.ebuild b/sys-apps/hdparm/hdparm-9.63.ebuild
index 730507f94862..3488ffc74343 100644
--- a/sys-apps/hdparm/hdparm-9.63.ebuild
+++ b/sys-apps/hdparm/hdparm-9.63.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
LICENSE="BSD GPL-2" # GPL-2 only
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static"
PATCHES=(
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 5cbf7e7cd043..3df183d9b474 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,6 +1,4 @@
AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
-DIST help2man-1.48.3.tar.xz 211504 BLAKE2B 407cc87b1238242c202d37c0c4cd394e0efba95759b86a88026aef7c05d6a097d1946614547ebfab45f7fe0c1ddd057724234629246d32e94862c3d633b78c31 SHA512 e000e7380604c0986b14cb64b852d55eff48595884bddd389e876056dde6ce72b37aa16d92230e6f8f6e128003b819954bae4aa90933a58b51d3665d3c0ba356
DIST help2man-1.48.5.tar.xz 204672 BLAKE2B 6d96f5f65f8c637d524e5c373f2b89f114adf544c1d3508a9cb51115279b9bf6399c8ebb0a8d831de12ef8cdaca40b6e75412a221efc5d2dd1794e9c9643196f SHA512 800eb0daa9daef8e423d52ede55eee2960122ea0269865295afada4cf4fcc1c6791da8429c3a57c0fc1bf0a14c8a77953952325413a8faa5dd07b1bc5bc0edd1
-EBUILD help2man-1.48.3.ebuild 1035 BLAKE2B 2bdcaea0a0b2256abf60dabc5f212b586ff59113f8d3ae541ce21d2f5c7c9a294b18280d741f116ea9dd75d9bdb24480ae6bfd5ac332456174d4ce942ffb997d SHA512 d1bfe5663fe13784f5d08e077f216f3155e44bcddba456413fc495dea90e799703a866f0210c690e4764f8826fb7f2732f8912df095b6e9c1f209432911aae0f
EBUILD help2man-1.48.5.ebuild 1042 BLAKE2B 32553914ae2c27d4d4f05d5be5ac93ed582c1443bd04642aedcf0d838f87dfebf6666d9159f41483bb91d56cb4d29c3b4220a75703ab567d8541117f93d0c44a SHA512 17c63491252c0730ec8e1403062a0413ea5be4368a5e43db561fc80bf07afe835533ebdccaec55b4e8078e8f827b2518ec726e97d3f5c4736dcd6a8572853ef2
MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/help2man/help2man-1.48.3.ebuild b/sys-apps/help2man/help2man-1.48.3.ebuild
deleted file mode 100644
index 31a7f04f2fc2..000000000000
--- a/sys-apps/help2man/help2man-1.48.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
- nls? ( dev-perl/Locale-gettext )"
-DEPEND="${RDEPEND}"
-
-DOCS=( debian/changelog NEWS README THANKS ) #385753
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i \
- -e 's/-shared/-bundle/' \
- Makefile.in || die
- fi
- default
-}
-
-src_configure() {
- # Disable gettext requirement as the release includes the gmo files #555018
- local myeconfargs=(
- ac_cv_path_MSGFMT=$(type -P false)
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/hponcfg/Manifest b/sys-apps/hponcfg/Manifest
index ef92eabd107c..2bf39aa27569 100644
--- a/sys-apps/hponcfg/Manifest
+++ b/sys-apps/hponcfg/Manifest
@@ -7,4 +7,4 @@ EBUILD hponcfg-4.6.0.0.ebuild 1214 BLAKE2B 81641e95bcf8eaae323e8a465bfbd524aaf54
EBUILD hponcfg-5.4.0.0.ebuild 947 BLAKE2B 5e433cfbfc8f468656740ec1bfa24d99703d90312b1217e61cf504a37d38d18eaed1a9763707f9550268061d32ee904752caabf9eba25b2b909c15388fe22979 SHA512 b2e65d46faf05e6c90c1eca0bfe96ea3efbd8f79c908e659522cba6159afc9bfdc98ec80dd408d4fa15200256a4f40ffd07bdbf278f8ef6a4d6d42c61b0ea87c
EBUILD hponcfg-5.5.0.0.ebuild 947 BLAKE2B 0856cfdb8d0e2cd6c36783759951cb2fa4e898706d6707e7f2e7a26b4cea9c4d307cd6cb0597cb90705fcad2db0e7b72a5540b7ceeed0e899fc0e0c8b7b40ea2 SHA512 31da07f1ec9cd69e5c63398c1656a81e70556b6a68c8fff152be26946a34b6c0df441f567ae6c29955129b4c481f13fe41275f664aa18ccebc2b809cf5430261
EBUILD hponcfg-5.6.0.0.ebuild 948 BLAKE2B 76e3bdf08867b9e40723653b6df4590b3607a318e4fa7f874d1f6dbbe88b18ac5d8144d9f09747980e60f99e9c121f10fe89958b3d80a0a3c7fb7002c5c56eb7 SHA512 9f464b7d7b9134027d1a4c416266e63b94377c3293e733ddd8c484e78ca4ae03beda42a3411bd27862c8459979a8d3c18fe4df32872e16c740cd3e13d47c117b
-MISC metadata.xml 252 BLAKE2B 84ce9630af2d663427fcf6fbc9832ea43e936720673088eb4a50db0e894647868f68ff3521824675235ee1ef504e4dc823efbd8d8f0b0905d58d8da94269eb2f SHA512 e44e7852efb83e01ec3ae07e390307b5de89fdd86705bfbc79432807c7b286fd56939ba92f8896c55cd70dae507b5e8ebc9d8e70c7d2756bab84cdc011c42126
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-apps/hponcfg/metadata.xml b/sys-apps/hponcfg/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/sys-apps/hponcfg/metadata.xml
+++ b/sys-apps/hponcfg/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index 9bb176d7c2d0..6fe85d6b02d7 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,6 +1,4 @@
AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326
-DIST hw-probe-1.6.2.tar.gz 163183 BLAKE2B f9b8d405e59f7799dd665b62362fe8f2b9fe45491d43249ab61ef0fa5ea4d83671ac0dbeef622c68f7c581eef8cd3aa33e6c8bbd46d5488a9c1f4781c820453d SHA512 8a7bf5254f24cc3a1ca19039a00de312f1400f34eaa0459fbff665221940abf60396e5d9e95b4a021e7f5fb9c54254b8c50d0d0b125fc60a0a7f5c7a57edf68c
DIST hw-probe-1.6.4.tar.gz 162317 BLAKE2B 5fc5ddf032c6b2504430349089d95be5310a7ac7752a2b6c3c504240dae6572ee773f8360d6449e9122b20de904a7348a2bdc0af660de44f14cf37b16664ef2a SHA512 c812ebdb23f6b8a4df2f2849a29ecc1307c09f758aeb912face6e899510af69f9dee606fb0ff1807a6de1e89a5f7a8b3259b894cc823b9d25efbf26accf60ac4
-EBUILD hw-probe-1.6.2.ebuild 2308 BLAKE2B e1619f4d5de09a5d7d2d2b55623d2db2ea5cd3833ac62c49b65fc8e1bc4af837c5f13bb50570d4a402949203b88035874d87c725eb563552816ac3c2afc065e5 SHA512 03e09dc195acb9f079e8980e6a3cd74cfe4da63a846fd177e27888b047ea974345a6a6d5c50eec59e8ac20899857f143cd268065727c0fe631737f81e0839f07
-EBUILD hw-probe-1.6.4.ebuild 2310 BLAKE2B e0be3c494d1c55e417aa6cda7fb5dce20fbdfde3c7a6a8912dea50d689429d76f1070cc04fbe2d38818db82284d4b14a73ad11bfa3d91f0d07f5d8b999bdc63c SHA512 ff0384687c15d332a47e890f49efae9da2a153eebcd971510b7f47704c10a72b87a1e829cf1faa7a47584259b68aeb1b2742ca38ea46782cbeb7db33cb12061d
+EBUILD hw-probe-1.6.4.ebuild 2308 BLAKE2B e1619f4d5de09a5d7d2d2b55623d2db2ea5cd3833ac62c49b65fc8e1bc4af837c5f13bb50570d4a402949203b88035874d87c725eb563552816ac3c2afc065e5 SHA512 03e09dc195acb9f079e8980e6a3cd74cfe4da63a846fd177e27888b047ea974345a6a6d5c50eec59e8ac20899857f143cd268065727c0fe631737f81e0839f07
MISC metadata.xml 647 BLAKE2B 522741fd8d5f7b64d686ce02dd5ccd7d9ba42df1e50a3e51921fa17c110c6db114ee22d5a903c8bb61a2a5f3884fad5e8b1a929a062af111fd52faf047638ab1 SHA512 ef6e4af1150d72b3cc26ba56267dae006ae8a19a8df2606a9f02df0dc6b091f0bd3dd9caee2171e896dd7b5e582b853f228e899dbd9281dd07b435a1da1f6b7b
diff --git a/sys-apps/hw-probe/hw-probe-1.6.2.ebuild b/sys-apps/hw-probe/hw-probe-1.6.2.ebuild
deleted file mode 100644
index 49411921e683..000000000000
--- a/sys-apps/hw-probe/hw-probe-1.6.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature readme.gentoo-r1
-
-DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
-HOMEPAGE="https://github.com/linuxhw/hw-probe/"
-SRC_URI="https://github.com/linuxhw/hw-probe/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
- dev-lang/perl
- dev-perl/Digest-SHA1
- net-misc/curl
- sys-apps/dmidecode
- sys-apps/edid-decode
- sys-apps/hwinfo
- sys-apps/pciutils
- sys-apps/smartmontools
- sys-apps/usbutils
- virtual/perl-Data-Dumper
-"
-
-src_compile() {
- :;
-}
-
-src_install() {
- default
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- optfeature "showing Machine Check Exceptions." app-admin/mcelog
- optfeature "showing additional I/O statistics." app-admin/sysstat
- optfeature "showing display data channel (ddc) information." app-misc/ddcutil
- optfeature "showing smart card (reader) information." dev-libs/opensc
- optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
- optfeature "showing information of attached scanners." media-gfx/sane-backends
- optfeature "showing GPU information provided by MESA." media-libs/mesa
- optfeature "showing zeroconf statistics." net-dns/avahi
- optfeature "showing HP printer statistics." net-print/hplip
- optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
- optfeature "showing additional CPU capabilities." sys-apps/cpuid
- optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
- optfeature "showing available I2C sensors." sys-apps/i2c-tools
- optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
- optfeature "showing information about tested memory for faults." sys-apps/memtester
- optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
- optfeature "showing systemd boot process information." sys-apps/systemd
- optfeature "showing ACPI statistics and tables." sys-power/iasl
- optfeature "showing information about NUMA." sys-process/numactl
- optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
- optfeature "showing available Xinput devices." x11-apps/xinput
-}
diff --git a/sys-apps/hw-probe/hw-probe-1.6.4.ebuild b/sys-apps/hw-probe/hw-probe-1.6.4.ebuild
index 89965032f4b0..49411921e683 100644
--- a/sys-apps/hw-probe/hw-probe-1.6.4.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxhw/hw-probe/archive/refs/tags/${PV}.tar.gz -> $
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
RDEPEND="
dev-lang/perl
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index 526ddf8a30f6..54fd7d351f8d 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -1,7 +1,11 @@
DIST hwdata-0.354.tar.gz 2212834 BLAKE2B 5df04fd6069e131be7195b515f4f7273e28030d46823fa3054371f9afde4eb9976df2663bc7d31d056cb718a479630676f05459064decd59914f3a69bcfb03f1 SHA512 07bbe5137f35c0402029e066e90a29da1ca95faa6996a192b1f9ac00568e5020cc540b642ad2b22b25c2cfa0d7e4c2d7b80c9978ca0cd091691d8f1cf2933915
DIST hwdata-0.357.tar.gz 2234392 BLAKE2B 54f26384664cc78d99db52cffa99bf74f57bf355908bd0a87bd01436596b8ed618567caa6f4486e32cbf11bd9313946db2f4d52ce7f2eae1d25b643e68714473 SHA512 7674e77887629e57cf1d6cb73ce7f4734f9dd5e5f8cee0016aa74f0ff6b962f9f0e501069f4cbaa0a5281fed179d2912a653071999b9f7d0eb4d81fff719cad1
DIST hwdata-0.358.tar.gz 2240851 BLAKE2B b164c267a6779fec2a4018fb8bad98e564794e46cdec77b6f1234444f0fb20f49f44303a400d3301b40b07cebe0cc590553ae5e01702032b53180826273eb416 SHA512 52c765786aa41551e47bad2358bbe50f8f6a60cd820696c6c341f08cbde695f86746660a3fdadd8fad5614b99a98616111011a17d115c25bbcaf03c891cc3e69
+DIST hwdata-0.359.tar.gz 2247837 BLAKE2B af573e38cc04281e18e202fe134430cca3f85129196ff793571f1aa12c2380719e470941e4c8ab74cc888b5f06498d70af2ac1604e758b77f329e11043aae4c0 SHA512 e3054ded9ff913498f27206829af91cfd816acc0cb574f85207f6df5568502c28ff9d4a778549c900e90dcc8958deb45a1eb1511bae57b3240472402576b4943
+DIST hwdata-0.360.tar.gz 2254316 BLAKE2B c2fae537f2ff594f73577cf72af9d6201bcd1dc26059786c1ae8cb7999d3774306244ea10aee0f9b4916f4a7547b549ccbd815ca9a93053e6ca069140e3a7232 SHA512 dc04bdfc21a7bb9903cc51156c9bf1f0d6c7c772db1a47f9d5b120e1e4955155fb5057ccc6679ae56ac790e5da3ca719a3a9b9cd9082eac261ef11e75c97a244
EBUILD hwdata-0.354.ebuild 698 BLAKE2B 136ac0f6d57825812547ca50d3abe718286ad2446205f0a155b5579761d1de1505075082bd2bceb8a7ab537ea36d1e8ea5f00fd4e02d9c4bd26d20353cba6b7b SHA512 31fe8fb5e5ac591a9df1c6817677b9a7acf604e20a1ab20dccd7bb884093456f024d6765bef3fececc8bc160ec9bd5828063ac0435c923da759fd9443a99996d
EBUILD hwdata-0.357.ebuild 701 BLAKE2B 2dfc5adafff54a5860818f63314931b5f2344ace66f45fb8b0d57d4272128b121964ed5ccc37d6a90d95720fb492c2309db19518c8fc6d9edeac17ebb2610112 SHA512 30344157fb62cf2ccba7a17e1713b51cd840548339e2c9400b20eecd3926c322c2d8e62516daa35a6961c202e6a7cf5ad316e414a9112d73b674f80d841179d6
-EBUILD hwdata-0.358.ebuild 708 BLAKE2B 1412ce67e1332c9df371a9a4bb0c68a94f24cd430b54102c4b2d9adbb6f0254fdc5359da02ffab4e463a9d341b3f81a4ed5bab4dc50be30894ff042c624316fa SHA512 68c36e8ae23c54c25be73b797cf9233d1db5d61591a7ef2150b0e63143c6bd825d784e5232e3abbc0a1adf7811d8e34477c803b428d269949b7557589a670b2e
+EBUILD hwdata-0.358.ebuild 700 BLAKE2B 3a2ff9c72dbafaa512759e46ecfebb10a2195b97ef2fa32e17c53770d089b7d21609c788b5ad17e8658c66bca25eb6d756be6b5177e53072517888e728c986e0 SHA512 494b93597c428fe331d4915b35b29a849876d4079db8a5b450367307b8b58f1f4d208d44279fb6ac25faaf51aeda18c3618abe0e81f0c95a1e7c29e404e2a79c
+EBUILD hwdata-0.359.ebuild 708 BLAKE2B 1412ce67e1332c9df371a9a4bb0c68a94f24cd430b54102c4b2d9adbb6f0254fdc5359da02ffab4e463a9d341b3f81a4ed5bab4dc50be30894ff042c624316fa SHA512 68c36e8ae23c54c25be73b797cf9233d1db5d61591a7ef2150b0e63143c6bd825d784e5232e3abbc0a1adf7811d8e34477c803b428d269949b7557589a670b2e
+EBUILD hwdata-0.360.ebuild 708 BLAKE2B 1412ce67e1332c9df371a9a4bb0c68a94f24cd430b54102c4b2d9adbb6f0254fdc5359da02ffab4e463a9d341b3f81a4ed5bab4dc50be30894ff042c624316fa SHA512 68c36e8ae23c54c25be73b797cf9233d1db5d61591a7ef2150b0e63143c6bd825d784e5232e3abbc0a1adf7811d8e34477c803b428d269949b7557589a670b2e
MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sys-apps/hwdata/hwdata-0.358.ebuild b/sys-apps/hwdata/hwdata-0.358.ebuild
index 81b4b0771008..3045467ded50 100644
--- a/sys-apps/hwdata/hwdata-0.358.ebuild
+++ b/sys-apps/hwdata/hwdata-0.358.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RESTRICT="test"
src_configure() {
diff --git a/sys-apps/hwdata/hwdata-0.359.ebuild b/sys-apps/hwdata/hwdata-0.359.ebuild
new file mode 100644
index 000000000000..81b4b0771008
--- /dev/null
+++ b/sys-apps/hwdata/hwdata-0.359.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Hardware identification and configuration data"
+HOMEPAGE="https://github.com/vcrhonek/hwdata"
+SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="test"
+
+src_configure() {
+ # configure is not compatible with econf
+ local conf=(
+ ./configure
+ --prefix="${EPREFIX}/usr"
+ --libdir="${EPREFIX}/lib"
+ --datadir="${EPREFIX}/usr/share"
+ )
+ echo "${conf[@]}" >&2
+ "${conf[@]}" || die
+}
diff --git a/sys-apps/hwdata/hwdata-0.360.ebuild b/sys-apps/hwdata/hwdata-0.360.ebuild
new file mode 100644
index 000000000000..81b4b0771008
--- /dev/null
+++ b/sys-apps/hwdata/hwdata-0.360.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Hardware identification and configuration data"
+HOMEPAGE="https://github.com/vcrhonek/hwdata"
+SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="test"
+
+src_configure() {
+ # configure is not compatible with econf
+ local conf=(
+ ./configure
+ --prefix="${EPREFIX}/usr"
+ --libdir="${EPREFIX}/lib"
+ --datadir="${EPREFIX}/usr/share"
+ )
+ echo "${conf[@]}" >&2
+ "${conf[@]}" || die
+}
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 5624bba4d0a5..b1a9d096db1a 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,3 +1,5 @@
DIST hwinfo-21.80-1.1.src.rpm 968192 BLAKE2B a11a1060137ff89504963c01c4129dcac93e8eea9747ea20272763f648068e8b4fb3f1c31ae761664b1b1ffedf32971b3b27804f125473f0367cc6eed03751bf SHA512 7bf64d9ee6b2381c43ffb22dc5623c8a8ed05c26b4e154c3093a9cb255779a1d482c18cd085b272ce619249743f1c43989337bed142685b4d6c634f4551893ee
-EBUILD hwinfo-21.80.ebuild 1554 BLAKE2B 8f385a6ca64430d31be7732a10063be122862d3b3e4e5b07fc9dddd96870730b5c19720143b9d5e763a7b5f2fa57ae7f51f8c0b16d4cfb0105e26351abd411c9 SHA512 69cee9f51cc1aecde7ef0131da5243a79b8dfda261e7156160fa33bd0f022b4b13dc400dc89419de7f11afd40fa521787b906237f345ff051da21dacd2ba29e4
+DIST hwinfo-21.81-1.3.src.rpm 967951 BLAKE2B af6c390cd327ac2683f6b92a7847c5a0dc99e7553e35b7a5fd07db0a7f60c671a303e85061e1656474792b921e0d1b8ad18591f22a5da557879743d91151509a SHA512 eef89b5c8c029f606d66eb1740c4d046baaf490fc39d42d0137d1c4c5b248b0ddbe34b1532dbcef10f408677f173cfeb11d4c3e801a6a90280e1a6babc245674
+EBUILD hwinfo-21.80.ebuild 1561 BLAKE2B f66110bb40f16efaeade743b03ddc26b72cd7b875c4ecf6c4599f1729c0feaab83a3b3f24867630c46c38ccac6ac6010eacc0b8b655f1e3d03af8e4679330ce9 SHA512 b455efce4294dbbcba410c675df5f0c34c4e97b9fa065953db481faa060d51348619f3f6c1030e4eae8336749e717034a73501ecb347f19f03204d2058a133aa
+EBUILD hwinfo-21.81.ebuild 1564 BLAKE2B d7a479b2084764650c4d4aeb3532d05a28647f6c5003297faac2a61ebd03b4d9d016140d54d5c5146b0c280b2b15059ebb8869398c636716fd53ad2045d25878 SHA512 1ab47b4a72a20408b2395e795e5965884c4ce2f539b14087f5524804f5ac879c73300f9b1e6e1c155e5b960b53b5ce6c5a10fc742faf25b786c21ffa5401a71d
MISC metadata.xml 335 BLAKE2B 038b3d0d2c3215e9c141823f3578880ecb43da74b991cce36793a6af5b3549603ad1fa95c1bbe477126c3b84f6493099400d8914d94cdbe1c557b0166c0ca43b SHA512 e24489f0c20cc1cd356f7059c4a2a8d02b2f39fcb43df0d685977ce6e1593c134420daf6d940f96f08fd0d19026618d89946e6ff0a24f449be5d5c8910b10581
diff --git a/sys-apps/hwinfo/hwinfo-21.80.ebuild b/sys-apps/hwinfo/hwinfo-21.80.ebuild
index 650c502fcb99..eca80e98fb3a 100644
--- a/sys-apps/hwinfo/hwinfo-21.80.ebuild
+++ b/sys-apps/hwinfo/hwinfo-21.80.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.r
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/sys-apps/hwinfo/hwinfo-21.81.ebuild b/sys-apps/hwinfo/hwinfo-21.81.ebuild
new file mode 100644
index 000000000000..81c6fd8f65b5
--- /dev/null
+++ b/sys-apps/hwinfo/hwinfo-21.81.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm toolchain-funcs
+
+DESCRIPTION="Hardware detection tool used in SuSE Linux"
+HOMEPAGE="https://github.com/openSUSE/hwinfo/"
+#Using srpms from SUSE to get pregenerated changelog, otherwise we could use GH
+#SRC_URI="https://github.com/openSUSE/hwinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.3.src.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ amd64? ( dev-libs/libx86emu )
+ x86? ( dev-libs/libx86emu )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ >=sys-kernel/linux-headers-2.6.17"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+ # Respect AR variable.
+ sed -i \
+ -e 's:ar r:$(AR) r:' \
+ src/{,isdn,ids,smp,hd}/Makefile || die
+
+ # Respect LDFLAGS.
+ sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
+
+ # Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
+ sed -i \
+ -e 's:make:$(MAKE):' \
+ -e 's:-pipe -g::' \
+ -e 's:LDFLAGS.*=:LDFLAGS +=:' \
+ Makefile{,.common} || die
+ # Workaround from Arch, if using source tarballs from github
+ # echo 'touch changelog' > git2log
+ default
+}
+
+src_compile() {
+ tc-export AR
+ emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_install() {
+ emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+ keepdir /var/lib/hardware/udi
+
+ dodoc changelog README*
+ docinto examples
+ dodoc doc/example*.c
+ doman doc/*.{1,8}
+}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 217dd6f94f2a..bf21d179d1fa 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -6,5 +6,5 @@ DIST hwloc-2.7.1.tar.bz2 6810477 BLAKE2B 26706b8835954b8baa9028eaf2da0f8ae6e57d1
EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B e055e5b7624f56f54352a39649a51dba5dfe2e6cfddcdf83ef6496f9e88a8ed7b417c47d0e6a6cb5ebbd18619514b8497ceae74ca7df7fa236b86f4cb108e170 SHA512 6684246ba36711860baee3429c7976c6a719b63b2999cacbe7135450d8954082ed282485bb2f68a82c0fc67f78231c6f1c63626adc09f38a50197be8ef142e05
EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B 10a2be87fa805d97886e1e9261506af1e027314a68bac3656babfaadbe7273cb91a01ca9706ea9f284b015b8ec0b776f648a6c3461d3ce05147086a6b0fdd75c SHA512 5d0aab779a86fdd409bdaa98fff362824b301675db065859022fbff2a55f4f1a88263cadb85af9470e4915c5cc5c8a34e7e5f2d1376480fbd0b9ed46363ca7e2
EBUILD hwloc-2.6.0.ebuild 2971 BLAKE2B 79a488a0e115c7f26a80b007088f8c14fc44d894b47637b0f2f9315082496361926165319e2e71ca21383406ea482f09c7dd6054ab4a198bc6c1e13605fbec1c SHA512 bf4432b8a655a23ae2faee3f1139d2beba90389f98df232a3999f4b86c73f01fa22c33e6350bd70817bc14e23f93115aba02cb9a9d5dae78ae1e023021b91707
-EBUILD hwloc-2.7.1-r1.ebuild 3213 BLAKE2B a89a29b783826055bbd57bcf191405c39bb9ad2ca049a4157d284abf176cac1cc8f3a3593ea9e0cae67cba1e70effdbeefb8196d35bab73b608dec4f3b5dc123 SHA512 2e5891623a4fe6ad9d66669aeceb70bdbeac36123854dcb0332229c7b8921c4bfcb38638acb4e9942c11139242181217b609439e8929ebb753092f1bcf7a0b93
+EBUILD hwloc-2.7.1-r1.ebuild 3220 BLAKE2B 3db9e6c805c4b3d9edcfb82d004fc7b3e6b9b09464cc7b0c8ed66636a3471f09a93504614f5326a9eeaebd62fcdf50c95c072ba9c847cac2492e13746819ed9a SHA512 dfd57d3a33c5ebe9523fdc00cb1890c07aae9163df98a6ec262d63c12006a4c57b841f03a3fd6e47ecfa486b45a91521f1cc8a76f2eb69b22ae146c813d3094a
MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317
diff --git a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
index cbdf2d374fb6..88cb06eb1dfc 100644
--- a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
LICENSE="BSD"
SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev xml X video_cards_nvidia"
# opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 3db14c05f962..21b1f9083796 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -4,10 +4,12 @@ DIST inxi-3.3.06.1.tar.gz 460416 BLAKE2B a7a5eeade861294c8c18cd9594ef6fd0c681d8a
DIST inxi-3.3.08.1.tar.gz 467132 BLAKE2B c0254174c0a48936e1f183c16f985838cf74302da706996c1baec0c67b9c4209da5b555805cb668d626eccaa69f95e3cab2605b06d2cc7361a6cd3ff5d88c29e SHA512 bcbb81dd022dbd525ed3811406997c6689f968de8a3b6e0988381d9d2a488617ef3bc966034f9baac8eebb412b8d2e612b7cece29d65bdcb20d8b8cdeca112e6
DIST inxi-3.3.12.1.tar.gz 495524 BLAKE2B 76b8600ea5bb5430a30bf3876ca80c1dbc8033449c3526c945d7457f3d9176d6299acf6d1a0b3e92c2f84e4b01ba70acbb326cfc9cd5b906e9e5a28550efa670 SHA512 5772b77a35342b6dee7211f31a35552794fddcdb01012e604c501707f1e3756791376b92e5c8f3d8c85493b83f2394d2e6f90f6e473225388975de2e174a2997
DIST inxi-3.3.13.1.tar.gz 524354 BLAKE2B de12d2145f61b385d636aa9aa1efa057cfa12b010789ec34602ee7567d4db34a960a85b47d17f7a4db8cdb68a44d1085ca2f3be11ca503e5172525d75901d244 SHA512 6eed08ed0efb3574d294127beaec1373df434554ad98debd25ac865b85ab98e81e11f0cee855da0213cbc25fee95ce8504c7eaee90d99b8ad7c63f2b301394f3
+DIST inxi-3.3.17.1.tar.gz 558476 BLAKE2B a53a90a9bbea44da7e2f4c77d2fbd6cf41fd4bcf95defe7c27379b62ccfbeee70e06865034082e4ffd24018312ca0f439d9ef7d746c979fbd4c5fff47b42f165 SHA512 2bf28e8c4bc3d93e309639e04dfafd6e7b2c82b33178c11e138828c8378e1636b1fb16dbae88838e69953020789637745ffa54818ed954624995c1daaf2387cb
EBUILD inxi-3.1.06.1.ebuild 807 BLAKE2B 448c656ce3d29ab6068ef103521cb60cec55d27e74294d98885230a1a3b437999187f9633af2b30e61ee8235067750152bd0a67394e4cd071adccc836ef9fa9e SHA512 6f48f6171bf6bfea9bafe1540d7f2a3ad809e3a422a9988420599620133dddccae19423e74998ff988b6e42e45317563884aa4a265b15e9137e635426c5e3004
EBUILD inxi-3.3.04.1.ebuild 812 BLAKE2B a1889935dae2f8bb4e2b123f40092a2afe972638165475caab81518b1c07320179cd6f36d66193675f885ffaa1ca8b1bc4d1e7b66f3c62d22c51f3166a1d4b5f SHA512 44641459e267d3bf1a8ecf96cff0d54352bf8faf261e33fa751ac1d79f7a6b718ef958300b79858f17362562f2883cf7d0523dcee2d665ec55d2818aefd9dd53
EBUILD inxi-3.3.06.1.ebuild 820 BLAKE2B 729a7050c2a4227dc0ce4b0c01d6c2a8c545682503312d552e8f5f9018aa04354abe2370ac6b97e97cafd4d6fb9a8af3caf62b79caa4bb71ccdd57fe95ec4f29 SHA512 2cb0591495315c2292549627f3c205613caa14d631f147f3890ee208cac8ff4afc07c3d6e9446f12aa403608b4b520110411c2a90d5ffe9d98e73bc5c5100cb2
EBUILD inxi-3.3.08.1.ebuild 822 BLAKE2B e0809bcec63b7f57cd126baacc4f463d946d9bb9f7ef235f0e7d21f197fa6b7248da90714a5a8f654a01a1f07a7fe99805587876b35f62f1b7a53b8fcd6f22d4 SHA512 fec2182a7fc229765f9b6861fedaab05b64f97ee6fa0d6bd324c369c53d5d7d567e002b4bb02599430d8c9e155c8776ff54239d0e9fe484ae1ea1ae35fa113d3
EBUILD inxi-3.3.12.1.ebuild 822 BLAKE2B e0809bcec63b7f57cd126baacc4f463d946d9bb9f7ef235f0e7d21f197fa6b7248da90714a5a8f654a01a1f07a7fe99805587876b35f62f1b7a53b8fcd6f22d4 SHA512 fec2182a7fc229765f9b6861fedaab05b64f97ee6fa0d6bd324c369c53d5d7d567e002b4bb02599430d8c9e155c8776ff54239d0e9fe484ae1ea1ae35fa113d3
-EBUILD inxi-3.3.13.1.ebuild 827 BLAKE2B 0a2266aa3e7ab485b37371442ead63b2e5cac6c5c7c0e895a3ece1ae6e9d49b27a8e4a7804888e8c4a905b228f5a9f0cfe61d93454587f323093c10001140300 SHA512 97004e1861cd1e2e8fa1ea0ae2e855d33faabf04e6b5d4855c8dbced5bbc0cc93fa23f340a541d9209546f02a6f776515a1ea8c192b4d446315e895a40646bb8
+EBUILD inxi-3.3.13.1.ebuild 834 BLAKE2B e917d5256700f690ce449ebd1a6b4f0f517b5e446040086968aed594d8af91f5714304122ab484fbb78671ca93d51c8cf9cc8f2ae541d39cc1cf7bd3679d0537 SHA512 fb82b7d86ccf3ed2840ade49f6ebd0bf252ffdc0a9d4c8e0db29b64b80d926a479bdbb654cdef75de32d7fa05a9ed5e40f5af3bfb85de4eb4a3b85541fb49188
+EBUILD inxi-3.3.17.1.ebuild 834 BLAKE2B e917d5256700f690ce449ebd1a6b4f0f517b5e446040086968aed594d8af91f5714304122ab484fbb78671ca93d51c8cf9cc8f2ae541d39cc1cf7bd3679d0537 SHA512 fb82b7d86ccf3ed2840ade49f6ebd0bf252ffdc0a9d4c8e0db29b64b80d926a479bdbb654cdef75de32d7fa05a9ed5e40f5af3bfb85de4eb4a3b85541fb49188
MISC metadata.xml 613 BLAKE2B f444aa0759120064814cacf0fcba57059d87b1c014d78eea52304fb3afb9da9b905e30c1cf1399bfbc0d66442e3d892eb2657543014b905f2bf9a943dc8480d9 SHA512 cbe6e76cb003bb77134398aa1db5a24c47de826eb1f17b07e2cee647b9d58948596c2f4588c7c834332c096ce8b782799f07ed4f47a7b252e85e402324ba76bb
diff --git a/sys-apps/inxi/inxi-3.3.13.1.ebuild b/sys-apps/inxi/inxi-3.3.13.1.ebuild
index 27490346a682..49cc31d24326 100644
--- a/sys-apps/inxi/inxi-3.3.13.1.ebuild
+++ b/sys-apps/inxi/inxi-3.3.13.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="bluetooth hddtemp opengl"
RDEPEND="dev-lang/perl
diff --git a/sys-apps/inxi/inxi-3.3.17.1.ebuild b/sys-apps/inxi/inxi-3.3.17.1.ebuild
new file mode 100644
index 000000000000..49cc31d24326
--- /dev/null
+++ b/sys-apps/inxi/inxi-3.3.17.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=$(ver_rs 3 '-')
+# 2.3.56 was the last version with no tagged release.
+# It was also the last Bash based release. Later versions are Perl based
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+RDEPEND="dev-lang/perl
+ sys-apps/pciutils
+ sys-apps/usbutils
+ bluetooth? ( net-wireless/bluez )
+ hddtemp? ( app-admin/hddtemp )
+ opengl? ( x11-apps/mesa-progs )
+ "
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1
+ dodoc README.txt
+}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index cc531cba7543..23455a3b9a99 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -3,8 +3,8 @@ AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc8
AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb797901886032bbbfc78b3116b548d317038144307a52ba86a01dc49460fa8b4524f03de3abc5b56f4901a9cb24f1f6cacfbd7a5b92cea7145 SHA512 a6184d1fc150717ab40a278c2a6ce439ea04e9967d55f1d10fecc8162452a1a38a6e11c2f736c5aebfe0ffe726bfa80e154169004ccc571b89dcef9c0dbe1242
AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
-DIST iproute2-5.17.0.tar.xz 870908 BLAKE2B 4310829ebbde7fd21ecc28856deddabfa93f26bf7937b3ef3c0e05e4e0bf925a9b167334efaefe3e275d196e7370a290679739ae8d8397dc6511f4da25dfd459 SHA512 fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d
+DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600 SHA512 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068
EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e
-EBUILD iproute2-5.17.0.ebuild 4933 BLAKE2B 7ef77ee3b1725b8c7b428e6ed97e9fc218f6956824e2b723c06aee7bf66e7e02901f05b2dca4099ddbfd4901a51c16198ba34410fdeac4280220dda94e3086c8 SHA512 56dd4e89a9ac6733ad4c8b2fc09368f2ad7c02f399d6fba7794b3a7b715fad743b1270f7d02a95b96979634e31d91596f3f64a84498e51bfb44247f71ba7a39e
-EBUILD iproute2-9999.ebuild 4926 BLAKE2B b10bd40a6acb0ca3345a5ca66349e70fb170e53471249021655ca073efb72bf335ad12a9b4ba44c339657e69212083fed886b92f0bc998ffa0f34ffffa68b5e9 SHA512 1a7faee630ec6735e49ddf30bf902f7e781114fbf0ea0f14c61aa7d074a4ef871f9b3f51648f766f27a49d087c2efc314eb054147eb5bc4346c5266851b5853b
-MISC metadata.xml 814 BLAKE2B a74c3bee84fc81acfeee405c22b84ca9a10f2daf4be9d496202cbc5a2595f7222b864f4105f5dd46ec45e7de57b6ffff991f907da6378293267209b9eafe91d5 SHA512 74936295cae7e84f39ea6dd8e6bee613bed9e9716c6a96aa8f497be96b14367a2d8829db3ed108b760afdd196c5dbc9f32b14f29f5a0939e47b15d7a68aeca4a
+EBUILD iproute2-5.18.0-r1.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266
+EBUILD iproute2-9999.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266
+MISC metadata.xml 898 BLAKE2B f3c281e448846b5fa0e4cabec04767fe7217bd0d77a2baba7c1524ebdc1df4cc4c7d38ff441617959281c3a08b564d3cc6b7a89f846041f2416441b82079318d SHA512 404bd3aa523554bd78da7eb90bd3c53c146f71da92116115c238e1b186e971bf6d49161c33e58d6116af1616688bc00eb7d96f0fa5afb300a703cbdf6fdfe4ed
diff --git a/sys-apps/iproute2/iproute2-5.17.0.ebuild b/sys-apps/iproute2/iproute2-5.17.0.ebuild
deleted file mode 100644
index f9085bf91567..000000000000
--- a/sys-apps/iproute2/iproute2-5.17.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-r3
-else
- SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables libbsd minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
- !net-misc/arpd
- !minimal? ( net-libs/libmnl:= )
- atm? ( net-dialup/linux-atm )
- berkdb? ( sys-libs/db:= )
- bpf? ( dev-libs/libbpf:= )
- caps? ( sys-libs/libcap )
- elf? ( virtual/libelf:= )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- libbsd? ( dev-libs/libbsd )
- selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
- ${RDEPEND}
- >=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
- app-arch/xz-utils
- >=sys-devel/bison-2.4
- sys-devel/flex
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
- "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
- #"${FILESDIR}"/${PN}-5.1.0-portability.patch
- "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
-)
-
-doecho() {
- echo "${@}"
- "${@}" || die
-}
-
-src_prepare() {
- default
-
- # Fix version if necessary
- local versionfile="include/version.h"
- if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
- einfo "Fixing version string"
- sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
- -i ${versionfile} || die
- fi
-
- # echo -n is not POSIX compliant
- sed 's@echo -n@printf@' -i configure || die
-
- sed -i \
- -e '/^CC :\?=/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Build against system headers
- rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- if use minimal ; then
- sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
- fi
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null || die
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'int main(){return 0;}' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null || die
-
- # run "configure" script first which will create "config.mk"...
- # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
- doecho ./configure --libbpf_force $(usex bpf on off)
-
- # ...now switch on/off requested features via USE flags
- # this is only useful if the test did not set other things, per bug #643722
- cat <<-EOF >> config.mk
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- TC_CONFIG_NO_XT := $(usex iptables n y)
- # We've locked in recent enough kernel headers, bug #549948
- TC_CONFIG_IPSET := y
- HAVE_BERKELEY_DB := $(usex berkdb y n)
- HAVE_CAP := $(usex caps y n)
- HAVE_MNL := $(usex minimal n y)
- HAVE_ELF := $(usex elf y n)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, bug #144265, bug #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- HAVE_LIBBSD := $(usex libbsd y n)
- EOF
-}
-
-src_compile() {
- emake V=1 NETNS_RUN_DIR=/run/netns
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}"/$(get_libdir) \
- SBINDIR="${EPREFIX}"/sbin \
- CONFDIR="${EPREFIX}"/etc/iproute2 \
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man \
- ARPDDIR="${EPREFIX}"/var/lib/arpd \
- install
-
- dodir /bin
- mv "${ED}"/{s,}bin/ip || die # bug #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. # bug #467716
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- keepdir /var/lib/arpd
- # bug #47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
- elif [[ -d "${ED}"/var/lib/arpd ]]; then
- rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-5.18.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.18.0-r1.ebuild
new file mode 100644
index 000000000000..c0e45a9ec79e
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-5.18.0-r1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eapi8-dosym edo toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+ inherit git-r3
+else
+ SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+ !net-misc/arpd
+ !minimal? ( net-libs/libmnl:= )
+ atm? ( net-dialup/linux-atm )
+ berkdb? ( sys-libs/db:= )
+ bpf? ( dev-libs/libbpf:= )
+ caps? ( sys-libs/libcap )
+ elf? ( virtual/libelf:= )
+ iptables? ( >=net-firewall/iptables-1.4.20:= )
+ libbsd? ( dev-libs/libbsd )
+ nfs? ( net-libs/libtirpc:= )
+ selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
+DEPEND="
+ ${RDEPEND}
+ >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+ app-arch/xz-utils
+ >=sys-devel/bison-2.4
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+ "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
+ #"${FILESDIR}"/${PN}-5.1.0-portability.patch
+ "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+)
+
+src_prepare() {
+ default
+
+ # Fix version if necessary
+ local versionfile="include/version.h"
+ if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+ einfo "Fixing version string"
+ sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+ -i ${versionfile} || die
+ fi
+
+ # echo -n is not POSIX compliant
+ sed 's@echo -n@printf@' -i configure || die
+
+ sed -i \
+ -e '/^CC :\?=/d' \
+ -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+ -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
+ -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+ -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+ Makefile || die
+
+ # Build against system headers
+ rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+ sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+ if use minimal ; then
+ sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+ fi
+}
+
+src_configure() {
+ tc-export AR CC PKG_CONFIG
+
+ # This sure is ugly. Should probably move into toolchain-funcs at some point.
+ local setns
+ pushd "${T}" >/dev/null || die
+ printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
+ if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
+ setns=y
+ else
+ setns=n
+ fi
+
+ echo 'int main(){return 0;}' > test.c || die
+ if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
+ sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
+ fi
+ popd >/dev/null || die
+
+ # run "configure" script first which will create "config.mk"...
+ # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
+ edo ./configure --libbpf_force $(usex bpf on off)
+
+ # Remove the definitions made by configure and allow them to be overridden
+ # by USE flags below.
+ # We have to do the cheesy only-sed-if-disabled because otherwise
+ # the *_FLAGS etc stuff found by configure will be used but result
+ # in a broken build.
+ if ! use berkdb ; then
+ sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
+ fi
+
+ if ! use caps ; then
+ sed -i -e '/HAVE_CAP/d' config.mk || die
+ fi
+
+ if use minimal ; then
+ sed -i -e '/HAVE_MNL/d' config.mk || die
+ fi
+
+ if ! use elf ; then
+ sed -i -e '/HAVE_ELF/d' config.mk || die
+ fi
+
+ if ! use nfs ; then
+ sed -i -e '/HAVE_RPC/d' config.mk || die
+ fi
+
+ if ! use selinux ; then
+ sed -i -e '/HAVE_SELINUX/d' config.mk || die
+ fi
+
+ if ! use libbsd ; then
+ sed -i -e '/HAVE_LIBBSD/d' config.mk || die
+ fi
+
+ # ...Now switch on/off requested features via USE flags
+ # this is only useful if the test did not set other things, per bug #643722
+ # Keep in sync with ifs above, or refactor to be unified.
+ cat <<-EOF >> config.mk
+ TC_CONFIG_ATM := $(usex atm y n)
+ TC_CONFIG_XT := $(usex iptables y n)
+ TC_CONFIG_NO_XT := $(usex iptables n y)
+ # We've locked in recent enough kernel headers, bug #549948
+ TC_CONFIG_IPSET := y
+ HAVE_BERKELEY_DB := $(usex berkdb y n)
+ HAVE_CAP := $(usex caps y n)
+ HAVE_MNL := $(usex minimal n y)
+ HAVE_ELF := $(usex elf y n)
+ HAVE_RPC := $(usex nfs y n)
+ HAVE_SELINUX := $(usex selinux y n)
+ IP_CONFIG_SETNS := ${setns}
+ # Use correct iptables dir, bug #144265, bug #293709
+ IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+ HAVE_LIBBSD := $(usex libbsd y n)
+ EOF
+}
+
+src_compile() {
+ emake V=1 NETNS_RUN_DIR=/run/netns
+}
+
+src_install() {
+ if use minimal ; then
+ into /
+ dosbin tc/tc
+ dobin ip/ip
+ return 0
+ fi
+
+ emake \
+ DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}"/$(get_libdir) \
+ SBINDIR="${EPREFIX}"/sbin \
+ CONFDIR="${EPREFIX}"/etc/iproute2 \
+ DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+ MANDIR="${EPREFIX}"/usr/share/man \
+ ARPDDIR="${EPREFIX}"/var/lib/arpd \
+ install
+
+ dodir /bin
+ mv "${ED}"/{s,}bin/ip || die # bug #330115
+
+ dolib.a lib/libnetlink.a
+ insinto /usr/include
+ doins include/libnetlink.h
+
+ if use split-usr ; then
+ # Can remove compatibility symlink in a year: 2023-05-28.
+ # bug #547264
+ mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
+ dosym8 -r /bin/ss /sbin/ss
+ fi
+
+ if use berkdb ; then
+ keepdir /var/lib/arpd
+ # bug #47482, arpd doesn't need to be in /sbin
+ dodir /usr/bin
+ mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+ elif [[ -d "${ED}"/var/lib/arpd ]]; then
+ rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
+ fi
+}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 11dfd239d1a7..c0e45a9ec79e 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -3,14 +3,14 @@
EAPI=7
-inherit toolchain-funcs
+inherit eapi8-dosym edo toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
LICENSE="GPL-2"
SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables libbsd minimal selinux"
+IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
# We could make libmnl optional, but it's tiny, so eh
RDEPEND="
@@ -31,9 +31,10 @@ RDEPEND="
elf? ( virtual/libelf:= )
iptables? ( >=net-firewall/iptables-1.4.20:= )
libbsd? ( dev-libs/libbsd )
+ nfs? ( net-libs/libtirpc:= )
selinux? ( sys-libs/libselinux )
"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
+# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
DEPEND="
${RDEPEND}
>=sys-kernel/linux-headers-3.16
@@ -52,17 +53,12 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
)
-doecho() {
- echo "${@}"
- "${@}" || die
-}
-
src_prepare() {
default
# Fix version if necessary
local versionfile="include/version.h"
- if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+ if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
einfo "Fixing version string"
sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-i ${versionfile} || die
@@ -91,21 +87,62 @@ src_prepare() {
src_configure() {
tc-export AR CC PKG_CONFIG
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
+ # This sure is ugly. Should probably move into toolchain-funcs at some point.
local setns
pushd "${T}" >/dev/null || die
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'int main(){return 0;}' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+ printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
+ if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
+ setns=y
+ else
+ setns=n
+ fi
+
+ echo 'int main(){return 0;}' > test.c || die
+ if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
+ sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
+ fi
popd >/dev/null || die
# run "configure" script first which will create "config.mk"...
# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
- doecho ./configure --libbpf_force $(usex bpf on off)
+ edo ./configure --libbpf_force $(usex bpf on off)
+
+ # Remove the definitions made by configure and allow them to be overridden
+ # by USE flags below.
+ # We have to do the cheesy only-sed-if-disabled because otherwise
+ # the *_FLAGS etc stuff found by configure will be used but result
+ # in a broken build.
+ if ! use berkdb ; then
+ sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
+ fi
+
+ if ! use caps ; then
+ sed -i -e '/HAVE_CAP/d' config.mk || die
+ fi
+
+ if use minimal ; then
+ sed -i -e '/HAVE_MNL/d' config.mk || die
+ fi
- # ...now switch on/off requested features via USE flags
+ if ! use elf ; then
+ sed -i -e '/HAVE_ELF/d' config.mk || die
+ fi
+
+ if ! use nfs ; then
+ sed -i -e '/HAVE_RPC/d' config.mk || die
+ fi
+
+ if ! use selinux ; then
+ sed -i -e '/HAVE_SELINUX/d' config.mk || die
+ fi
+
+ if ! use libbsd ; then
+ sed -i -e '/HAVE_LIBBSD/d' config.mk || die
+ fi
+
+ # ...Now switch on/off requested features via USE flags
# this is only useful if the test did not set other things, per bug #643722
+ # Keep in sync with ifs above, or refactor to be unified.
cat <<-EOF >> config.mk
TC_CONFIG_ATM := $(usex atm y n)
TC_CONFIG_XT := $(usex iptables y n)
@@ -116,6 +153,7 @@ src_configure() {
HAVE_CAP := $(usex caps y n)
HAVE_MNL := $(usex minimal n y)
HAVE_ELF := $(usex elf y n)
+ HAVE_RPC := $(usex nfs y n)
HAVE_SELINUX := $(usex selinux y n)
IP_CONFIG_SETNS := ${setns}
# Use correct iptables dir, bug #144265, bug #293709
@@ -153,10 +191,13 @@ src_install() {
dolib.a lib/libnetlink.a
insinto /usr/include
doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. # bug #467716
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+
+ if use split-usr ; then
+ # Can remove compatibility symlink in a year: 2023-05-28.
+ # bug #547264
+ mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
+ dosym8 -r /bin/ss /sbin/ss
+ fi
if use berkdb ; then
keepdir /var/lib/arpd
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index ab92eca64ca4..10e4c7acb786 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -12,6 +12,7 @@
<flag name="iptables">include support for iptables filtering</flag>
<flag name="libbsd">Use <pkg>dev-libs/libbsd</pkg> instead of internal funcs</flag>
<flag name="minimal">only install ip and tc programs, without eBPF support</flag>
+ <flag name="nfs">Support RPC lookups via <pkg>net-libs/libtirpc</pkg> in ss</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:iproute2_project:iproute2</remote-id>
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index b49085f8f55a..4af8db2d4d1b 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,5 +1,7 @@
AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c
DIST irqbalance-1.8.0.tar.gz 55238 BLAKE2B 0181ee57c4ddbdb55e1529cfd7da4b875320eff65cb606f925f0b4f4243b51e1349d4aba38690a78d7deab6d3f55ae8d6c45af44a904f03d7127678202f288db SHA512 3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740
+DIST irqbalance-1.9.0.tar.gz 55779 BLAKE2B 11df51b03a473da10340c0c9ca9a28b3d9f9ed81e202e434b135a4be1cf54bc5558b33a4a922eba89bdd8cebbd6d3448527507fa72f03c4ff494ae83d513854e SHA512 878977da5eff18e53bdceeaa4aca952f73ba8b03eb028cf176816af971ffc65f0b1f1bb3a68e3a2502491895cc2b9438652dc97d5696232bb2f64860109e9a24
EBUILD irqbalance-1.8.0-r1.ebuild 1334 BLAKE2B 74900103bf0167ae4d3dc4fe0d73de353ccc818f29b9edddffe9c163f47f46d3baee119b403ceb24058598739c9c691a69bd4a896f47a591687435c22ab32124 SHA512 03363872eae5a613833a7e1b6506f5440cc40b1bdce4aafbb891e5091f1c1815848c3df8f0b578a3742b25b5f3a0dd3f22100fb1c2068882a3affb4fbfa625ad
+EBUILD irqbalance-1.9.0.ebuild 1340 BLAKE2B 72a6182edb1bfc1fe75a892445e98b9a0e9a2a265af8ab40f622c7318d2ef695ffd71f7af029dcad18cde2614fc07d85cd96e464b71db969779a700dd468b50d SHA512 d2e5bb9000f8f88ca12d6bde375f293012794546521e68435aa1219d928417524e6242abc68324681218b4fc0b6c1e668ddf3b8d028f9edfdc96954de35b2750
MISC metadata.xml 547 BLAKE2B 0a83f459995622fe247317aa9f045c0696f888712e9e5b56ac4eedb12862772044aaf407e25181ac84d64b9fced0e950b74c9dfcfa7a44e2451356dbab03461a SHA512 90b145e0e3fd1519eb1e6a412fc06700eed8bd27bea262e3d0bed02b0140586c0a9a01b9e301d3c0ec464c2cfbc6f80118c48eead3c830ba13dfd3b1588f6c9f
diff --git a/sys-apps/irqbalance/irqbalance-1.9.0.ebuild b/sys-apps/irqbalance/irqbalance-1.9.0.ebuild
new file mode 100644
index 000000000000..b2eda8368949
--- /dev/null
+++ b/sys-apps/irqbalance/irqbalance-1.9.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd linux-info
+
+DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
+HOMEPAGE="https://github.com/Irqbalance/irqbalance"
+SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
+IUSE="caps +numa selinux tui"
+
+DEPEND="
+ dev-libs/glib:2
+ caps? ( sys-libs/libcap-ng )
+ numa? ( sys-process/numactl )
+ tui? ( sys-libs/ncurses:=[unicode(+)] )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-irqbalance )
+"
+
+pkg_setup() {
+ CONFIG_CHECK="~PCI_MSI"
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ # Follow systemd policies
+ # https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
+ sed \
+ -e 's/ $IRQBALANCE_ARGS//' \
+ -e '/EnvironmentFile/d' \
+ -i misc/irqbalance.service || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with caps libcap-ng)
+ $(use_enable numa)
+ $(use_with tui irqbalance-ui)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
+ newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
+ systemd_dounit misc/irqbalance.service
+}
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index ff950d9cf61f..fd1f13e2e4dd 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,4 +1,6 @@
DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb
-EBUILD kbd-2.4.0.ebuild 1859 BLAKE2B 30abb362d5bca1d525ca6d96cf844ab79a8c12bcf8c83e65d78ee3227b805aceef699040e9315e11b2c80cb9615fd217e343ef0dac856fd99aaad8da6859dc5d SHA512 314268d654df7524bf8ba61cd7c234127f9171044bc20136f99e9b3c013529226e872bb9fea05a32b22953588a0b3d198a58fa16eed343e0072d1a25e5d2c71c
-EBUILD kbd-9999.ebuild 1860 BLAKE2B beaf59ae73c17d9d01a5bd7d4a807f8f80259cc9194d0f9b221f3ac329e72eb290fc7b70bdb4b66b666f51bfc3bc5cf2c2b3541469881c1fc318a522cf7b31bc SHA512 939675dfc61faac63a75c968fe5d2cc73672316f16aa1ea4f0f1382e0e515a82e9ac1800e136ddfa8dc6eb0fc5018133ea81cd09f55414e56f86746bdd1cf884
-MISC metadata.xml 322 BLAKE2B c059619ec7424e63ad96d2be7d4d5a0872b494d24dcb923eb159898563ac7a79f6c51cf1b4027c1a3e40f1177107e24dd7485e73010625c64eb7bce2a35429fc SHA512 813a710b7238c4b0366da55c1180a9f1df97d3e58207680dc902739e4306d28183b5a5b04bb98714b488a12b09a9b388a30eb1407f41fdab49e86cab3b5f51f9
+DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
+EBUILD kbd-2.4.0.ebuild 1836 BLAKE2B 1797a7b563ec3ef7e55ce1d5c164ea035bbe7da3a3f1f0abb033a3de3015d2b676c4bb24c942e6b1ebfd9bd3f15120914f042ee6f3649130fbe5adfba74b7199 SHA512 7d74a77490c4fe1c041995f6a7bf3424ae4d7c33199e14ccec9a50837144121d8090446636a39e9675b02fc835f3098c97b99cf037631fbdd963aa6276d2f9d6
+EBUILD kbd-2.5.1.ebuild 2027 BLAKE2B efa4617f0d185b8a6689977985af9da0b028077ca1e89aa135c292f0e534b2295da7bc75ab14039a2d3bda6497a015ff7b2ce16d3b9bd7317386cf02a1ead1b3 SHA512 cadc6fcd9ec5b2623722d3b12d53cb6e2abff2dccf7154068803b6eb01adc455b809b69beadb11dd6e20d2e30840d25e9801fa516aef8758cf64543a33e6af35
+EBUILD kbd-9999.ebuild 2027 BLAKE2B efa4617f0d185b8a6689977985af9da0b028077ca1e89aa135c292f0e534b2295da7bc75ab14039a2d3bda6497a015ff7b2ce16d3b9bd7317386cf02a1ead1b3 SHA512 cadc6fcd9ec5b2623722d3b12d53cb6e2abff2dccf7154068803b6eb01adc455b809b69beadb11dd6e20d2e30840d25e9801fa516aef8758cf64543a33e6af35
+MISC metadata.xml 335 BLAKE2B 3b00a31428edc76e9a758c347107ad15e2f91a440a49e5167878555eda6dad176f8936ca22acbbecb5ff4827d8605b28db53ca990284b4e18c536a04d46616ed SHA512 86a6b134e0403abf5c22e868e2013a2051f504401d5ff8aa1ad682638d866ab8d837470ed87434286b77933483d7675646f382b15aed19772b2fff17258fc0f7
diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild
index 70122423cadd..d857523a184d 100644
--- a/sys-apps/kbd/kbd-2.4.0.ebuild
+++ b/sys-apps/kbd/kbd-2.4.0.ebuild
@@ -25,7 +25,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="nls pam test"
#RESTRICT="!test? ( test )"
-# Upstream has strange assumptions how to run tests (see bug #732868)
+# Need to check autotest bit (see bug #732868)
RESTRICT="test"
RDEPEND="
diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild
new file mode 100644
index 000000000000..a8607b2c1f1d
--- /dev/null
+++ b/sys-apps/kbd/kbd-2.5.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
+ EGIT_BRANCH="master"
+else
+ if [[ $(ver_cut 3) -lt 90 ]] ; then
+ SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ else
+ inherit autotools
+ SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ fi
+fi
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="https://kbd-project.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls pam test"
+RESTRICT="!test? ( test )"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+RDEPEND="
+ app-arch/gzip
+ pam? (
+ !app-misc/vlock
+ sys-libs/pam
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ test? ( dev-libs/check )
+"
+
+src_prepare() {
+ default
+
+ # Rename conflicting keymaps to have unique names, bug #293228
+ # See also https://github.com/legionus/kbd/issues/76.
+ pushd "${S}"/data/keymaps/i386 &> /dev/null || die
+ mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
+ mv olpc/es.map olpc/es-olpc.map || die
+ mv olpc/pt.map olpc/pt-olpc.map || die
+ mv qwerty/cz.map qwerty/cz-qwerty.map || die
+ popd &> /dev/null || die
+
+ if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-werror
+
+ $(use_enable nls)
+ $(use_enable pam vlock)
+ $(use_enable test tests)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ docinto html
+ dodoc docs/doc/*.html
+
+ # USE="test" installs .la files
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index b430d89f0657..a8607b2c1f1d 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
inherit autotools git-r3
- #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
- EGIT_REPO_URI="https://github.com/legionus/kbd.git"
+ EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
EGIT_BRANCH="master"
else
if [[ $(ver_cut 3) -lt 90 ]] ; then
SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
else
inherit autotools
SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -19,14 +18,17 @@ else
fi
DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://kbd-project.org/"
+HOMEPAGE="https://kbd-project.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="nls pam test"
-#RESTRICT="!test? ( test )"
-# Upstream has strange assumptions how to run tests (see bug #732868)
-RESTRICT="test"
+RESTRICT="!test? ( test )"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
RDEPEND="
app-arch/gzip
@@ -41,41 +43,38 @@ BDEPEND="
test? ( dev-libs/check )
"
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- else
- default
- fi
+src_prepare() {
+ default
# Rename conflicting keymaps to have unique names, bug #293228
- cd "${S}"/data/keymaps/i386 || die
+ # See also https://github.com/legionus/kbd/issues/76.
+ pushd "${S}"/data/keymaps/i386 &> /dev/null || die
mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
mv olpc/es.map olpc/es-olpc.map || die
mv olpc/pt.map olpc/pt-olpc.map || die
mv qwerty/cz.map qwerty/cz-qwerty.map || die
-}
+ popd &> /dev/null || die
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
+ if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
eautoreconf
fi
}
src_configure() {
local myeconfargs=(
- # USE="test" installs .a files
- --disable-static
+ --disable-werror
+
$(use_enable nls)
$(use_enable pam vlock)
$(use_enable test tests)
)
+
econf "${myeconfargs[@]}"
}
src_install() {
default
+
docinto html
dodoc docs/doc/*.html
diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml
index c9f6f6355fc7..9ef7f5ef4a9d 100644
--- a/sys-apps/kbd/metadata.xml
+++ b/sys-apps/kbd/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<upstream>
- <remote-id type="freshmeat">kbd</remote-id>
-</upstream>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">legionus/kbd</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index b0124121d711..9cd204f221bc 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -8,7 +8,9 @@ AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649a
AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
DIST kexec-tools-2.0.23.tar.xz 304024 BLAKE2B 0150985093dc0012d3870c127ac5eab81d4cc839c0a79ff20224d1a409462a194d7e304f54ed8f0952e4d325dbff11bcbe1565b2c57c45c212302810dc06ed62 SHA512 b6e3b967cacc31c434b185d25da4d53c822ae4bbcec26ef9d6cb171f294fdcc80913d381e686a0a41e025187835f4dc088052ff88efe75a021d7624c8b1a1ed8
+DIST kexec-tools-2.0.24.tar.xz 303808 BLAKE2B 8188602f1b843c1dccc0307131f8c9ec0426c6cb3de898040352c1fed5f6d4bd7c58a0c2bf54290b91c8fe3401180df682959ee6c41693d07acc199c087c7db2 SHA512 ef7cf78246e2d729d81a3649791a5a23c385353cc75cbe8ef279616329fdaccc876d614c7f51e1456822a13a11520296070d9897467d24310399909e049c3822
EBUILD kexec-tools-2.0.22.ebuild 3265 BLAKE2B f73c0709212598dc834fe12567891266c3e07fb6efbbd3fb91a1b579faba10475d387a73a53ac7ce5b694db0c2d67ae6bb1fa602faae6902e42e0b0920d0e725 SHA512 05f74d84eadb72d9399a1769d69520191d98e057d137253c49d0faef523a0f6f2f7a85c582fc5cf60606cb3d91a15d7c813835ab668419d32fa3091ea63a5e1e
EBUILD kexec-tools-2.0.23.ebuild 3267 BLAKE2B 69aca60481b1300d82a3d0198501423b6505570ff16da0dd54f7c516786fac11c15eb7fa2ba01b8d75d83c0eeea9934fb7c63816856d56699857483c1949e97a SHA512 9bc20ee9eb06df7d6f29f28e7b56ea8266b1fa01a61ee669c979c2cb00c9e86fb6a69f151265fcd1e33afae8dd77f6bfb3bcc44375caf71da176e400caba86d0
+EBUILD kexec-tools-2.0.24.ebuild 3267 BLAKE2B f93324b4be4091c0092424f0717a570d9f250adb1f65b48d25151b05e8ff5837699d20fa7ef69a0750f6cab43acb27cfef7cad9ac0b1a11fd9647b5f54e8a050 SHA512 9154ec583877c3ca6e68dd4877435f07c27ae44db63246869fe3eba265b0d644c9f7ba76be1b44bef09f9e90907a7e32456633428577395465d3cf60493420b6
EBUILD kexec-tools-9999.ebuild 3267 BLAKE2B 69aca60481b1300d82a3d0198501423b6505570ff16da0dd54f7c516786fac11c15eb7fa2ba01b8d75d83c0eeea9934fb7c63816856d56699857483c1949e97a SHA512 9bc20ee9eb06df7d6f29f28e7b56ea8266b1fa01a61ee669c979c2cb00c9e86fb6a69f151265fcd1e33afae8dd77f6bfb3bcc44375caf71da176e400caba86d0
MISC metadata.xml 491 BLAKE2B a47fdf282e096eb77748e23470df2a95cf2982e1e722ea74b9aee795f764e287a9364836139bba6462afd0a0f2a9d2f67c25ba1dd22a0a842a3f547a92cdd476 SHA512 a9f187f3cd1d63cfcfdcd93cdb50015b2d29eeb24558530febe440e6573464712d8e83a8743efc727c4c92ad61e1c36dc7d93cd33a222d751a4ec2b75d42f17d
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
new file mode 100644
index 000000000000..5723fa802401
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.24.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool linux-info systemd
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+else
+ SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
+ [[ "${PV}" == *_rc* ]] || \
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+ "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+ # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+ export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+ default
+
+ # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely.
+ sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
+ if [[ "${PV}" == 9999 ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with booke)
+ $(use_with lzma)
+ $(use_with xen)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Respect CFLAGS for purgatory.
+ # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+ # -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+ # -mcmodel=large which is added by build system.
+ # Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline.
+ local flag flags=()
+ for flag in ${CFLAGS}; do
+ [[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline"
+ [[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline"
+ flags+=("${flag}")
+ done
+ local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+ default
+}
+
+src_install() {
+ default
+
+ dodoc "${FILESDIR}"/README.Gentoo
+
+ newinitd "${FILESDIR}"/kexec-r2.init kexec
+ newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+ insinto /etc
+ doins "${FILESDIR}"/kexec.conf
+
+ insinto /etc/kernel/postinst.d
+ doins "${FILESDIR}"/90_kexec
+
+ systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ elog "For systemd support the new config file is"
+ elog " /etc/kexec.conf"
+ elog "Please adopt it to your needs as there is no autoconfig anymore"
+ fi
+
+ local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+ local has_rootpart_set=no
+ if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+ if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
+ has_rootpart_set=yes
+ fi
+ fi
+
+ if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no" ]]; then
+ ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+ ewarn "This was probably caused by a previous version of ${PN}."
+ ewarn "Please reboot system once *without* kexec to avoid boot problems"
+ ewarn "in case running system and initramfs do not agree on detected"
+ ewarn "root device name!"
+ fi
+}
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 23eb6257b144..6fde1d0bce06 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,5 +1,6 @@
AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
+EBUILD kmod-29-r2.ebuild 5291 BLAKE2B 7528b891100e568a324649b865ff22b22d5dcd00294f70514ab62ebea527983b4a2e0a79f9fba4efeaf4a20621fa2243691eb813b70e5495e6ad33aa820580e4 SHA512 52a755c75b47c5d52a4f15ccddba16e21ecabecd7ecbe48f85bae9e5334c22b73ca5677a2ea3397aa0429b562a46b6a46b68bc15d75ec716679c0f2a61e812da
EBUILD kmod-29.ebuild 5236 BLAKE2B 8674297d2f9ba5382792f4ca756e3fc47e6558020dd11d07c590232098d14f358130163733d5338cecf13b55b0f90086011bab2e4a753de8fc17f17cd22c7e07 SHA512 f576e67fd863468a49fa0b17a70cc654cce65675a10080911a210a07392a9b542d5706d63eba6daf5662be4670e2e254afc70780c9d50a7fa6ba7c967df94a41
-EBUILD kmod-9999.ebuild 5237 BLAKE2B 6b8233ab744534061927afdd75bcd8d8a26c7f4243db2fa460729e5bbb78914d9279f0667e9d6f25ca5213eb4846d33fb18c3fa189dd8a68559507a68f513d49 SHA512 0739003537b94cff33ab4bb4a795df48dc01b2fb2cf15501e8f6b756a5734e0568d91b50787aff8e10e08db8e6a0c9a609db8bb473d50b10c1ea0add817ebe9c
+EBUILD kmod-9999.ebuild 5291 BLAKE2B 434a7a9104f0d64f8a22dc8e0dbc57b1652b15e9c6796deaebbba2c6d57116a88fc7f569f5c435820d04e41770ef3ab7b23a282a24b6c4f5da8d367ea166ff71 SHA512 b948c27eb7e144ff067f5587c2d897847290046bb0d9d207a468ce1983bc602f9fb6e03e08067857f25230e9aa2fe19d94136a5ab2c9113614c520d6dfc406ca
MISC metadata.xml 611 BLAKE2B d356a4efdd4696d1a57b9e57a4c2c6cda612830c11dcedadb307db85f202ceb8d8f6e6aaacc0e1b69f9bf909cf226f4174fb270f5f4eded14a1b42d236e345e5 SHA512 bba19da08e022d4de0970d80646dfdcaaede388e2b0a020bb9d83ebcb0fe1e62864e944c29a9bb6692df12981e24c091803ccda6161c2d6186b0dd46c3074108
diff --git a/sys-apps/kmod/kmod-29-r2.ebuild b/sys-apps/kmod/kmod-29-r2.ebuild
new file mode 100644
index 000000000000..d6f72bfcac71
--- /dev/null
+++ b/sys-apps/kmod/kmod-29-r2.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools libtool bash-completion-r1 python-r1
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd"
+
+# Upstream does not support running the test suite with custom configure flags.
+# I was also told that the test suite is intended for kmod developers.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
+# - >=zlib-1.2.6 required because of bug #427130
+# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
+# - >=zstd-1.5.2-r1 required for bug #771078
+RDEPEND="!sys-apps/module-init-tools
+ !sys-apps/modutils
+ !<sys-apps/openrc-0.13.8
+ !<sys-apps/systemd-216-r3
+ lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+ python? ( ${PYTHON_DEPS} )
+ pkcs7? ( >=dev-libs/openssl-1.1.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.6 )
+ zstd? ( >=app-arch/zstd-1.5.2-r1:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? (
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ )
+ lzma? ( virtual/pkgconfig )
+ python? (
+ dev-python/cython[${PYTHON_USEDEP}]
+ virtual/pkgconfig
+ )
+ zlib? ( virtual/pkgconfig )
+"
+if [[ ${PV} == 9999* ]]; then
+ BDEPEND="${BDEPEND}
+ dev-libs/libxslt"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( NEWS README TODO )
+
+src_prepare() {
+ default
+
+ if [[ ! -e configure ]] || use doc ; then
+ if use doc; then
+ cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
+ gtkdocize --copy --docdir libkmod/docs || die
+ else
+ touch libkmod/docs/gtk-doc.make
+ fi
+ eautoreconf
+ else
+ elibtoolize
+ fi
+
+ # Restore possibility of running --enable-static, bug #472608
+ sed -i \
+ -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
+ configure || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ --bindir="${EPREFIX}/bin"
+ --enable-shared
+ --with-bashcompletiondir="$(get_bashcompdir)"
+ --with-rootlibdir="${EPREFIX}/$(get_libdir)"
+ $(use_enable debug)
+ $(usex doc '--enable-gtk-doc' '')
+ $(use_enable static-libs static)
+ $(use_enable tools)
+ $(use_with lzma xz)
+ $(use_with pkcs7 openssl)
+ $(use_with zlib)
+ $(use_with zstd)
+ )
+
+ local ECONF_SOURCE="${S}"
+
+ kmod_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ run_in_build_dir econf "${myeconfargs[@]}" "$@"
+ }
+
+ BUILD_DIR="${WORKDIR}/build"
+ kmod_configure --disable-python
+
+ if use python; then
+ python_foreach_impl kmod_configure --enable-python
+ fi
+}
+
+src_compile() {
+ emake -C "${BUILD_DIR}"
+
+ if use python; then
+ local native_builddir="${BUILD_DIR}"
+
+ python_compile() {
+ emake -C "${BUILD_DIR}" -f Makefile -f - python \
+ VPATH="${native_builddir}:${S}" \
+ native_builddir="${native_builddir}" \
+ libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
+ <<< 'python: $(pkgpyexec_LTLIBRARIES)'
+ }
+
+ python_foreach_impl python_compile
+ fi
+}
+
+src_install() {
+ emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+
+ einstalldocs
+
+ if use python; then
+ local native_builddir="${BUILD_DIR}"
+
+ python_install() {
+ emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+ VPATH="${native_builddir}:${S}" \
+ install-pkgpyexecLTLIBRARIES \
+ install-dist_pkgpyexecPYTHON
+ python_optimize
+ }
+
+ python_foreach_impl python_install
+ fi
+
+ find "${ED}" -type f -name "*.la" -delete || die
+
+ if use tools; then
+ local cmd
+ for cmd in depmod insmod modprobe rmmod; do
+ dosym ../bin/kmod /sbin/${cmd}
+ done
+
+ # These are also usable as normal user
+ for cmd in lsmod modinfo; do
+ dosym kmod /bin/${cmd}
+ done
+ fi
+
+ cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+ softdep uhci_hcd pre: ehci_hcd
+ softdep ohci_hcd pre: ehci_hcd
+ EOF
+
+ insinto /lib/modprobe.d
+ # bug #260139
+ doins "${T}"/usb-load-ehci-first.conf
+
+ newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
+}
+
+pkg_postinst() {
+ if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
+ ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
+ rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
+ fi
+
+ # Add kmod to the runlevel automatically if this is the first install of this package.
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
+ mkdir -p "${EROOT}"/etc/runlevels/sysinit
+ fi
+ if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
+ ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
+ fi
+ fi
+
+ if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
+ if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+ ewarn
+ ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+ ewarn "kernel modules to have required static nodes!"
+ ewarn "Run this command:"
+ ewarn "\trc-update add kmod-static-nodes sysinit"
+ fi
+ fi
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index c18aedb0e8f6..48747e41ed50 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools bash-completion-r1 multilib python-r1
+inherit autotools libtool bash-completion-r1 python-r1
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
- #inherit libtool
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="library and tools for managing linux kernel modules"
@@ -21,7 +20,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
LICENSE="LGPL-2"
SLOT="0"
-IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd"
+IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd"
# Upstream does not support running the test suite with custom configure flags.
# I was also told that the test suite is intended for kmod developers.
@@ -29,17 +28,18 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd"
# See bug #408915.
RESTRICT="test"
-# >=zlib-1.2.6 required because of bug #427130
-# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
+# - >=zlib-1.2.6 required because of bug #427130
+# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
+# - >=zstd-1.5.1-r3 required for bug #771078
RDEPEND="!sys-apps/module-init-tools
!sys-apps/modutils
!<sys-apps/openrc-0.13.8
!<sys-apps/systemd-216-r3
lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
python? ( ${PYTHON_DEPS} )
- pkcs7? ( >=dev-libs/openssl-1.1.0:0= )
+ pkcs7? ( >=dev-libs/openssl-1.1.0:= )
zlib? ( >=sys-libs/zlib-1.2.6 )
- zstd? ( >=app-arch/zstd-1.4.4 )"
+ zstd? ( >=app-arch/zstd-1.5.1-r3:= )"
DEPEND="${RDEPEND}"
BDEPEND="
doc? (
@@ -50,7 +50,7 @@ BDEPEND="
python? (
dev-python/cython[${PYTHON_USEDEP}]
virtual/pkgconfig
- )
+ )
zlib? ( virtual/pkgconfig )
"
if [[ ${PV} == 9999* ]]; then
@@ -77,7 +77,7 @@ src_prepare() {
elibtoolize
fi
- # Restore possibility of running --enable-static wrt #472608
+ # Restore possibility of running --enable-static, bug #472608
sed -i \
-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
configure || die
@@ -118,7 +118,7 @@ src_compile() {
emake -C "${BUILD_DIR}"
if use python; then
- local native_builddir=${BUILD_DIR}
+ local native_builddir="${BUILD_DIR}"
python_compile() {
emake -C "${BUILD_DIR}" -f Makefile -f - python \
@@ -134,10 +134,11 @@ src_compile() {
src_install() {
emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+
einstalldocs
if use python; then
- local native_builddir=${BUILD_DIR}
+ local native_builddir="${BUILD_DIR}"
python_install() {
emake -C "${BUILD_DIR}" DESTDIR="${D}" \
@@ -170,7 +171,8 @@ src_install() {
EOF
insinto /lib/modprobe.d
- doins "${T}"/usb-load-ehci-first.conf #260139
+ # bug #260139
+ doins "${T}"/usb-load-ehci-first.conf
newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
}
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index fd06ea48a3ce..23984af8730f 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -1,5 +1,6 @@
DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf0c05e1e2bb4268435e17adb8858439ac6bf0e1783cfdd24a48fcb2dcf7c1cb20eee09aeb90db08c2e94224d01efeff7 SHA512 2ccdc5b30df6d96ac7a75d01d674b295bcdb0d445169716638a20c9884b090bbfe509e0aee79cb674a2d9b0eb18ea6284b9d4e2939cb5bf290cade4c1a02487a
DIST kmscon-8_p20220214.tar.gz 1158069 BLAKE2B a64b19da4bc57e4baed8d3822cbf7cca472614a30fe604a09c53f8ab3e024725abdad7286c6c183e7de3b24bd80e01c5141d6c7f10794b9101530832602dad4f SHA512 837026b3f9702fe487d63d665140ea9e37a39975161e86f78a4c989b18eabd3c3429a4a6ebc384790389042b014dbaaa8225a136290f9310b113b606e551f4c2
EBUILD kmscon-8_p20180906-r2.ebuild 2929 BLAKE2B 9fa4c899c776e7bd780b6dd40d1a8adc9880ab129a308479f60eabecd00843e389b886dbd632c4d5da4b2d5d04ba655e1af2b49d3bffabd1873b0f523fcb14e2 SHA512 ac8ca2c15773715a2b79b494fd82952f89bd805223a7b36c04a44aa1d81f5378129bde32ef970b1a8c19bcf2af75a44245b880e70dcb2dcad9b9a8ecb4e2f48d
+EBUILD kmscon-8_p20220214-r1.ebuild 3015 BLAKE2B c49d2f797ff8db10fe01affcf3a75dc03cbb233e654cfb2e898b09e065b84871cffa658f5ec81f29b53671cefd40b54b9abba79a9f61a568cbf23a21f930d388 SHA512 41dd8e5fc4de97d6e413a4830c2108a1cc0ddc20f55d0bc929164149b81707c8882584262253d2dbbc3e54dbbd9ba5e151d0d80376255ae6a93bec6b7040561a
EBUILD kmscon-8_p20220214.ebuild 2929 BLAKE2B 77b35eb82062531590fad5fba956c9e50c0818635a59f437f090282dad52d7973408a6f1f14e5ad0dda660b816adcf113afddaeee6f2314618681add1c08c019 SHA512 28a613ece6af9b05330f52cf864a036ca8fdb25b9567d993d59617cd6e7eb77bcf2aeded9caf0f8ea37b29411097ef3ee79acde6510b35368f4b8db0b8ff4681
MISC metadata.xml 665 BLAKE2B 3eda7f9e7848f5e1ee5161d8f124bd9cec1978c3bac41c3d3b90ffa1eb6300cb69a609233307731e7f71c89a30550c61f84d2690793a75f500853491bc137391 SHA512 d692f3f0cdabf80e3c5eb6c4a41efa457ab15b3e90ecadf741e829ea28a63f223e55439b4ca7f0ef15a61e8f9e77c2b9eb0952241940a939e801b97280dbda1a
diff --git a/sys-apps/kmscon/kmscon-8_p20220214-r1.ebuild b/sys-apps/kmscon/kmscon-8_p20220214-r1.ebuild
new file mode 100644
index 000000000000..21a91dd7c616
--- /dev/null
+++ b/sys-apps/kmscon/kmscon-8_p20220214-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="5eed56cfc873df4d7606bc1c470e1d2bb4d42f1c"
+SRC_URI="https://github.com/Aetf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+inherit autotools flag-o-matic systemd toolchain-funcs vcs-snapshot
+
+DESCRIPTION="KMS/DRM based virtual Console Emulator"
+HOMEPAGE="https://github.com/Aetf/kmscon"
+
+LICENSE="MIT LGPL-2.1 BSD-2"
+SLOT="0"
+IUSE="debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode"
+
+COMMON_DEPEND="
+ >=virtual/udev-172
+ x11-libs/libxkbcommon
+ >=dev-libs/libtsm-4.0.0:=
+ media-libs/mesa[X(+)]
+ drm? ( x11-libs/libdrm
+ >=media-libs/mesa-8.0.3[egl(+),gbm(+)] )
+ gles2? ( >=media-libs/mesa-8.0.3[gles2] )
+ systemd? ( sys-apps/systemd )
+ pango? ( x11-libs/pango dev-libs/glib:2 )
+ pixman? ( x11-libs/pixman )"
+RDEPEND="${COMMON_DEPEND}
+ x11-misc/xkeyboard-config"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )"
+
+REQUIRED_USE="gles2? ( drm )"
+
+# args - names of renderers to enable
+renderers_enable() {
+ if [[ "x${RENDER}" == "x" ]]; then
+ RENDER="$1"
+ shift
+ else
+ for i in $@; do
+ RENDER+=",${i}"
+ done
+ fi
+}
+
+# args - names of font renderer backends to enable
+fonts_enable() {
+ if [[ "x${FONTS}" == "x" ]]; then
+ FONTS="$1"
+ shift
+ else
+ for i in $@; do
+ FONTS+=",${i}"
+ done
+ fi
+}
+
+# args - names of video backends to enable
+video_enable() {
+ if [[ "x${VIDEO}" == "x" ]]; then
+ VIDEO="$1"
+ shift
+ else
+ for i in $@; do
+ VIDEO+=",${i}"
+ done
+ fi
+}
+
+src_prepare() {
+ default
+ eautoreconf
+
+ export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_configure() {
+ # Video backends
+
+ if use fbdev; then
+ video_enable fbdev
+ fi
+
+ if use drm; then
+ video_enable drm2d
+ fi
+
+ if use gles2; then
+ video_enable drm3d
+ fi
+
+ # Font rendering backends
+
+ if use unicode; then
+ fonts_enable unifont
+ fi
+
+ if use pango; then
+ fonts_enable pango
+ fi
+
+ # Console rendering backends
+
+ renderers_enable bbulk
+
+ if use gles2; then
+ renderers_enable gltex
+ fi
+
+ if use pixman; then
+ renderers_enable pixman
+ fi
+
+ # kmscon sets -ffast-math unconditionally
+ strip-flags
+
+ # xkbcommon not in portage
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable debug) \
+ $(use_enable optimizations) \
+ $(use_enable systemd multi-seat) \
+ --with-video=${VIDEO} \
+ --with-fonts=${FONTS} \
+ --with-renderers=${RENDER} \
+ --with-sessions=dummy,terminal
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ systemd_dounit "${S}/docs"/kmscon{,vt@}.service
+
+ insinto /usr/share/${PN}
+ doins -r fblog
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \
+ ewarn "It is recommended that you comment out the ERASECHAR line in" && \
+ ewarn " /etc/login.defs for proper backspace functionality at the" && \
+ ewarn " kmscon login prompt. For details see:" && \
+ ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797"
+}
diff --git a/sys-apps/lcdutils/Manifest b/sys-apps/lcdutils/Manifest
index a2ba6f157ac0..e001d3015e7a 100644
--- a/sys-apps/lcdutils/Manifest
+++ b/sys-apps/lcdutils/Manifest
@@ -2,4 +2,4 @@ AUX lcdutils-0.2-include-stdlib.h-for-exit.patch 1165 BLAKE2B 0a3f425a53c21a3613
AUX lcdutils-0.2-makefile.patch 446 BLAKE2B c268c67bf1ec0cba97b46ba12112103d81ad32e3463871539dfffd5cc6caf5422c1ebf4064604ed3adb0883b87b12c26f2bb0d8b08d3da33bdb9d6f708fc9538 SHA512 ee811308e5045eeee2f99536473294d9b7fec852b1d578dfb6c9fdaea0c250c2f59da740d9f6be52234ecb4cedbf38ff49886e388d350d93fd97ea92177c2dfd
DIST lcdutils-0.2.tar.gz 10819 BLAKE2B ea493a49cc1d121b1edb848645f189b4996463e0616dc418e938658767cb56b4ca3982bda0d7349eb303b88ecd3015fa2d8c178607ad14311ca5a0af57a2305b SHA512 ea7140b7b27aade66d025b4c4c7441a2357d03f5081f67ccac8175e709e8f20bf800208a72675eacfca1af8329c01b9e8b1a9bd910bf858bcbdb8aff3c2169f4
EBUILD lcdutils-0.2-r2.ebuild 524 BLAKE2B 9dae606f538cd4df2483b3509bf5682bb716d5405cfdf2e0abad0921c24ecd1db1e390338b5ce9f1b95321873314bd64e34423f0fa6f0b42cd797fa10427dac1 SHA512 1fd1c8f81fe2b98d53318d97981e445380a9f05b18dbbe14c87595e20a9602a455bbd2b102fc05c8f581813562b79e519e9c155be31bf4d16fabe2506834c3af
-MISC metadata.xml 503 BLAKE2B 5c09c6fa891bb3c73e5d8de1c0ea4fa11878db51645347c83bbe20f3ea0a02ee249e6db8428fab0620db033023ed9308cdc93750702e71f37adbbbd5b4c4e765 SHA512 030c55f8581752a8ec3462fd2242751641a9fa74faa0c20f8e5097b4dcb6886a13483105e511d23a296e2535ef9dca6fc5e506e7cc191cc09e10b36a15bfbd36
+MISC metadata.xml 516 BLAKE2B 82270c31ddfeb49a3fab5ac459cd9f5f1e6ba17a58f771e5d12cb50feb90680026d9b43eca50f4d4c07f6886f3e7ea519e9a06e514cc56c2538acf0304d1bd5e SHA512 1f85443a5aaa9109a3d6590eb9bc07fefbfccb1e307d21d65fdfce4a035ec381f591325d7258e66ee70a326f503b88c3eb7fa79fddd48057cc711c580824e85d
diff --git a/sys-apps/lcdutils/metadata.xml b/sys-apps/lcdutils/metadata.xml
index d2df3c7ed23a..41e0d4a29188 100644
--- a/sys-apps/lcdutils/metadata.xml
+++ b/sys-apps/lcdutils/metadata.xml
@@ -7,7 +7,7 @@
</maintainer>
<maintainer type="project">
<email>mips@gentoo.org</email>
- <name>Mips Team</name>
+ <name>Linux MIPS Development</name>
</maintainer>
<longdescription>
Provides utilities for the (Sun) Cobalt Microserver Systems
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 45faae1e1abd..f8f150be1ab3 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,4 +1,6 @@
AUX likwid-4.3.1-fix-gnustack.patch 1014 BLAKE2B 68ac831c96f826156238bbb4178c4923cb869a2757928af12f788a01067fb129326fec0c7a98b073f504f0aa8234d42dcd9fe7cdb0185b8107a6db3962cfbc08 SHA512 ab12e2ebebfca5c87b1ad2c89c5073aaa6987e8d440cfdfffc107233fc5b66c6562f25fdbd6720df3c1477becaaa3c3ac470fa4f99ac15bb78ea09fa06460a4b
DIST likwid-4.3.4.tar.gz 1584829 BLAKE2B dcd1c3a0c5e549dc3d22bb98120339521e270da55460f5af9f2fe04849af0fe1ac4d9b881883a4efc3695ceb087d1afad5bcc55b55543199d2c33b0f5012cc68 SHA512 f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2
+DIST likwid-5.2.1.tar.gz 2308041 BLAKE2B 1913212fb5157365a439757018ab58b4555e2b4401575ee05c784d038e13296644a7d0a89769599eef0444b13ed10f0357ad09b9cbae712f7d1fb9cca65fb1e3 SHA512 f096dcc071e976284c874aeb254dcb83c66ae808876a8c6be7b05e359d06800f1da25c01c072950c3493eb9ca10f6f9d81624feef61cc7a01f40fc0d003f98a7
EBUILD likwid-4.3.4.ebuild 5514 BLAKE2B c7bdc0310f21b8985128bc6006f57a3bfa3746783a8bbdd6187a7569ad4ea74580a67ee6a250e0aa73960adf01066d0428a75b21479011c23a79bec54eaa4d8c SHA512 b9a511141568693eb960a4837914e8357dc814280b58e062286ba6472aedadca86e9f6cbaab89320a456df99a2edf1c61ee3978411d2d38f78690aba93160914
+EBUILD likwid-5.2.1.ebuild 4173 BLAKE2B a7525c50019c522701d7f529c22751579beaae02db35183b715fd5fb3ee5fb2a6d3a514f3637ce5c6de5606641749c8fa73e9621c189843c086f46b7416ea663 SHA512 5347087addf99de7410931de8c25bf14357dfc54f1469a1eb2103e233ad6834d6a7f4a74b01d5ed228ff963adff35d3fa615cdd4f4505ee4512d527956bc1bd3
MISC metadata.xml 334 BLAKE2B 206f8a2f15ea7991479d3ca98b36da8b334f242063d1522addd4cbe29e8a71f77f16a2053eca6bfce78fdf38e11c4962ea70dfd3f35298f312832e312f7ababb SHA512 31565b8fb881011bb9d2f25c453e5b2b8644348cdec699ab8c28efed8dc281a35895bb795958b2376a99097eb90edb40d3998f6eea041dd979fcf716edb1731e
diff --git a/sys-apps/likwid/likwid-5.2.1.ebuild b/sys-apps/likwid/likwid-5.2.1.ebuild
new file mode 100644
index 000000000000..ed2192fcf1bc
--- /dev/null
+++ b/sys-apps/likwid/likwid-5.2.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+inherit fcaps fortran-2 linux-info toolchain-funcs
+
+DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
+HOMEPAGE="https://github.com/rrze-likwid/likwid"
+SRC_URI="https://ftp.fau.de/pub/likwid/${P}.tar.gz"
+
+LICENSE="GPL-3+ BSD MIT"
+
+SLOT="0"
+KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64
+IUSE="fortran"
+
+CDEPEND="dev-lang/perl"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+CONFIG_CHECK="~X86_MSR"
+
+FILECAPS=(
+ -M 755 cap_sys_rawio+ep usr/sbin/likwid-accessD
+ --
+ -M 755 cap_sys_rawio+ep usr/sbin/likwid-setFreq
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.3.1-fix-gnustack.patch"
+)
+
+pkg_setup() {
+ fortran-2_pkg_setup
+}
+
+src_prepare() {
+ # Ensure we build with a non executable stack
+ sed \
+ -e '/^SHARED_CFLAGS/s/$/ -Wa,--noexecstack/' \
+ -i make/include_{GCC*,CLANG}.mk \
+ || die "Failed to set nonexecstack"
+
+ # Make the install targets respect Q= for being quiet or not
+ # MUCH easier for debugging
+ sed -r \
+ -e '/^install/,/^[a-z]/{/^\t@/{ s/@/$(Q)/; }}' \
+ -i \
+ Makefile || die "Failed to sed Makefile"
+
+ sed -i \
+ -e '/^\.NOTPARALLEL:/d' \
+ Makefile \
+ bench/Makefile \
+ ext/hwloc/Makefile || die "Failed to re-enable parallel"
+
+ default
+}
+
+export_emake_opts() {
+ # Warning: this build system uses PREFIX in a way that differs from
+ # autoconf! It's more like:
+ # PREFIX=$(DESTDIR)$(INSTALLED_PREFIX)
+ # it's not 100% like that, because parts of the Makefiles are inconsistent.
+ # this is the same solution used in the upstream RPM specs
+ # these variables are uppercase so they match what's put into Make.
+ local INSTALLED_PREFIX=/usr
+ local INSTALLED_LIBPREFIX=/usr/$(get_libdir) # upstream is '$(INSTALLED_PREFIX)/lib'
+ local INSTALLED_MANPREFIX=/usr/share/man # upstream has it as used but undefined variable.
+ # If the build is too loud, pass 'Q=@'
+ src_compile_opts=(
+ "Q="
+ "INSTALLED_PREFIX=${INSTALLED_PREFIX}"
+ "INSTALLED_LIBPREFIX=${INSTALLED_LIBPREFIX}"
+ "INSTALLED_MANPREFIX=${INSTALLED_MANPREFIX}"
+ "PREFIX=${INSTALLED_PREFIX}"
+ "LIBPREFIX=${INSTALLED_LIBPREFIX}"
+ "MANPREFIX=${INSTALLED_MANPREFIX}"
+ "CC=$(tc-getCC)"
+ "ANSI_CFLAGS=${CFLAGS}"
+ "INSTRUMENT_BENCH=true"
+ "FORTRAN_INTERFACE=$(usex fortran likwid.mod false)"
+ "FC=$(usex fortran "${FC}" false)"
+ "FCFLAGS=-J ./ -fsyntax-only" # needed for building correctly
+ )
+ src_install_opts=(
+ "PREFIX=${D}${INSTALLED_PREFIX}"
+ "LIBPREFIX=${D}${INSTALLED_LIBPREFIX}"
+ "MANPREFIX=${D}${INSTALLED_MANPREFIX}"
+ )
+}
+
+src_compile() {
+ export_emake_opts
+ emake \
+ "${src_compile_opts[@]}" \
+ || die 'emake failed'
+}
+
+src_install () {
+ export_emake_opts
+ emake \
+ "${src_compile_opts[@]}" \
+ "${src_install_opts[@]}" \
+ DESTDIR="${D}" \
+ install || die 'emake install failed'
+
+ use fortran && doheader likwid.mod
+
+ # Fix Python filter added shortly after 4.3.3
+ #python_fix_shebang "${D}"/usr/share/likwid/filter/
+
+ # Do NOT use 'doman'! The upstream 'make install' target does a sed as it's
+ # generating the final manpage to the real install dir; and the copies in
+ # ${S} are unmodified.
+ dodoc README.md CHANGELOG
+ dodoc doc/*.txt
+ dodoc doc/*.md
+ dodoc -r doc/applications doc/archs
+ # Fix upstream partial doc install
+ rm -rf "${D}"/usr/share/likwid/docs || die
+ ln -sf "/usr/share/doc/${PF}" "${D}"/usr/share/likwid/docs || die
+}
+
+pkg_preinst() {
+ # This is now a symlink, but used to be a plain directory
+ OLDDOCDIR=/usr/share/likwid/docs
+ if [[ ! -L "${OLDDOCDIR}" && -d "${OLDDOCDIR}" ]]; then
+ einfo "Cleaning up old docdir at ${OLDDOCDIR}"
+ rm -rf "${OLDDOCDIR}" || die
+ fi
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+ einfo "If you get 'Cannot gather values from MSR_PLATFORM_INFO', then 'modprobe msr'!"
+ einfo
+ ewarn "To enable users to access performance counters it is necessary to"
+ ewarn "change the access permissions to /dev/cpu/msr[0]* devices."
+ ewarn "It can be accomplished by adding the following line to file"
+ ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\""
+ ewarn "Alternatively, assign the MSR files to a unique group and use mode 0660"
+}
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 35fe65fc3bdf..bb5eab5033e6 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -2,11 +2,12 @@ AUX fancontrol.confd 669 BLAKE2B cc297a5122d54f6104d840548480c6648fb31388a9c78a5
AUX fancontrol.initd 600 BLAKE2B 2c869e1c5f1a6af0a95a9dce29856414f7e0d8e4a0accf407b1b04dd099a6ff0e0afaaa9ab01f97bebdf0c64bac680f0c7b826c7cb0baffae31ee031a18aa779 SHA512 81a3fe5be067c095b9dec2fcf76718af780bb55d45f5a395f6aba246f877fc602e5f2225ffe14db6dcc34a6053ad04951715fc4c986da28e57118d0b3d101a4b
AUX fancontrol.service-r1 146 BLAKE2B 666a45c2e55dcf31470167ba9bb78e6205b3fcb47f66ae7b185d6651dba33f8a7699f800ecddaed070a8827d24893cc1971203b691f37515ea74125e889e8965 SHA512 eb1e22045a4adbcba398b77061d33b145614edf960c31aeb3c9a987553d6a0d8de332d4887e52ca2c6d6147d6e1a2b5e8bae41dca5f1c9d4fc2dc522c18459f8
AUX lm-sensors-3.5.0-sensors-detect-gentoo.patch 12593 BLAKE2B 21383c2d0a7dc2063f81ca7af15ee02dc94a3344f23da80433ab19fc7a5528cc516408ecadc46d0fd1f55799a305c0e509211476314ca0cdf05e3b8942059050 SHA512 0f1556cef3d1c19f4dd822afdf609390f82dbfda7e66070ca5b89b145c29669e05141f150b3b0d58c277c79c57f98659284953788db6334c27e17e3f39e23cdd
+AUX lm-sensors-3.6.0-no-which.patch 593 BLAKE2B 7e5e141b3cae400f767b31226436370a9dba1cd2c5364463225900cb95f4cfaf67ef75a4f89e3a760ea3ef5383ee4d0ed873f277114d6ebc1aee44cf543d7d0f SHA512 dad3c21290323eeec3ab947a723700ebb819cbe067059fce3d1e81c5c1c9b1a62d0ecc2d9a710e1d25600dd25e11c0f664dd1e67f05cf54859d37d0c642ebce8
AUX lm_sensors.confd 102 BLAKE2B 5d0771a2cac4869caee2d6ae3ac2cc2f60e64720ad587d4a89fa6dca7506325554b06d92cce42fc51b9af9c8715834d6d481f342cd6be57061c5234dfabd26d3 SHA512 a31220f4bf337de7b17158e00c64e662527abe11c5cc9f8401216f757dcde1c220527ad73f375c0de051030119daeba4cef6c5155f077447a9391e273cd65f50
AUX lm_sensors.initd 331 BLAKE2B 6bb75290fb3b686c6a4ad213360cf82020065b259b22c40d049b5caf6f22f7bcaf37e09b90e50330e14023d1d0102f4d2e755757c983fa58c2f0ed4ecb45b025 SHA512 1b4ad50408804da03b3862e10d342ad2e0d8077340fa57d8b28e470259bc50176b4e1208ff9ffaf28839c76767e18685c7abdac12b74185c84e80ebfbcd01ab1
AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378eeef36654933f0ec2042683e1b13bc48349eebc4d2dde26d20ac7e7681c01ceeb0b3b4e27576d2b SHA512 83c71b9aaae273daff62da31ae45ffa682460e4d4a8fbca54dfa83b1db58d4d042bba08eb62c62f4d8f6647d222ef5a11181a3fb7bedffbb4138ef02f6143535
AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
-EBUILD lm-sensors-3.6.0.ebuild 6629 BLAKE2B f82f43029c27520bcad2b4ef1f1b9816bfbc86e6b4da2ace33867ce3d3c66ee93459470c09cb8a2663cef552f21818b84a40e07f47a96a2f09e83efa8021ef27 SHA512 12950ccb4c069b48a0ff856d472370d164b8b3085694a9991d36e943b07f935ba19e152cc1e279bd72a0cf8504f75ac1893febb6cc58dd8e1edaf84bb662ed5b
-MISC metadata.xml 944 BLAKE2B 51d63cd4ecf93033ee09f766a240778fd71f666f26cab5b6e8cb19a10dcb174e88feb69d4dbea5e3d4b35a12d7d52dad7a96f8f53d6e3e366dd1383b9e5aaf22 SHA512 2bbd482a716a6cccd84d4ed299934205b6fcdb77c4e12805791273ca5b7d64d27ecd75f2a877bdcfdcd7a9c4e0df2b18a1e1045e4f5194f6169716893b459289
+EBUILD lm-sensors-3.6.0.ebuild 6672 BLAKE2B efecba75234ac2175f71f070cd16b3bed7dbae5e74c91ce78c3999de502155286669651dd8ff3149d83d51190bf672e90a477aba5d528b540e1fe6ef2b2aa3f2 SHA512 2f120c58c561c148ab755b85dc3d1e65c731e1fad666cc39ade50e98fff6de3c0c0ab59cdd57bbd262a47a15ef2095f7d4139c996446288d3ddc6e9d61f7cf7d
+MISC metadata.xml 748 BLAKE2B d7060e5184c987acf8978936cabd72b47794ad0462af91e664d0efcf3fefd58f9c8ba0814cd09b839104018e6c996cbaa89f4e35d034a902f7557941005a904f SHA512 c5c7a7653230cbe673af3fcf7d5b4deb6bc69863d1eb96a99e04df1348f08406f19b5c296e76d13db46697d4489a769c545caf601d736b793ba3d320264ae65f
diff --git a/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch b/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch
new file mode 100644
index 000000000000..e75e23142d86
--- /dev/null
+++ b/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch
@@ -0,0 +1,21 @@
+https://github.com/lm-sensors/lm-sensors/pull/402
+--- a/Makefile
++++ b/Makefile
+@@ -250,7 +250,7 @@ manhtml:
+
+ # Flex and Bison
+ %.c: %.y
+- @if ! which $(BISON) 2> /dev/null ; then \
++ @if ! command -v $(BISON) 2> /dev/null ; then \
+ echo "Please install $(BISON), then run \"make clean\" and try again" ; \
+ false ; \
+ fi
+@@ -263,7 +263,7 @@ FLEX_FLAGS := -Psensors_yy -t -Cfe -8
+ endif
+
+ %.c: %.l
+- @if ! which $(FLEX) 2> /dev/null ; then \
++ @if ! command -v $(FLEX) 2> /dev/null ; then \
+ echo "Please install $(FLEX), then run \"make clean\" and try again" ; \
+ false ; \
+ fi
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
index 74b209916ec0..01d6dec1eb38 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
@@ -44,7 +44,10 @@ WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-PATCHES=( "${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch
+ "${FILESDIR}"/${PN}-3.6.0-no-which.patch
+)
DOCS=( CHANGES CONTRIBUTORS INSTALL README )
DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )
diff --git a/sys-apps/lm-sensors/metadata.xml b/sys-apps/lm-sensors/metadata.xml
index 581e9a94e242..b2dda5428d40 100644
--- a/sys-apps/lm-sensors/metadata.xml
+++ b/sys-apps/lm-sensors/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
+ <!-- maintainer-needed -->
<slots>
<subslots>Reflect ABI of libsensors.so.</subslots>
</slots>
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 7c4d26c405df..e28bf2c97b23 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,8 +1,6 @@
AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504
AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
-DIST logwatch-7.5.6.tar.gz 484873 BLAKE2B 18a10f7baade4650c836ad402fcb92096923e0a8b6890352916e3b514bf85fe5b5070c0a47059c68fd84624407006107332f75a5ce3164a25cfa05f28f2ec882 SHA512 fb490f5bc1bf469309ee9caa1e040d71b4332d7fb64f94865a9b5fe707a92cb10c207022ce5e279709bf3412605f67f7da11303d91aa078f680c598398aab2ab
DIST logwatch-7.6.tar.gz 488750 BLAKE2B fd7f2a7c65151dbfbd924102b01ead00f92d74a59a417361b65be972368f7ed93810feefedf1ad9bba2de5ebbc74589c3fc0a8a484f19b5a9782c9799ffdf656 SHA512 8672dcf2b781d89ec281c4370b204467f9db219edb7c23adf02b71decf0ecab7b442d6e95e91416af3aecc27948e9442bb3b369e532e40f7ef32635628e110af
-EBUILD logwatch-7.5.6.ebuild 2412 BLAKE2B cbcd0212a9615556f4fd1d88dad7020bd8dd9d389efbd0cb11c8aa59c5d23e0d05ecfab4fb5fcfc750e78914c0ce6f15f68225d0921163e1edb56b5cf55c07a5 SHA512 a1a7f7e4bc55099b8aaeeef0250496850a5a3c82ae6855795668a91e2e0f2a35c0c94b9fbc431c74ff3c57d67a89645ebb04d29421214c0aeec4a6f8b8dd39a3
EBUILD logwatch-7.6.ebuild 2412 BLAKE2B cbcd0212a9615556f4fd1d88dad7020bd8dd9d389efbd0cb11c8aa59c5d23e0d05ecfab4fb5fcfc750e78914c0ce6f15f68225d0921163e1edb56b5cf55c07a5 SHA512 a1a7f7e4bc55099b8aaeeef0250496850a5a3c82ae6855795668a91e2e0f2a35c0c94b9fbc431c74ff3c57d67a89645ebb04d29421214c0aeec4a6f8b8dd39a3
EBUILD logwatch-9999.ebuild 2420 BLAKE2B 5876966303c0c8c809b49a14278f2196747b21c32bdfd7aee74418ec8309b3a2eb6f7fe28c89cd1cffaafb7b371d4837b5ee32fdd44226d98b3a9bd3b1e0ff1a SHA512 7bb4bc9a0e4e463185f7080fd8144d0f42f036fc354f55aaf25025ef722e6ad5921c942bface3571465b308bf7ed892c8623224bc991651c4144833d63cbdc4e
MISC metadata.xml 329 BLAKE2B ae6bfb6282dd2f5ddc01959eb57e894cc12a69de5fea771439d9b2a95110754fd7c35db97ee238865cfb81333800dcdcfb42654d12572e16cde12c7212a505c5 SHA512 a523f269535d7e0272f2d66b903319197f52477dbf40b32729eff93b5788f9c8b8756a4750128f894b4ab0d05b9effbac5d350e5ae2ab68474ef4fa39022710a
diff --git a/sys-apps/logwatch/logwatch-7.5.6.ebuild b/sys-apps/logwatch/logwatch-7.5.6.ebuild
deleted file mode 100644
index 24fb4fa00cfe..000000000000
--- a/sys-apps/logwatch/logwatch-7.5.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit tmpfiles
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
- inherit git-r3
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="https://sourceforge.net/projects/logwatch/"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="virtual/cron
- virtual/mta
- virtual/mailx
- dev-lang/perl
- dev-perl/Date-Calc
- dev-perl/Date-Manip
- dev-perl/Tie-IxHash
- dev-perl/Sys-CPU
- dev-perl/Sys-MemInfo"
-
-PATCHES=()
-
-src_install() {
- dodir /usr/share/logwatch/lib
- dodir /usr/share/logwatch/scripts/services
- dodir /usr/share/logwatch/scripts/shared
- dodir /usr/share/logwatch/default.conf/logfiles
- dodir /usr/share/logwatch/default.conf/services
- dodir /usr/share/logwatch/default.conf/html
- keepdir /etc/logwatch
-
- # logwatch.pl requires cache dir (bug #607668)
- newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
-
- newsbin scripts/logwatch.pl logwatch.pl
-
- exeinto /usr/share/logwatch/lib
- doexe lib/*.pm
-
- exeinto /usr/share/logwatch/scripts/services
- doexe scripts/services/*
-
- exeinto /usr/share/logwatch/scripts/shared
- doexe scripts/shared/*
-
- insinto /usr/share/logwatch/default.conf
- doins conf/logwatch.conf
-
- insinto /usr/share/logwatch/default.conf/logfiles
- doins conf/logfiles/*
-
- insinto /usr/share/logwatch/default.conf/services
- doins conf/services/*
-
- insinto /usr/share/logwatch/default.conf/html
- doins conf/html/*
-
- # Make sure logwatch is run before anything else #100243
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/logwatch 00-logwatch
-
- doman logwatch.8
- dodoc README HOWTO-Customize-LogWatch
-
- # Do last due to insopts modification.
- insinto /usr/share/logwatch/scripts/logfiles
- insopts -m755
- doins -r scripts/logfiles/*
-}
-
-pkg_postinst() {
- # Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
- if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
- local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
- [[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
- && rm -f "${ROOT}"/etc/cron.daily/logwatch \
- || ewarn "You have two logwatch files in /etc/cron.daily/"
- fi
-
- # Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
- tmpfiles_process ${PN}.conf
-}
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index 929448e6fe85..a9adfe19251a 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -1,4 +1,4 @@
AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca31b87fd910b770b212f1d06aef668f184343f7d961aa38a1ba35e2bc1628750bd1680a70b7405271fab59c5f732fde66c SHA512 289795f45144071f5f166a3dfd387267fd3327767bae9d8e9c48818de0c60b961ac35952eb8b42b3ebfd415b337c096fa2db8009fdfbc218814a3ace633a8483
DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
-EBUILD lsb-release-1.4-r4.ebuild 1097 BLAKE2B 23a59cca1c82fad9bbda0c0d4dfa4869bc29d47524dc43820555926e95d92b4b1251735b12ca58711bfdddf2f12ebb5423c4fdd4d9eade50c89828a61f7072f0 SHA512 13f4c4d16ad265edf84f05767b741968968090041508391c1fea36f5eb8927bcf1ac13c41ab74b983c48718bbae9b737cf4244f532d8416fe5391d9cd5202ff7
+EBUILD lsb-release-1.4-r4.ebuild 1104 BLAKE2B b399f7a4641078445f8f6910cbe1ffc0a720523b891c84ea259a60efeaec15cc7ca632ec14c617973232d6933732eb564db4c1103d7a77046b7d7d69465682d9 SHA512 3d859f8ae02d17a5bbc940f72b6255cd2cb0ada459d16550bd63991973d2a11b8d79645212df293ed90b211783443c633c5317e8dc00be30f151f6c3e45074d9
MISC metadata.xml 809 BLAKE2B 38ad65227aa223463f44a81f24f8b8930ac8df03dd556eea24759b8a770c798ba42e3497970b6b2cca3437ebb21f38af094d4625128feef6cb1b6f228e2f8db7 SHA512 943f7df2955531edfef1305376c0cc2ee25f98d73f045cea5001d1e1956579c0d6779b16b70bc1ecdaf06737faead54b2a928202cfd252c2d9b3ab649920f0e4
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r4.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r4.ebuild
index 46e771a99627..65f0ea92e476 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r4.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
# Perl isn't needed at runtime, it is just used to generate the man page.
BDEPEND="dev-lang/perl"
diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest
index 3b7e1620aec4..a197b918b1f6 100644
--- a/sys-apps/lsvpd/Manifest
+++ b/sys-apps/lsvpd/Manifest
@@ -1,3 +1,5 @@
DIST lsvpd-1.7.13.tar.gz 93269 BLAKE2B 9b92de69b810314dd8c84e300fabcce2117b16373b68c7e414cd6035f1b64f90fec2e2c4f0b623263d0f7de1e499464139e7b8ffa30e2e13b76fce50ea67ff4c SHA512 99039b622051a24d1d17a014a81c6909a403c4b3746c2e4e62b0822f1d14319b3fcd5c82c13ec240ef2110c8a08de5b74a39ed0dea8a482977a475566cd83d3b
+DIST lsvpd-1.7.14.tar.gz 93419 BLAKE2B a79706993678b5732896141017ade419fe4ffb15cae0c8c68d8f9e64ce7d4f007a5f5d80b1e6c0935e23f41641f95ee1becdacb1515b34278eb7d7cc23df129b SHA512 f9c507db1e5e16adeccf50ce94a0bb891e4907724ed36da88fa94cdca11436124dc6615b3c9287a1a26ee1beb51a0d3c203c58b15e7bcf9a4338087ae4ff8018
EBUILD lsvpd-1.7.13-r1.ebuild 599 BLAKE2B cd957f7eec4975eb3bb501b96996c592aebe6d0ae665274ad5e2738d0ed94b6b6a95150bd2c442877743dd89de5c6a78ac19700f7765b1682fc1762a688f65e1 SHA512 aa6b35fbcc109bb504dd4f755c2ee233122c5dd5b57395112fc68873a87722939fcd78b4ad81fb2b8af994bfffdce2aedaa5ddf1bd5d53497378b605e54a9ce0
-MISC metadata.xml 989 BLAKE2B 7ebdc7122186b4592922dada5663240f97304867ffc6388bfacd4f27dc22928c46417afa71f7a7a0d4ac6e99f89c6e56afdace589b6a6eb0a8ca7eb5a75ff92f SHA512 a321b9e6e79a39866f36f18ceae469701737145a09bd6e721d2f23d04815344fc875d236c8a2c4a885770298259438fabf93faa21924c51ca9f180ad3e8e586f
+EBUILD lsvpd-1.7.14.ebuild 610 BLAKE2B 1273edd6db1d2ec87b23b763d5047f641b153cf470c7f52ccb184b27b0bb97ba9c7b63ce308c8cef4141299d03f8784f8bc9415ca65ea24244753e247e34a3cb SHA512 c80545d1626f732eec5089cae904757da9bcd2166308f6512e1d26af6c73e0cc9f3761c44a5a201dc4dbbc6e54d2322248797fbb436bfd52965b63c19152923f
+MISC metadata.xml 1071 BLAKE2B 1fda1748245f526f97b158d797697b28c01dc972147657190c6f76b804c2b5ec0313d8ee144de72bc752a1a654da96af77ba717bd4367bb1e13b9a6d7617092b SHA512 368ff48f6707bf950c9e607f8c58d6403a1723a7a26d9ff64d43698091833cdc15ecb909619fc54adee95fd6876c8e0a7b766dce5aaa0f09b1762ca06d6e0dc0
diff --git a/sys-apps/lsvpd/lsvpd-1.7.14.ebuild b/sys-apps/lsvpd/lsvpd-1.7.14.ebuild
new file mode 100644
index 000000000000..3e1d9c5a79f2
--- /dev/null
+++ b/sys-apps/lsvpd/lsvpd-1.7.14.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Utility to List Device Vital Product Data (VPD)"
+HOMEPAGE="https://github.com/power-ras/lsvpd"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE=""
+
+RDEPEND="
+ dev-db/sqlite:3
+ sys-apps/hwdata
+ sys-apps/sg3_utils:0=
+ sys-libs/librtas
+ >=sys-libs/libvpd-2.2.9:=
+ sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}
+ virtual/os-headers
+"
+
+BDEPEND=""
+
+src_prepare() {
+ default
+ eautoreconf
+}
diff --git a/sys-apps/lsvpd/metadata.xml b/sys-apps/lsvpd/metadata.xml
index 8526d81e6097..e6e188d96782 100644
--- a/sys-apps/lsvpd/metadata.xml
+++ b/sys-apps/lsvpd/metadata.xml
@@ -20,5 +20,6 @@
</longdescription>
<upstream>
<remote-id type="github">power-ras/lsvpd</remote-id>
+ <changelog>https://github.com/power-ras/lsvpd/blob/master/ChangeLog</changelog>
</upstream>
</pkgmetadata>
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 41ab23bcf0b9..fd3e4d83210f 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -2,5 +2,5 @@ DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7
DIST man-pages-5.13.tar.xz 1788980 BLAKE2B 7cca88b7f201d177b087893f60e6a87fd3ed8c78a183bd6ebcd0c28961f5f5d24aa2ba9d3a1d9cec4e0fc9cc0b26489c91e991a2d4420c28e1f61b850b882752 SHA512 a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499
DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
EBUILD man-pages-5.12-r2.ebuild 1912 BLAKE2B a613be39418f7d57549a53cfa41c982b49068000d1039f2f0980a97dc7e08d300ff168c8bdaa36d301144317fb748640449d61884b929456969733e03bf4a3a4 SHA512 2c8fe64e0b047fcdc8cd1445d6a6a343fc299f12b104b93084d3ac0b5ae9fbcf7954e158c29f7f3a640d39938e507f8a9c6216eae4a128573ee3bd08d4bedc51
-EBUILD man-pages-5.13.ebuild 1928 BLAKE2B 9961fab2fe28337a545cc9922272e7069f022fe140dfa8ceda1d673fcfd6b76ee252d8539617488d55d8f0c652ab03b76a2e20f36581e0ba8db2a81326286758 SHA512 ac6d5c9463cb7718889aa48e715443cc07aab0a9ce15d3acfe37795a5fd9bb5bb826b7e080153017a91390f2163cd01105faf82b1fcc8fee32cb7eced4cbb8f5
+EBUILD man-pages-5.13.ebuild 1920 BLAKE2B b73d7bb9058ab24ef60d5ad26308f2137251a90d4a7634f0bc9544f49de5d96ec200b3bd57aed7e9239c11408b77fba64a41e0602afc690184ef971f08eb71f2 SHA512 e137297af41cfcaa9dee06c9ec6ee603ad442317648dacc5569459ed67dde4dcb87d227174726a466e7ebb54fd3c7d13c60889b7a9dad683d0cc03701022c5da
MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-5.13.ebuild b/sys-apps/man-pages/man-pages-5.13.ebuild
index 811b1b19ea3b..d8cb5f940dac 100644
--- a/sys-apps/man-pages/man-pages-5.13.ebuild
+++ b/sys-apps/man-pages/man-pages-5.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
LICENSE="man-pages GPL-2+ BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
IUSE="${IUSE_L10N// / l10n_}"
RESTRICT="binchecks"
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 4ab4433e00d4..a4748b572526 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,7 +1,7 @@
AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97ec51f20541863111de4298b7d6eb0911ded757cadc1ba4deefd500d8a6e335693191e2e65286a585 SHA512 8de0df316d8c926bd99515b4c6eb5bc9d51df3925d3dbad49fe0229193e82f008b09a7343c0d1c2cdc9dd35ad8fd7c82e29ba2bd6a7ab6cf882afe78985e9579
DIST mcstrans-3.3.tar.gz 44621 BLAKE2B 624780c219d0b8f369def5ab334caf9d2ae847f9cfb4359ce38e240bcb72b7cfeef45d08cd6e7330cc90394f6c32bd622d2133e675036f98992145b1530ab1e2 SHA512 2157a0361bb5a2bc8e149373b2dd7d9b042f8c4c0aa845ae6967a23d9b875d2dcd6176d99d7f8f15e17eb5877fea60814e19aabfe76950d25b75c9c25df811c2
-DIST mcstrans-3.4-rc1.tar.gz 45128 BLAKE2B 90ef74de6db72005b17254a23673edca30c8441155947b0cd11e5a45b376a58f608eca38fc91184e33dd593551de48010bde1962849ad7d6427d310c4e2609e4 SHA512 7889b6b4a22d2b3b900b28fddfb09d32bcc8d4dfacb3ac75253aa812b35578907272b758c4050d52560cdb751cefca5f4bd46c8c2402b47f8833c63134b8e780
+DIST mcstrans-3.4.tar.gz 45125 BLAKE2B 59a403e7d4018bee2632360d5720e65f26b0581ed58a42e8caee2d352d104658e27ece850ca6c50ea513766a973c6ae98fd4115d478555dd5c130956188c0668 SHA512 bd612f1ae886c7a0300bb4aa1d52f139677787cc026475eada98e11a46910fa4a8baba9026530af6fa649a4f07978039f584e55567b87bbbb89ff06fb182518c
EBUILD mcstrans-3.3.ebuild 988 BLAKE2B d4fe2829c039c8871d19cee9a9d50e26bc8b9961ebc2b8d4a77c950b30d573eec52842e9bdef80c43f9734530be2311d8d76190ffb5439bd5fa39133d0a484ed SHA512 d40639217b41c04f1e43c826b7304ad67b9c375d3ec6f3ba5019e52f36f689a5a97dd370ec73d652d82b8599f932f7cffdef76498f09451fe7e722d95aeb2d5a
-EBUILD mcstrans-3.4_rc1.ebuild 1064 BLAKE2B 8014d2426569f5fa9beb45607b2a85154b66866667ca4c8c793bb928d785e6bd786e125f0af4debc1f97375aac5622a2beef9563d2f6fa00aa553701f8ce58dc SHA512 3f668c23c439999a669bb082253457d8c94f61d8f85800f63b4b352d92d38c871c84dda3ae4f29f1d18c65d052e9e695855ab69cf6a04d3cfc9fb78790293785
+EBUILD mcstrans-3.4.ebuild 1064 BLAKE2B 8014d2426569f5fa9beb45607b2a85154b66866667ca4c8c793bb928d785e6bd786e125f0af4debc1f97375aac5622a2beef9563d2f6fa00aa553701f8ce58dc SHA512 3f668c23c439999a669bb082253457d8c94f61d8f85800f63b4b352d92d38c871c84dda3ae4f29f1d18c65d052e9e695855ab69cf6a04d3cfc9fb78790293785
EBUILD mcstrans-9999.ebuild 1064 BLAKE2B 8014d2426569f5fa9beb45607b2a85154b66866667ca4c8c793bb928d785e6bd786e125f0af4debc1f97375aac5622a2beef9563d2f6fa00aa553701f8ce58dc SHA512 3f668c23c439999a669bb082253457d8c94f61d8f85800f63b4b352d92d38c871c84dda3ae4f29f1d18c65d052e9e695855ab69cf6a04d3cfc9fb78790293785
MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/mcstrans/mcstrans-3.4.ebuild b/sys-apps/mcstrans/mcstrans-3.4.ebuild
new file mode 100644
index 000000000000..75563498db4f
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-3.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+ S="${WORKDIR}/${P}/${PN}"
+else
+ SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+ >=sys-libs/libselinux-${PV}:=
+ dev-libs/libpcre2:=
+ >=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+ tc-export CC
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ rm -rf "${D}/etc/rc.d" || die
+
+ newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild b/sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild
deleted file mode 100644
index 75563498db4f..000000000000
--- a/sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="SELinux context translation to human readable names"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
- S="${WORKDIR}/${P}/${PN}"
-else
- SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=sys-libs/libsepol-${PV}:=
- >=sys-libs/libselinux-${PV}:=
- dev-libs/libpcre2:=
- >=sys-libs/libcap-1.10-r10:="
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
-
- sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
- tc-export CC
- default
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- rm -rf "${D}/etc/rc.d" || die
-
- newinitd "${FILESDIR}/mcstransd.init" mcstransd
-}
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 7bd7421a7744..42b487a852c5 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,4 +1,5 @@
AUX 39_memtest86+-r1 1702 BLAKE2B ba73cef5d026a242ab3e5ac54a98cf289ceedfbe174a9d2109cab785e0b0fc9b9e59aa3c80d276255cc8c18bdc3567f02e644652512e194e3c555436d42be8e3 SHA512 ef2d86bd902f44905921880c630a85d3c9763bea3b79211f64346f1f55a5f31ed0b20a80f9f0c3914de1f33b7bd7d3471762f17065183ced185de52d34f2068f
+AUX 39_memtest86+-r2 3529 BLAKE2B 8af086ab34f99b8307571f1ca4820e8dbcdfe0393d0be1c9b4aa6e44690b03ea23d418aba4cb11f1d099c5b0932942d08857eefa998984bc07dd1985dccbf891 SHA512 0e9c485699a8fcd777b40ae6d366878826608d10b2668bbc6b0b28a91f43a44882bc10c95a2103c573a85a95c1bf6f41e2eb65a3bd2d146d621f987eede2c278
AUX make-memtest86+-boot-floppy 2499 BLAKE2B 1076e5d3e3a139c46c684f7ed29658cd815525e56fae03eb4dd1e36fda0c751a1aa78c891d040aeee979f8b79a8b0db8453e4e26f2efd9963e7bfa10206b5c86 SHA512 28649d630c4624573a5cf4279f6207cf44707978d8a18f2c614997f641038f2da731bb5c3b26066812a5c02d926c40020e74820b1a4eb2b4732a76686c52c260
AUX make-memtest86+-boot-floppy.1 1165 BLAKE2B 974a5c70009031517bbeaa06155a7da411ce1823ed2b7dc31a1843618058cbcd1c1a51f9c9012dddd843579b588c619c6448e65ae369ba2dc6441a991bf8d9b7 SHA512 8b5b6397e50cf4d48aeda31de4c1f72493e97db52ff45966716df8f9b0fbbd8d4ed71e289c0113ef53fa52a7ea6df4c107c63ca70f90c951dd085c05b64db147
AUX memtest86+-5.31b-discard-note_gnu_property.patch 723 BLAKE2B 852a5daf852991cde8dec0bd777524744c5303b1966cacd0e15abad9dfea06ea3d6616ea57777bf694da2edb0e4c8b828288c69d655c0e46e27b6a6463ef787b SHA512 923c71e9d037cc0c26006a55045c9362dabf1ed3a6cf20a5b9f61661d6fe9e6dd17f17bcee47d515497a2720485f5d4d34c0f7815c483997aff123ab9d2f5239
@@ -9,5 +10,7 @@ AUX memtest86+-5.31b-no-clean.patch 570 BLAKE2B 99fcdc691c44b4c116878713e48ec505
AUX memtest86+-5.31b-objcopy.patch 610 BLAKE2B a7a68cefbca249a2db578fa2d1eac2095ebe35f4fba67b6b44b1a85360fdac86a154585b6776ac95ac2963c773ccfcf4e8d828b2c1736bab2741f483626b61a6 SHA512 ad55e5448e70db93a19801cb6dd7cddfd4bf52d9d11582ba00335e59906cb8ee9165b828e59a1ecd1b0ddb2a52aff7165803d69c2ad3984a18ff07f069d36ea1
AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d54daca34ad53a6eee0f7ce2592acfc60a60bf0c8f08adacc82ed67ae8e7ae7faa995d9b6efa0d0ea3cf0df33f5cda1a606a7e0d987 SHA512 98965cfe1ec90f5dee115da406609cd85651e09b9914232b717a3b8755b4c10b05f58ed08c8a470b2bd772f1ef4d93faf63516f902a0b48b9c33974eba4733a1
DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
+DIST memtest86+-6.00_beta2.tar.gz 214840 BLAKE2B 223c3023ba38d584c9ff1923e859ee37f1d943be657c80d4151d0b9ded79b4b363f3e2f7e51d58c7b2b637133ecada0f9a952fcdbbf03d8c34cb00a64762022c SHA512 78b13cc05f470e40e347f6eddb4441c2b377c47ea9aa0252096ef37c884f452bdfce1292452a36aa3ce0cf59c3eb0e53c0e069863b3f165dcd648d9eae9c76ea
EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881
-MISC metadata.xml 551 BLAKE2B 8d899e354f3c3e84526674d2eab5fb81f20a2c585d599cafe7a12dec4aa9bf2b004ce6f54010474b0abd2ec0b347b00937aef25cc162794520554dedc89471ba SHA512 519fa8bbbeda2f082ce1eb5874089a61041d2ae0902c73183fd4e619e14b137c1aca2cb4d81557afad5f9620713ba8ee324d7c7674ac0618e9dab8a5d7abdc0e
+EBUILD memtest86+-6.00_beta2.ebuild 1611 BLAKE2B c0de373f6409919e2fcd15c8f2ebe0bdd17692d88016392173b9ab4a80e9f64ebfaaa5ce19bbb431e8f3635d1de838bd114db466653dfeb16a836c8c0ebca4db SHA512 2e07de7fd39f2f66c3cd337ee151e45fbf4f0b32a343290170727980232c75b212e910870f2d614abcea4ba912e4420d526e2ba90e8a3ed13fceb932fcdc37a3
+MISC metadata.xml 944 BLAKE2B fd7d12b3e27ea5dfa0ebf56502faf2bf43222f9a070fc718c7e983a03afb2cde239f71d5a45947548435005dc72faeff4d8b850f38a64f57f7def5f098896ac6 SHA512 e64965365707ad5c830fb07f4ed2a2c54dcf7703b5b898d24c87ea7c082312ac30277abb77af643c9a7c021c56578de0d8b9b2f12cb01017b68ddf61885a13d4
diff --git a/sys-apps/memtest86+/files/39_memtest86+-r2 b/sys-apps/memtest86+/files/39_memtest86+-r2
new file mode 100644
index 000000000000..a213e0325609
--- /dev/null
+++ b/sys-apps/memtest86+/files/39_memtest86+-r2
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+. /usr/share/grub/grub-mkconfig_lib
+
+mtbios32=/boot/memtest86plus/memtest32.bios
+mtbios64=/boot/memtest86plus/memtest64.bios
+mtefi32=/boot/memtest86plus/memtest.efi32
+mtefi64=/boot/memtest86plus/memtest.efi64
+
+if [ $(ls /boot/memtest86plus | wc -l) -gt 1 ]; then
+ multiple_memtest=true
+fi
+
+submenu_indentation=""
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
+ submenu_indentation="${grub_tab}"
+ cat <<EOF
+submenu 'Memtest86+' {
+EOF
+fi
+
+# Start bios32
+if [ -f "${mtbios32}" ]; then
+ gettext_printf "Found memtest image: %s\n" "${mtbios32}" >&2
+
+ device="$("${grub_probe}" --target=device "${mtbios32}")"
+ path="$(make_system_path_relative_to_its_root "${mtbios32}")"
+ cat <<EOF
+${submenu_indentation}if [ "x\$grub_platform" = xpc ]; then
+${submenu_indentation}menuentry 'Memtest86+ 32bit' {
+EOF
+
+ if [ -n "{submenu_indentation}" ]; then
+ prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
+ else
+ prepare_grub_to_access_device "${device}" | grub_add_tab
+ fi
+
+ cat <<EOF
+ ${submenu_indentation}linux "${path}"
+${submenu_indentation}}
+${submenu_indentation}fi
+EOF
+fi
+# End bios32
+
+# Start bios64
+if [ -f "${mtbios64}" ]; then
+ gettext_printf "Found memtest image: %s\n" "${mtbios64}" >&2
+
+ device="$("${grub_probe}" --target=device "${mtbios64}")"
+ path="$(make_system_path_relative_to_its_root "${mtbios64}")"
+ cat <<EOF
+${submenu_indentation}if [ "x\$grub_platform" = xpc ]; then
+${submenu_indentation}menuentry 'Memtest86+ 64bit' {
+EOF
+
+ if [ -n "{submenu_indentation}" ]; then
+ prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
+ else
+ prepare_grub_to_access_device "${device}" | grub_add_tab
+ fi
+
+ cat <<EOF
+ ${submenu_indentation}linux "${path}"
+${submenu_indentation}}
+${submenu_indentation}fi
+EOF
+fi
+# End bios64
+
+# Start efi32
+if [ -f "${mtefi32}" ]; then
+ gettext_printf "Found memtest image: %s\n" "${mtefi32}" >&2
+
+ device="$("${grub_probe}" --target=device "${mtefi32}")"
+ path="$(make_system_path_relative_to_its_root "${mtefi32}")"
+ cat <<EOF
+${submenu_indentation}if [ "x\$grub_platform" = xefi ]; then
+${submenu_indentation}menuentry 'Memtest86+ 32bit UEFI' {
+EOF
+
+ if [ -n "{submenu_indentation}" ]; then
+ prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
+ else
+ prepare_grub_to_access_device "${device}" | grub_add_tab
+ fi
+
+ cat <<EOF
+ ${submenu_indentation}chainloader "${path}"
+${submenu_indentation}}
+${submenu_indentation}fi
+EOF
+fi
+# End efi32
+
+# Start efi64
+if [ -f "${mtefi64}" ]; then
+ gettext_printf "Found memtest image: %s\n" "${mtefi64}" >&2
+
+ device="$("${grub_probe}" --target=device "${mtefi64}")"
+ path="$(make_system_path_relative_to_its_root "${mtefi64}")"
+ cat <<EOF
+${submenu_indentation}if [ "x\$grub_platform" = xefi ]; then
+${submenu_indentation}menuentry 'Memtest86+ 64bit UEFI' {
+EOF
+
+ if [ -n "{submenu_indentation}" ]; then
+ prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
+ else
+ prepare_grub_to_access_device "${device}" | grub_add_tab
+ fi
+
+ cat <<EOF
+ ${submenu_indentation}chainloader "${path}"
+${submenu_indentation}}
+${submenu_indentation}fi
+EOF
+fi
+#End efi64
+
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
+ cat <<EOF
+}
+EOF
+fi
diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
new file mode 100644
index 000000000000..2107fd4d4b8f
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+ dev-libs/libisoburn
+ sys-fs/dosfstools
+ sys-fs/mtools
+"
+BDEPEND="
+ iso32? ( ${ISODEPS} )
+ iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+ sed -i -e "s#/sbin/mkdosfs#mkfs.vfat#" build{32,64}/Makefile || die
+ sed -i -e "s/^AS = as/AS +=/" -e "/^CC/d" build{32,64}/Makefile || die
+ default
+}
+
+src_compile() {
+ pushd build32
+ use bios32 && emake memtest.bin
+ use efi32 && emake memtest.efi
+ use iso32 && emake iso
+ popd
+
+ pushd build64
+ use bios64 && emake memtest.bin
+ use efi64 && emake memtest.efi
+ use iso32 && emake iso
+ popd
+}
+
+install_memtest_images() {
+ use bios32 && newins build32/memtest.bin memtest32.bios
+ use bios64 && newins build64/memtest.bin memtest64.bios
+ use efi32 && newins build32/memtest.efi memtest.efi32
+ use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+ default
+ if use boot; then
+ exeinto /etc/grub.d/
+ newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+ insinto /boot/memtest86plus
+ install_memtest_images
+ fi
+
+ insinto /usr/share/${PN}
+ install_memtest_images
+ use iso32 && newins build32/memtest.iso memtest32.iso
+ use iso64 && newins build64/memtest.iso memtest64.iso
+}
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 359afa21d566..dd0c79050ba4 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -6,9 +6,15 @@
<name>Ben Kohler</name>
</maintainer>
<use>
+ <flag name="bios32">Compile a BIOS-bootable 32bit memtest image</flag>
+ <flag name="bios64">Compile a BIOS-bootable 64bit memtest image</flag>
<flag name="boot">Also install to /boot instead of just /usr/share/memtest86+/</flag>
+ <flag name="efi32">Compile a EFI32-bootable 32bit memtest image</flag>
+ <flag name="efi64">Compile a UEFI-bootable 64bit memtest image</flag>
<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
<flag name="iso">Compile an ISO image</flag>
+ <flag name="iso32">Compile a 32bit ISO image</flag>
+ <flag name="iso64">Compile a 64bit ISO image</flag>
<flag name="serial">Compile with serial console support</flag>
</use>
</pkgmetadata>
diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest
index 213cfe26a682..b6618aa26139 100644
--- a/sys-apps/minijail/Manifest
+++ b/sys-apps/minijail/Manifest
@@ -1,6 +1,5 @@
AUX minijail-12-makefile.patch 1511 BLAKE2B 74b620f44ffa3a3f82771d10dfff5999f223613ee734a38be770ac91e128c3e4f26cbbdff197a0636cb8c3b094c70fbed08443560bea095407736327f9d485ac SHA512 c727ff4752345f08d89dab5bc7489793763bf459bc169f132a285bc40c1d8e1e40d366bc8336e35c5362f4e4b999ec9d07db2b3bcd5f394954dae54cb533515a
-DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2
+AUX minijail-17-no-werror.patch 594 BLAKE2B 7afa3b6179ce975d8dac6496532222057db0f27c134b0fa6f783f1f18e7166d310ccfbaa387482fb27f91e7f9cf5b478267e6a4db2ced380efbcd77bfa1b7b6e SHA512 27f7e2c4ca046e86c81ec419fe745bc25547ff5217340af772b331448c19cbcb228835c3ddd1d2879e3b13bf59f85724dcf3cc455c22e0fd27ac81a28efd135d
DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf
-EBUILD minijail-12.ebuild 1804 BLAKE2B 7065e7c2dc8bdec18ab687e8b2cbc5ca8ca14adfbba4c1ebf2064d9da0f274823d35e1b79e30975824363373a59affdb795585376019ebd362562d5b59350f8a SHA512 bd180ef8ddfd13e061cac2e8cebf0f200817fd0f9b7894fa7e082461e910a773f670634ad4b889fe406a1dfdccb1f33ef7cdcb1bad5f81f149459eb127df8da6
-EBUILD minijail-17.ebuild 1804 BLAKE2B 7065e7c2dc8bdec18ab687e8b2cbc5ca8ca14adfbba4c1ebf2064d9da0f274823d35e1b79e30975824363373a59affdb795585376019ebd362562d5b59350f8a SHA512 bd180ef8ddfd13e061cac2e8cebf0f200817fd0f9b7894fa7e082461e910a773f670634ad4b889fe406a1dfdccb1f33ef7cdcb1bad5f81f149459eb127df8da6
+EBUILD minijail-17.ebuild 1847 BLAKE2B 4a29b4c111a215a627fca5349a3b00271e71985113dd4e820b48f27a230a886b440bc01101ff07de6b7ceab02c1381afaabe22adea07bba6f027b284679df606 SHA512 2a437e1cb4a841ee7898516f12ed688c7130ae0d8dd54617a8aeddfc185c83465910c6308eeaa50a26b53624f2e8cc43e7bfd04b5facf488282cd2840b7c5bfe
MISC metadata.xml 316 BLAKE2B 1c0d0d8d3d56290e6c416abd016b8e9884d281b4c8700d5e229bbd820946c9b962c148f4d838b3206f091c9340d93febf69c8dab0af58101c5c5128fceea888e SHA512 f31d33694241be5dc691ca273d0712a062b84eaccb44adc3a50a1085a451543ff1c2d20960444474c2d32121a52c2b15c2510c802a59983534c6176906fbaaee
diff --git a/sys-apps/minijail/files/minijail-17-no-werror.patch b/sys-apps/minijail/files/minijail-17-no-werror.patch
new file mode 100644
index 000000000000..01d655f2bd55
--- /dev/null
+++ b/sys-apps/minijail/files/minijail-17-no-werror.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/770940
+https://bugs.gentoo.org/732014
+--- a/common.mk
++++ b/common.mk
+@@ -319,7 +319,7 @@ endif
+ # The same goes for CFLAGS.
+ COMMON_CFLAGS-gcc := -fvisibility=internal -ggdb3 -Wa,--noexecstack
+ COMMON_CFLAGS-clang := -fvisibility=hidden -ggdb
+-COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Werror -Wformat=2 \
++COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Wformat=2 \
+ -fno-strict-aliasing $(SSP_CFLAGS) -O1
+ CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER)) -std=gnu++14
+ CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER)) -std=gnu11
diff --git a/sys-apps/minijail/minijail-12.ebuild b/sys-apps/minijail/minijail-12.ebuild
deleted file mode 100644
index 9f0c093fd994..000000000000
--- a/sys-apps/minijail/minijail-12.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="helper binary and library for sandboxing & restricting privs of service"
-HOMEPAGE="https://android.googlesource.com/platform/external/minijail"
-
-# Use GitHub mirror as Gitiles doesn't generate stable tarballs.
-SRC_URI="https://github.com/google/${PN}/archive/linux-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+seccomp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/libcap-ng:="
-DEPEND="${RDEPEND}
- test? (
- virtual/pkgconfig
- >=dev-cpp/gtest-1.8.0:=
- )"
-
-S="${WORKDIR}/${PN}-linux-v${PV}"
-
-PATCHES=(
- "${FILESDIR}/minijail-12-makefile.patch"
-)
-
-pkg_pretend() {
- local CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS
- ~SECCOMP ~SECCOMP_FILTER ~CGROUPS"
- check_extra_config
-}
-
-src_configure() {
- export LIBDIR="/usr/$(get_libdir)"
- export USE_seccomp="$(usex seccomp)"
- export USE_SYSTEM_GTEST=yes
- if use test; then
- export GTEST_CXXFLAGS="$($(tc-getPKG_CONFIG) --cflags gtest_main)"
- export GTEST_LIBS="$($(tc-getPKG_CONFIG) --libs gtest_main)"
- else
- export GTEST_CXXFLAGS='' GTEST_LIBS=''
- fi
- export VERBOSE=1
-}
-
-src_compile() {
- tc-env_build emake all parse_seccomp_policy
-}
-
-src_test() {
- GTEST_FILTER="-NamespaceTest.test_tmpfs_userns:NamespaceTest.test_namespaces" \
- tc-env_build emake tests
-}
-
-src_install() {
- dosbin minijail0
- dolib.so libminijail{,preload}.so
- dobin parse_seccomp_policy
-
- doman minijail0.[15]
- dodoc README.md
-
- local include_dir="/usr/include"
-
- "${S}"/platform2_preinstall.sh "${PV}" "${include_dir}"
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins libminijail.pc
-
- insinto "${include_dir}"
- doins libminijail.h scoped_minijail.h
-}
diff --git a/sys-apps/minijail/minijail-17.ebuild b/sys-apps/minijail/minijail-17.ebuild
index 9f0c093fd994..f9192fecbd38 100644
--- a/sys-apps/minijail/minijail-17.ebuild
+++ b/sys-apps/minijail/minijail-17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -28,6 +28,7 @@ S="${WORKDIR}/${PN}-linux-v${PV}"
PATCHES=(
"${FILESDIR}/minijail-12-makefile.patch"
+ "${FILESDIR}/minijail-17-no-werror.patch"
)
pkg_pretend() {
diff --git a/sys-apps/minised/Manifest b/sys-apps/minised/Manifest
index 55793707a70c..2d13fdd27b11 100644
--- a/sys-apps/minised/Manifest
+++ b/sys-apps/minised/Manifest
@@ -1,3 +1,5 @@
DIST minised-1.15.tar.gz 32224 BLAKE2B 9dac7557fc697aac8f42daf09bf68ac87a79cb7cbcbe6c3372d9d229a3010b86399658df00c04f039c64f75749d7e905a196e1e7532c3f0e3ae42edce385fb08 SHA512 82ebe5c70f24adebd5f1c37422bac543c06684bff40d1d1fab473abc248d4c5f93e7a4969204877170fed1f2616f6fb666bd485183115cc996ba691c7bb88a71
+DIST minised-1.16.tar.gz 31067 BLAKE2B eb37d147434fe06b3c1741d544a6e3088f265e17779e156317a9eaaac99d77276c93e2c60b49a92423378509f7588c50a1421d3d74e0086fb1fbc3bf5079da09 SHA512 9d81ba58f5460e341d9de7c4b2af38c7bf39ae40fdcfac1652e7ad64bd903d58222128880daeb30ef5c1726a244d815ab9c7b22b9cb92c7aeaaa7728f29c4116
EBUILD minised-1.15.ebuild 405 BLAKE2B 679782eb53de550e7b54b78c098e97d897e37631682c6baeb80f561303d7442730b9caf8aae66cdeb7e31aae759a9c981e30fee070e0397c30b34d4994a22c00 SHA512 a237dfcbe39ff7f7ad5690fb92e2daf200adbff29379f30069750749e31762845e11f76caae2a883b93208296bf5751585f9c7aebbc90f01790f5c58da84ba99
+EBUILD minised-1.16.ebuild 402 BLAKE2B 31bda144a6c4d808271cd626a532818434178847f9a4610f819659e281335a3e899e225c8fc14cac1a47fc81d9b06c48a57dde4f50f4aa871a9347b1c9891d90 SHA512 f5b5f295967e31b894f7408cc4ab3483e38bd248403a874360d2da78019c2c1360178d8a273050c78f77a71aa8bc469f69be26a81b56652a1a97b9cca20d5c04
MISC metadata.xml 362 BLAKE2B c4ebe1d9e4f16ca0e52a21fcf18d74d64320fbb05df6274d922da1be585600d805c774a546dbd40fcbb7f3090573dd9661e9cfefe61a455ade10697e2f1377c8 SHA512 a4e14a9d55025f9d23796fece229cf4e33bc8c7469ae55438a23a1ce3901612ed4be33673587e65bc39c2e5995a6f773fb4a461c0b2e8d87e45b23bb733c782f
diff --git a/sys-apps/minised/minised-1.16.ebuild b/sys-apps/minised/minised-1.16.ebuild
new file mode 100644
index 000000000000..bb8676b03d2e
--- /dev/null
+++ b/sys-apps/minised/minised-1.16.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="a smaller, cheaper and faster sed implementation"
+HOMEPAGE="http://www.exactcode.de/oss/minised/"
+SRC_URI="http://dl.exactcode.de/oss/minised/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_prepare() {
+ default
+ tc-export CC
+}
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index 51bd81adc638..5c1df7caf351 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,5 +1,4 @@
DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
-EBUILD miscfiles-1.5-r3.ebuild 1700 BLAKE2B 366872b7f95d837bfe179e40b2c0562bfd756e12619fd695c1427c965f1f59c5aab4e418578122b8e733b7fed373e993070d174489c5fe24215fb7a62a389941 SHA512 78ab9a62e854e0f2801119c309d25443d057577c6e406f03c06000461ed2131d7e1388b6065cd9524ac1c783f5ae51aca0d18e35f481459b0e2deec93df5397e
-EBUILD miscfiles-1.5-r4.ebuild 1696 BLAKE2B 2117860031f78221ac13387d7f8811e453f49031494843db32f050c67076baccd6291d1ee3e6cfef05f2bf968e64c368d1f603c24e571402dab637b940defa53 SHA512 790435250bc83480e71a35a9fc4bbb5cfbe044c46b30d030017e1f31e45a65bd4240c26e31cc3fea9deeb25f699b8827856707fc1a144b1c587ebbf37a74310c
+EBUILD miscfiles-1.5-r4.ebuild 1688 BLAKE2B a2abd4623e93f4cbfc6ce76e3e2df2b98356e78ead627c610d74a79b24012d69a85074e0d505b29144d650cc31e71e5f1b3c6db1f3fded5796ddf2654afcd3ae SHA512 9dbebce0f2aaf98f3a1966f5ac3bc52a004692a8baca60b3f85293e0aaa96f39e348107aaacdf6b251eb5fd5bc150cc68eafc1602e9fc533fab0d3229646e72e
MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
deleted file mode 100644
index 8237ad438342..000000000000
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-UNI_PV="10.0.0"
-DESCRIPTION="Miscellaneous files"
-HOMEPAGE="https://savannah.gnu.org/projects/miscfiles/"
-# https://www.unicode.org/Public/${UNI_PV}/ucd/UnicodeData.txt
-SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
- https://dev.gentoo.org/~whissi/dist/${PN}/UnicodeData-${UNI_PV}.txt.xz"
-
-LICENSE="GPL-2 unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="minimal"
-
-src_prepare() {
- default
-
- mv "${WORKDIR}"/UnicodeData-${UNI_PV}.txt unicode || die
-}
-
-src_configure() {
- econf --datadir="${EPREFIX}"/usr/share/misc
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc NEWS ORIGIN README dict-README
-
- # not sure if this is still needed ...
- dodir /usr/share/dict
- cd "${ED%/}"/usr/share/misc || die
- mv $(awk '$1=="dictfiles"{$1="";$2="";print}' "${S}"/Makefile) ../dict/ || die
- cd ../dict || die
- ln -s web2 words || die
- ln -s web2a extra.words || die
-
- if use minimal ; then
- pushd "${ED%/}"/usr/share/dict || die
- rm -f words extra.words || die
- gzip -9 * || die
- ln -s web2.gz words || die
- ln -s web2a.gz extra.words || die
- ln -s connectives{.gz,} || die
- ln -s propernames{.gz,} || die
- popd || die
- rm -r "${ED%/}"/usr/share/misc || die
- fi
-}
-
-pkg_postinst() {
- if [[ ${ROOT} == "/" ]] && type -P create-cracklib-dict >/dev/null ; then
- ebegin "Regenerating cracklib dictionary"
- create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null
- eend $?
- fi
-
- # pkg_postinst isn't supposed to fail
- return 0
-}
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild
index 7ecdbacf6c43..ef089045102c 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
LICENSE="GPL-2 unicode"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="minimal"
src_prepare() {
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index c95809939534..6fad7f58fa20 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -5,5 +5,5 @@ AUX netplug-1.2.9.2-multi-waitpid-sigchld.patch 1865 BLAKE2B c70d7fbf21c27bdaf70
AUX netplug-2 715 BLAKE2B df2ffc7a904a86bedb5c160ad0ba8a2d49a8125ed3042f85a361a6270ab79668cdb4dd693e022908b2637a4522f8038f22c0c03b19909d1cdaca2e7da0da21ae SHA512 11efb8b8916d40615840c5721aba089dc9f81bf30f2af6f47d6df2fd8f2b6f22e0cd59ebd37fd9875c4af31e064128e93acbef5cf859b3cabb553fbdd2f3c9ee
DIST netplug-1.2.9.2.tar.bz2 22332 BLAKE2B 3a4232178e782417e30da3dc33361c4043d5ff9bb610c2f9a82281d395af470ddeab9cf12f91ef4a18f4fe6ff49f85b7015fecc7018b1b561e2e7f179d8d206b SHA512 b68a00eb8874ec7dd6aa9f7b7f529a6e1d9ecece4b798c8cee996b7f3534c556656f642de0ac4b2a6d06fbaf18e3bfaab00934a9292b95939a4935e673e9ca8c
EBUILD netplug-1.2.9.2-r2.ebuild 1367 BLAKE2B 623141474c25647e63dbb7353f4e98c8a46046ce0f3731d7561d2020d09f23ea5de1007e437b3395feb13582b7f39921bd1df2c311eed51c1eccff4dbdbc71d1 SHA512 fe7bb9d19ae3e4f649b50ecda9a7669a7e130c4b4136037441760098c77de5df485ea7f3173659f3d722c7b8a5904862d2ba48f13c135be930bdd45af3ae887b
-EBUILD netplug-1.2.9.2-r3.ebuild 1496 BLAKE2B 6c23c00a9bb252de1d3dfef271d92abf2ea5abdba0c794a4ba6900b903ef6088d709ac4019c7e879ce7b3cb3ceee722c539b1621312e89c0e3bc898e0b17e610 SHA512 7c4a4af168034ba05e83e318b6dbf6111efe5f964627dceb75eb1cd69100d69c6e5fd32577912d1d740b644ec1e9245b9369b84991b9b59c5b1f2ec850152ea5
-MISC metadata.xml 252 BLAKE2B 5dd8d0c83d6c9c396753f4e6674725483e0c7a005b4c529d3bd1fba5de36cee7f2b33e53aec48aa75f35ec663173677c2c964fb73f7f954b20631cc9c59533ca SHA512 afee4a606f4b70f265eb14178037c0459e32ddd98378c6c2978b829e906f83dc3607385173bd8f84ad988d307f8e44e1320310c92c070c802a4ccba93a96ae18
+EBUILD netplug-1.2.9.2-r3.ebuild 1503 BLAKE2B 0d9ded186b560a29eefef5aba8cf9758c7d4d21c97643d152cc3cf57e42816fe29f4552ab24022035ef20c172175b61815577fcef1b24b6e524288189df169e6 SHA512 5cacca0956912c49efe534cde9c9afdab72c21f351dc0e9a80a592b5c0009293b2bd157ff5f7b91d39aae6b88e225966dce326108bce3542712d0daabfc8f438
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-apps/netplug/metadata.xml b/sys-apps/netplug/metadata.xml
index 99e2666c588b..115e9d64a669 100644
--- a/sys-apps/netplug/metadata.xml
+++ b/sys-apps/netplug/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
index 6f9af1c75154..e226a88eeb91 100644
--- a/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
+++ b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="debug doc"
DEPEND="doc? ( app-text/ghostscript-gpl
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 08c15fbd444f..1ccff9723ff2 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,6 +1,10 @@
+AUX nvme-cli-1.16-bash-completions.patch 2223 BLAKE2B 072ce4f65ab4177a1a2f4aece0103c00a596503b7a8100cbc545750d6f7b63c12f014101f2441e0bb58a0364b6215e9fdf02bebb5191ba2e26121e896f2c2d95 SHA512 ff18cded88a78fd07f6a11f06635699a76c0efa6cfce217f7d02581a8fd60e7e2c1b248efec45fd28a962b4cff6534404d466252659a9e77e609174d07b0c2e8
AUX nvme-cli-1.16-musl-limits.patch 1148 BLAKE2B ee1206a23ee11d6badaed70a98cd2ea405d3ad144def7d00e44a49b2f2579fc61efbaa3325856e426be097e52b02e4b18c4122ab74c1f20d58ced1c1748419c0 SHA512 e7c8c387446360eb2ed816006fe7d9a7f6a1b9c81dd6d3171f909ae760236243278a4b42be727b39381f95c9b50dce09f816400a280da929da8453b6c9851004
+AUX nvme-cli-2.0-bash-completions.patch 1803 BLAKE2B fd201e60a66b1fbc61f13c002465b002b60de94acf0c604af359064e2d4d2f3ed1c02d8f2f48b7af8812405a4990fe23b20fff39b28a69770d21174af5ff9741 SHA512 6baef0aff380fe8b0f0b21ba450e81703c6a3c88959c635d9425f010ffe0845d5b47c02e63df0b190899238dc911c108eda793f7823e4dba2a793782e2aa47d6
DIST nvme-cli-1.16.tar.gz 598246 BLAKE2B 8aef6ae82ec9a2c67de6c69addd72c87ade6554e6d374c717f8e3c0585565974a2b2870eb172b3ebdc1ae307bd3a55a14a17d3feea8d437265db136b434b519f SHA512 c713eb15b979ad17791cf95717b42d5f638cb4803d646bca1f4825e6bb50f086226b44b108b61571709b2cb615ae6ba86dbad309f675b240ebd3968d1cf536ff
DIST nvme-cli-2.0.tar.gz 646320 BLAKE2B 81a8161091071be4e98d4feb78b3f3edaed07262212a8950c1882e3b46f38cd82d8cd8bfec62b3971feda6e82d297338e5541c8eda33c8b6f714d3b3ce000c25 SHA512 24a00ee8e0fc963c1757797413ff5725cec18f821a714d6bbbf37906010d72934d6fdd7b466c085f13716a5279d1a7bd3254ee474e37a0ecd00a85ef23e12417
+EBUILD nvme-cli-1.16-r1.ebuild 1394 BLAKE2B bd2e45a72c07efd6e48b5872f43353817550ac4e7c4c31efc9b1b6f4e5736ac4298b2505c9d55537ecf701933bb470368a44df0587fa0a59d51a562f56273148 SHA512 63d4ef1730a6cb1fee4a331a8df795637935fc00d994f09a1d9d060d18726081ea7a2098c33187a23c4b81cec0742967fcb7ae9e1b9a107579f09a4d6ac765aa
EBUILD nvme-cli-1.16.ebuild 1330 BLAKE2B dca5bcee7da2e65799bed14ba6eec3484b19d025061f1068d343891f2e76aa2c000c017b03bc977be76f51d9b0d38180ba7e44e6d7ce27eeed338a2b1741ba07 SHA512 44c68fa403731bd0d8f54f361e6d7b84cbb7f9222f7070ef174354c29e0314fa1007f0c1caba48e30afb607e5a6c56f355eb2d02b80079f62a8c2defc073b55f
-EBUILD nvme-cli-2.0.ebuild 830 BLAKE2B 28e4292e92d7863ea0a56936497cf55428c3fc83efa8a9bf7fa6223c09ab46ae917b56c0cf073ee3e655d766a481dd0e63d8244a65787bf53b4935e6d56df2d6 SHA512 87536e85ae720b018679ec0798d1cdd5edd6bad105d8e5a3098efd230dd4a038aee6e4e09edf751c389af6ac0cff0e5c099abe730888f16cea2627a0265ec9a0
+EBUILD nvme-cli-2.0-r1.ebuild 914 BLAKE2B f3eab8dd6ebbda164595f6db4862d189d38a307e4cb1980d253fad3819b8bfd29f667cf800d6ca59c92389855aaf2faf41800a0a305ec3dc906869520883a590 SHA512 f32c72f6498994ce0a9ac303e2d7de5ed29717bd6c3fe812887df9d6411550c3050efea116f1bba15fadd978525b3190d3dbdf43fed4f62052f5b6fcff9974e9
+EBUILD nvme-cli-2.0.ebuild 837 BLAKE2B b701df8a1a9c88145c6c3aeb7aa338dd1235cd03e70320425cfabb0208009b87987e9f8ce73bf0c99e116a44817db0c078b0d0691482d7273dc1b0c075c0be68 SHA512 e5d801a01776c6eef50b260836e4b0fcb4bf73f0df579bc678c92b23a2213dd80b4793e71d28c2e31ff6a63929609d165aea7a0bb07b8946c1610205deb948e6
MISC metadata.xml 594 BLAKE2B 52ac0579fd52797d0c9b2ec0528b134f67ef927987f9b99cf72d1010f13088af42d5eddb761b53939b196bc96ef4b8589b1bfc02242c95a56bf6a6a40afbad91 SHA512 d971b4fd68f8574b4e93377e9c4eef1f5901e81099ae97003ccfafbbd1657db92ce8a975cae38e6516cc4652b54259013c0c5e3ba53e80d717e42dab71440464
diff --git a/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch b/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch
new file mode 100644
index 000000000000..27a80eda9955
--- /dev/null
+++ b/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch
@@ -0,0 +1,72 @@
+This fixes several issues:
+* the upstream rebase error (unclosed double quote)
+* typo "lugin_seagate_opts"
+* "readonly" with assignment is problematic on Bash 5.1.x
+
+Gentoo bug: https://bugs.gentoo.org/852764
+Upstream: https://github.com/linux-nvme/nvme-cli/pull/1574
+Upstream: https://github.com/linux-nvme/nvme-cli/commit/25fd8c707b106ca0763402566ad657ef710bf09e
+
+Author: Karlson2k (Evgeny Grin)
+Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru>
+
+diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
+index 41938d77..31afb3b3 100644
+--- a/completions/bash-nvme-completion.sh
++++ b/completions/bash-nvme-completion.sh
+@@ -3,12 +3,13 @@
+ # Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015
+
+ # Constant to indicate command has no options
+-readonly NO_OPTS=""
++NO_OPTS=""
++readonly NO_OPTS
+
+ # Associative array of plugins and associated subcommands
+ # Order here is same as PLUGIN_OBJS in Makefile
+ typeset -A _plugin_subcmds
+-readonly _plugin_subcmds=(
++_plugin_subcmds=(
+ [intel]="id-ctrl internal-log lat-stats \
+ set-bucket-thresholds lat-stats-tracking \
+ market-name smart-log-add temp-stats"
+@@ -55,10 +56,11 @@ readonly _plugin_subcmds=(
+ [nvidia]="id-ctrl"
+ [ymtc]="smart-log-add"
+ )
++readonly _plugin_subcmds
+
+ # Associative array mapping plugins to coresponding option completions
+ typeset -A _plugin_funcs
+-readonly _plugin_funcs=(
++_plugin_funcs=(
+ [intel]="plugin_intel_opts"
+ [amzn]="plugin_amzn_opts"
+ [lnvm]="plugin_lnvm_opts"
+@@ -77,6 +79,7 @@ readonly _plugin_funcs=(
+ [nvidia]="plugin_nvidia_opts"
+ [ymtc]="plugin_ymtc_opts"
+ )
++readonly _plugin_funcs
+
+ # Top level commands
+ _cmds="list list-subsys id-ctrl id-ns \
+@@ -101,8 +104,7 @@ _cmds="list list-subsys id-ctrl id-ns \
+ connect disconnect disconnect-all gen-hostnqn \
+ show-hostnqn dir-receive dir-send virt-mgmt \
+ rpmb boot-part-log fid-support-effects-log \
+- supported-log-pages lockdown"
+- supported-log-pages list-endgrp"
++ supported-log-pages lockdown list-endgrp"
+
+ # Add plugins:
+ for plugin in "${!_plugin_subcmds[@]}"; do
+@@ -983,7 +985,7 @@ plugin_micron_opts () {
+ return 0
+ }
+
+-lugin_seagate_opts () {
++plugin_seagate_opts () {
+ local opts=""
+ local compargs=""
+
diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch b/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch
new file mode 100644
index 000000000000..3ddad04a5518
--- /dev/null
+++ b/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch
@@ -0,0 +1,61 @@
+This fixes several issues:
+* typo "lugin_seagate_opts"
+* "readonly" with assignment resulting in error on Bash 5.x
+
+Gentoo bug: https://bugs.gentoo.org/852764
+Upstream: https://github.com/linux-nvme/nvme-cli/pull/1574
+Upstream: https://github.com/linux-nvme/nvme-cli/commit/25fd8c707b106ca0763402566ad657ef710bf09e
+
+Author: Karlson2k (Evgeny Grin)
+Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru>
+
+diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
+index 5e0eb23b..469ba3e2 100644
+--- a/completions/bash-nvme-completion.sh
++++ b/completions/bash-nvme-completion.sh
+@@ -3,12 +3,13 @@
+ # Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015
+
+ # Constant to indicate command has no options
+-readonly NO_OPTS=""
++NO_OPTS=""
++readonly NO_OPTS
+
+ # Associative array of plugins and associated subcommands
+ # Order here is same as PLUGIN_OBJS in Makefile
+ typeset -A _plugin_subcmds
+-readonly _plugin_subcmds=(
++_plugin_subcmds=(
+ [intel]="id-ctrl internal-log lat-stats \
+ set-bucket-thresholds lat-stats-tracking \
+ market-name smart-log-add temp-stats"
+@@ -53,10 +54,11 @@ readonly _plugin_subcmds=(
+ [nvidia]="id-ctrl"
+ [ymtc]="smart-log-add"
+ )
++readonly _plugin_subcmds
+
+ # Associative array mapping plugins to coresponding option completions
+ typeset -A _plugin_funcs
+-readonly _plugin_funcs=(
++_plugin_funcs=(
+ [intel]="plugin_intel_opts"
+ [amzn]="plugin_amzn_opts"
+ [memblaze]="plugin_memblaze_opts"
+@@ -74,6 +76,7 @@ readonly _plugin_funcs=(
+ [nvidia]="plugin_nvidia_opts"
+ [ymtc]="plugin_ymtc_opts"
+ )
++readonly _plugin_funcs
+
+ # Top level commands
+ _cmds="list list-subsys id-ctrl id-ns \
+@@ -939,7 +942,7 @@ plugin_micron_opts () {
+ return 0
+ }
+
+-lugin_seagate_opts () {
++plugin_seagate_opts () {
+ local opts=""
+ local compargs=""
+
diff --git a/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild
new file mode 100644
index 000000000000..d1507396d8fd
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs udev
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
+IUSE="hugepages +json systemd +uuid"
+
+RDEPEND="json? ( dev-libs/json-c:= )
+ hugepages? ( sys-libs/libhugetlbfs )
+ systemd? ( sys-apps/systemd:= )
+ uuid? ( sys-apps/util-linux:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-musl-limits.patch
+ "${FILESDIR}"/${P}-bash-completions.patch # Gentoo bug #852764
+)
+
+src_prepare() {
+ default
+
+ sed -e 's|^LIBUUID =|LIBUUID ?=|' \
+ -e 's|^LIBJSONC =|LIBJSONC ?=|' \
+ -e 's|^LIBHUGETLBFS =|LIBHUGETLBFS ?=|' \
+ -e 's|^HAVE_SYSTEMD =|HAVE_SYSTEMD ?=|' \
+ -e '/DESTDIROLD/d' \
+ -i Makefile || die
+}
+
+src_configure() {
+ tc-export CC
+
+ export PREFIX="${EPREFIX}/usr"
+
+ local unitdir="$(systemd_get_systemunitdir)"
+ export SYSTEMDDIR="${unitdir%/system}"
+ export UDEVDIR="${EPREFIX}$(get_udevdir)"
+
+ MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
+ MAKEOPTS+=" LIBJSONC=$(usex json 0 1)"
+ MAKEOPTS+=" LIBHUGETLBFS=$(usex hugepages 0 1)"
+ MAKEOPTS+=" HAVE_SYSTEMD=$(usex systemd 0 1)"
+ MAKEOPTS+=" V=1"
+}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
new file mode 100644
index 000000000000..bc3e02e3f368
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd udev
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="hugepages +json +uuid"
+
+RDEPEND="
+ sys-libs/libnvme:=[json=,uuid=]
+ hugepages? ( sys-libs/libhugetlbfs:= )
+ json? ( dev-libs/json-c:= )
+ uuid? ( sys-apps/util-linux:= )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-bash-completions.patch # Gentoo bug #852764
+)
+
+src_configure() {
+ local unitdir="$(systemd_get_systemunitdir)"
+ local emesonargs=(
+ -Dsystemddir=${unitdir%/system}
+ -Dudevrulesdir=${EPREFIX}$(get_udevdir)
+ )
+ meson_src_configure
+}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.0.ebuild b/sys-apps/nvme-cli/nvme-cli-2.0.ebuild
index cc8d7246bc18..2805c11288da 100644
--- a/sys-apps/nvme-cli/nvme-cli-2.0.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-2.0.ebuild
@@ -12,7 +12,7 @@ RESTRICT="test"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="hugepages +json +uuid"
RDEPEND="
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index 9488c70403ae..b0bcddada018 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,3 +1,5 @@
DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
+DIST onerng-3.7.tar.gz 133016 BLAKE2B 8bae3f51baf3526e68070856d216de9e99064e8a728942fd4b926495ae34f3021ae3c99c8b5e4ea73dacdf8fa870cba67e1d3e94f5a3f0acddef0e48c02111e4 SHA512 6150787fc8415c7aaa13d6e98c3dc72e9160308eb912d97b7c9f59c6d4f5a9612917a7ff34084ba52a80e0aac6c65dd29653dd3bd211bd261fb89273f02be830
EBUILD onerng-3.6-r4.ebuild 819 BLAKE2B 0b179249b742d0f7a5fd2ad6c03e64ccfd7f1e9d462e198ac74c398bead9f2a15d12e2476ab3ad66d0f1722bc7d1a6da9097e09d126012759cbb2c4ce4574c2f SHA512 a41aea45ad0d06e27824d11dda561f192dfb414a9a5cbcce0b7321fbc2705a07cc3ab16056e6ef415a8c6b3fcda6a605daea0c8c5b8853b69602308f8bde1ce2
+EBUILD onerng-3.7.ebuild 820 BLAKE2B f1a5eb2418eacb46cc7c50fb1333cb33b8d91cad124c58ba7ed260e8398e80f50b780edcc07badc503ae2455955567c9998421a569104bd8366ea37b47a6a1f1 SHA512 84bda6856ead877120bb154fc009b40ca89c051fd9e5ec6a4821ad9971d34a2af93fed3134e1910524a449c0802ea4044cf422f9e56af507de686321e6437e26
MISC metadata.xml 716 BLAKE2B a50a27c236e78467723dbc900d4b6dec63ecaa25ac3e8a3fd1ac0a0b201dd38b14f264d6c392bdc6640cc5844d58be5130bd8c26eecf1dbc28173354c6dbe3dd SHA512 f2daa15f0e04c0ed6897d10edcbac8b205ad274b1df44beaf55d4681eede00b41cbf69e21707a61b056ff938a8c3537a0696448843a160ebf0fad302712e7bdb
diff --git a/sys-apps/onerng/onerng-3.7.ebuild b/sys-apps/onerng/onerng-3.7.ebuild
new file mode 100644
index 000000000000..e8aa548f36d0
--- /dev/null
+++ b/sys-apps/onerng/onerng-3.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${P/-/_}"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-single-r1 udev
+
+DESCRIPTION="Software for the Open Hardware Random Number Generator called OneRNG"
+HOMEPAGE="https://www.onerng.info/"
+SRC_URI="https://github.com/OneRNG/onerng.github.io/raw/master/sw/${MY_P}.orig.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="virtual/udev"
+
+RDEPEND="
+ ${DEPEND}
+ ${PYTHON_DEPS}
+ app-crypt/gnupg
+ $(python_gen_cond_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]')
+ sys-apps/rng-tools
+ sys-process/at
+"
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index bb6616d96131..70d0bc8eb074 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,6 +1,8 @@
AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
DIST openrc-0.44.10.tar.gz 254298 BLAKE2B 3cfecc27b560b8bb60d2104ab3dcf176b98677b65b829fa403ad2eb0e2e8bb0d586d374c336328a07c2f35e3abcb3f897cf5df142540a60fc09883aabd0ac79d SHA512 0e41f5268c6b8c325a6773511ca58c38ba52a1987aa47165794df8a99359bd1bfcb99d30e0d129b9242a2661663234f6f85c92c55c891dbb6c5b8a11d93edea4
-EBUILD openrc-0.44.10.ebuild 4394 BLAKE2B 41dc3568e4050567dd31ac036df3c74a860746cc144ed7a7b5c5ec0c482c5a9805c269c40888f9c77d7cade7c909b67f487b14d9acc2f49994f428873ef722ef SHA512 dd9166adae7920717861502d44bf0ae560d2ed1678f20d7d0b58e6272de890e3966ce8cadea9f583ad0df623001e3ef15d3a48e084b76f0f9704a4ff4be67f17
-EBUILD openrc-9999.ebuild 4396 BLAKE2B 78a8697930e9ec5b4792cb8ad738a0b69426fd0979d15da3378fd0a1008a21b0df67d0ed43603fa4ad4a6fed03e8fd6aa04a629f41025582cb14f89b85e011f5 SHA512 2773b661bca4a7279cbffed1606c622c8d73561dbae40c1fe6ad67bebc71c75f0fc90e0ecdcc4136c313d12269319d825118a81f6dee2393e83dbd2d2c3c14a1
+DIST openrc-0.45.1.tar.gz 246503 BLAKE2B 28ed668b1da7bc3d22de1f7b22b6d10ecd1c789eb5c017803754fa8f6197ee4a7b179728064fa31d4b9dd0d15e3332c4bb839bd56ac5abb39b5b772b53394e8a SHA512 340661c6f8fc60dd7fbbe4a84aaeb0a9a7337577e6d98698c34db3c160890780376587ca6f803563fec53e852593265a28c307fa38a5f71a3e48c62cd63611a1
+EBUILD openrc-0.44.10.ebuild 4689 BLAKE2B ee59077c97af4c8d59a2ae262557b89e52578adaea6e041ed8e594dfbacaba8f00cf09c89c2ee0c5cd4ef1f2e682e2d888a92409ae2f1d22cfc63333eb2af0a0 SHA512 c3b0616e1c83096c80e270bea172918080ef29bd2684580146ad2a396c540b95b02f907d39ac84919cb271d72330fea86dfbb1d6f3b6a83a8bd7bb13e9dc933c
+EBUILD openrc-0.45.1.ebuild 4492 BLAKE2B b3705152b85364d430b8b2ff173b971f3d8de589c5fe8cfbedf2a9945663fb959fc4ce785c47e4996f22c17faa72bc0235102d2b98b6df1a358220ba2624f632 SHA512 e7fd352f7d166d37cb786420b0a13ecfaffd59153c633c0cc66bc5d4139f7638b7122f87f3d4b8b421dddd5e15fbf0dc478e4cc8d6e0511224299f562ef1bb07
+EBUILD openrc-9999.ebuild 4492 BLAKE2B b3705152b85364d430b8b2ff173b971f3d8de589c5fe8cfbedf2a9945663fb959fc4ce785c47e4996f22c17faa72bc0235102d2b98b6df1a358220ba2624f632 SHA512 e7fd352f7d166d37cb786420b0a13ecfaffd59153c633c0cc66bc5d4139f7638b7122f87f3d4b8b421dddd5e15fbf0dc478e4cc8d6e0511224299f562ef1bb07
MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/openrc-0.44.10.ebuild b/sys-apps/openrc/openrc-0.44.10.ebuild
index e7337a132e40..c4028fe6262e 100644
--- a/sys-apps/openrc/openrc-0.44.10.ebuild
+++ b/sys-apps/openrc/openrc-0.44.10.ebuild
@@ -155,4 +155,15 @@ pkg_postinst() {
ewarn "without networking."
ewarn
fi
+
+ # added to handle downgrading from 0.45 (2022-06-08)
+ for v in ${REPLACING_VERSIONS}; do
+ [[ -x $(type rc-update) ]] || continue
+ if ver_test $v -gt 0.44.10; then
+ if rc-update show boot | grep -q seedrng; then
+ rc-update del seedrng boot
+ rc-update add urandom boot
+ fi
+ fi
+ done
}
diff --git a/sys-apps/openrc/openrc-0.45.1.ebuild b/sys-apps/openrc/openrc-0.45.1.ebuild
new file mode 100644
index 000000000000..c76771b7efea
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.45.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson pam
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} =~ ^9{4,}$ ]]; then
+ EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+ ncurses? ( sys-libs/ncurses:0= )
+ pam? ( sys-libs/pam )
+ audit? ( sys-process/audit )
+ sys-process/psmisc
+ selinux? (
+ sys-apps/policycoreutils
+ >=sys-libs/libselinux-2.6
+ )"
+DEPEND="${COMMON_DEPEND}
+ virtual/os-headers
+ ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+ bash? ( app-shells/bash )
+ !prefix? (
+ sysv-utils? (
+ !sys-apps/systemd[sysv-utils(-)]
+ !sys-apps/sysvinit
+ )
+ !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+ virtual/tmpfiles
+ )
+ selinux? (
+ >=sec-policy/selinux-base-policy-2.20170204-r4
+ >=sec-policy/selinux-openrc-2.20170204-r4
+ )
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature audit)
+ "-Dbranding=\"Gentoo Linux\""
+ $(meson_use newnet)
+ -Dos=Linux
+ $(meson_use pam)
+ $(meson_feature selinux)
+ -Drootprefix="${EPREFIX}"
+ -Dshell=$(usex bash /bin/bash /bin/sh)
+ $(meson_use sysv-utils sysvinit)
+ -Dtermcap=$(usev ncurses)
+ )
+ # export DEBUG=$(usev debug)
+ meson_src_configure
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+ local file="${ED}/$1" var=$2 val com
+ eval "${@:5}" && val=$3 || val=$4
+ [[ ${val} == "#" ]] && com="#" && val='\2'
+ sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+ set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+ meson_install
+
+ keepdir /lib/rc/tmp
+
+ # Setup unicode defaults for silly unicode users
+ set_config_yes_no /etc/rc.conf unicode use unicode
+
+ # Cater to the norm
+ set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+ # On HPPA, do not run consolefont by default (bug #222889)
+ if use hppa; then
+ rm -f "${ED}"/etc/runlevels/boot/consolefont
+ fi
+
+ # Support for logfile rotation
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/openrc.logrotate openrc
+
+ if use pam; then
+ # install gentoo pam.d files
+ newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+ newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+ fi
+
+ # install documentation
+ dodoc *.md
+}
+
+pkg_preinst() {
+ # avoid default thrashing in conf.d files when possible #295406
+ if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+ (
+ unset hostname HOSTNAME
+ source "${EROOT}"/etc/conf.d/hostname
+ : ${hostname:=${HOSTNAME}}
+ [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+ )
+ fi
+
+ # set default interactive shell to sulogin if it exists
+ set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+ return 0
+}
+
+pkg_postinst() {
+ if use hppa; then
+ elog "Setting the console font does not work on all HPPA consoles."
+ elog "You can still enable it by running:"
+ elog "# rc-update add consolefont boot"
+ fi
+
+ if ! use newnet && ! use netifrc; then
+ ewarn "You have emerged OpenRc without network support. This"
+ ewarn "means you need to SET UP a network manager such as"
+ ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+ ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+ ewarn "Or, you have the option of emerging openrc with the newnet"
+ ewarn "use flag and configuring /etc/conf.d/network and"
+ ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+ ewarn
+ fi
+
+ if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+ ewarn "Please add the network service to your boot runlevel"
+ ewarn "as soon as possible. Not doing so could leave you with a system"
+ ewarn "without networking."
+ ewarn
+ fi
+
+ # added for 0.45 to handle seedrng/urandom switching (2022-06-07)
+ for v in ${REPLACING_VERSIONS}; do
+ [[ -x $(type rc-update) ]] || continue
+ if ver_test $v -lt 0.45; then
+ if rc-update show boot | grep -q urandom; then
+ rc-update del urandom boot
+ rc-update add seedrng boot
+ fi
+ fi
+ done
+}
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 4c8638a6543e..c76771b7efea 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit flag-o-matic meson pam toolchain-funcs
+inherit meson pam
DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
HOMEPAGE="https://github.com/openrc/openrc/"
@@ -13,7 +13,7 @@ if [[ ${PV} =~ ^9{4,}$ ]]; then
inherit git-r3
else
SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
LICENSE="BSD-2"
@@ -25,13 +25,10 @@ COMMON_DEPEND="
pam? ( sys-libs/pam )
audit? ( sys-process/audit )
sys-process/psmisc
- !<sys-process/procps-3.3.9-r2
selinux? (
sys-apps/policycoreutils
>=sys-libs/libselinux-2.6
- )
- !<sys-apps/baselayout-2.1-r1
- !<sys-fs/udev-init-scripts-27"
+ )"
DEPEND="${COMMON_DEPEND}
virtual/os-headers
ncurses? ( virtual/pkgconfig )"
@@ -49,8 +46,6 @@ RDEPEND="${COMMON_DEPEND}
>=sec-policy/selinux-base-policy-2.20170204-r4
>=sec-policy/selinux-openrc-2.20170204-r4
)
- !<app-shells/gentoo-bashcomp-20180302
- !<app-shells/gentoo-zsh-completions-20180228
"
PDEPEND="netifrc? ( net-misc/netifrc )"
@@ -112,7 +107,7 @@ src_install() {
fi
# install documentation
- dodoc ChangeLog *.md
+ dodoc *.md
}
pkg_preinst() {
@@ -155,4 +150,15 @@ pkg_postinst() {
ewarn "without networking."
ewarn
fi
+
+ # added for 0.45 to handle seedrng/urandom switching (2022-06-07)
+ for v in ${REPLACING_VERSIONS}; do
+ [[ -x $(type rc-update) ]] || continue
+ if ver_test $v -lt 0.45; then
+ if rc-update show boot | grep -q urandom; then
+ rc-update del urandom boot
+ rc-update add seedrng boot
+ fi
+ fi
+ done
}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 88045fe39780..8535d35811d7 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,3 +1,5 @@
DIST osinfo-db-20220214.tar.xz 127528 BLAKE2B 7e0076d3f844e52744dd6086404504831c7ed625003bc789103919a140a5a281c1a44773f7decf0825cad845274417b3cb510f3bd62e840f84b972358755dc34 SHA512 d8823b3928d2648a759c4c15b57b57cfd79a406813ec375b02bf2c382c1b22ee0177e520ef04cf334af3b08cc810867472c35a73555f1fdb8855a1b8679c183c
+DIST osinfo-db-20220516.tar.xz 129272 BLAKE2B 47f6eb2e1ae0cad277be71fb0955415c4afdb27e3b80e36c98ce5b7c8d22efcab91047e93c586045baa233ac61dc08113a5aedb626db4f24bf0472455826e481 SHA512 44c56824c774e68bd79633c415c71155e814c1f928fceba845ab649f8cb0dd325ad06b91a2d720cb25fd62e67d7ea17774cc395995b4f201527c4a6aa447a744
EBUILD osinfo-db-20220214.ebuild 653 BLAKE2B 61a4b4b88845fb9a89d023d36849e576c105f8f211b69591aa929c4add0d43a1658b4c61129728fe90f66a8c8e464bb19da254734d5c87d39dd901102359ad59 SHA512 4d062a99286fb303d0d1f182a5c02e0aed4bf3c73ea9cd943c1039c0228a1fc7e46b585604050e41ad4a0a7ae788e48bdb08db911c6c17b0ae46be336055f666
+EBUILD osinfo-db-20220516.ebuild 695 BLAKE2B 320bab52572b923ba2de94d64fc029461fadf1c5c709396ae570dd20015cce555226e839c2cd4e80afc089c96a3508d2afa8b20c3ff061334f0e69ac877189d2 SHA512 22dcc990da0b6c5159e8e598641630ab84a45697c99aaf1e71de3a6efbf0ecc9423caaf9cc251c356e941260b62fc722b418ba8e239e661288d1eda838e5c529
MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sys-apps/osinfo-db/osinfo-db-20220516.ebuild b/sys-apps/osinfo-db/osinfo-db-20220516.ebuild
new file mode 100644
index 000000000000..28ae854564ac
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20220516.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/ https://gitlab.com/libosinfo/osinfo-db"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="sys-apps/osinfo-db-tools"
+
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+ osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 9252a81d71fb..fc8eef06660d 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,8 +1,8 @@
AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a9320cdba2d410dde4f2b3198b4e07d3341b2b7fcafcfd6cafea648909bdaa4976703c764d5d4a0e312 SHA512 7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4
AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
-AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
-DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
+AUX pciutils-3.8.0-no-which.patch 1207 BLAKE2B 6012046e4d0831e5a20b351e43bde4c1450c076989ed42741eac76510e2bc279940c80a04d978f6947878adca3140f5fc205615540871eefc9d62a68482fd4fa SHA512 240bb7142f5af044a8fdac96fcc63af7938b1e7f5f3d1689d213df09e71c1d6da84d1d1ee421511fa4c07f212e5605485c1f5ad8ad30052d181f0020e256d387
+AUX pciutils-3.8.0-pkg-config.patch 691 BLAKE2B c12a6a6f19a62d5d161479e401f5bd9e373821fb72648c6ef0d9a49312a0ed930e790a9153eddadfaca28b8c0c330166c915c43d9439e1163a385defa08760df SHA512 d616aadc83c40cde4f8e0261ad0a99259d5b66bf32c7db3f5b47cd0981b27ec93ff5547b1927806e3b045ac61d884cd5eb96e4ff58955b1881616056a95cab4c
DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
-EBUILD pciutils-3.7.0-r2.ebuild 2625 BLAKE2B 79828b3bb68b1aea998c716677815a2a459df5813c26056d69ce336ff3b2c63b51a9299f4f75c7e9eb7d99d75644c8a68ef21016ce15c929294566d894ee0b5f SHA512 6b35ea095aac16030aa2033e8429dcb80bbd6300e8de1750342e3b70af354417dfde559936f962b8c883d0b173ae0ccd164da4eded1065fc47924ce879ccc028
-EBUILD pciutils-3.8.0.ebuild 2568 BLAKE2B 0373c7cb27124af1f6ceaf2a333f2f732976a727d9d5caa075cfc65dfeb401cfcb737fc1ec46a3598feaf33c305aa45427f44a3c6e56d06371bcd9dd0b805e5a SHA512 ebf9b0c4a49e1da1ff2b579dcb0364ae2e2dd403f5fa74fec7e0f3d0cf39e36bf674777105b8027dd627e5e51da1d549deed353fdfb942d064e6087823bdc8d3
+EBUILD pciutils-3.8.0-r1.ebuild 4882 BLAKE2B a25f7136f8ed59963eca2c3a36e8be95fe007a5a84b1be136abaa63b1e0ef5b3c2911c825f49b91042099e8e1c45409ca6688d7721623cdc3b8d3295c17014e9 SHA512 4febe95aea85c906b361d876467f1ba68162101dce1d770c310d42516c506377bb0c20962c1d7c4ae120c9ab04a4403b516f41efa7f08c2f579ad6eecb1d0f50
+EBUILD pciutils-3.8.0.ebuild 4709 BLAKE2B f3954f5bf30d0fc063fdd27b7e1c6824ef396a8f922d5ed0b3180a1ea5036a6d04f79acfb863919f1f00466f6070e1f42338d89fa937fbf2b9318987bea4d7bc SHA512 dfacfe7264bacac6e00c252f20b04366a72cccb47f7629bd8dd12541be9d4daea82c0359f6407bbc566bbcef0d6f875de69bbdcf147506bf19080d2a347d0b98
MISC metadata.xml 525 BLAKE2B 5a7a502d28b6e74db1f1f008adfc5d9c398fb7832c8c82e066c9d4834726a0cd1e97b9738ca21906468f3c2444f20bfcf715339a1314e34b2b43d4f5c631a659 SHA512 5e53a4261ea0aa0d58f7a16b5c8ddbc2e6bda130e49642a9dc220f39cd6a77b8fdf22c22fd7def106d4728b880b75371feea3d552981d03294b86b8cb7fd08c0
diff --git a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch b/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
deleted file mode 100644
index 9e63b7ecd661..000000000000
--- a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-make sure all lib entries get into libs.private in the .pc file
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -61,7 +61,7 @@ $(PCILIBPC): libpci.pc.in
- -e 's,@LIBDIR@,$(LIBDIR),' \
- -e 's,@IDSDIR@,$(IDSDIR),' \
- -e 's,@VERSION@,$(VERSION),' \
-- -e 's,@LDLIBS@,$(LDLIBS),'
-+ -e 's,@LDLIBS@,$(LDLIBS) $(LIB_LDLIBS),'
-
- init.o: init.c $(INCL)
- access.o: access.c $(INCL)
diff --git a/sys-apps/pciutils/files/pciutils-3.8.0-no-which.patch b/sys-apps/pciutils/files/pciutils-3.8.0-no-which.patch
new file mode 100644
index 000000000000..3024d73555d3
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.8.0-no-which.patch
@@ -0,0 +1,34 @@
+https://github.com/pciutils/pciutils/pull/105
+
+From 91bf24dd3c91f826377548b7e164b49cfed56f9a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 19 Jun 2022 23:52:22 +0100
+Subject: [PATCH 1/2] lib/configure: drop usage of which
+
+'which' is not required by POSIX and is an external command which may not be
+available, and 'command -v' does the job just fine.
+
+Debian and Gentoo at least are both making efforts to drop which from
+their base system package list.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/lib/configure
++++ b/lib/configure
+@@ -238,7 +238,7 @@ if [ "$sys" = linux ] ; then
+ PKG_CONFIG=pkg-config
+ fi
+ if [ "$LIBKMOD" != no ] ; then
+- if ! which $PKG_CONFIG >/dev/null ; then
++ if ! command -v $PKG_CONFIG >/dev/null ; then
+ echo_n "($PKG_CONFIG not found) "
+ elif $PKG_CONFIG libkmod ; then
+ LIBKMOD_DETECTED=1
+@@ -268,7 +268,7 @@ if [ "$sys" = linux ] ; then
+ if [ "$HWDB" = yes -o "$HWDB" = no ] ; then
+ echo "$HWDB (set manually)"
+ else
+- if `which pkg-config >/dev/null && pkg-config --atleast-version=196 libudev` ; then
++ if `command -v pkg-config >/dev/null && pkg-config --atleast-version=196 libudev` ; then
+ HWDB=yes
+ else
+ HWDB=no
diff --git a/sys-apps/pciutils/files/pciutils-3.8.0-pkg-config.patch b/sys-apps/pciutils/files/pciutils-3.8.0-pkg-config.patch
new file mode 100644
index 000000000000..4630609bad24
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.8.0-pkg-config.patch
@@ -0,0 +1,19 @@
+https://github.com/pciutils/pciutils/pull/105
+
+From a74832198ab36683a867c79b3d6ef2cac9baad55 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 19 Jun 2022 23:53:42 +0100
+Subject: [PATCH 2/2] lib/configure: respect $PKG_CONFIG completely
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/lib/configure
++++ b/lib/configure
+@@ -268,7 +268,7 @@ if [ "$sys" = linux ] ; then
+ if [ "$HWDB" = yes -o "$HWDB" = no ] ; then
+ echo "$HWDB (set manually)"
+ else
+- if `command -v pkg-config >/dev/null && pkg-config --atleast-version=196 libudev` ; then
++ if `command -v $PKG_CONFIG >/dev/null && $PKG_CONFIG --atleast-version=196 libudev` ; then
+ HWDB=yes
+ else
+ HWDB=no
diff --git a/sys-apps/pciutils/pciutils-3.7.0-r2.ebuild b/sys-apps/pciutils/pciutils-3.7.0-r2.ebuild
deleted file mode 100644
index 9f9b0b41e67e..000000000000
--- a/sys-apps/pciutils/pciutils-3.7.0-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-REQUIRED_USE="static-libs? ( !udev )"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libpci.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
-"
-DEPEND="
- kmod? ( sys-apps/kmod )
- udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
- static-libs? ( ${LIB_DEPEND} )
- !static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
-"
-RDEPEND="
- ${DEPEND}
- sys-apps/hwdata
-"
-BDEPEND="kmod? ( virtual/pkgconfig )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
- [[ $# -ne 2 ]] && return 1
- local opt=$1 val=$2
-
- sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
- return 0
-}
-
-src_prepare() {
- default
-
- if use static-libs ; then
- cp -pPR "${S}" "${S}.static" || die
- mv "${S}.static" "${S}/static" || die
- fi
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- append-lfs-flags #471102
-}
-
-pemake() {
- emake \
- HOST="${CHOST}" \
- CROSS_COMPILE="${CHOST}-" \
- CC="$(tc-getCC)" \
- AR="$(tc-getAR)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- RANLIB="$(tc-getRANLIB)" \
- DNS=$(usex dns) \
- IDSDIR='$(SHAREDIR)/hwdata' \
- MANDIR='$(SHAREDIR)/man' \
- PREFIX="${EPREFIX}/usr" \
- SHARED="yes" \
- STRIP="" \
- ZLIB=$(usex zlib) \
- PCI_COMPRESSED_IDS=0 \
- PCI_IDS=pci.ids \
- LIBDIR="\${PREFIX}/$(get_libdir)" \
- LIBKMOD=$(multilib_native_usex kmod) \
- HWDB=$(usex udev) \
- "$@"
-}
-
-multilib_src_compile() {
- pemake OPT="${CFLAGS}" all
- if use static-libs ; then
- pemake \
- -C "${BUILD_DIR}/static" \
- OPT="${CFLAGS}" \
- SHARED="no" \
- lib/libpci.a
- fi
-}
-
-multilib_src_install() {
- pemake DESTDIR="${D}" install install-lib
- use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README TODO
-
- rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
- rm -r "${ED}"/usr/share/hwdata || die
-
- newinitd "${FILESDIR}"/init.d-pciparm pciparm
- newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
diff --git a/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild b/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..1bf858cd8fbf
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dns +kmod static-libs +udev zlib"
+REQUIRED_USE="static-libs? ( !udev )"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libpci.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
+DEPEND="kmod? ( sys-apps/kmod )
+ udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
+ static-libs? ( ${LIB_DEPEND} )
+ !static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )"
+RDEPEND="${DEPEND}
+ sys-apps/hwdata"
+# See bug #847133 re binutils check
+BDEPEND="|| ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools )
+ kmod? ( virtual/pkgconfig )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.8.0-no-which.patch
+ "${FILESDIR}"/${PN}-3.8.0-pkg-config.patch
+)
+
+switch_config() {
+ [[ $# -ne 2 ]] && return 1
+ local opt=$1 val=$2
+
+ sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
+ return 0
+}
+
+check_binutils_version() {
+ if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && ! tc-ld-is-gold && ! tc-ld-is-lld ; then
+ # Okay, hopefully it's Binutils' bfd.
+ # bug #847133
+
+ # Convert this:
+ # ```
+ # GNU ld (Gentoo 2.38 p4) 2.38
+ # Copyright (C) 2022 Free Software Foundation, Inc.
+ # This program is free software; you may redistribute it under the terms of
+ # the GNU General Public License version 3 or (at your option) a later version.
+ # This program has absolutely no warranty.
+ # ```
+ #
+ # into...
+ # ```
+ # 2.38
+ # ```
+ local ver=$($(tc-getLD) --version 2>&1 | head -1 | rev | cut -d' ' -f1 | rev)
+
+ if ! [[ ${ver} =~ [0-9].[0-9][0-9] ]] ; then
+ # Skip if unrecognised format so we don't pass something
+ # odd into ver_cut.
+ return
+ fi
+
+ ver_major=$(ver_cut 1 "${ver}")
+ ver_minor=$(ver_cut 2 "${ver}")
+
+ # We use 2.37 here, not 2.35, as https://github.com/pciutils/pciutils/issues/98 mentions
+ # because we've had other miscompiles with older Binutils (not just build failures!)
+ # and we don't want people running any unsupported versions of Binutils. An example
+ # of this is where glibc is completely broken with old binutils: bug #802036. It's
+ # just not sustainable to support.
+ if [[ ${ver_major} -eq 2 && ${ver_minor} -lt 37 ]] ; then
+ eerror "Old version of binutils activated! ${P} cannot be built with an old version."
+ eerror "Please follow these steps:"
+ eerror "1. Select a newer binutils (>= 2.37) using binutils-config"
+ eerror " (If no such version is installed, run emerge -v1 sys-devel/binutils)"
+ eerror "2. Run: . /etc/profile"
+ eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
+ eerror "4. Complete your world upgrade if you were performing one."
+ eerror "4. Perform a depclean (emerge -acv)"
+ eerror "\tYou MUST depclean after every world upgrade in future!"
+ die "Old binutils found! Change to a newer ld using binutils-config (bug #847133)."
+ fi
+ fi
+}
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && check_binutils_version
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && check_binutils_version
+}
+
+src_prepare() {
+ default
+
+ if use static-libs ; then
+ cp -pPR "${S}" "${S}.static" || die
+ mv "${S}.static" "${S}/static" || die
+ fi
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ # bug #471102
+ append-lfs-flags
+}
+
+pemake() {
+ emake \
+ HOST="${CHOST}" \
+ CROSS_COMPILE="${CHOST}-" \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ RANLIB="$(tc-getRANLIB)" \
+ DNS=$(usex dns) \
+ IDSDIR='$(SHAREDIR)/hwdata' \
+ MANDIR='$(SHAREDIR)/man' \
+ PREFIX="${EPREFIX}/usr" \
+ SHARED="yes" \
+ STRIP="" \
+ ZLIB=$(usex zlib) \
+ PCI_COMPRESSED_IDS=0 \
+ PCI_IDS=pci.ids \
+ LIBDIR="\${PREFIX}/$(get_libdir)" \
+ LIBKMOD=$(multilib_native_usex kmod) \
+ HWDB=$(usex udev) \
+ "$@"
+}
+
+multilib_src_compile() {
+ pemake OPT="${CFLAGS}" all
+
+ if use static-libs ; then
+ pemake \
+ -C "${BUILD_DIR}"/static \
+ OPT="${CFLAGS}" \
+ SHARED="no" \
+ lib/libpci.a
+ fi
+}
+
+multilib_src_install() {
+ pemake DESTDIR="${D}" install install-lib
+
+ use static-libs && dolib.a "${BUILD_DIR}"/static/lib/libpci.a
+}
+
+multilib_src_install_all() {
+ dodoc ChangeLog README TODO
+
+ rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
+ rm -r "${ED}"/usr/share/hwdata || die
+
+ newinitd "${FILESDIR}"/init.d-pciparm pciparm
+ newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
diff --git a/sys-apps/pciutils/pciutils-3.8.0.ebuild b/sys-apps/pciutils/pciutils-3.8.0.ebuild
index 311aa06502b2..53e69aa143eb 100644
--- a/sys-apps/pciutils/pciutils-3.8.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="dns +kmod static-libs +udev zlib"
REQUIRED_USE="static-libs? ( !udev )"
@@ -24,7 +24,10 @@ DEPEND="kmod? ( sys-apps/kmod )
!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )"
RDEPEND="${DEPEND}
sys-apps/hwdata"
-BDEPEND="kmod? ( virtual/pkgconfig )"
+# See bug #847133 re binutils check
+BDEPEND="sys-apps/which
+ || ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools )
+ kmod? ( virtual/pkgconfig )"
MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
@@ -36,6 +39,62 @@ switch_config() {
return 0
}
+check_binutils_version() {
+ if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && ! tc-ld-is-gold && ! tc-ld-is-lld ; then
+ # Okay, hopefully it's Binutils' bfd.
+ # bug #847133
+
+ # Convert this:
+ # ```
+ # GNU ld (Gentoo 2.38 p4) 2.38
+ # Copyright (C) 2022 Free Software Foundation, Inc.
+ # This program is free software; you may redistribute it under the terms of
+ # the GNU General Public License version 3 or (at your option) a later version.
+ # This program has absolutely no warranty.
+ # ```
+ #
+ # into...
+ # ```
+ # 2.38
+ # ```
+ local ver=$($(tc-getLD) --version 2>&1 | head -1 | rev | cut -d' ' -f1 | rev)
+
+ if ! [[ ${ver} =~ [0-9].[0-9][0-9] ]] ; then
+ # Skip if unrecognised format so we don't pass something
+ # odd into ver_cut.
+ return
+ fi
+
+ ver_major=$(ver_cut 1 "${ver}")
+ ver_minor=$(ver_cut 2 "${ver}")
+
+ # We use 2.37 here, not 2.35, as https://github.com/pciutils/pciutils/issues/98 mentions
+ # because we've had other miscompiles with older Binutils (not just build failures!)
+ # and we don't want people running any unsupported versions of Binutils. An example
+ # of this is where glibc is completely broken with old binutils: bug #802036. It's
+ # just not sustainable to support.
+ if [[ ${ver_major} -eq 2 && ${ver_minor} -lt 37 ]] ; then
+ eerror "Old version of binutils activated! ${P} cannot be built with an old version."
+ eerror "Please follow these steps:"
+ eerror "1. Select a newer binutils (>= 2.37) using binutils-config"
+ eerror "2. Run: . /etc/profile"
+ eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
+ eerror "4. Complete your world upgrade if you were performing one."
+ eerror "4. Perform a depclean (emerge -acv)"
+ eerror "\tYou MUST depclean after every world upgrade in future!"
+ die "Old binutils found! Change to a newer ld using binutils-config (bug #847133)."
+ fi
+ fi
+}
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && check_binutils_version
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && check_binutils_version
+}
+
src_prepare() {
default
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index 0750de78c7c4..3db1337fbfa7 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -2,5 +2,5 @@ AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528
AUX pcmciautils-018_p8-musl-unsigned-type.patch 648 BLAKE2B dd82e800e032eb95dc1160424157f13f56ca8f000fe7c857cbaf40010dc2e65914e5d38ee8910607ea45859a7464d64f6aa9ff1f7b4c6a8412fc4d0ad2f10378 SHA512 7d140e327421f70007728e7330042dbf6d16988d6ecdc2372321a3d0a6e1c240549a5e9d110d9e6d5b74c1bdcb1caa13f52d3ad75a35dbf70d1602c46e50d358
DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9
DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
-EBUILD pcmciautils-018_p8-r3.ebuild 1632 BLAKE2B aaae3b06f9288c32cbd42721b522c9ca4a46166d172b1e862124672b013cbc9e25c4589ad0c4497a780d8ab5a5e277508c3a2f007460385e2ae0b67220ffc644 SHA512 e2e485f5087afa06cb851ed8b421afd2084cb904997e59dd87ab2236ad192b511558929a585f03a6a9f4e47b303cf5361e4750c21cf4be6d2d0e961ff2705b17
+EBUILD pcmciautils-018_p8-r3.ebuild 1639 BLAKE2B 9e5c45db1e16bbce73f72144f8fc73c62f2fdbaf4b413515fe6cac0ccade3d050995464aa02d986d5aced7ac87c8486c51bb6d001586c39112abb04c4b7c8988 SHA512 3326fde811b8fdb54dfbb5c6c8d9b8d38816dc9337da3e0cd015a855fc09d0392372bf017a123d7ace404c3c36bb94c6719ac955c14fd11f834e4ca35f2d739f
MISC metadata.xml 245 BLAKE2B 7c3776457ba60210a6b5e9b1a0d81ca8fa5cebad8aa6b06001104cf7bbe9dc65ca4fe70b827f3423fc6d0f6de56d8bb5484580e47331655fd4b07e58e2ced33c SHA512 e05491fb93b9ea6296bd0ebdbf9a8027b413e9d8d798a815c65c566b44cfb76b601a82b6da42a5bcea6d8b9ff31d721248d944891abd71cff844537dd4e50cc4
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
index 9d5b1a167818..10d08defcef6 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~riscv x86"
IUSE="debug staticsocket"
RDEPEND="sys-apps/kmod[tools]"
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 34554c0c8acd..d3669429943f 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,15 +1,9 @@
AUX 99-pcscd-hotplug-r1.rules 363 BLAKE2B 65049122751de2d50f60449cebaa948ce276680d969ef1a13700a3fc7577c90e24b96b69f2285389361aeb6dfbdd7f0eb49faa953855ba39473270aa530c395f SHA512 45c1d50175844b4f46d0a5a15855bfb929d4848f9570e92c3327a95fce7aeb11fda7cecd1c24338aed96b696134baa1715ab59ac578af7c11e43bbc73b27a990
-AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa06eeec753415df8b514894dbc925c9210df80fbdf2f723a476740e8d15785c2c98cca6733249c4643aa632aa SHA512 74421fe073cb55f665c4a0350931beae7c252300b4954f69f215334e3e4e6dda927f51837540d24d893ba8ae862e3c1370b694d153508c4186e94959d37f918a
AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
-AUX pcsc-lite-1.9.5-no-libusb-udev.patch 1271 BLAKE2B dcf1cf8e70446ec0ee19cf17edf66372e2feea817ffb822bd0bf656c3e310df752d85be0dbbb43680a0ba3ec45c3846a97465ef2b82ee3b53c88aac00cf9a174 SHA512 de3d1cf4dff39a7499337a6e915a3d3813a8840299a8851b24afd847aa184f38b51f76bac7fc1161011d1c4d047c195609e54e07f541502f8cf205a0e95f314c
AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500
AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
-DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
-DIST pcsc-lite-1.9.1.tar.bz2 763525 BLAKE2B b85364f5e2a92450b020bfc28439774c6a6ffb9016ea4072d1925fbc1cef76cd370b298c0b414ba322205d859018308bd7101ef89c5b6f96b97e4f223035ac35 SHA512 4f59ea6acb5b258092018f10609987e12b8e601049e6ffed4b4b82abd3c4b35c38a60e1cda28fdc884202e694d1bc3a3b5d930c5b1e9c1b9c309bd17ef463e63
-DIST pcsc-lite-1.9.4.tar.bz2 776581 BLAKE2B fb870fab3bfc7ae372a62c678a0321445f14c36c84c4fff8b7bf4e17f14b64575128fdcf7c8642cd03cb3586d6846845196a93d02b037090f49b88bbee896caa SHA512 d812fd4c6e906f277a73863c4170d96c30245c5fd0a8329e78923533320d71c6591b3f282695bcd69823c8cc381d8d438736bb7ab2262ab24c9d89434368659e
-DIST pcsc-lite-1.9.5.tar.bz2 775736 BLAKE2B 2e42fa3864ec68725f90338ae981c758328c3129278739bb7bd0e8d62f0cd984dfe2bc0268226614110833db7c0ba48f7c2cd3808a505d836e95cd9709938170 SHA512 0315c2cf97cc9da0f5faf115f24e523b5a1746cea250a4fe6c4d5d7b2fbfc7c3ea0f068611072ca84866c672eb679e8067101437573148ccd1ac5ad26b18cd78
-EBUILD pcsc-lite-1.9.0.ebuild 3167 BLAKE2B 9172b138a531936e2de9bd0d9d961d252f88d57950ae414b6ea3816f0d25f60406ede13d3d1e17159bf33681d7294526e9778f42a10292aaf846a70c6978c208 SHA512 baacae6682f43ce2ab5d89c5e278d11cc9cc5420d14821bbaa7b03e000884953d9aa1cda9df634d090444ba16af9fb7e2ed7e12d5b6d568ab4808960f5ee16da
-EBUILD pcsc-lite-1.9.1.ebuild 3181 BLAKE2B 5d67ccc4a2705aa85746347ff32f6d15e6613ea40ea244d7c810061a3dd5c023606f070b6d73544e4ef9f86ddfe4444e37c335177d65eb2a02ba06d4abb8ce0a SHA512 c8fee2822eada5dd7cbbe334be1ca72318a009fde315c8dc46fb9380f8f76a0965445bfc858bbadff1baae6bf80353223b59eb4990c9097970d8d891d07f9a02
-EBUILD pcsc-lite-1.9.4.ebuild 3182 BLAKE2B d1f81f1ff0e2b317847aaf59e32afcb17a813fff04a7326b6d5c1cc4f91b6775de01674e15f3a773d565d986caa7c585df7e807ff3e450e6c17d62a62172e376 SHA512 0b1d4de95dfabcbbc958e38f5e07551cf0fd59674a23027c0dbeb8d237356d4dd928bcc444aea8dc7fd090d6beea6fb321b9eea9883b28d4ac658c7d3a3151b6
-EBUILD pcsc-lite-1.9.5.ebuild 3230 BLAKE2B 78aed73e849af2ae4fc4a0d0167e7ea3b456100414191b7bebe798fe7b1f9a968ec2e178ddfc8ed6930583f5e0a73f5cc2f814215af21bf7cdd31d7e8b0eff72 SHA512 3972d7bae4d6d5622296a29c83477eebf50511af235516610f09326b944859a3ac23bc2acf73c08247b3bf3deab098c04e320a6372899f33be55b31bb73ee68a
+DIST pcsc-lite-1.9.7.tar.bz2 784685 BLAKE2B 74848b06ce9e497287cc4a8f307a194d766091a35af46300bd1dcdbf730c3f86f14928ff2e576ac83c07a37234b866e0b2cb3afd3d963b8570051c5c4880f4b9 SHA512 0c7f6c0efcfd6f6996e9e751dd0dd9969590b19144099aa6003c089d95d5ffdfddf3a50b82ece31e0f22e8213317dd827e5fbb4cdde614818b81a80c434788dd
+DIST pcsc-lite-1.9.8.tar.bz2 787198 BLAKE2B ba7297e567e5ad7fdb8041d6cddd61e772795d725d91be7f041493a2404a42acf51b41a4e0e82765f4d2a93517d8d9345abd7520dc03eeb48d2eb83bb6082390 SHA512 6275eee849c5572264f5a1ef1ea2a2db5fec9c4129b348bd6e2c1d4444c46c945b8ecab682c003913e9d06da7034b383199b6e392ae178ffae296017e7c61812
+EBUILD pcsc-lite-1.9.7.ebuild 3173 BLAKE2B 6db8a85ed76f5247b5e85efc9d7972ade5c2bd6ee3db54b4a8d72ded1b9fa19e4a173a9bea482d88ecfb6471e93e4d398a16ee5ead75e92715d760a3127c6aa9 SHA512 9464a02d4dcc70e8bf938e46a65c320486cbd835b2a732b4c76baf250510919946b07e133d91281495b2f01ef346b69056eedc9df491977f444da36ac43738d7
+EBUILD pcsc-lite-1.9.8.ebuild 3175 BLAKE2B 47e282f197ae2aca9a3fa8fa4e1b2cea11592e8c10bc1a07d268740bcb075b6cdc16cd845e6b0f3bd0c3863a800cd5e04240991a4b2c21404f7a0db094c77c0e SHA512 d08c69852af23c37956d7777abc6f3ca25f1efe8bc79284b1bc9923b6ff2fd18ebe32973cf7f9268be1e21849c2604d5d0017180e37c1009dda117eeaedad27d
MISC metadata.xml 1083 BLAKE2B 8dc3fe1bbd660b4ea9db99fb8f82b905843d96005928f42aa4007e13aa6e0a75af83f1552b434136c8584b98ddae6a0c68776fbb1096da29433864536405fdf3 SHA512 da7d9e3842429795970dd73ffab39e031188e6fd585d144e6348007c55eeb67dcb8e5e04aea1115796f73ff1d455887e0c00301da2b9e689551fef8144c2f388
diff --git a/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules b/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules
deleted file mode 100644
index e6ee464344ff..000000000000
--- a/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# We add this here so that it runs after ccid's and ifd-gempc's rules;
-# if we just added a pcscd-owned device, we hotplug the pcscd service.
-ACTION=="add", ENV{PCSCD}=="1", GROUP="pcscd", RUN+="/bin/env IN_HOTPLUG=1 /etc/init.d/pcscd --quiet start"
diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch
deleted file mode 100644
index 2f4793b03fb4..000000000000
--- a/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/LudovicRousseau/PCSC/commit/a4bdfd2eb6e908c8306fe421137a83573ba05d8c
-https://bugs.gentoo.org/832593
-
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 14 Dec 2021 08:20:59 +0100
-Subject: [PATCH] src/hotplug_generic.c: fix build without lib{udev,usb}
-
-Fix the following build failure without lib{udev,usb} raised since
-version 1.9.5 and
-https://github.com/LudovicRousseau/PCSC/commit/6f8f170db3c88c59a5ddb5ae5319b921a901a6aa:
-
-/home/giuliobenetti/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: pcscd-pcscdaemon.o: in function `signal_thread':
-pcscdaemon.c:(.text+0x444): undefined reference to `HPReCheckSerialReaders'
-
-Fixes:
- - http://autobuild.buildroot.org/results/6cf323229f32967aa554418410dc94b7094d09af
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---- a/src/hotplug_generic.c
-+++ b/src/hotplug_generic.c
-@@ -48,7 +48,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #define FALSE 0
- #endif
-
--#if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(__linux__) && !defined(HAVE_LIBUDEV)
-+#if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUDEV)
-
- LONG HPSearchHotPluggables(void)
- {
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
deleted file mode 100644
index 5d6b8904ec10..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-inherit python-single-r1 systemd udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
- udev? ( virtual/libudev:= )
- policykit? ( >=sys-auth/polkit-0.111 )
- acct-group/openct
- acct-group/pcscd
- acct-user/pcscd
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-maintainer-mode \
- --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
- --enable-ipcdir=/run/pcscd \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable doc documentation) \
- $(multilib_native_use_enable embedded) \
- $(multilib_native_use_enable systemd libsystemd) \
- $(multilib_native_use_enable udev libudev) \
- $(multilib_native_use_enable libusb) \
- $(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
- if use udev; then
- exeinto "$(get_udevdir)"
- newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
- insinto "$(get_udevdir)"/rules.d
- newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
- fi
-
- python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
- elog "the pcscd group, to avoid running as root."
- elog ""
- elog "This also means you need the newest drivers available so that the"
- elog "devices get the proper owner."
- elog ""
- elog "Furthermore, a conf.d file is no longer installed by default, as"
- elog "the default configuration does not require one. If you need to"
- elog "pass further options to pcscd, create a file and set the"
- elog "EXTRA_OPTS variable."
- elog ""
- if use udev; then
- elog "Hotplug support is provided by udev rules."
- elog "When using OpenRC you additionally need to tell it to hotplug"
- elog "pcscd by setting this variable in /etc/rc.conf:"
- elog ""
- elog " rc_hotplug=\"pcscd\""
- fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
deleted file mode 100644
index 5ad5f5d7b9f6..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-inherit python-single-r1 systemd udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
- udev? ( virtual/libudev:= )
- policykit? ( >=sys-auth/polkit-0.111 )
- acct-group/openct
- acct-group/pcscd
- acct-user/pcscd
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-maintainer-mode \
- --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
- --enable-ipcdir=/run/pcscd \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable doc documentation) \
- $(multilib_native_use_enable embedded) \
- $(multilib_native_use_enable systemd libsystemd) \
- $(multilib_native_use_enable udev libudev) \
- $(multilib_native_use_enable libusb) \
- $(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
- if use udev; then
- exeinto "$(get_udevdir)"
- newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
- insinto "$(get_udevdir)"/rules.d
- newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
- fi
-
- python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
- elog "the pcscd group, to avoid running as root."
- elog ""
- elog "This also means you need the newest drivers available so that the"
- elog "devices get the proper owner."
- elog ""
- elog "Furthermore, a conf.d file is no longer installed by default, as"
- elog "the default configuration does not require one. If you need to"
- elog "pass further options to pcscd, create a file and set the"
- elog "EXTRA_OPTS variable."
- elog ""
- if use udev; then
- elog "Hotplug support is provided by udev rules."
- elog "When using OpenRC you additionally need to tell it to hotplug"
- elog "pcscd by setting this variable in /etc/rc.conf:"
- elog ""
- elog " rc_hotplug=\"pcscd\""
- fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
deleted file mode 100644
index a282e00b2aa9..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python{3_8,3_9,3_10} )
-
-inherit python-single-r1 systemd udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
- udev? ( virtual/libudev:= )
- policykit? ( >=sys-auth/polkit-0.111 )
- acct-group/openct
- acct-group/pcscd
- acct-user/pcscd
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-maintainer-mode \
- --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
- --enable-ipcdir=/run/pcscd \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable doc documentation) \
- $(multilib_native_use_enable embedded) \
- $(multilib_native_use_enable systemd libsystemd) \
- $(multilib_native_use_enable udev libudev) \
- $(multilib_native_use_enable libusb) \
- $(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
- if use udev; then
- exeinto "$(get_udevdir)"
- newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
- insinto "$(get_udevdir)"/rules.d
- newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
- fi
-
- python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
- elog "the pcscd group, to avoid running as root."
- elog ""
- elog "This also means you need the newest drivers available so that the"
- elog "devices get the proper owner."
- elog ""
- elog "Furthermore, a conf.d file is no longer installed by default, as"
- elog "the default configuration does not require one. If you need to"
- elog "pass further options to pcscd, create a file and set the"
- elog "EXTRA_OPTS variable."
- elog ""
- if use udev; then
- elog "Hotplug support is provided by udev rules."
- elog "When using OpenRC you additionally need to tell it to hotplug"
- elog "pcscd by setting this variable in /etc/rc.conf:"
- elog ""
- elog " rc_hotplug=\"pcscd\""
- fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
deleted file mode 100644
index 3b34179b63c5..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python{3_8,3_9,3_10} )
-
-inherit python-single-r1 systemd udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
- udev? ( virtual/libudev:= )
- policykit? ( >=sys-auth/polkit-0.111 )
- acct-group/openct
- acct-group/pcscd
- acct-user/pcscd
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
- "${FILESDIR}"/${P}-no-libusb-udev.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-maintainer-mode \
- --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
- --enable-ipcdir=/run/pcscd \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable doc documentation) \
- $(multilib_native_use_enable embedded) \
- $(multilib_native_use_enable systemd libsystemd) \
- $(multilib_native_use_enable udev libudev) \
- $(multilib_native_use_enable libusb) \
- $(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
- if use udev; then
- exeinto "$(get_udevdir)"
- newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
- insinto "$(get_udevdir)"/rules.d
- newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
- fi
-
- python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
- elog "the pcscd group, to avoid running as root."
- elog ""
- elog "This also means you need the newest drivers available so that the"
- elog "devices get the proper owner."
- elog ""
- elog "Furthermore, a conf.d file is no longer installed by default, as"
- elog "the default configuration does not require one. If you need to"
- elog "pass further options to pcscd, create a file and set the"
- elog "EXTRA_OPTS variable."
- elog ""
- if use udev; then
- elog "Hotplug support is provided by udev rules."
- elog "When using OpenRC you additionally need to tell it to hotplug"
- elog "pcscd by setting this variable in /etc/rc.conf:"
- elog ""
- elog " rc_hotplug=\"pcscd\""
- fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
new file mode 100644
index 000000000000..f81a4eec7c4e
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+
+inherit python-single-r1 systemd udev multilib-minimal
+
+DESCRIPTION="PC/SC Architecture smartcard middleware library"
+HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
+
+SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
+
+# GPL-2 is there for the init script; everything else comes from
+# upstream.
+LICENSE="BSD ISC MIT GPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# This is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="doc embedded libusb policykit selinux systemd +udev"
+
+REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
+
+# No dependencies need the MULTILIB_DEPS because the libraries are actually
+# standalone, the deps are only needed for the daemon itself.
+DEPEND="libusb? ( virtual/libusb:1 )
+ udev? ( virtual/libudev:= )
+ policykit? ( >=sys-auth/polkit-0.111 )
+ acct-group/openct
+ acct-group/pcscd
+ acct-user/pcscd
+ ${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-pcscd )"
+
+BDEPEND="sys-devel/flex
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+)
+
+DOCS=( AUTHORS HELP README SECURITY ChangeLog )
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --disable-maintainer-mode \
+ --disable-strict \
+ --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+ --enable-ipcdir=/run/pcscd \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ $(use_enable doc documentation) \
+ $(multilib_native_use_enable embedded) \
+ $(multilib_native_use_enable systemd libsystemd) \
+ $(multilib_native_use_enable udev libudev) \
+ $(multilib_native_use_enable libusb) \
+ $(multilib_native_use_enable policykit polkit)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+
+ if use udev; then
+ exeinto "$(get_udevdir)"
+ newexe "${FILESDIR}"/pcscd-udev pcscd.sh
+
+ insinto "$(get_udevdir)"/rules.d
+ newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+ fi
+
+ python_fix_shebang "${ED}"/usr/bin/pcsc-spy
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+ elog "the pcscd group, to avoid running as root."
+ elog ""
+ elog "This also means you need the newest drivers available so that the"
+ elog "devices get the proper owner."
+ elog ""
+ elog "Furthermore, a conf.d file is no longer installed by default, as"
+ elog "the default configuration does not require one. If you need to"
+ elog "pass further options to pcscd, create a file and set the"
+ elog "EXTRA_OPTS variable."
+ elog ""
+ if use udev; then
+ elog "Hotplug support is provided by udev rules."
+ elog "When using OpenRC you additionally need to tell it to hotplug"
+ elog "pcscd by setting this variable in /etc/rc.conf:"
+ elog ""
+ elog " rc_hotplug=\"pcscd\""
+ fi
+}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild
new file mode 100644
index 000000000000..d5a422386bb8
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-single-r1 systemd udev multilib-minimal
+
+DESCRIPTION="PC/SC Architecture smartcard middleware library"
+HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
+
+SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
+
+# GPL-2 is there for the init script; everything else comes from
+# upstream.
+LICENSE="BSD ISC MIT GPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# This is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="doc embedded libusb policykit selinux systemd +udev"
+
+REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
+
+# No dependencies need the MULTILIB_DEPS because the libraries are actually
+# standalone, the deps are only needed for the daemon itself.
+DEPEND="libusb? ( virtual/libusb:1 )
+ udev? ( virtual/libudev:= )
+ policykit? ( >=sys-auth/polkit-0.111 )
+ acct-group/openct
+ acct-group/pcscd
+ acct-user/pcscd
+ ${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-pcscd )"
+
+BDEPEND="sys-devel/flex
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+)
+
+DOCS=( AUTHORS HELP README SECURITY ChangeLog )
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --disable-maintainer-mode \
+ --disable-strict \
+ --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+ --enable-ipcdir=/run/pcscd \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ $(use_enable doc documentation) \
+ $(multilib_native_use_enable embedded) \
+ $(multilib_native_use_enable systemd libsystemd) \
+ $(multilib_native_use_enable udev libudev) \
+ $(multilib_native_use_enable libusb) \
+ $(multilib_native_use_enable policykit polkit)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+
+ if use udev; then
+ exeinto "$(get_udevdir)"
+ newexe "${FILESDIR}"/pcscd-udev pcscd.sh
+
+ insinto "$(get_udevdir)"/rules.d
+ newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+ fi
+
+ python_fix_shebang "${ED}"/usr/bin/pcsc-spy
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+ elog "the pcscd group, to avoid running as root."
+ elog ""
+ elog "This also means you need the newest drivers available so that the"
+ elog "devices get the proper owner."
+ elog ""
+ elog "Furthermore, a conf.d file is no longer installed by default, as"
+ elog "the default configuration does not require one. If you need to"
+ elog "pass further options to pcscd, create a file and set the"
+ elog "EXTRA_OPTS variable."
+ elog ""
+ if use udev; then
+ elog "Hotplug support is provided by udev rules."
+ elog "When using OpenRC you additionally need to tell it to hotplug"
+ elog "pcscd by setting this variable in /etc/rc.conf:"
+ elog ""
+ elog " rc_hotplug=\"pcscd\""
+ fi
+}
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 0722da006fef..6661aef7a43f 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -2,5 +2,6 @@ AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f
DIST pcsc-tools-1.5.6.tar.bz2 289691 BLAKE2B 35dd50a3a8babff89f9e5d769ef70a573e58b2780d680c82dfa07177a3daaf527b5ccca665c901f9667ca4a81719916bd5aebb2e9b1b4d0301001498fe587832 SHA512 94076ed5af698afcec05da9645d7108c02c110fd0ee5efecbd8e0c7eb5ed9a55ee857d23b79ab2ccb93847f8a36f996fa9d521d999395f63274d4bf1d9cf3d26
DIST pcsc-tools-1.5.7.tar.bz2 292637 BLAKE2B f0bfa9f680a2f2b348d2baef4b4b4567008163f47d7d7e6cec694cdc424626c5c6f18c475f0e8d4c5cd49111315b3c8a934fecf30afe90bbebc0a15f8d6f4a1d SHA512 58d70f41c5815297def7d8b64807e960db85719996771ecb43a4320d3f3fc82e2deb133d9ca97b3a4e8e76267294b3339d8883ba4770bdd0071566e1ce457501
EBUILD pcsc-tools-1.5.6.ebuild 1334 BLAKE2B 8f671f22c23efe48c28f9af575d596dd2573e97894f80f85f5727da4d62eded2779158b9f4d8d2190cda6ddce10ca26d89dbec3972870311d479127a7829096d SHA512 4692b478bfa5add8df4784e3a291bd6d782fb4c012f012d50cc964d3d726e09435a1f2257a4c9ad664fe7285a1fa33c185e1503633e43d7b35d8fe5ae25df22f
+EBUILD pcsc-tools-1.5.7-r1.ebuild 1384 BLAKE2B cfa533a949228bd37faba534b8643809fd6a3db641a3cefbfd64502769cf2c2147b04bac9245fed0e242639ebc9dc327151fde077b61fcbafa50fe8c4a102865 SHA512 6ede8d9306ef45184908398de1d87cb49da2acd5727951151b6ddce5ff9b86b6e6f60e4b023f3032d4f689bb01054a6474467840224c1862b53c9131f115f052
EBUILD pcsc-tools-1.5.7.ebuild 1384 BLAKE2B f564d094b220ae5f527e749439bf158d80ed630934ed2c67476a4e3082751be8c8db5db1686f00be9fa28f02d5e4d1219f231831b8a77178b7128516f84f3304 SHA512 8404504fabb1d89fcc85f122090ab672054efe137924faebfe496bf8eac5a30d3b1084a56b06e4b4d4d2503e9534b46a3187c092279b7263bcddf86622c8b448
MISC metadata.xml 357 BLAKE2B 42de2e205846206e147c56d469fd99d34e0e0ae207337223f93089c4d6ff86dfdeeeb65a4d0fb81398afc8d847be8f4e7559dc34ee50b899e8f20bcbea79b606 SHA512 241d96ef35852c80c581c527a9e469043c218cd81a4fa835c36d097e0b128961482d081e879cb99d74694121e35a99fb75ec7b9eba4f30970897c4e2fc3839db
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild
new file mode 100644
index 000000000000..c4fece6556bd
--- /dev/null
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="PC/SC Architecture smartcard tools"
+HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/ https://github.com/LudovicRousseau/pcsc-tools"
+SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="gtk network-cron"
+
+DEPEND=">=sys-apps/pcsc-lite-1.4.14"
+RDEPEND="${DEPEND}
+ dev-perl/pcsc-perl
+ gtk? ( dev-perl/Gtk3 )"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=(
+ README Changelog
+)
+
+src_compile() {
+ # explicitly only build the pcsc_scan application, or the man
+ # pages will be gzipped first, and then unpacked.
+ emake pcsc_scan CC="$(tc-getCC)"
+}
+
+src_install() {
+ einstalldocs
+
+ # install manually, makes it much easier since the Makefile
+ # requires fiddling with
+ dobin ATR_analysis scriptor pcsc_scan
+ doman pcsc_scan.1 scriptor.1p ATR_analysis.1p
+
+ if use gtk; then
+ domenu gscriptor.desktop
+ dobin gscriptor
+ doman gscriptor.1p
+ fi
+
+ if use network-cron ; then
+ exeinto /etc/cron.monthly
+ newexe "${FILESDIR}"/smartcard.cron update-smartcard_list
+ fi
+
+ insinto /usr/share/pcsc
+ doins smartcard_list.txt
+}
+
+pkg_postinst() {
+ use gtk && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 6277d0c10e05..0aaddcdb382e 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,6 @@
DIST pkgcore-0.12.10.tar.gz 625285 BLAKE2B e6d8aeec37e9f5379cc12ca9ff502bbfd8ab355087be63160b9a03feddb5c792cc0ef01d338926e3217ee01859fca5a84aa710db8e224dde8e2befc59e3fafad SHA512 8b5159a06e8291be1663de077ac089b0cfc0da1334111ee66cb6c3b627bb29ecbc7fa6b4727fef1d4c9ac93889a7de787114d07071157a1fc1ed0b5143ebe12f
+DIST pkgcore-0.12.11.tar.gz 625613 BLAKE2B f9bb17286cf30714d9f6f47ae6286031e418fd5f420e8921e1f1ed546cb1f293772e8d6e11ea2f4af8046d82fd166abb7c27f640f7f105c13a73d9ce19ccc52b SHA512 b98804603a9d14562efd56d01fa0b17ee1753d25b8c108d0d12eb47b103787f5fa7170f9924b473996817f31c31c40b5920db597974438cdc43215f5f83e43db
EBUILD pkgcore-0.12.10.ebuild 1301 BLAKE2B 57d05e60b30be4a51fba84d10fa8fc4914d7e879f098b5a265c6f973d8180ccbcae86ba834fc0243aab4451b63f34d2d9dec264d45251a34abc376d27bffa894 SHA512 3c8a8001b429b97d057ee9212ba748b2e43c8323b7e0430fbed17bbd7200f9d4fe0af5bd36aa20de3112443c2bad824c0113a98afdd41441a1a72ca736ef27cb
+EBUILD pkgcore-0.12.11.ebuild 1309 BLAKE2B b92c0f41da48bbbd8e2ee2abf63da449e098ed5ee95a305b9ff101320bdd06d9fd54034384601c0be378baa5ce505e381a3834449bd6846cc83fd7aa46e02c2a SHA512 15ec096ac7978faff4191192030dda97ffa9dee7ad75ee6b57e2a44ce671753a6cbf6d6b855ab82c2295cdab6d5633ddcce6d0115a079fb3635bae9e86fc4b8f
EBUILD pkgcore-9999.ebuild 1309 BLAKE2B b92c0f41da48bbbd8e2ee2abf63da449e098ed5ee95a305b9ff101320bdd06d9fd54034384601c0be378baa5ce505e381a3834449bd6846cc83fd7aa46e02c2a SHA512 15ec096ac7978faff4191192030dda97ffa9dee7ad75ee6b57e2a44ce671753a6cbf6d6b855ab82c2295cdab6d5633ddcce6d0115a079fb3635bae9e86fc4b8f
-MISC metadata.xml 338 BLAKE2B 8e1efa689e0129b002ca035af4d3da753e9ef4d80029e01d2baceaca5a45a4c1c325ed25d58f38094a73564a033611e92a3b60d836967e9c664021d643bd0813 SHA512 019b2e934eb8f3a04148d4426466fc397983487122e10e9a2dc2f42e747bc7675947edf549e5ab5efb284d753de0af994a0a7a4f014ee22183a156afa4a462da
+MISC metadata.xml 373 BLAKE2B d50a9f253a6e39e9b97a29bda16b142ea409b58d9cdd955765639e162c26a9889918229d1645e27c5f7a26a4949e08af8a9f3b664650035b2abd77e0aca2c617 SHA512 bb58b38c187036ab4536a6cf96d28d79e9ca78c9f98289a3db61df36f14410a99e0d166cbaec78995517ca2e32a34cc621660c15b2446f520b19eefcdc8c9083
diff --git a/sys-apps/pkgcore/metadata.xml b/sys-apps/pkgcore/metadata.xml
index 0a3cb143f510..5c0a6aa8ab5f 100644
--- a/sys-apps/pkgcore/metadata.xml
+++ b/sys-apps/pkgcore/metadata.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>mgorny@gentoo.org</email>
- <name>Michał Górny</name>
- </maintainer>
- <upstream>
- <remote-id type="github">pkgcore/pkgcore</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">pkgcore/pkgcore</remote-id>
+ <remote-id type="pypi">pkgcore</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/pkgcore/pkgcore-0.12.11.ebuild b/sys-apps/pkgcore/pkgcore-0.12.11.ebuild
new file mode 100644
index 000000000000..8ee26f5ac2e5
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.11.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+ inherit git-r3
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="
+ >=app-shells/bash-5.0
+ dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+ RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+ RDEPEND+=" >=dev-python/snakeoil-0.9.10[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+ test? (
+ >=dev-python/pytest-6[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+ # With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
+ # https://bugs.gentoo.org/840266
+ local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+ addpredict /
+
+ local -x PYTHONDONTWRITEBYTECODE=
+ distutils-r1_src_test
+}
+
+python_install_all() {
+ local DOCS=( NEWS.rst )
+ [[ ${PV} == *9999 ]] || doman man/*
+ distutils-r1_python_install_all
+}
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 3b97dd2f8461..3dd280b3a3ac 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -3,5 +3,7 @@ AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc
AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
DIST plocate-1.1.15.tar.gz 73274 BLAKE2B 72dba287ba3357d2fa541542bf5e9d283eac672b7f3b2eebab687ecec930d6e91400eeb0f24c97d6133d69cae0308bc4473b7c8cbc5e263dd18ae8a7728a42a4 SHA512 772f82af38fd7b61fa51ac31f71d4a855542cfa617867da54b5ad8202f49f9e1861064a01e9b8f0937c3da902d84f19a50c1d0e4f037a491a9a6819b2413cfa1
-EBUILD plocate-1.1.15.ebuild 2086 BLAKE2B 9409e3c332deb24190a4c21cc131c7f327629f14d7b26d8de6438e4ccf0d29aa9e1efd01eb46cdcd9b3e7c16d90e9340f9d7d1cf61835587c75cc93228c1b8cb SHA512 bfc5795021a7863ba464d58d416755e29ecbe2c927f50fe1c96cc9215ec4249dee3e9a8fac11524eadc631b42a38f6a248955f9b9fc58ce4ccdc353703fff62f
+DIST plocate-1.1.16.tar.gz 73397 BLAKE2B b6706145e9cba8b386761229cfbf23f8a9490596210b0a8dc467dfa6a6ed5b349c8f84cfcbe0430e89691afb50e257a3d331b1dcdc638611407587c8b623e72b SHA512 01dfc3ba434e6164f3e582fb102bd7ec0167a8f93e4cf9c3e72af804a8eda9b69b04fec20ee34fc19549d810b97076342f3a83b46705d0311ada6004d05da26c
+EBUILD plocate-1.1.15.ebuild 2195 BLAKE2B 707f602b2d22ab6a2856221c1d51b865d1cae1cfbc982e2ff839e70e0a7ff24ce15b9a967b30ca0a4fe7c9101d7e6e9e0ce782734752ced52098c65cd4b8121d SHA512 6394a30fb3ebb738d230c25d9e4857aca2ab5f31e279490b6b477dd871aaddf03cf5152b4dadbc92b8e87a06ccb8aaa3b8eec25af7fa92b0c2986ca136978ede
+EBUILD plocate-1.1.16.ebuild 2196 BLAKE2B 634e6419b067d6f07c68e8e581221444106788996b17bed3af68d4d95e2c3b22cf78491608ec22435cf8e91e899480491a1c7edb6e73393e6bd82f81a2483879 SHA512 60b1b3de696979e06b1d94de11916b2e0b155af471775e4e4001f5d8dd228e63e0daff1a0975768a0e90f602a1b8463b7885a580c06c829ed11bf9a59a7e9988
MISC metadata.xml 1437 BLAKE2B d3aece3d36e8cc4ceaf9947f0b535c7e2187a25cbb88910f704b1d72a2784831bfb746cca323c98183964688e6b5f2f2fa6bf54c97f8fc99eeea4ee946983e0d SHA512 b24d79da1b27531a7f3353128f7fbc583ef064f4aff58894e9d37dfa9144203c1f1898113aa31f82604aea93de66423e3313924bad25e31e075832c77a99c39e
diff --git a/sys-apps/plocate/plocate-1.1.15.ebuild b/sys-apps/plocate/plocate-1.1.15.ebuild
index 3fb8c7c34d07..5df0276d30a1 100644
--- a/sys-apps/plocate/plocate-1.1.15.ebuild
+++ b/sys-apps/plocate/plocate-1.1.15.ebuild
@@ -24,13 +24,18 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-CONFIG_CHECK="~IO_URING"
-ERROR_IO_URING="required for USE=io-uring"
-
PATCHES=(
"${FILESDIR}"/${PN}-1.1.15-meson-use-feature-option-for-libiouring.patch
)
+pkg_setup() {
+ if use io-uring && linux_config_exists; then
+ if ! linux_chkconfig_present IO_URING; then
+ ewarn "CONFIG_IO_URING must be enabled for USE=io-uring"
+ fi
+ fi
+}
+
src_prepare() {
# We'll install the manpage ourself to locate.1
sed -i "/install_man('plocate.1')/d" meson.build || die
diff --git a/sys-apps/plocate/plocate-1.1.16.ebuild b/sys-apps/plocate/plocate-1.1.16.ebuild
new file mode 100644
index 000000000000..baa634d92859
--- /dev/null
+++ b/sys-apps/plocate/plocate-1.1.16.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info meson systemd
+
+DESCRIPTION="Posting locate is a much faster locate"
+HOMEPAGE="https://plocate.sesse.net/"
+SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
+
+# GPL-2 for updatedb
+# GPL-2+ for plocate itself
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+io-uring"
+
+RDEPEND="
+ acct-group/locate
+ app-arch/zstd:=
+ io-uring? ( sys-libs/liburing:= )
+ !sys-apps/mlocate
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.15-meson-use-feature-option-for-libiouring.patch
+)
+
+pkg_setup() {
+ if use io-uring && linux_config_exists; then
+ if ! linux_chkconfig_present IO_URING; then
+ ewarn "CONFIG_IO_URING must be enabled for USE=io-uring"
+ fi
+ fi
+}
+
+src_prepare() {
+ # We'll install the manpage ourself to locate.1
+ sed -i "/install_man('plocate.1')/d" meson.build || die
+
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dlocategroup=locate
+ -Dinstall_systemd=true
+ -Dinstall_cron=false
+ -Dsystemunitdir="$(systemd_get_systemunitdir)"
+ "$(meson_feature io-uring use_libiouring)"
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ dodoc README NEWS
+ newman "${S}"/${PN}.1 locate.1
+ dosym plocate /usr/bin/locate
+
+ insinto /etc
+ doins "${FILESDIR}"/updatedb.conf
+ doins "${FILESDIR}"/plocate-cron.conf
+ fperms 0644 /etc/{updatedb,plocate-cron}.conf
+
+ insinto /etc/cron.daily
+ # Ensure that the cron file has the same name as the
+ # systemd-timer, to avoid plocate being run twice daily on systems
+ # with a systemd compatiblity layer. See also bug #780351.
+ newins "${FILESDIR}"/plocate.cron plocate-updatedb
+ fperms 0755 /etc/cron.daily/plocate-updatedb
+
+ systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ elog "The database for the locate command is generated daily by a cron job,"
+ elog "if you install for the first time you can run the updatedb command manually now."
+ elog
+ elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
+ elog "please customize it to your system requirements."
+ fi
+}
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index f3a9f659894b..cba3b490150d 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -1,7 +1,10 @@
AUX pmount-0.9.19-testsuite-missing-dir.patch 1360 BLAKE2B 3a44bfe3de89169f5666886b9c192e0f530b3a3785c8a64fbfbdbbbc93331a9c74cbc19cab25ebcc0f5e3fb64d23348f1dd8deaf028545d444000a64d6a5b45a SHA512 3bc940550f59d62106c610d7846ddea09cab674b176cd7361848d283b0f19a0fda5573c6bafb99abe99c806651493ed07ac21f92d32f7dc30d0ccb77a4c1928e
AUX pmount-0.9.99_alpha-exfat-support.patch 499 BLAKE2B 11045f138c9b20c03f39760d2da8c36600f1be539b2fdfba6e5ba9f97b953945fed7fd9d127ed0f1874cf9f36efe455c32a726e52bf8274c381da476a64e723d SHA512 d2b0024a73343646d688212749ef4e1b6b01f93e2e5059eb1a94b3e0a84a1c2491551c80d295fa62815e609c5f7c442920cfa832fa74a836904b6cef1048c847
+AUX pmount-0.9.99_alpha-limits-musl.patch 176 BLAKE2B 34e41d6c1b5e0a13db17ec5341cbc66a95a6e52f0edccace07f067655d7c72fe186203368941c4b5172c32b826e86becca25a50cb7fdde9ffc6d213029887ade SHA512 20d90921827b6bcc89dc8df01c2b83279c334d096b4f17591acf8d042d7813d6e16bcc7b3fa40feddfbc740fdc98d1c16e6e95359af8c3f40496e1ac8c3ab82e
AUX pmount-0.9.99_alpha-locale-regex.patch 753 BLAKE2B a79805f883143f6beea9597ab88059e15ccde83d08ce69625c8c3387b419e46f8a6ea3c3937c17adfdbaeaa4dd5c3f9ad7aef8d67cc5dd406e79dbc250196c1b SHA512 423d52a372c7cdd73206a9001fcc717b50b834023130cc77e4e063ac2b62ae5c84698d127646e3658ae44e3a47f2c77522d007664cf0c4277dc49b47413c8563
+AUX pmount-0.9.99_alpha-missing-includes.patch 1522 BLAKE2B d1adc8c74fb67010df912eaa650f6d06fb0dab513edbcce403834b9679cb95c56681f6785bc1a8bdc306335c49339384e912de51550d062ef595733bda77bd97 SHA512 5457a641e5a40c90119d25d835757d7f4ed127cc36838715ddb6d957b83b3dddb5fb0357cfef7fe0b4b6133249476fc585a8d78cda1057debf9576c316df8ddc
AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r6.ebuild 2054 BLAKE2B 6fd8f5a1d5a3f68636fa85c0ac07e2ad666694173e7d6712fe85c0b0caa8908c12133159c5d19b56972060eeb19b1e7f7966eb29690d734ba357e49d521190ee SHA512 dd24bfdbe6f7cd5e2d1ca844976d440ef0c76476c4c0808a689ba2fc607613b916dab12b091e7a29492e898bdb7bf2fc7d3a1aee719699a0285a79ff0136553b
+EBUILD pmount-0.9.99_alpha-r6.ebuild 2091 BLAKE2B 1765473acb740cad9ec5d9fd44f31b2742b82ff375156824cc7fb34b921b767cfa5887558e7ffedf04df3cd3afbfae78f3ff7a4ee4898768a38fad659fc4bd5c SHA512 93ea2e28487a0fd771afc81f0d413dbeaeb63d3337b849976b035efb4e3666f148cce9d9fd871991e2e4073c47910c23a962677919bec161b4e3ce31d638fc63
+EBUILD pmount-0.9.99_alpha-r7.ebuild 2274 BLAKE2B 11ade87d1a94362701f85ed5f243833b041bbfa85fed6d32cf7a9a02336a0de10056458f3bbf788e5ca93e89a192a6e33019072c846d831dee1c2da05e163af4 SHA512 3da339d0e774a8236f1b2317acebe6634f9dcc7c122319aafccdcb90bd3fb422bfa1d189d8f8288b147de9f764153a0d84b4b0e4a9470329bb5173792def1494
MISC metadata.xml 435 BLAKE2B 66040336d89bbeae61ac4385f1744bff6cd3f0275efae4c57df0dc6a9a74a0594a046e25092b21273b83cd80ee86f29963702063ee3b9ef73a3f6d6ff9fd7289 SHA512 c1f52d17d0922fe6809259d0394453110c796e94114e348a70e32e5af134a843c7a4b2bb61ca67361a2dc1e8e7c41822cffe7118590b63eeb7afcd285816d341
diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-limits-musl.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-limits-musl.patch
new file mode 100644
index 000000000000..af6a1ebc521d
--- /dev/null
+++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-limits-musl.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/713422
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -25,6 +25,7 @@
+ #include <libintl.h>
+
+ #include <unistd.h>
++#include <limits.h>
+
+ #include "utils.h"
+
+
diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-missing-includes.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-missing-includes.patch
new file mode 100644
index 000000000000..cdcb65ad822d
--- /dev/null
+++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-missing-includes.patch
@@ -0,0 +1,82 @@
+--- a/src/conffile.c
++++ b/src/conffile.c
+@@ -22,6 +22,7 @@
+ #include <sys/types.h>
+ #include <pwd.h>
+ #include <grp.h>
++#include <unistd.h>
+
+ #include "conffile.h"
+ #include "config.h"
+--- a/src/luks.c
++++ b/src/luks.c
+@@ -13,7 +13,9 @@
+ #include "utils.h"
+ #include "policy.h"
+ #include <stdio.h>
++#include <fcntl.h>
+ #include <limits.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include <libintl.h>
+
+--- a/src/policy.c
++++ b/src/policy.c
+@@ -13,6 +13,7 @@
+ #include "policy.h"
+ #include "utils.h"
+
++#include <ctype.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+--- a/src/pmount.c
++++ b/src/pmount.c
+@@ -29,6 +29,7 @@
+ #include "policy.h"
+ #include "utils.h"
+ #include "luks.h"
++#include "loop.h"
+ #include "config.h"
+
+ /* Configuration file handling */
+--- a/src/policy.c
++++ b/src/policy.c
+@@ -33,6 +33,7 @@
+ #include <pwd.h>
+ #include <utmpx.h>
+
++#include "configuration.h"
+
+ /* We use our own safe version of realpath */
+ #include "realpath.h"
+--- a/src/pumount.c
++++ b/src/pumount.c
+@@ -24,6 +24,7 @@
+ #include "utils.h"
+ #include "luks.h"
+ #include "config.h"
++#include "configuration.h"
+
+ /* error codes */
+ const int E_ARGS = 1;
+--- a/tests/test_policy.c
++++ b/tests/test_policy.c
+@@ -16,6 +16,7 @@
+ #include "policy.h"
+ #include "utils.h"
+ #include <stdio.h>
++#include <string.h>
+
+ int testsFailed = 0;
+ int totalTests = 0;
+--- a/tests/test_spawn.c
++++ b/tests/test_spawn.c
+@@ -12,6 +12,7 @@
+
+
+ #include <stdio.h>
++#include <string.h>
+ #include <unistd.h>
+ #include "utils.h"
+
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
index e6a575c9f139..1d336844462f 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,7 +26,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch
"${FILESDIR}"/${P}-locale-regex.patch
"${FILESDIR}"/${P}-exfat-support.patch
-
+ "${FILESDIR}"/${P}-limits-musl.patch
)
src_prepare() {
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild
new file mode 100644
index 000000000000..baad4714b833
--- /dev/null
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
+HOMEPAGE="https://launchpad.net/pmount"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
+S="${WORKDIR}"/${P/_/-}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt"
+
+# cryptsetup is executed at runtime only, no libraries used AFAICT
+# but in DEPEND too as it's checked during configure
+RDEPEND="
+ acct-group/plugdev
+ >=sys-apps/util-linux-2.17.2
+ crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/gettext"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch
+ "${FILESDIR}"/${P}-locale-regex.patch
+ "${FILESDIR}"/${P}-exfat-support.patch
+ "${FILESDIR}"/${P}-limits-musl.patch
+ "${FILESDIR}"/${P}-missing-includes.patch
+)
+
+src_prepare() {
+ # Restore default value from pmount <= 0.9.23 wrt #393633
+ sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
+
+ cat <<-EOF > po/POTFILES.skip || die
+ src/conffile.c
+ src/configuration.c
+ src/loop.c
+ EOF
+
+ default
+}
+
+src_configure() {
+ econf --disable-hal
+}
+
+src_test() {
+ local testdir=${S}/tests/check_fstab
+
+ ln -s a "${testdir}/b" &&
+ ln -s d "${testdir}/c" &&
+ ln -s c "${testdir}/e" ||
+ die "Unable to create fake symlinks required for testsuite"
+
+ emake check
+}
+
+src_install() {
+ # Must be run SETUID+SETGID, bug #250106
+ exeinto /usr/bin
+ exeopts -m 6710 -g plugdev
+ doexe src/{p,pu}mount
+
+ dodoc AUTHORS ChangeLog TODO
+ doman man/{{p,pu}mount.1,pmount.conf.5}
+
+ insinto /etc
+ doins etc/pmount.{allow,conf}
+
+ keepdir /media #501772
+
+ newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+ bashcomp_alias pmount pumount
+}
+
+pkg_postinst() {
+ elog
+ elog "This package has been installed setuid and setgid."
+
+ elog "The permissions are as such that only users that belong to the plugdev"
+ elog "group are allowed to run this. But if a script run by root mounts a"
+ elog "device, members of the plugdev group will have access to it."
+ elog
+ elog "Please add your user to the plugdev group to be able to mount USB drives"
+}
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 33b722d7c7ba..1a609503b989 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,8 +1,8 @@
AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b122b16e88190cad74891434c57fff3d9d4fa2529ac5e88cbbf572e710cf0bc313ffb83d8e80261265c121230f3975900a7ed97093dbd2f8930 SHA512 2e42dcc62be3a224b0bb153c615e12dc7febcb11bc46dca32d1ccafe51a8ceb4e57c63080b6cd8c8e87e16ea901dcfdc6aab9dd9c6f48b691a23da4eadad007d
DIST policycoreutils-3.3.tar.gz 2818092 BLAKE2B 0ed9f128a774176ebadb71f448af8dee8c616a706314783b646869e7ea91892e358d5bb03e3aece3d0e6dc3203852e4e2925482727df1e5c71e075236ee43e5c SHA512 db658990355f99a8e43f53d20cc67bf9e557b0a7837d1927c80f325b7f93ad47876382278a980b818484d6e31712a9b03e279f947ebc88c4be60a9f395607f98
-DIST policycoreutils-3.4-rc1.tar.gz 771240 BLAKE2B 27f730c1f870be9175bef9d8c44ad74f737d5a185d369ceb84c609974423ffea5ce1f8a602af6d25253df963e37c7d2fd5a4cc4877782f6768cfaf5a544c4aa4 SHA512 bbe7b126f07b895d6bea4dfdbc6574a3f8ba08466979f8ed5009b54c68eb0c7f1786d175f52925d0e7e983ca799b846f50112b50c5d6d4edc1b03152593b68c1
+DIST policycoreutils-3.4.tar.gz 771435 BLAKE2B 53654ad8f17c8e539c7821ddcc4f40dde1aa214943b5f2876efbfd8e10c90747d21c1530df3d53e51677159026a70691db6282f3bedc79739673380e053f74a2 SHA512 ded0d6fb5e3f165a893ee42411ac82616ddf37a02acaca6a8437b8f10ea12e5594bbd7bc7e3ead12df00c018078950f3fbe55604c41b0554257c4ca18f55ebb6
DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
EBUILD policycoreutils-3.3.ebuild 4509 BLAKE2B 082483774c49df970002fbdd2f163b604f52bbf621e5754e7e1ff7a3fb9e0fadc2be5c552e4dade95e4946955dfd052d0d10d8efb2956f458a1844d3faf25a8a SHA512 4952b2a4f9d065b60ec3c623909e1279f538bac5c7349186fcb0d9325c5f8ac5bab882986fa3b27219e2ff21d1fe81ed97d7de5cefd71b2479c5d5815c48299c
-EBUILD policycoreutils-3.4_rc1.ebuild 4563 BLAKE2B b1f005f3c1fcf15e76a3e8f6e28da3c82bcc9de3f7e9551be1e5f082d76b437584acf11a5324585aa2da3f5562550d384edbb99dbbe9a3ca4aabba3e1d9d354b SHA512 d09ebbfae77df40a5817332bc24529ccc1820faf0c0fdac71b4e0fde41ed2f251460f73e10fca24cc8b5c4c6024786ba1291bbfa76bebc5f8860cebe087635c6
-EBUILD policycoreutils-9999.ebuild 4563 BLAKE2B b1f005f3c1fcf15e76a3e8f6e28da3c82bcc9de3f7e9551be1e5f082d76b437584acf11a5324585aa2da3f5562550d384edbb99dbbe9a3ca4aabba3e1d9d354b SHA512 d09ebbfae77df40a5817332bc24529ccc1820faf0c0fdac71b4e0fde41ed2f251460f73e10fca24cc8b5c4c6024786ba1291bbfa76bebc5f8860cebe087635c6
+EBUILD policycoreutils-3.4.ebuild 4566 BLAKE2B 50bb4f9d7a953954612758b59225a6b08812eef9e6aafb27c18194b02530f5c68efa75e1c3daf9d9d52cf741e7b61ea7d6ba0c89430599200bf5fd2ec0ce863f SHA512 60871d3a75b14641e15e7e61e39a1b641b42b5a08e663101930f4ae0140764c61bca3a866dfe692f5546a8146830f043fa4082c5e1fdca10660a6edaa7b3954e
+EBUILD policycoreutils-9999.ebuild 4566 BLAKE2B 50bb4f9d7a953954612758b59225a6b08812eef9e6aafb27c18194b02530f5c68efa75e1c3daf9d9d52cf741e7b61ea7d6ba0c89430599200bf5fd2ec0ce863f SHA512 60871d3a75b14641e15e7e61e39a1b641b42b5a08e663101930f4ae0140764c61bca3a866dfe692f5546a8146830f043fa4082c5e1fdca10660a6edaa7b3954e
MISC metadata.xml 1118 BLAKE2B b77b6c2e9fbc2fe7e0079d08c6e361f91131951db7f3babd217b6a122f780cdb1cf7624ab3af21066d65493b571516da7ba2f2dcb41fe6d1dadef4ffb12852fb SHA512 a1cce588f3d89b33399bc871da491480610c187379d62a4650c02955ff213b93f506a4d82e638a5ffc5ca3a2f4210b89c078406cc0d835d2603676e600b9d8de
diff --git a/sys-apps/policycoreutils/policycoreutils-3.4.ebuild b/sys-apps/policycoreutils/policycoreutils-3.4.ebuild
new file mode 100644
index 000000000000..1ac0b78acdaf
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-3.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit multilib python-r1 toolchain-funcs bash-completion-r1
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+EXTRAS_VER="1.37"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+ SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+ S1="${WORKDIR}/${P}/${PN}"
+ S2="${WORKDIR}/policycoreutils-extra"
+ S="${S1}"
+else
+ SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz
+ https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+ S1="${WORKDIR}/${MY_P}"
+ S2="${WORKDIR}/policycoreutils-extra"
+ S="${S1}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="audit pam split-usr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
+ >=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
+ >=sys-libs/libsepol-${PV}:=
+ sys-libs/libcap-ng:=
+ >=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+ audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
+ pam? ( sys-libs/pam:= )
+ ${PYTHON_DEPS}"
+
+# Avoid dependency loop in the cross-compile case, bug #755173
+# (Still exists in native)
+BDEPEND="sys-devel/gettext"
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${DEPEND}
+ app-misc/pax-utils"
+
+PDEPEND="sys-apps/semodule-utils
+ sys-apps/selinux-python"
+
+src_unpack() {
+ # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+ default
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ fi
+}
+
+src_prepare() {
+ S="${S1}"
+ cd "${S}" || die "Failed to switch to ${S}"
+ if [[ ${PV} != 9999 ]] ; then
+ # If needed for live ebuilds please use /etc/portage/patches
+ eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
+ fi
+
+ # rlpkg is more useful than fixfiles
+ sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+ || die "fixfiles sed 1 failed"
+ sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+ || die "fixfiles sed 2 failed"
+
+ eapply_user
+
+ sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
+ python_copy_sources
+ # Our extra code is outside the regular directory, so set it to the extra
+ # directory. We really should optimize this as it is ugly, but the extra
+ # code is needed for Gentoo at the same time that policycoreutils is present
+ # (so we cannot use an additional package for now).
+ S="${S2}"
+ python_copy_sources
+}
+
+src_compile() {
+ building() {
+ emake -C "${BUILD_DIR}" \
+ AUDIT_LOG_PRIVS="y" \
+ AUDITH="$(usex audit y n)" \
+ PAMH="$(usex pam y n)" \
+ SESANDBOX="n" \
+ CC="$(tc-getCC)" \
+ LIBDIR="\$(PREFIX)/$(get_libdir)"
+ }
+ S="${S1}" # Regular policycoreutils
+ python_foreach_impl building
+ S="${S2}" # Extra set
+ python_foreach_impl building
+}
+
+src_install() {
+ # Python scripts are present in many places. There are no extension modules.
+ installation-policycoreutils() {
+ einfo "Installing policycoreutils"
+ emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+ AUDIT_LOG_PRIVS="y" \
+ AUDITH="$(usex audit y n)" \
+ PAMH="$(usex pam y n)" \
+ SESANDBOX="n" \
+ CC="$(tc-getCC)" \
+ LIBDIR="\$(PREFIX)/$(get_libdir)" \
+ install
+ python_optimize
+ }
+
+ installation-extras() {
+ einfo "Installing policycoreutils-extra"
+ emake -C "${BUILD_DIR}" \
+ DESTDIR="${D}" \
+ install
+ python_optimize
+ }
+
+ S="${S1}" # policycoreutils
+ python_foreach_impl installation-policycoreutils
+ S="${S2}" # extras
+ python_foreach_impl installation-extras
+ S="${S1}" # back for later
+
+ # remove redhat-style init script
+ rm -fR "${D}/etc/rc.d" || die
+
+ # compatibility symlinks
+ use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles
+
+ bashcomp_alias setsebool getsebool
+
+ # location for policy definitions
+ dodir /var/lib/selinux
+ keepdir /var/lib/selinux
+
+ # Set version-specific scripts
+ for pyscript in rlpkg; do
+ python_replicate_script "${ED}/usr/sbin/${pyscript}"
+ done
+}
+
+pkg_postinst() {
+ for POLICY_TYPE in ${POLICY_TYPES} ; do
+ # There have been some changes to the policy store, rebuilding now.
+ # https://marc.info/?l=selinux&m=143757277819717&w=2
+ einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
+ semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+ done
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-3.4_rc1.ebuild b/sys-apps/policycoreutils/policycoreutils-3.4_rc1.ebuild
deleted file mode 100644
index 91d0f1ac5ab7..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-3.4_rc1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs bash-completion-r1
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
-EXTRAS_VER="1.37"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
- SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
- S1="${WORKDIR}/${P}/${PN}"
- S2="${WORKDIR}/policycoreutils-extra"
- S="${S1}"
-else
- SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz
- https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
- S1="${WORKDIR}/${MY_P}"
- S2="${WORKDIR}/policycoreutils-extra"
- S="${S1}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="audit pam split-usr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
- >=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
- >=sys-libs/libsepol-${PV}:=
- sys-libs/libcap-ng:=
- >=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
- audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
- pam? ( sys-libs/pam:= )
- ${PYTHON_DEPS}"
-
-# Avoid dependency loop in the cross-compile case, bug #755173
-# (Still exists in native)
-BDEPEND="sys-devel/gettext"
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${DEPEND}
- app-misc/pax-utils"
-
-PDEPEND="sys-apps/semodule-utils
- sys-apps/selinux-python"
-
-src_unpack() {
- # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
- default
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- fi
-}
-
-src_prepare() {
- S="${S1}"
- cd "${S}" || die "Failed to switch to ${S}"
- if [[ ${PV} != 9999 ]] ; then
- # If needed for live ebuilds please use /etc/portage/patches
- eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
- fi
-
- # rlpkg is more useful than fixfiles
- sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
- || die "fixfiles sed 1 failed"
- sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
- || die "fixfiles sed 2 failed"
-
- eapply_user
-
- sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
-
- python_copy_sources
- # Our extra code is outside the regular directory, so set it to the extra
- # directory. We really should optimize this as it is ugly, but the extra
- # code is needed for Gentoo at the same time that policycoreutils is present
- # (so we cannot use an additional package for now).
- S="${S2}"
- python_copy_sources
-}
-
-src_compile() {
- building() {
- emake -C "${BUILD_DIR}" \
- AUDIT_LOG_PRIVS="y" \
- AUDITH="$(usex audit y n)" \
- PAMH="$(usex pam y n)" \
- SESANDBOX="n" \
- CC="$(tc-getCC)" \
- LIBDIR="\$(PREFIX)/$(get_libdir)"
- }
- S="${S1}" # Regular policycoreutils
- python_foreach_impl building
- S="${S2}" # Extra set
- python_foreach_impl building
-}
-
-src_install() {
- # Python scripts are present in many places. There are no extension modules.
- installation-policycoreutils() {
- einfo "Installing policycoreutils"
- emake -C "${BUILD_DIR}" DESTDIR="${D}" \
- AUDIT_LOG_PRIVS="y" \
- AUDITH="$(usex audit y n)" \
- PAMH="$(usex pam y n)" \
- SESANDBOX="n" \
- CC="$(tc-getCC)" \
- LIBDIR="\$(PREFIX)/$(get_libdir)" \
- install
- python_optimize
- }
-
- installation-extras() {
- einfo "Installing policycoreutils-extra"
- emake -C "${BUILD_DIR}" \
- DESTDIR="${D}" \
- install
- python_optimize
- }
-
- S="${S1}" # policycoreutils
- python_foreach_impl installation-policycoreutils
- S="${S2}" # extras
- python_foreach_impl installation-extras
- S="${S1}" # back for later
-
- # remove redhat-style init script
- rm -fR "${D}/etc/rc.d" || die
-
- # compatibility symlinks
- use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles
-
- bashcomp_alias setsebool getsebool
-
- # location for policy definitions
- dodir /var/lib/selinux
- keepdir /var/lib/selinux
-
- # Set version-specific scripts
- for pyscript in rlpkg; do
- python_replicate_script "${ED}/usr/sbin/${pyscript}"
- done
-}
-
-pkg_postinst() {
- for POLICY_TYPE in ${POLICY_TYPES} ; do
- # There have been some changes to the policy store, rebuilding now.
- # https://marc.info/?l=selinux&m=143757277819717&w=2
- einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
- semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
- done
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 91d0f1ac5ab7..1ac0b78acdaf 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
inherit multilib python-r1 toolchain-funcs bash-completion-r1
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 96cf54b35726..1426fc0c6cde 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -21,6 +21,6 @@ EBUILD portage-3.0.28-r1.ebuild 8727 BLAKE2B e174e7fb7f51f1ec04d4076f6b04e9d7fac
EBUILD portage-3.0.29.ebuild 8548 BLAKE2B 32eba52517af7bde9fbafddb15203a7c9c6b72cd549b6a81f79b35b0ba96cedc7a121f3dd9496a3d4c66377ef591fe63a6eb0b57da3a1b72d0e2656aa4b11da9 SHA512 11f9394cfd8ed261d0b83a724366d9e43b2fb76fd71d1f6e1424ebf07d55a4dde78ea25157266f5eb6bd85d414f07d4499888907697d41248ceabf74ced03282
EBUILD portage-3.0.30-r3.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43
EBUILD portage-3.0.30-r4.ebuild 8926 BLAKE2B 96f1c4b40f1489d5a8c0274b9795460c4b3cd9508e8bb44506b98961ebceba1daf4a48008805631075a8d4cc2ca97f17ebf8d0571f71b1a8ba95a8ba9612a0fc SHA512 47328268b12cedcee99ee431f5eda36ab02d790a77bb0bb9658e9248b9b1bb2d3d1a5aa2567be5ae74a8a3ae0666b4d7aa9fed7a74f6113c8333858b9a040b5a
-EBUILD portage-3.0.30-r5.ebuild 8973 BLAKE2B 7d128def685ab7656f51ebdcccad1ee21719eaff8d8e61581c3f01fa6712a01a769c9c35c004796deae0e7fa7226c0e2ff935475210bb8dbbc8f05ea8efc3b99 SHA512 55151ccc3c2f0c5631de0230137b1325d7d268100bbfde66221b35a460fb67c12841101144b8996ab4ca2369b88a2806e0c1b4afdfd784827ee86316e0bda6d0
-EBUILD portage-9999.ebuild 8018 BLAKE2B 9df65587b54a652aa2c404bbb6cc97a96740c5467753858d3a498ddf5990db62ca8ae590a67e21d793297bc02ff61c0eef86ccef0f7a7e135866914acad8e780 SHA512 51307bb4ec176494f4fd4c9d24bf876bc0dc69077ae0fd814e69844a6ef640974ca8b4897358a3f3082baaa8d66287e1910890d381d0b8da5fe888c1ceb4627e
-MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402
+EBUILD portage-3.0.30-r5.ebuild 8973 BLAKE2B 0b3396401ef95f21383bc0c9792db80c491d9ea50ffa65985b34289171a20d738b4972fb599d5e1939fef4c60c14a3fec134161381b40ef105f99ba67f7afe7c SHA512 cfa11f597b58d814b8ed6efef30dd2b19935785d61595a2dfbb1220fa5c2417cb724af08cf390bc3896ccf2c68d2834e92cf9ec98e8e7fa3c2ee0a43c8cfad05
+EBUILD portage-9999.ebuild 8018 BLAKE2B 697673972eb6bf97f1787e316dd5f47e24ac875a51c2f6397cb756cdd47e2d13517c497831a4aa106195ef6010ba6d55705727e3110cb4f696c7077b87d1cfde SHA512 e93838433d223a828c959ccc21411525794e611a21352d7e47c06cd17b337a8bd8b1af12324bcc5d5d2e03357d8a185b13458a627724b365f9005e163740ede8
+MISC metadata.xml 1530 BLAKE2B fc0b28f07ffc585142eeef77c4365c89b883e6d4543a2c9a91164f809189543926550e4df1dfc9f86b0585da717e7586240d6d9948766944eada542b6f303cc3 SHA512 1b02a082b1cea7c6346ba96dac653d0bf49fc3b65b26ea87ce9a390f6b483579b068409a13142b38105d0c17a580c3104ed3992a2d30063576b57b5a395814c0
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 58ed367a289a..60a055aa8e08 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -6,6 +6,7 @@
<changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog>
<doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc>
<remote-id type="cpe">cpe:/a:gentoo:portage</remote-id>
+ <remote-id type="pypi">portage</remote-id>
</upstream>
<maintainer type="project">
<email>dev-portage@gentoo.org</email>
diff --git a/sys-apps/portage/portage-3.0.30-r5.ebuild b/sys-apps/portage/portage-3.0.30-r5.ebuild
index e3b118e52957..8634c1a2e2ad 100644
--- a/sys-apps/portage/portage-3.0.30-r5.ebuild
+++ b/sys-apps/portage/portage-3.0.30-r5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
PYTHON_REQ_USE='bzip2(+),threads(+)'
TMPFILES_OPTIONAL=1
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 03fbe40d7065..f134a27fd88e 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
PYTHON_REQ_USE='bzip2(+),threads(+)'
TMPFILES_OPTIONAL=1
diff --git a/sys-apps/ppc64-diag/Manifest b/sys-apps/ppc64-diag/Manifest
index 03875e4e80a3..17cbe1d53086 100644
--- a/sys-apps/ppc64-diag/Manifest
+++ b/sys-apps/ppc64-diag/Manifest
@@ -2,5 +2,7 @@ AUX fix-systemd-unit-path.patch 1539 BLAKE2B 78865aea8745102e34a0f29884d21efd768
AUX opal_errd.initd 374 BLAKE2B b463e484e60ea63afd2c4f27a4e8330ae6733ecd3e6925b4c1e7333022ff1bd895da29343a7dbf1e92a88c9b204b691d64450c3847dacc8329678f2c9b55cb21 SHA512 1e6e363dbf59d3ef96e724d37d9dd6e764a145cbaf3cc18007d9da50dc5c2ef4effef50282daea93db62ae6722cb6857060896ab5ff76b7348d42d09926b2b04
AUX rtas_errd.initd 371 BLAKE2B a5367e20d7732fc0b778349e740351fbd55049a08e456a859fc5d8a2e06418bc865b7ef5d27fb3ba420bb008ca7ee5b4781fc41393716d6e502cb691f602805b SHA512 a92128d9b5e31d1206999123734924e8e24833beba4e39b067fbb38bb16cbf174d1dbd51a1d27f294ba95da849020fd60e737ada35db98a7b6210cd06375c1de
DIST ppc64-diag-2.7.7.tar.gz 423357 BLAKE2B b32def540811f383e401d352d17f2edce6a998a91a7b27bcab981e42469f44aaa505104ed2d2ced8a85485c0886525ff5128b36cdbad3a8eed90e8002877498c SHA512 42d94214345ab8deb7bd9ee8b145052fc2f733ba13d1567dbe6592fe9306670e3cd0ab6122e515464f7050753a992061c056e009673c7f8f6e554e9eaf75c550
+DIST ppc64-diag-2.7.8.tar.gz 424366 BLAKE2B e5e4791dffba4ede725051682019f0b75c2ee718fd33170912ccf228946fa56b4e63930a9b9c8d7e58ce27f0a18b03ea7c58ba259b781d4c40eed945e2d895a9 SHA512 1a8890624609f64eb412cabb690f30a67b7f714260de14acc195268ecbda79d6c5e7d80694dabb3ab148fc74a4df6b8e147750e869ab49f40d04742ef284398e
EBUILD ppc64-diag-2.7.7.ebuild 1557 BLAKE2B f2625c84268207eb112f92318383567e347b4b4286da37d2c5c5e5ce24078e54430617176cb9e22f0170663e5a36d13309fd18c4c2f2e0eac6243cdc690dc225 SHA512 d4d3b3ecf072c68a2122ebeab58e724a0b497c1911591f4a5ebc30c84fad819d0f6eb5e4c5c8ba5891f1600ad936e9a6e9af77a3049710723dabfec75376050f
+EBUILD ppc64-diag-2.7.8.ebuild 1572 BLAKE2B 1d38e9dc5a739fa8791f2c515aeeb96ff6f73c4bf6a75a4c2b3278b1137775c75077be53f9c754156d9fb13787eb23d60ca8117f0fe236cdc2d6cb8ce6d4c8b1 SHA512 57a492c116173c5f909cb5c7af9792bfd3d3dca2862c35e7a807e666ca02207ac2e4e651f112cdd133ef0ffafd86135a9236fcccfa9665e437f20abc3546d3c4
MISC metadata.xml 696 BLAKE2B 28351b849bd1cb8fc12fa9830d59ee750257357145f8c6190b86c6fe312d1402fdca5fe6a6605345089fb3ee31afdb0fe72745dd766b64e3511e5209e34493a5 SHA512 316773db58db5a822a0b7e2d0924028e4be047eb7a7747ad00f10cafe8a31500f4a9643f2b6ba4c8015e3ce77e93d6898aa370883cb76a476408f8847bb7461c
diff --git a/sys-apps/ppc64-diag/ppc64-diag-2.7.8.ebuild b/sys-apps/ppc64-diag/ppc64-diag-2.7.8.ebuild
new file mode 100644
index 000000000000..d8d62ef7d06e
--- /dev/null
+++ b/sys-apps/ppc64-diag/ppc64-diag-2.7.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Diagnostic tools for PowerLinux"
+HOMEPAGE="https://github.com/power-ras/ppc64-diag"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE="rtas"
+
+DEPEND="virtual/libudev:=
+ rtas? (
+ sys-libs/ncurses:0=
+ sys-libs/librtas
+ sys-libs/libservicelog
+ >=sys-libs/libvpd-2.2.9:=
+ )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/fix-systemd-unit-path.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with rtas librtas)
+ # handle ncurses[tinfo]
+ sed -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+ -i Makefile || die
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}/opal_errd.initd" opal_errd
+
+ if use rtas; then
+ newinitd "${FILESDIR}/rtas_errd.initd" rtas_errd
+ keepdir /var/log/ppc64-diag/diag_disk
+ else
+ # makefile installs it unconditionally
+ rm -rf "${ED}/lib/systemd/system/rtas_errd.service" || die
+ rm -rf "${ED}/usr/lib/systemd/system/rtas_errd.service" || die
+ fi
+
+ keepdir /var/log/opal-elog
+ keepdir /var/log/dump
+}
+
+src_test() {
+ # it assumes MKTEMP created dir in /tmp, add /var to the string.
+ # /varplatform.0x01 becomes platform.0x01, just as test expects
+ # so we sed a sed expression, don't judge me
+ sed -i 's%\/tmp/%\/var\/tmp\/%' opal_errd/tests/test-extract_opal_dump-000 || die
+ emake check
+}
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index 3f48d7aefc4d..d5f991b57fd9 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -1,5 +1,5 @@
AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d1128026ffc5112f9a0611d6eff9fbf2aacb9660bd3698727da5812da5b8937205246d70a20a5f876156b6ebe46638289c0e6cabd9 SHA512 c34c7f314420a1597b0c5aa44f6ae3b55e212d1bb9c00498f5e1525390bb2e62d68ebbe5dabc48468e79f0fe8f2f30b81459a5e9cc0b3e837239d39230fd7238
AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
DIST razercfg-0.42.tar.xz 103300 BLAKE2B 83f9432edf4deda78514dd1e2a65e04981d3646c543ebf3b74060f5d6ee5f9c3ddec5b0c544c11c9968c790172ae2bd4d4503adaf1428ca31337fdcd33d8545c SHA512 3856f4133b620fb639a46a5bb02fe8e6c47ae3928a04fe9d1bbef2792a44fdd4f5dff2efa43a1e43d75312025d3c65c626e331e723092e4e0b8d6622657fb197
-EBUILD razercfg-0.42.ebuild 2113 BLAKE2B 62885dfaeccbd82fe41cbecf614125fd7f0cb44865a36d3020d63a9fcf30e8bf129268a995a81f1f1b21def3f2ee84a6e9bd769f414fbc56545cedc12d45784c SHA512 c644c8f8735c82a7a9953fc3793e484e4456acc457959ff773d1af1658bfc2e225fd897f41702a589880dbcf4906e4b1abe6827cf3a925341a946f4ebe4a5e84
+EBUILD razercfg-0.42.ebuild 2114 BLAKE2B 27aed82160985fff39fae4c008fcdcb9608be40442dffce9b1820aef3b91bc53a251d918f7d3accea39bdcc532e324a9eabd265ff9b845fd18e9d1488aa04deb SHA512 de5444579fd523e82c8fa02a2053d7e61781a6d1d6392c4590280beb7eb1a285746e54f7d6040f5458c479617f6d4e67900c18721ed5a7a5676d660b024766eb
MISC metadata.xml 994 BLAKE2B ca973295308e5fb4a3141efd6f2e23bd79940707f351fecffd8ac7afdf6f0953023c73948d37f34668478ba183e91707f7f6dc5cd0747ac2aa04b526f6e45f51 SHA512 ff960857c85416027490f7f2322ea030ca1b1a3554fac8ee632c8728227803e50c58e76d8acfe4429b9bae1ca6b2302c4bbeb71e5cbe4f4ddc4212628eccdcfe
diff --git a/sys-apps/razercfg/razercfg-0.42.ebuild b/sys-apps/razercfg/razercfg-0.42.ebuild
index 7a759a878d94..eade9c4b6c2d 100644
--- a/sys-apps/razercfg/razercfg-0.42.ebuild
+++ b/sys-apps/razercfg/razercfg-0.42.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake python-single-r1 systemd tmpfiles udev xdg-utils
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index a52bbbb75dde..2e3e5f356ec6 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,7 +1,7 @@
AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f082c9c9c9ef458ef87c48bf2e6cacc8c2603a51d9c639938056cffb49a0b089eb4b2a088a11af8eec0c SHA512 dd68ba095d67ccc6f698a8ab2d86942458763619d97a68f421eff0a48d72e66021df40121440107b9402a30a4e4351526d0878dca29a7eb57d68399052b1e2a6
DIST restorecond-3.3.tar.gz 18970 BLAKE2B 41c0eed734ab1e89cdfd40fdb0ceff47e1c4bb66354ff78d548a9747c661fbf7ed4b6b3daa1e39325de2a2ca087aca803f073f942f3ac89b71d873e27a1d6712 SHA512 ea2b97d22c1d68aa4ea31d8850f8c9632c0db0d4d666e323c648da896554c6a6fdf6dfa3c105a1df3f1ede9da8cce5ba4c1533b05520846fcb2d584935e5d7cb
-DIST restorecond-3.4-rc1.tar.gz 18961 BLAKE2B 7f5f41f9dd7e776c266818221706f5cfff2fbb3ce99550e4c679a52e1c7694ddf06a8cd686ed80787e2acbf4060bb6cb4c4c15b85eb3ee58355b560f3751e910 SHA512 5d526ceb314719400cfeecb3d28369f62ca8f29223c6eabe847f3565c27b6a7f74ef6f489750b80809df6b3227324c978e4aceca1cb2f4f6a28bcaa03f1f9db9
+DIST restorecond-3.4.tar.gz 18965 BLAKE2B a77de19d9f00d6e8f384a7ac411257b059ba3ecfefba893eda0e563600002eca705347af364d51037f8b3308bac1c5248bb9326c692175c6c1dc561b18c84bff SHA512 9c6803444445af1592a74177ba2e7cefa1b0e8e3c73d34ef932948598adb38c648dcae8495c951b1badfc587b2d67843b83598c904d924db349b6118560f115c
EBUILD restorecond-3.3.ebuild 1082 BLAKE2B d004337893dc2363a312366a7c4250158f1396e4d54a7b361d2665a51350f0cce3a9ad76002aa5a32fa5369ddc91b015a85d99e7664fc012eacdead1644af9bc SHA512 47fb0c285c427c1ad5551d0786f90000b85420a16ca52dd1416774a1ee93afdf00e4197d6f91fa51248419a693d4cd2b528c3ad18a99cd668eed1fd0eacd1f9a
-EBUILD restorecond-3.4_rc1.ebuild 1161 BLAKE2B 3793aa9799c94c6c92d7b078b57756ede4968821aab7e1227c36555255fd79566a03becd5f1dfafb3943ca8957227181a7727ff835887da625c012dfeeec5e81 SHA512 518d1858f9b89ffd2ee639d49f1736d0ed386ecb44626f05facfad3d5c891378c2b66e6db39e8d669c84b95338c7ca4a369062a903fb60c28aa8f69a4e0dc97a
+EBUILD restorecond-3.4.ebuild 1161 BLAKE2B 3793aa9799c94c6c92d7b078b57756ede4968821aab7e1227c36555255fd79566a03becd5f1dfafb3943ca8957227181a7727ff835887da625c012dfeeec5e81 SHA512 518d1858f9b89ffd2ee639d49f1736d0ed386ecb44626f05facfad3d5c891378c2b66e6db39e8d669c84b95338c7ca4a369062a903fb60c28aa8f69a4e0dc97a
EBUILD restorecond-9999.ebuild 1161 BLAKE2B 3793aa9799c94c6c92d7b078b57756ede4968821aab7e1227c36555255fd79566a03becd5f1dfafb3943ca8957227181a7727ff835887da625c012dfeeec5e81 SHA512 518d1858f9b89ffd2ee639d49f1736d0ed386ecb44626f05facfad3d5c891378c2b66e6db39e8d669c84b95338c7ca4a369062a903fb60c28aa8f69a4e0dc97a
MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/restorecond/restorecond-3.4.ebuild b/sys-apps/restorecond/restorecond-3.4.ebuild
new file mode 100644
index 000000000000..92cd1c69200e
--- /dev/null
+++ b/sys-apps/restorecond/restorecond-3.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+ S="${WORKDIR}/${P}/${PN}"
+else
+ SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/glib:2
+ >=sys-libs/libsepol-${PV}:=
+ >=sys-libs/libselinux-${PV}:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+ tc-export CC
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
+ SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \
+ install
+
+ rm -rf "${D}/etc/rc.d" || die
+
+ newinitd "${FILESDIR}/restorecond.init" restorecond
+}
diff --git a/sys-apps/restorecond/restorecond-3.4_rc1.ebuild b/sys-apps/restorecond/restorecond-3.4_rc1.ebuild
deleted file mode 100644
index 92cd1c69200e..000000000000
--- a/sys-apps/restorecond/restorecond-3.4_rc1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit systemd toolchain-funcs
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
- S="${WORKDIR}/${P}/${PN}"
-else
- SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/glib:2
- >=sys-libs/libsepol-${PV}:=
- >=sys-libs/libselinux-${PV}:="
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
-
- sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
- tc-export CC
- default
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
- SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \
- install
-
- rm -rf "${D}/etc/rc.d" || die
-
- newinitd "${FILESDIR}/restorecond.init" restorecond
-}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 3e04ac1f7d59..fe6819e1d683 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,7 +1,5 @@
AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4e257f60479a3e69428d3735802d480e1a25714854de9bc6ed997856c1c4dbbf289b7a014026522aea SHA512 32c52316ebdffef7ec07dd97b45f124c2ecced3d0f49d75ad8d226f6eff478739dab6b008e0b1f4e55bc81bf615feee9860c45f35f0994c7c65d4d439501621f
AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d
-DIST rng-tools-6.14.tar.gz 60277 BLAKE2B 177065f9ea68b68459d034d38278f866a0c9d5c499578fabcc29ceb387b49667393f23dcae9f13ff401599846e872dbada73f5e319a99dfa4605cdb77ee3e896 SHA512 6a267257292697023cd349a5bda4998e39e874969f2b437eb2498f2d7d70a7ed293ca76b4c83aebf80955e33f6c8f8bbb65c6636cc0979e0e0d80d148380b8c7
DIST rng-tools-6.15.tar.gz 60731 BLAKE2B 693056ca600448d07413661498ca33893e99648c6344e02f2f0babb014878b9452e024904f5b58efc6cfe72201e582a6b458664d11160bb1b0dbdc28ba6325c5 SHA512 44146d891c4f46675a031f2e5ff7755cfaf1abe3252f241c16e042d3bb5e988b77ff840382caca49d8cb9854af1e49369398a506de5e819167739ad33b58d180
-EBUILD rng-tools-6.14-r2.ebuild 1614 BLAKE2B 71d653d03e6efdd46783d53dbe0306b417dfb56d06f3a658ff1e158d761bd5234d7b6d00f7318374e299e678b9b8ee368263c498702a91c2c5df7e98e69e6f15 SHA512 5d0c3bda93eae06d80c87dadafbcc00604bc962590d8ddc6b2c4d3fa8ebee757f081890b41345a60307dd144259526679a7cec655d4928293b863eeecfd37c76
-EBUILD rng-tools-6.15.ebuild 1619 BLAKE2B 3cbfc2bc50d3fff64ff1473cb0eae22f72c58a8e14fcce017bfcf83d3abb9f5bb71ebe9581c8d2e0d192e77effe8593c5e3c68edcf569c1f318639eca64a2d5e SHA512 5e25d099db7d28456b4fc86e04c6777c3aaca44fa183e54f57b5feccb0f8c8b211b45edc33376d0ef167d9ecad27a2db3de206eee75c6999f8cd802773a2db24
+EBUILD rng-tools-6.15.ebuild 1614 BLAKE2B 26f6366efd41e3cb6a00ea929aee7d339d5b7bd4c5903cbf7ddc18d190d8861747a5e85aa5757ba286eafaf779ac1d3fab250ba5700c82c8f54bb4ed011c960b SHA512 25ac8443c941f34d99978b0bbb86d3024a8f4aa9927bedb8afb50247e886ba7bdcf706b1df34022a7f9cd072bc6ed225a0700780bc7892ddbf64380dc7921202
MISC metadata.xml 826 BLAKE2B 6a0fb04e17c209dcbf342357d8b044258533e877bc191d3afea272d379f02e75af2fbf912a840db32313e2fbf418c25556d423aec7793a0fca0fbaca5a4feb18 SHA512 24e9616ab14295a4cc0101752734332e98bb0299c42e831a0db9262527f83433174b704d3b1114841c4a00c82adfbe07b7473b2d57ec85d9358f41bff3797f3c
diff --git a/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild
deleted file mode 100644
index 92fd4222d6c1..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.14-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="jitterentropy nistbeacon pkcs11 rtlsdr selinux"
-
-DEPEND="
- dev-libs/openssl:0=
- jitterentropy? ( app-crypt/jitterentropy:= )
- nistbeacon? (
- dev-libs/jansson:=
- dev-libs/libxml2:2=
- net-misc/curl[ssl]
- )
- pkcs11? ( dev-libs/libp11:= )
- rtlsdr? ( net-wireless/rtl-sdr )
- elibc_musl? ( sys-libs/argp-standalone )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-rngd )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable jitterentropy)
- $(use_with nistbeacon)
- $(use_with pkcs11)
- $(use_with rtlsdr)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
- newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
- systemd_dounit rngd.service
-
- if use pkcs11; then
- local DISABLE_AUTOFORMATTING=1
- local DOC_CONTENTS="
-The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
-to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
- '${EPREFIX}/etc/conf.d/rngd'
-reflects the correct PKCS11 engine path to be used by rngd.
-"
- readme.gentoo_create_doc
- fi
-}
-
-pkg_postinst() {
- use pkcs11 && readme.gentoo_print_elog
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.15.ebuild b/sys-apps/rng-tools/rng-tools-6.15.ebuild
index 6f8f8bee081e..9f0c340274f0 100644
--- a/sys-apps/rng-tools/rng-tools-6.15.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
IUSE="jitterentropy nistbeacon pkcs11 rtlsdr selinux"
DEPEND="
diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest
index 0e43e5595d96..acce8983f6a4 100644
--- a/sys-apps/roccat-tools/Manifest
+++ b/sys-apps/roccat-tools/Manifest
@@ -3,4 +3,4 @@ AUX roccat-tools-5.9.0-cmake_lua_impl.patch 236 BLAKE2B 833cb7662bdd1fc5942cfd3f
AUX roccat-tools-5.9.0-fno-common.patch 216 BLAKE2B da4c297a8efbe66afd6796a00e32424b46e84a76d9ee746d599d71ada7a64fff1a2365dc25183b4013c001b63f259516c2501db9bbff6e1bb185a95274a164e3 SHA512 51df4761508094536a5c6c18a7400797ded66ed0bd39acf35ac9aafbaf063d887892a2de738e355b365967e0e4ffe63688da098d04b8b2097a5d51e8660e99e9
DIST roccat-tools-5.9.0.tar.bz2 3736671 BLAKE2B 4cdd0c6b50021cfae127a692d5a2a7fff5e7e1281da7add0cf9cd8f5fbfd8882186142d56982bf929867bde2950440f26ced167b52707c9d810ab53a62a4bded SHA512 d825fc372654257f330abbc7e611e87c4888924288ad56c8e57c9db5c8c25426d454ae1ab4dd591ef3b930bed410497c0aa88095d5319e2708f4b263d16eca00
EBUILD roccat-tools-5.9.0-r101.ebuild 3404 BLAKE2B 0a72381c759ebd820179a19e3d22bc71e8e4456f04da910e70e16c4f1f2dd9953be384b0b9d91b31a6fe64dbb9551309a679278963339e6452912fc08ef77d6f SHA512 24d9d57147649199d55db11cea310b04d78072ce185d8a61b6d94d78544ebfd0d9db3a0667384ace97a8a6ac423b2f6adf21d2e739aa6ee47329109bfb4da356
-MISC metadata.xml 328 BLAKE2B 2e7ac6b58f354d766eee70f498deb3730c72d8cc9a0aad3612adc85dcdf547fb3ecf87b2ca06b78606a9f98163b637e12a925ba5787977d7b7dbab786091a919 SHA512 798b52ea5c8453a8e641db30b81a9287410a0f299f0edb80e6c0c25e04d985ab8277130bd3ec172ae03455a103637706763e14dc28d534f242a5f55fa67daab6
+MISC metadata.xml 244 BLAKE2B 2da05d61cfb52e48c43821bfe91e08721665fe50d0be62cf0505413d84f73e315848605f63b2d49d233511cfe5aea144ceb99f30a4d9c4c34ec3a521ce431dc4 SHA512 422eefaf18c498187b39f07a01a2e19b485a319177740e809e55bb6f2bfb4b0b50130ba3fa36b24d60161b8126e534228eda1fefb9064d7d3cb8c029234f1d93
diff --git a/sys-apps/roccat-tools/metadata.xml b/sys-apps/roccat-tools/metadata.xml
index 86c541ba59f0..5010191bf4d2 100644
--- a/sys-apps/roccat-tools/metadata.xml
+++ b/sys-apps/roccat-tools/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">roccat</remote-id>
</upstream>
diff --git a/sys-apps/rootlesskit/Manifest b/sys-apps/rootlesskit/Manifest
index b18bef4df4cb..89e21ba88601 100644
--- a/sys-apps/rootlesskit/Manifest
+++ b/sys-apps/rootlesskit/Manifest
@@ -1,107 +1,4 @@
-DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
-DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
-DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
-DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Ffanliao%2Fgo-promise%2F@v%2Fv0.0.0-20141029170127-1890db352a72.mod 37 BLAKE2B 2192038adcc0bd5fc5be522624f1e2953140a74612a2abbba7c93a24d9ff65b62d73764e4650ab8057927bca2a2bb06a7bdbc68cf1fc9774fd1906016c1f56d9 SHA512 ded2e5dd23c0af5d7c973c97ab390ac9de104f0043bc5cb7ef38a2d5cea715b66b895325cc4b9766da86c87a5b04c702e579a80e9e2e61cb2835e63c27549423
-DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
-DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.zip 14639 BLAKE2B e8d9db907be590e1fe4017afc762898fc83eab3df6e56ac5b0aed018c2275c312a58d9140bee3d0eed21a290851460fbefc41713f26d99bf87d635181cf8e0a7 SHA512 e6dc067a4977622a374656709552a15baed25ce3f3714682ba041fc80c96d64b3f74ac7862dc00e616c85b7ce53a221391c1eafab1bbeb81485bc5bee05d35c9
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
-DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip 21941 BLAKE2B 94e8f4d50c0651e1bb47daf76c642871e1e3c53b725910aa101991a7a9b83b8042f76f20be54323b66b5dda1900a7fa5c3708ba0ef02fa2a72c2012efcfa1644 SHA512 eef3b3444dce760fb6cbca5e22f3fcb33fd418e2b54509e80a2150cc644f41a05a59f0acfb7fee386c994dca06d96f4cd023fa192aab368be08ef20eac4a626b
-DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
-DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod 39 BLAKE2B ce025298653101cca2bccaa3f6797881c47f92443d0835d57c2900c62bb34a82d1399884826c863a7a51fbf731c1a8f836674f4416ec2364a20c690d788eaf14 SHA512 3398e8e140093ee9f7c27ce680fc141df5bbeacffb365a98b64898fb6b28cca8eadcbed1d593b90a101a1aede53a5602eb3455e4ec364ea4b76aa3ca043f68f8
-DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip 57100 BLAKE2B 002b1bb18bc81e6a124d511aaa6270763eef5c9af2117cec54f4dae6be22f0bd0de2594158484ae32933f24f1107f4bd490dec99f119a1c7d2cb2f722a9160c8 SHA512 d4bab61fba7c23094263e73459f6b4bd15bdbe02ef6349619cf89e1064a7d44c20534d6267034a0af4f2aa1a7aff0f02c35f424d25e6dc7c4d5e911e6e9fed32
-DIST github.com%2Fhugelgupf%2Fsocketpair%2F@v%2Fv0.0.0-20190730060125-05d35a94e714.mod 39 BLAKE2B a912dcc347224514c81826763aa9ad2e6fcfdeb8b97ea12b1d46bf738ed2d6894f63253f8df923f4ceb8b306f724998cf06ed4f67494b45039c7adffee02347c SHA512 f4f7373afd8b364bdb8817d6dc5131113a7540a49b28a306faa42f031905632ce39adff49098236be024966e5f7ba7bbe96eb815bd65bf1d7e7d5b0be28c29f5
-DIST github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20210120172423-cc9239ac6294.mod 663 BLAKE2B 24e5c678742cebe0227616262ce67ef3d3ad91cba4b64da045121ddc88557b271a1fe869815d4f6158599877eb8672bdb81d21232121cbcf49ab09ac7434c232 SHA512 20aae78d98ad5b7b363e7f1a21050caaf4a399662ce7a97022cf9b7d174478b6ffc11a38945ad638769237018d6b86ce3527862bbdbc4d237a0fd1601dd0d107
-DIST github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20210120172423-cc9239ac6294.zip 241947 BLAKE2B 62978502e560be131ce97b350d2284ba27ff5fba39697cf15faef837afabab7fd62b0a3138446d4e42710f488288dbef634c19a1ab4a9bf5c2e85950f6dc2354 SHA512 defc922d5c29e44620f79fb84bf01e1697bfa2d3fbf27b67e50e776cf68c4744340b5795170a847482b93fb66daeca9dd8875639c1d5fb5e1b36ec89c8597ac3
-DIST github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.mod 34 BLAKE2B dc250d3c19b11a58deed3e35ece7cef11c91af1da148471c1803e9eb4dc63f6e519993aba3245317577e37644c7a43bdda5c7f69687638a08f0330b82b218e95 SHA512 edd717821dfe4d73ec9ee7e1864284d39fc5ec282c5ebaa3f20b409f86fccf24b8c243ed2671387860dd5e1ecb7b780e896d3798ee4af62e2029b078a9cd360e
-DIST github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.zip 6227 BLAKE2B 295e3d0a3b7c730efaf25470060bcf01ada1b4b4e4f0c212d6477a5ed528f557d86edbca78736cd97ee898f1914c0c9ca772846c4dbcb446dc0f6da4be0ef8b4 SHA512 71cf1725e14a1054c3cc79de141a2e6c96a3a537dbee93b2873844574b8376a1db9046a13487b2ce56b8aea67f4132c1c7d167330717753cf9965492dcea65fa
-DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod 178 BLAKE2B 305d9f2431b92866a80f6d956d8c0e0825857da7177e9c628d2cfb88b6995a49696d9274d7e0a8ae5e3ec8a1e490f3e5ac74f8f1decf6730ce70bfc9d3681ec3 SHA512 9dae3380dc38404b99d1a7119e3607aae1cd1132f8d7a808733cc22ed21fbc4edc2d1320d008cb63439812151f44a69938abcff05a6c8727d1bc58b2c973dcc4
-DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod 215 BLAKE2B 290912a223a80b17cda3da4e72cb5a149e6c3e2fa8d79bf221d6529eb74c1e88c602bffe1234f16657433128f0ef3c9091b723689be39a6193e421b44bee1715 SHA512 549d0522fff36f194065fb864e65e0d11fb5aa45f4720d38c74049af138d75a1f7680489d5e7c4adca47abaf902dfdb202d05e8b040f119c1fcec2c22f412d0a
-DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod 183 BLAKE2B e9f24802c355e638823352a65cb9211b7ef90951890fe600791236d0877731924c34624c483ca14b5c97378ceedd35abd8b5f2e2397985039b0096057bd6c0e6 SHA512 c64bfec29d68ac738bfa3ec5263eba71ce749c89b5296e8e16205a286fe715536da5b66856065986e94172665dedbda96531f6c8b7f6803f2a1c4213d9f5f138
-DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201110080708-d2c240429e6c.mod 183 BLAKE2B cc512f6cf373325a09f20eb9dd33809c33d89d93d67ab1b57e95ccbd558e3ca7790ce8a2cbf77a8998bd8f4c7dae7acfed12d338991d036ba7613be8c6b71bdc SHA512 f019e3325b1eed1b46bc937b9aa1639fc611da42952c4095bf830afe8b8e0f237b5a9cda6663860e8bb31af07ec845753790f803f6ab8e7acdb368ef124b0746
-DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
-DIST github.com%2Fmdlayher%2Fethernet%2F@v%2Fv0.0.0-20190606142754-0394541c37b7.mod 293 BLAKE2B 5f61954d8488ea7636d31c7f139e604d78774546bf5668f4b7466c250bc6397b36db8d0ead8c0ca9eebb6b8b548a6e967c18a5235f1066ec6a6c7d237a4a6d2c SHA512 cdca21047fb14be4646478109afc34ac6bbcff4387ae7342cd9422d0ab3025318d2b9977cc3739584adc781a01fc99dca4364ca294bb48fe7198d57497eb235f
-DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod 196 BLAKE2B 69661cd95029a767e20e49762a593633d3acd11e44b489bedc3f52c0a997826b5a07e9706b74edfebcf3aa94706836ee6362edcd32a9a7b6ff33dbb01ab0c1df SHA512 edb2c00f2879dfedf8116e6f21f8358ad89750e1b26ab25db625c55fcfbeface38b523c72e376bd7a5eee333d33e883cbf7ed26d07b4b3a567a162283d9aa006
-DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod 264 BLAKE2B afcb7c0ee7467a383178aed08ff780382ee1efbda1101cd944cba4dd653974153654b3ff38943fb7d6ecece515997384e8eb6f9be2aaceaa4b09bec6fbfddfe7 SHA512 e59cba812a94c451a95be9347f148f0341d0803f32f5f387f6b9dafc96bd4072b035e6fc504235554585338ef448304fcefbc50b1b345d80b27f1cc1b2b571b2
-DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod 264 BLAKE2B ac83365044a3a4cf949e88ebfa21128e7af58e00b1681d94165dccbd57c8cbc45079b84d0da814312f60baeb0bc8209a66f5edbc6c9b376ed2068ae167f35eff SHA512 18c6cda418f62c68b1f39b3d40ae8f6a81442f577bf8eb3180df408c0ed9e05e4f43b57d0bc54f4d51b1c13d8fbb436f01895c3a3c70ce08d7d47ebca1e46726
-DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod 264 BLAKE2B 50eabb5a490f67a346b49011bd13385645b7c56000e78e73b05b5dbcdd98929d9167e74f2d08c548cc66a59beb2a11bd93dda533f6d01ae21b2a16a5aa0dc47b SHA512 7b2445ae9f2ad7c1f5ce769bb84721838136a325dd5dae17eb8cbf34e582a1296cfbfd260a2598fd80f3418945560e16814203f39dd1e61dfa605ddbe379107d
-DIST github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20190606142536-fef19f00fc18.mod 192 BLAKE2B 375c888a49b9c59d4040e03c543290675cec5876cd6bc94cc39072b79ed7a7123e67d4d6e6770d0418d77965d6651b353469e260d5db090e50fd5c75750f5a46 SHA512 f322192b679b9e1bd03201b14d85c077be14ab94500b6b337f392558a680b3da4cffbb68caa890ffaa779ebae72c346a6f72175832b28bf64cf5a442a421e87d
-DIST github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20191009151244-50f2db8cc065.mod 192 BLAKE2B 375c888a49b9c59d4040e03c543290675cec5876cd6bc94cc39072b79ed7a7123e67d4d6e6770d0418d77965d6651b353469e260d5db090e50fd5c75750f5a46 SHA512 f322192b679b9e1bd03201b14d85c077be14ab94500b6b337f392558a680b3da4cffbb68caa890ffaa779ebae72c346a6f72175832b28bf64cf5a442a421e87d
-DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod 107 BLAKE2B ab66968ee9263d9c9d1e1a85444ca0da86a5b0f263cdc51a4d4ae9d6398445b529ea4042e3d93560cade1321d0115c153950611f34a8075194ffaf19a7acc472 SHA512 55dc5a9ed85f4b355e9de88d26d76fe6d87aaf45f95574960d42af9d2c9e97c9685d5397faad9409e3384bb0a205b6546e40c303f127302cf9bea040466665e3
-DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip 36737 BLAKE2B 3edd53bcc466182fde46b860033e34cbd5bebff97fa22fcdab0ac5808e796cf9947f921ee267fe0fa3befacd032d655ed771cea4b80f633a321044d08dfc78f4 SHA512 0926b976e8ea08cefa68658519450675ec50e9dbad8716c8e211812bc36830746a75a1a8dea5a8365fdd8d383cda115b066c7cc93abf613f14203ad398d66813
-DIST github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.5.0.mod 30 BLAKE2B e9d34b8d09999397940ff0ccb1ca0925c3e3f0cdf55364314dc535920732ca8181828715240283d2eda8846183d018582988bb93b6d9fe5e128ef5f46c079e7c SHA512 946d58070f83448aa79ee6f594e8bc1bb013d4d92953b8c0079eec0ded5a0adefe95ed852d4d98ab46d2637faece15a7dfd7d48f2fa429b2586993d9f9078e9d
-DIST github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.5.0.zip 737146 BLAKE2B 0bb07891976994953ca3cc215ff5dfd3e23cc8d53c24952ff1edb2e9bbc46c59d011175e49019248d11d97e50fc75605521ebf965cd1147751fc2544c93e3794 SHA512 2a0c678d40dceec17a8a220cab9851c7772a6ace2922615c4240a9842de5de546f1d0f42a61ec29fc81ccb9fa5c9c89d5e3c0377ea913b7c71456294be4bd066
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
-DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
-DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
-DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip 122358 BLAKE2B 8f906d748eda31f9e673fd8eb0978eb9ff17484d38cfef9f5cb7dd623005bb971d131dce52a6089f5a41deded4c4dbb956aa9a56da91b5a5b5eba9e3a9100f59 SHA512 11e29cdd7a8baee7995009755582c26eb819efd715e9dfa1442b5743c7bf5752188f0fa8f5ddb3452f05f371a280324406410b683609f6a510277d3e03b30ca0
-DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod 242 BLAKE2B 68986e3744d3ae593a16a24b6ce79876723d93cdf96c978c185b14e4fb8d73d379d4ba05e138b412973b465a76a98a458c6606137b0affdd085dbcf20851471e SHA512 ba06d3386a03812f2ce65f0597b932beb62b70b4da92974c5f5ed81c150fb71ce0285a2d9779ec8a40916870b0e4da5c2c8c5591c3687f3b8e829652a01ec1f6
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip 66301 BLAKE2B cc9a5f24d1cecda3c1cb51b34d441527c40d16a4c088b888b2e43bb08b0a4f41301ba78fa2503b54546b568a49544ddc516451ac1aff4fc7f92300677e802f5e SHA512 50aa92ee488371c7242664cacc6772fcf3b54068d834089d7b62675f9e17a84d234295f266419919ca197f3ddb6d358bab6d5e4583883d4504d6ff90054f5827
-DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
-DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
-DIST github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.mod 32 BLAKE2B a7ad78e4f0640ac2e2a89707740847482b2c20c3156d929b27af98a496f720d3ee6579da516043c8f0a4849b3eae6ab3b42b6a6fec1d5dd320f94b21b8efbc97 SHA512 03919957e4a589b3576e8b9aed9e8d4a0858060f92c8e75756a7fbfcdf10326836cf3b03bfd1bd4405a1281fa01a92dcfc876301b5cb17c0a44105a2eb714368
-DIST github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.zip 4068836 BLAKE2B 73ed69ad3628e38c4d3b7d9481a12330c0a8bdc58e4f9eac9a3c442f87b7ec2adfd1fd1ec306342a9b010dbce6e6431100d71b1b7e76d91525301e286ee1e98f SHA512 85d333b8baec16fbd572f52aba626b32858bc9e99357c19c5179e6d9407bc74f056595c597017b8f0dec0a9c14942beac1c425c2cdf28cf1d314b9d40cde5b89
-DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod 183 BLAKE2B 664e1cdbf471bca9566e20f34f214a9abd2ce826067d232b177056fecba72e8d87bb9eb9b56dff47f5ab7a8c5aeb5ac6bccc7069738f4b195cef81851b0ccffd SHA512 081cf55720b5ee8f81340d7d9ff9da92ef1be9d7a139d58516b01db8a2d8e020d097f79305dcba18ed2975b49b2ee23bd697e3c0a466adbf8a8e75328e943401
-DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip 3454701 BLAKE2B 5f43a7730268c3bd6d4fcc6b6e27ac23075de3421239c00604b3dbd05f0a65a163a41dce00ec919e2704327419117dfa1f21285b74e44945a615b698b397d465 SHA512 b08d6aa4db1930e6864be6a09bbae416bff657cb25c10350f0a5c7bf92d893240216b6fa243e9d58ac68e684512c1818a70e33e11665b467f6dff6a3433a7e29
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190419010253-1f3472d942ba.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.zip 1583673 BLAKE2B 07f4349a74096ed2d757fef00892d30c428082663d5cf998dae21f6bc0aa62897e25bcb628872ef0f100088ae9c5b01eb0915db28980e1a0d9651655fb287e25 SHA512 2a79fdae6c57df7762827d29d9e31e916a2dd33ce9d1dd07fa9e0c2b194015018949078d791336eaa5aa3c5ae831702aacdc48fbce5a779120d0eb8754fa4024
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190418153312-f0ce4c0180be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606122018-79a91cf218c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.zip 1546031 BLAKE2B b8b07e0d05b0bd1b77ef90145d6684a30225e5c38ebc21039e94524792937ef49d60ef2705fe226f62a03712553c685c5eff6c4ddaa6a1fad0327151769125b2 SHA512 f4a3d3f6af5020f70eb69f539c4ee8452028aad40bda05bcd5de74e725db1ffc487a3ff2bf31e4c26ef530b74fa090332f608bec5a2ee233ddfd82c1209e77b4
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
+DIST rootlesskit-0.14.2-deps.tar.xz 17068276 BLAKE2B 00d80142b08afa2987a410683ba1a681ea85f7076b367d81f1df65f84e4986f970fd5d52738160c94b38534574f2b2f4b9aebddb26c16b3353a9b1937713c6cf SHA512 55afbaa51b63ce331397d8c4b7fa7dbc62cc2e2e4b926fc118d81f57692914b9793126089fc3cdc288ff119fbb5073a3d57416a03d6f42f10be3064d910f2e14
DIST rootlesskit-0.14.2.tar.gz 68527 BLAKE2B ceb08c4a1d12916dcf1f54f38de800a0d9ee0a67caaea7bb326c40e05bfeeb9bb1e1c79152d1ebbc648dd0df72251c24897f2d2efbe1e44ef9f22957eb417ebb SHA512 2b8deab3116ac85062020e395d0343b2984da26593d16629119ad0dcb6a4d9177dcc43b50cc839707159c87972530f2fd0e830c6bd54bb8be24a3e7aabf401fd
-EBUILD rootlesskit-0.14.2.ebuild 6250 BLAKE2B 0f8ce8ec47ee328da388fbc321590cd2fb062167d8c6e2bc09116ed7192775730f4767b515873d5443532c8c471187c2e142a8e65a10da8f01cc1aded6bd193e SHA512 d45ef70ca35ea13245dbc4e9270f68be51649a458c0d201b493ae125596b0f0e4a95e1f8b0eb47f5718de05b3bc4157f71dd3e9425e1f9f5505884fcc8f28f95
+EBUILD rootlesskit-0.14.2.ebuild 655 BLAKE2B b1efaa709eadb6f383afc3dbd3fdb4f7bda4387cb774f2c16cf66ff538ad82fcedb1d5a0e09aa41474e91f69a5368ade7e680a9c4e6ec1f5551ba1c6e5808922 SHA512 0db03c5ee90a4935a9b0a5b2bdd7d027e5f63ea77abb79e31aa3fb501b41e75cec91a51306b8566d62351b425e6a42ec074c57aed01260275d26a66c806729ac
MISC metadata.xml 341 BLAKE2B 9280333a05ba1d222b2c510f1f7be410eb619c9915a6736107831a45177610654a5ee5dc783e3bf25afff050b81742ecbacb660524b3e186364f23b6c6fb6454 SHA512 7c23ba523062e7c7c4265b6b1449a486a321cb10090bafb39aa0ef89c25801735975e0e90af10a57fd9f29afe75570a17f2d750bd21868447dc8cccb58516d0a
diff --git a/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild b/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild
index 1ea385e775e0..41eaa47c0740 100644
--- a/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild
+++ b/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild
@@ -6,116 +6,8 @@ inherit go-module
DESCRIPTION="Linux-native \"fake root\" for implementing rootless containers"
HOMEPAGE="https://github.com/rootless-containers/rootlesskit"
-
-EGO_SUM=(
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod"
-"github.com/gofrs/flock v0.8.0"
-"github.com/gofrs/flock v0.8.0/go.mod"
-"github.com/google/go-cmp v0.2.0/go.mod"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.2/go.mod"
-"github.com/google/uuid v1.2.0"
-"github.com/google/uuid v1.2.0/go.mod"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-"github.com/gorilla/mux v1.8.0"
-"github.com/gorilla/mux v1.8.0/go.mod"
-"github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod"
-"github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294"
-"github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294/go.mod"
-"github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c"
-"github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c/go.mod"
-"github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod"
-"github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod"
-"github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod"
-"github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod"
-"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-"github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod"
-"github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod"
-"github.com/mdlayher/netlink v1.0.0/go.mod"
-"github.com/mdlayher/netlink v1.1.0/go.mod"
-"github.com/mdlayher/netlink v1.1.1/go.mod"
-"github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod"
-"github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod"
-"github.com/moby/sys/mountinfo v0.4.1"
-"github.com/moby/sys/mountinfo v0.4.1/go.mod"
-"github.com/moby/vpnkit v0.5.0"
-"github.com/moby/vpnkit v0.5.0/go.mod"
-"github.com/pkg/errors v0.9.1"
-"github.com/pkg/errors v0.9.1/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-"github.com/russross/blackfriday/v2 v2.1.0"
-"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
-"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-"github.com/sirupsen/logrus v1.8.1"
-"github.com/sirupsen/logrus v1.8.1/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-"github.com/smartystreets/goconvey v1.6.4/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.6.1/go.mod"
-"github.com/stretchr/testify v1.7.0"
-"github.com/stretchr/testify v1.7.0/go.mod"
-"github.com/u-root/u-root v7.0.0+incompatible"
-"github.com/u-root/u-root v7.0.0+incompatible/go.mod"
-"github.com/urfave/cli/v2 v2.3.0"
-"github.com/urfave/cli/v2 v2.3.0/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod"
-"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
-"golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod"
-"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-"golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod"
-"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
-"golang.org/x/net v0.0.0-20210119194325-5f4716e94777"
-"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-"golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod"
-"golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod"
-"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-"golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod"
-"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-"golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod"
-"golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod"
-"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
-"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4"
-"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/yaml.v2 v2.2.3/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-)
-go-module_set_globals
SRC_URI="https://github.com/rootless-containers/rootlesskit/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_SUM_SRC_URI}"
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
SLOT="0"
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 96e4b5d7b74e..0744abd9dcb3 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,7 +1,5 @@
-DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53
-DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64
DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3
-EBUILD s6-linux-init-1.0.4.2.ebuild 1792 BLAKE2B 13834f7a4794db95f5cca7b98b8e2a119d5ba341a81a256ea953987c04994224d7108c43a0e375cf003821089f5973640e2399f3ce656d636abef7f3ed58fbed SHA512 83a8813ae4d6d6fe87d23c74e8093a999e52d29d4b4433172ff13dc55ecbb750da5729aa8f899b874ab0fbdea82eb21b5f82a4d975fc75de45c37422b64d0d83
-EBUILD s6-linux-init-1.0.7.1.ebuild 1734 BLAKE2B 68c3cd8aa92cd63dc66997ef24291d83b78b735cbfe68bcecfe18eafbb4626ad4d28eea1f825ab9dc4b14e3ff290a7d84bfed9260882e846cf9bed321ec089d1 SHA512 bec91dde8777bd4694528cea56410a98d640f94b7fce97ec81763f0cefa5e59dc92fe1be8b6ec3aad027ce3eb6bb2c583c45ccab5f194744caafd9d4c9484b9b
-EBUILD s6-linux-init-1.0.7.3.ebuild 1736 BLAKE2B c4726a5a52c2f662471f13bdcd644b5c3260b299a9a49dad3bf2948e9ce0aaa7d12ba9a52a6b8ec09a16e3fef96dad03c990636c181e77c4495cd7d77f8bb38a SHA512 ba7b39e4e7a14c03de166fd3bd9fdcecd97e71e06466108bfb692a0d02cd2e1e3fa81e8f9d84de3d9ce54985867f5a93b5dfe6da7aeb8d3373dbc55cd08b294a
+DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e SHA512 b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346
+EBUILD s6-linux-init-1.0.7.3-r1.ebuild 1743 BLAKE2B d2687d2be6ea3e4c6add5cf3cae82cd661fbd63ab51fbb9131c16535027002589c8c4dc11d1ec1be4a4ff987ec7929f00faf1dc466d6900193754d8ad1f93388 SHA512 4d4028b445e3a4c6f7d7c126cea23007163e6e590139a6e29db60cb108f8d959ad4f50e8e00c8668fbb24ca34aedaa898311916e649b205a8371459212a2f070
+EBUILD s6-linux-init-1.0.8.0.ebuild 1547 BLAKE2B b442d9b7539c96f8956a59cd60230a2061c1877a922ba0a491c21653b2b910060f16ace0869dc2c58b2dff5dc6fa757f2cefb609dc3727960bceffd95c46540d SHA512 1f27ab694807e37e6162dd9850939aedffd239de3432e080da91f1822fde6f16c5ee8ab6e7883a4026cce4a21f222ce9e2392300c90ccdf162822202381baf36
MISC metadata.xml 762 BLAKE2B c6fcd5da4965ab30aa041c568356cbe8fefb5df76f5396d5d47264d1463730be034b8a8fa96bfa8961bd27ea253495b340ce07da6f16f59ed1d657da560d36bc SHA512 ef5a96b38cc3b927841a7d7e9bdc27d6609c95f585b93c8e6496c57743cdb3d0335434c63d0634207c4554d8a0aaaebd2c0ec06e953d3065dd119db6972e1666
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
deleted file mode 100644
index 63b8c46f64c7..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.4.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs +sysv-utils"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?]
- <dev-libs/skalibs-2.10.0.0:=[static-libs?]
- <sys-apps/s6-2.10.0.0:=[execline,static-libs?]
- sysv-utils? (
- !sys-apps/systemd[sysv-utils]
- !sys-apps/sysvinit
- )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
- configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- econf \
- --bindir=/bin \
- --dynlibdir=/usr/$(get_libdir) \
- --skeldir=/etc/s6-linux-init/skel \
- --libdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/usr/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/s6 \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- --enable-shared \
- $(use_enable static allstatic) \
- $(use_enable static static-libc) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- if use sysv-utils ; then
- "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
- into /
- dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
- fi
-}
-
-pkg_postinst() {
- einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
- einfo "for usage instructions."
-}
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
deleted file mode 100644
index 305a8b7a163c..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static static-libs +sysv-utils"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
- >=dev-libs/skalibs-2.11.1.0:=[static-libs?]
- >=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
- sysv-utils? (
- !sys-apps/systemd[sysv-utils]
- !sys-apps/sysvinit
- )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- local myconf=(
- --bindir=/bin
- --dynlibdir=/usr/$(get_libdir)
- --skeldir=/etc/s6-linux-init/skel
- --libdir=/usr/$(get_libdir)/${PN}
- --with-dynlib=/usr/$(get_libdir)
- --with-lib=/usr/$(get_libdir)/s6
- --with-lib=/usr/$(get_libdir)/skalibs
- --with-sysdeps=/usr/$(get_libdir)/skalibs
- --enable-shared
- $(use_enable static allstatic)
- $(use_enable static static-libc)
- $(use_enable static-libs static)
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
-
- if use sysv-utils ; then
- "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
- into /
- dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
- fi
-}
-
-pkg_postinst() {
- einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
- einfo "for usage instructions."
-}
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild
new file mode 100644
index 000000000000..415a46d9f524
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm x86"
+IUSE="static static-libs +sysv-utils"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs(-)?]
+ >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
+ >=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?]
+ sysv-utils? (
+ !sys-apps/systemd[sysv-utils]
+ !sys-apps/sysvinit
+ )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --skeldir=/etc/s6-linux-init/skel
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/s6
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ --enable-shared
+ $(use_enable static allstatic)
+ $(use_enable static static-libc)
+ $(use_enable static-libs static)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ if use sysv-utils ; then
+ "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+ into /
+ dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+ fi
+}
+
+pkg_postinst() {
+ einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+ einfo "for usage instructions."
+}
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
deleted file mode 100644
index 3d6d31aec21b..000000000000
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generates an init binary for s6-based init systems"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs +sysv-utils"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs?]
- >=dev-libs/skalibs-2.11.2.0:=[static-libs?]
- >=sys-apps/s6-2.11.1.0:=[execline,static-libs?]
- sysv-utils? (
- !sys-apps/systemd[sysv-utils]
- !sys-apps/sysvinit
- )
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- local myconf=(
- --bindir=/bin
- --dynlibdir=/usr/$(get_libdir)
- --skeldir=/etc/s6-linux-init/skel
- --libdir=/usr/$(get_libdir)/${PN}
- --with-dynlib=/usr/$(get_libdir)
- --with-lib=/usr/$(get_libdir)/s6
- --with-lib=/usr/$(get_libdir)/skalibs
- --with-sysdeps=/usr/$(get_libdir)/skalibs
- --enable-shared
- $(use_enable static allstatic)
- $(use_enable static static-libc)
- $(use_enable static-libs static)
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
-
- if use sysv-utils ; then
- "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
- into /
- dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
- fi
-}
-
-pkg_postinst() {
- einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
- einfo "for usage instructions."
-}
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
new file mode 100644
index 000000000000..134f021dac5e
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+sysv-utils"
+
+RDEPEND="dev-lang/execline:=
+ dev-libs/skalibs:=
+ sys-apps/s6:=[execline]
+ sysv-utils? (
+ !sys-apps/systemd[sysv-utils]
+ !sys-apps/sysvinit
+ )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --skeldir=/etc/s6-linux-init/skel
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/s6
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ --enable-shared
+ --disable-allstatic
+ --disable-static-libc
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ if use sysv-utils ; then
+ "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+ into /
+ dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+ fi
+}
+
+pkg_postinst() {
+ einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+ einfo "for usage instructions."
+}
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 9164557f4d6a..a95245da0051 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,5 +1,5 @@
-DIST s6-linux-utils-2.5.1.3.tar.gz 35549 BLAKE2B e39dcf141839e6fc4554ba10fc89daaa7b9600ffa4360c80d3278d49224c88f124588ec988a2386a3243923002a16d9829d4828c829fda18745356fa6774175d SHA512 73c887e67251c162677b2151d37a1cdbb9cee6f50bd52c5eefd4750f9bf77452a023e0484891e384312fb169dfbe02af3d4cfecb17d34f1668cc0acb8d7a9181
DIST s6-linux-utils-2.5.1.7.tar.gz 36574 BLAKE2B 53b5c46e84873df2263eb05ef6dae2321957e2065966854402f819cff6712de991a3a3c480325556e53491c9016deb52c0a437a8b9bcc721dac97e31c98ba501 SHA512 dabe510d0a4d045578309beeec17aa1b4f88acb09513be65c31a7b338bd50fcb7cc809015fa7328c4a310b838f1335e754f49a12dcf369483c83294b5957156c
-EBUILD s6-linux-utils-2.5.1.3.ebuild 1115 BLAKE2B a2709fa8f63247cbb652ae9a4af0b639d199b7676946163d50f20254ebce130941acaae68900e4e1ac8a5a8c1e38da231de557815439aa51b9f1c948b9dc0287 SHA512 39ac3a5b2d126ea8e3601230727e5cb650417aa69ab5fbfab5eb69ad5dbea144a2a2294b1c2bd9bab19d488886b650986dc7192655eadb5c0dbb98c2268762e6
-EBUILD s6-linux-utils-2.5.1.7.ebuild 1071 BLAKE2B 5eb4a0a9d77d72e6ff3fc82f0d0a6b959ed7bef4288667b059c9f39c01e33fa16b7ca8e17fd39d4ddbe02aedb00c7bb5560dbf5e021ae7b6d91cfd7a46299b40 SHA512 8ed1649c5e5e1da603cca0a09897a9ff399685da241c3c521f43c9f066f8a866d852c1921ae2f0bdbe02fed68f6b5903fee420107c278e1ae5ec6811fe455deb
+DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 146b5ef47c00c4e96eb6ea697137cd11732087612df98781e45169ff8503fe3ba9b84cab06e6b96ba373f11c65902f4f5111322d51b0fdb395b3422ba092d836 SHA512 cecd745d473b200e10071d73191d5ec425533818a9775e882a2b8a2fbc98779f2309e17d41f844b171e0625b233804bc7af9585709e8e42dc73ff30afcee06e9
+EBUILD s6-linux-utils-2.5.1.7-r1.ebuild 1063 BLAKE2B 76ad5faf56fc65ab8e6f0130f0aef9440f86652bcbb334e1c6cfec065c428f02d8bbc0ca84b92aafb8f70cb0b1cd3b1e40e135e782401fc2236a9216a389ad24 SHA512 ff21ecb28ed7126c75df198c54a8b2d4e992069765144fa8626ade2b9aed7a930ec46d574a6b62ae57355f4e57510fafe9b3e6b24a12cb621c2a89853d56b1b0
+EBUILD s6-linux-utils-2.6.0.0.ebuild 969 BLAKE2B 76fbbb8aab26239984077a596b18c811cbc83beab9fa4353b0f775ba2337fa293372e2ce951af43cd6579973be86719e7d857af10d395af334f0a54a69e9226a SHA512 0b004d37df1142b9925eefce19c187ec387b3e4e8370da056d411ca7d79c26312a5c40743c2239b731023778d75971a9a23c47a9b8df3c1150d6c1928006ab37
MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild
deleted file mode 100644
index 7637a669f3ad..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static"
-
-RDEPEND="!static? ( <dev-libs/skalibs-2.10.0.0:= )"
-DEPEND="${RDEPEND}
- static? ( <dev-libs/skalibs-2.10.0.0[static-libs] )
-"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
- configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- econf \
- --bindir=/bin \
- --dynlibdir=/usr/$(get_libdir) \
- --libdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/usr/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- $(use_enable static allstatic) \
- $(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild
new file mode 100644
index 000000000000..8b385d9a68ab
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="static"
+
+RDEPEND="!static? ( =dev-libs/skalibs-2.11*:= )"
+DEPEND="${RDEPEND}
+ static? ( =dev-libs/skalibs-2.11*[static-libs] )
+"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ $(use_enable static allstatic)
+ $(use_enable static static-libc)
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
deleted file mode 100644
index 3a7aed22a1ac..000000000000
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny linux utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="static"
-
-RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )"
-DEPEND="${RDEPEND}
- static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
-"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- local myconf=(
- --bindir=/bin
- --dynlibdir=/usr/$(get_libdir)
- --libdir=/usr/$(get_libdir)/${PN}
- --with-dynlib=/usr/$(get_libdir)
- --with-lib=/usr/$(get_libdir)/skalibs
- --with-sysdeps=/usr/$(get_libdir)/skalibs
- $(use_enable static allstatic)
- $(use_enable static static-libc)
- )
-
- econf "${myconf[@]}"
-}
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
new file mode 100644
index 000000000000..36d949ef12f9
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ --disable-allstatic
+ --disable-static-libc
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index f9b5d782e0c3..e6cd912b7454 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,7 +1,5 @@
-DIST s6-portable-utils-2.2.3.0.tar.gz 49239 BLAKE2B 3be6d6f7b92eea4fb67e3e52ced4409d2bc04c7bb23fea146d778b3739b4682f10dcd2f58cc37a7760368a645d0fa50c887445e6006a563d290c739e72634e9f SHA512 17cb58a49494bba323f031aa07db134505a0884827745ea48e4e93d1ea70b9d4dd141d065b126abb40d5c7625cbb03ba71090e66fd0adb0c54ab49478e929837
-DIST s6-portable-utils-2.2.3.4.tar.gz 50120 BLAKE2B 17eecbf432b91720ed672e0388665e3dd7302fa2638225d0cdb9ad3c580fa29734ebf5f6e838e1bc4fdcec841ac4414d5b13d78ccb9167f5fad18dc763d8f611 SHA512 1bb9f7bd1c00d12d8434dbabb7061fe589ee9de9f0745399aacf560712bb0c9b4df2dbc221b0c8144c351e9976982c7a7e69dd127517281799d810596d8db5a2
DIST s6-portable-utils-2.2.4.0.tar.gz 50343 BLAKE2B edfbe4ab48914ae485072f220931e6af4d53fc8d1c1dc5e1186bc1688a429e6d14a370b02dbe0a9b641a8204f65e6f6bfb6cb0c0c9318acf89d9f6ad7f7f914f SHA512 35b62aff76b9fbf978e81dad2f343a2542cb4a853530948cc3b446b20e8d5f976d1624194c2aad6e0277b73d23d5cecf2142e3f2916bd152ad62342fc30fe07a
-EBUILD s6-portable-utils-2.2.3.0.ebuild 1128 BLAKE2B 028d23ac9833e15903d5a4bb8bde19423993280bc38c210ff31de80bf885f0aa216a55b2dc047df4ba565d4af5e4b53c08fe8488f6765697b77c8d667b5932eb SHA512 33674630d7611880b44a67cf390037007b8f321c138fe49be1588a3e27d75639d63b804cf60d9c5639b62cff5d5c355f34c75526c5bc614a6c5998985e90a898
-EBUILD s6-portable-utils-2.2.3.4.ebuild 1075 BLAKE2B f5b3b90648b618522c9a12658fc397010f8afa09329e6f13384e3d2e9f66a374a474ce456c646bf9914d56b8448f062278869356549ceaa4a2dae09a52b46304 SHA512 4e6a7ecd36e4525e07a4df1ebf2750aa2eb73b19b4c7bbb6f67c49f8908ccab0f11a2ed085491aff8b9c2c5bda8023b9e9b937f2c543537e0c673521f8f1ed3d
-EBUILD s6-portable-utils-2.2.4.0.ebuild 1077 BLAKE2B 1a6204b90ece44b6f12cfb259e9ecba89552848f5759b0793b1ed9d7e93cbd925672c7e2a467b0e83824f6af5ddf1d7bff9cb90d0c2b4775fb967e0e5d2cf906 SHA512 250d3c598588b128dcbba24a5ef657798b158262ef9fb868e6000aceb48c92d082a85124c9a33f0dbdc32e7dfee9d1373a361642fbeff1e5e614364fd8b857db
+DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a SHA512 2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
+EBUILD s6-portable-utils-2.2.4.0-r1.ebuild 1067 BLAKE2B a9d5f552beec4cc602fdc8dc1dfb933b282eaa63aed91161f2a7baa42f63fbdbeebd38eb20272135ee805266c3166f2d79c34c9bc8bdca77946f63334aedb2f4 SHA512 f0082da58ea6b2d158cfc7256e2bee3aa8e3f4edcfc35056e3053401cfa958dc859e6c831b121e479f06d7d8b02c5b3a371e93cbdf90705182ed2cc5da58c356
+EBUILD s6-portable-utils-2.2.5.0.ebuild 973 BLAKE2B 6676a2451c4f534b6c87b5e4233d7ad8e969c0d16411d457a3216b43ea2728743b6d50607aa0522e4dcb8f9d174428cdff7b7a39889d773f9308885cd007d772 SHA512 db620eb11e4b63ee5add49cb9770df8a88fe42e51d5a9aa1c93922a7c4c6f5bd4db85bdd8941d597442827e28fc1b5e7f4283f2df6c8863c1eecd07530f5c115
MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild
deleted file mode 100644
index 321cb2248504..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static"
-
-RDEPEND="!static? ( >=dev-libs/skalibs-2.10.0.0:= )"
-DEPEND="${RDEPEND}
- static? ( >=dev-libs/skalibs-2.10.0.0[static-libs] )
-"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
- configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- econf \
- --bindir=/bin \
- --dynlibdir=/usr/$(get_libdir) \
- --libdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/usr/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- $(use_enable static allstatic) \
- $(use_enable static static-libc)
-}
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild
deleted file mode 100644
index e94c0ff91382..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static"
-
-RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )"
-DEPEND="${RDEPEND}
- static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
-"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- local myconf=(
- --bindir=/bin
- --dynlibdir=/usr/$(get_libdir)
- --libdir=/usr/$(get_libdir)/${PN}
- --with-dynlib=/usr/$(get_libdir)
- --with-lib=/usr/$(get_libdir)/skalibs
- --with-sysdeps=/usr/$(get_libdir)/skalibs
- $(use_enable static allstatic)
- $(use_enable static static-libc)
- )
-
- econf "${myconf[@]}"
-}
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
new file mode 100644
index 000000000000..175012649933
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="static"
+
+RDEPEND="!static? ( =dev-libs/skalibs-2.11*:= )"
+DEPEND="${RDEPEND}
+ static? ( =dev-libs/skalibs-2.11*[static-libs] )
+"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ $(use_enable static allstatic)
+ $(use_enable static static-libc)
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
deleted file mode 100644
index 5defe8187bb3..000000000000
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Set of tiny portable unix utilities"
-HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static"
-
-RDEPEND="!static? ( >=dev-libs/skalibs-2.11.2.0:= )"
-DEPEND="${RDEPEND}
- static? ( >=dev-libs/skalibs-2.11.2.0[static-libs] )
-"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- local myconf=(
- --bindir=/bin
- --dynlibdir=/usr/$(get_libdir)
- --libdir=/usr/$(get_libdir)/${PN}
- --with-dynlib=/usr/$(get_libdir)
- --with-lib=/usr/$(get_libdir)/skalibs
- --with-sysdeps=/usr/$(get_libdir)/skalibs
- $(use_enable static allstatic)
- $(use_enable static static-libc)
- )
-
- econf "${myconf[@]}"
-}
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
new file mode 100644
index 000000000000..34e4528aaa94
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ --disable-allstatic
+ --disable-static-libc
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index ab393c29ef56..c39bdf5ecbb2 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,5 +1,7 @@
-DIST s6-rc-0.5.2.0.tar.gz 98758 BLAKE2B 9de7a96a67be33dd152a801af1f85d2feeed6581e96cb5f9ea4f9497326061096fff4873e068d5eb9a7361aad6dc11e8c43566d4f108cccf0a56378448bc4df8 SHA512 663cddac2b60143703cf9cc33777ead2a283eb9cba53add726849e1c95418fa2729e0d3bc5dafe8879a5ce036f705e344aaf3f7e2f287fbd6c2a68e9dcbb01f5
DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1 SHA512 0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
-EBUILD s6-rc-0.5.2.0.ebuild 1613 BLAKE2B 8eaf3b4e3598ad22f0e4e26c54cab9bfb7e0592c5f3b2147ebc82841f5d7b45d3611ba60ef14e09358179dce3aa14bb7f96d568c40313cf15cb41659818ec708 SHA512 6035993720a534dc85be24466c65b3edda4d4b47da166fe1e360ebeae5f4e480fcff4fd5dd4c6e7cd47b5f94942302ce75e10d1256ec4a1765327fd5337fed5c
-EBUILD s6-rc-0.5.3.0.ebuild 1555 BLAKE2B 4999b9c4e4c54a6054a4f51b5a7c1bcb10ea6da1c78c664f2cb0e039451bc3ee4b8e1c3e5e324632278da9f8836da40594cc108315bb17024de12d56ead0d039 SHA512 596b1f9c1261ad6dcac1bba72080285a51d2ccb00714970824ac39ab5cfa49b92a28a231571ffd57947d2f930ba7b3ec85f4b3c1b9913fb5a1f0b2079192d3cc
+DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63 SHA512 1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9
+DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b SHA512 72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
+EBUILD s6-rc-0.5.3.0-r1.ebuild 1564 BLAKE2B bd55d06fa05b0d563266477c137ac78de5a46afd74001e9393f08a9713426e1b9e1f19bb62703f4b1e41a7a1b3825b01cde70f2245bed79eb3ec18fa2988bd2a SHA512 e5877057af14429fcd0cf05d087b6df7f8d83f0691044938d63c7e79d01ad3f05a88e141c871475eb4cb983e097341580a60b21fbf5d063d7f6e34995bf5d4f4
+EBUILD s6-rc-0.5.3.1-r1.ebuild 1564 BLAKE2B bd55d06fa05b0d563266477c137ac78de5a46afd74001e9393f08a9713426e1b9e1f19bb62703f4b1e41a7a1b3825b01cde70f2245bed79eb3ec18fa2988bd2a SHA512 e5877057af14429fcd0cf05d087b6df7f8d83f0691044938d63c7e79d01ad3f05a88e141c871475eb4cb983e097341580a60b21fbf5d063d7f6e34995bf5d4f4
+EBUILD s6-rc-0.5.3.2.ebuild 1115 BLAKE2B 00fed9fbe5865de7315607d24ec115c7f250dbf2002eb665294acee5432014ffa36229f0bcd21bb5b5fbf3cc2add539bc1ac8877f139022a8207f499617fbc13 SHA512 ac171864566939e4314d9043de2e106b49478ce903295fbbd9a730ad5c453960f466921374a5038b89d5d44edc9fa7c66f3bc663985f2739e21805e7deb6c637
MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
deleted file mode 100644
index 88fb3dd4c768..000000000000
--- a/sys-apps/s6-rc/s6-rc-0.5.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="<dev-lang/execline-2.7.0.0:=[static-libs?]
- <dev-libs/skalibs-2.10.0.0:=[static-libs?]
- <sys-apps/s6-2.10.0.0:=[execline,static-libs?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
- configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- econf \
- --bindir=/bin \
- --dynlibdir=/usr/$(get_libdir) \
- --libdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/usr/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/execline \
- --with-lib=/usr/$(get_libdir)/s6 \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- --enable-shared \
- $(use_enable static allstatic) \
- $(use_enable static static-libc) \
- $(use_enable static-libs static)
-}
-
-pkg_postinst() {
- ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!"
- ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
- ewarn "and the documentation for the s6-rc-format-upgrade utility."
-}
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
new file mode 100644
index 000000000000..4c6c8d4c1bca
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?]
+ >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?]
+ >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/execline
+ --with-lib=/usr/$(get_libdir)/s6
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ --enable-shared
+ $(use_enable static allstatic)
+ $(use_enable static static-libc)
+ $(use_enable static-libs static)
+ )
+
+ econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+ ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!"
+ ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
+ ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
deleted file mode 100644
index 6feff233b4ae..000000000000
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
- >=dev-libs/skalibs-2.11.1.0:=[static-libs?]
- >=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- local myconf=(
- --bindir=/bin
- --dynlibdir=/usr/$(get_libdir)
- --libdir=/usr/$(get_libdir)/${PN}
- --with-dynlib=/usr/$(get_libdir)
- --with-lib=/usr/$(get_libdir)/execline
- --with-lib=/usr/$(get_libdir)/s6
- --with-lib=/usr/$(get_libdir)/skalibs
- --with-sysdeps=/usr/$(get_libdir)/skalibs
- --enable-shared
- $(use_enable static allstatic)
- $(use_enable static static-libc)
- $(use_enable static-libs static)
- )
-
- econf "${myconf[@]}"
-}
-
-pkg_postinst() {
- ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!"
- ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
- ewarn "and the documentation for the s6-rc-format-upgrade utility."
-}
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
new file mode 100644
index 000000000000..4c6c8d4c1bca
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?]
+ >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?]
+ >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/execline
+ --with-lib=/usr/$(get_libdir)/s6
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ --enable-shared
+ $(use_enable static allstatic)
+ $(use_enable static static-libc)
+ $(use_enable static-libs static)
+ )
+
+ econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+ ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!"
+ ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
+ ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
new file mode 100644
index 000000000000..9304b3decb02
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="dev-lang/execline:=
+ dev-libs/skalibs:=
+ sys-apps/s6:=[execline]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/execline
+ --with-lib=/usr/$(get_libdir)/s6
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ --enable-shared
+ --disable-allstatic
+ --disable-static-libc
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index f101f06160a8..9638d470a2dc 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,7 +1,5 @@
-DIST s6-2.11.0.1.tar.gz 227802 BLAKE2B 76721fdbc4fdbcb11d20eff31b817e66c49a488290ac8564a0418c5cd2ba3a204625dac2ce0dedcc8fccb18f54c5178253627f6874160b748db323cb4a34f32e SHA512 e833ae42d7094a46eea4d914c8e9b07b030cab2c6010c1d7698a070d14adbb62a614822a9575a3064a6b8a5a856146fc9fa27661f0d84569dac14ad6cdbf84d9
DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
-DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee
-EBUILD s6-2.11.0.1.ebuild 1303 BLAKE2B 48e80812dfdecce6aca5998024b95aaa25533f0dd6c73e03a7c41ea7b898b1388b3941b32ccf111912e7da89821f658fa1e0c4a1447bcff16c84825b58b88748 SHA512 0b2ba15254cd187e8594d1124e0431e7d6a64ce21578f36dd6e6309da93e64452ddc80b5c56d6fcd10770358df47b4f45e78c140f35ff6adb9cc2abbf7a8e552
-EBUILD s6-2.11.1.0.ebuild 1305 BLAKE2B 61b02f5abb1138a61a431f8ae267e0a5746ac6e8b759a5eca11b1845fc3ca5d18b9bedd6396508de68148aa718cdfade3684bdf5bfb446968f6920a867b71375 SHA512 ed187f4373043e66ab0aadba46ce10e350c7d5c1e596e67e5701e8de750c70ec6348d636d8dfd9b69413b233c0dbbbde6a44be140c4d3cc24e5e8c1e6db11dd5
-EBUILD s6-2.9.2.0.ebuild 1360 BLAKE2B b031627f947e70b106b19335538a7873430dfba114d8c8fa5384570eb99d43c276777c4a6943bfac5808d57d8f0767e071db9a1405d44e758f71f90c6812ba89 SHA512 37b8ec76eeb1a008a5694ce07181a7b76bbeaf4e5ad445028e0fd0fecfd230541b8b68d529cfc59012e352b2116e2baf2b2508038edc0fbc2391b28aaa884781
+DIST s6-2.11.1.1.tar.gz 228878 BLAKE2B c94c18b66862c7945a317ab76d933d40fc360847b71c6fb3d507535ee41637d60327a05486a93ab7aec630a0c8ead61d6c17bfc064bd9f94b39a7cc56f76cb49 SHA512 f5fc903c11b57b2a83d9e120a51f64b63984a2af9b772dd6fd64f268b512a083350abedcae04c926deb6751b5ae30e992d6a4128ddf4ab1d49c548ef8f3d7752
+EBUILD s6-2.11.1.0-r1.ebuild 1309 BLAKE2B 21e324158a89d92f9ff05d6188375435d3b254a722ab222f615224a12fa614dbdb0e5f2e7f40c410b6f104710094f6855fda0c8d50e4df505096cafdf22f3e20 SHA512 0e9b27a30c07af081e0fcb189ba7a9aa4eea03c685434a5c7bbe6a228eeca0bf6ff145215114eec7d760b7eb56bac457070396f7a53e0766473fd31813e30291
+EBUILD s6-2.11.1.1.ebuild 1121 BLAKE2B 3f1d0f3d60e2e7dc19380198c82431fa2362efe082980f62baa11b6c506cb004d28a15f6bb34299c107c03e6ebf13f7f671f895b1f2169a4253fb2569fc1eb16 SHA512 9e5335e94e50136c01df285867204dffb20819eab9bfbca8db92a0c8c8889f3cd166dab85f2bf954f92e79cb8986b42e7ce555f3c97f2ef33aa4fa072f4e4994
MISC metadata.xml 883 BLAKE2B 501518e15b1abd7badfd84007057b30f5ce972d7da8997ebbc218db6aa4001e06500f3b42f88ff259324bd3ba732231275cd33f27baa1588e28b9b80098befa9 SHA512 98b763747501225ebb0a5a1b8fb8a49757bb64c792c572f01c84dbdfe62ae83f03f72cb4ccfb905f58f9d24f06ded96a158602528ee26c1979c017477a4be183
diff --git a/sys-apps/s6/s6-2.11.0.1.ebuild b/sys-apps/s6/s6-2.11.0.1.ebuild
deleted file mode 100644
index 2f9f63992ca5..000000000000
--- a/sys-apps/s6/s6-2.11.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+execline static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="execline? ( >=dev-lang/execline-2.8.2.0:=[static-libs?] )
- >=dev-libs/skalibs-2.11.1.0:=[static-libs?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- local myconf=(
- --bindir=/bin
- --dynlibdir=/usr/$(get_libdir)
- --libdir=/usr/$(get_libdir)/${PN}
- --with-dynlib=/usr/$(get_libdir)
- --with-lib=/usr/$(get_libdir)/execline
- --with-lib=/usr/$(get_libdir)/skalibs
- --with-sysdeps=/usr/$(get_libdir)/skalibs
- $(usex execline '' '--disable-execline' )
- --enable-shared
- $(use_enable static allstatic)
- $(use_enable static static-libc)
- $(use_enable static-libs static)
- )
-
- econf "${myconf[@]}"
-}
diff --git a/sys-apps/s6/s6-2.11.1.0-r1.ebuild b/sys-apps/s6/s6-2.11.1.0-r1.ebuild
new file mode 100644
index 000000000000..65697c3d13b7
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm x86"
+IUSE="+execline static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] )
+ >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/execline
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ $(usex execline '' '--disable-execline' )
+ --enable-shared
+ $(use_enable static allstatic)
+ $(use_enable static static-libc)
+ $(use_enable static-libs static)
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6/s6-2.11.1.0.ebuild b/sys-apps/s6/s6-2.11.1.0.ebuild
deleted file mode 100644
index bf45c253220e..000000000000
--- a/sys-apps/s6/s6-2.11.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+execline static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs?] )
- >=dev-libs/skalibs-2.11.2.0:=[static-libs?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- local myconf=(
- --bindir=/bin
- --dynlibdir=/usr/$(get_libdir)
- --libdir=/usr/$(get_libdir)/${PN}
- --with-dynlib=/usr/$(get_libdir)
- --with-lib=/usr/$(get_libdir)/execline
- --with-lib=/usr/$(get_libdir)/skalibs
- --with-sysdeps=/usr/$(get_libdir)/skalibs
- $(usex execline '' '--disable-execline' )
- --enable-shared
- $(use_enable static allstatic)
- $(use_enable static static-libc)
- $(use_enable static-libs static)
- )
-
- econf "${myconf[@]}"
-}
diff --git a/sys-apps/s6/s6-2.11.1.1.ebuild b/sys-apps/s6/s6-2.11.1.1.ebuild
new file mode 100644
index 000000000000..dcdeeef35af5
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+execline"
+
+RDEPEND="dev-libs/skalibs:=
+ execline? ( dev-lang/execline:= )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+
+ # Avoid QA warning for LDFLAGS addition
+ sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+ sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+ tc-export AR CC RANLIB
+
+ local myconf=(
+ --bindir=/bin
+ --dynlibdir=/usr/$(get_libdir)
+ --libdir=/usr/$(get_libdir)/${PN}
+ --with-dynlib=/usr/$(get_libdir)
+ --with-lib=/usr/$(get_libdir)/execline
+ --with-lib=/usr/$(get_libdir)/skalibs
+ --with-sysdeps=/usr/$(get_libdir)/skalibs
+ --enable-shared
+ --disable-allstatic
+ --disable-static-libc
+ $(use_enable execline)
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6/s6-2.9.2.0.ebuild b/sys-apps/s6/s6-2.9.2.0.ebuild
deleted file mode 100644
index 473967d84b7d..000000000000
--- a/sys-apps/s6/s6-2.9.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="https://www.skarnet.org/software/s6/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+execline static static-libs"
-
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND="execline? ( <dev-lang/execline-2.7.0.0:=[static-libs?] )
- <dev-libs/skalibs-2.10.0.0:=[static-libs?]
-"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- default
-
- # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
- sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
- configure || die
-
- sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
- tc-export AR CC RANLIB
-
- econf \
- --bindir=/bin \
- --dynlibdir=/usr/$(get_libdir) \
- --libdir=/usr/$(get_libdir)/${PN} \
- --with-dynlib=/usr/$(get_libdir) \
- --with-lib=/usr/$(get_libdir)/execline \
- --with-lib=/usr/$(get_libdir)/skalibs \
- --with-sysdeps=/usr/$(get_libdir)/skalibs \
- $(usex execline '' '--disable-execline' ) \
- --enable-shared \
- $(use_enable static allstatic) \
- $(use_enable static static-libc) \
- $(use_enable static-libs static)
-}
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index 157d3624f42d..86a69c9972c8 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,3 +1,3 @@
DIST sdparm-1.12.tgz 486592 BLAKE2B 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6 SHA512 00e2775c290c6db3a02780dd3eefa58ac40e1df79a7f19f80a9d497c019a9a4a9a16fb2726f48e7083d0104a8e74326e683c3f5f44c7d1f591a0f607e10493b1
-EBUILD sdparm-1.12.ebuild 1019 BLAKE2B 4d161fb654b2e0478a1e54db27b5a4c1c41b75aed5db6cb948a4ab98943d0b34f247d4ae785ea564a121a7e037faa22d3e081ea94120e50ab09e53e46abb1e0f SHA512 1efd970e9f4004998edae5dc175363e52acc6a77cfc50b4d7d08f92ff1ff80455ac54d9429113045c117db24fe454465c3723fc9c93711d22c189206be302529
+EBUILD sdparm-1.12.ebuild 1033 BLAKE2B 0653c563787bd657b60d995118cc33444e89740bd26bb84c716e50abbc4eb8744f49a186ba9fb1633ed6d335785b989f21236417a40237809ce9409db0392bf8 SHA512 c6c4193c0c5b45375c36f21b181821d7a1b84ad8c46a2b074d4802ececa056c3cb50f87ed26b9edc840059fa14e027399e892a5e5829327811e2084416c7f7e3
MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/sdparm/sdparm-1.12.ebuild b/sys-apps/sdparm/sdparm-1.12.ebuild
index 9424a1f7fe1b..f867670ecaf9 100644
--- a/sys-apps/sdparm/sdparm-1.12.ebuild
+++ b/sys-apps/sdparm/sdparm-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
# Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 65506b950e1e..138c71449ff7 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,6 +1,6 @@
DIST secilc-3.3.tar.gz 181205 BLAKE2B ffccf2e6ea416f6e5a8270a488c6c6ed01b607af20fffed129f5d9b9957f2ab16e90a3fdbd57b597f1195987edf6a2ca1ae561cca62d176a01878fe24900f4b9 SHA512 11b2b6a56d588a71d8cc5b2e69e76579ddd3ea20e036bbfdbeefd8ed64a6dca3c8f963509a96231eb21807a195ec24e4807ef52dc2218ee0410ee0828ad77fa8
-DIST secilc-3.4-rc1.tar.gz 181269 BLAKE2B cc0bd0d6016833d64d615fe0f1ef59ab302b15238f10005412d3c2347056fbc5a0e587ac2e18f62f7cb1402a2749c117ac6b50e97df9677a0afc9b2270d9352d SHA512 d99e76c50395fcb20a4c08156b155f7411eab2ce3374899cc3cf6193d95ed3a5b2dae86d18ddfda838e6701aeddedbdb98f8faedeb4506ac5b19c7957763d22c
+DIST secilc-3.4.tar.gz 181312 BLAKE2B cee26f3b6dc3d7a48df3bd3c9e0edf15f92f55b399afe02d7f4efe10cfd1d8ec140aa5ed588003c6ffca95e1abc82a6163f86edc58ea140703f47ca4bf2d5179 SHA512 f29ff42dd60050cdd4367af38b334876817f8e33ed40a9be89304beea840a210bd9a58d658d0b09f98bad54b12b185a0262ca05094b63e7f96c0142729699c3b
EBUILD secilc-3.3.ebuild 770 BLAKE2B 0a03a4c536f52d34bb1355ff9ba957170875c41edb11648484469d355ef533ecd8cb2e4083aeba5eb46ac19b5ead308a92b95772d768763801f0e19360690fe7 SHA512 b78f66005b8b7d2672446acd60bca58ea14d3246152d5befae3114be524cd32f6faca8ba03543375b9a5cee3d7fb0245b2d664d0148d0e13a7f630163a9aeae4
-EBUILD secilc-3.4_rc1.ebuild 846 BLAKE2B e531168df9007f4095558a294b329af64def434354b6572e04762e4f1804c340b8917c87cd23c4d6d488c253fa445eee83a2f20076116d2ef90f5088c9520b18 SHA512 3da24a91a87b20e26bce7139941fc0870e0f6c88d9382cf31496065c3c604e5c58487cc0a484b7500d7e945bf268bbda49d76b97d8e118db8b1763927e335e97
+EBUILD secilc-3.4.ebuild 846 BLAKE2B e531168df9007f4095558a294b329af64def434354b6572e04762e4f1804c340b8917c87cd23c4d6d488c253fa445eee83a2f20076116d2ef90f5088c9520b18 SHA512 3da24a91a87b20e26bce7139941fc0870e0f6c88d9382cf31496065c3c604e5c58487cc0a484b7500d7e945bf268bbda49d76b97d8e118db8b1763927e335e97
EBUILD secilc-9999.ebuild 846 BLAKE2B e531168df9007f4095558a294b329af64def434354b6572e04762e4f1804c340b8917c87cd23c4d6d488c253fa445eee83a2f20076116d2ef90f5088c9520b18 SHA512 3da24a91a87b20e26bce7139941fc0870e0f6c88d9382cf31496065c3c604e5c58487cc0a484b7500d7e945bf268bbda49d76b97d8e118db8b1763927e335e97
MISC metadata.xml 518 BLAKE2B e04a38178db6390e78057059950b7c7ff090272739b618e75b5231176594a7fb3c2df88cfbf63575a3805bdb22f87c7f6aba7044bfc0c2c5e6ebdfef18b47d95 SHA512 a0d7f84a3578791107f46664b0da8078c37cf9a976d8aca31d462d2b19b82f1c7a0c7d5d43b9af59736983fa223238aabd1000d4eaaf18ee0a7759e2d6b0ce81
diff --git a/sys-apps/secilc/secilc-3.4.ebuild b/sys-apps/secilc/secilc-3.4.ebuild
new file mode 100644
index 000000000000..13b261011af0
--- /dev/null
+++ b/sys-apps/secilc/secilc-3.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+ S="${WORKDIR}/${P}/${PN}"
+else
+ SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/xmlto"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_compile() {
+ tc-export CC
+ default
+}
diff --git a/sys-apps/secilc/secilc-3.4_rc1.ebuild b/sys-apps/secilc/secilc-3.4_rc1.ebuild
deleted file mode 100644
index 13b261011af0..000000000000
--- a/sys-apps/secilc/secilc-3.4_rc1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
- S="${WORKDIR}/${P}/${PN}"
-else
- SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libsepol-${PV}"
-RDEPEND="${DEPEND}"
-BDEPEND="app-text/xmlto"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_compile() {
- tc-export CC
- default
-}
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index c77229a282fe..b3754707ea18 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,6 @@
DIST selinux-python-3.3.tar.gz 2101584 BLAKE2B 603aafbf316b744098bd34c79bf384d55624c086fd75147675a4a0715df3d61710a99d490f30b78d59a2c2a85fcc4db91772c24644a963b31e1a0d305c4bc83e SHA512 a69948a8b139a309f18632440e4204f49832a94b8b6be50e162d3dacb16698effeb1a77c44462e8cc7dc3dd600b887b9ab2fef618c31d3e0fe0de216a6aaebe3
-DIST selinux-python-3.4-rc1.tar.gz 3597175 BLAKE2B eb5c71b5a946978353dc023a799dd3e4063a8af460887a05dc9e852ef93e5794a4edb4c2fe909602c0bfd7a34d3c3d16b713ace822e610dc3a6c3c34929c3374 SHA512 b67baf60e95a5f7f1764b41e550665231639722e1a039f7f8d6b8eda3f70dd376f9e813fd755e5035018c8719069fc987e89b928c5cf7c9bd447d65af51e7656
+DIST selinux-python-3.4.tar.gz 3596450 BLAKE2B b98f6ba63814a4281c5ea624b2b0f68c6ae92e4447dd6078a0d70bce34534b0a457f0a9533e1db1fbf665b8a0b379adf78fd8ba8f3ae19973b74a3332157842b SHA512 d601ce2628c4876dc4f2dfccd6db8ff45f68c5eb1b14cec3328644b71959107546469b27dfd90488fc669019b341d0cba708a1797f427ac7f86a0f05e86c0948
EBUILD selinux-python-3.3.ebuild 3087 BLAKE2B ad27bfc49dd0ad01c181ec159aee9bfd4018b13e4a2dd602d6f35e890a6879dd48c91901760e1ae093d28db3d5b4ead2e9ca92ff4d7f728a85a6b08f3f452af6 SHA512 761646c3a71af22ad4ef51abdb282f5733389471389bfee06c08edcdb3b1360b5087adc1f11530c04ef86bbe65bd3ed1b1a9653034550a743f6582a8a9ea9a66
-EBUILD selinux-python-3.4_rc1.ebuild 3163 BLAKE2B 5d14a809a6d465c019d9e886c9a21444c9aff8f08f7001444b0ffa4b8f6d6967153aa7dbae7babd8eeaf845cc88106ba9bd07478bb208dd4953a4cd0529710d0 SHA512 e6fdba90ad3182e7fccc35a16475c87e2c6eefc934fe141556e8ae3bd9b2a8f7429a680f26b2d053258d4f6502849a09fd328407b0e390a0706a82c9b269ed1c
-EBUILD selinux-python-9999.ebuild 3163 BLAKE2B 5d14a809a6d465c019d9e886c9a21444c9aff8f08f7001444b0ffa4b8f6d6967153aa7dbae7babd8eeaf845cc88106ba9bd07478bb208dd4953a4cd0529710d0 SHA512 e6fdba90ad3182e7fccc35a16475c87e2c6eefc934fe141556e8ae3bd9b2a8f7429a680f26b2d053258d4f6502849a09fd328407b0e390a0706a82c9b269ed1c
+EBUILD selinux-python-3.4.ebuild 3166 BLAKE2B 3d433b54b46cb0fbfadd567c3cff7e84a2b9e7b156331f4d4d221cb367f75566909fc91a751347caaafff222a38d8b05a274fcf6164fe518f243afd3772cfb5b SHA512 affe54cc07584e4e5752b74727d419c9715f286067fda42d58589caeb636824dd74302fc6f2510fb828edd8c1a7bc03039d7e6bc67cefd3c5b9c868c43da14cd
+EBUILD selinux-python-9999.ebuild 3166 BLAKE2B 3d433b54b46cb0fbfadd567c3cff7e84a2b9e7b156331f4d4d221cb367f75566909fc91a751347caaafff222a38d8b05a274fcf6164fe518f243afd3772cfb5b SHA512 affe54cc07584e4e5752b74727d419c9715f286067fda42d58589caeb636824dd74302fc6f2510fb828edd8c1a7bc03039d7e6bc67cefd3c5b9c868c43da14cd
MISC metadata.xml 558 BLAKE2B 6fba5f27d19e5ea730bd1bfb9b63c536a86f0b47c7156388df9e9af9bda8856c8e4291bf822b469afb333638504d75f64215ef86f3bf65b68812a829b0e94f38 SHA512 df8eaff3f7e69d8d0f437d29dc38b654b81a5769c32e8c0fb98aeb83cf18a1598845d03d177b1837a6b0b628a34c524a52fae5672b7c186a6a8567f349b25304
diff --git a/sys-apps/selinux-python/selinux-python-3.4.ebuild b/sys-apps/selinux-python/selinux-python-3.4.ebuild
new file mode 100644
index 000000000000..edd4c0e29e22
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-3.4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+ S="${WORKDIR}/${P}/${PN#selinux-}"
+else
+ SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=sys-libs/libselinux-${PV}:=[python]
+ >=sys-libs/libsemanage-${PV}:=[python(+)]
+ >=sys-libs/libsepol-${PV}:=
+ >=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+ >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ >=sys-apps/secilc-${PV}
+ )"
+
+src_prepare() {
+ default
+ sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+
+ python_copy_sources
+}
+
+src_compile() {
+ building() {
+ emake -C "${BUILD_DIR}" \
+ CC="$(tc-getCC)" \
+ LIBDIR="\$(PREFIX)/$(get_libdir)"
+ }
+ python_foreach_impl building
+}
+
+src_test() {
+ testing() {
+ # The different subprojects have some interproject dependencies:
+ # - audit2allow depens on sepolgen
+ # - chcat depends on semanage
+ # and maybe others.
+ # Add all the modules of the individual subprojects to the
+ # PYTHONPATH, so they get actually found and used. In
+ # particular, already installed versions on the system are not
+ # used.
+ for dir in audit2allow chcat semanage sepolgen/src sepolicy ; do
+ PYTHONPATH="${BUILD_DIR}/${dir}:${PYTHONPATH}"
+ done
+ PYTHONPATH=${PYTHONPATH} \
+ emake -C "${BUILD_DIR}" \
+ test
+ }
+ python_foreach_impl testing
+}
+
+src_install() {
+ installation() {
+ emake -C "${BUILD_DIR}" \
+ DESTDIR="${D}" \
+ LIBDIR="\$(PREFIX)/$(get_libdir)" \
+ install
+ python_optimize
+ }
+ python_foreach_impl installation
+
+ # Set version-specific scripts
+ for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+ python_replicate_script "${ED}/usr/bin/${pyscript}"
+ done
+ for pyscript in semanage; do
+ python_replicate_script "${ED}/usr/sbin/${pyscript}"
+ done
+
+ # Create sepolgen.conf with different devel location definition
+ if [[ -f /etc/selinux/config ]];
+ then
+ local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+ mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+ echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+ else
+ local selinuxtype="${POLICY_TYPES%% *}";
+ if [[ -n "${selinuxtype}" ]];
+ then
+ echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+ else
+ echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+ fi
+ fi
+}
diff --git a/sys-apps/selinux-python/selinux-python-3.4_rc1.ebuild b/sys-apps/selinux-python/selinux-python-3.4_rc1.ebuild
deleted file mode 100644
index 4f4a0a3c95d3..000000000000
--- a/sys-apps/selinux-python/selinux-python-3.4_rc1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 toolchain-funcs
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
- S="${WORKDIR}/${P}/${PN#selinux-}"
-else
- SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=sys-libs/libselinux-${PV}:=[python]
- >=sys-libs/libsemanage-${PV}:=[python(+)]
- >=sys-libs/libsepol-${PV}:=
- >=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
- >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? (
- ${RDEPEND}
- >=sys-apps/secilc-${PV}
- )"
-
-src_prepare() {
- default
- sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-
- python_copy_sources
-}
-
-src_compile() {
- building() {
- emake -C "${BUILD_DIR}" \
- CC="$(tc-getCC)" \
- LIBDIR="\$(PREFIX)/$(get_libdir)"
- }
- python_foreach_impl building
-}
-
-src_test() {
- testing() {
- # The different subprojects have some interproject dependencies:
- # - audit2allow depens on sepolgen
- # - chcat depends on semanage
- # and maybe others.
- # Add all the modules of the individual subprojects to the
- # PYTHONPATH, so they get actually found and used. In
- # particular, already installed versions on the system are not
- # used.
- for dir in audit2allow chcat semanage sepolgen/src sepolicy ; do
- PYTHONPATH="${BUILD_DIR}/${dir}:${PYTHONPATH}"
- done
- PYTHONPATH=${PYTHONPATH} \
- emake -C "${BUILD_DIR}" \
- test
- }
- python_foreach_impl testing
-}
-
-src_install() {
- installation() {
- emake -C "${BUILD_DIR}" \
- DESTDIR="${D}" \
- LIBDIR="\$(PREFIX)/$(get_libdir)" \
- install
- python_optimize
- }
- python_foreach_impl installation
-
- # Set version-specific scripts
- for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
- python_replicate_script "${ED}/usr/bin/${pyscript}"
- done
- for pyscript in semanage; do
- python_replicate_script "${ED}/usr/sbin/${pyscript}"
- done
-
- # Create sepolgen.conf with different devel location definition
- if [[ -f /etc/selinux/config ]];
- then
- local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
- mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
- echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
- else
- local selinuxtype="${POLICY_TYPES%% *}";
- if [[ -n "${selinuxtype}" ]];
- then
- echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
- else
- echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
- fi
- fi
-}
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 4f4a0a3c95d3..edd4c0e29e22 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
inherit python-r1 toolchain-funcs
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 52f79655c5c4..b29b0d6345d7 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,6 @@
DIST semodule-utils-3.3.tar.gz 14268 BLAKE2B 5b03dd731c28e29b146e9f75fa7ce5151e58df1ea6598356b1ad9ee6846d2ebf7ceb57c740aa0ae4b94e0a7356180bd8e608d6a9543b48251e553036f2b2833e SHA512 76aa0c9322889c7de100f3c5789bdf27b7073827fe2af371bd50a4517baa8442f35e53f16a93227dce93da0ceb054bea7e5ee17a46fe05e06f3c2d9925cf59dc
-DIST semodule-utils-3.4-rc1.tar.gz 14270 BLAKE2B 7a0b5d060fc07ea71b71ccf2eaa6604cdc00afabaef1be8efb62a38bd401cfacd20f36af1a74324c2162b5fcdbcba6a3b3c5d98e33fccba99bc38ddfabd10ff8 SHA512 848354e95fcd6ae6be3e0ff5a32b26d78b2fbd04f463f063db796ff843dab44675eceb670f10c3ee602a6280e885ecc33242b37bb67ef77d467be030ddd4a72c
+DIST semodule-utils-3.4.tar.gz 14267 BLAKE2B 292c9550a5f1bc8b901c7c95fe2dde07068513bf7d358decab65afc2db185996ec905b582691265a63aba7bc47f4e1d6da4c867eb9a9df5b22fc623a716e927b SHA512 3a102eb83e1feff9796c4da572500be1e3a8a8bc8a7eed762ef4144761280f0513050c714aa287b1e4e67d2938f9f9a0ee5036762472d732eae0288b437cb7a9
EBUILD semodule-utils-3.3.ebuild 806 BLAKE2B cfa2dad68c85bcf6be3aedf1e2c5e6f071d98d98f72c7d48dbdc68896fb5c603701adc03cb52e105ab8063fd8431b8e2362ffb839c853127dc666f3907325f59 SHA512 699229f4a8ad869568eec8145ca1b1d014f2abbf870dde437bcef1c71149d3433383298590c0f9fdad9719b7ee284484e2ff43249a8c000e8b6b4987da1224a8
-EBUILD semodule-utils-3.4_rc1.ebuild 880 BLAKE2B 3122abbba2f5fb48d2e756f92380aa362bdcac2794bd566012bfb54c8d74a702d131d1d66b61504f2502758ddd36a9e0e1ef111c6961b1f580a50b87a52db1d7 SHA512 a6583f9fb2527091c65c90fcb10bb93f9635f0e4c9edac977aac3c2964d3460b0baaa39376147f3ca4b39fc4d3528ba244cb7892c5596cc7228c7604599ba33e
+EBUILD semodule-utils-3.4.ebuild 880 BLAKE2B 3122abbba2f5fb48d2e756f92380aa362bdcac2794bd566012bfb54c8d74a702d131d1d66b61504f2502758ddd36a9e0e1ef111c6961b1f580a50b87a52db1d7 SHA512 a6583f9fb2527091c65c90fcb10bb93f9635f0e4c9edac977aac3c2964d3460b0baaa39376147f3ca4b39fc4d3528ba244cb7892c5596cc7228c7604599ba33e
EBUILD semodule-utils-9999.ebuild 880 BLAKE2B 3122abbba2f5fb48d2e756f92380aa362bdcac2794bd566012bfb54c8d74a702d131d1d66b61504f2502758ddd36a9e0e1ef111c6961b1f580a50b87a52db1d7 SHA512 a6583f9fb2527091c65c90fcb10bb93f9635f0e4c9edac977aac3c2964d3460b0baaa39376147f3ca4b39fc4d3528ba244cb7892c5596cc7228c7604599ba33e
MISC metadata.xml 401 BLAKE2B de9fab42212c80ca7439bc2f09693f17a5da3e0c412a1599e12c9c02087487a68836ecf651b8b016b3215552cc88cd8b398d42eac783f0039d10d962205d280a SHA512 28d7ee52e3e1a41366554857904226d1fa9cea07726538c06913c65f7c12ea9d70a5d6ede253659e14f7672f6cedd90ac4ac572462220493e256f640a40876e5
diff --git a/sys-apps/semodule-utils/semodule-utils-3.4.ebuild b/sys-apps/semodule-utils/semodule-utils-3.4.ebuild
new file mode 100644
index 000000000000..ce9f168c9c89
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-3.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux policy module utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+ S="${WORKDIR}/${P}/${PN}"
+else
+ SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=sys-libs/libsepol-${PV}:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+}
diff --git a/sys-apps/semodule-utils/semodule-utils-3.4_rc1.ebuild b/sys-apps/semodule-utils/semodule-utils-3.4_rc1.ebuild
deleted file mode 100644
index ce9f168c9c89..000000000000
--- a/sys-apps/semodule-utils/semodule-utils-3.4_rc1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="SELinux policy module utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
- S="${WORKDIR}/${P}/${PN}"
-else
- SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=sys-libs/libsepol-${PV}:="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
-
- sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-}
diff --git a/sys-apps/servicelog/Manifest b/sys-apps/servicelog/Manifest
index 6e5ddb50a248..baeaf5dec980 100644
--- a/sys-apps/servicelog/Manifest
+++ b/sys-apps/servicelog/Manifest
@@ -1,3 +1,5 @@
DIST servicelog-1.1.15.tar.gz 29097 BLAKE2B a2ae131305ce466999536fca6734c006eafe70d8be16c5a8465f6ceb7ffb53cd06d82fe7229275f4e71ffddf7a572a214591aed59a6345f81c3f65dbe205cd1e SHA512 5d5142aeb947133fb8ae77d5021790ab530d4614a8becf018342e1feeded2f64302343189d4bd4d684b096888aad6f45e08861404bcc5437abeac078fbbb7ac6
+DIST servicelog-1.1.16.tar.gz 33068 BLAKE2B 281f15aecaafb246c9a6b40f377aa5087f2b3fdd28f217e7f26aa19f30e66c03b0a795f7eedf14d27b49ae36c81b4bdba9b0f9108a2a7a3a18051e35b8ec8a71 SHA512 127329cd04cbcc83ea95614aff441e8efb5ba10c1befbf13ad9ed7fc2ca88f11b6390c2ed7843df7e56b848fb0066d85c0bf17e60b22885ed4266661012b34a0
EBUILD servicelog-1.1.15.ebuild 514 BLAKE2B 6c442aae127d952781ab50d1f460266b5f1e402bd68b1c0a3c446925d3d78d26d6b2b986a81d39d401c2e5eafee173085d89d249307f651c24941223abe5ee54 SHA512 64cd20c23a344df40306dfaf59b0278ee47519cbcd8fe11ba00768c798144efb1a755e480d4fcc5bcbba710001e548ab1290427e5a11b10286713526f46292a3
-MISC metadata.xml 344 BLAKE2B 4261bbbdfac5884656099239198d6315ee706b8186088c824b9aade6eb7f731b7b624fa4b8044040b80221886de402347cac7bd162831397a6b1907acb3bdfb3 SHA512 04374310d6b5009209d16fbf79106bb0233c7f7f92c9e9aab8ae94c1a0a25297cd024b485db91fb0012994a5582281de386444ca94c02458a1cd7678a6021a8c
+EBUILD servicelog-1.1.16.ebuild 516 BLAKE2B 8fbc4fb15d8ed80e76933cee9730bf097a007db56edf6315e3d67dd66d25b29c40ef8b9c60af2718b6c1b8ec84c100f13417f0162f651f184fcff7435759a530 SHA512 26b33b52748301a84f7af7074666a235cf9567022e7d0c03d1cc3fbac2dbc03aa483f4fa4aa65ef6dd2053d55bddc9d9643a364478656f6469abfbdac2cac2cb
+MISC metadata.xml 349 BLAKE2B 1a34f5e7d57c7c0dd56b2f4c2a90f8fb874de6e23285190da3f4257ae58f382a2be8be5406faede0e45388781fb52782c36233fdadd9f19567078e1136407566 SHA512 d0245c85da294a50004aa68db107cb1251b1e2a1f851cb6c88932801327913448651752d8b541a1d24647439819a826e5c39957e23f02fe24821b4161c3467eb
diff --git a/sys-apps/servicelog/metadata.xml b/sys-apps/servicelog/metadata.xml
index 2219560b548b..49ade3aaf177 100644
--- a/sys-apps/servicelog/metadata.xml
+++ b/sys-apps/servicelog/metadata.xml
@@ -6,6 +6,6 @@
<name>Gentoo Linux PowerPC Development</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">linux-diag</remote-id>
+ <remote-id type="github">power-ras/servicelog</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-apps/servicelog/servicelog-1.1.16.ebuild b/sys-apps/servicelog/servicelog-1.1.16.ebuild
new file mode 100644
index 000000000000..90da4a3e02d8
--- /dev/null
+++ b/sys-apps/servicelog/servicelog-1.1.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Provides utilities for logging service-related events"
+HOMEPAGE="https://github.com/power-ras/servicelog"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64"
+
+DEPEND="
+ sys-libs/libservicelog
+"
+RDEPEND="
+ ${DEPEND}
+ virtual/logger
+"
+DOCS="ChangeLog"
+
+src_prepare() {
+ default
+ eautoreconf
+}
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index cb805d1b571d..62db9c104c04 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -6,5 +6,5 @@ AUX setserial-2.17-headers.patch 236 BLAKE2B 06ba0f4ad6ecc3788115b02fa4f5762b272
AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2adcb7adc8e04f6d20594395cc01e821364d04aeb02608644c88e511453599af451d00dda8c8ab54bdd1710030cbdc7833c32286f SHA512 6041894014b3d139a8c2d59460003310c17aee407dab2fa3713f98ea2c29fd347906f68f3d988f052cbee45de43fa00afadc4359b562bfd34fd4931b48505cf8
AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
-EBUILD setserial-2.17-r5.ebuild 953 BLAKE2B 3ae641afca71105475e26a752416b40b08310fbefcd979d268dadbb604c63967171ab2b76879fd58671a7913a727e04cd29ff01f6dcb90a1e8831127f05a4b71 SHA512 f479bf152514f73bd5d9fa8dc7b77cca458fae12fffe11cd22b380f54df0b9d2dbb9913263731f17d202fb8eec7f2b0bcd59f77dafb9470fad5ee08229299f3e
+EBUILD setserial-2.17-r5.ebuild 960 BLAKE2B 26d902599bb196e1fa05350b27debf041f9d970754b24d6c3b8f992105bd3ca97c39333378346cbad80ee07d50648e83b5f7ceb9cc1c39ee38cb67994c898ec3 SHA512 d8265a1eba44c193543e3e203db3749543bd37704d70c89abcc29ac463736c61495256974eab8c6f8a399c258b8d9ba12ac73a47cdd3bcaa285408becbc80f17
MISC metadata.xml 330 BLAKE2B 911c480b4963e51f555f0ae07e9795194bd381ca1bfb86e1e1760187e676c7683e039193c58a86d18f167a6f80d214435f611193a7145a3068f5e13f3eb80799 SHA512 34422f5f444bc2fdb4bea8fed7e434d57d5aa54bb0b00ca24dcfc1f9431d7c661807405ecb091f58b59b2a3d39e544f4a423ab7f2ab063251daa030823f47cdb
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index 62ff18bf70b7..2fddb3b824a0 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
PATCHES=(
"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 1064003f029c..5ed22af75c63 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -2,5 +2,5 @@ AUX sg3_utils-1.46-musl-drand48-compat.patch 4532 BLAKE2B 454837f33c374eb3002a47
DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
DIST sg3_utils-1.47.tar.xz 1046904 BLAKE2B 6efadd86f6d466469f5d5d3f53b2b6bf01143695db19e96b55a13a606d8a36d5571e390fed0b0990371dc4b77714f88c03f440a4468f6863544c0d21b2e3ef73 SHA512 ef072b8f0012d0944e21d2134aff7125e24ea24d1cbbb1aa79160e844f9a60236f1e244437a3bc08a22a7e99f613adad4a05ae5cc3916ded5a72d162cd3aa163
EBUILD sg3_utils-1.46-r1.ebuild 1078 BLAKE2B e8d173b0636b17a6ef4922f3817ca7250eac4ce241f4103bc75ca39c7a4e2675b10f70672e680bd8d19dfdb8917871a6f46c116ff8585938fe357e83833c1933 SHA512 2b59e7d8e31ec2d5010e2cb822888bde3891f625a46a6951b123c38f39f9978986479688d74986beebbec27230eb27a154c77caad200323ec65733549bcc61dd
-EBUILD sg3_utils-1.47.ebuild 1004 BLAKE2B 68be79173ef911951935bb214c250f752f34b59ad4fb8cc27f0d31043488208d59f9b54c1ccbe512745a409aad0518b16b0762c2105f2889c638a59f34995183 SHA512 eb50d4bc2606e38e496d09b5add629aa57515800880a992d25a58caf2b16d13475e59c6a9d554206d4123970d2c41086433c899d5ff8e34a6e2e0a1880d4dfdb
+EBUILD sg3_utils-1.47.ebuild 1003 BLAKE2B 37ab8a8a18d80df213402fe43335bf07b1a36056a23cdaff02c8b199e8b7e72af3b094170a9b748072848054382be4efe6d504cbd66260ce1d6ea16a18fbf5a9 SHA512 9bb97a9d684a6ff8cf64b8f1db7c4eaebc2c37ab13c990e26139ce02c30b0a6be0af062d3fbeb05426bcf37b31505519788213bc0ade798110c887407eb9c86b
MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/sg3_utils/sg3_utils-1.47.ebuild b/sys-apps/sg3_utils/sg3_utils-1.47.ebuild
index 810a9073c7ac..decc87723a37 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.47.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.47.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://sg.danny.cz/sg/p/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs"
DEPEND="sys-devel/libtool"
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 2734b8ed7d30..406b5d78b7ef 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,10 +1,7 @@
AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba692cfcf106557047ce4ecb2756addff2800f75ae2d550e209a83d1399484f7c1bf1c7f7f859b9 SHA512 7a46212d2d76b335ac7470b51b44e40b1cdd4814e5db4a8a2f013803bb40ea5072fde64590ffd51754b03a6f80a43e835605a5bb3ac2c23e456633995191ec31
AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
-AUX smartmontools-7.2-update-smart-drivedb-quiet.patch 2141 BLAKE2B 9de69ba2187b94885e29594c9a350f0b44c2ea88b6fdee96e8c397ea57db74903b174714fce94433cbf00e11e9c6270f70ccdd3ca818667c09ed4681ebc49b8e SHA512 7e1f70212602b6e4b87ab1017777c4edf8627dbea3bb15476e4c356d41469913a1194dbba5054055fb6fd814face766b85851d16b7383c64d26eb9a8d796bc7c
AUX smartmontools-update-drivedb 45 BLAKE2B 6b77927d453f6b39898dcb164b4e7cb32f65de528088bfe4e2b358a3adffecc5cc6a120ee64de307551f0a0444b13901eb2db28bbd8ac81fba50f1dfbf0772f9 SHA512 6fd231ea3215fdc14c25f2ee7d767ca35f8c1f438e97d6056f419699d042a6a23473b26f2e28b1fb16a1389144a62a4b642f0ae19ab1dbda0c0a4a34bf709246
-DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea
DIST smartmontools-7.3.tar.gz 1043932 BLAKE2B 119fd4aded487796ffd38050ddf8c7dd69cc6f3950650cb0315846292fd4a6594d949d87c51ed46717d6aaadb332c68f655514d1fde89600d51f3fe36f8df1ca SHA512 08afe8b0a6a39e742160cd4e4c03fc7aff7b1ae8681b906360f0932277dc99e361b7606b2373bdf42425cf9453480a5f4344bc040ebc2fa26a03bd52f02a6ac0
-EBUILD smartmontools-7.2-r2.ebuild 4243 BLAKE2B a03483429b480b9116c6e7f9fd20dd39cd68899f5129bfac5e4a3ead00d5ba810047bbcdfba40dc6a7c9dae59dcef04234fe3964748e681e6ba1ec3922a402eb SHA512 dcaeb1f24fd743c8ebfb65ff44808d35d3258819e6ca75f26dd2077f7f9ecd18dcde295a68b335f74f82b50b4247db301ade39c5c2dab643a331a43e80a0110c
EBUILD smartmontools-7.3.ebuild 4159 BLAKE2B bcff963225c9d017346409c47b8c8acd82ad9173e1f4f597613687282fc01a19e97086bb4cd6a493ba545c9cb4792c54df94b4de400449c90053eb4776a9ef48 SHA512 a561ed49dc1d39995e9ffe5c6e0f07616c0e3200747d2ab2673bca7ef0ae5c56aa3914a2528de9866fe31d713f4ff74d77204a091ac454caedf5c9ec4f971b96
EBUILD smartmontools-9999.ebuild 4167 BLAKE2B 4c44ef2ed5903bef1013c14ad9c8c9384e2285fe97e5ad7f22d3066e3705041c4d30ca51e74ef22a541b79adc856992a4afa8957179cc0d8da939296ca61c038 SHA512 0baa8408e8387ebcd7a983eecd5ea5dd0198be2f46d0b2f195320f9eb1459a95e3f2ee85e40a75ec79a082ceebfe02851558caadaf712f4d58ab1d25ce1d8949
MISC metadata.xml 708 BLAKE2B fcd5acb620a89a1171a63a678e16a6eefd0f72616c7c8c8999adb617d5b7e6aa359c89793db574e18a7424e838cf986005df9b538eb4d3a0df59fe09aa701f0f SHA512 0c6315a656c69a2d343f072d91d0457d3ee6169824c6eb232fd651895f207cf8162b178adc5a1f9de2b76bc9cb0f10fb3ead49c45a104db744bc98915a3aa7dd
diff --git a/sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch b/sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch
deleted file mode 100644
index 773375508222..000000000000
--- a/sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-commit 56363dff436c12eaa296bbba39dfd65ec3f1f1f2
-Author: chrfranke <authors@smartmontools.org>
-Date: Sat Nov 6 15:07:18 2021 +0000
-
- update-smart-drivedb.in: Add '-q' option to suppress info messages.
- (GH issues/110).
- update-smart-drivedb.8.in: Document new option.
-
- git-svn-id: http://svn.code.sf.net/p/smartmontools/code/trunk@5242 4ea69e1a-61f1-4043-bf83-b5c94c648137
-
---- a/update-smart-drivedb.8.in
-+++ b/update-smart-drivedb.8.in
-@@ -1,6 +1,6 @@
- .ig
- Copyright (C) 2013 Hannes von Haugwitz <hannes@vonhaugwitz.com>
--Copyright (C) 2014-20 Christian Franke
-+Copyright (C) 2014-21 Christian Franke
-
- SPDX-License-Identifier: GPL-2.0-or-later
-
-@@ -144,6 +144,10 @@ Print the OpenPGP/GPG public key block.
- .B \-\-dryrun
- Print download commands only.
- .TP
-+.B \-q
-+[NEW EXPERIMENTAL UPDATE-SMART-DRIVEDB FEATURE]
-+Suppress info messages.
-+.TP
- .B \-v
- Verbose output.
- .Sp
---- a/update-smart-drivedb.in
-+++ b/update-smart-drivedb.in
-@@ -72,6 +72,7 @@ Usage: $myname [OPTIONS] [DESTFILE]
- --no-verify Don't verify signature
- --export-key Print the OpenPGP/GPG public key block
- --dryrun Print download commands only
-+ -q Suppress info messages
- -v Verbose output
-
- Updates $DRIVEDB
-@@ -131,6 +132,11 @@ inpath()
- return $rc
- }
-
-+iecho()
-+{
-+ test -n "$quiet" || echo "$*"
-+}
-+
- vecho()
- {
- test -n "$q" || echo "$*"
-@@ -522,6 +528,7 @@ mv_all()
- smtctl=$SMARTCTL
- tool=
- urlid="svn"
-+quiet=
- q="-q"
- dryrun=
- trunk=
-@@ -547,6 +554,9 @@ while true; do case $1 in
- shift; test -n "$1" || usage
- urlid=$1 ;;
-
-+ -q)
-+ quiet=t ;;
-+
- -v)
- q= ;;
-
-@@ -727,7 +737,7 @@ if [ -f "$DEST" ]; then
- then
- rm -f "$DEST.new" "$DEST.new.raw" "$DEST.new.raw.asc"
- touch "$DEST.lastcheck"
-- echo "$DEST is already up to date"
-+ iecho "$DEST is already up to date"
- exit 0
- fi
- mv_all "$DEST" "" ".old"
-@@ -738,4 +748,4 @@ fi
-
- mv_all "$DEST" ".new" ""
-
--echo "$DEST updated from ${trunk:-branches/$brnch}${no_verify:+ (NOT VERIFIED)}"
-+iecho "$DEST updated from ${trunk:-branches/$brnch}${no_verify:+ (NOT VERIFIED)}"
diff --git a/sys-apps/smartmontools/smartmontools-7.2-r2.ebuild b/sys-apps/smartmontools/smartmontools-7.2-r2.ebuild
deleted file mode 100644
index 3059ff0feb50..000000000000
--- a/sys-apps/smartmontools/smartmontools-7.2-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools flag-o-matic systemd
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools"
- ESVN_PROJECT="smartmontools"
- inherit subversion
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
-HOMEPAGE="https://www.smartmontools.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps +daemon selinux static systemd +update-drivedb"
-
-DEPEND="
- caps? (
- static? ( sys-libs/libcap-ng[static-libs] )
- !static? ( sys-libs/libcap-ng )
- )
- selinux? (
- sys-libs/libselinux
- )"
-RDEPEND="${DEPEND}
- daemon? ( virtual/mailx )
- selinux? ( sec-policy/selinux-smartmon )
- systemd? ( sys-apps/systemd )
- update-drivedb? (
- app-crypt/gnupg
- || (
- net-misc/curl
- net-misc/wget
- www-client/lynx
- dev-vcs/subversion
- )
- )
-"
-
-REQUIRED_USE="(
- caps? ( daemon )
- static? ( !systemd )
-)"
-
-PATCHES=(
- # Backport from commit 56363dff436c12eaa296bbba39dfd65ec3f1f1f2
- "${FILESDIR}/${P}-update-smart-drivedb-quiet.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- use static && append-ldflags -static
- # The build installs /etc/init.d/smartd, but we clobber it
- # in our src_install, so no need to manually delete it.
- myeconfargs=(
- --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
- --with-initscriptdir="${EPREFIX}/etc/init.d"
- #--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}"
- $(use_with caps libcap-ng)
- $(use_with selinux)
- $(use_with systemd libsystemd)
- $(use_with update-drivedb gnupg)
- $(use_with update-drivedb update-smart-drivedb)
- $(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '')
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local db_path="/var/db/${PN}"
- insopts -m0644 -p # preserve timestamps
-
- if use daemon; then
- default
-
- newinitd "${FILESDIR}"/smartd-r1.rc smartd
- newconfd "${FILESDIR}"/smartd.confd smartd
- else
- dosbin smartctl
- doman smartctl.8
-
- local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO )
- einstalldocs
- fi
-
- if use update-drivedb ; then
- if ! use daemon; then
- dosbin "${S}"/update-smart-drivedb
- fi
-
- exeinto /etc/cron.monthly
- doexe "${FILESDIR}/${PN}-update-drivedb"
- fi
-
- if use daemon || use update-drivedb; then
- keepdir "${db_path}"
-
- # Install a copy of the initial drivedb.h to /usr/share/${PN}
- # so that we can access that file later in pkg_postinst
- # even when dealing with binary packages (bug #575292)
- insinto /usr/share/${PN}
- doins "${S}"/drivedb.h
- fi
-
- # Make sure we never install drivedb.h into the db location
- # of the acutal image so we don't record hashes because user
- # can modify that file
- rm -f "${ED%/}${db_path}/drivedb.h" || die
-
- # Bug #622072
- find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
-}
-
-pkg_postinst() {
- if use daemon || use update-drivedb; then
- local initial_db_file="${EROOT}usr/share/${PN}/drivedb.h"
- local db_path="${EROOT}var/db/${PN}"
-
- if [[ ! -f "${db_path}/drivedb.h" ]] ; then
- # No initial database found
- cp "${initial_db_file}" "${db_path}" || die
- einfo "Default drive database which was shipped with this release of ${PN}"
- einfo "has been installed to '${db_path}'."
- else
- ewarn "WARNING: There's already a drive database in '${db_path}'!"
- ewarn "Because we cannot determine if this database is untouched"
- ewarn "or was modified by the user you have to manually update the"
- ewarn "drive database:"
- ewarn ""
- ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this"
- ewarn " release which can be found in '${initial_db_file}', i.e."
- ewarn ""
- ewarn " cp \"${initial_db_file}\" \"${db_path}\""
- ewarn ""
- ewarn "b) Run the following command as root:"
- ewarn ""
- ewarn " /usr/sbin/update-smart-drivedb"
-
- if ! use update-drivedb ; then
- ewarn ""
- ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
- ewarn "with USE='update-drivedb'."
- fi
- fi
- fi
-}
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index b2d956336af8..d929d40f70f8 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,5 +1,7 @@
AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
AUX smc-sum-2.7.0.20210903-missing-include.patch 264 BLAKE2B 977008b43b91ff7ee7a1c32ac6ce4221d078c782b36479f5319818c143d99eec0ef69c787e8e170badb54c45bde4bf10f7359bf7e30e84141de816de4334f1e1 SHA512 c75b04f7c44cb273d781648e57c7339eb16c23e37b6cdfe3387444e0f5a4dcb72097d03a78d5f6ec327ba4b739444c93c378f0d2212c845873a387d30517328b
DIST sum_2.8.0_Linux_x86_64_20220126.tar.gz 14852916 BLAKE2B a65243878ec41c05fc8c71f147883fea29517e93ef0e1460a39827a98e1fd9e533be2f4a6cfceed29562ba2d0e798cac64645bbf4d2b23267396d86516277df9 SHA512 4e11a9916b3386229eb5cfc15830bd1ecab7d79cdc3280f4a736b8882554170e6d1579531c441d0966c816e1f9c98d256d7fbb2c0a6e8c03770a1053860a06f5
+DIST sum_2.8.1_Linux_x86_64_20220506.tar.gz 15414174 BLAKE2B 939e338f7ae3223bcd970dfdabb1e5a0bb2388d21b8fdf3666b82cf77e6c415869518d15675f2a6b4a15312bdb6d44c5b13366d1173e4ac5343ec13c65a8cdec SHA512 7350fefee12c7272d568049d07b18ef5736afc8602cb563691f8887ba046cc19aadbf57c0328e593a797d641cc515ea322de8dfb7a63ecff9b089f463dfb223e
EBUILD smc-sum-2.8.0.20220126.ebuild 1513 BLAKE2B 71326c2b86218846ff457ea92cee67c0efb390e1a5e970acda131043fd948cc3966b338d693e132d2a997f79b221b4d2b8edf8cdb205ce4f9dd344963982e3d5 SHA512 fbb2b85600c6a5c391b157506d15841eb2538e166bf2ecff2b3a92e919dfb43c69ca4852bd2df44df4756c972ea11540d5b9878f0d275a335f84abde7091c1cc
+EBUILD smc-sum-2.8.1.20220506.ebuild 1513 BLAKE2B 71326c2b86218846ff457ea92cee67c0efb390e1a5e970acda131043fd948cc3966b338d693e132d2a997f79b221b4d2b8edf8cdb205ce4f9dd344963982e3d5 SHA512 fbb2b85600c6a5c391b157506d15841eb2538e166bf2ecff2b3a92e919dfb43c69ca4852bd2df44df4756c972ea11540d5b9878f0d275a335f84abde7091c1cc
MISC metadata.xml 1098 BLAKE2B af888334fb5709cdaf9ee12821a8d006e4343d27ae89d51683b30c32820a6250b75b762946a6c7d1f23b7c1383eb66ba4d6b450d5d366bdac42d4df350f5e5fc SHA512 aef30566e58c8781faed28eee5e8574fa7017f90c20065a13868a0c6abaa9e069f425c4826cddbbbbbb84c37b3ef83c13eb46ce1eb829dca0380a2f5ed72729c
diff --git a/sys-apps/smc-sum/smc-sum-2.8.1.20220506.ebuild b/sys-apps/smc-sum/smc-sum-2.8.1.20220506.ebuild
new file mode 100644
index 000000000000..e309a7ad7f47
--- /dev/null
+++ b/sys-apps/smc-sum/smc-sum-2.8.1.20220506.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN/smc-/}"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="${MY_PN}_${MY_PV}_Linux_x86_64_${MY_DATE}.tar.gz"
+S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64"
+
+LICENSE="supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="module"
+
+RDEPEND="
+ sys-libs/zlib
+ sys-power/iasl
+ module? ( !sys-apps/smc-sum-driver )
+"
+
+RESTRICT="bindist fetch mirror"
+
+DOCS=(
+ "PlatformFeatureSupportMatrix.pdf"
+ "ReleaseNote.txt"
+ "SUM_UserGuide.pdf"
+ "sumrc.sample"
+ "ExternalData/SMCIPID.txt"
+ "ExternalData/VENID.txt"
+)
+
+PATCHES=( "${FILESDIR}/${PN}-2.7.0.20210903-missing-include.patch" )
+
+BUILD_TARGETS="default"
+MODULE_NAMES="sum_bios(misc:${S}/driver/Source/Linux)"
+
+QA_PREBUILT="usr/bin/smc-sum"
+
+pkg_nofetch() {
+ elog "Please download ${A} from"
+ elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SUM"
+ elog "and place it in your DISTDIR directory."
+}
+
+src_prepare() {
+ default
+
+ # Install new Makefile to respect users CFLAGS and LDFLAGS
+ cp "${FILESDIR}"/makefile driver/Source/Linux/Makefile || die
+}
+
+src_compile() {
+ if use module; then
+ BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}/driver/Source/Linux"
+ linux-mod_src_compile
+ else
+ :;
+ fi
+}
+
+src_install() {
+ newbin sum smc-sum
+ einstalldocs
+
+ use module && linux-mod_src_install
+}
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index 16c259860aa9..cf1b9e6b7619 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -8,5 +8,5 @@ DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47db
DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
EBUILD systemd-tmpfiles-249.7.ebuild 6091 BLAKE2B 63064cd496f780af754185f05a47551804f05d2b21c58d4b173d2a2ec82b7ba986c947ca1fc15cfc793f411caebf2b7586315ef7e741c534e00649c26c5d5bcf SHA512 e56de86404b80d686e233a17761adfd7f7f59afd1a8f90c2a50658d1fd04e8d1a8b62acbc4cc1d882d094fac10ed5964a03edc1f182c00b3821c856245e33eb3
EBUILD systemd-tmpfiles-249.9.ebuild 5989 BLAKE2B 3aef19d9a002b4a697e778073d0ad59bb50150f5b5a4a2277f3d1fbb26098934ce1c84610943ad0219053a348c8c3c5e3ed0eeba4d0c47fbd267a890868213c4 SHA512 201c85c33567feb6dacde41f69c5e25f1f412fcf37af99fc211b161f55293b41cee199a3ae437f5b056d40e25218e5e985c145c9416c799c060b1102039b5afd
-EBUILD systemd-tmpfiles-250.ebuild 379 BLAKE2B f7b4cd861020c8b3a46f7b266b8ead19b22674c71bf1a84775729c1ea6a54a907cfb3295e81cbfc5015d64069edaae781465d480d398dafc04ca6589e0c218e2 SHA512 229ca3e4b7ed1ff2d1e04193b50151c583de4aa7e4f610d4b820aa7b9e8bdadc87ba5ded0d90e8cdf24519721caef035be8fd72f2fc1aaf21e079435f2c8e02e
+EBUILD systemd-tmpfiles-250.ebuild 371 BLAKE2B a68a8de1e3d9a4315e6eded9106ee0a80aa1574155baefb448082b9023b08326d53f2bc6de201da8af4ade36b65b4bd1b89f3dad8b1594d2fb647bc73b302e69 SHA512 c947ea7946727efe39d9f5280e8ba1ad182aeab0c9c77f1ae20c667884bbe8bdc9ecfcf55e63008058c9ee57a38b44220eb0e3e93d04d235b5f441b0cd1e2027
MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
index 97da597ebea3..85dcdb3b2003 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
@@ -8,6 +8,6 @@ HOMEPAGE="https://systemd.io/"
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="sys-apps/systemd-utils[tmpfiles]"
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 5485b02c1e5b..bf13622f748a 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,8 +3,8 @@ AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0
AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
-DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
-DIST systemd-stable-250.5.tar.gz 11212059 BLAKE2B b7dbcb9e82c51e966db20a92ccd59ac19309702c481dd575c4e6367ca5ade10fe4b689925416ce1169682380cbf22d7d692b2378ef091f3007c16891992e3f92 SHA512 ad864b67bd5e2f5fd5705b636467827e4735142cefba150d24bb8e51ac0263650b2b0e53d4426eb509d1db59b83dc3b4c4bf157cc355fc2b7524db6bc4a9b5cd
-EBUILD systemd-utils-250.4-r3.ebuild 10521 BLAKE2B 2c0df60cc2cd254986f5258f529f2ab23ffd891aabfc135f0c58806a99848498c5f120df3c6116867f07a8be10c6919cd96f5f434d6c4bd5a548796b3c203f4e SHA512 47e6f1670d49a6bd9ef5e5228cbcf61db156524a5e54e24859fb0b2d7302ceb55851bc56cb11d371399e6d4cc77e9fc600b5e21fe2fb93994e59424416b57d90
-EBUILD systemd-utils-250.5.ebuild 10521 BLAKE2B 2c0df60cc2cd254986f5258f529f2ab23ffd891aabfc135f0c58806a99848498c5f120df3c6116867f07a8be10c6919cd96f5f434d6c4bd5a548796b3c203f4e SHA512 47e6f1670d49a6bd9ef5e5228cbcf61db156524a5e54e24859fb0b2d7302ceb55851bc56cb11d371399e6d4cc77e9fc600b5e21fe2fb93994e59424416b57d90
+DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
+DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
+EBUILD systemd-utils-250.6.ebuild 11342 BLAKE2B cbef57c68e15fe5fc76e2ba656fa6636d872781b2849c8558a61085e7ef8411b352469acb9b94b45be48fd5e6d29a5ff37fcff9ab2036870b23a811e3cb7af9a SHA512 3b3970ebd790cdcef1511879a1949e788ddfe0ff03866b3e9d5e932341f3e01be48618978559e4179118fdd025e74703bc5bccefce140740a656ea4751c06fdb
+EBUILD systemd-utils-250.7.ebuild 11342 BLAKE2B 67a094e130be3b21a647a3db3a66ea0b35b6f4292fa98c3e81d6a2ecd09b291ef08efdbb048e73c5b141b1cf815a4d7a340c6b43c65aa6a3f5b31fa962b60f89 SHA512 2d88c146cebdc0ae5344c80cf807507e343e77ca37af9b0c28cd131ce2f532418e13773ae00a712d54302b8196e4b5696c1a213dbb2472931d79e1f8485b4537
MISC metadata.xml 571 BLAKE2B 6b3a69524c5fd3fa0bbe534ccbf3598cedcbe51542d738237ca13b465fd342555f35b2ebd1d784b7a81664c58125e01404434ca48a07502343a24dd395618c4c SHA512 8184f6d8107be83d7411f63e86a8469c4b86c96bf4738ebfda8d654e4ecedf334b4319c9d442832c8373a34e7c35ca14b879e75eb4e006d48fa3d667be0a66e4
diff --git a/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
deleted file mode 100644
index 1a7f5f5fb352..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
+++ /dev/null
@@ -1,475 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs usr-ldscript
-
-DESCRIPTION="Utilities taken from systemd"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-250.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- boot? (
- >=sys-boot/gnu-efi-3.0.2
- )
- >=sys-kernel/linux-headers-3.11
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-python_check_deps() {
- has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
- )
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootlibexecdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Drootprefix="${EPREFIX:-/}"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dkernel-install=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into /
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into /
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- fi
- if use udev; then
- into /
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm /lib/systemd/systemd-udevd
- exeinto /lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
-
- fi
- fi
- if use udev; then
- into /usr
- dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobin src/kernel-install/kernel-install
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- fi
- if use udev; then
- doheader src/libudev/libudev.h
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
- insinto /lib/systemd/network
- doins network/99-default.link
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
- dobashcomp shell-completion/bash/udevadm
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-250.5.ebuild b/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
deleted file mode 100644
index 1a7f5f5fb352..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
+++ /dev/null
@@ -1,475 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs usr-ldscript
-
-DESCRIPTION="Utilities taken from systemd"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
- MY_P="systemd-stable-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
- MY_P="systemd-${PV}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-250.4"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- selinux? ( sys-libs/libselinux:0= )
- tmpfiles? (
- acl? ( sys-apps/acl:0= )
- )
- udev? (
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- )
- !udev? (
- >=sys-apps/util-linux-2.30:0=
- sys-libs/libcap:0=
- virtual/libcrypt:=
- )
-"
-DEPEND="${COMMON_DEPEND}
- boot? (
- >=sys-boot/gnu-efi-3.0.2
- )
- >=sys-kernel/linux-headers-3.11
-"
-RDEPEND="${COMMON_DEPEND}
- boot? ( !<sys-boot/systemd-boot-250 )
- tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
- udev? (
- acct-group/audio
- acct-group/cdrom
- acct-group/dialout
- acct-group/disk
- acct-group/input
- acct-group/kmem
- acct-group/kvm
- acct-group/lp
- acct-group/render
- acct-group/sgx
- acct-group/tape
- acct-group/tty
- acct-group/video
- !sys-apps/gentoo-systemd-integration
- !sys-apps/hwids[udev]
- !<sys-fs/udev-250
- !sys-fs/eudev
- )
- !sys-apps/systemd
-"
-PDEPEND="
- udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gperf
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-python_check_deps() {
- has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
- )
- if use elibc_musl; then
- PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
- fi
- default
-
- # Remove install_rpath; we link statically
- local rpath_pattern="install_rpath : rootlibexecdir,"
- grep -q -e "${rpath_pattern}" meson.build || die
- sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Drootprefix="${EPREFIX:-/}"
- -Dsysvinit-path=
- $(meson_native_use_bool boot efi)
- $(meson_native_use_bool boot gnu-efi)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool sysusers)
- $(meson_use test tests)
- $(meson_native_use_bool tmpfiles)
- $(meson_use udev hwdb)
-
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
- # Link staticly with libsystemd-shared
- -Dlink-boot-shared=false
- -Dlink-udev-shared=false
-
- # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
- -Dstandalone-binaries=true
-
- # Disable all optional features
- -Dadm-group=false
- -Danalyze=false
- -Dapparmor=false
- -Daudit=false
- -Dbacklight=false
- -Dbinfmt=false
- -Dbzip2=false
- -Dcoredump=false
- -Ddbus=false
- -Delfutils=false
- -Denvironment-d=false
- -Dfdisk=false
- -Dgcrypt=false
- -Dglib=false
- -Dgshadow=false
- -Dgnutls=false
- -Dhibernate=false
- -Dhostnamed=false
- -Didn=false
- -Dima=false
- -Dinitrd=false
- -Dfirstboot=false
- -Dkernel-install=false
- -Dldconfig=false
- -Dlibcryptsetup=false
- -Dlibcurl=false
- -Dlibfido2=false
- -Dlibidn=false
- -Dlibidn2=false
- -Dlibiptc=false
- -Dlocaled=false
- -Dlogind=false
- -Dlz4=false
- -Dmachined=false
- -Dmicrohttpd=false
- -Dnetworkd=false
- -Dnscd=false
- -Dnss-myhostname=false
- -Dnss-resolve=false
- -Dnss-systemd=false
- -Doomd=false
- -Dopenssl=false
- -Dp11kit=false
- -Dpam=false
- -Dpcre2=false
- -Dpolkit=false
- -Dportabled=false
- -Dpstore=false
- -Dpwquality=false
- -Drandomseed=false
- -Dresolve=false
- -Drfkill=false
- -Dseccomp=false
- -Dsmack=false
- -Dsysext=false
- -Dtimedated=false
- -Dtimesyncd=false
- -Dtpm=false
- -Dqrencode=false
- -Dquotacheck=false
- -Duserdb=false
- -Dutmp=false
- -Dvconsole=false
- -Dwheel-group=false
- -Dxdg-autostart=false
- -Dxkbcommon=false
- -Dxz=false
- -Dzlib=false
- -Dzstd=false
- )
-
- if use tmpfiles || use udev; then
- emesonargs+=( $(meson_native_use_bool acl) )
- else
- emesonargs+=( -Dacl=false )
- fi
-
- if use udev; then
- emesonargs+=( $(meson_native_use_bool kmod) )
- else
- emesonargs+=( -Dkmod=false )
- fi
-
- if use elibc_musl; then
- # Avoid redefinition of struct ethhdr.
- append-cppflags -D__UAPI_DEF_ETHHDR=0
- fi
-
- if multilib_is_native_abi || use udev; then
- meson_src_configure
- fi
-}
-
-efi_arch() {
- case "$(tc-arch)" in
- amd64) echo x64 ;;
- arm) echo arm ;;
- arm64) echo aa64 ;;
- x86) echo x86 ;;
- esac
-}
-
-multilib_src_compile() {
- local targets=()
- if multilib_is_native_abi; then
- if use boot; then
- targets+=(
- bootctl
- man/bootctl.1
- man/kernel-install.8
- src/boot/efi/linux$(efi_arch).{efi,elf}.stub
- src/boot/efi/systemd-boot$(efi_arch).efi
- )
- fi
- if use sysusers; then
- targets+=(
- systemd-sysusers.standalone
- man/sysusers.d.5
- man/systemd-sysusers.8
- )
- if use test; then
- targets+=(
- systemd-runtest.env
- )
- fi
- fi
- if use tmpfiles; then
- targets+=(
- systemd-tmpfiles.standalone
- man/tmpfiles.d.5
- man/systemd-tmpfiles.8
- )
- if use test; then
- targets+=( test-tmpfiles )
- fi
- fi
- if use udev; then
- targets+=(
- udevadm
- systemd-hwdb
- src/udev/ata_id
- src/udev/cdrom_id
- src/udev/fido_id
- src/udev/mtd_probe
- src/udev/scsi_id
- src/udev/udev.pc
- src/udev/v4l_id
- man/udev.conf.5
- man/systemd.link.5
- man/hwdb.7
- man/udev.7
- man/systemd-hwdb.8
- man/systemd-udevd.service.8
- man/udevadm.8
- hwdb.d/60-autosuspend-chromiumos.hwdb
- rules.d/50-udev-default.rules
- rules.d/64-btrfs.rules
- )
- if use test; then
- targets+=(
- # Used by udev-test.pl
- systemd-detect-virt
- test/sys
- test-udev
-
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- fi
- fi
- fi
- if use udev; then
- targets+=(
- udev:shared_library
- src/libudev/libudev.pc
- )
- if use test; then
- targets+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- fi
- if multilib_is_native_abi || use udev; then
- meson_src_compile "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- local tests=()
- if multilib_is_native_abi; then
- if use sysusers; then
- tests+=(
- test-sysusers.standalone
- )
- fi
- if use tmpfiles; then
- tests+=(
- test-systemd-tmpfiles.standalone
- test-tmpfiles
- )
- fi
- if use udev; then
- tests+=(
- rule-syntax-check
- test-fido-id-desc
- test-udev-builtin
- test-udev-event
- test-udev-netlink
- test-udev-node
- test-udev-util
- )
- if [[ -w /dev ]]; then
- tests+=( udev-test )
- else
- ewarn "Skipping udev-test (needs write access to /dev)"
- fi
- fi
- fi
- if use udev; then
- tests+=(
- test-libudev
- test-libudev-sym
- test-udev-device-thread
- )
- fi
- if [[ ${#tests[@]} -ne 0 ]]; then
- meson_src_test "${tests[@]}"
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- if use boot; then
- into /usr
- dobin bootctl
- doman man/{bootctl.1,kernel-install.8}
- insinto usr/lib/systemd/boot/efi
- doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
- fi
- if use sysusers; then
- into /
- newbin systemd-sysusers{.standalone,}
- doman man/{systemd-sysusers.8,sysusers.d.5}
- fi
- if use tmpfiles; then
- into /
- newbin systemd-tmpfiles{.standalone,}
- doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
- fi
- if use udev; then
- into /
- dobin udevadm systemd-hwdb
- dosym ../../bin/udevadm /lib/systemd/systemd-udevd
- exeinto /lib/udev
- doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
- insinto /usr/share/pkgconfig
- doins src/udev/udev.pc
- doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
- newman man/systemd-udevd.service.8 systemd-udevd.8
-
- fi
- fi
- if use udev; then
- into /usr
- dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
- gen_usr_ldscript -a udev
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins src/libudev/libudev.pc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- if use boot; then
- into /usr
- dobin src/kernel-install/kernel-install
- exeinto usr/lib/kernel/install.d
- doexe src/kernel-install/*.install
- dobashcomp shell-completion/bash/bootctl
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/{_bootctl,_kernel-install}
- fi
- if use tmpfiles; then
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup
- doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_systemd-tmpfiles
- fi
- if use udev; then
- doheader src/libudev/libudev.h
- insinto /etc/udev
- doins src/udev/udev.conf
- keepdir /etc/udev/{hwdb.d,rules.d}
- insinto /lib/systemd/network
- doins network/99-default.link
- insinto /lib/udev/rules.d
- doins rules.d/*.rules
- doins "${FILESDIR}"/40-gentoo.rules
- insinto /lib/udev/hwdb.d
- doins hwdb.d/*.hwdb
- dobashcomp shell-completion/bash/udevadm
- insinto /usr/share/zsh/site-functions
- doins shell-completion/zsh/_udevadm
- fi
-}
-
-add_service() {
- local initd=$1
- local runlevel=$2
-
- ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
- mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
- ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
- eend $?
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- add_service systemd-tmpfiles-setup-dev sysinit
- add_service systemd-tmpfiles-setup boot
- fi
- if use udev; then
- ebegin "Updating hwdb"
- systemd-hwdb --root="${ROOT}" update
- eend $?
- fi
-}
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
new file mode 100644
index 000000000000..dc655fae7a8c
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -0,0 +1,500 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-250.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ boot? (
+ >=sys-boot/gnu-efi-3.0.2
+ )
+ >=sys-kernel/linux-headers-3.11
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
+ )
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ # When bumping to 251, please keep this, but add the revert patch
+ # like in sys-apps/systemd!
+ #
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ local emesonargs=(
+ -Drootprefix="${EPREFIX:-/}"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dkernel-install=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into /
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into /
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into /
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+
+ fi
+ fi
+ if use udev; then
+ into /usr
+ dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobin src/kernel-install/kernel-install
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+ insinto /lib/systemd/network
+ doins network/99-default.link
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ dobashcomp shell-completion/bash/udevadm
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
new file mode 100644
index 000000000000..7c1f1c2f6a75
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -0,0 +1,500 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+ MY_P="systemd-stable-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+ MY_P="systemd-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-250.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ selinux? ( sys-libs/libselinux:0= )
+ tmpfiles? (
+ acl? ( sys-apps/acl:0= )
+ )
+ udev? (
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ )
+ !udev? (
+ >=sys-apps/util-linux-2.30:0=
+ sys-libs/libcap:0=
+ virtual/libcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ boot? (
+ >=sys-boot/gnu-efi-3.0.2
+ )
+ >=sys-kernel/linux-headers-3.11
+"
+RDEPEND="${COMMON_DEPEND}
+ boot? ( !<sys-boot/systemd-boot-250 )
+ tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+ udev? (
+ acct-group/audio
+ acct-group/cdrom
+ acct-group/dialout
+ acct-group/disk
+ acct-group/input
+ acct-group/kmem
+ acct-group/kvm
+ acct-group/lp
+ acct-group/render
+ acct-group/sgx
+ acct-group/tape
+ acct-group/tty
+ acct-group/video
+ !sys-apps/gentoo-systemd-integration
+ !sys-apps/hwids[udev]
+ !<sys-fs/udev-250
+ !sys-fs/eudev
+ )
+ !sys-apps/systemd
+"
+PDEPEND="
+ udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gperf
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
+ )
+ if use elibc_musl; then
+ PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+ fi
+ default
+
+ # Remove install_rpath; we link statically
+ local rpath_pattern="install_rpath : rootlibexecdir,"
+ grep -q -e "${rpath_pattern}" meson.build || die
+ sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+ # When bumping to 251, please keep this, but add the revert patch
+ # like in sys-apps/systemd!
+ #
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ local emesonargs=(
+ -Drootprefix="${EPREFIX:-/}"
+ -Dsysvinit-path=
+ $(meson_native_use_bool boot efi)
+ $(meson_native_use_bool boot gnu-efi)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool sysusers)
+ $(meson_use test tests)
+ $(meson_native_use_bool tmpfiles)
+ $(meson_use udev hwdb)
+
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+ # Link staticly with libsystemd-shared
+ -Dlink-boot-shared=false
+ -Dlink-udev-shared=false
+
+ # systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+ -Dstandalone-binaries=true
+
+ # Disable all optional features
+ -Dadm-group=false
+ -Danalyze=false
+ -Dapparmor=false
+ -Daudit=false
+ -Dbacklight=false
+ -Dbinfmt=false
+ -Dbzip2=false
+ -Dcoredump=false
+ -Ddbus=false
+ -Delfutils=false
+ -Denvironment-d=false
+ -Dfdisk=false
+ -Dgcrypt=false
+ -Dglib=false
+ -Dgshadow=false
+ -Dgnutls=false
+ -Dhibernate=false
+ -Dhostnamed=false
+ -Didn=false
+ -Dima=false
+ -Dinitrd=false
+ -Dfirstboot=false
+ -Dkernel-install=false
+ -Dldconfig=false
+ -Dlibcryptsetup=false
+ -Dlibcurl=false
+ -Dlibfido2=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dlocaled=false
+ -Dlogind=false
+ -Dlz4=false
+ -Dmachined=false
+ -Dmicrohttpd=false
+ -Dnetworkd=false
+ -Dnscd=false
+ -Dnss-myhostname=false
+ -Dnss-resolve=false
+ -Dnss-systemd=false
+ -Doomd=false
+ -Dopenssl=false
+ -Dp11kit=false
+ -Dpam=false
+ -Dpcre2=false
+ -Dpolkit=false
+ -Dportabled=false
+ -Dpstore=false
+ -Dpwquality=false
+ -Drandomseed=false
+ -Dresolve=false
+ -Drfkill=false
+ -Dseccomp=false
+ -Dsmack=false
+ -Dsysext=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dtpm=false
+ -Dqrencode=false
+ -Dquotacheck=false
+ -Duserdb=false
+ -Dutmp=false
+ -Dvconsole=false
+ -Dwheel-group=false
+ -Dxdg-autostart=false
+ -Dxkbcommon=false
+ -Dxz=false
+ -Dzlib=false
+ -Dzstd=false
+ )
+
+ if use tmpfiles || use udev; then
+ emesonargs+=( $(meson_native_use_bool acl) )
+ else
+ emesonargs+=( -Dacl=false )
+ fi
+
+ if use udev; then
+ emesonargs+=( $(meson_native_use_bool kmod) )
+ else
+ emesonargs+=( -Dkmod=false )
+ fi
+
+ if use elibc_musl; then
+ # Avoid redefinition of struct ethhdr.
+ append-cppflags -D__UAPI_DEF_ETHHDR=0
+ fi
+
+ if multilib_is_native_abi || use udev; then
+ meson_src_configure
+ fi
+}
+
+efi_arch() {
+ case "$(tc-arch)" in
+ amd64) echo x64 ;;
+ arm) echo arm ;;
+ arm64) echo aa64 ;;
+ x86) echo x86 ;;
+ esac
+}
+
+multilib_src_compile() {
+ local targets=()
+ if multilib_is_native_abi; then
+ if use boot; then
+ targets+=(
+ bootctl
+ man/bootctl.1
+ man/kernel-install.8
+ src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+ src/boot/efi/systemd-boot$(efi_arch).efi
+ )
+ fi
+ if use sysusers; then
+ targets+=(
+ systemd-sysusers.standalone
+ man/sysusers.d.5
+ man/systemd-sysusers.8
+ )
+ if use test; then
+ targets+=(
+ systemd-runtest.env
+ )
+ fi
+ fi
+ if use tmpfiles; then
+ targets+=(
+ systemd-tmpfiles.standalone
+ man/tmpfiles.d.5
+ man/systemd-tmpfiles.8
+ )
+ if use test; then
+ targets+=( test-tmpfiles )
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udevadm
+ systemd-hwdb
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-hwdb.8
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ hwdb.d/60-autosuspend-chromiumos.hwdb
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ if use test; then
+ targets+=(
+ # Used by udev-test.pl
+ systemd-detect-virt
+ test/sys
+ test-udev
+
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ fi
+ fi
+ fi
+ if use udev; then
+ targets+=(
+ udev:shared_library
+ src/libudev/libudev.pc
+ )
+ if use test; then
+ targets+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ fi
+ if multilib_is_native_abi || use udev; then
+ meson_src_compile "${targets[@]}"
+ fi
+}
+
+multilib_src_test() {
+ local tests=()
+ if multilib_is_native_abi; then
+ if use sysusers; then
+ tests+=(
+ test-sysusers.standalone
+ )
+ fi
+ if use tmpfiles; then
+ tests+=(
+ test-systemd-tmpfiles.standalone
+ test-tmpfiles
+ )
+ fi
+ if use udev; then
+ tests+=(
+ rule-syntax-check
+ test-fido-id-desc
+ test-udev-builtin
+ test-udev-event
+ test-udev-netlink
+ test-udev-node
+ test-udev-util
+ )
+ if [[ -w /dev ]]; then
+ tests+=( udev-test )
+ else
+ ewarn "Skipping udev-test (needs write access to /dev)"
+ fi
+ fi
+ fi
+ if use udev; then
+ tests+=(
+ test-libudev
+ test-libudev-sym
+ test-udev-device-thread
+ )
+ fi
+ if [[ ${#tests[@]} -ne 0 ]]; then
+ meson_src_test "${tests[@]}"
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ if use boot; then
+ into /usr
+ dobin bootctl
+ doman man/{bootctl.1,kernel-install.8}
+ insinto usr/lib/systemd/boot/efi
+ doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+ fi
+ if use sysusers; then
+ into /
+ newbin systemd-sysusers{.standalone,}
+ doman man/{systemd-sysusers.8,sysusers.d.5}
+ fi
+ if use tmpfiles; then
+ into /
+ newbin systemd-tmpfiles{.standalone,}
+ doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+ fi
+ if use udev; then
+ into /
+ dobin udevadm systemd-hwdb
+ dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+ doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+ newman man/systemd-udevd.service.8 systemd-udevd.8
+
+ fi
+ fi
+ if use udev; then
+ into /usr
+ dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
+ gen_usr_ldscript -a udev
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use boot; then
+ into /usr
+ dobin src/kernel-install/kernel-install
+ exeinto usr/lib/kernel/install.d
+ doexe src/kernel-install/*.install
+ dobashcomp shell-completion/bash/bootctl
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/{_bootctl,_kernel-install}
+ fi
+ if use tmpfiles; then
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+ doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_systemd-tmpfiles
+ fi
+ if use udev; then
+ doheader src/libudev/libudev.h
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+ insinto /lib/systemd/network
+ doins network/99-default.link
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.rules
+ insinto /lib/udev/hwdb.d
+ doins hwdb.d/*.hwdb
+ dobashcomp shell-completion/bash/udevadm
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+ fi
+}
+
+add_service() {
+ local initd=$1
+ local runlevel=$2
+
+ ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+ mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+ ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+ eend $?
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ add_service systemd-tmpfiles-setup-dev sysinit
+ add_service systemd-tmpfiles-setup boot
+ fi
+ if use udev; then
+ ebegin "Updating hwdb"
+ systemd-hwdb --root="${ROOT}" update
+ eend $?
+ udev_reload
+ fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 170a1a6660f0..9266b919e596 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,22 +1,20 @@
AUX 00-hostnamed-network-user.conf 227 BLAKE2B 0cc780a2ea9f31f08be01184704e4fa8b4b95e4c82b7e2dd4127f82c594a5cd7c8f865a83ae5f1284e58a7fd120ee9a9f4f586b7e479d21f1e8adf26e8e61238 SHA512 97e8decd802de8581fb546e3a714376fbd065108f3edfed54a1036d93df02f9947c358aec9aa4841a766c9120fa20c69eb7867bb4d2bd7339d8bd89c43235b2b
-AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194
AUX 250.4-random-seed-hash.patch 3300 BLAKE2B 3a952e18ebc8075853943e57730b2f9cf0ac31e2161fce992d11df483a57fc777b74b212c243260ddb6255b2bfe6ac64ba4abfedd236d2cae5e18150e2e3d859 SHA512 4ade52e055d6ccd252221354125e3155c9398452a470b45dc15967fd354d94f4ef94437626c6063762c1c83243d65ec57b0b8d326b769514dbd76f2644925b39
-AUX 251-rc2-colorterm.patch 2964 BLAKE2B 42a6a39c864d2e7a6428ab7392e3d2b75f9d9d8d9acadc85f444ea768e67ab18e3d7bdc114d0c18c4f2d16da710bf7e9b8b318764df29ad6931a6a20da89551c SHA512 af06812f8674221632768923959aaf77bde05d74518c140a7ec8128146478e1f697f10c41ec08b783a636ee341eb5c8f58e5eb4435c0eef8280d587af7a2fd35
+AUX 251-format-string.patch 1038 BLAKE2B 2b7400516fd93bdaa887e6203b44e656ccc27ddd963264c2ae1a360c5899cbd42417e66f72fb8c02366a64371257d782d9c34e5288b17e357edebdb55da939c8 SHA512 d300bdcad16485a92c80df575c403fabbdcd4e8c71251e56147b0d85c2a2e8d271eb055b5f188a184cb652c22ce428176355f322e679b88bb8db90610e63c1a4
+AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782
AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
AUX org.freedesktop.hostname1_no_polkit.conf 471 BLAKE2B 50d9f86b2c4813a90eac8a31f0f762eb1b9e0272024419bfffd1d8c4dbe9955541df5c1e5a14e1663db3c0194e95a8984e5ec0c8a65eb74d279f021c3ef3d348 SHA512 af38bfed2230a75e03de6831a5202e21af6c01e13670df1a5b1b454203bd9db47428a61aa9cf0a21841a11e7caa889e3f6147342ba5411649e00f334a8e03639
AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-251-rc2.tar.gz 11407144 BLAKE2B 5049a959a461ee00b093a1a4127d0859f3d2b72479ced893446b6a27d8624f155e0979c18595475e36c50add146905feae53e341da12557ddb2076beaa89a21a SHA512 09f1d558afe368710adbed1c21d78e7538bdf3eb4fefa4633086fe12763eaa772a87af69cf0fe04689a34cde246541726ae5b18701f6bf39c046ed2971fb414d
-DIST systemd-stable-249.11.tar.gz 10622702 BLAKE2B aa3a327ba8de73dd2ac5ecbd9065f2ca4ed56702d6bbd19de43580e6d56211be58ec7678c1609d843f7e960b71b251e0b7080c49338942cd3071076fa02f7acb SHA512 fed7f81933648945a4bfac9fb12150ecd84d32181f79be0e14e0b3a789343a87569f868670e0b8dfc2801fab39f7490f95ee8c29ba831d7611f78c14ace5ddd8
-DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
-DIST systemd-stable-250.5.tar.gz 11212059 BLAKE2B b7dbcb9e82c51e966db20a92ccd59ac19309702c481dd575c4e6367ca5ade10fe4b689925416ce1169682380cbf22d7d692b2378ef091f3007c16891992e3f92 SHA512 ad864b67bd5e2f5fd5705b636467827e4735142cefba150d24bb8e51ac0263650b2b0e53d4426eb509d1db59b83dc3b4c4bf157cc355fc2b7524db6bc4a9b5cd
-EBUILD systemd-249.11.ebuild 14749 BLAKE2B 3b6ccb1617acceb9ebd90805aa7e2124be674e235094641013a665b76bf2417f250cb290e96caca6cdfa6704ee179a07057dfb820ce3a57daaecd754427a88d2 SHA512 6aa8d8428824cc8961692075a4ec34d1d5b179fef6b499c381370645259250b8c340dbb4523f4ac1c61241e844ed17c7800fc34ceb51c43fcde62562ddc350d8
-EBUILD systemd-249.9.ebuild 14784 BLAKE2B ca86d60cc9890d368c269baa814c55345c05da6781dab850dc11d1ea81304e1d25319af0e3a81690df4fa178a796a54af5789dff4756c65b2bcb326f5f4bd511 SHA512 2c3166d0e8ce969b0117cd4454f7d8f71dcf6f079e7a8890cbe77c56e92e3d28d54e98ca07ed5dc0a391cd9acb0b58ce4869ee98b7d91f36fbdbfac54d01ee7f
-EBUILD systemd-250.4-r2.ebuild 15727 BLAKE2B 693d157b9b961f5a241bcd541a43b5a89adcba3e4a747cbb6675fc6ec2c3d34fc6601f8c090b6600ce3c898996db3cc151d68dfa0ce1750df4000fb46104ae06 SHA512 e25b31b1b39ddf5e7b0090e4d06742b4b2302efeb6ff66b4842e910000a239de9ac264a5872eea850f8e94024062d3d52074df756d232c9979359fddc9e097b4
-EBUILD systemd-250.5-r1.ebuild 15690 BLAKE2B 95db48fc59472e29d3e72fd105af3a1bf1915b21baf67f812bbe32748b625e3805754794657eec8bb719180df7c2a5e25e8f0ebb304383fa5ab09b516f6f5725 SHA512 bbc8cc748f8f76d47e090e8220c4eb2f669dad72f3d883903e5c87b3d9d2c9d71f8db4b51bc39fd3ad760955df2c3371c8dbf079f76c529d2e2d38b9274e8449
-EBUILD systemd-251_rc2.ebuild 14814 BLAKE2B 81e01e42310dd718745ada1b906c5a2150940bc00955c37d4809e45a59f397909fe09892aff11838e30970873c58780acf3b0beb69c1fd704343a4406769ab8b SHA512 470b4f316864ae2d3e9dcc39ee2335e975c52c7bc2da4cd16fe77051532efd317387c639f238a01ed77c88266c2be954b6f1b4ebef4efe103594ac0fe21bf0db
-EBUILD systemd-9999.ebuild 14773 BLAKE2B 4ba71f245b22115dbfb4fac08b25151e32c7c5643939818b83b814eee9f50e08c6a939e881dbdb2be1523b9d774ed45e6e989285f97f53059edc0c830b17ec7d SHA512 8fe693b973e2aff7ff3b9b962863377480cf7a0438abcb2a260fe64ba4a44aacefd705cafb113b0f444473d8069abcdea15c24ab6b2663faedcbfc3fa136e967
-MISC metadata.xml 2668 BLAKE2B a50719e9a4e5ed12fcbfab8cd6dbe151d7013d8fe2965aa1e1b69d227e6f462555a7075890a99b6d3e1963e9b7c79400057ffef232ba60843907ca97259062dc SHA512 11a81a40054d7643a68ee0faf359a8f2c5719fb9d3765585ab27f3d5189198d8b70062e7cf6adbfffc2736b2590e949c9fac1db64bb4ced95d39df76269f2cce
+DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
+DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
+DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
+EBUILD systemd-250.4-r2.ebuild 15755 BLAKE2B 5934a91181220d8b80e0302e6b7b2e34efb44739c20cd907bda7d390a1f0aa442b87c270c8907f8bf9ca8337cb2ba9307f9496383fc551dadd837072bf73d9bc SHA512 33881d3746d7bff5e14e55115f883b692cf873cdd23650144b2b356e2635e0fdef6216e5883078f48576ecc80cef02c0bb5f696f9b3f4cc9bbfae5bd14efb7e0
+EBUILD systemd-250.6.ebuild 16332 BLAKE2B 02a861c7d18856a1153b84caba100bfa57c064ab2c62fc804d3acc188f0c2d95365d48123f380216505e3ec94a7537b8c88b54ab5e1204e4be7c51d53ca1273d SHA512 76e38f8e889dc0b5dae9951dcbe8b113c9482b1c5b1f133c1be358fe6177597bc69f80f819da5b20cecd08335d346a9c541ec32f2f29f6969a5234d4fd1aab37
+EBUILD systemd-250.7.ebuild 16367 BLAKE2B 503095e43681f2a91fcd6960618e8797fd7cef70d1ac8c4073425b2e5d5f0fbcc58c13c4fa758cbef43d8a835c70654e6cdfffa73511f800a8cc18fcc7ba320e SHA512 ac6d5964b0a5b812dead1b1d119473e27d80f12a11329c058303caba5cfb6726be3442e80ecad2dd895f81c9bf35e71e96d64698e572bf2e92d3ea4d32e83cf5
+EBUILD systemd-251.2.ebuild 15623 BLAKE2B 003543cc788018617ca266f2e9aa445676b81eb94e5e30aa4440037fd8b12ab16f340aca2da4f49be4846c607631cd96566a8f673281512f6f4c7ebd836a3a27 SHA512 e48e06ebfbcb334397907c3e3bdd5edbb0cf82df4cd983c568e5fc151f7f39489b63431f34477cd443218b200678165d3e7f9c0c9d0554825d35375d715a8a0e
+EBUILD systemd-9999.ebuild 15447 BLAKE2B a29df698c2ed2f54fe0d694360086b865b1578bc0e2792ceb69be38e8d52a57f080794254612c67ad6d2a3018139fd76a98e9e92d826f586e238387512422f28 SHA512 50a8be318610b0a01734bd746823820f259ad17a5cdf5a40919dda49e4c7fa5e0abab77dcdc7e15924fd3cbb78f50bc525aaae4061e7a6b916d3b54326abb970
+MISC metadata.xml 2594 BLAKE2B 9ef88b77dba5d66b6902cbc1a4f104e783fa530f7148f48692992dbe2edf8a88a3d96993f6ecc34708ff49f7e7b4d9bbcf001fad6ca5a8d097030bc83b9b3b57 SHA512 22bfbaaaa68142286b36005b685d6955c68b71df064e412f0edbd858c9610c6ad76b5d970292d30b06eb536a9a140af307a3b4fee897b7f281cee00083472430
diff --git a/sys-apps/systemd/files/249.9-cross-compile.patch b/sys-apps/systemd/files/249.9-cross-compile.patch
deleted file mode 100644
index e063d303c7d8..000000000000
--- a/sys-apps/systemd/files/249.9-cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Tue, 21 Dec 2021 20:10:09 +0900
-Subject: [PATCH] meson: fix cross compiling
-
-(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 02495d16c9..c76cab535d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>'))
- conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>'))
- conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>'))
- conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>'))
--conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include <sys/timex.h>'))
-+conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>'))
-
- decl_headers = '''
- #include <uchar.h>
diff --git a/sys-apps/systemd/files/251-format-string.patch b/sys-apps/systemd/files/251-format-string.patch
new file mode 100644
index 000000000000..f36cc5d657f3
--- /dev/null
+++ b/sys-apps/systemd/files/251-format-string.patch
@@ -0,0 +1,25 @@
+From 08e86b15fc22a8e9f1ee0a791dfd35b2fc25e4c4 Mon Sep 17 00:00:00 2001
+From: Daan De Meyer <daan.j.demeyer@gmail.com>
+Date: Sun, 22 May 2022 14:36:07 +0200
+Subject: [PATCH] coredump: Fix format string type mismatch
+
+Fixes #23471
+---
+ src/coredump/coredump.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
+index c9747416ad3c..994d968d871b 100644
+--- a/src/coredump/coredump.c
++++ b/src/coredump/coredump.c
+@@ -512,8 +512,8 @@ static int save_external_coredump(
+
+ if (truncated)
+ log_struct(LOG_INFO,
+- LOG_MESSAGE("Core file was truncated to %zu bytes.", max_size),
+- "SIZE_LIMIT=%zu", max_size,
++ LOG_MESSAGE("Core file was truncated to %"PRIu64" bytes.", max_size),
++ "SIZE_LIMIT=%"PRIu64, max_size,
+ "MESSAGE_ID=" SD_MESSAGE_TRUNCATED_CORE_STR);
+
+ r = fix_permissions(fd, tmp, fn, context, uid);
diff --git a/sys-apps/systemd/files/251-rc2-colorterm.patch b/sys-apps/systemd/files/251-rc2-colorterm.patch
deleted file mode 100644
index 167329b63cde..000000000000
--- a/sys-apps/systemd/files/251-rc2-colorterm.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 34c2d32cf97ddc41348960687e52db6637faf1df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 6 May 2022 18:19:21 +0200
-Subject: [PATCH] shared/terminal-util: don't use $COLORTERM to force colors
-
-Fixup for a5efbf468c96190c9562bc8121eda32310dfd112: if $COLORTERM was set, we'd
-unconditionally turn on colors, which is unexpected and wrong. It even breaks
-our own tests when executed in gnome-terminal.
----
- src/basic/terminal-util.c | 27 ++++++++++++++++++---------
- 1 file changed, 18 insertions(+), 9 deletions(-)
-
-diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
-index 8ddcfe23230f..a142ba2dfb51 100644
---- a/src/basic/terminal-util.c
-+++ b/src/basic/terminal-util.c
-@@ -1278,12 +1278,7 @@ ColorMode get_color_mode(void) {
- /* We only check for the presence of the variable; value is ignored. */
- cached_color_mode = COLOR_OFF;
-
-- else if (STRPTR_IN_SET(getenv("COLORTERM"),
-- "truecolor",
-- "24bit"))
-- cached_color_mode = COLOR_24BIT;
--
-- else if (getpid_cached() == 1)
-+ else if (getpid_cached() == 1) {
- /* PID1 outputs to the console without holding it open all the time.
- *
- * Note that the Linux console can only display 16 colors. We still enable 256 color
-@@ -1292,9 +1287,23 @@ ColorMode get_color_mode(void) {
- * map them to the closest color in the 16 color palette (since kernel 3.16). Doing
- * 256 colors is nice for people who invoke systemd in a container or via a serial
- * link or such, and use a true 256 color terminal to do so. */
-- cached_color_mode = getenv_terminal_is_dumb() ? COLOR_OFF : COLOR_256;
-- else
-- cached_color_mode = terminal_is_dumb() ? COLOR_OFF : COLOR_256;
-+ if (getenv_terminal_is_dumb())
-+ cached_color_mode = COLOR_OFF;
-+ } else {
-+ if (terminal_is_dumb())
-+ cached_color_mode = COLOR_OFF;
-+ }
-+
-+ if (cached_color_mode < 0) {
-+ /* We failed to figure out any reason to *disable* colors.
-+ * Let's see how many colors we shall use. */
-+ if (STRPTR_IN_SET(getenv("COLORTERM"),
-+ "truecolor",
-+ "24bit"))
-+ cached_color_mode = COLOR_24BIT;
-+ else
-+ cached_color_mode = COLOR_256;
-+ }
- }
-
- return cached_color_mode;
diff --git a/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch b/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch
new file mode 100644
index 000000000000..bbe45f85dcf2
--- /dev/null
+++ b/sys-apps/systemd/files/251-revert-fortify-source-3-fix.patch
@@ -0,0 +1,40 @@
+From: Sam James <sam@gentoo.org>
+Date: Tue, 24 May 2022 23:21:50 +0100
+Subject: [PATCH] Revert "Support -D_FORTIFY_SOURCE=3 by using
+ __builtin_dynamic_object_size."
+
+Breaks Clang (even without F_S=3).
+
+This reverts commit 0bd292567a543d124cd303f7dd61169a209cae64.
+
+Bug: https://bugs.gentoo.org/841770
+Bug: https://github.com/systemd/systemd/issues/23150
+--- a/src/basic/alloc-util.h
++++ b/src/basic/alloc-util.h
+@@ -174,23 +174,13 @@ void* greedy_realloc0(void **p, size_t need, size_t size);
+ * is compatible with _FORTIFY_SOURCES. If _FORTIFY_SOURCES is used many memory operations will take the
+ * object size as returned by __builtin_object_size() into account. Hence, let's return the smaller size of
+ * malloc_usable_size() and __builtin_object_size() here, so that we definitely operate in safe territory by
+- * both the compiler's and libc's standards. Note that _FORTIFY_SOURCES=3 handles also dynamically allocated
+- * objects and thus it's safer using __builtin_dynamic_object_size if _FORTIFY_SOURCES=3 is used (#22801).
+- * Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and
++ * both the compiler's and libc's standards. Note that __builtin_object_size() evaluates to SIZE_MAX if the
++ * size cannot be determined, hence the MIN() expression should be safe with dynamically sized memory,
++ * too. Moreover, when NULL is passed malloc_usable_size() is documented to return zero, and
+ * __builtin_object_size() returns SIZE_MAX too, hence we also return a sensible value of 0 in this corner
+ * case. */
+-
+-#if defined __has_builtin
+-# if __has_builtin(__builtin_dynamic_object_size)
+-# define MALLOC_SIZEOF_SAFE(x) \
+- MIN(malloc_usable_size(x), __builtin_dynamic_object_size(x, 0))
+-# endif
+-#endif
+-
+-#ifndef MALLOC_SIZEOF_SAFE
+ #define MALLOC_SIZEOF_SAFE(x) \
+ MIN(malloc_usable_size(x), __builtin_object_size(x, 0))
+-#endif
+
+ /* Inspired by ELEMENTSOF() but operates on malloc()'ed memory areas: typesafely returns the number of items
+ * that fit into the specified memory block */
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 0c24d0ac54bb..0d8cc3d2f286 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -29,7 +29,6 @@
<flag name="openssl">Enable use of <pkg>dev-libs/openssl</pkg> for various features</flag>
<flag name="pkcs11">Enable PKCS#11 support for cryptsetup and homed</flag>
<flag name="pwquality">Enable password quality checking in homed</flag>
- <flag name="repart">Enable support for growing/adding partitions</flag>
<flag name="qrcode">Enable qrcode output support in journal</flag>
<flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>
<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
diff --git a/sys-apps/systemd/systemd-249.11.ebuild b/sys-apps/systemd/systemd-249.11.ebuild
deleted file mode 100644
index 79c41b24c83c..000000000000
--- a/sys-apps/systemd/systemd-249.11.ebuild
+++ /dev/null
@@ -1,505 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/systemd/systemd.git"
- inherit git-r3
-else
- if [[ ${PV} == *.* ]]; then
- MY_PN=systemd-stable
- else
- MY_PN=systemd
- fi
- MY_PV=${PV/_/-}
- MY_P=${MY_PN}-${MY_PV}
- S=${WORKDIR}/${MY_P}
- SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
-
-REQUIRED_USE="
- homed? ( cryptsetup pam )
- importd? ( curl gcrypt lzma )
- pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- apparmor? ( sys-libs/libapparmor:0= )
- audit? ( >=sys-process/audit-2:0= )
- cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
- curl? ( net-misc/curl:0= )
- dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
- elfutils? ( >=dev-libs/elfutils-0.158:0= )
- fido2? ( dev-libs/libfido2:0= )
- gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
- homed? ( ${OPENSSL_DEP} )
- http? (
- >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
- >=net-libs/gnutls-3.1.4:0=
- )
- idn? ( net-dns/libidn2:= )
- importd? (
- app-arch/bzip2:0=
- sys-libs/zlib:0=
- )
- kmod? ( >=sys-apps/kmod-15:0= )
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
- nat? ( net-firewall/iptables:0= )
- pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
- pkcs11? ( app-crypt/p11-kit:0= )
- pcre? ( dev-libs/libpcre2 )
- pwquality? ( dev-libs/libpwquality:0= )
- qrcode? ( media-gfx/qrencode:0= )
- repart? ( ${OPENSSL_DEP} )
- seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
- selinux? ( sys-libs/libselinux:0= )
- tpm? ( app-crypt/tpm2-tss:0= )
- xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
- zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-${MINKV}
- gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
- >=acct-group/adm-0-r1
- >=acct-group/wheel-0-r1
- >=acct-group/kmem-0-r1
- >=acct-group/tty-0-r1
- >=acct-group/utmp-0-r1
- >=acct-group/audio-0-r1
- >=acct-group/cdrom-0-r1
- >=acct-group/dialout-0-r1
- >=acct-group/disk-0-r1
- >=acct-group/input-0-r1
- >=acct-group/kvm-0-r1
- >=acct-group/lp-0-r1
- >=acct-group/render-0-r1
- acct-group/sgx
- >=acct-group/tape-0-r1
- acct-group/users
- >=acct-group/video-0-r1
- >=acct-group/systemd-journal-0-r1
- >=acct-user/root-0-r1
- acct-user/nobody
- >=acct-user/systemd-journal-remote-0-r1
- >=acct-user/systemd-coredump-0-r1
- >=acct-user/systemd-network-0-r1
- acct-user/systemd-oom
- >=acct-user/systemd-resolve-0-r1
- >=acct-user/systemd-timesync-0-r1
- >=sys-apps/baselayout-2.2
- selinux? ( sec-policy/selinux-base-policy[systemd] )
- sysv-utils? (
- !sys-apps/openrc[sysv-utils(-)]
- !sys-apps/sysvinit
- )
- !sysv-utils? ( sys-apps/sysvinit )
- resolvconf? ( !net-dns/openresolv )
- !build? ( || (
- sys-apps/util-linux[kill(-)]
- sys-process/procps[kill(+)]
- sys-apps/coreutils[kill(-)]
- ) )
- !sys-apps/hwids[udev]
- !sys-auth/nss-myhostname
- !sys-fs/eudev
- !sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
- >=sys-fs/udev-init-scripts-34
- policykit? ( sys-auth/polkit )
- !vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
- app-arch/xz-utils:0
- dev-util/gperf
- >=dev-util/meson-0.46
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- test? (
- app-text/tree
- dev-lang/perl
- sys-apps/dbus
- )
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt:0
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
- has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- if use test && has pid-sandbox ${FEATURES}; then
- ewarn "Tests are known to fail with PID sandboxing enabled."
- ewarn "See https://bugs.gentoo.org/674458."
- fi
-
- local CONFIG_CHECK="~AUTOFS4_FS ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
- ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
- ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
- ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
- ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
- ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2"
-
- use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
- use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
- kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
- kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
- kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
- if kernel_is -lt 5 10 20; then
- CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
- else
- CONFIG_CHECK+=" ~KCMP"
- fi
-
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- if linux_chkconfig_present X86; then
- CONFIG_CHECK+=" ~DMIID"
- fi
- fi
-
- if kernel_is -lt ${MINKV//./ }; then
- ewarn "Kernel version at least ${MINKV} required"
- fi
-
- check_extra_config
- fi
-}
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- default
- [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
- # Do NOT add patches here
- local PATCHES=()
-
- [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
- # Add local patches here
- PATCHES+=(
- )
-
- if ! use vanilla; then
- PATCHES+=(
- "${FILESDIR}/gentoo-generator-path-r2.patch"
- "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
- "${FILESDIR}/gentoo-journald-audit.patch"
- )
- fi
-
- default
-}
-
-src_configure() {
- # Prevent conflicts with i686 cross toolchain, bug 559726
- tc-export AR CC NM OBJCOPY RANLIB
-
- python_setup
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --localstatedir="${EPREFIX}/var"
- -Dsupport-url="https://gentoo.org/support/"
- -Dpamlibdir="$(getpam_mod_dir)"
- # avoid bash-completion dep
- -Dbashcompletiondir="$(get_bashcompdir)"
- # make sure we get /bin:/sbin in PATH
- $(meson_use split-usr)
- -Dsplit-bin=true
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- # Avoid infinite exec recursion, bug 642724
- -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
- # no deps
- -Dima=true
- -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
- # Optional components/dependencies
- $(meson_native_use_bool acl)
- $(meson_native_use_bool apparmor)
- $(meson_native_use_bool audit)
- $(meson_native_use_bool cryptsetup libcryptsetup)
- $(meson_native_use_bool curl libcurl)
- $(meson_native_use_bool dns-over-tls dns-over-tls)
- $(meson_native_use_bool elfutils)
- $(meson_native_use_bool fido2 libfido2)
- $(meson_use gcrypt)
- $(meson_native_use_bool gnuefi gnu-efi)
- -Defi-includedir="${ESYSROOT}/usr/include/efi"
- -Defi-ld="$(tc-getLD)"
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
- $(meson_native_use_bool homed)
- $(meson_native_use_bool http microhttpd)
- $(meson_native_use_bool idn)
- $(meson_native_use_bool importd)
- $(meson_native_use_bool importd bzip2)
- $(meson_native_use_bool importd zlib)
- $(meson_native_use_bool kmod)
- $(meson_use lz4)
- $(meson_use lzma xz)
- $(meson_use zstd)
- $(meson_native_use_bool nat libiptc)
- $(meson_use pam)
- $(meson_native_use_bool pkcs11 p11kit)
- $(meson_native_use_bool pcre pcre2)
- $(meson_native_use_bool policykit polkit)
- $(meson_native_use_bool pwquality)
- $(meson_native_use_bool qrcode qrencode)
- $(meson_native_use_bool repart)
- $(meson_native_use_bool seccomp)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool tpm tpm2)
- $(meson_native_use_bool test dbus)
- $(meson_native_use_bool xkb xkbcommon)
- -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
- # Breaks screen, tmux, etc.
- -Ddefault-kill-user-processes=false
- -Dcreate-log-dirs=false
-
- # multilib options
- $(meson_native_true backlight)
- $(meson_native_true binfmt)
- $(meson_native_true coredump)
- $(meson_native_true environment-d)
- $(meson_native_true firstboot)
- $(meson_native_true hibernate)
- $(meson_native_true hostnamed)
- $(meson_native_true ldconfig)
- $(meson_native_true localed)
- $(meson_native_true man)
- $(meson_native_true networkd)
- $(meson_native_true quotacheck)
- $(meson_native_true randomseed)
- $(meson_native_true rfkill)
- $(meson_native_true sysusers)
- $(meson_native_true timedated)
- $(meson_native_true timesyncd)
- $(meson_native_true tmpfiles)
- $(meson_native_true vconsole)
- )
-
- meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
- unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
- meson_src_test
-}
-
-multilib_src_install_all() {
- local rootprefix=$(usex split-usr '' /usr)
-
- # meson doesn't know about docdir
- mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
- einstalldocs
- dodoc "${FILESDIR}"/nsswitch.conf
-
- if ! use resolvconf; then
- rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
- fi
-
- rm "${ED}"/etc/init.d/README || die
- rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
- if ! use sysv-utils; then
- rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
- rm "${ED}"/usr/share/man/man1/init.1 || die
- rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
- fi
-
- if ! use resolvconf && ! use sysv-utils; then
- rmdir "${ED}${rootprefix}"/sbin || die
- fi
-
- # https://bugs.gentoo.org/761763
- rm -r "${ED}"/usr/lib/sysusers.d || die
-
- # Preserve empty dirs in /etc & /var, bug #437008
- keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
- keepdir /etc/kernel/install.d
- keepdir /etc/systemd/{network,system,user}
- keepdir /etc/udev/rules.d
-
- keepdir /etc/udev/hwdb.d
-
- keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
- keepdir /usr/lib/{binfmt.d,modules-load.d}
- keepdir /usr/lib/systemd/user-generators
- keepdir /var/lib/systemd
- keepdir /var/log/journal
-
- # Symlink /etc/sysctl.conf for easy migration.
- dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
- if use pam; then
- newpamd "${FILESDIR}"/systemd-user.pam systemd-user
- fi
-
- if use split-usr; then
- # Avoid breaking boot/reboot
- dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
- dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
- fi
-
- gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
- local envd_locale_def="${EROOT}/etc/env.d/02locale"
- local envd_locale=( "${EROOT}"/etc/env.d/??locale )
- local locale_conf="${EROOT}/etc/locale.conf"
-
- if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
- # If locale.conf does not exist...
- if [[ -e ${envd_locale} ]]; then
- # ...either copy env.d/??locale if there's one
- ebegin "Moving ${envd_locale} to ${locale_conf}"
- mv "${envd_locale}" "${locale_conf}"
- eend ${?} || FAIL=1
- else
- # ...or create a dummy default
- ebegin "Creating ${locale_conf}"
- cat > "${locale_conf}" <<-EOF
- # This file has been created by the sys-apps/systemd ebuild.
- # See locale.conf(5) and localectl(1).
-
- # LANG=${LANG}
- EOF
- eend ${?} || FAIL=1
- fi
- fi
-
- if [[ ! -L ${envd_locale} ]]; then
- # now, if env.d/??locale is not a symlink (to locale.conf)...
- if [[ -e ${envd_locale} ]]; then
- # ...warn the user that he has duplicate locale settings
- ewarn
- ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
- ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
- ewarn "and create the symlink with the following command:"
- ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
- ewarn
- else
- # ...or just create the symlink if there's nothing here
- ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
- ln -n -s ../locale.conf "${envd_locale_def}"
- eend ${?} || FAIL=1
- fi
- fi
-}
-
-pkg_preinst() {
- if ! use split-usr; then
- local dir
- for dir in bin sbin lib; do
- if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
- eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
- eerror "One of them should be a symbolic link to the other one."
- FAIL=1
- fi
- done
- if [[ ${FAIL} ]]; then
- eerror "Migration to system layout with merged directories must be performed before"
- eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
- die "System layout with split directories still used"
- fi
- fi
-}
-
-pkg_postinst() {
- systemd_update_catalog
-
- # Keep this here in case the database format changes so it gets updated
- # when required.
- systemd-hwdb --root="${ROOT}" update
-
- udev_reload || FAIL=1
-
- # Bug 465468, make sure locales are respected, and ensure consistency
- # between OpenRC & systemd
- migrate_locale
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- if type systemctl &>/dev/null; then
- systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
- fi
- elog "To enable a useful set of services, run the following:"
- elog " systemctl preset-all --preset-mode=enable-only"
- fi
-
- if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
- rm "${EROOT}/var/lib/systemd/timesync"
- fi
-
- if [[ ${FAIL} ]]; then
- eerror "One of the postinst commands failed. Please check the postinst output"
- eerror "for errors. You may need to clean up your system and/or try installing"
- eerror "systemd again."
- eerror
- fi
-}
-
-pkg_prerm() {
- # If removing systemd completely, remove the catalog database.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
- fi
-}
diff --git a/sys-apps/systemd/systemd-249.9.ebuild b/sys-apps/systemd/systemd-249.9.ebuild
deleted file mode 100644
index 3367ca393987..000000000000
--- a/sys-apps/systemd/systemd-249.9.ebuild
+++ /dev/null
@@ -1,506 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/systemd/systemd.git"
- inherit git-r3
-else
- if [[ ${PV} == *.* ]]; then
- MY_PN=systemd-stable
- else
- MY_PN=systemd
- fi
- MY_PV=${PV/_/-}
- MY_P=${MY_PN}-${MY_PV}
- S=${WORKDIR}/${MY_P}
- SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
-
-REQUIRED_USE="
- homed? ( cryptsetup pam )
- importd? ( curl gcrypt lzma )
- pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- apparmor? ( sys-libs/libapparmor:0= )
- audit? ( >=sys-process/audit-2:0= )
- cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
- curl? ( net-misc/curl:0= )
- dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
- elfutils? ( >=dev-libs/elfutils-0.158:0= )
- fido2? ( dev-libs/libfido2:0= )
- gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
- homed? ( ${OPENSSL_DEP} )
- http? (
- >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
- >=net-libs/gnutls-3.1.4:0=
- )
- idn? ( net-dns/libidn2:= )
- importd? (
- app-arch/bzip2:0=
- sys-libs/zlib:0=
- )
- kmod? ( >=sys-apps/kmod-15:0= )
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
- nat? ( net-firewall/iptables:0= )
- pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
- pkcs11? ( app-crypt/p11-kit:0= )
- pcre? ( dev-libs/libpcre2 )
- pwquality? ( dev-libs/libpwquality:0= )
- qrcode? ( media-gfx/qrencode:0= )
- repart? ( ${OPENSSL_DEP} )
- seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
- selinux? ( sys-libs/libselinux:0= )
- tpm? ( app-crypt/tpm2-tss:0= )
- xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
- zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-${MINKV}
- gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
- >=acct-group/adm-0-r1
- >=acct-group/wheel-0-r1
- >=acct-group/kmem-0-r1
- >=acct-group/tty-0-r1
- >=acct-group/utmp-0-r1
- >=acct-group/audio-0-r1
- >=acct-group/cdrom-0-r1
- >=acct-group/dialout-0-r1
- >=acct-group/disk-0-r1
- >=acct-group/input-0-r1
- >=acct-group/kvm-0-r1
- >=acct-group/lp-0-r1
- >=acct-group/render-0-r1
- acct-group/sgx
- >=acct-group/tape-0-r1
- acct-group/users
- >=acct-group/video-0-r1
- >=acct-group/systemd-journal-0-r1
- >=acct-user/root-0-r1
- acct-user/nobody
- >=acct-user/systemd-journal-remote-0-r1
- >=acct-user/systemd-coredump-0-r1
- >=acct-user/systemd-network-0-r1
- acct-user/systemd-oom
- >=acct-user/systemd-resolve-0-r1
- >=acct-user/systemd-timesync-0-r1
- >=sys-apps/baselayout-2.2
- selinux? ( sec-policy/selinux-base-policy[systemd] )
- sysv-utils? (
- !sys-apps/openrc[sysv-utils(-)]
- !sys-apps/sysvinit
- )
- !sysv-utils? ( sys-apps/sysvinit )
- resolvconf? ( !net-dns/openresolv )
- !build? ( || (
- sys-apps/util-linux[kill(-)]
- sys-process/procps[kill(+)]
- sys-apps/coreutils[kill(-)]
- ) )
- !sys-apps/hwids[udev]
- !sys-auth/nss-myhostname
- !sys-fs/eudev
- !sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
- >=sys-fs/udev-init-scripts-34
- policykit? ( sys-auth/polkit )
- !vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
- app-arch/xz-utils:0
- dev-util/gperf
- >=dev-util/meson-0.46
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- test? (
- app-text/tree
- dev-lang/perl
- sys-apps/dbus
- )
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt:0
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
- has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- if use test && has pid-sandbox ${FEATURES}; then
- ewarn "Tests are known to fail with PID sandboxing enabled."
- ewarn "See https://bugs.gentoo.org/674458."
- fi
-
- local CONFIG_CHECK="~AUTOFS4_FS ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
- ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
- ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
- ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
- ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
- ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2"
-
- use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
- use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
- kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
- kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
- kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
- if kernel_is -lt 5 10 20; then
- CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
- else
- CONFIG_CHECK+=" ~KCMP"
- fi
-
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- if linux_chkconfig_present X86; then
- CONFIG_CHECK+=" ~DMIID"
- fi
- fi
-
- if kernel_is -lt ${MINKV//./ }; then
- ewarn "Kernel version at least ${MINKV} required"
- fi
-
- check_extra_config
- fi
-}
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- default
- [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
- # Do NOT add patches here
- local PATCHES=()
-
- [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
- # Add local patches here
- PATCHES+=(
- "${FILESDIR}/249.9-cross-compile.patch"
- )
-
- if ! use vanilla; then
- PATCHES+=(
- "${FILESDIR}/gentoo-generator-path-r2.patch"
- "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
- "${FILESDIR}/gentoo-journald-audit.patch"
- )
- fi
-
- default
-}
-
-src_configure() {
- # Prevent conflicts with i686 cross toolchain, bug 559726
- tc-export AR CC NM OBJCOPY RANLIB
-
- python_setup
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --localstatedir="${EPREFIX}/var"
- -Dsupport-url="https://gentoo.org/support/"
- -Dpamlibdir="$(getpam_mod_dir)"
- # avoid bash-completion dep
- -Dbashcompletiondir="$(get_bashcompdir)"
- # make sure we get /bin:/sbin in PATH
- $(meson_use split-usr)
- -Dsplit-bin=true
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- # Avoid infinite exec recursion, bug 642724
- -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
- # no deps
- -Dima=true
- -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
- # Optional components/dependencies
- $(meson_native_use_bool acl)
- $(meson_native_use_bool apparmor)
- $(meson_native_use_bool audit)
- $(meson_native_use_bool cryptsetup libcryptsetup)
- $(meson_native_use_bool curl libcurl)
- $(meson_native_use_bool dns-over-tls dns-over-tls)
- $(meson_native_use_bool elfutils)
- $(meson_native_use_bool fido2 libfido2)
- $(meson_use gcrypt)
- $(meson_native_use_bool gnuefi gnu-efi)
- -Defi-includedir="${ESYSROOT}/usr/include/efi"
- -Defi-ld="$(tc-getLD)"
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
- $(meson_native_use_bool homed)
- $(meson_native_use_bool http microhttpd)
- $(meson_native_use_bool idn)
- $(meson_native_use_bool importd)
- $(meson_native_use_bool importd bzip2)
- $(meson_native_use_bool importd zlib)
- $(meson_native_use_bool kmod)
- $(meson_use lz4)
- $(meson_use lzma xz)
- $(meson_use zstd)
- $(meson_native_use_bool nat libiptc)
- $(meson_use pam)
- $(meson_native_use_bool pkcs11 p11kit)
- $(meson_native_use_bool pcre pcre2)
- $(meson_native_use_bool policykit polkit)
- $(meson_native_use_bool pwquality)
- $(meson_native_use_bool qrcode qrencode)
- $(meson_native_use_bool repart)
- $(meson_native_use_bool seccomp)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool tpm tpm2)
- $(meson_native_use_bool test dbus)
- $(meson_native_use_bool xkb xkbcommon)
- -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
- # Breaks screen, tmux, etc.
- -Ddefault-kill-user-processes=false
- -Dcreate-log-dirs=false
-
- # multilib options
- $(meson_native_true backlight)
- $(meson_native_true binfmt)
- $(meson_native_true coredump)
- $(meson_native_true environment-d)
- $(meson_native_true firstboot)
- $(meson_native_true hibernate)
- $(meson_native_true hostnamed)
- $(meson_native_true ldconfig)
- $(meson_native_true localed)
- $(meson_native_true man)
- $(meson_native_true networkd)
- $(meson_native_true quotacheck)
- $(meson_native_true randomseed)
- $(meson_native_true rfkill)
- $(meson_native_true sysusers)
- $(meson_native_true timedated)
- $(meson_native_true timesyncd)
- $(meson_native_true tmpfiles)
- $(meson_native_true vconsole)
- )
-
- meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
- unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
- meson_src_test
-}
-
-multilib_src_install_all() {
- local rootprefix=$(usex split-usr '' /usr)
-
- # meson doesn't know about docdir
- mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
- einstalldocs
- dodoc "${FILESDIR}"/nsswitch.conf
-
- if ! use resolvconf; then
- rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
- fi
-
- rm "${ED}"/etc/init.d/README || die
- rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
- if ! use sysv-utils; then
- rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
- rm "${ED}"/usr/share/man/man1/init.1 || die
- rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
- fi
-
- if ! use resolvconf && ! use sysv-utils; then
- rmdir "${ED}${rootprefix}"/sbin || die
- fi
-
- # https://bugs.gentoo.org/761763
- rm -r "${ED}"/usr/lib/sysusers.d || die
-
- # Preserve empty dirs in /etc & /var, bug #437008
- keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
- keepdir /etc/kernel/install.d
- keepdir /etc/systemd/{network,system,user}
- keepdir /etc/udev/rules.d
-
- keepdir /etc/udev/hwdb.d
-
- keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
- keepdir /usr/lib/{binfmt.d,modules-load.d}
- keepdir /usr/lib/systemd/user-generators
- keepdir /var/lib/systemd
- keepdir /var/log/journal
-
- # Symlink /etc/sysctl.conf for easy migration.
- dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
- if use pam; then
- newpamd "${FILESDIR}"/systemd-user.pam systemd-user
- fi
-
- if use split-usr; then
- # Avoid breaking boot/reboot
- dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
- dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
- fi
-
- gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
- local envd_locale_def="${EROOT}/etc/env.d/02locale"
- local envd_locale=( "${EROOT}"/etc/env.d/??locale )
- local locale_conf="${EROOT}/etc/locale.conf"
-
- if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
- # If locale.conf does not exist...
- if [[ -e ${envd_locale} ]]; then
- # ...either copy env.d/??locale if there's one
- ebegin "Moving ${envd_locale} to ${locale_conf}"
- mv "${envd_locale}" "${locale_conf}"
- eend ${?} || FAIL=1
- else
- # ...or create a dummy default
- ebegin "Creating ${locale_conf}"
- cat > "${locale_conf}" <<-EOF
- # This file has been created by the sys-apps/systemd ebuild.
- # See locale.conf(5) and localectl(1).
-
- # LANG=${LANG}
- EOF
- eend ${?} || FAIL=1
- fi
- fi
-
- if [[ ! -L ${envd_locale} ]]; then
- # now, if env.d/??locale is not a symlink (to locale.conf)...
- if [[ -e ${envd_locale} ]]; then
- # ...warn the user that he has duplicate locale settings
- ewarn
- ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
- ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
- ewarn "and create the symlink with the following command:"
- ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
- ewarn
- else
- # ...or just create the symlink if there's nothing here
- ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
- ln -n -s ../locale.conf "${envd_locale_def}"
- eend ${?} || FAIL=1
- fi
- fi
-}
-
-pkg_preinst() {
- if ! use split-usr; then
- local dir
- for dir in bin sbin lib; do
- if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
- eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
- eerror "One of them should be a symbolic link to the other one."
- FAIL=1
- fi
- done
- if [[ ${FAIL} ]]; then
- eerror "Migration to system layout with merged directories must be performed before"
- eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
- die "System layout with split directories still used"
- fi
- fi
-}
-
-pkg_postinst() {
- systemd_update_catalog
-
- # Keep this here in case the database format changes so it gets updated
- # when required.
- systemd-hwdb --root="${ROOT}" update
-
- udev_reload || FAIL=1
-
- # Bug 465468, make sure locales are respected, and ensure consistency
- # between OpenRC & systemd
- migrate_locale
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- if type systemctl &>/dev/null; then
- systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
- fi
- elog "To enable a useful set of services, run the following:"
- elog " systemctl preset-all --preset-mode=enable-only"
- fi
-
- if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
- rm "${EROOT}/var/lib/systemd/timesync"
- fi
-
- if [[ ${FAIL} ]]; then
- eerror "One of the postinst commands failed. Please check the postinst output"
- eerror "for errors. You may need to clean up your system and/or try installing"
- eerror "systemd again."
- eerror
- fi
-}
-
-pkg_prerm() {
- # If removing systemd completely, remove the catalog database.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
- fi
-}
diff --git a/sys-apps/systemd/systemd-250.4-r2.ebuild b/sys-apps/systemd/systemd-250.4-r2.ebuild
index 270bfe1cff71..2c6f143758cf 100644
--- a/sys-apps/systemd/systemd-250.4-r2.ebuild
+++ b/sys-apps/systemd/systemd-250.4-r2.ebuild
@@ -122,7 +122,10 @@ RDEPEND="${COMMON_DEPEND}
acct-group/systemd-hostname
sys-apps/dbus-broker
)
- selinux? ( sec-policy/selinux-base-policy[systemd] )
+ selinux? (
+ sec-policy/selinux-base-policy[systemd]
+ sec-policy/selinux-ntp
+ )
sysv-utils? (
!sys-apps/openrc[sysv-utils(-)]
!sys-apps/sysvinit
diff --git a/sys-apps/systemd/systemd-250.5-r1.ebuild b/sys-apps/systemd/systemd-250.5-r1.ebuild
deleted file mode 100644
index 8272af827231..000000000000
--- a/sys-apps/systemd/systemd-250.5-r1.ebuild
+++ /dev/null
@@ -1,534 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/systemd/systemd.git"
- inherit git-r3
-else
- if [[ ${PV} == *.* ]]; then
- MY_PN=systemd-stable
- else
- MY_PN=systemd
- fi
- MY_PV=${PV/_/-}
- MY_P=${MY_PN}-${MY_PV}
- S=${WORKDIR}/${MY_P}
- SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="
- acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
- fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
- +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
- +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
-"
-REQUIRED_USE="
- dns-over-tls? ( || ( gnutls openssl ) )
- homed? ( cryptsetup pam openssl )
- importd? ( curl lzma || ( gcrypt openssl ) )
- policykit? ( !hostnamed-fallback )
- pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND="
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- apparmor? ( sys-libs/libapparmor:0= )
- audit? ( >=sys-process/audit-2:0= )
- cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
- curl? ( net-misc/curl:0= )
- elfutils? ( >=dev-libs/elfutils-0.158:0= )
- fido2? ( dev-libs/libfido2:0= )
- gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
- gnutls? ( >=net-libs/gnutls-3.6.0:0= )
- http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
- idn? ( net-dns/libidn2:= )
- importd? (
- app-arch/bzip2:0=
- sys-libs/zlib:0=
- )
- kmod? ( >=sys-apps/kmod-15:0= )
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
- nat? ( net-firewall/iptables:0= )
- openssl? ( >=dev-libs/openssl-1.1.0:0= )
- pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
- pkcs11? ( app-crypt/p11-kit:0= )
- pcre? ( dev-libs/libpcre2 )
- pwquality? ( dev-libs/libpwquality:0= )
- qrcode? ( media-gfx/qrencode:0= )
- seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
- selinux? ( sys-libs/libselinux:0= )
- tpm? ( app-crypt/tpm2-tss:0= )
- xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
- zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-${MINKV}
- gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
- >=acct-group/adm-0-r1
- >=acct-group/wheel-0-r1
- >=acct-group/kmem-0-r1
- >=acct-group/tty-0-r1
- >=acct-group/utmp-0-r1
- >=acct-group/audio-0-r1
- >=acct-group/cdrom-0-r1
- >=acct-group/dialout-0-r1
- >=acct-group/disk-0-r1
- >=acct-group/input-0-r1
- >=acct-group/kvm-0-r1
- >=acct-group/lp-0-r1
- >=acct-group/render-0-r1
- acct-group/sgx
- >=acct-group/tape-0-r1
- acct-group/users
- >=acct-group/video-0-r1
- >=acct-group/systemd-journal-0-r1
- >=acct-user/root-0-r1
- acct-user/nobody
- >=acct-user/systemd-journal-remote-0-r1
- >=acct-user/systemd-coredump-0-r1
- >=acct-user/systemd-network-0-r1
- acct-user/systemd-oom
- >=acct-user/systemd-resolve-0-r1
- >=acct-user/systemd-timesync-0-r1
- >=sys-apps/baselayout-2.2
- hostnamed-fallback? (
- acct-group/systemd-hostname
- sys-apps/dbus-broker
- )
- selinux? ( sec-policy/selinux-base-policy[systemd] )
- sysv-utils? (
- !sys-apps/openrc[sysv-utils(-)]
- !sys-apps/sysvinit
- )
- !sysv-utils? ( sys-apps/sysvinit )
- resolvconf? ( !net-dns/openresolv )
- !build? ( || (
- sys-apps/util-linux[kill(-)]
- sys-process/procps[kill(+)]
- sys-apps/coreutils[kill(-)]
- ) )
- !sys-apps/hwids[udev]
- !sys-auth/nss-myhostname
- !sys-fs/eudev
- !sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
- >=sys-fs/udev-init-scripts-34
- policykit? ( sys-auth/polkit )
- !vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
- app-arch/xz-utils:0
- dev-util/gperf
- >=dev-util/meson-0.46
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- test? (
- app-text/tree
- dev-lang/perl
- sys-apps/dbus
- )
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt:0
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
- has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- if use test && has pid-sandbox ${FEATURES}; then
- ewarn "Tests are known to fail with PID sandboxing enabled."
- ewarn "See https://bugs.gentoo.org/674458."
- fi
-
- local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
- ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
- ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
- ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
- ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
- ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2"
-
- use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
- use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
- kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
- kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
- kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
- if kernel_is -ge 5 10 20; then
- CONFIG_CHECK+=" ~KCMP"
- else
- CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
- fi
-
- if kernel_is -ge 4 18; then
- CONFIG_CHECK+=" ~AUTOFS_FS"
- else
- CONFIG_CHECK+=" ~AUTOFS4_FS"
- fi
-
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- if linux_chkconfig_present X86; then
- CONFIG_CHECK+=" ~DMIID"
- fi
- fi
-
- if kernel_is -lt ${MINKV//./ }; then
- ewarn "Kernel version at least ${MINKV} required"
- fi
-
- check_extra_config
- fi
-}
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- default
- [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
- # Do NOT add patches here
- local PATCHES=()
-
- [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
- # Add local patches here
- PATCHES+=(
- )
-
- if ! use vanilla; then
- PATCHES+=(
- "${FILESDIR}/gentoo-generator-path-r2.patch"
- "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
- "${FILESDIR}/gentoo-journald-audit.patch"
- )
- fi
-
- default
-}
-
-src_configure() {
- # Prevent conflicts with i686 cross toolchain, bug 559726
- tc-export AR CC NM OBJCOPY RANLIB
-
- python_setup
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --localstatedir="${EPREFIX}/var"
- -Dsupport-url="https://gentoo.org/support/"
- -Dpamlibdir="$(getpam_mod_dir)"
- # avoid bash-completion dep
- -Dbashcompletiondir="$(get_bashcompdir)"
- # make sure we get /bin:/sbin in PATH
- $(meson_use split-usr)
- -Dsplit-bin=true
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- # Avoid infinite exec recursion, bug 642724
- -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
- # no deps
- -Dima=true
- -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
- # Optional components/dependencies
- $(meson_native_use_bool acl)
- $(meson_native_use_bool apparmor)
- $(meson_native_use_bool audit)
- $(meson_native_use_bool cryptsetup libcryptsetup)
- $(meson_native_use_bool curl libcurl)
- $(meson_native_use_bool dns-over-tls dns-over-tls)
- $(meson_native_use_bool elfutils)
- $(meson_native_use_bool fido2 libfido2)
- $(meson_use gcrypt)
- $(meson_native_use_bool gnuefi gnu-efi)
- $(meson_native_use_bool gnutls)
- -Defi-includedir="${ESYSROOT}/usr/include/efi"
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
- $(meson_native_use_bool homed)
- $(meson_native_use_bool http microhttpd)
- $(meson_native_use_bool idn)
- $(meson_native_use_bool importd)
- $(meson_native_use_bool importd bzip2)
- $(meson_native_use_bool importd zlib)
- $(meson_native_use_bool kmod)
- $(meson_use lz4)
- $(meson_use lzma xz)
- $(meson_use zstd)
- $(meson_native_use_bool nat libiptc)
- $(meson_native_use_bool openssl)
- $(meson_use pam)
- $(meson_native_use_bool pkcs11 p11kit)
- $(meson_native_use_bool pcre pcre2)
- $(meson_native_use_bool policykit polkit)
- $(meson_native_use_bool pwquality)
- $(meson_native_use_bool qrcode qrencode)
- $(meson_native_use_bool seccomp)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool tpm tpm2)
- $(meson_native_use_bool test dbus)
- $(meson_native_use_bool xkb xkbcommon)
- -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
- # Breaks screen, tmux, etc.
- -Ddefault-kill-user-processes=false
- -Dcreate-log-dirs=false
-
- # multilib options
- $(meson_native_true backlight)
- $(meson_native_true binfmt)
- $(meson_native_true coredump)
- $(meson_native_true environment-d)
- $(meson_native_true firstboot)
- $(meson_native_true hibernate)
- $(meson_native_true hostnamed)
- $(meson_native_true ldconfig)
- $(meson_native_true localed)
- $(meson_native_true man)
- $(meson_native_true networkd)
- $(meson_native_true quotacheck)
- $(meson_native_true randomseed)
- $(meson_native_true rfkill)
- $(meson_native_true sysusers)
- $(meson_native_true timedated)
- $(meson_native_true timesyncd)
- $(meson_native_true tmpfiles)
- $(meson_native_true vconsole)
- )
-
- meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
- unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
- meson_src_test
-}
-
-multilib_src_install_all() {
- local rootprefix=$(usex split-usr '' /usr)
-
- # meson doesn't know about docdir
- mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
- einstalldocs
- dodoc "${FILESDIR}"/nsswitch.conf
-
- if ! use resolvconf; then
- rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
- fi
-
- rm "${ED}"/etc/init.d/README || die
- rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
- if ! use sysv-utils; then
- rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
- rm "${ED}"/usr/share/man/man1/init.1 || die
- rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
- fi
-
- if ! use resolvconf && ! use sysv-utils; then
- rmdir "${ED}${rootprefix}"/sbin || die
- fi
-
- # https://bugs.gentoo.org/761763
- rm -r "${ED}"/usr/lib/sysusers.d || die
-
- # Preserve empty dirs in /etc & /var, bug #437008
- keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
- keepdir /etc/kernel/install.d
- keepdir /etc/systemd/{network,system,user}
- keepdir /etc/udev/rules.d
-
- keepdir /etc/udev/hwdb.d
-
- keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
- keepdir /usr/lib/{binfmt.d,modules-load.d}
- keepdir /usr/lib/systemd/user-generators
- keepdir /var/lib/systemd
- keepdir /var/log/journal
-
- # Symlink /etc/sysctl.conf for easy migration.
- dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
- if use pam; then
- newpamd "${FILESDIR}"/systemd-user.pam systemd-user
- fi
-
- if use split-usr; then
- # Avoid breaking boot/reboot
- dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
- dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
- fi
-
- # workaround for https://github.com/systemd/systemd/issues/13501
- if use hostnamed-fallback; then
- # this file requires dbus-broker
- insinto /usr/share/dbus-1/system.d/
- doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
-
- insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
- doins "${FILESDIR}/00-hostnamed-network-user.conf"
- fi
-
- gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
- local envd_locale_def="${EROOT}/etc/env.d/02locale"
- local envd_locale=( "${EROOT}"/etc/env.d/??locale )
- local locale_conf="${EROOT}/etc/locale.conf"
-
- if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
- # If locale.conf does not exist...
- if [[ -e ${envd_locale} ]]; then
- # ...either copy env.d/??locale if there's one
- ebegin "Moving ${envd_locale} to ${locale_conf}"
- mv "${envd_locale}" "${locale_conf}"
- eend ${?} || FAIL=1
- else
- # ...or create a dummy default
- ebegin "Creating ${locale_conf}"
- cat > "${locale_conf}" <<-EOF
- # This file has been created by the sys-apps/systemd ebuild.
- # See locale.conf(5) and localectl(1).
-
- # LANG=${LANG}
- EOF
- eend ${?} || FAIL=1
- fi
- fi
-
- if [[ ! -L ${envd_locale} ]]; then
- # now, if env.d/??locale is not a symlink (to locale.conf)...
- if [[ -e ${envd_locale} ]]; then
- # ...warn the user that he has duplicate locale settings
- ewarn
- ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
- ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
- ewarn "and create the symlink with the following command:"
- ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
- ewarn
- else
- # ...or just create the symlink if there's nothing here
- ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
- ln -n -s ../locale.conf "${envd_locale_def}"
- eend ${?} || FAIL=1
- fi
- fi
-}
-
-pkg_preinst() {
- if ! use split-usr; then
- local dir
- for dir in bin sbin lib; do
- if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
- eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
- eerror "One of them should be a symbolic link to the other one."
- FAIL=1
- fi
- done
- if [[ ${FAIL} ]]; then
- eerror "Migration to system layout with merged directories must be performed before"
- eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
- die "System layout with split directories still used"
- fi
- fi
-}
-
-pkg_postinst() {
- systemd_update_catalog
-
- # Keep this here in case the database format changes so it gets updated
- # when required.
- systemd-hwdb --root="${ROOT}" update
-
- udev_reload || FAIL=1
-
- # Bug 465468, make sure locales are respected, and ensure consistency
- # between OpenRC & systemd
- migrate_locale
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- if type systemctl &>/dev/null; then
- systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
- fi
- elog "To enable a useful set of services, run the following:"
- elog " systemctl preset-all --preset-mode=enable-only"
- fi
-
- if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
- rm "${EROOT}/var/lib/systemd/timesync"
- fi
-
- if [[ ${FAIL} ]]; then
- eerror "One of the postinst commands failed. Please check the postinst output"
- eerror "for errors. You may need to clean up your system and/or try installing"
- eerror "systemd again."
- eerror
- fi
-
- if use hostnamed-fallback; then
- if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then
- ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run."
- ewarn "To enable dbus-broker.service run the next command as root:"
- ewarn "systemctl enable dbus-broker.service"
- fi
- fi
-}
-
-pkg_prerm() {
- # If removing systemd completely, remove the catalog database.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
- fi
-}
diff --git a/sys-apps/systemd/systemd-250.6.ebuild b/sys-apps/systemd/systemd-250.6.ebuild
new file mode 100644
index 000000000000..56fa2b1cb927
--- /dev/null
+++ b/sys-apps/systemd/systemd-250.6.ebuild
@@ -0,0 +1,554 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+ inherit git-r3
+else
+ if [[ ${PV} == *.* ]]; then
+ MY_PN=systemd-stable
+ else
+ MY_PN=systemd
+ fi
+ MY_PV=${PV/_/-}
+ MY_P=${MY_PN}-${MY_PV}
+ S=${WORKDIR}/${MY_P}
+ SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+ acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+ fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
+ +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+ +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+ dns-over-tls? ( || ( gnutls openssl ) )
+ homed? ( cryptsetup pam openssl )
+ importd? ( curl lzma || ( gcrypt openssl ) )
+ policykit? ( !hostnamed-fallback )
+ pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND="
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ apparmor? ( sys-libs/libapparmor:0= )
+ audit? ( >=sys-process/audit-2:0= )
+ cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+ curl? ( net-misc/curl:0= )
+ elfutils? ( >=dev-libs/elfutils-0.158:0= )
+ fido2? ( dev-libs/libfido2:0= )
+ gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+ gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+ http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+ idn? ( net-dns/libidn2:= )
+ importd? (
+ app-arch/bzip2:0=
+ sys-libs/zlib:0=
+ )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+ nat? ( net-firewall/iptables:0= )
+ openssl? ( >=dev-libs/openssl-1.1.0:0= )
+ pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+ pkcs11? ( app-crypt/p11-kit:0= )
+ pcre? ( dev-libs/libpcre2 )
+ pwquality? ( dev-libs/libpwquality:0= )
+ qrcode? ( media-gfx/qrencode:0= )
+ seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+ selinux? ( sys-libs/libselinux:0= )
+ tpm? ( app-crypt/tpm2-tss:0= )
+ xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+ zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-${MINKV}
+ gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+ >=acct-group/adm-0-r1
+ >=acct-group/wheel-0-r1
+ >=acct-group/kmem-0-r1
+ >=acct-group/tty-0-r1
+ >=acct-group/utmp-0-r1
+ >=acct-group/audio-0-r1
+ >=acct-group/cdrom-0-r1
+ >=acct-group/dialout-0-r1
+ >=acct-group/disk-0-r1
+ >=acct-group/input-0-r1
+ >=acct-group/kvm-0-r1
+ >=acct-group/lp-0-r1
+ >=acct-group/render-0-r1
+ acct-group/sgx
+ >=acct-group/tape-0-r1
+ acct-group/users
+ >=acct-group/video-0-r1
+ >=acct-group/systemd-journal-0-r1
+ >=acct-user/root-0-r1
+ acct-user/nobody
+ >=acct-user/systemd-journal-remote-0-r1
+ >=acct-user/systemd-coredump-0-r1
+ >=acct-user/systemd-network-0-r1
+ acct-user/systemd-oom
+ >=acct-user/systemd-resolve-0-r1
+ >=acct-user/systemd-timesync-0-r1
+ >=sys-apps/baselayout-2.2
+ hostnamed-fallback? (
+ acct-group/systemd-hostname
+ sys-apps/dbus-broker
+ )
+ selinux? (
+ sec-policy/selinux-base-policy[systemd]
+ sec-policy/selinux-ntp
+ )
+ sysv-utils? (
+ !sys-apps/openrc[sysv-utils(-)]
+ !sys-apps/sysvinit
+ )
+ !sysv-utils? ( sys-apps/sysvinit )
+ resolvconf? ( !net-dns/openresolv )
+ !build? ( || (
+ sys-apps/util-linux[kill(-)]
+ sys-process/procps[kill(+)]
+ sys-apps/coreutils[kill(-)]
+ ) )
+ !sys-apps/hwids[udev]
+ !sys-auth/nss-myhostname
+ !sys-fs/eudev
+ !sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+ >=sys-fs/udev-init-scripts-34
+ policykit? ( sys-auth/polkit )
+ !vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+ app-arch/xz-utils:0
+ dev-util/gperf
+ >=dev-util/meson-0.46
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ app-text/tree
+ dev-lang/perl
+ sys-apps/dbus
+ )
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt:0
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
+ has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ if use test && has pid-sandbox ${FEATURES}; then
+ ewarn "Tests are known to fail with PID sandboxing enabled."
+ ewarn "See https://bugs.gentoo.org/674458."
+ fi
+
+ local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+ ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+ ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+ ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+ ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+ ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2"
+
+ use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+ use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+ kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+ kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+ if kernel_is -ge 5 10 20; then
+ CONFIG_CHECK+=" ~KCMP"
+ else
+ CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+ fi
+
+ if kernel_is -ge 4 18; then
+ CONFIG_CHECK+=" ~AUTOFS_FS"
+ else
+ CONFIG_CHECK+=" ~AUTOFS4_FS"
+ fi
+
+ if linux_config_exists; then
+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+ if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+ ewarn "It's recommended to set an empty value to the following kernel config option:"
+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+ fi
+ if linux_chkconfig_present X86; then
+ CONFIG_CHECK+=" ~DMIID"
+ fi
+ fi
+
+ if kernel_is -lt ${MINKV//./ }; then
+ ewarn "Kernel version at least ${MINKV} required"
+ fi
+
+ check_extra_config
+ fi
+}
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ default
+ [[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+ # Do NOT add patches here
+ local PATCHES=()
+
+ [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+ # Add local patches here
+ PATCHES+=(
+ )
+
+ if ! use vanilla; then
+ PATCHES+=(
+ "${FILESDIR}/gentoo-generator-path-r2.patch"
+ "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+ "${FILESDIR}/gentoo-journald-audit.patch"
+ )
+ fi
+
+ default
+}
+
+src_configure() {
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ python_setup
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --localstatedir="${EPREFIX}/var"
+ -Dsupport-url="https://gentoo.org/support/"
+ -Dpamlibdir="$(getpam_mod_dir)"
+ # avoid bash-completion dep
+ -Dbashcompletiondir="$(get_bashcompdir)"
+ # make sure we get /bin:/sbin in PATH
+ $(meson_use split-usr)
+ -Dsplit-bin=true
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ # Avoid infinite exec recursion, bug 642724
+ -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+ # no deps
+ -Dima=true
+ -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+ # Optional components/dependencies
+ $(meson_native_use_bool acl)
+ $(meson_native_use_bool apparmor)
+ $(meson_native_use_bool audit)
+ $(meson_native_use_bool cryptsetup libcryptsetup)
+ $(meson_native_use_bool curl libcurl)
+ $(meson_native_use_bool dns-over-tls dns-over-tls)
+ $(meson_native_use_bool elfutils)
+ $(meson_native_use_bool fido2 libfido2)
+ $(meson_use gcrypt)
+ $(meson_native_use_bool gnuefi gnu-efi)
+ $(meson_native_use_bool gnutls)
+ -Defi-includedir="${ESYSROOT}/usr/include/efi"
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+ $(meson_native_use_bool homed)
+ $(meson_native_use_bool http microhttpd)
+ $(meson_native_use_bool idn)
+ $(meson_native_use_bool importd)
+ $(meson_native_use_bool importd bzip2)
+ $(meson_native_use_bool importd zlib)
+ $(meson_native_use_bool kmod)
+ $(meson_use lz4)
+ $(meson_use lzma xz)
+ $(meson_use zstd)
+ $(meson_native_use_bool nat libiptc)
+ $(meson_native_use_bool openssl)
+ $(meson_use pam)
+ $(meson_native_use_bool pkcs11 p11kit)
+ $(meson_native_use_bool pcre pcre2)
+ $(meson_native_use_bool policykit polkit)
+ $(meson_native_use_bool pwquality)
+ $(meson_native_use_bool qrcode qrencode)
+ $(meson_native_use_bool seccomp)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool tpm tpm2)
+ $(meson_native_use_bool test dbus)
+ $(meson_native_use_bool xkb xkbcommon)
+ -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+ # Breaks screen, tmux, etc.
+ -Ddefault-kill-user-processes=false
+ -Dcreate-log-dirs=false
+
+ # multilib options
+ $(meson_native_true backlight)
+ $(meson_native_true binfmt)
+ $(meson_native_true coredump)
+ $(meson_native_true environment-d)
+ $(meson_native_true firstboot)
+ $(meson_native_true hibernate)
+ $(meson_native_true hostnamed)
+ $(meson_native_true ldconfig)
+ $(meson_native_true localed)
+ $(meson_native_true man)
+ $(meson_native_true networkd)
+ $(meson_native_true quotacheck)
+ $(meson_native_true randomseed)
+ $(meson_native_true rfkill)
+ $(meson_native_true sysusers)
+ $(meson_native_true timedated)
+ $(meson_native_true timesyncd)
+ $(meson_native_true tmpfiles)
+ $(meson_native_true vconsole)
+ )
+
+ meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+ meson_src_test
+}
+
+multilib_src_install_all() {
+ local rootprefix=$(usex split-usr '' /usr)
+
+ # meson doesn't know about docdir
+ mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+ einstalldocs
+ dodoc "${FILESDIR}"/nsswitch.conf
+
+ if ! use resolvconf; then
+ rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+ fi
+
+ rm "${ED}"/etc/init.d/README || die
+ rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+ if ! use sysv-utils; then
+ rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+ rm "${ED}"/usr/share/man/man1/init.1 || die
+ rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+ fi
+
+ if ! use resolvconf && ! use sysv-utils; then
+ rmdir "${ED}${rootprefix}"/sbin || die
+ fi
+
+ # https://bugs.gentoo.org/761763
+ rm -r "${ED}"/usr/lib/sysusers.d || die
+
+ # Preserve empty dirs in /etc & /var, bug #437008
+ keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+ keepdir /etc/kernel/install.d
+ keepdir /etc/systemd/{network,system,user}
+ keepdir /etc/udev/rules.d
+
+ keepdir /etc/udev/hwdb.d
+
+ keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+ keepdir /usr/lib/{binfmt.d,modules-load.d}
+ keepdir /usr/lib/systemd/user-generators
+ keepdir /var/lib/systemd
+ keepdir /var/log/journal
+
+ # Symlink /etc/sysctl.conf for easy migration.
+ dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+ if use pam; then
+ newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+ fi
+
+ if use split-usr; then
+ # Avoid breaking boot/reboot
+ dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+ dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+ fi
+
+ # workaround for https://github.com/systemd/systemd/issues/13501
+ if use hostnamed-fallback; then
+ # this file requires dbus-broker
+ insinto /usr/share/dbus-1/system.d/
+ doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
+
+ insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
+ doins "${FILESDIR}/00-hostnamed-network-user.conf"
+ fi
+
+ gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+ local envd_locale_def="${EROOT}/etc/env.d/02locale"
+ local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+ local locale_conf="${EROOT}/etc/locale.conf"
+
+ if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+ # If locale.conf does not exist...
+ if [[ -e ${envd_locale} ]]; then
+ # ...either copy env.d/??locale if there's one
+ ebegin "Moving ${envd_locale} to ${locale_conf}"
+ mv "${envd_locale}" "${locale_conf}"
+ eend ${?} || FAIL=1
+ else
+ # ...or create a dummy default
+ ebegin "Creating ${locale_conf}"
+ cat > "${locale_conf}" <<-EOF
+ # This file has been created by the sys-apps/systemd ebuild.
+ # See locale.conf(5) and localectl(1).
+
+ # LANG=${LANG}
+ EOF
+ eend ${?} || FAIL=1
+ fi
+ fi
+
+ if [[ ! -L ${envd_locale} ]]; then
+ # now, if env.d/??locale is not a symlink (to locale.conf)...
+ if [[ -e ${envd_locale} ]]; then
+ # ...warn the user that he has duplicate locale settings
+ ewarn
+ ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+ ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+ ewarn "and create the symlink with the following command:"
+ ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+ ewarn
+ else
+ # ...or just create the symlink if there's nothing here
+ ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+ ln -n -s ../locale.conf "${envd_locale_def}"
+ eend ${?} || FAIL=1
+ fi
+ fi
+}
+
+pkg_preinst() {
+ if ! use split-usr; then
+ local dir
+ for dir in bin sbin lib; do
+ if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+ eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+ eerror "One of them should be a symbolic link to the other one."
+ FAIL=1
+ fi
+ done
+ if [[ ${FAIL} ]]; then
+ eerror "Migration to system layout with merged directories must be performed before"
+ eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+ die "System layout with split directories still used"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ systemd_update_catalog
+
+ # Keep this here in case the database format changes so it gets updated
+ # when required.
+ systemd-hwdb --root="${ROOT}" update
+
+ udev_reload || FAIL=1
+
+ # Bug 465468, make sure locales are respected, and ensure consistency
+ # between OpenRC & systemd
+ migrate_locale
+
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ if type systemctl &>/dev/null; then
+ systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+ fi
+ elog "To enable a useful set of services, run the following:"
+ elog " systemctl preset-all --preset-mode=enable-only"
+ fi
+
+ if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+ rm "${EROOT}/var/lib/systemd/timesync"
+ fi
+
+ if [[ ${FAIL} ]]; then
+ eerror "One of the postinst commands failed. Please check the postinst output"
+ eerror "for errors. You may need to clean up your system and/or try installing"
+ eerror "systemd again."
+ eerror
+ fi
+
+ if use hostnamed-fallback; then
+ if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then
+ ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run."
+ ewarn "To enable dbus-broker.service run the next command as root:"
+ ewarn "systemctl enable dbus-broker.service"
+ fi
+ fi
+}
+
+pkg_prerm() {
+ # If removing systemd completely, remove the catalog database.
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+ fi
+}
diff --git a/sys-apps/systemd/systemd-250.7.ebuild b/sys-apps/systemd/systemd-250.7.ebuild
new file mode 100644
index 000000000000..92bbec7305b4
--- /dev/null
+++ b/sys-apps/systemd/systemd-250.7.ebuild
@@ -0,0 +1,556 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+ inherit git-r3
+else
+ if [[ ${PV} == *.* ]]; then
+ MY_PN=systemd-stable
+ else
+ MY_PN=systemd
+ fi
+ MY_PV=${PV/_/-}
+ MY_P=${MY_PN}-${MY_PV}
+ S=${WORKDIR}/${MY_P}
+ SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+ acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+ fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
+ +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+ +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+ dns-over-tls? ( || ( gnutls openssl ) )
+ homed? ( cryptsetup pam openssl )
+ importd? ( curl lzma || ( gcrypt openssl ) )
+ policykit? ( !hostnamed-fallback )
+ pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND="
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ apparmor? ( sys-libs/libapparmor:0= )
+ audit? ( >=sys-process/audit-2:0= )
+ cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+ curl? ( net-misc/curl:0= )
+ elfutils? ( >=dev-libs/elfutils-0.158:0= )
+ fido2? ( dev-libs/libfido2:0= )
+ gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+ gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+ http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+ idn? ( net-dns/libidn2:= )
+ importd? (
+ app-arch/bzip2:0=
+ sys-libs/zlib:0=
+ )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+ nat? ( net-firewall/iptables:0= )
+ openssl? ( >=dev-libs/openssl-1.1.0:0= )
+ pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+ pkcs11? ( app-crypt/p11-kit:0= )
+ pcre? ( dev-libs/libpcre2 )
+ pwquality? ( dev-libs/libpwquality:0= )
+ qrcode? ( media-gfx/qrencode:0= )
+ seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+ selinux? ( sys-libs/libselinux:0= )
+ tpm? ( app-crypt/tpm2-tss:0= )
+ xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+ zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-${MINKV}
+ gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+ >=acct-group/adm-0-r1
+ >=acct-group/wheel-0-r1
+ >=acct-group/kmem-0-r1
+ >=acct-group/tty-0-r1
+ >=acct-group/utmp-0-r1
+ >=acct-group/audio-0-r1
+ >=acct-group/cdrom-0-r1
+ >=acct-group/dialout-0-r1
+ >=acct-group/disk-0-r1
+ >=acct-group/input-0-r1
+ >=acct-group/kvm-0-r1
+ >=acct-group/lp-0-r1
+ >=acct-group/render-0-r1
+ acct-group/sgx
+ >=acct-group/tape-0-r1
+ acct-group/users
+ >=acct-group/video-0-r1
+ >=acct-group/systemd-journal-0-r1
+ >=acct-user/root-0-r1
+ acct-user/nobody
+ >=acct-user/systemd-journal-remote-0-r1
+ >=acct-user/systemd-coredump-0-r1
+ >=acct-user/systemd-network-0-r1
+ acct-user/systemd-oom
+ >=acct-user/systemd-resolve-0-r1
+ >=acct-user/systemd-timesync-0-r1
+ >=sys-apps/baselayout-2.2
+ hostnamed-fallback? (
+ acct-group/systemd-hostname
+ sys-apps/dbus-broker
+ )
+ selinux? (
+ sec-policy/selinux-base-policy[systemd]
+ sec-policy/selinux-ntp
+ )
+ sysv-utils? (
+ !sys-apps/openrc[sysv-utils(-)]
+ !sys-apps/sysvinit
+ )
+ !sysv-utils? ( sys-apps/sysvinit )
+ resolvconf? ( !net-dns/openresolv )
+ !build? ( || (
+ sys-apps/util-linux[kill(-)]
+ sys-process/procps[kill(+)]
+ sys-apps/coreutils[kill(-)]
+ ) )
+ !sys-apps/hwids[udev]
+ !sys-auth/nss-myhostname
+ !sys-fs/eudev
+ !sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+ >=sys-fs/udev-init-scripts-34
+ policykit? ( sys-auth/polkit )
+ !vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+ app-arch/xz-utils:0
+ dev-util/gperf
+ >=dev-util/meson-0.46
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ app-text/tree
+ dev-lang/perl
+ sys-apps/dbus
+ )
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt:0
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
+ has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ if use test && has pid-sandbox ${FEATURES}; then
+ ewarn "Tests are known to fail with PID sandboxing enabled."
+ ewarn "See https://bugs.gentoo.org/674458."
+ fi
+
+ local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+ ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+ ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+ ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+ ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+ ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2"
+
+ use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+ use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+ kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+ kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+ if kernel_is -ge 5 10 20; then
+ CONFIG_CHECK+=" ~KCMP"
+ else
+ CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+ fi
+
+ if kernel_is -ge 4 18; then
+ CONFIG_CHECK+=" ~AUTOFS_FS"
+ else
+ CONFIG_CHECK+=" ~AUTOFS4_FS"
+ fi
+
+ if linux_config_exists; then
+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+ if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+ ewarn "It's recommended to set an empty value to the following kernel config option:"
+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+ fi
+ if linux_chkconfig_present X86; then
+ CONFIG_CHECK+=" ~DMIID"
+ fi
+ fi
+
+ if kernel_is -lt ${MINKV//./ }; then
+ ewarn "Kernel version at least ${MINKV} required"
+ fi
+
+ check_extra_config
+ fi
+}
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ default
+ [[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+ # Do NOT add patches here
+ local PATCHES=()
+
+ [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+ # Add local patches here
+ PATCHES+=(
+ )
+
+ if ! use vanilla; then
+ PATCHES+=(
+ "${FILESDIR}/gentoo-generator-path-r2.patch"
+ "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+ "${FILESDIR}/gentoo-journald-audit.patch"
+ )
+ fi
+
+ default
+}
+
+src_configure() {
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+
+ # Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+ # wasn't backported to 250.x, but it turns out to break Clang
+ # anyway: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ python_setup
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --localstatedir="${EPREFIX}/var"
+ -Dsupport-url="https://gentoo.org/support/"
+ -Dpamlibdir="$(getpam_mod_dir)"
+ # avoid bash-completion dep
+ -Dbashcompletiondir="$(get_bashcompdir)"
+ # make sure we get /bin:/sbin in PATH
+ $(meson_use split-usr)
+ -Dsplit-bin=true
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ # Avoid infinite exec recursion, bug 642724
+ -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+ # no deps
+ -Dima=true
+ -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+ # Optional components/dependencies
+ $(meson_native_use_bool acl)
+ $(meson_native_use_bool apparmor)
+ $(meson_native_use_bool audit)
+ $(meson_native_use_bool cryptsetup libcryptsetup)
+ $(meson_native_use_bool curl libcurl)
+ $(meson_native_use_bool dns-over-tls dns-over-tls)
+ $(meson_native_use_bool elfutils)
+ $(meson_native_use_bool fido2 libfido2)
+ $(meson_use gcrypt)
+ $(meson_native_use_bool gnuefi gnu-efi)
+ $(meson_native_use_bool gnutls)
+ -Defi-includedir="${ESYSROOT}/usr/include/efi"
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+ $(meson_native_use_bool homed)
+ $(meson_native_use_bool http microhttpd)
+ $(meson_native_use_bool idn)
+ $(meson_native_use_bool importd)
+ $(meson_native_use_bool importd bzip2)
+ $(meson_native_use_bool importd zlib)
+ $(meson_native_use_bool kmod)
+ $(meson_use lz4)
+ $(meson_use lzma xz)
+ $(meson_use zstd)
+ $(meson_native_use_bool nat libiptc)
+ $(meson_native_use_bool openssl)
+ $(meson_use pam)
+ $(meson_native_use_bool pkcs11 p11kit)
+ $(meson_native_use_bool pcre pcre2)
+ $(meson_native_use_bool policykit polkit)
+ $(meson_native_use_bool pwquality)
+ $(meson_native_use_bool qrcode qrencode)
+ $(meson_native_use_bool seccomp)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool tpm tpm2)
+ $(meson_native_use_bool test dbus)
+ $(meson_native_use_bool xkb xkbcommon)
+ -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+ # Breaks screen, tmux, etc.
+ -Ddefault-kill-user-processes=false
+ -Dcreate-log-dirs=false
+
+ # multilib options
+ $(meson_native_true backlight)
+ $(meson_native_true binfmt)
+ $(meson_native_true coredump)
+ $(meson_native_true environment-d)
+ $(meson_native_true firstboot)
+ $(meson_native_true hibernate)
+ $(meson_native_true hostnamed)
+ $(meson_native_true ldconfig)
+ $(meson_native_true localed)
+ $(meson_native_true man)
+ $(meson_native_true networkd)
+ $(meson_native_true quotacheck)
+ $(meson_native_true randomseed)
+ $(meson_native_true rfkill)
+ $(meson_native_true sysusers)
+ $(meson_native_true timedated)
+ $(meson_native_true timesyncd)
+ $(meson_native_true tmpfiles)
+ $(meson_native_true vconsole)
+ )
+
+ meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+ meson_src_test
+}
+
+multilib_src_install_all() {
+ local rootprefix=$(usex split-usr '' /usr)
+
+ # meson doesn't know about docdir
+ mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+ einstalldocs
+ dodoc "${FILESDIR}"/nsswitch.conf
+
+ if ! use resolvconf; then
+ rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+ fi
+
+ rm "${ED}"/etc/init.d/README || die
+ rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+ if ! use sysv-utils; then
+ rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+ rm "${ED}"/usr/share/man/man1/init.1 || die
+ rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+ fi
+
+ if ! use resolvconf && ! use sysv-utils; then
+ rmdir "${ED}${rootprefix}"/sbin || die
+ fi
+
+ # https://bugs.gentoo.org/761763
+ rm -r "${ED}"/usr/lib/sysusers.d || die
+
+ # Preserve empty dirs in /etc & /var, bug #437008
+ keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+ keepdir /etc/kernel/install.d
+ keepdir /etc/systemd/{network,system,user}
+ keepdir /etc/udev/rules.d
+
+ keepdir /etc/udev/hwdb.d
+
+ keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+ keepdir /usr/lib/{binfmt.d,modules-load.d}
+ keepdir /usr/lib/systemd/user-generators
+ keepdir /var/lib/systemd
+ keepdir /var/log/journal
+
+ # Symlink /etc/sysctl.conf for easy migration.
+ dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+ if use pam; then
+ newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+ fi
+
+ if use split-usr; then
+ # Avoid breaking boot/reboot
+ dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+ dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+ fi
+
+ # workaround for https://github.com/systemd/systemd/issues/13501
+ if use hostnamed-fallback; then
+ # this file requires dbus-broker
+ insinto /usr/share/dbus-1/system.d/
+ doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
+
+ insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
+ doins "${FILESDIR}/00-hostnamed-network-user.conf"
+ fi
+
+ gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+ local envd_locale_def="${EROOT}/etc/env.d/02locale"
+ local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+ local locale_conf="${EROOT}/etc/locale.conf"
+
+ if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+ # If locale.conf does not exist...
+ if [[ -e ${envd_locale} ]]; then
+ # ...either copy env.d/??locale if there's one
+ ebegin "Moving ${envd_locale} to ${locale_conf}"
+ mv "${envd_locale}" "${locale_conf}"
+ eend ${?} || FAIL=1
+ else
+ # ...or create a dummy default
+ ebegin "Creating ${locale_conf}"
+ cat > "${locale_conf}" <<-EOF
+ # This file has been created by the sys-apps/systemd ebuild.
+ # See locale.conf(5) and localectl(1).
+
+ # LANG=${LANG}
+ EOF
+ eend ${?} || FAIL=1
+ fi
+ fi
+
+ if [[ ! -L ${envd_locale} ]]; then
+ # now, if env.d/??locale is not a symlink (to locale.conf)...
+ if [[ -e ${envd_locale} ]]; then
+ # ...warn the user that he has duplicate locale settings
+ ewarn
+ ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+ ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+ ewarn "and create the symlink with the following command:"
+ ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+ ewarn
+ else
+ # ...or just create the symlink if there's nothing here
+ ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+ ln -n -s ../locale.conf "${envd_locale_def}"
+ eend ${?} || FAIL=1
+ fi
+ fi
+}
+
+pkg_preinst() {
+ if ! use split-usr; then
+ local dir
+ for dir in bin sbin lib; do
+ if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+ eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+ eerror "One of them should be a symbolic link to the other one."
+ FAIL=1
+ fi
+ done
+ if [[ ${FAIL} ]]; then
+ eerror "Migration to system layout with merged directories must be performed before"
+ eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+ die "System layout with split directories still used"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ systemd_update_catalog
+
+ # Keep this here in case the database format changes so it gets updated
+ # when required.
+ systemd-hwdb --root="${ROOT}" update
+
+ udev_reload || FAIL=1
+
+ # Bug 465468, make sure locales are respected, and ensure consistency
+ # between OpenRC & systemd
+ migrate_locale
+
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ if type systemctl &>/dev/null; then
+ systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+ fi
+ elog "To enable a useful set of services, run the following:"
+ elog " systemctl preset-all --preset-mode=enable-only"
+ fi
+
+ if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+ rm "${EROOT}/var/lib/systemd/timesync"
+ fi
+
+ if [[ ${FAIL} ]]; then
+ eerror "One of the postinst commands failed. Please check the postinst output"
+ eerror "for errors. You may need to clean up your system and/or try installing"
+ eerror "systemd again."
+ eerror
+ fi
+
+ if use hostnamed-fallback; then
+ if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then
+ ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run."
+ ewarn "To enable dbus-broker.service run the next command as root:"
+ ewarn "systemctl enable dbus-broker.service"
+ fi
+ fi
+}
+
+pkg_prerm() {
+ # If removing systemd completely, remove the catalog database.
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+ fi
+}
diff --git a/sys-apps/systemd/systemd-251.2.ebuild b/sys-apps/systemd/systemd-251.2.ebuild
new file mode 100644
index 000000000000..04abbae40454
--- /dev/null
+++ b/sys-apps/systemd/systemd-251.2.ebuild
@@ -0,0 +1,536 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..11} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+ inherit git-r3
+else
+ if [[ ${PV} == *.* ]]; then
+ MY_PN=systemd-stable
+ else
+ MY_PN=systemd
+ fi
+ MY_PV=${PV/_/-}
+ MY_P=${MY_PN}-${MY_PV}
+ S=${WORKDIR}/${MY_P}
+ SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+ acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+ fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod
+ +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+ +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+ dns-over-tls? ( || ( gnutls openssl ) )
+ homed? ( cryptsetup pam openssl )
+ importd? ( curl lzma || ( gcrypt openssl ) )
+ pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+ >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl:0= )
+ apparmor? ( sys-libs/libapparmor:0= )
+ audit? ( >=sys-process/audit-2:0= )
+ cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+ curl? ( net-misc/curl:0= )
+ elfutils? ( >=dev-libs/elfutils-0.158:0= )
+ fido2? ( dev-libs/libfido2:0= )
+ gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+ gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+ http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+ idn? ( net-dns/libidn2:= )
+ importd? (
+ app-arch/bzip2:0=
+ sys-libs/zlib:0=
+ )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+ nat? ( net-firewall/iptables:0= )
+ openssl? ( >=dev-libs/openssl-1.1.0:0= )
+ pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+ pkcs11? ( app-crypt/p11-kit:0= )
+ pcre? ( dev-libs/libpcre2 )
+ pwquality? ( dev-libs/libpwquality:0= )
+ qrcode? ( media-gfx/qrencode:0= )
+ seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+ selinux? ( sys-libs/libselinux:0= )
+ tpm? ( app-crypt/tpm2-tss:0= )
+ xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+ zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-${MINKV}
+ gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+ >=acct-group/adm-0-r1
+ >=acct-group/wheel-0-r1
+ >=acct-group/kmem-0-r1
+ >=acct-group/tty-0-r1
+ >=acct-group/utmp-0-r1
+ >=acct-group/audio-0-r1
+ >=acct-group/cdrom-0-r1
+ >=acct-group/dialout-0-r1
+ >=acct-group/disk-0-r1
+ >=acct-group/input-0-r1
+ >=acct-group/kvm-0-r1
+ >=acct-group/lp-0-r1
+ >=acct-group/render-0-r1
+ acct-group/sgx
+ >=acct-group/tape-0-r1
+ acct-group/users
+ >=acct-group/video-0-r1
+ >=acct-group/systemd-journal-0-r1
+ >=acct-user/root-0-r1
+ acct-user/nobody
+ >=acct-user/systemd-journal-remote-0-r1
+ >=acct-user/systemd-coredump-0-r1
+ >=acct-user/systemd-network-0-r1
+ acct-user/systemd-oom
+ >=acct-user/systemd-resolve-0-r1
+ >=acct-user/systemd-timesync-0-r1
+ >=sys-apps/baselayout-2.2
+ selinux? (
+ sec-policy/selinux-base-policy[systemd]
+ sec-policy/selinux-ntp
+ )
+ sysv-utils? (
+ !sys-apps/openrc[sysv-utils(-)]
+ !sys-apps/sysvinit
+ )
+ !sysv-utils? ( sys-apps/sysvinit )
+ resolvconf? ( !net-dns/openresolv )
+ !build? ( || (
+ sys-apps/util-linux[kill(-)]
+ sys-process/procps[kill(+)]
+ sys-apps/coreutils[kill(-)]
+ ) )
+ !sys-apps/hwids[udev]
+ !sys-auth/nss-myhostname
+ !sys-fs/eudev
+ !sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+ >=sys-fs/udev-init-scripts-34
+ policykit? ( sys-auth/polkit )
+ !vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+ app-arch/xz-utils:0
+ dev-util/gperf
+ >=dev-util/meson-0.46
+ >=sys-apps/coreutils-8.16
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ app-text/tree
+ dev-lang/perl
+ sys-apps/dbus
+ )
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt:0
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
+ has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ if use test && has pid-sandbox ${FEATURES}; then
+ ewarn "Tests are known to fail with PID sandboxing enabled."
+ ewarn "See https://bugs.gentoo.org/674458."
+ fi
+
+ local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+ ~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+ ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+ ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+ ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+ ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2"
+
+ use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+ use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+ if kernel_is -ge 5 10 20; then
+ CONFIG_CHECK+=" ~KCMP"
+ else
+ CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+ fi
+
+ if kernel_is -ge 4 18; then
+ CONFIG_CHECK+=" ~AUTOFS_FS"
+ else
+ CONFIG_CHECK+=" ~AUTOFS4_FS"
+ fi
+
+ if linux_config_exists; then
+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+ if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+ ewarn "It's recommended to set an empty value to the following kernel config option:"
+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+ fi
+ if linux_chkconfig_present X86; then
+ CONFIG_CHECK+=" ~DMIID"
+ fi
+ fi
+
+ if kernel_is -lt ${MINKV//./ }; then
+ ewarn "Kernel version at least ${MINKV} required"
+ fi
+
+ check_extra_config
+ fi
+}
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ default
+ [[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+ # Do NOT add patches here
+ local PATCHES=()
+
+ [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+ # Add local patches here
+ PATCHES+=(
+ "${FILESDIR}/251-format-string.patch"
+ # Breaks Clang. Revert the commit for now and force off F_S=3.
+ # bug #841770.
+ "${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+ )
+
+ if ! use vanilla; then
+ PATCHES+=(
+ "${FILESDIR}/gentoo-generator-path-r2.patch"
+ "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+ "${FILESDIR}/gentoo-journald-audit.patch"
+ )
+ fi
+
+ # Fails with split-usr.
+ sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
+
+ default
+}
+
+src_configure() {
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+
+ # Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
+ # the upstream patch for it because it breaks Clang: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
+ python_setup
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --localstatedir="${EPREFIX}/var"
+ -Dsupport-url="https://gentoo.org/support/"
+ -Dpamlibdir="$(getpam_mod_dir)"
+ # avoid bash-completion dep
+ -Dbashcompletiondir="$(get_bashcompdir)"
+ # make sure we get /bin:/sbin in PATH
+ $(meson_use split-usr)
+ -Dsplit-bin=true
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ # Avoid infinite exec recursion, bug 642724
+ -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+ # no deps
+ -Dima=true
+ -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+ # Optional components/dependencies
+ $(meson_native_use_bool acl)
+ $(meson_native_use_bool apparmor)
+ $(meson_native_use_bool audit)
+ $(meson_native_use_bool cryptsetup libcryptsetup)
+ $(meson_native_use_bool curl libcurl)
+ $(meson_native_use_bool dns-over-tls dns-over-tls)
+ $(meson_native_use_bool elfutils)
+ $(meson_native_use_bool fido2 libfido2)
+ $(meson_use gcrypt)
+ $(meson_native_use_bool gnuefi gnu-efi)
+ $(meson_native_use_bool gnutls)
+ -Defi-includedir="${ESYSROOT}/usr/include/efi"
+ -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+ $(meson_native_use_bool homed)
+ $(meson_native_use_bool http microhttpd)
+ $(meson_native_use_bool idn)
+ $(meson_native_use_bool importd)
+ $(meson_native_use_bool importd bzip2)
+ $(meson_native_use_bool importd zlib)
+ $(meson_native_use_bool kmod)
+ $(meson_use lz4)
+ $(meson_use lzma xz)
+ $(meson_use zstd)
+ $(meson_native_use_bool nat libiptc)
+ $(meson_native_use_bool openssl)
+ $(meson_use pam)
+ $(meson_native_use_bool pkcs11 p11kit)
+ $(meson_native_use_bool pcre pcre2)
+ $(meson_native_use_bool policykit polkit)
+ $(meson_native_use_bool pwquality)
+ $(meson_native_use_bool qrcode qrencode)
+ $(meson_native_use_bool seccomp)
+ $(meson_native_use_bool selinux)
+ $(meson_native_use_bool tpm tpm2)
+ $(meson_native_use_bool test dbus)
+ $(meson_native_use_bool xkb xkbcommon)
+ -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+ # Breaks screen, tmux, etc.
+ -Ddefault-kill-user-processes=false
+ -Dcreate-log-dirs=false
+
+ # multilib options
+ $(meson_native_true backlight)
+ $(meson_native_true binfmt)
+ $(meson_native_true coredump)
+ $(meson_native_true environment-d)
+ $(meson_native_true firstboot)
+ $(meson_native_true hibernate)
+ $(meson_native_true hostnamed)
+ $(meson_native_true ldconfig)
+ $(meson_native_true localed)
+ $(meson_native_true man)
+ $(meson_native_true networkd)
+ $(meson_native_true quotacheck)
+ $(meson_native_true randomseed)
+ $(meson_native_true rfkill)
+ $(meson_native_true sysusers)
+ $(meson_native_true timedated)
+ $(meson_native_true timesyncd)
+ $(meson_native_true tmpfiles)
+ $(meson_native_true vconsole)
+ )
+
+ meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+ meson_src_test
+}
+
+multilib_src_install_all() {
+ local rootprefix=$(usex split-usr '' /usr)
+
+ # meson doesn't know about docdir
+ mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+ einstalldocs
+ dodoc "${FILESDIR}"/nsswitch.conf
+
+ if ! use resolvconf; then
+ rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+ fi
+
+ rm "${ED}"/etc/init.d/README || die
+ rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+ if ! use sysv-utils; then
+ rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+ rm "${ED}"/usr/share/man/man1/init.1 || die
+ rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+ fi
+
+ if ! use resolvconf && ! use sysv-utils; then
+ rmdir "${ED}${rootprefix}"/sbin || die
+ fi
+
+ # https://bugs.gentoo.org/761763
+ rm -r "${ED}"/usr/lib/sysusers.d || die
+
+ # Preserve empty dirs in /etc & /var, bug #437008
+ keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+ keepdir /etc/kernel/install.d
+ keepdir /etc/systemd/{network,system,user}
+ keepdir /etc/udev/rules.d
+
+ keepdir /etc/udev/hwdb.d
+
+ keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+ keepdir /usr/lib/{binfmt.d,modules-load.d}
+ keepdir /usr/lib/systemd/user-generators
+ keepdir /var/lib/systemd
+ keepdir /var/log/journal
+
+ # Symlink /etc/sysctl.conf for easy migration.
+ dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+ if use pam; then
+ newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+ fi
+
+ if use split-usr; then
+ # Avoid breaking boot/reboot
+ dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+ dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+ fi
+
+ gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+ local envd_locale_def="${EROOT}/etc/env.d/02locale"
+ local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+ local locale_conf="${EROOT}/etc/locale.conf"
+
+ if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+ # If locale.conf does not exist...
+ if [[ -e ${envd_locale} ]]; then
+ # ...either copy env.d/??locale if there's one
+ ebegin "Moving ${envd_locale} to ${locale_conf}"
+ mv "${envd_locale}" "${locale_conf}"
+ eend ${?} || FAIL=1
+ else
+ # ...or create a dummy default
+ ebegin "Creating ${locale_conf}"
+ cat > "${locale_conf}" <<-EOF
+ # This file has been created by the sys-apps/systemd ebuild.
+ # See locale.conf(5) and localectl(1).
+
+ # LANG=${LANG}
+ EOF
+ eend ${?} || FAIL=1
+ fi
+ fi
+
+ if [[ ! -L ${envd_locale} ]]; then
+ # now, if env.d/??locale is not a symlink (to locale.conf)...
+ if [[ -e ${envd_locale} ]]; then
+ # ...warn the user that he has duplicate locale settings
+ ewarn
+ ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+ ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+ ewarn "and create the symlink with the following command:"
+ ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+ ewarn
+ else
+ # ...or just create the symlink if there's nothing here
+ ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+ ln -n -s ../locale.conf "${envd_locale_def}"
+ eend ${?} || FAIL=1
+ fi
+ fi
+}
+
+pkg_preinst() {
+ if ! use split-usr; then
+ local dir
+ for dir in bin sbin lib; do
+ if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+ eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+ eerror "One of them should be a symbolic link to the other one."
+ FAIL=1
+ fi
+ done
+ if [[ ${FAIL} ]]; then
+ eerror "Migration to system layout with merged directories must be performed before"
+ eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+ die "System layout with split directories still used"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ systemd_update_catalog
+
+ # Keep this here in case the database format changes so it gets updated
+ # when required.
+ systemd-hwdb --root="${ROOT}" update
+
+ udev_reload || FAIL=1
+
+ # Bug 465468, make sure locales are respected, and ensure consistency
+ # between OpenRC & systemd
+ migrate_locale
+
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ if type systemctl &>/dev/null; then
+ systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+ fi
+ elog "To enable a useful set of services, run the following:"
+ elog " systemctl preset-all --preset-mode=enable-only"
+ fi
+
+ if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+ rm "${EROOT}/var/lib/systemd/timesync"
+ fi
+
+ if [[ ${FAIL} ]]; then
+ eerror "One of the postinst commands failed. Please check the postinst output"
+ eerror "for errors. You may need to clean up your system and/or try installing"
+ eerror "systemd again."
+ eerror
+ fi
+}
+
+pkg_prerm() {
+ # If removing systemd completely, remove the catalog database.
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+ fi
+}
diff --git a/sys-apps/systemd/systemd-251_rc2.ebuild b/sys-apps/systemd/systemd-251_rc2.ebuild
deleted file mode 100644
index 433553652a86..000000000000
--- a/sys-apps/systemd/systemd-251_rc2.ebuild
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/systemd/systemd.git"
- inherit git-r3
-else
- if [[ ${PV} == *.* ]]; then
- MY_PN=systemd-stable
- else
- MY_PN=systemd
- fi
- MY_PV=${PV/_/-}
- MY_P=${MY_PN}-${MY_PV}
- S=${WORKDIR}/${MY_P}
- SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
- #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="
- acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
- fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod
- +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
- +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
-"
-REQUIRED_USE="
- dns-over-tls? ( || ( gnutls openssl ) )
- homed? ( cryptsetup pam openssl )
- importd? ( curl lzma || ( gcrypt openssl ) )
- pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
- >=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
- sys-libs/libcap:0=[${MULTILIB_USEDEP}]
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- acl? ( sys-apps/acl:0= )
- apparmor? ( sys-libs/libapparmor:0= )
- audit? ( >=sys-process/audit-2:0= )
- cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
- curl? ( net-misc/curl:0= )
- elfutils? ( >=dev-libs/elfutils-0.158:0= )
- fido2? ( dev-libs/libfido2:0= )
- gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
- gnutls? ( >=net-libs/gnutls-3.6.0:0= )
- http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
- idn? ( net-dns/libidn2:= )
- importd? (
- app-arch/bzip2:0=
- sys-libs/zlib:0=
- )
- kmod? ( >=sys-apps/kmod-15:0= )
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
- nat? ( net-firewall/iptables:0= )
- openssl? ( >=dev-libs/openssl-1.1.0:0= )
- pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
- pkcs11? ( app-crypt/p11-kit:0= )
- pcre? ( dev-libs/libpcre2 )
- pwquality? ( dev-libs/libpwquality:0= )
- qrcode? ( media-gfx/qrencode:0= )
- seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
- selinux? ( sys-libs/libselinux:0= )
- tpm? ( app-crypt/tpm2-tss:0= )
- xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
- zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-${MINKV}
- gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
- >=acct-group/adm-0-r1
- >=acct-group/wheel-0-r1
- >=acct-group/kmem-0-r1
- >=acct-group/tty-0-r1
- >=acct-group/utmp-0-r1
- >=acct-group/audio-0-r1
- >=acct-group/cdrom-0-r1
- >=acct-group/dialout-0-r1
- >=acct-group/disk-0-r1
- >=acct-group/input-0-r1
- >=acct-group/kvm-0-r1
- >=acct-group/lp-0-r1
- >=acct-group/render-0-r1
- acct-group/sgx
- >=acct-group/tape-0-r1
- acct-group/users
- >=acct-group/video-0-r1
- >=acct-group/systemd-journal-0-r1
- >=acct-user/root-0-r1
- acct-user/nobody
- >=acct-user/systemd-journal-remote-0-r1
- >=acct-user/systemd-coredump-0-r1
- >=acct-user/systemd-network-0-r1
- acct-user/systemd-oom
- >=acct-user/systemd-resolve-0-r1
- >=acct-user/systemd-timesync-0-r1
- >=sys-apps/baselayout-2.2
- selinux? ( sec-policy/selinux-base-policy[systemd] )
- sysv-utils? (
- !sys-apps/openrc[sysv-utils(-)]
- !sys-apps/sysvinit
- )
- !sysv-utils? ( sys-apps/sysvinit )
- resolvconf? ( !net-dns/openresolv )
- !build? ( || (
- sys-apps/util-linux[kill(-)]
- sys-process/procps[kill(+)]
- sys-apps/coreutils[kill(-)]
- ) )
- !sys-apps/hwids[udev]
- !sys-auth/nss-myhostname
- !sys-fs/eudev
- !sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
- >=sys-fs/udev-init-scripts-34
- policykit? ( sys-auth/polkit )
- !vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
- app-arch/xz-utils:0
- dev-util/gperf
- >=dev-util/meson-0.46
- >=sys-apps/coreutils-8.16
- sys-devel/gettext
- virtual/pkgconfig
- test? (
- app-text/tree
- dev-lang/perl
- sys-apps/dbus
- )
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt:0
- $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
- $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
- has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- if use test && has pid-sandbox ${FEATURES}; then
- ewarn "Tests are known to fail with PID sandboxing enabled."
- ewarn "See https://bugs.gentoo.org/674458."
- fi
-
- local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
- ~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
- ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
- ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
- ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
- ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
- ~!SYSFS_DEPRECATED_V2"
-
- use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
- use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-
- if kernel_is -ge 5 10 20; then
- CONFIG_CHECK+=" ~KCMP"
- else
- CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
- fi
-
- if kernel_is -ge 4 18; then
- CONFIG_CHECK+=" ~AUTOFS_FS"
- else
- CONFIG_CHECK+=" ~AUTOFS4_FS"
- fi
-
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- if linux_chkconfig_present X86; then
- CONFIG_CHECK+=" ~DMIID"
- fi
- fi
-
- if kernel_is -lt ${MINKV//./ }; then
- ewarn "Kernel version at least ${MINKV} required"
- fi
-
- check_extra_config
- fi
-}
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- default
- [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
- # Do NOT add patches here
- local PATCHES=()
-
- [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
- # Add local patches here
- PATCHES+=(
- "${FILESDIR}/251-rc2-colorterm.patch"
- )
-
- if ! use vanilla; then
- PATCHES+=(
- "${FILESDIR}/gentoo-generator-path-r2.patch"
- "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
- "${FILESDIR}/gentoo-journald-audit.patch"
- )
- fi
-
- # Fails with split-usr.
- sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
- default
-}
-
-src_configure() {
- # Prevent conflicts with i686 cross toolchain, bug 559726
- tc-export AR CC NM OBJCOPY RANLIB
-
- python_setup
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --localstatedir="${EPREFIX}/var"
- -Dsupport-url="https://gentoo.org/support/"
- -Dpamlibdir="$(getpam_mod_dir)"
- # avoid bash-completion dep
- -Dbashcompletiondir="$(get_bashcompdir)"
- # make sure we get /bin:/sbin in PATH
- $(meson_use split-usr)
- -Dsplit-bin=true
- -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
- -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
- # Avoid infinite exec recursion, bug 642724
- -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
- # no deps
- -Dima=true
- -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
- # Optional components/dependencies
- $(meson_native_use_bool acl)
- $(meson_native_use_bool apparmor)
- $(meson_native_use_bool audit)
- $(meson_native_use_bool cryptsetup libcryptsetup)
- $(meson_native_use_bool curl libcurl)
- $(meson_native_use_bool dns-over-tls dns-over-tls)
- $(meson_native_use_bool elfutils)
- $(meson_native_use_bool fido2 libfido2)
- $(meson_use gcrypt)
- $(meson_native_use_bool gnuefi gnu-efi)
- $(meson_native_use_bool gnutls)
- -Defi-includedir="${ESYSROOT}/usr/include/efi"
- -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
- $(meson_native_use_bool homed)
- $(meson_native_use_bool http microhttpd)
- $(meson_native_use_bool idn)
- $(meson_native_use_bool importd)
- $(meson_native_use_bool importd bzip2)
- $(meson_native_use_bool importd zlib)
- $(meson_native_use_bool kmod)
- $(meson_use lz4)
- $(meson_use lzma xz)
- $(meson_use zstd)
- $(meson_native_use_bool nat libiptc)
- $(meson_native_use_bool openssl)
- $(meson_use pam)
- $(meson_native_use_bool pkcs11 p11kit)
- $(meson_native_use_bool pcre pcre2)
- $(meson_native_use_bool policykit polkit)
- $(meson_native_use_bool pwquality)
- $(meson_native_use_bool qrcode qrencode)
- $(meson_native_use_bool seccomp)
- $(meson_native_use_bool selinux)
- $(meson_native_use_bool tpm tpm2)
- $(meson_native_use_bool test dbus)
- $(meson_native_use_bool xkb xkbcommon)
- -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
- # Breaks screen, tmux, etc.
- -Ddefault-kill-user-processes=false
- -Dcreate-log-dirs=false
-
- # multilib options
- $(meson_native_true backlight)
- $(meson_native_true binfmt)
- $(meson_native_true coredump)
- $(meson_native_true environment-d)
- $(meson_native_true firstboot)
- $(meson_native_true hibernate)
- $(meson_native_true hostnamed)
- $(meson_native_true ldconfig)
- $(meson_native_true localed)
- $(meson_native_true man)
- $(meson_native_true networkd)
- $(meson_native_true quotacheck)
- $(meson_native_true randomseed)
- $(meson_native_true rfkill)
- $(meson_native_true sysusers)
- $(meson_native_true timedated)
- $(meson_native_true timesyncd)
- $(meson_native_true tmpfiles)
- $(meson_native_true vconsole)
- )
-
- meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
- unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
- meson_src_test
-}
-
-multilib_src_install_all() {
- local rootprefix=$(usex split-usr '' /usr)
-
- # meson doesn't know about docdir
- mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
- einstalldocs
- dodoc "${FILESDIR}"/nsswitch.conf
-
- if ! use resolvconf; then
- rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
- fi
-
- rm "${ED}"/etc/init.d/README || die
- rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
- if ! use sysv-utils; then
- rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
- rm "${ED}"/usr/share/man/man1/init.1 || die
- rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
- fi
-
- if ! use resolvconf && ! use sysv-utils; then
- rmdir "${ED}${rootprefix}"/sbin || die
- fi
-
- # https://bugs.gentoo.org/761763
- rm -r "${ED}"/usr/lib/sysusers.d || die
-
- # Preserve empty dirs in /etc & /var, bug #437008
- keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
- keepdir /etc/kernel/install.d
- keepdir /etc/systemd/{network,system,user}
- keepdir /etc/udev/rules.d
-
- keepdir /etc/udev/hwdb.d
-
- keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
- keepdir /usr/lib/{binfmt.d,modules-load.d}
- keepdir /usr/lib/systemd/user-generators
- keepdir /var/lib/systemd
- keepdir /var/log/journal
-
- # Symlink /etc/sysctl.conf for easy migration.
- dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
- if use pam; then
- newpamd "${FILESDIR}"/systemd-user.pam systemd-user
- fi
-
- if use split-usr; then
- # Avoid breaking boot/reboot
- dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
- dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
- fi
-
- gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
- local envd_locale_def="${EROOT}/etc/env.d/02locale"
- local envd_locale=( "${EROOT}"/etc/env.d/??locale )
- local locale_conf="${EROOT}/etc/locale.conf"
-
- if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
- # If locale.conf does not exist...
- if [[ -e ${envd_locale} ]]; then
- # ...either copy env.d/??locale if there's one
- ebegin "Moving ${envd_locale} to ${locale_conf}"
- mv "${envd_locale}" "${locale_conf}"
- eend ${?} || FAIL=1
- else
- # ...or create a dummy default
- ebegin "Creating ${locale_conf}"
- cat > "${locale_conf}" <<-EOF
- # This file has been created by the sys-apps/systemd ebuild.
- # See locale.conf(5) and localectl(1).
-
- # LANG=${LANG}
- EOF
- eend ${?} || FAIL=1
- fi
- fi
-
- if [[ ! -L ${envd_locale} ]]; then
- # now, if env.d/??locale is not a symlink (to locale.conf)...
- if [[ -e ${envd_locale} ]]; then
- # ...warn the user that he has duplicate locale settings
- ewarn
- ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
- ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
- ewarn "and create the symlink with the following command:"
- ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
- ewarn
- else
- # ...or just create the symlink if there's nothing here
- ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
- ln -n -s ../locale.conf "${envd_locale_def}"
- eend ${?} || FAIL=1
- fi
- fi
-}
-
-pkg_preinst() {
- if ! use split-usr; then
- local dir
- for dir in bin sbin lib; do
- if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
- eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
- eerror "One of them should be a symbolic link to the other one."
- FAIL=1
- fi
- done
- if [[ ${FAIL} ]]; then
- eerror "Migration to system layout with merged directories must be performed before"
- eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
- die "System layout with split directories still used"
- fi
- fi
-}
-
-pkg_postinst() {
- systemd_update_catalog
-
- # Keep this here in case the database format changes so it gets updated
- # when required.
- systemd-hwdb --root="${ROOT}" update
-
- udev_reload || FAIL=1
-
- # Bug 465468, make sure locales are respected, and ensure consistency
- # between OpenRC & systemd
- migrate_locale
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- if type systemctl &>/dev/null; then
- systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
- fi
- elog "To enable a useful set of services, run the following:"
- elog " systemctl preset-all --preset-mode=enable-only"
- fi
-
- if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
- rm "${EROOT}/var/lib/systemd/timesync"
- fi
-
- if [[ ${FAIL} ]]; then
- eerror "One of the postinst commands failed. Please check the postinst output"
- eerror "for errors. You may need to clean up your system and/or try installing"
- eerror "systemd again."
- eerror
- fi
-}
-
-pkg_prerm() {
- # If removing systemd completely, remove the catalog database.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
- fi
-}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 93399a9c83e7..0b4f28e4c6b5 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -2,10 +2,13 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
# Avoid QA warnings
TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git"
@@ -20,13 +23,13 @@ else
MY_P=${MY_PN}-${MY_PV}
S=${WORKDIR}/${MY_P}
SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+HOMEPAGE="http://systemd.io/"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
@@ -117,7 +120,10 @@ RDEPEND="${COMMON_DEPEND}
>=acct-user/systemd-resolve-0-r1
>=acct-user/systemd-timesync-0-r1
>=sys-apps/baselayout-2.2
- selinux? ( sec-policy/selinux-base-policy[systemd] )
+ selinux? (
+ sec-policy/selinux-base-policy[systemd]
+ sec-policy/selinux-ntp
+ )
sysv-utils? (
!sys-apps/openrc[sysv-utils(-)]
!sys-apps/sysvinit
@@ -255,6 +261,21 @@ src_configure() {
# Prevent conflicts with i686 cross toolchain, bug 559726
tc-export AR CC NM OBJCOPY RANLIB
+ # Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
+ # the upstream patch for it because it breaks Clang: bug #841770.
+ #
+ # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+ # to unset F_S first, then explicitly set 2, to negate any default
+ # and anything set by the user if they're choosing 3 (or if they've
+ # modified GCC to set 3).
+ #
+ if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ # We can't unconditionally do this b/c we fortify needs
+ # some level of optimisation.
+ filter-flags -D_FORTIFY_SOURCE=3
+ append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ fi
+
python_setup
multilib-minimal_src_configure
diff --git a/sys-apps/tas/Manifest b/sys-apps/tas/Manifest
index 741f166eaaef..29b29fd5f1c2 100644
--- a/sys-apps/tas/Manifest
+++ b/sys-apps/tas/Manifest
@@ -1,6 +1,6 @@
AUX tas.ini 81 BLAKE2B 2dd7bc87d72d00d7dd73e496d253810dfe110aa1d754f1fe923f4bf0bafa79c516bf24eaa684822155afd88d9067a6106ee49f7bc8847c75a2a436cf72e893da SHA512 d1e555341bf1aa5e0f4097c948e32cf274d788821eb9bbbc62f15107dbf5893cc14f41ab47f2a59fb6cb5df4b3e431b403f643743eaf7fd3c121d4ee458a8d99
AUX tas.initd 422 BLAKE2B af394bb87952d7e5ddb20e3b688372f7e526ebde59a3862112a8c723252575683e8218297b801b0ef027b3953e8e78898407f6d85b7bec4f166fad4469d114ed SHA512 0cced493bd7a451bb8a76be1b24171fbc72c0571fb6337e52fe0140184a0990baac9a95e512738366433c3516b859f1958546a8e0ca8f718f7fc48b32f95c792
AUX tas.service 162 BLAKE2B f9f8d8f9e8dbe1b6aa6e7c531cb69b3e6f39e563cc64f2630a0db2b48cc0425806b166f39d7b2dc356c55b4771da7023ab5c0f10dd2d2857beaff7699fa1a0a7 SHA512 53a6ad9f0d42b26f2a2e9462a5f14a31e4bbde4d8badf7beb9e96e2a916d81ccda96be9bad80fbcc1a8f9e4a72ac5cfb1e13112785de8fe978823d97de145efd
-DIST TAS_1.6.0_build.200601.zip 15528952 BLAKE2B f2514180c1335c2c8afd5cf0234da8dd22563086cf2c85e38b8dc2bc28b27fd3dac6a09123a0d4f57354cf729ad5050a6253608d15682577c75b551c921aa1b0 SHA512 725e8134a51a75b23f566f1321e87faf44f96603d63b4a253f03c262ec2c40c339e024162ba84da37647cd301a039ca4aa34e42936d1a47303c7fa68e1e5f2f3
-EBUILD tas-1.6.0.200601-r1.ebuild 1602 BLAKE2B 193843008f9b7cee9e3e95c9351660812bd9fa6f7d6c65f5f5f257a2e48970f8f26750c679cb185eb9b03d0b8e642e30a11232db89a8446b281ffc5e86aaae8a SHA512 7ba86cc51edd74c79bf5493933223ba0d1dbd071f3fe92406482e2d6a53b722ce4995272c4b187edb92d65b6449868e7ff5114484019f148106b5ee54bf5f511
+DIST TAS_1.7.0_build.220503.zip 15345434 BLAKE2B 48f70d0dbafdb3e2acba8fb2e29007dce21062c843ea601c623664e7df8bf3638f14c489688e25445611d261ab6a30ce2edeae8f4e19749c9d3be61f6c30766b SHA512 dedef4b53afb5607f61d7e8793f966d4345ebb530cb0174c22fb72f41568a0b5c109833609e63d25de562c8de7fec312da3198b023265867b8f1228e0974455b
+EBUILD tas-1.7.0.220503.ebuild 1602 BLAKE2B 193843008f9b7cee9e3e95c9351660812bd9fa6f7d6c65f5f5f257a2e48970f8f26750c679cb185eb9b03d0b8e642e30a11232db89a8446b281ffc5e86aaae8a SHA512 7ba86cc51edd74c79bf5493933223ba0d1dbd071f3fe92406482e2d6a53b722ce4995272c4b187edb92d65b6449868e7ff5114484019f148106b5ee54bf5f511
MISC metadata.xml 872 BLAKE2B 404d895608719452cfe3ad2c6e2f6737ca970ce4e4bfdbda72fe67dd30975576d2145d3741b202abed66ad11dda16316bf84d02cd082e7cbb3d6169cc93bdee7 SHA512 8ea38656a0659bfedac562db6b89d14ae21ec523e8cb22c60297e128af868bf28712196fe3c5ad64c6971f5f9b28d8606c62264ab29af591b3dcf701ce2bc96d
diff --git a/sys-apps/tas/tas-1.6.0.200601-r1.ebuild b/sys-apps/tas/tas-1.6.0.200601-r1.ebuild
deleted file mode 100644
index 3ce67d72f4a4..000000000000
--- a/sys-apps/tas/tas-1.6.0.200601-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info optfeature systemd
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="${PN^^}"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Supermicro Thin-Agent Service for monitoring through the BMC/IPMI"
-HOMEPAGE="https://www.supermicro.com"
-SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
-S="${WORKDIR}"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="BSD supermicro"
-SLOT="0"
-
-RDEPEND="
- net-misc/networkmanager
- sys-apps/ethtool
- sys-apps/net-tools
- sys-apps/smartmontools
- sys-block/storcli
- sys-devel/bc
- sys-fs/lsscsi
- sys-fs/mdadm"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="usr/bin/IPMITAS"
-
-DOCS=(
- "clireadme.txt"
- "ReleaseNotes.txt"
- "software_license_agreement_pv.pdf"
- "TAS_UserGuide.pdf"
-)
-
-CONFIG_CHECK="~IPMI_DEVICE_INTERFACE ~IPMI_HANDLER ~IPMI_SI"
-
-src_unpack() {
- unpack ${A}
- unpack "${S}"/${MY_PN}_${MY_PV}_build.${MY_DATE}_Linux.tar.gz
-}
-
-src_install() {
- dobin TAS/$(usex amd64 '64' '32')bit/IPMITAS
-
- insinto /etc/supermicro
- doins "${FILESDIR}"/tas.ini
-
- dodir /var/log/tas
- local logfiles=( {starttime,tas,tas.com}.log )
- for logfile in ${logfiles[@]}; do
- touch "${ED}"/var/log/tas/${logfile} || die
- dosym ../../var/log/tas/${logfile} /etc/supermicro/${logfile}
- done
-
- newinitd "${FILESDIR}"/tas.initd tas
- systemd_newunit "${FILESDIR}"/tas.service tas.service
-
- einstalldocs
-}
-
-pkg_postinst() {
- optfeature "Broadcom controller management" sys-block/storcli
- optfeature "LSI controller management" sys-block/sas3ircu
-}
diff --git a/sys-apps/tas/tas-1.7.0.220503.ebuild b/sys-apps/tas/tas-1.7.0.220503.ebuild
new file mode 100644
index 000000000000..3ce67d72f4a4
--- /dev/null
+++ b/sys-apps/tas/tas-1.7.0.220503.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info optfeature systemd
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN^^}"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Supermicro Thin-Agent Service for monitoring through the BMC/IPMI"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
+S="${WORKDIR}"
+
+KEYWORDS="-* amd64 x86"
+LICENSE="BSD supermicro"
+SLOT="0"
+
+RDEPEND="
+ net-misc/networkmanager
+ sys-apps/ethtool
+ sys-apps/net-tools
+ sys-apps/smartmontools
+ sys-block/storcli
+ sys-devel/bc
+ sys-fs/lsscsi
+ sys-fs/mdadm"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="usr/bin/IPMITAS"
+
+DOCS=(
+ "clireadme.txt"
+ "ReleaseNotes.txt"
+ "software_license_agreement_pv.pdf"
+ "TAS_UserGuide.pdf"
+)
+
+CONFIG_CHECK="~IPMI_DEVICE_INTERFACE ~IPMI_HANDLER ~IPMI_SI"
+
+src_unpack() {
+ unpack ${A}
+ unpack "${S}"/${MY_PN}_${MY_PV}_build.${MY_DATE}_Linux.tar.gz
+}
+
+src_install() {
+ dobin TAS/$(usex amd64 '64' '32')bit/IPMITAS
+
+ insinto /etc/supermicro
+ doins "${FILESDIR}"/tas.ini
+
+ dodir /var/log/tas
+ local logfiles=( {starttime,tas,tas.com}.log )
+ for logfile in ${logfiles[@]}; do
+ touch "${ED}"/var/log/tas/${logfile} || die
+ dosym ../../var/log/tas/${logfile} /etc/supermicro/${logfile}
+ done
+
+ newinitd "${FILESDIR}"/tas.initd tas
+ systemd_newunit "${FILESDIR}"/tas.service tas.service
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ optfeature "Broadcom controller management" sys-block/storcli
+ optfeature "LSI controller management" sys-block/sas3ircu
+}
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 7b851fa17f83..23318e440096 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -3,5 +3,5 @@ AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae
AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
DIST tcp-wrappers_7.6.q-31.debian.tar.xz 36256 BLAKE2B 3ffd8b014c120f54b9231f375d3ec77a1894db8c48e56a57b52c5d796be42b78a1ddc35a45c816a05a1cbc603b88e3fe6131b4a562fb9d2169685031ecbf44d5 SHA512 de2bd7b081fca0f182def93795014332baf7b5edf339eaf81dff82772aea1dc866ccddccd5273e7dc49cf760953e164a66f1e5945cb54f2b8dab090c11712c33
DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.31.ebuild 2564 BLAKE2B 3ae25f25c15634af4d7fccc518895d229192c35d733c797b0029016c18b1e648cd27004d2774b977324a5a4a85689f926f1d70e5214c34311b025d46b48e924d SHA512 3e59384dcc0e7b242ced107ce0dbee326eee37af1411a4b40b5c721d1c5d5e5e5ec2ee614a27e0d0b7718cc68a1bd7fb10a1cf447966a182756760c70319cba7
+EBUILD tcp-wrappers-7.6.31.ebuild 2571 BLAKE2B f3f94b2bc096577c2cef45de35bc31f3b6bc7ea953bd06f22cc779d4618e9e853c713a2cf3faca47aae066cbd836ca23be4ce4be7064ed5007cdf823bf832895 SHA512 aa502d0526276623d32ee101dc0c415fe23fba6574febe14c44a4153edf5845f9d20e1aaa0e3f89b153e6743f434f627e523fefe12dad6ef91e65cdb353dbdf4
MISC metadata.xml 441 BLAKE2B 4387da8847f321871fa326aa52ff72a22c3ef29abb3a1ba06a2bf89d4cb69ed464d05007ca9f647ba3ec4ea23454081e442b67402f4258e61687b7b2c354cb5b SHA512 95f6cd45971b1ef2c47bfc504a84072a0fc95418a5fd0b8a51cdef38359e556caa439b111d381897979c6f82871af343a3134270de21e9e2ffa6ae7cb7949883
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
index 00076f71d73c..dc893cbfbf1b 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="tcp_wrappers_license"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="ipv6 netgroups"
RDEPEND="netgroups? ( net-libs/libnsl:= )"
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 61141d1ea0c5..824a55b20a51 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,4 +1,4 @@
AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9
DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
-EBUILD texinfo-6.8.ebuild 1678 BLAKE2B c55d227aaf21a2855bd0d32ba623312d21987a9ebbbe79494fe3a63a8a43361382d533a53d7fa1c29453699edb21cf078302f78017fe0e4e078513e136a8f404 SHA512 f44742872a26edbc6d1051d980808c1d7daaa0f5a4d7763e1e249571631e327774998485767ccd2258fc939589014562daa79a8ec35a92332beed4a6dbac5386
+EBUILD texinfo-6.8.ebuild 1716 BLAKE2B 4194a080e1dfb4f405330b000838f461a4bd19a253249b41034595449e8ab8f75e075383a5e970506db9d8970f29e30f84611f81a6c032edcc930786898f6533 SHA512 55afd3cf0f842dc8894162940abe2ccd384b0491fcd4fe877255c509031002cd0e8c83f5a4348dbc2432f124d80e224a3e7f127f475e40af5eeb3c0febe1601c
MISC metadata.xml 540 BLAKE2B 64b068c14cc3ce828768e85d21c46e25d8930f66287329bd6ec41893bb26b352a0384155688768aa472cf7c58113e02b79e88d99c98233c3f80b393a0d518443 SHA512 32c337ea240d5ec20130fbb17a9622e3736d8c4b577b6bdebebbe3344675cf9faf3140471ff9fe4c5862b75858017b5e9fd8fc34a1c1f53fe8babc106aa83af3
diff --git a/sys-apps/texinfo/texinfo-6.8.ebuild b/sys-apps/texinfo/texinfo-6.8.ebuild
index be21633802a7..0935accde6c5 100644
--- a/sys-apps/texinfo/texinfo-6.8.ebuild
+++ b/sys-apps/texinfo/texinfo-6.8.ebuild
@@ -45,7 +45,10 @@ src_configure() {
local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
use static && append-ldflags -static
- local myeconfargs=( $(use_enable nls) )
+ local myeconfargs=(
+ --cache-file="${S}"/config.cache
+ $(use_enable nls)
+ )
if use standalone ; then
myeconfargs+=(
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index cbaac18e0378..510d8005bd00 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -1,4 +1,4 @@
AUX tomoyo-tools-2.5.0_p20130214-warnings.patch 814 BLAKE2B 10a9966f726a47058388773500bc06bc6cebbdcf90eaaca5ecf8b2c1159618843645e55663892a5897c6741794b49cacf823a1fcee5e0e67e9a5c7e27ec3b892 SHA512 947caa5ce7f2c80e7e0b40042b09568c4fed731b530cf70c1fa24fa0f1a382dd41443f3db82a6aa6444c0ebcd25fd7de657c0f1990d69579e4645f3efa561e10
DIST tomoyo-tools-2.5.0-20130214.tar.gz 210892 BLAKE2B fc9435c5b4c97a58d6e3b00cfa5b82e08732c0f6804a819e99872fbcf64e3e831f33766c23e0ab7d8767e0c806d8e2f7c18280ebedb198684c386e8c7c8bb637 SHA512 1ba6f6b3a3d4e644e6ee742beb64b09c6d527f130b1fe6d09a2e19760ced26f540ac8cc1e6f83fddacc3ef8844c3c23425191e4e0098c8b72b5ba3086adc9dc4
EBUILD tomoyo-tools-2.5.0_p20130214-r1.ebuild 1374 BLAKE2B ac08fe95a322b0108ab270b7338e51fdc9758e0fe37fc57436f2f5c83f771378563cadc40d916bd6ebcf104cc17f1f70569759b8d443a9007284b6b5a0d47e39 SHA512 a97f68573f73256eb10f5749832c1c8888a176669cde4cb8c1d9d7b06403df74ec5aa0cf8d4fb3831dc3e85e965af9728a52ee76ff0dad508f4f2087a14ba8e7
-MISC metadata.xml 324 BLAKE2B 24fda3589fe0df36f6b5bdb3899bf4099ffdd2d949db77d803d2f93760b6b3a449e4d6af7d5843a0db5c6d2c6741c7014351620caab59f9b2591c07c5183d8b5 SHA512 fc3021d80213dd4423096c243d8a281a379c60f20f8d6816d16fc7e8e24aa594e72de1d70798c3213f7bd80ab4c1c562750c9cc3861d4b8ce378a5f74244fe75
+MISC metadata.xml 314 BLAKE2B c821d14a53bb7f364304ba6369940b54178d190f61ea50d12e6d9d6294438e7df8239cbcc988adfa89d2b3a22e5d653da4d66c336f6f7cee1874976fb6f3132d SHA512 cce47d4f20646285da780284ab90fd5f4928561abfa7d5700ca66dd1e3f7de22178870b7af7f4d4d18b6cf3158b798eeef13576461e43fc59df51b6edc68656b
diff --git a/sys-apps/tomoyo-tools/metadata.xml b/sys-apps/tomoyo-tools/metadata.xml
index aac55a5dd45c..747054053788 100644
--- a/sys-apps/tomoyo-tools/metadata.xml
+++ b/sys-apps/tomoyo-tools/metadata.xml
@@ -6,6 +6,6 @@
<name>Naohiro Aota</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge-jp">tomoyo</remote-id>
+ <remote-id type="osdn">tomoyo</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index c458c65ef2b8..6211103a9771 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -2,6 +2,8 @@ AUX usbguard-0.7.6-usbguard-dbus.openrc 278 BLAKE2B 58f11c693e25436605af6ad41a1f
AUX usbguard-0.7.6-usbguard.openrc 309 BLAKE2B d5297058d0ee8ce0f9fc91f2158f4aef5f077e1087800449a0319038d677a2a70274305058cd104ba30529b3c9daf82ffbe16ca5cdf20a3b4817e66d499d08c5 SHA512 512a08f59caf9de22b0776473a1ea9a4322b05c6286c99dac3055e0c6d52c78542448c33e19708338080cfdcdfcfb0f9868e8c523155e978c0161c262081da09
DIST usbguard-1.1.0.tar.gz 1648078 BLAKE2B 99dd7fef6cf93f72b87a00874757c1a2447530aa48405f2d260c3f3295881e3e6521c77195467af84c5b4554510250149eba5181eb44e9a997a120217e32bbea SHA512 f882e8ba38743c044984520d5514035e0e76e185328c2f16226ce8fb14b5dbde0c021327b3dabfdea36e18428be5fb23b559f6837ef7f81dabb5e9b4ed4e1e91
DIST usbguard-1.1.1.tar.gz 1651887 BLAKE2B ef736740592fb9a9589d53eaccd17fd8f0ebb4ca6f39794674aaad2edb3e259048452a63e6966a527a040cea83576d79a37b870d85cc4fff7603a6502dab4973 SHA512 7810471a3778b4bca644565cefa2666f98d53c2747bff7262b9bbb0327e7dba7a1e8c067c96d89e6742ccec5f65410f4e273bf84ee2bb1fbc7ff5738df3af780
-EBUILD usbguard-1.1.0-r1.ebuild 2385 BLAKE2B c553a785308a63f839386d426e878400bfd40bdbc7d0d032428f0d7864d83d2ed91ea8717473f4e8f3ad054280b0a77eafd2cb53239851848706cd5d86d58a28 SHA512 3bf634d0ef87f82bee8f7a5d90858947055eff9c63bf3b53dd701b0ba5cc178f837dae3b273438bdca640cc95326086d2d3d50428b68259ff6ddcc80596bd194
-EBUILD usbguard-1.1.1-r1.ebuild 2385 BLAKE2B c553a785308a63f839386d426e878400bfd40bdbc7d0d032428f0d7864d83d2ed91ea8717473f4e8f3ad054280b0a77eafd2cb53239851848706cd5d86d58a28 SHA512 3bf634d0ef87f82bee8f7a5d90858947055eff9c63bf3b53dd701b0ba5cc178f837dae3b273438bdca640cc95326086d2d3d50428b68259ff6ddcc80596bd194
+EBUILD usbguard-1.1.0-r1.ebuild 2388 BLAKE2B 43e1c79f82fb05e3a477378a4546ab5d8be4b2e75aaa6318d04d3ab89353e85037a9651e0e69dd6d0f9c90f166af5ad038b0525e2352c3ed8cc4ff4ff1b0805b SHA512 cabfa6fb583770640bb5158c2855ea7e516c971de4d7018bb85d62dafeec4da3b98d1b12d67fb46d0789ad3ab6009e2dfbc387f14241445b18bc67e3be411245
+EBUILD usbguard-1.1.1-r1.ebuild 2388 BLAKE2B 43e1c79f82fb05e3a477378a4546ab5d8be4b2e75aaa6318d04d3ab89353e85037a9651e0e69dd6d0f9c90f166af5ad038b0525e2352c3ed8cc4ff4ff1b0805b SHA512 cabfa6fb583770640bb5158c2855ea7e516c971de4d7018bb85d62dafeec4da3b98d1b12d67fb46d0789ad3ab6009e2dfbc387f14241445b18bc67e3be411245
+EBUILD usbguard-1.1.1-r2.ebuild 2444 BLAKE2B 0a028b71b0b0ce0a30dd32d9cedf5113daf50f7d9591d251c0d1326dafb131e4291f4f3873500d1d445ce8f192a92557e46b7c45fb16871ac93cb4bf93b7cd08 SHA512 1df118177a62209da537026d94eb97994b9774517ebe392c5caab1c5117491ca28a8d420cc37d90a2bc7468c777c268ce971f308fd0339a1b96eea7468b4b0eb
+EBUILD usbguard-1.1.1-r3.ebuild 2496 BLAKE2B 2a8702c9ccd6add3c3a4877da4261dc57848912edade75a6f192aa6fc20826279d682774a757d1d63b6750b19c483d34e74b399628e35cd7f8fe6d85edc54bc2 SHA512 0e776c254ebecac6ced3cae00e902f79e64fbe42d996b14f91060503e0da2be0e13e6e991d95701ad2fd6a5755fe8c60aca51df7bc6d2ee8d9b3f384d978a6b9
MISC metadata.xml 345 BLAKE2B ee71f0699ba99d30148f602e0af3b921c5c243e23e8587428df56ea8fa841f929103687b38d35fb7eb6812c0ccc2d811df0670db7a0beb915a61a8cf3914a7b2 SHA512 97c84d9a097784f95b0f33bef9855a3d81732eb29371de1c4ec2d9313c5346ad46832bec29bd6135fcf48540cbc683b2b13cf217f0f29df9995c0bd6b1b035b9
diff --git a/sys-apps/usbguard/usbguard-1.1.0-r1.ebuild b/sys-apps/usbguard/usbguard-1.1.0-r1.ebuild
index 78027c44d831..d17817210d25 100644
--- a/sys-apps/usbguard/usbguard-1.1.0-r1.ebuild
+++ b/sys-apps/usbguard/usbguard-1.1.0-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${CDEPEND}
"
DEPEND="${CDEPEND}
app-text/asciidoc
- dev-cpp/catch:0
+ <dev-cpp/catch-3:0
dbus? (
dev-libs/libxml2
dev-libs/libxslt
diff --git a/sys-apps/usbguard/usbguard-1.1.1-r1.ebuild b/sys-apps/usbguard/usbguard-1.1.1-r1.ebuild
index 78027c44d831..d17817210d25 100644
--- a/sys-apps/usbguard/usbguard-1.1.1-r1.ebuild
+++ b/sys-apps/usbguard/usbguard-1.1.1-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${CDEPEND}
"
DEPEND="${CDEPEND}
app-text/asciidoc
- dev-cpp/catch:0
+ <dev-cpp/catch-3:0
dbus? (
dev-libs/libxml2
dev-libs/libxslt
diff --git a/sys-apps/usbguard/usbguard-1.1.1-r2.ebuild b/sys-apps/usbguard/usbguard-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..ecaf1104c8a8
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-1.1.1-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="Daemon protecting your computer against BadUSB"
+HOMEPAGE="https://github.com/USBGuard/usbguard"
+SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # due to libusbguard.so.<1>.0.0
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus ldap policykit selinux static-libs systemd test umockdev"
+
+# https://github.com/USBGuard/usbguard/issues/449
+# https://bugs.gentoo.org/769692
+REQUIRED_USE+=" test? ( static-libs )"
+
+CDEPEND="
+ dev-libs/pegtl
+ >=dev-libs/libsodium-0.4.5:=
+ >=dev-libs/protobuf-2.5.0:=
+ >=sys-cluster/libqb-0.16.0:=
+ sys-devel/gcc:*[cxx]
+ >=sys-libs/libcap-ng-0.7.0
+ >=sys-libs/libseccomp-2.0.0
+ >=sys-process/audit-2.7.7
+ dbus? (
+ dev-libs/glib:2
+ sys-apps/dbus
+ sys-auth/polkit[introspection]
+ )
+ ldap? ( net-nds/openldap:= )
+ systemd? ( sys-apps/systemd )
+ umockdev? ( dev-util/umockdev )
+ "
+RDEPEND="${CDEPEND}
+ virtual/udev
+ selinux? ( sec-policy/selinux-usbguard )
+ "
+DEPEND="${CDEPEND}
+ app-text/asciidoc
+ <dev-cpp/catch-3:0
+ dbus? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ )
+ "
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myargs=(
+ --with-bash-completion-dir=$(get_bashcompdir)
+ $(use_with dbus)
+ $(use_with dbus polkit)
+ $(use_with ldap)
+ $(use_enable static-libs static)
+ $(use_enable systemd)
+ $(use_enable umockdev)
+ )
+
+ econf "${myargs[@]}"
+}
+
+src_install() {
+ default
+
+ keepdir /etc/usbguard/IPCAccessControl.d # bug 808801
+ keepdir /var/lib/log/usbguard
+ chmod 0600 "${ED}"/etc/usbguard/IPCAccessControl.d/.keep* || die # bug 808801
+
+ newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
+ use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
+
+ find "${D}" -name '*.la' -delete || die # bug 850655
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
+ ewarn ' a rules file at /etc/usbguard/rules.conf'
+ ewarn ' so that you do not'
+ ewarn ' GET LOCKED OUT'
+ ewarn " of this system (\"$(hostname)\")."
+ ewarn
+ ewarn 'This command may be of help:'
+ ewarn ' sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
+ ewarn
+}
diff --git a/sys-apps/usbguard/usbguard-1.1.1-r3.ebuild b/sys-apps/usbguard/usbguard-1.1.1-r3.ebuild
new file mode 100644
index 000000000000..889da51341e6
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-1.1.1-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="Daemon protecting your computer against BadUSB"
+HOMEPAGE="https://github.com/USBGuard/usbguard"
+SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # due to libusbguard.so.<1>.0.0
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus ldap policykit selinux static-libs systemd test umockdev"
+
+# https://github.com/USBGuard/usbguard/issues/449
+# https://bugs.gentoo.org/769692
+REQUIRED_USE+=" test? ( static-libs )"
+
+CDEPEND="
+ dev-libs/pegtl
+ >=dev-libs/libsodium-0.4.5:=
+ >=dev-libs/protobuf-2.5.0:=
+ >=sys-cluster/libqb-0.16.0:=
+ sys-devel/gcc:*[cxx]
+ >=sys-libs/libcap-ng-0.7.0
+ >=sys-libs/libseccomp-2.0.0
+ >=sys-process/audit-2.7.7
+ dbus? (
+ dev-libs/glib:2
+ sys-apps/dbus
+ sys-auth/polkit[introspection]
+ )
+ ldap? ( net-nds/openldap:= )
+ systemd? ( sys-apps/systemd )
+ umockdev? ( dev-util/umockdev )
+ "
+RDEPEND="${CDEPEND}
+ virtual/udev
+ selinux? ( sec-policy/selinux-usbguard )
+ "
+DEPEND="${CDEPEND}
+ app-text/asciidoc
+ <dev-cpp/catch-3:0
+ dbus? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ )
+ "
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myargs=(
+ --with-bash-completion-dir=$(get_bashcompdir)
+ --localstatedir=/var # i.e. not /var/lib, bug 852296
+ $(use_with dbus)
+ $(use_with dbus polkit)
+ $(use_with ldap)
+ $(use_enable static-libs static)
+ $(use_enable systemd)
+ $(use_enable umockdev)
+ )
+
+ econf "${myargs[@]}"
+}
+
+src_install() {
+ default
+
+ keepdir /etc/usbguard/IPCAccessControl.d # bug 808801
+ keepdir /var/log/usbguard
+ chmod 0600 "${ED}"/etc/usbguard/IPCAccessControl.d/.keep* || die # bug 808801
+
+ newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
+ use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
+
+ find "${D}" -name '*.la' -delete || die # bug 850655
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
+ ewarn ' a rules file at /etc/usbguard/rules.conf'
+ ewarn ' so that you do not'
+ ewarn ' GET LOCKED OUT'
+ ewarn " of this system (\"$(hostname)\")."
+ ewarn
+ ewarn 'This command may be of help:'
+ ewarn ' sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
+ ewarn
+}
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 55a3fc661d82..e67c2cf662db 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,3 +1,3 @@
DIST usbutils-014.tar.xz 165884 BLAKE2B aea4f8edd3c7d7bc400fd63a8702b6d0bb50b8ed07196c4a0ed20a615eacf6373794afb9e7d5d81408dc3382848e965ecf8bc1bbec20837e4d1f96ba47cc40b5 SHA512 43c9f6ed14f8d01e014ef39a5d50b3b09031c6bda8261e0945b4cb4287c9107104175b386c2adc61dc7f9f476afb30f9a647a6ece6dee26b4133a4f10af72792
-EBUILD usbutils-014-r1.ebuild 1331 BLAKE2B 784f8460e23b0bd885ec86d6c0e4daa2b40a72193d7c82d83e20d3d9b219369c8835ebd283485afae927b7451859ab79c2546a85409363392e12a457b19b490c SHA512 3c7fac95d86331cf4320d8e4ab1bf39907677ea68463c59393be2fc2813b5023cd01a87333cd1c7f603adec60d4eb3f9cba26ea082d45ca0028ec0387bb84a2e
+EBUILD usbutils-014-r1.ebuild 1351 BLAKE2B 02d2753b401fa7c06e8a55783cb23fe93855c23116c85079ac875ce55f470bc36d2dce0e70274c75ea06ef09495ed5e6a174b2045239fd4313ebf810c73cac21 SHA512 bef29472eda89501af0d72679f92cbd41b5074c6e73d7d1d3afccb06b53371864175044ed80fc7820fd54867b17fa174880166d6d24aa061be19f64558129290
MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/usbutils/usbutils-014-r1.ebuild b/sys-apps/usbutils/usbutils-014-r1.ebuild
index 547e7cc8092a..e99096d69ad4 100644
--- a/sys-apps/usbutils/usbutils-014-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-014-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit autotools python-single-r1
+inherit python-single-r1
DESCRIPTION="USB enumeration utilities"
HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -36,12 +36,13 @@ pkg_setup() {
src_prepare() {
default
- eautoreconf
+
use python && python_fix_shebang lsusb.py.in
}
src_configure() {
local myeconfargs=(
+ --cache-file="${S}"/config.cache
--datarootdir="${EPREFIX}/usr/share"
--datadir="${EPREFIX}/usr/share/hwdata"
)
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index f2beb45cb9a1..3f4208e66b78 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -2,5 +2,7 @@ AUX x86info-1.30-makefile.patch 2169 BLAKE2B c543daf7e672b1ac55a6cd029bc814f5530
AUX x86info-1.30-pic.patch 512 BLAKE2B 968b592289df73700785d37b607693f1e43fbae18da878a9888ed02ba68f370b799d92dca1dc00c3c2fc1c2d1faeb9ee9278bc6c1b5ac5fc1f4ddfe5c7a4ca49 SHA512 578dfae0ea84e3836c73840981f9c95594acbeff264c914015be43ad30e3bbf6bbb268373de7871e1a10288749dba466f8511a452a76028cead53571dac8b1a4
AUX x86info-modules.conf-rc 204 BLAKE2B 1077f0a793ca7eedef6c996d2ec9075872d7df862d24885a8152ee22ef3e0ee1667f142a690b44c019c7d75093038ad5a9eb9be7b34e7bc08abf498aa91a7591 SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b
DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
+DIST x86info-1.31.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
EBUILD x86info-1.30_p20190617.ebuild 1780 BLAKE2B 7cee22fc45e216b05b1111cf82951ab1e768b4f4ead32e391e8b9d76bd831f8dc7cdb7e94cbf979a4d6e6c8eeb0bad8cce4447a4865f912873f97479d464f971 SHA512 be7388d75e4aeb5344b5a33d38bc92a1784c86f2deb941076de42328a70ea1a10ff5289878003cd059dabcfe915e7b225a5b8cbc13dcf24500d3839d5a78526b
+EBUILD x86info-1.31.ebuild 1781 BLAKE2B 123fb94e2f10df62c9f8c705005840b10a8fa0d002283e36b275d1635cc80cb39902f5c1dba5973feaee8b50182e0323f945c56525802c3370f1ff9748881429 SHA512 61e5e5f202c0ea98883ad39661c3ae7a01beebbdb0a0ad7ca027118be3a37322f2d7f8e3f3f67a86b0eb3926236fd80d566c0fa5fb85059d87b420b9373c4fa9
MISC metadata.xml 337 BLAKE2B 41db6bb84baa494b640a676262c6e06401688586cede16b94fefad53d15f6472cdea04ec3124b4779c443551edde9cef4a8db76d94b038bef0705e46557bb395 SHA512 4f8abe9675319e4cfb56c4f43e951ecf55ce1a099ddc459b0d8404a7c88e467e78c78fc302b93213b87e7db4684aa36b6f21db22d0e83cfd29098df1669a1193
diff --git a/sys-apps/x86info/x86info-1.31.ebuild b/sys-apps/x86info/x86info-1.31.ebuild
new file mode 100644
index 000000000000..b695f1e7be37
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.31.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
+
+# Upstream stopped versioned releases entirely
+COMMIT="8ea5ed19fae1d209eba9257171a10f7afd474618"
+
+DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
+SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="sys-apps/pciutils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.30-pic.patch #270388
+ "${FILESDIR}"/${PN}-1.30-makefile.patch
+)
+
+pkg_setup() {
+ CONFIG_CHECK="~MTRR ~X86_CPUID"
+ linux-info_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # These flags taken from the 1.29 ebuild
+ append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \
+ -Wdeclaration-after-statement -Wredundant-decls
+ append-ldflags -Wl,-z,relro,-z,now
+
+ tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+ emake x86info
+}
+
+src_install() {
+ dobin x86info
+
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
+
+ einstalldocs
+ doman x86info.1
+}
+
+pkg_preinst() {
+ if [[ -a "${EROOT}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info ]]; then
+ elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
+ mv "${EROOT}"/etc/{modules,modprobe}.d/x86info
+ fi
+ if [[ -a "${EROOT}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info.conf ]]; then
+ elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
+ mv "${EROOT}"/etc/modprobe.d/x86info{,.conf}
+ fi
+}
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
index abfb41b44ad4..c9b005612a1d 100644
--- a/sys-apps/xdg-dbus-proxy/Manifest
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -1,3 +1,5 @@
DIST xdg-dbus-proxy-0.1.3.tar.xz 119896 BLAKE2B c789ad697c1cda84a4cde2c84b90370869bdaeb76736c2891270a58834296e3acbf83b311ba153a0d1e9f3266de0cc1eda63866e2808dcbb4aeac451f90da7f6 SHA512 bb730366efca9d0d199983063dd5cd7b8a8aac8d9efd8e3d6b6090166e5e09a74ef241a07388cfbb2f108e66b3a29114671a6d955324626aebefa1d6c2423632
+DIST xdg-dbus-proxy-0.1.4.tar.xz 122112 BLAKE2B c7d2898b703c51d6b53838996a0ae74e7a4e163b9611e28dfded54ab1a44c0473fa25daa13e94977c918544e0741bf0dd4747dfcae858468bc4abd288613cb8b SHA512 d50fa916d07f23e080ab53cf290b5d6db73cfd8262253a48b9f012ce6c182e201d0a67efaeb7f28a844d3ef146aa48936dfbe4279a59b909a6dc4419d5f15b04
EBUILD xdg-dbus-proxy-0.1.3.ebuild 621 BLAKE2B f972dcbee8a8acfead30601ddc92388f26cc7d4b5a20ed3e3690d1f38cc66daf1eff676279d6dac6a7bff11de95af2f211bab3895d1d49f93a9f3f15b9c9da72 SHA512 95cecbb2dca547bc3b7822ce00fbf9e03e295d1a55c383bc4605db481dfe6332c126c8b548aca8c428f0b9f8744a1ef3600d43967064eb6818010a9e42cf36fe
+EBUILD xdg-dbus-proxy-0.1.4.ebuild 708 BLAKE2B bca9efa9b55c47828cbb291650d5b47e9ff20b8e06412d24c5c36d61d44e331b8fc1ca34e05b40658c622f3531b9c93debe2ff29ba1e946449c5bccf01dcb686 SHA512 b69d192cc74ec0f4ab97c4903705d7f1a805ff0649923f1b707218d7d9479766091f8cfb20e4bdf2c5ccd90273dc19b01fc7d3c93b79c344f0a88f807cf29049
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.4.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.4.ebuild
new file mode 100644
index 000000000000..23744c014949
--- /dev/null
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Filtering proxy for D-Bus connections"
+HOMEPAGE="https://github.com/flatpak/xdg-dbus-proxy"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.40:2
+"
+DEPEND="${RDEPEND}
+ test? ( sys-apps/dbus )
+"
+BDEPEND="
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ -Dman=enabled
+ $(meson_use test tests)
+ )
+ meson_src_configure
+}
diff --git a/sys-apps/xdg-desktop-portal-gnome/Manifest b/sys-apps/xdg-desktop-portal-gnome/Manifest
index 5e37a7aa6299..532bb19608a9 100644
--- a/sys-apps/xdg-desktop-portal-gnome/Manifest
+++ b/sys-apps/xdg-desktop-portal-gnome/Manifest
@@ -1,3 +1,3 @@
DIST xdg-desktop-portal-gnome-42.1.tar.xz 117932 BLAKE2B c0c6dc7e4efbfda8996d63c191228ebf867e3fe11a0ae031b5bfd4298a33ab3b9cb9d9cecc36c1b41eeb33c54bd3bca17149e641c1131f0be7dcb2dbdf42eda8 SHA512 6843fd10e7e70f3d09c2a9b1397288f553fb44bcae30e7992790fddbc92d6c5cc966c27b7f294e2de1a139d3893c009f1480855d66c873a13861f3fe4abecee7
-EBUILD xdg-desktop-portal-gnome-42.1.ebuild 792 BLAKE2B e7ac062dc0ef3d32285f761ce0a2665914cc714549f9b80abed1bebc59fd6caba636000a8f6e399376d29a91bd7e4ca2eb680deb2d59904f9561ab40222dc1c7 SHA512 38cd1adc6b676a265f9c1dc9d255a0cfe6dc3e4402453e54d40d0e7cf7c4a50d285bc7fe81b8cc1ac0c65e2b50dbbc538ac503457c7a04391531297c1acab9b1
+EBUILD xdg-desktop-portal-gnome-42.1.ebuild 828 BLAKE2B dec0a3265b8df2219e7a5a94ee4760bf83664f0295c55e3c209d4388eee9f5c83e1cdf02d90b02ab4d48c5c47ba8a8ac603e66c9bbd8ac6dc70570d6b851a028 SHA512 bb2626878286461bf2827aeb8468dd881bb5acff33a491a72e1125c637617fc234268b1591878c8b4a88a30147411727214bc9294f958b057df939c709de346c
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.1.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.1.ebuild
index 06373774a4c6..405d9ea7195b 100644
--- a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.1.ebuild
+++ b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="wayland X"
BDEPEND="
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index cf118ede03c8..e9f709f63936 100644
--- a/sys-apps/xdg-desktop-portal-gtk/Manifest
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -1,5 +1,5 @@
DIST xdg-desktop-portal-gtk-1.14.0.tar.xz 381316 BLAKE2B 73a1e1d9944c4776ef2ebff33b26559767aad10784e9518690d31575a6216014bd0c518bde9a3b4e92d6a7edbf1aaa3510d669a025b7574c4df978f7c24b83ac SHA512 b0ba54e1ddbdfbd22b8b31bf4ece261dc0beba303e642f10afc72659dd5477438a30688c9d018e3d1ed2adbc053ddf4e3a2d70de8cac03d9519355772862fafc
DIST xdg-desktop-portal-gtk-1.8.0.tar.xz 370196 BLAKE2B d15a054e8fbc74718db7ad2d0f7b53c86b392e729fb4d5b8bdd87b16c0ebbf4feb11b29bc27da12990b351f520faa23bde694721819589513b6cfd1e4ea2f092 SHA512 832b3c4cb9ea738f2ab7641fbd7e14beaa5f6a1ae88f012cd44b12f4bc51588f61868b5982301e3dfd67965d6a69fd8669a9832b6ec7017168d611c87d76689b
-EBUILD xdg-desktop-portal-gtk-1.14.0.ebuild 1338 BLAKE2B d407d7c35c9a8b8c8f9f50a8a9327630adac6eb2626e32ad579f77a8f95d0b61300e6ec23776e60ee2c5841cdc8b8cccfb57533206045ce6ed6dae3e3a83e118 SHA512 93f29ce337740af77d3106e8b9746a8153289f96ea538b7080678e21325f80d82ad2a38212505a620b4656911e68c24fda7f2e97b2be335de3a01a8eb3032e8d
+EBUILD xdg-desktop-portal-gtk-1.14.0.ebuild 1345 BLAKE2B fa3f5458397dd25dcf4e0ee0e1ffc000d46355371d142c2a4e523e10cd107c301ec8d8c61e7209b5144b74a51e5132572f0be774340e9e3de15cfea1e7f834b0 SHA512 97073a0538e7fb9b54c12ff5a8422e66774cb7ca2db8e5ea3c3865c88dc49d3cabffe609cecfac4ea1a8790ce738543f296c9e99d1a275d8972b7870bc2e1bb7
EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 983 BLAKE2B a08a593be0d458d342b1a4b00abd38f6a20e09812b5219d75fe268c02908e9f2abd26727e220c8da1808341144e17ea000f9fb7136b45ba13418eb76effd24a4 SHA512 666f331b55f8c55475e559576c5321bdd998f413cc6e1ac9b4ba5e6fadbd993cc4f69878af5663ddd41331e98e87606e02899499ff22a1ee75500a3252ddcf33
MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
index 9e8da15268bc..011da45afd39 100644
--- a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
+++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="wayland X"
BDEPEND="
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 7b27f6dc8f55..36258e6a6472 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,3 @@
-DIST xdg-desktop-portal-1.12.1.tar.xz 484352 BLAKE2B afa14ab78f35cb1c0e66514f313f5dc297ceef88af1ca7b3028305faa8398bdae1b9e897289b18a93b1cda1a8290c0e51bf73e66c9dce231f57a58652fb9e120 SHA512 62df427e2d8d54acd9a34a02a77c26ae3911fbb4c5844eff4a253dc839775c929c6945401b93549ba200ba637d315146767e41f18a831d7627b35de880de0da1
DIST xdg-desktop-portal-1.14.4.tar.xz 510492 BLAKE2B 32f71cbc74d6bb3010e31172972dd7bfc4c982691ef55f66c29d5cf4aa2abeed816f890800691e898f739c2c7aa13db1e04f322c89ce30e9ac8a69b87435a448 SHA512 23fa4f9fdf39f22d6eaa4f6020db5f81d272b85fe6051467c5e28a752c65b18a9b540fafe5b27725fafa29dffefcd113d873928cd78e3658895cd24d96b82f73
-EBUILD xdg-desktop-portal-1.12.1.ebuild 987 BLAKE2B 94bb8e58df78606aca537d7d824fa28624d1363ecbb851da6cf26c1c9c9df001c374700ce1927d9c8e21c4f9ba57f8f0401b67384b402955884b22e34f498323 SHA512 8364ffd4409b01f374b3e192bfb7e955f00e9c8fe056439b34ec5cc2b2ca750fb69ddef02469d5b542f6bee51f4de8885802acabccd6f112184920c9dcb814e4
-EBUILD xdg-desktop-portal-1.14.4.ebuild 1088 BLAKE2B cafd8ca7c6cb352dbb59b3c263b147f1d2cc15a669b5fb509740d08ea90a2f2b879122cfb6b126752862c8b1e7f49da6168cd3d318d2884143c69985a4f306b6 SHA512 2555737a1f5b4eefa8c59bdfa7ba8cfe4dcd32da8ce418a9171b4b722c5d45964d79a168581cf47af28e867716de9506c3a4b0ff4d803cff7b5968653c497cd8
+EBUILD xdg-desktop-portal-1.14.4.ebuild 1092 BLAKE2B 3ba584de28227ecc1de0b5195e7cbae54443738c336f5bff6780db45036349cba5408fc791546e1c9fbed0139d69e3109bb0bf7435de2ea4a1a6f90c34b3e2c9 SHA512 4d2720260e53a084e9a6047d318a3039d3d8e1d9b2ed251136bf30e622ea686c8f361e2f84260b9b9f13fbf366f2c6906aa3995d5d81f1b3ba5f8c6c9b695171
MISC metadata.xml 361 BLAKE2B 29f050b1cf9380b76d4a779066ae0db5704da11ba9d97e1b2ed7c8d15003d534ecb83c4cd186e7f47e0e89b10e51299ee7bdd9acff9a02f9dc721647bca283da SHA512 872fc2c477635667b5593856f3fef346b96add82b754f9978c36c3c4e56a00516196faab14bac0adff40636c481ba436889b13549b2fc29412f3a21d1166fa25
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.12.1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.12.1.ebuild
deleted file mode 100644
index aed53a5dcb64..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.12.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="geolocation screencast"
-
-DEPEND="
- dev-libs/glib:2
- dev-libs/json-glib
- sys-fs/fuse:0
- geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
- screencast? ( >=media-video/pipewire-0.3:= )
-"
-RDEPEND="${DEPEND}
- sys-apps/dbus
-"
-BDEPEND="
- dev-util/gdbus-codegen
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- local myeconfargs=(
- --disable-docbook-docs # requires flatpak
- --disable-libportal # not packaged
- --with-systemduserunitdir="$(systemd_get_userunitdir)"
- $(use_enable geolocation geoclue)
- $(use_enable screencast pipewire)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
index 03615c15f70a..88a0b170d6e9 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
IUSE="geolocation screencast systemd"
DEPEND="
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 8a2a29edbd57..af84edcda779 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -1,5 +1,5 @@
AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbaed904d8387a4ac686f730e2f0ddf5ee90575bd0a7d73588a23b25ec4a6e9c73d48714f5770f5d SHA512 03bf05e544c0e52bc2bdeadf494dabd49ace985687b656baae869be99ef65a5f7129492c37e062bf6f196f70561d6239f2d3c4e8171fddc04729d3e266bfe2b2
AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604
DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d SHA512 1d9bbf5f60b299746adf3e57a669bf1a554b50066563b65cdb7584f00dcab2d3d331df705eefb56b51c52a16b5ed6b109cd832c27df87c7f262bb304e17ddc0e
-EBUILD xinetd-2.3.15.4.ebuild 1271 BLAKE2B 78641b77dc50e0a6ceb70d962acff14bd95ffc28f66df41fa5d2e9fa9d2f1aae38bd4bfc09969830139ed57fd5346c591c89ceec0b83187bbfd8723afd7051ed SHA512 dbe701dc2f8f64a54deebd0c2df836d69c330b9c36192597759d304f9a6129e626b2fe025c19c26d431205cf87ced12c1ee793883d11008edb84e288e7614574
+EBUILD xinetd-2.3.15.4.ebuild 1278 BLAKE2B be9347ce993ae3b9e703cb7a09acdc3a05fee3ceeeffe321f0515afd716dfaecf6a93282c621312be6f1ce4ec0979d3b02b9e0ae979f07038c3e8512f3ebffbe SHA512 1f9a6bd1607ed5a83d8290fb0d66c510c5f5c9617eefb1e26e160c3f0e310fd75d24c4dd8f515bf4b3eff49a20e1a21860d1535353daed5f99d990cdec376954
MISC metadata.xml 402 BLAKE2B 2a178e254b868a3f45c83204a1d5ab44c09364b8934274121ddaf64fea015045c64a4e4350a2eaa4efda47d8051f0fbfd652bcaee776ccf5bfe36b4f0cde9efd SHA512 0b776965e5830ca2b0301fb4436a4d7bebff58ad6fa50a1678ef107fc7c7cbf4269e121156b3a7873de51d16434d4162d8b63d799d260ed0dc94b9cdddcb0f27
diff --git a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
index 08ee1e302472..6897b1c75fd8 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="perl rpc selinux tcpd"
DEPEND="
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index a4fc1e9be199..5f89a58de69b 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,7 +1,5 @@
-DIST yarn-v1.22.10.tar.gz 1244965 BLAKE2B 6a9471a6905d89481665c099f00a985daacc8c7953327ee12b3d70f3f42dc304ceca01446281964d1af7a005ecae4a12ca55df637732e52821b4ecb9cdce6418 SHA512 d75dccd318f280abcbfd8d78b63546e11e7a8459c5dd737d0c8da2742cd5d7e3d7a5e668ce680234b0c09e71d128787777061d24c6e3ae4b6626086461e3ce25
DIST yarn-v1.22.17.tar.gz 1246198 BLAKE2B ae0b86cdb248a0f81d1a4a23d15ef9aab185fcda7ef7f8873959c3e54dfc305219afb2416264911098c4e3a6a65a33d248ff97c8e0ca043b118de64e003c3d9b SHA512 1f4a76e35057687d1437d21e1fffd14fcdad9793df36b695a52a44a16f844fb966a29342eb5799f80f880ef53c14ce86a39bf1d7ad929dc0cbf09d598d106b89
-DIST yarn-v1.22.4.tar.gz 1244785 BLAKE2B 1f1eeb829096eaf19a8fdb48b46fa736769d9d3c247759e434413665186e4cccb750024afa836dae8a0130fc472df3c01805d263d81346e1dd7509e1b106e88a SHA512 a1833b862fe52169bd6c2a033045a07df5bc6a23595c259e675fed1b2d035ab37abe6ce309720abb6636d68f03615054b6292dc0a70da31c8697fda228b50d18
-EBUILD yarn-1.22.10.ebuild 1069 BLAKE2B 362375e59c35e3a4a8c8d8990bbc9662ac2a0da9ce389007b824c8cd2c6369dce2e6a4ddd3bb85934a689829b9dcbdb74fd35bff11d00f26eb88546af5e86eac SHA512 7886b477b9e87d0c7cc67d219693564d17ec018c391f99ce874ffe0726bb9c5e9137755af58bac5151238e8099096ca246c644c29c08adf2d681a6df28c08f2f
+DIST yarn-v1.22.19.tar.gz 1244259 BLAKE2B f103d148bafa76bddcdf9e26356fbebba87f7c7c707f823a54404302571e1d09e25569406fc721d74f53cfdac8706dec6bd40da39b7d44000381b1f36d0d8de0 SHA512 ff4579ab459bb25aa7c0ff75b62acebe576f6084b36aa842971cf250a5d8c6cd3bc9420b22ce63c7f93a0857bc6ef29291db39c3e7a23aab5adfd5a4dd6c5d71
EBUILD yarn-1.22.17.ebuild 1069 BLAKE2B 362375e59c35e3a4a8c8d8990bbc9662ac2a0da9ce389007b824c8cd2c6369dce2e6a4ddd3bb85934a689829b9dcbdb74fd35bff11d00f26eb88546af5e86eac SHA512 7886b477b9e87d0c7cc67d219693564d17ec018c391f99ce874ffe0726bb9c5e9137755af58bac5151238e8099096ca246c644c29c08adf2d681a6df28c08f2f
-EBUILD yarn-1.22.4.ebuild 1057 BLAKE2B 40ca4f1e345f8914a672817c21b0a5974ac314b9bc10f54937dd7d607f492725e7e41632d4b75a0ab62b43607a2aa90b6f2ea83b4a1844ae098f0f12cefc7b45 SHA512 a50ec0902a9a509918b979a634350e048d9ba5f768cceab11b1b2af08076aaa85cd2e22174934f010330eb9ce0c08402ac77cfb7a58d6e33d7162e27784c261b
+EBUILD yarn-1.22.19.ebuild 1069 BLAKE2B d65e6b947685760cc46e50d970ff5842f7ab68dacb02d81199609f884456476cee86f6fe5b377b765d55ade576283bb72013864ac9f19226b651a725185c31a9 SHA512 3ca2aedab551049876cb51d9bc2b2ab593a1a9521dd1b9ede2a3ad475f650afecde7c16c64872760c6e02b7434437e3cea56930175f71fd67e820e03583d293c
MISC metadata.xml 685 BLAKE2B 9957b4bfeb2729a4cb8bb0f717a431fb0713e5b198565245037369c6f7892ef3a51aee4b5fc650b91728baa49ef5d05b518a3f0b0f52897de861fc57c275d386 SHA512 ba7ecb814fb0888255afb243394f55cb7c4489fa5c8843c1ea6f9e0c24f21c30247a39150f1cfc51aed86010201f2f201d9fd9c09e7ce93b6d498a4a3f3c16d1
diff --git a/sys-apps/yarn/yarn-1.22.10.ebuild b/sys-apps/yarn/yarn-1.22.10.ebuild
deleted file mode 100644
index bb8df23d1c0e..000000000000
--- a/sys-apps/yarn/yarn-1.22.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
- net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
- local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
- insinto "${install_dir}"
- doins -r .
- dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
- dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg" "/usr/bin/yarnpkg"
-
- while read -r -d '' path; do
- read -r shebang < "${ED}${path}" || die
- [[ "${shebang}" == \#\!* ]] || continue
- fperms +x "${path}"
- done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-apps/yarn/yarn-1.22.19.ebuild b/sys-apps/yarn/yarn-1.22.19.ebuild
new file mode 100644
index 000000000000..a1a20e84d28e
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.22.19.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com"
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+ net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
+}
+
+src_install() {
+ local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
+ insinto "${install_dir}"
+ doins -r .
+ dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+ dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg" "/usr/bin/yarnpkg"
+
+ while read -r -d '' path; do
+ read -r shebang < "${ED}${path}" || die
+ [[ "${shebang}" == \#\!* ]] || continue
+ fperms +x "${path}"
+ done < <(find "${ED}" -type f -printf '/%P\0' || die)
+}
diff --git a/sys-apps/yarn/yarn-1.22.4.ebuild b/sys-apps/yarn/yarn-1.22.4.ebuild
deleted file mode 100644
index 0374a801dbc1..000000000000
--- a/sys-apps/yarn/yarn-1.22.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
- net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
- local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
- insinto "${install_dir}"
- doins -r .
- dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
- dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg" "/usr/bin/yarnpkg"
-
- while read -r -d '' path; do
- read -r shebang < "${ED}${path}" || die
- [[ "${shebang}" == \#\!* ]] || continue
- fperms +x "${path}"
- done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-apps/zram-generator/Manifest b/sys-apps/zram-generator/Manifest
index 5eec7b7325be..626437cb902d 100644
--- a/sys-apps/zram-generator/Manifest
+++ b/sys-apps/zram-generator/Manifest
@@ -37,5 +37,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
DIST zram-generator-1.1.2.tar.gz 26483 BLAKE2B 20a3519c21f543626efb4bf507f0f59dc6dd2ec208eccbcbdbb07a96e7f03ca5539cda17e4a96187267f71f3d771921f7a83fbdab26051c312640c1118a3b186 SHA512 334864dade2c5e0ca5519c0d1d3448e115440538dd04d29857f71cdb6383c65afebd022903f7fa768824becd90072a6a15ed9e1709bbe2676fb71d9f6b9b5f42
-EBUILD zram-generator-1.1.2.ebuild 2080 BLAKE2B fd4654039d9d64a582a6e59e55a469bf047927a65065980ff28202f76be8e6432f4253cb7ecbeb9465dcda02b87f292438d30c3ffe5939c00c658114b705c6f0 SHA512 12f87ccb84935b6a0a5b24599c6a4a7b01632fcd063cc3015ef5843614fd941853325a9d5cbb8a4a57ef0fdc669310bec3ecc08394366fa38acf04dc25017bb9
+EBUILD zram-generator-1.1.2.ebuild 2087 BLAKE2B 16cdc414273a35645f1ccaa877a413b2bda66332fcc163ac839ea1e916cbdcafe4a70e94e27e60ba859c7151bcb4eda8536525fae52a50433c0a152b0fe869a0 SHA512 37489b95e989ff8197ec4f3d45180d9b3d045f474014ce9af2d25822e8469f3934a408dadc1ac1c602a30347ad6198aa16450bbc77189fd9dc75627814c10643
MISC metadata.xml 215 BLAKE2B d2ce9b6179c543801bfe26069c65df723eaac4c8bab2d6ea1bb78f41a6ea032fb4491adee16a11e38342158c312ea625113cb362f5da840efc2b432ba3117fe6 SHA512 375665b8997b26eaec5c9237b5ccdf8628af5fd54548e85ba80c12e34e6afe8304fbcf7dfb30f69c6081e9d45e372ae2603efc778421586a13ddfcbec695cf87
diff --git a/sys-apps/zram-generator/zram-generator-1.1.2.ebuild b/sys-apps/zram-generator/zram-generator-1.1.2.ebuild
index dd3664998c2b..51419daae462 100644
--- a/sys-apps/zram-generator/zram-generator-1.1.2.ebuild
+++ b/sys-apps/zram-generator/zram-generator-1.1.2.ebuild
@@ -53,7 +53,7 @@ SRC_URI="https://github.com/systemd/zram-generator/archive/refs/tags/v${PV}.tar.
LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
IUSE="+man"
BDEPEND="virtual/rust
--
cgit v1.2.3