summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/accountsservice/accountsservice-22.08.8.ebuild2
-rw-r--r--sys-apps/accountsservice/metadata.xml19
-rw-r--r--sys-apps/ack/Manifest2
-rw-r--r--sys-apps/ack/ack-3.6.0.ebuild (renamed from sys-apps/ack/ack-3.4.0.ebuild)6
-rw-r--r--sys-apps/ack/metadata.xml1
-rw-r--r--sys-apps/acl/acl-2.3.1-r1.ebuild2
-rw-r--r--sys-apps/acl/metadata.xml1
-rw-r--r--sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild2
-rw-r--r--sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild2
-rw-r--r--sys-apps/apparmor/apparmor-3.0.3.ebuild6
-rw-r--r--sys-apps/apparmor/apparmor-3.0.4.ebuild6
-rw-r--r--sys-apps/apparmor/metadata.xml1
-rw-r--r--sys-apps/attr/attr-2.5.1-r1.ebuild109
-rw-r--r--sys-apps/attr/attr-2.5.1-r2.ebuild2
-rw-r--r--sys-apps/attr/attr-2.5.1.ebuild101
-rw-r--r--sys-apps/attr/attr-9999.ebuild11
-rw-r--r--sys-apps/attr/files/attr-2.5.1-fix-symver.patch173
-rw-r--r--sys-apps/attr/metadata.xml1
-rw-r--r--sys-apps/baobab/Manifest1
-rw-r--r--sys-apps/baobab/baobab-43.0.ebuild44
-rw-r--r--sys-apps/baobab/metadata.xml11
-rw-r--r--sys-apps/baselayout-prefix/Manifest8
-rw-r--r--sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild344
-rw-r--r--sys-apps/baselayout-prefix/metadata.xml10
-rw-r--r--sys-apps/baselayout/Manifest3
-rw-r--r--sys-apps/baselayout/baselayout-2.7-r3.ebuild347
-rw-r--r--sys-apps/baselayout/baselayout-2.8.ebuild338
-rw-r--r--sys-apps/baselayout/baselayout-2.9.ebuild (renamed from sys-apps/baselayout/baselayout-2.8-r2.ebuild)3
-rw-r--r--sys-apps/baselayout/baselayout-9999.ebuild1
-rw-r--r--sys-apps/bolt/Manifest1
-rw-r--r--sys-apps/bolt/bolt-0.9.2.ebuild2
-rw-r--r--sys-apps/bolt/bolt-0.9.3.ebuild70
-rw-r--r--sys-apps/bubblewrap/Manifest1
-rw-r--r--sys-apps/bubblewrap/bubblewrap-0.7.0.ebuild (renamed from sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild)4
-rw-r--r--sys-apps/busybox/busybox-1.34.1-r1.ebuild7
-rw-r--r--sys-apps/busybox/busybox-1.34.1.ebuild7
-rw-r--r--sys-apps/busybox/busybox-1.35.0-r1.ebuild7
-rw-r--r--sys-apps/busybox/busybox-1.35.0.ebuild7
-rw-r--r--sys-apps/busybox/busybox-9999.ebuild7
-rw-r--r--sys-apps/coreutils/Manifest2
-rw-r--r--sys-apps/coreutils/coreutils-8.32-r1.ebuild4
-rw-r--r--sys-apps/coreutils/coreutils-9.0-r2.ebuild239
-rw-r--r--sys-apps/coreutils/coreutils-9.1-r1.ebuild4
-rw-r--r--sys-apps/coreutils/coreutils-9.1-r2.ebuild (renamed from sys-apps/coreutils/coreutils-9.1.ebuild)11
-rw-r--r--sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch35
-rw-r--r--sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch130
-rw-r--r--sys-apps/coreutils/metadata.xml1
-rw-r--r--sys-apps/cpint/metadata.xml2
-rw-r--r--sys-apps/cpu-x/Manifest2
-rw-r--r--sys-apps/cpu-x/cpu-x-4.5.1.ebuild78
-rw-r--r--sys-apps/cpu-x/cpu-x-4.5.2.ebuild78
-rw-r--r--sys-apps/cpu-x/metadata.xml47
-rw-r--r--sys-apps/cpuid/Manifest2
-rw-r--r--sys-apps/cpuid/cpuid-20221003.ebuild (renamed from sys-apps/cpuid/cpuid-20220620.ebuild)0
-rw-r--r--sys-apps/cracklib-words/Manifest1
-rw-r--r--sys-apps/cracklib-words/cracklib-words-2.9.8.ebuild27
-rw-r--r--sys-apps/dbus-broker/Manifest9
-rw-r--r--sys-apps/dbus-broker/dbus-broker-29.ebuild75
-rw-r--r--sys-apps/dbus-broker/dbus-broker-32.ebuild65
-rw-r--r--sys-apps/dbus-broker/dbus-broker-9999.ebuild14
-rw-r--r--sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch26
-rw-r--r--sys-apps/dbus/Manifest4
-rw-r--r--sys-apps/dbus/dbus-1.12.20-r5.ebuild284
-rw-r--r--sys-apps/dbus/dbus-1.12.22-r2.ebuild290
-rw-r--r--sys-apps/dbus/dbus-1.14.0-r2.ebuild293
-rw-r--r--sys-apps/dbus/dbus-1.15.2.ebuild (renamed from sys-apps/dbus/dbus-1.14.0-r4.ebuild)30
-rw-r--r--sys-apps/dbus/files/80-dbus13
-rw-r--r--sys-apps/dbus/files/dbus-1.12.22-check-fd.patch33
-rw-r--r--sys-apps/dbus/files/dbus-1.14.0-oom_score_adj.patch115
-rw-r--r--sys-apps/dbus/files/dbus-1.14.0-x-autoconf-fixes.patch147
-rw-r--r--sys-apps/dbus/files/dbus-1.15.0-daemon-optional.patch (renamed from sys-apps/dbus/files/dbus-daemon-optional.patch)38
-rw-r--r--sys-apps/dbus/files/dbus-1.15.0-enable-elogind.patch (renamed from sys-apps/dbus/files/dbus-enable-elogind.patch)60
-rw-r--r--sys-apps/dcfldd/Manifest1
-rw-r--r--sys-apps/dcfldd/dcfldd-1.8.ebuild25
-rw-r--r--sys-apps/dchroot/dchroot-0.12.1.ebuild25
-rw-r--r--sys-apps/dchroot/files/dchroot-0.12.1-make.patch16
-rw-r--r--sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch13
-rw-r--r--sys-apps/diffutils/metadata.xml12
-rw-r--r--sys-apps/dmidecode/Manifest1
-rw-r--r--sys-apps/dmidecode/dmidecode-3.3.ebuild43
-rw-r--r--sys-apps/dmidecode/dmidecode-3.4.ebuild2
-rw-r--r--sys-apps/dtc/Manifest1
-rw-r--r--sys-apps/dtc/dtc-1.5.0-r2.ebuild87
-rw-r--r--sys-apps/dtc/dtc-1.5.0.ebuild59
-rw-r--r--sys-apps/dtc/dtc-1.6.0.ebuild3
-rw-r--r--sys-apps/dtc/dtc-9999.ebuild5
-rw-r--r--sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch48
-rw-r--r--sys-apps/dtc/files/dtc-1.5.0-fdt_check_full-visibility.patch12
-rw-r--r--sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch50
-rw-r--r--sys-apps/earlyoom/Manifest2
-rw-r--r--sys-apps/earlyoom/earlyoom-1.7.ebuild61
-rw-r--r--sys-apps/earlyoom/earlyoom-9999.ebuild50
-rw-r--r--sys-apps/earlyoom/metadata.xml3
-rw-r--r--sys-apps/ed/metadata.xml11
-rw-r--r--sys-apps/etckeeper/Manifest3
-rw-r--r--sys-apps/etckeeper/etckeeper-1.18.17.ebuild99
-rw-r--r--sys-apps/etckeeper/etckeeper-1.18.18.ebuild (renamed from sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild)9
-rw-r--r--sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch85
-rw-r--r--sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch (renamed from sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch)44
-rw-r--r--sys-apps/ethtool/Manifest1
-rw-r--r--sys-apps/ethtool/ethtool-5.19.ebuild21
-rw-r--r--sys-apps/fakeroot/fakeroot-1.29.ebuild2
-rw-r--r--sys-apps/fd/Manifest114
-rw-r--r--sys-apps/fd/fd-8.2.1.ebuild106
-rw-r--r--sys-apps/fd/fd-8.4.0.ebuild (renamed from sys-apps/fd/fd-8.3.1.ebuild)88
-rw-r--r--sys-apps/file/Manifest4
-rw-r--r--sys-apps/file/file-5.43-r1.ebuild (renamed from sys-apps/file/file-5.42.ebuild)3
-rw-r--r--sys-apps/file/file-9999.ebuild20
-rw-r--r--sys-apps/file/files/file-5.39-portage-sandbox.patch9
-rw-r--r--sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch9
-rw-r--r--sys-apps/file/files/file-5.43-configure-clang16.patch20
-rw-r--r--sys-apps/file/metadata.xml3
-rw-r--r--sys-apps/findutils/findutils-4.9.0-r1.ebuild (renamed from sys-apps/findutils/findutils-4.9.0.ebuild)21
-rw-r--r--sys-apps/findutils/findutils-4.9.0-r2.ebuild97
-rw-r--r--sys-apps/firejail/metadata.xml2
-rw-r--r--sys-apps/flashrom/flashrom-1.2-r4.ebuild (renamed from sys-apps/flashrom/flashrom-1.2-r3.ebuild)2
-rw-r--r--sys-apps/flashrom/metadata.xml3
-rw-r--r--sys-apps/flatpak/Manifest5
-rw-r--r--sys-apps/flatpak/flatpak-1.12.3-r1.ebuild (renamed from sys-apps/flatpak/flatpak-1.12.3.ebuild)5
-rw-r--r--sys-apps/flatpak/flatpak-1.12.7.ebuild101
-rw-r--r--sys-apps/flatpak/flatpak-1.14.0-r1.ebuild (renamed from sys-apps/flatpak/flatpak-1.13.2.ebuild)16
-rw-r--r--sys-apps/flatpak/flatpak-1.14.1.ebuild (renamed from sys-apps/flatpak/flatpak-1.13.3.ebuild)18
-rw-r--r--sys-apps/fwupd-efi/Manifest1
-rw-r--r--sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild51
-rw-r--r--sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild2
-rw-r--r--sys-apps/fwupd/Manifest7
-rw-r--r--sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch16
-rw-r--r--sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch11
-rw-r--r--sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch215
-rw-r--r--sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch357
-rw-r--r--sys-apps/fwupd/fwupd-1.7.5.ebuild174
-rw-r--r--sys-apps/fwupd/fwupd-1.7.7-r2.ebuild174
-rw-r--r--sys-apps/fwupd/fwupd-1.8.0-r1.ebuild179
-rw-r--r--sys-apps/fwupd/fwupd-1.8.5.ebuild (renamed from sys-apps/fwupd/fwupd-1.8.3.ebuild)31
-rw-r--r--sys-apps/fwupd/fwupd-1.8.7.ebuild (renamed from sys-apps/fwupd/fwupd-1.8.1.ebuild)53
-rw-r--r--sys-apps/fwupd/metadata.xml1
-rw-r--r--sys-apps/gawk/Manifest2
-rw-r--r--sys-apps/gawk/gawk-5.1.1-r2.ebuild2
-rw-r--r--sys-apps/gawk/gawk-5.2.1.ebuild131
-rw-r--r--sys-apps/gawk/metadata.xml23
-rw-r--r--sys-apps/gentoo-functions/Manifest3
-rw-r--r--sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild27
-rw-r--r--sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild27
-rw-r--r--sys-apps/gentoo-functions/gentoo-functions-0.16.ebuild27
-rw-r--r--sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild2
-rw-r--r--sys-apps/gnome-disk-utility/Manifest1
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild2
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-43.0.ebuild63
-rw-r--r--sys-apps/gnome-disk-utility/metadata.xml28
-rw-r--r--sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch22
-rw-r--r--sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild (renamed from sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild)5
-rw-r--r--sys-apps/gradm/Manifest4
-rw-r--r--sys-apps/gradm/gradm-3.1.201603152148.ebuild51
-rw-r--r--sys-apps/gradm/gradm-3.1.201607172312.ebuild51
-rw-r--r--sys-apps/gradm/gradm-3.1.201608131257.ebuild51
-rw-r--r--sys-apps/gradm/gradm-3.1.201708012022.ebuild51
-rw-r--r--sys-apps/gradm/gradm-3.1.201903191516.ebuild3
-rw-r--r--sys-apps/grep/Manifest6
-rw-r--r--sys-apps/grep/grep-3.7_p20220425.ebuild72
-rw-r--r--sys-apps/grep/grep-3.8.ebuild (renamed from sys-apps/grep/grep-3.7_p20220702.ebuild)0
-rw-r--r--sys-apps/groff/metadata.xml18
-rw-r--r--sys-apps/gsmartcontrol/Manifest1
-rw-r--r--sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild48
-rw-r--r--sys-apps/gsmartcontrol/gsmartcontrol-1.1.4.ebuild2
-rw-r--r--sys-apps/hdparm/Manifest2
-rw-r--r--sys-apps/hdparm/hdparm-9.64.ebuild2
-rw-r--r--sys-apps/hdparm/hdparm-9.65.ebuild (renamed from sys-apps/hdparm/hdparm-9.63.ebuild)7
-rw-r--r--sys-apps/help2man/help2man-1.48.5.ebuild3
-rw-r--r--sys-apps/help2man/help2man-1.49.2.ebuild3
-rw-r--r--sys-apps/hw-probe/Manifest2
-rw-r--r--sys-apps/hw-probe/hw-probe-1.6.5.ebuild (renamed from sys-apps/hw-probe/hw-probe-1.6.4.ebuild)0
-rw-r--r--sys-apps/hwdata/Manifest4
-rw-r--r--sys-apps/hwdata/hwdata-0.361.ebuild2
-rw-r--r--sys-apps/hwdata/hwdata-0.363.ebuild (renamed from sys-apps/hwdata/hwdata-0.360.ebuild)9
-rw-r--r--sys-apps/hwdata/hwdata-0.364.ebuild (renamed from sys-apps/hwdata/hwdata-0.358.ebuild)9
-rw-r--r--sys-apps/hwinfo/hwinfo-22.1-r1.ebuild61
-rw-r--r--sys-apps/hwinfo/hwinfo-22.1.ebuild2
-rw-r--r--sys-apps/hwloc/Manifest2
-rw-r--r--sys-apps/hwloc/hwloc-1.11.13-r1.ebuild (renamed from sys-apps/hwloc/hwloc-1.11.13.ebuild)2
-rw-r--r--sys-apps/hwloc/hwloc-2.5.0.ebuild98
-rw-r--r--sys-apps/hwloc/hwloc-2.6.0-r1.ebuild (renamed from sys-apps/hwloc/hwloc-2.6.0.ebuild)2
-rw-r--r--sys-apps/hwloc/hwloc-2.7.1-r1.ebuild110
-rw-r--r--sys-apps/hwloc/hwloc-2.8.0-r1.ebuild (renamed from sys-apps/hwloc/hwloc-2.8.0.ebuild)4
-rw-r--r--sys-apps/hwloc/metadata.xml1
-rw-r--r--sys-apps/i2c-tools/Manifest1
-rw-r--r--sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild81
-rw-r--r--sys-apps/i2c-tools/i2c-tools-4.3.ebuild2
-rw-r--r--sys-apps/ibm-powerpc-utils/Manifest1
-rw-r--r--sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.10.ebuild (renamed from sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild)18
-rw-r--r--sys-apps/ibm-powerpc-utils/metadata.xml2
-rw-r--r--sys-apps/ifd-gempc/Manifest1
-rw-r--r--sys-apps/ifd-gempc/ifd-gempc-1.0.8.ebuild59
-rw-r--r--sys-apps/inxi/Manifest4
-rw-r--r--sys-apps/inxi/inxi-3.1.06.1.ebuild33
-rw-r--r--sys-apps/inxi/inxi-3.3.08.1.ebuild32
-rw-r--r--sys-apps/inxi/inxi-3.3.12.1.ebuild32
-rw-r--r--sys-apps/inxi/inxi-3.3.13.1.ebuild32
-rw-r--r--sys-apps/inxi/inxi-3.3.20.1.ebuild2
-rw-r--r--sys-apps/ipmi-fan-control/Manifest98
-rw-r--r--sys-apps/ipmi-fan-control/ipmi-fan-control-0.4.0.ebuild161
-rw-r--r--sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild64
-rw-r--r--sys-apps/ipmi-fan-control/metadata.xml12
-rw-r--r--sys-apps/ipmicfg/Manifest2
-rw-r--r--sys-apps/ipmicfg/ipmicfg-1.34.0.220906.ebuild (renamed from sys-apps/ipmicfg/ipmicfg-1.33.2.220126.ebuild)2
-rw-r--r--sys-apps/ipmitool/Manifest2
-rw-r--r--sys-apps/ipmitool/files/exchange-bmc-os-info.initd23
-rw-r--r--sys-apps/ipmitool/files/ipmievd.confd (renamed from sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd)11
-rw-r--r--sys-apps/ipmitool/files/ipmievd.initd28
-rw-r--r--sys-apps/ipmitool/files/ipmitool-1.8.19-CVE-2011-4339.patch20
-rw-r--r--sys-apps/ipmitool/files/ipmitool-1.8.19-fix-buffer-overflow.patch21
-rw-r--r--sys-apps/ipmitool/files/ipmitool-1.8.19-manpage-longlines.patch55
-rw-r--r--sys-apps/ipmitool/files/ipmitool-1.8.19-missing-func-decl.patch32
-rw-r--r--sys-apps/ipmitool/files/ipmitool-1.8.19-nvidia-iana.patch23
-rw-r--r--sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd24
-rw-r--r--sys-apps/ipmitool/files/log_bmc.initd25
-rw-r--r--sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild145
-rw-r--r--sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild201
-rw-r--r--sys-apps/ipmitool/ipmitool-1.8.19.ebuild147
-rw-r--r--sys-apps/ipmitool/metadata.xml1
-rw-r--r--sys-apps/ipmiutil/Manifest4
-rw-r--r--sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch20
-rw-r--r--sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch180
-rw-r--r--sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch184
-rw-r--r--sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild55
-rw-r--r--sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild60
-rw-r--r--sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild66
-rw-r--r--sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild72
-rw-r--r--sys-apps/iproute2/Manifest1
-rw-r--r--sys-apps/iproute2/iproute2-5.19.0-r3.ebuild (renamed from sys-apps/iproute2/iproute2-5.19.0-r2.ebuild)4
-rw-r--r--sys-apps/iproute2/iproute2-6.0.0.ebuild215
-rw-r--r--sys-apps/iproute2/iproute2-9999.ebuild4
-rw-r--r--sys-apps/iproute2/metadata.xml33
-rw-r--r--sys-apps/irqbalance/Manifest2
-rw-r--r--sys-apps/irqbalance/irqbalance-1.9.0.ebuild2
-rw-r--r--sys-apps/irqbalance/irqbalance-1.9.2.ebuild (renamed from sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild)14
-rw-r--r--sys-apps/iucode_tool/metadata.xml12
-rw-r--r--sys-apps/kbd/Manifest1
-rw-r--r--sys-apps/kbd/kbd-2.4.0.ebuild84
-rw-r--r--sys-apps/kbd/kbd-2.5.1.ebuild2
-rw-r--r--sys-apps/kexec-tools/Manifest1
-rw-r--r--sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild124
-rw-r--r--sys-apps/kexec-tools/metadata.xml3
-rw-r--r--sys-apps/keyutils/keyutils-1.6.3.ebuild2
-rw-r--r--sys-apps/keyutils/metadata.xml3
-rw-r--r--sys-apps/kmod/Manifest1
-rw-r--r--sys-apps/kmod/kmod-29-r2.ebuild205
-rw-r--r--sys-apps/kmod/kmod-29.ebuild203
-rw-r--r--sys-apps/kmod/kmod-30.ebuild2
-rw-r--r--sys-apps/kmscon/Manifest2
-rw-r--r--sys-apps/kmscon/kmscon-8_p20180906-r2.ebuild145
-rw-r--r--sys-apps/kmscon/kmscon-8_p20220214-r1.ebuild150
-rw-r--r--sys-apps/kmscon/kmscon-8_p20220214.ebuild145
-rw-r--r--sys-apps/kmscon/kmscon-9.0.0.ebuild4
-rw-r--r--sys-apps/kmscon/metadata.xml1
-rw-r--r--sys-apps/lcdutils/metadata.xml2
-rw-r--r--sys-apps/less/Manifest3
-rw-r--r--sys-apps/less/files/less-608-procfs.patch45
-rw-r--r--sys-apps/less/less-608-r1.ebuild (renamed from sys-apps/less/less-590.ebuild)14
-rw-r--r--sys-apps/less/less-612.ebuild58
-rw-r--r--sys-apps/lm-sensors/files/lm-sensors-3.6.0-w83627ehf-nct6775.patch46
-rw-r--r--sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild (renamed from sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild)6
-rw-r--r--sys-apps/lm-sensors/metadata.xml2
-rw-r--r--sys-apps/logwatch/Manifest1
-rw-r--r--sys-apps/logwatch/logwatch-7.6.ebuild93
-rw-r--r--sys-apps/logwatch/logwatch-7.7.ebuild2
-rw-r--r--sys-apps/lsadb/metadata.xml2
-rw-r--r--sys-apps/lsb-release/lsb-release-3.2.ebuild2
-rw-r--r--sys-apps/lsd/Manifest185
-rw-r--r--sys-apps/lsd/lsd-0.20.1.ebuild142
-rw-r--r--sys-apps/lsd/lsd-0.23.1.ebuild (renamed from sys-apps/lsd/lsd-0.21.0.ebuild)141
-rw-r--r--sys-apps/lssbus/metadata.xml2
-rw-r--r--sys-apps/lsvpd/metadata.xml2
-rw-r--r--sys-apps/man-db/Manifest1
-rw-r--r--sys-apps/man-db/man-db-2.11.1.ebuild203
-rw-r--r--sys-apps/man-db/man-db-9999.ebuild10
-rw-r--r--sys-apps/man-db/metadata.xml2
-rw-r--r--sys-apps/man-pages-posix/Manifest1
-rw-r--r--sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild (renamed from sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild)2
-rw-r--r--sys-apps/man-pages-posix/man-pages-posix-2017a-r1.ebuild28
-rw-r--r--sys-apps/man-pages/Manifest1
-rw-r--r--sys-apps/man-pages/man-pages-5.12-r3.ebuild (renamed from sys-apps/man-pages/man-pages-5.12-r2.ebuild)15
-rw-r--r--sys-apps/man-pages/man-pages-5.13-r2.ebuild (renamed from sys-apps/man-pages/man-pages-5.13.ebuild)13
-rw-r--r--sys-apps/man-pages/man-pages-6.01.ebuild113
-rw-r--r--sys-apps/man-pages/man-pages-9999.ebuild113
-rw-r--r--sys-apps/man2html/files/man-1.6g-clang-15-configure.patch83
-rw-r--r--sys-apps/man2html/man2html-1.6g-r2.ebuild52
-rw-r--r--sys-apps/mawk/mawk-1.3.4_p20200120.ebuild2
-rw-r--r--sys-apps/memtest86+/Manifest3
-rw-r--r--sys-apps/memtest86+/memtest86+-6.00.ebuild (renamed from sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild)0
-rw-r--r--sys-apps/memtest86+/memtest86+-6.00_beta3.ebuild78
-rw-r--r--sys-apps/memtest86+/metadata.xml3
-rw-r--r--sys-apps/memtest86-bin/Manifest2
-rw-r--r--sys-apps/memtest86-bin/memtest86-bin-10.0.ebuild (renamed from sys-apps/memtest86-bin/memtest86-bin-9.4.ebuild)0
-rw-r--r--sys-apps/merge-usr/Manifest1
-rw-r--r--sys-apps/merge-usr/merge-usr-5.ebuild23
-rw-r--r--sys-apps/merge-usr/metadata.xml11
-rw-r--r--sys-apps/minised/Manifest1
-rw-r--r--sys-apps/minised/minised-1.15.ebuild19
-rw-r--r--sys-apps/miscfiles/metadata.xml11
-rw-r--r--sys-apps/miscfiles/miscfiles-1.5-r4.ebuild2
-rw-r--r--sys-apps/most/metadata.xml3
-rw-r--r--sys-apps/mount-idmapped/Manifest1
-rw-r--r--sys-apps/mount-idmapped/metadata.xml11
-rw-r--r--sys-apps/mount-idmapped/mount-idmapped-0.0_pre20220825.ebuild37
-rw-r--r--sys-apps/mouseemu/metadata.xml2
-rw-r--r--sys-apps/net-tools/metadata.xml1
-rw-r--r--sys-apps/netkit-base/netkit-base-0.17-r9.ebuild6
-rw-r--r--sys-apps/netplug/netplug-1.2.9.2-r2.ebuild70
-rw-r--r--sys-apps/netplug/netplug-1.2.9.2-r3.ebuild2
-rw-r--r--sys-apps/noexec/noexec-1.1.0-r1.ebuild14
-rw-r--r--sys-apps/noexec/noexec-1.1.0-r2.ebuild32
-rw-r--r--sys-apps/nvme-cli/Manifest2
-rw-r--r--sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch13
-rw-r--r--sys-apps/nvme-cli/metadata.xml23
-rw-r--r--sys-apps/nvme-cli/nvme-cli-1.16.ebuild54
-rw-r--r--sys-apps/nvme-cli/nvme-cli-2.1.1.ebuild34
-rw-r--r--sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild (renamed from sys-apps/nvme-cli/nvme-cli-2.0.ebuild)36
-rw-r--r--sys-apps/opal-utils/Manifest1
-rw-r--r--sys-apps/opal-utils/metadata.xml2
-rw-r--r--sys-apps/opal-utils/opal-utils-6.8.ebuild93
-rw-r--r--sys-apps/opal-utils/opal-utils-7.0.ebuild2
-rw-r--r--sys-apps/openrazer/Manifest2
-rw-r--r--sys-apps/openrazer/metadata.xml17
-rw-r--r--sys-apps/openrazer/openrazer-3.4.0-r3.ebuild160
-rw-r--r--sys-apps/openrazer/openrazer-3.5.0.ebuild160
-rw-r--r--sys-apps/openrc/Manifest2
-rw-r--r--sys-apps/openrc/openrc-0.44.10.ebuild169
-rw-r--r--sys-apps/openrc/openrc-0.45.2-r1.ebuild (renamed from sys-apps/openrc/openrc-0.45.1.ebuild)9
-rw-r--r--sys-apps/openrc/openrc-0.45.2.ebuild164
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild7
-rw-r--r--sys-apps/opentmpfiles/Manifest3
-rw-r--r--sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild44
-rw-r--r--sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild47
-rw-r--r--sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild53
-rw-r--r--sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild47
-rw-r--r--sys-apps/opentmpfiles/opentmpfiles-0.2-r1.ebuild (renamed from sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild)29
-rw-r--r--sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch16
-rw-r--r--sys-apps/osinfo-db-tools/metadata.xml11
-rw-r--r--sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r1.ebuild49
-rw-r--r--sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild8
-rw-r--r--sys-apps/osinfo-db/Manifest3
-rw-r--r--sys-apps/osinfo-db/metadata.xml11
-rw-r--r--sys-apps/osinfo-db/osinfo-db-20220830.ebuild (renamed from sys-apps/osinfo-db/osinfo-db-20220727.ebuild)0
-rw-r--r--sys-apps/osinfo-db/osinfo-db-20221018.ebuild25
-rw-r--r--sys-apps/pciutils/Manifest1
-rw-r--r--sys-apps/pciutils/pciutils-3.9.0.ebuild (renamed from sys-apps/pciutils/pciutils-3.8.0.ebuild)15
-rw-r--r--sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild2
-rw-r--r--sys-apps/pcsc-lite/Manifest2
-rw-r--r--sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch18
-rw-r--r--sys-apps/pcsc-lite/files/pcscd.conf1
-rw-r--r--sys-apps/pcsc-lite/metadata.xml38
-rw-r--r--sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild2
-rw-r--r--sys-apps/pcsc-lite/pcsc-lite-1.9.9.ebuild (renamed from sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild)43
-rw-r--r--sys-apps/pcsc-tools/Manifest2
-rw-r--r--sys-apps/pcsc-tools/metadata.xml17
-rw-r--r--sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild62
-rw-r--r--sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild2
-rw-r--r--sys-apps/pcsc-tools/pcsc-tools-1.6.0.ebuild (renamed from sys-apps/pcsc-tools/pcsc-tools-1.5.7.ebuild)16
-rw-r--r--sys-apps/pkgcore/Manifest5
-rw-r--r--sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch29
-rw-r--r--sys-apps/pkgcore/files/pkgcore-0.12.17-fix-prefix.patch18
-rw-r--r--sys-apps/pkgcore/metadata.xml11
-rw-r--r--sys-apps/pkgcore/pkgcore-0.12.12.ebuild56
-rw-r--r--sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild (renamed from sys-apps/pkgcore/pkgcore-0.12.11.ebuild)18
-rw-r--r--sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild (renamed from sys-apps/pkgcore/pkgcore-0.12.13-r1.ebuild)30
-rw-r--r--sys-apps/pkgcore/pkgcore-9999.ebuild25
-rw-r--r--sys-apps/plocate/Manifest2
-rw-r--r--sys-apps/plocate/plocate-1.1.16.ebuild2
-rw-r--r--sys-apps/plocate/plocate-1.1.17.ebuild (renamed from sys-apps/plocate/plocate-1.1.15.ebuild)4
-rw-r--r--sys-apps/policycoreutils/policycoreutils-3.3.ebuild9
-rw-r--r--sys-apps/policycoreutils/policycoreutils-3.4.ebuild7
-rw-r--r--sys-apps/policycoreutils/policycoreutils-9999.ebuild7
-rw-r--r--sys-apps/polychromatic/Manifest1
-rw-r--r--sys-apps/polychromatic/metadata.xml21
-rw-r--r--sys-apps/polychromatic/polychromatic-0.7.3-r1.ebuild69
-rw-r--r--sys-apps/polychromatic/polychromatic-9999.ebuild69
-rw-r--r--sys-apps/portage/Manifest4
-rw-r--r--sys-apps/portage/files/3.0.30-loong-abis.patch133
-rw-r--r--sys-apps/portage/files/3.0.30-qa-checks.patch137
-rw-r--r--sys-apps/portage/files/3.0.30-revert-default-enable-soname-dependencies.patch52
-rw-r--r--sys-apps/portage/files/3.0.30-revert-run-warn.patch64
-rw-r--r--sys-apps/portage/files/portage-3.0.38.1-xz-32-bit.patch90
-rw-r--r--sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch34
-rw-r--r--sys-apps/portage/files/portage-tmpdir.conf2
-rw-r--r--sys-apps/portage/portage-3.0.30-r3.ebuild274
-rw-r--r--sys-apps/portage/portage-3.0.38.1-r4.ebuild (renamed from sys-apps/portage/portage-3.0.30-r5.ebuild)19
-rw-r--r--sys-apps/portage/portage-3.0.39-r2.ebuild (renamed from sys-apps/portage/portage-3.0.34.ebuild)13
-rw-r--r--sys-apps/portage/portage-9999.ebuild12
-rw-r--r--sys-apps/powerpc-utils/metadata.xml2
-rw-r--r--sys-apps/ppc64-diag/Manifest1
-rw-r--r--sys-apps/ppc64-diag/metadata.xml9
-rw-r--r--sys-apps/ppc64-diag/ppc64-diag-2.7.9.ebuild79
-rw-r--r--sys-apps/qcontrol/metadata.xml2
-rw-r--r--sys-apps/qdirstat/Manifest1
-rw-r--r--sys-apps/qdirstat/files/qdirstat-1.8-musl.patch102
-rw-r--r--sys-apps/qdirstat/qdirstat-1.8.ebuild57
-rw-r--r--sys-apps/razer-cli/Manifest1
-rw-r--r--sys-apps/razer-cli/files/razer-cli-setup.patch9
-rw-r--r--sys-apps/razer-cli/metadata.xml20
-rw-r--r--sys-apps/razer-cli/razer-cli-2.1.0.ebuild37
-rw-r--r--sys-apps/razercommander/Manifest1
-rw-r--r--sys-apps/razercommander/metadata.xml13
-rw-r--r--sys-apps/razercommander/razercommander-1.2.1.2-r1.ebuild36
-rw-r--r--sys-apps/readahead-list/metadata.xml3
-rw-r--r--sys-apps/s6-linux-init/Manifest1
-rw-r--r--sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild74
-rw-r--r--sys-apps/s6-linux-init/s6-linux-init-1.0.8.0-r1.ebuild (renamed from sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild)1
-rw-r--r--sys-apps/s6-linux-utils/Manifest1
-rw-r--r--sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild48
-rw-r--r--sys-apps/s6-portable-utils/Manifest1
-rw-r--r--sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild48
-rw-r--r--sys-apps/s6-rc/Manifest1
-rw-r--r--sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild61
-rw-r--r--sys-apps/s6/Manifest2
-rw-r--r--sys-apps/s6/s6-2.11.1.0-r1.ebuild54
-rw-r--r--sys-apps/s6/s6-2.11.1.1.ebuild51
-rw-r--r--sys-apps/salinfo/metadata.xml2
-rw-r--r--sys-apps/sed/Manifest2
-rw-r--r--sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch21
-rw-r--r--sys-apps/sed/sed-4.8-r1.ebuild60
-rw-r--r--sys-apps/sed/sed-4.8.ebuild6
-rw-r--r--sys-apps/sed/sed-4.9.ebuild56
-rw-r--r--sys-apps/selinux-python/selinux-python-3.3.ebuild4
-rw-r--r--sys-apps/servicelog/metadata.xml2
-rw-r--r--sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch32
-rw-r--r--sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild42
-rw-r--r--sys-apps/shadow/Manifest7
-rw-r--r--sys-apps/shadow/files/shadow-4.13-configure-clang16.patch38
-rw-r--r--sys-apps/shadow/shadow-4.12.3.ebuild (renamed from sys-apps/shadow/shadow-4.12.1.ebuild)5
-rw-r--r--sys-apps/shadow/shadow-4.13-r1.ebuild (renamed from sys-apps/shadow/shadow-4.11.1.ebuild)33
-rw-r--r--sys-apps/smc-sum/Manifest1
-rw-r--r--sys-apps/smc-sum/smc-sum-2.8.0.20220126.ebuild73
-rw-r--r--sys-apps/smcipmitool/Manifest2
-rw-r--r--sys-apps/smcipmitool/smcipmitool-2.27.0.220824.ebuild (renamed from sys-apps/smcipmitool/smcipmitool-2.26.0.220209.ebuild)0
-rw-r--r--sys-apps/sparc-utils/metadata.xml2
-rw-r--r--sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild62
-rw-r--r--sys-apps/sparc-utils/sparc-utils-1.9-r7.ebuild4
-rw-r--r--sys-apps/systemd-tmpfiles/Manifest4
-rw-r--r--sys-apps/systemd-tmpfiles/files/249.9-cross-compile.patch23
-rw-r--r--sys-apps/systemd-tmpfiles/files/stmpfiles-dev.initd20
-rw-r--r--sys-apps/systemd-tmpfiles/files/stmpfiles-setup.initd19
-rw-r--r--sys-apps/systemd-tmpfiles/files/stmpfiles.confd2
-rw-r--r--sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild260
-rw-r--r--sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild260
-rw-r--r--sys-apps/systemd-utils/Manifest7
-rw-r--r--sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch40
-rw-r--r--sys-apps/systemd-utils/files/251-glibc-2.36.patch154
-rw-r--r--sys-apps/systemd-utils/files/251-gpt-auto-no-cryptsetup.patch28
-rw-r--r--sys-apps/systemd-utils/files/251-meson-0.64.patch26
-rw-r--r--sys-apps/systemd-utils/files/251-revert-fortify-source-3-fix.patch40
-rw-r--r--sys-apps/systemd-utils/files/systemd-tmpfiles-clean2
-rw-r--r--sys-apps/systemd-utils/metadata.xml4
-rw-r--r--sys-apps/systemd-utils/systemd-utils-250.7.ebuild500
-rw-r--r--sys-apps/systemd-utils/systemd-utils-250.8.ebuild500
-rw-r--r--sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild (renamed from sys-apps/systemd-utils/systemd-utils-251.3.ebuild)45
-rw-r--r--sys-apps/systemd-utils/systemd-utils-251.7.ebuild (renamed from sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild)52
-rw-r--r--sys-apps/systemd-utils/systemd-utils-251.8-r1.ebuild (renamed from sys-apps/systemd-utils/systemd-utils-251.4.ebuild)48
-rw-r--r--sys-apps/systemd/Manifest5
-rw-r--r--sys-apps/systemd/files/251-format-string.patch25
-rw-r--r--sys-apps/systemd/files/251-glibc-2.36.patch154
-rw-r--r--sys-apps/systemd/files/251-gpt-auto-no-cryptsetup.patch28
-rw-r--r--sys-apps/systemd/files/251-meson-0.64.patch26
-rw-r--r--sys-apps/systemd/metadata.xml1
-rw-r--r--sys-apps/systemd/systemd-251.4.ebuild12
-rw-r--r--sys-apps/systemd/systemd-251.7.ebuild (renamed from sys-apps/systemd/systemd-251.2.ebuild)27
-rw-r--r--sys-apps/systemd/systemd-251.8.ebuild (renamed from sys-apps/systemd/systemd-251.3.ebuild)25
-rw-r--r--sys-apps/systemd/systemd-252.2.ebuild525
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild13
-rw-r--r--sys-apps/sysvinit/Manifest8
-rw-r--r--sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch82
-rw-r--r--sys-apps/sysvinit/files/sysvinit-3.05-fix-man-makefile.patch19
-rw-r--r--sys-apps/sysvinit/metadata.xml1
-rw-r--r--sys-apps/sysvinit/sysvinit-2.99-r1.ebuild138
-rw-r--r--sys-apps/sysvinit/sysvinit-3.01.ebuild138
-rw-r--r--sys-apps/sysvinit/sysvinit-3.04.ebuild177
-rw-r--r--sys-apps/sysvinit/sysvinit-3.05.ebuild (renamed from sys-apps/sysvinit/sysvinit-3.03.ebuild)18
-rw-r--r--sys-apps/tas/tas-1.7.0.220503-r1.ebuild (renamed from sys-apps/tas/tas-1.7.0.220503.ebuild)1
-rw-r--r--sys-apps/tcp-wrappers/Manifest1
-rw-r--r--sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-redhat-bug11881.patch35
-rw-r--r--sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.28-no-external-malloc.patch15
-rw-r--r--sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild9
-rw-r--r--sys-apps/texinfo/Manifest1
-rw-r--r--sys-apps/texinfo/metadata.xml1
-rw-r--r--sys-apps/texinfo/texinfo-6.8.ebuild2
-rw-r--r--sys-apps/texinfo/texinfo-7.0.ebuild62
-rw-r--r--sys-apps/toybox/Manifest5
-rw-r--r--sys-apps/toybox/metadata.xml3
-rw-r--r--sys-apps/toybox/toybox-0.8.4-r1.ebuild58
-rw-r--r--sys-apps/toybox/toybox-0.8.5-r1.ebuild58
-rw-r--r--sys-apps/toybox/toybox-0.8.7.ebuild58
-rw-r--r--sys-apps/toybox/toybox-0.8.8.ebuild (renamed from sys-apps/toybox/toybox-0.8.6.ebuild)2
-rw-r--r--sys-apps/tuned/Manifest2
-rw-r--r--sys-apps/tuned/tuned-2.19.0.ebuild (renamed from sys-apps/tuned/tuned-2.17.0.ebuild)1
-rw-r--r--sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild4
-rw-r--r--sys-apps/usbguard/Manifest1
-rw-r--r--sys-apps/usbguard/usbguard-1.1.2.ebuild99
-rw-r--r--sys-apps/usbredir/Manifest1
-rw-r--r--sys-apps/usbredir/metadata.xml19
-rw-r--r--sys-apps/usbredir/usbredir-0.13.0.ebuild25
-rw-r--r--sys-apps/util-linux/Manifest2
-rw-r--r--sys-apps/util-linux/util-linux-2.38.ebuild394
-rw-r--r--sys-apps/uutils/Manifest80
-rw-r--r--sys-apps/uutils/uutils-0.0.15.ebuild279
-rw-r--r--sys-apps/vbetool/Manifest2
-rw-r--r--sys-apps/vbetool/files/vbetool-1.0-build.patch18
-rw-r--r--sys-apps/vbetool/files/vbetool-1.2.2-libx86.patch7
-rw-r--r--sys-apps/vbetool/vbetool-1.2.2.ebuild (renamed from sys-apps/vbetool/vbetool-1.1-r1.ebuild)20
-rw-r--r--sys-apps/watchdog/files/watchdog-5.16-implicit-func-decls-musl.patch30
-rw-r--r--sys-apps/watchdog/watchdog-5.16-r1.ebuild42
-rw-r--r--sys-apps/x86info/metadata.xml3
-rw-r--r--sys-apps/xdg-dbus-proxy/metadata.xml3
-rw-r--r--sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.4.ebuild2
-rw-r--r--sys-apps/xdg-desktop-portal-gnome/Manifest2
-rw-r--r--sys-apps/xdg-desktop-portal-gnome/metadata.xml11
-rw-r--r--sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild2
-rw-r--r--sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-43.0.ebuild39
-rw-r--r--sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-43.1.ebuild39
-rw-r--r--sys-apps/xdg-desktop-portal-gtk/Manifest1
-rw-r--r--sys-apps/xdg-desktop-portal-gtk/metadata.xml11
-rw-r--r--sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild47
-rw-r--r--sys-apps/xdg-desktop-portal/Manifest3
-rw-r--r--sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.5.ebuild45
-rw-r--r--sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.6.ebuild2
-rw-r--r--sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.15.0.ebuild (renamed from sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild)16
-rw-r--r--sys-apps/xinetd/files/xinetd-2.3.15.4-0001-configure.ac-use-AC_USE_SYSTEM_EXTENSIONS.patch43
-rw-r--r--sys-apps/xinetd/files/xinetd-2.3.15.4-0002-redirect-drop-deprecated-sys-signal.h-include.patch24
-rw-r--r--sys-apps/xinetd/xinetd-2.3.15.4-r1.ebuild62
-rw-r--r--sys-apps/zorroutils/Manifest1
-rw-r--r--sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch15
-rw-r--r--sys-apps/zorroutils/metadata.xml1
-rw-r--r--sys-apps/zorroutils/zorroutils-0.04.ebuild34
531 files changed, 7549 insertions, 14266 deletions
diff --git a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
index 40e0dad498b..897cb46e3fb 100644
--- a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
+++ b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit meson python-any-r1 systemd
DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml
index 1394e6dc5f5..a5e0c3471d4 100644
--- a/sys-apps/accountsservice/metadata.xml
+++ b/sys-apps/accountsservice/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
- <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> for session tracking</flag>
- </use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
+ <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> for session tracking</flag>
+ </use>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">accountsservice/accountsservice</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 9380f8c0210..c7a55f8018a 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,2 +1,2 @@
-DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 192d1e851ef5bd3547e21fe49cf276180eb278af783209046c02e4a1ae1471c7b24aaf6825223aad96dedea9fd266576a2021dcb808b0e229312e8237e2f7afd SHA512 cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5
DIST ack-v3.5.0.tar.gz 249718 BLAKE2B dedd11b424f7274c45dabfd0ddf2c92ee9d15ccf40d251c79159aef6e93071c963291722a2024db1d4828ae02c1310d3fec366ca8bd5f249da2c0c73f7e303cb SHA512 f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d
+DIST ack-v3.6.0.tar.gz 251556 BLAKE2B 6e65633ea9b8b24b03d3ff60c0554eb05009ebbaacbeede8109bdfd36340ac6151f3be9b461349793d6a222d4fb9b21579d44cff3aa541b7bdbc94d16269d2d1 SHA512 1cef0d873be47c8e27d5c3b3b47ea965cf39755d1556c3f653c28d75e1cea9b1ff183297c897d919e220cfcb556e3d5b88eb0b5343d933a05fa2c1fff1234173
diff --git a/sys-apps/ack/ack-3.4.0.ebuild b/sys-apps/ack/ack-3.6.0.ebuild
index 054e1784005..316b7d2e334 100644
--- a/sys-apps/ack/ack-3.4.0.ebuild
+++ b/sys-apps/ack/ack-3.6.0.ebuild
@@ -1,7 +1,7 @@
-# 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
DIST_AUTHOR=PETDANCE
DIST_VERSION="v${PV}"
inherit perl-module
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/ack/metadata.xml b/sys-apps/ack/metadata.xml
index f48a742f0ea..b516c73148a 100644
--- a/sys-apps/ack/metadata.xml
+++ b/sys-apps/ack/metadata.xml
@@ -31,5 +31,6 @@
<remote-id type="cpan-module">App::Ack::Filter::MatchGroup</remote-id>
<remote-id type="cpan-module">App::Ack::Resource</remote-id>
<remote-id type="cpan-module">App::Ack::Resources</remote-id>
+ <remote-id type="github">beyondgrep/ack3</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-apps/acl/acl-2.3.1-r1.ebuild b/sys-apps/acl/acl-2.3.1-r1.ebuild
index acc9d09b23f..02aac439632 100644
--- a/sys-apps/acl/acl-2.3.1-r1.ebuild
+++ b/sys-apps/acl/acl-2.3.1-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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="
diff --git a/sys-apps/acl/metadata.xml b/sys-apps/acl/metadata.xml
index 8817932e4a5..80877575baf 100644
--- a/sys-apps/acl/metadata.xml
+++ b/sys-apps/acl/metadata.xml
@@ -6,5 +6,6 @@
</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:xfs:acl</remote-id>
+ <remote-id type="savannah-nongnu">acl</remote-id>
</upstream>
</pkgmetadata>
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 7db7337d04f..77690904dec 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
@@ -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 arm64"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test"
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
index 26e8c7c92a7..0ef73bf6738 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
@@ -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 ~arm64 ~riscv"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test"
diff --git a/sys-apps/apparmor/apparmor-3.0.3.ebuild b/sys-apps/apparmor/apparmor-3.0.3.ebuild
index 4cbc200ad95..04328c25820 100644
--- a/sys-apps/apparmor/apparmor-3.0.3.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.3.ebuild
@@ -13,14 +13,16 @@ 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
RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-lang/perl
+ sys-apps/which
sys-devel/bison
sys-devel/gettext
sys-devel/flex
diff --git a/sys-apps/apparmor/apparmor-3.0.4.ebuild b/sys-apps/apparmor/apparmor-3.0.4.ebuild
index d1413fd5619..94f291d4b02 100644
--- a/sys-apps/apparmor/apparmor-3.0.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.4.ebuild
@@ -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 ~riscv"
IUSE="doc"
# Was restricted previously b/c needs apparmor support in kernel
@@ -21,8 +21,10 @@ IUSE="doc"
#RESTRICT="test" # bug 675854
RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-lang/perl
+ sys-apps/which
sys-devel/bison
sys-devel/gettext
sys-devel/flex
diff --git a/sys-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml
index 22230f2666f..a1ec120ea86 100644
--- a/sys-apps/apparmor/metadata.xml
+++ b/sys-apps/apparmor/metadata.xml
@@ -10,6 +10,7 @@
<name>Gentoo Hardened</name>
</maintainer>
<upstream>
+ <remote-id type="cpe">cpe:/a:canonical:apparmor</remote-id>
<remote-id type="launchpad">apparmor</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-apps/attr/attr-2.5.1-r1.ebuild b/sys-apps/attr/attr-2.5.1-r1.ebuild
deleted file mode 100644
index c8051fdd82e..00000000000
--- a/sys-apps/attr/attr-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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-2.5.1-r2.ebuild b/sys-apps/attr/attr-2.5.1-r2.ebuild
index 2046677dadd..16d9c6ba5ee 100644
--- a/sys-apps/attr/attr-2.5.1-r2.ebuild
+++ b/sys-apps/attr/attr-2.5.1-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
else
inherit libtool
- 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"
SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
fi
diff --git a/sys-apps/attr/attr-2.5.1.ebuild b/sys-apps/attr/attr-2.5.1.ebuild
deleted file mode 100644
index 0d212005d51..00000000000
--- a/sys-apps/attr/attr-2.5.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool 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
- 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 )
-"
-
-src_prepare() {
- default
-
- if [[ ${PV} == 9999 ]] ; then
- po/update-potfiles || die
- eautopoint
- eautoreconf
- else
- elibtoolize #580792
- 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
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --bindir="${EPREFIX}"/bin
- --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
- 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.
- 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 c8051fdd82e..2046677dadd 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -3,9 +3,7 @@
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
+inherit flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
@@ -27,7 +25,7 @@ IUSE="debug nls static-libs"
BDEPEND="nls? ( sys-devel/gettext )"
PATCHES=(
- "${FILESDIR}"/${PN}-2.5.1-fix-symver.patch
+ "${FILESDIR}"/${PN}-2.5.1-r2-fix-symver.patch
)
src_prepare() {
@@ -39,10 +37,7 @@ src_prepare() {
eautoreconf
else
# bug #580792
- #elibtoolize
-
- # Temporarily for 2.5.1-r1 for symver patch
- eautoreconf
+ elibtoolize
fi
}
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
deleted file mode 100644
index 55ef4506f7d..00000000000
--- a/sys-apps/attr/files/attr-2.5.1-fix-symver.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-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/attr/metadata.xml b/sys-apps/attr/metadata.xml
index 92a88c8a8fc..05e4a37e997 100644
--- a/sys-apps/attr/metadata.xml
+++ b/sys-apps/attr/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:attr_project:attr</remote-id>
+ <remote-id type="savannah-nongnu">attr</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 3b0e05f3409..bafb02ea22b 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,2 +1,3 @@
DIST baobab-41.0.tar.xz 586228 BLAKE2B 8c06dd4c62dd377e2338df280dd1f78dcd6e0c13713f06bb126f96e658e42b9ed5f1cffa9f7445f2d854cf42c09b93d72f4ff82a80df5dd4a4d395978fe2ecff SHA512 4f41cac42491afb98855771a621573689f2b35c0a2602799af9f88adf901a5c62c9f8e4b70be43ed27024deba860b128bc22b8a7782ac207a5746b4df6b65aa0
DIST baobab-42.0.tar.xz 588392 BLAKE2B ec2525b6643a9ab2ecedcbb7b7a54419859116808d9287bfcc694cf22d314b5dc34e71483718353685f3a246c87b4b492e7c3fb69c7044dea605ae3e8737d0f1 SHA512 21837bfe901034ed3450f6937d3ede1e567d16a5ae308db91029dc2ff4bb523b36f9408f7489c6798140de039e928f49969a1ed741027da0ae8377be6352ba08
+DIST baobab-43.0.tar.xz 594832 BLAKE2B 1cf42a475bf08ddf85d3fb2944f80e274eeb47d1e3f44fcfba9e53c9302a5c3f5fcbe9378dc74059199e2ed38945af16eca2456f7cede9b45228b90e14ae8b96 SHA512 d368bde1ba1fafbe908c5e8e0e5cd9d593d3f3cc551a7b1f3be68624bd7ee8b1dac6374fc9031c7d4c53240dda739974b5c71653227251bb5b8fbcd332900b91
diff --git a/sys-apps/baobab/baobab-43.0.ebuild b/sys-apps/baobab/baobab-43.0.ebuild
new file mode 100644
index 00000000000..e36fbd56e11
--- /dev/null
+++ b/sys-apps/baobab/baobab-43.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Disk usage browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ >=gui-libs/gtk-4.4.0:4
+ >=gui-libs/libadwaita-1.2:1=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ $(vala_depend)
+ >=gui-libs/libadwaita-1.2:1=[vala]
+ dev-util/itstool
+ >=sys-devel/gettext-0.21
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ vala_setup
+ xdg_environment_reset
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/sys-apps/baobab/metadata.xml b/sys-apps/baobab/metadata.xml
index 7b343b06be8..bda41aace7c 100644
--- a/sys-apps/baobab/metadata.xml
+++ b/sys-apps/baobab/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/baobab</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
deleted file mode 100644
index aa09c5824d1..00000000000
--- a/sys-apps/baselayout-prefix/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
-DIST baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch 1760 BLAKE2B 227ea5a9f70e927ba19de675f408ad01c4d934575cfeb780a525a4e24afd46d9d91d4e4acf773403cb6ac4a493b81da1cad787a5c0e41096056ad4e233b3cfc8 SHA512 77b4c3cad19251497808b6a07a384846f3ebb2282860d55197cee03d373b16622ef3b6c95e411e1cbb79702f10fe2e9c43cfe4175cca1db3ea6c06c6b2331ac9
-DIST baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch 809 BLAKE2B 237eb610b6935ec5139299f1dccc6260b31a1d47a82390d713fc759ef37de986de8392a82068c70c1f63f382a9212103025fe019614796f5b6a3b4ed0f81f8b2 SHA512 6cd1bf81d8619be27c20fcd703be9a97cc6129d9c13402172e7f16adf6e9b9eb0238edfd311ca8b98b3898876d2bf9686a2a3905510d26608773a3da5233ee95
-DIST baselayout-prefix-95a8e95af948014d024842892be1405d656ab5fc.patch 3754 BLAKE2B c64cf440d7dc27bd3c38ad93d242a28e3ae0df6ebef282249996bc2c463aa6c0941ea41fbee236ba77742ba5bff777cd3226054b80abe99a454f39d488f8e1c1 SHA512 8e2d44e9caedfa7159f374e39d416a7ceebd407ea9550d9aa52d0a87a44b7b805b1725f8eefd592eb5fbd9a5f3f851a28c18565f3b0e621530f4c51c109df24e
-DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE2B d9b3135fc77a1941e08c68f0981385bcab412fc4949a70c7b75e11e7f8a6ee1eff6b5be0804d06539ed9f02a6245c0161d3dfd6de9fb0bf68d0d07c724650707 SHA512 822065592f434fcbae42b48d475ac0d188e29773337c3154f162ff830b58dcf44c87e3091933d5a0c0cc7e89e4d0223f60cefc0e525ca29aa3c9a0f9a5e974bf
-DIST baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch 1168 BLAKE2B 241d3dd665a7373563fb413ea9613a0597deb5b1b5213567ed0abf1edb00c495acec9570f5c3b2365c00683cbc32fb9e518666928c73640bebe99d3345fcd764 SHA512 96c4d63b5782e388882760cefd57157927543570a920f66c88cf3c58335c7e05918805510dc6e07f07f06564756482d055987c99b0cca7c31b432936558cadc6
-DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
-DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
deleted file mode 100644
index 72df7fd7769..00000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-# just use "upstream" sources
-MY_P=${P/-prefix/}
-MY_PN=${PN/-prefix/}
-S="${WORKDIR}/${MY_P}"
-
-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/${MY_PN}.git"
- inherit git-r3
-else
- SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
- KEYWORDS="~arm ~arm64 ~ppc64 ~riscv ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-RDEPEND="!sys-apps/baselayout" #681760
-
-my_prefix_commits=(
- # commits in reverse order as listed by:
- # git log --decorate=no --oneline --no-abbrev-commit origin/master..
- bb4c4f5f45b6798f5c9658e0e862077c404c675c # prefix-stack: ROOTPATH needs EPREFIX before BROOT
- a054fcc408ad48f775f7379834385c6a707d7a53 # also create etc/gentoo-release
- 5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge
- 395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support
- 95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support
- c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout'
- c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install'
-)
-for my_c in ${my_prefix_commits[*]}
-do
- SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch"
- PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" )
-done
-unset my_prefix_commits my_c
-
-pkg_setup() {
- multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
- use prefix && return 0
- 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
- 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}" #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
- 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}"
- 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
-
- # 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="${ROOT}" layout
- else
- emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge
- fi
- fi
- rm -f "${ED}"/usr/share/${PN}/Makefile
-}
-
-src_prepare() {
- default
-
- # 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
- ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
- ldpaths+=":${EPREFIX}/usr/local/${libdir}"
- done
- echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-}
-
-src_configure() {
- local OS
- # although having a prefix, RAP uses full Linux baselayout
- OS=$(usex prefix-stack prefix-stack \
- $(usex prefix-guest prefix-guest \
- Linux ) )
- # set up immutable Makefile variables once
- sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \
- -e "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \
- -e "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \
- -i Makefile || die
-}
-
-src_install() {
- emake ROOT="${ROOT}" DESTDIR="${D}" install
- dodoc ChangeLog
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # add SDK path which contains development manpages
- echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
- > "${ED}"/etc/env.d/98macos-sdk
- fi
-
- # need the makefile in pkg_preinst
- insinto /usr/share/${PN}
- doins Makefile
-
- use prefix-guest || return 0
-
- # add a dummy to avoid Portage shebang errors
- dodir sbin
- cat > "${ED}"/sbin/runscript <<- EOF
- #!/usr/bin/env sh
- source "${EPREFIX}/lib/gentoo/functions.sh"
-
- eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
- exit 1
- EOF
- chmod 755 "${ED}"/sbin/runscript || die
- cp "${ED}"/sbin/{runscript,openrc-run} || die
-}
-
-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
- done
-
- # Force shadow permissions to not be world-readable #260993
- for x in shadow ; do
- [ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}"
- 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
- 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
-
- 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 ${x} -lt 2.4; then
- ewarn "After updating ${EROOT}/etc/profile, please run"
- ewarn "env-update && . ${EPREFIX}/etc/profile"
- fi
-
- if ver_test ${x} -lt 2.6; 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"
- 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-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml
deleted file mode 100644
index 217a87b6d50..00000000000
--- a/sys-apps/baselayout-prefix/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>prefix@gentoo.org</email>
-</maintainer>
-<use>
- <flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index a24c7a1d49b..44609f8f1a9 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,2 +1 @@
-DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
-DIST baselayout-2.8.tar.bz2 30236 BLAKE2B 0bac62dd5585f1f550da8c99d06a7f8ab6cdd473b0499a8f0ac58a5c43e3883b42adb7f80c172d894fae93a6ddb6fec7a65cad9897f4a2532b481c82065ed96b SHA512 506d7cc8399b530eabc9ba2d16cbb6c024350f9487a2a9168c670cee9876f62e5a716942f698c4883013d6ccc9591c2d7fc2ac9d782f0ce8d724371ca94c739a
+DIST baselayout-2.9.tar.bz2 30200 BLAKE2B 3a997e847e853a5bcdce7eb06d50fda4727a6c408ca614bdc8dd576bfc9296d3c625c4e8791dbdb078dd5088f818e5ee98eea5d14d737f465ed225554da26180 SHA512 c07726141446c9d9202bac19642baf819b28a838814e1dd3c200d1768af64a913bd9188923029e0b0edf7e420d5aad7bdde278d6c24c4f40029fddbad28d8e02
diff --git a/sys-apps/baselayout/baselayout-2.7-r3.ebuild b/sys-apps/baselayout/baselayout-2.7-r3.ebuild
deleted file mode 100644
index 3293e119b3c..00000000000
--- a/sys-apps/baselayout/baselayout-2.7-r3.ebuild
+++ /dev/null
@@ -1,347 +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
-}
-
-riscv_compat_symlink() {
- # Here we apply some special sauce for riscv.
- # Two multilib layouts exist for now:
- # 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
- # these are chosen by us to closely resemble other arches
- # 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
- # this is the glibc/gcc default
- # Unfortunately, the default has only one fallback, which is "lib"
- # for both 32bit and 64bit. So things do not break in 1), we need
- # to provide compatibility symlinks...
-
- # This function has exactly two parameters:
- # - the default libdir, to determine if 1) or 2) applies
- # - the location of the symlink (which points to ".")
-
- # Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
- # there never was a ${SYMLINK_LIB} = yes riscv profile.
-
- case ${CHOST} in
- riscv*)
- # are we on a one level libdir profile? is there no symlink yet?
- if [[ ${1} != */* && ! -L ${2} ]] ; then
- ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
- fi
- ;;
- esac
-}
-
-# 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
- riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
- 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.8.ebuild b/sys-apps/baselayout/baselayout-2.8.ebuild
deleted file mode 100644
index 5767ed31ca8..00000000000
--- a/sys-apps/baselayout/baselayout-2.8.ebuild
+++ /dev/null
@@ -1,338 +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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-pkg_setup() {
- multilib_layout
-}
-
-riscv_compat_symlink() {
- # Here we apply some special sauce for riscv.
- # Two multilib layouts exist for now:
- # 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
- # these are chosen by us to closely resemble other arches
- # 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
- # this is the glibc/gcc default
- # Unfortunately, the default has only one fallback, which is "lib"
- # for both 32bit and 64bit. So things do not break in 1), we need
- # to provide compatibility symlinks...
-
- # This function has exactly two parameters:
- # - the default libdir, to determine if 1) or 2) applies
- # - the location of the symlink (which points to ".")
-
- # Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
- # there never was a ${SYMLINK_LIB} = yes riscv profile.
-
- case ${CHOST} in
- riscv*)
- # are we on a one level libdir profile? is there no symlink yet?
- if [[ ${1} != */* && ! -L ${2} ]] ; then
- ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
- fi
- ;;
- esac
-}
-
-# 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
- riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
- 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/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
-}
-
-src_install() {
- emake \
- OS=Linux \
- DESTDIR="${ED}" \
- install
-
- # need the makefile in pkg_preinst
- insinto /usr/share/${PN}
- doins Makefile
-
- dodoc ChangeLog
-}
-
-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.8-r2.ebuild b/sys-apps/baselayout/baselayout-2.9.ebuild
index c6296f1a6f9..6cb197c3c6f 100644
--- a/sys-apps/baselayout/baselayout-2.8-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.9.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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ 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 ~x86-winnt"
fi
LICENSE="GPL-2"
@@ -218,7 +218,6 @@ src_prepare() {
# don't want symlinked directories in PATH on systems with usr-merge
if ! use split-usr && ! use prefix-guest; then
sed \
- -e 's|/usr/local/sbin:||g' \
-e 's|:/usr/sbin:|:|g' \
-e 's|:/sbin:|:|g' \
-e 's|:/bin:|:|g' \
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index c6296f1a6f9..b7fc36bdb83 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -218,7 +218,6 @@ src_prepare() {
# don't want symlinked directories in PATH on systems with usr-merge
if ! use split-usr && ! use prefix-guest; then
sed \
- -e 's|/usr/local/sbin:||g' \
-e 's|:/usr/sbin:|:|g' \
-e 's|:/sbin:|:|g' \
-e 's|:/bin:|:|g' \
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 96e5b97f9ed..cedcf9f4e23 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,2 +1,3 @@
DIST bolt-0.9.1.tar.gz 250978 BLAKE2B a3b1ea51704e2b54abb0135013019b9cad6ed9c0acfdb56797e19c9b5a1abe9f921446cfcc5b664f73bbbff857cf8d420f588517d4c633d1b3776a35c37fc882 SHA512 c925c290de75d3fa2dfb9e86b2f14ea39279b3f2ab6bebeced72a7853c901d44de02157d684534af2b54edd3a2e0b2ba61e889579ab1b192f99e98a2d73685d9
DIST bolt-0.9.2.tar.gz 252532 BLAKE2B 45ea8ae2e77a90099152e708dafe68e63492d0370b734612b516d4a772507174c3df75ddd7d6bdea4be5022a88e1e286a738d3b8df6a662ef3b0b92ac7328730 SHA512 69e7ffa58a6dbc8a1b14fd7e11e2291fa60227896ead1a449839716b581c6ab0e351d3ed62f9b51c5e44a5a33ba5e23dc5af73a1b4eef87f733b3231d5454e90
+DIST bolt-0.9.3.tar.gz 253085 BLAKE2B 7547a35aa16a7681737989c72dfd2e13245eb50c7b814de979974750e3c8805156fd22054308d715299baab3ebd4144923aacc04ef301ee039e84b6370cbcba7 SHA512 2160831011090e75cf54408525f53ead6c0e7797de8a4afdd07ef5a035f8e1aa58f34efb9bd52e6e7cd93ac17751e72ff27e99f2b372a5720b2cbadd6abb3c26
diff --git a/sys-apps/bolt/bolt-0.9.2.ebuild b/sys-apps/bolt/bolt-0.9.2.ebuild
index b6e173c5433..d1044fd43ad 100644
--- a/sys-apps/bolt/bolt-0.9.2.ebuild
+++ b/sys-apps/bolt/bolt-0.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1 GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/bolt/bolt-0.9.3.ebuild b/sys-apps/bolt/bolt-0.9.3.ebuild
new file mode 100644
index 00000000000..3e80af202e2
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.9.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson udev
+
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
+HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~loong ~riscv x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.56.0:2
+ virtual/libudev:=
+ virtual/udev
+ sys-auth/polkit[introspection]
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-util/umockdev )
+"
+BDEPEND="
+ app-text/asciidoc
+ dev-util/glib-utils
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ if use kernel_linux && kernel_is lt 5 6; then
+ CONFIG_CHECK="~THUNDERBOLT"
+ ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
+ else
+ CONFIG_CHECK="~USB4"
+ ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
+ fi
+ CONFIG_CHECK+=" ~HOTPLUG_PCI"
+ ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
+
+ linux-info_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dman=true
+ --sysconfdir="${EPREFIX}"/etc
+ --localstatedir="${EPREFIX}"/var
+ --sharedstatedir="${EPREFIX}"/var/lib
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ newinitd "${FILESDIR}"/${PN}.openrc-r1 boltd
+ keepdir /var/lib/boltd
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index fc964394d9a..ae80c367beb 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1 +1,2 @@
DIST bubblewrap-0.6.2.tar.xz 146312 BLAKE2B bf02e9095cd1e80b84e0439d14ce57fc9bb08f9f0d3596a19eb34a55bd03b9d371368eda75f2b2106d47db29d1c2d9845fe2a12f5d0c554bbb532c9e0e53d368 SHA512 235da019cb370ea6d9328352acb38e6ff368f02f71db1ae85f2dd37655757975bd5b57bbe15f7b419b53a26b8ec3edd81b55893b420d5f42d6a9dab3471d0096
+DIST bubblewrap-0.7.0.tar.xz 147700 BLAKE2B 379feff513a509e6e00c933ca6bafdeef43827e406fbf31e56c1d16feb099a887f88125fb52d038e78b1604c504bdba771aeaeb3274e8d11163492f00fe9633c SHA512 3d163eecd79774e02d082141d027b7ac13f7d3a29c22f6513203e1088f53d53d8dde50e36fc4c8a34e8cde2f3e2a692e00b741f4bee2cc2bb21b9deb600271b5
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild b/sys-apps/bubblewrap/bubblewrap-0.7.0.ebuild
index a9f2860b3fd..fa95d51552b 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.7.0.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-IUSE="selinux +suid"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="selinux suid"
RDEPEND="
sys-libs/libseccomp
diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
index 8fb10aebdff..1c76b4ce84f 100644
--- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
@@ -27,8 +27,11 @@ RESTRICT="test"
# TODO: Could make pkgconfig conditional on selinux? bug #782829
RDEPEND="
- virtual/libcrypt:=
- !static? ( selinux? ( sys-libs/libselinux ) )
+ !static? (
+ virtual/libc
+ virtual/libcrypt:=
+ selinux? ( sys-libs/libselinux )
+ )
pam? ( sys-libs/pam )
"
DEPEND="${RDEPEND}
diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild
index 502b590fd4a..a983429625d 100644
--- a/sys-apps/busybox/busybox-1.34.1.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1.ebuild
@@ -27,8 +27,11 @@ RESTRICT="test"
# TODO: Could make pkgconfig conditional on selinux? bug #782829
RDEPEND="
- virtual/libcrypt:=
- !static? ( selinux? ( sys-libs/libselinux ) )
+ !static? (
+ virtual/libc
+ virtual/libcrypt:=
+ selinux? ( sys-libs/libselinux )
+ )
pam? ( sys-libs/pam )
"
DEPEND="${RDEPEND}
diff --git a/sys-apps/busybox/busybox-1.35.0-r1.ebuild b/sys-apps/busybox/busybox-1.35.0-r1.ebuild
index 76d06dcb9b2..d08c6a826b6 100644
--- a/sys-apps/busybox/busybox-1.35.0-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.35.0-r1.ebuild
@@ -28,8 +28,11 @@ RESTRICT="test"
# TODO: Could make pkgconfig conditional on selinux? bug #782829
RDEPEND="
- virtual/libcrypt:=
- !static? ( selinux? ( sys-libs/libselinux ) )
+ !static? (
+ virtual/libc
+ virtual/libcrypt:=
+ selinux? ( sys-libs/libselinux )
+ )
pam? ( sys-libs/pam )
"
DEPEND="${RDEPEND}
diff --git a/sys-apps/busybox/busybox-1.35.0.ebuild b/sys-apps/busybox/busybox-1.35.0.ebuild
index 24f99089f84..223e6ce2486 100644
--- a/sys-apps/busybox/busybox-1.35.0.ebuild
+++ b/sys-apps/busybox/busybox-1.35.0.ebuild
@@ -28,8 +28,11 @@ RESTRICT="test"
# TODO: Could make pkgconfig conditional on selinux? bug #782829
RDEPEND="
- virtual/libcrypt:=
- !static? ( selinux? ( sys-libs/libselinux ) )
+ !static? (
+ virtual/libc
+ virtual/libcrypt:=
+ selinux? ( sys-libs/libselinux )
+ )
pam? ( sys-libs/pam )
"
DEPEND="${RDEPEND}
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 5e059850212..6450127bf54 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -27,8 +27,11 @@ RESTRICT="test"
# TODO: Could make pkgconfig conditional on selinux? bug #782829
RDEPEND="
- virtual/libcrypt:=
- !static? ( selinux? ( sys-libs/libselinux ) )
+ !static? (
+ virtual/libc
+ virtual/libcrypt:=
+ selinux? ( sys-libs/libselinux )
+ )
pam? ( sys-libs/pam )
"
DEPEND="${RDEPEND}
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index d48998b486f..7ea8df983e9 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,7 +1,5 @@
DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
-DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03
-DIST coreutils-9.0.tar.xz.sig 833 BLAKE2B 1393f60361524e0a6eab5631aada50ee4124bd0e9ff3020b7593914a888f0edaec78339caee28847e85e1a1af6ea519ab9fad208db605f0c6b8a4e7ab19853a8 SHA512 1a368c92ddb57f386c188ef72f1edad7e217c983c296f9be0d27ffbaa673bf2f004c321fbaff8ae6cdebf6ffef402e3e8c69e6c8e30aca988e0ea38f2296cf30
DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f
DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index 1a139279ad8..16c4445f3ae 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-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
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
)
"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
diff --git a/sys-apps/coreutils/coreutils-9.0-r2.ebuild b/sys-apps/coreutils/coreutils-9.0-r2.ebuild
deleted file mode 100644
index e55e9bf82f7..00000000000
--- a/sys-apps/coreutils/coreutils-9.0-r2.ebuild
+++ /dev/null
@@ -1,239 +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} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
-inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
-
-PATCH="${PN}-8.30-patches-01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- !vanilla? (
- mirror://gentoo/${PATCH}.tar.xz
- https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
- )
- verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
- caps? ( sys-libs/libcap )
- gmp? ( dev-libs/gmp:=[static-libs] )
- xattr? ( sys-apps/attr[static-libs] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
- selinux? ( sys-libs/libselinux )
- nls? ( virtual/libintl )"
-DEPEND="
- ${RDEPEND}
- static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
- app-arch/xz-utils
- dev-lang/perl
- test? (
- dev-lang/perl
- dev-perl/Expect
- dev-util/strace
- ${PYTHON_DEPS}
- )
- verify-sig? ( sec-keys/openpgp-keys-coreutils )
-"
-RDEPEND+="
- hostname? ( !sys-apps/net-tools[hostname] )
- kill? (
- !sys-apps/util-linux[kill]
- !sys-process/procps[kill]
- )
- !app-misc/realpath
- !<sys-apps/util-linux-2.13
- !<sys-apps/sandbox-2.10-r4
- !sys-apps/stat
- !net-mail/base64
- !sys-apps/mktemp
- !<app-forensics/tct-1.18-r1
- !<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
- if use test ; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_unpack() {
- if use verify-sig ; then
- # Needed for downloaded patch (which is unsigned, which is fine)
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
- fi
-
- default
-}
-
-src_prepare() {
- local PATCHES=(
- # Upstream patches
- "${FILESDIR}"/${P}-fix-chmod-symlink-exit.patch
- )
-
- if ! use vanilla ; then
- PATCHES+=( "${WORKDIR}"/patch )
- PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
- PATCHES+=( "${FILESDIR}"/${PN}-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch )
- fi
-
- default
-
- # Since we've patched many .c files, the make process will try to
- # re-build the manpages by running `./bin --help`. When doing a
- # cross-compile, we can't do that since 'bin' isn't a native bin.
- #
- # Also, it's not like we changed the usage on any of these things,
- # so let's just update the timestamps and skip the help2man step.
- set -- man/*.x
- touch ${@/%x/1} || die
-
- # Avoid perl dep for compiled in dircolors default (bug #348642)
- if ! has_version dev-lang/perl ; then
- touch src/dircolors.h || die
- touch ${@/%x/1} || die
- fi
-}
-
-src_configure() {
- local myconf=(
- --with-packager="Gentoo"
- --with-packager-version="${PVR} (p${PATCH_VER:-0})"
- --with-packager-bug-reports="https://bugs.gentoo.org/"
- # kill/uptime - procps
- # groups/su - shadow
- # hostname - net-tools
- --enable-install-program="arch,$(usev hostname),$(usev kill)"
- --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
- --enable-largefile
- $(usex caps '' --disable-libcap)
- $(use_enable nls)
- $(use_enable acl)
- $(use_enable multicall single-binary)
- $(use_enable xattr)
- $(use_with gmp libgmp)
- )
-
- if use gmp ; then
- myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
- fi
-
- if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
- # bug #311569
- export fu_cv_sys_stat_statfs2_bsize=yes
- # bug #416629
- export gl_cv_func_realpath_works=yes
- fi
-
- # bug #409919
- export gl_cv_func_mknod_works=yes
-
- if use static ; then
- append-ldflags -static
- # bug #321821
- sed -i '/elf_sys=yes/s:yes:no:' configure || die
- fi
-
- if ! use selinux ; then
- # bug #301782
- export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- # Known to fail with FEATURES=usersandbox (bug #439574):
- # - tests/du/long-from-unreadable.sh} (bug #413621)
- # - tests/rm/deep-2.sh (bug #413621)
- # - tests/dd/no-allocate.sh (bug #629660)
- if has usersandbox ${FEATURES} ; then
- ewarn "You are emerging ${P} with 'usersandbox' enabled." \
- "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
- fi
-
- # Non-root tests will fail if the full path isn't
- # accessible to non-root users
- chmod -R go-w "${WORKDIR}" || die
- chmod a+rx "${WORKDIR}" || die
-
- # coreutils tests like to do `mount` and such with temp dirs,
- # so make sure:
- # - /etc/mtab is writable (bug #265725)
- # - /dev/loop* can be mounted (bug #269758)
- mkdir -p "${T}"/mount-wrappers || die
- mkwrap() {
- local w ww
- for w in "${@}" ; do
- ww="${T}/mount-wrappers/${w}"
- cat <<-EOF > "${ww}"
- #!${EPREFIX}/bin/sh
- exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
- EOF
- chmod a+rx "${ww}" || die
- done
- }
- mkwrap mount umount
-
- addwrite /dev/full
- #export RUN_EXPENSIVE_TESTS="yes"
- #export FETISH_GROUPS="portage wheel"
- env PATH="${T}/mount-wrappers:${PATH}" \
- emake -j1 -k check
-}
-
-src_install() {
- default
-
- insinto /etc
- newins src/dircolors.hin DIR_COLORS
-
- if use split-usr ; then
- cd "${ED}"/usr/bin || die
- dodir /bin
-
- # Move critical binaries into /bin (required by FHS)
- local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
- mkdir mknod mv pwd rm rmdir stty sync true uname"
- mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
-
- if use hostname ; then
- mv hostname ../../bin/ || die
- fi
-
- if use kill ; then
- mv kill ../../bin/ || die
- fi
-
- # Move critical binaries into /bin (common scripts)
- # (Why are these required for booting?)
- local com="basename chroot cut dir dirname du env expr head mkfifo
- mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
- mv ${com} ../../bin/ || die "Could not move common bins!"
-
- # Create a symlink for uname in /usr/bin/ since autotools require it.
- # (Other than uname, we need to figure out why we are
- # creating symlinks for these in /usr/bin instead of leaving
- # the files there in the first place...)
- local x
- for x in ${com} uname ; do
- dosym ../../bin/${x} /usr/bin/${x}
- done
- fi
-}
-
-pkg_postinst() {
- ewarn "Make sure you run 'hash -r' in your active shells."
- ewarn "You should also re-source your shell settings for LS_COLORS"
- ewarn " changes, such as: source /etc/profile"
-}
diff --git a/sys-apps/coreutils/coreutils-9.1-r1.ebuild b/sys-apps/coreutils/coreutils-9.1-r1.ebuild
index 4594d9dae0b..8c53dea0990 100644
--- a/sys-apps/coreutils/coreutils-9.1-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.1-r1.ebuild
@@ -26,12 +26,12 @@ else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
- 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"
fi
SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/coreutils/coreutils-9.1.ebuild b/sys-apps/coreutils/coreutils-9.1-r2.ebuild
index 7b78b8fa9d1..88256476cc2 100644
--- a/sys-apps/coreutils/coreutils-9.1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.1-r2.ebuild
@@ -3,6 +3,10 @@
EAPI=7
+# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
+# The upstream coreutils maintianers also maintain the package in Fedora and may
+# backport fixes which we want to pick up.
+
PYTHON_COMPAT=( python3_{8..10} )
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
@@ -27,14 +31,15 @@ fi
SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
+IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr"
RESTRICT="!test? ( test )"
LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
caps? ( sys-libs/libcap )
gmp? ( dev-libs/gmp:=[static-libs] )
+ openssl? ( dev-libs/openssl:=[static-libs] )
xattr? ( sys-apps/attr[static-libs] )"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
selinux? ( sys-libs/libselinux )
@@ -87,6 +92,7 @@ src_unpack() {
src_prepare() {
local PATCHES=(
# Upstream patches
+ "${FILESDIR}"/${P}-fix-rename-simple-backups.patch
)
if ! use vanilla ; then
@@ -128,6 +134,7 @@ src_configure() {
$(use_enable multicall single-binary)
$(use_enable xattr)
$(use_with gmp libgmp)
+ $(use_with openssl)
)
if use gmp ; then
diff --git a/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch b/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch
deleted file mode 100644
index 25b2b72bcb8..00000000000
--- a/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=e8b56ebd536e82b15542a00c888109471936bfda
-https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00031.html
-(and https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00035.html)
-
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Fri, 24 Sep 2021 20:57:41 +0100
-Subject: chmod: fix exit status when ignoring symlinks
-
-* src/chmod.c: Reorder enum so CH_NOT_APPLIED
-can be treated as a non error.
-* tests/chmod/ignore-symlink.sh: A new test.
-* tests/local.mk: Reference the new test.
-* NEWS: Mention the bug fix.
-Fixes https://bugs.gnu.org/50784
---- a/src/chmod.c
-+++ b/src/chmod.c
-@@ -44,8 +44,8 @@ struct change_status
- enum
- {
- CH_NO_STAT,
-- CH_NOT_APPLIED,
- CH_FAILED,
-+ CH_NOT_APPLIED,
- CH_NO_CHANGE_REQUESTED,
- CH_SUCCEEDED
- }
-@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
- if ( ! recurse)
- fts_set (fts, ent, FTS_SKIP);
-
-- return CH_NO_CHANGE_REQUESTED <= ch.status;
-+ return CH_NOT_APPLIED <= ch.status;
- }
-
- /* Recursively change the modes of the specified FILES (the last entry
diff --git a/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch b/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch
deleted file mode 100644
index e77766cbfe3..00000000000
--- a/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From cbb451b63faee375415691c1abc8a6fd3e1677a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Sat, 12 Feb 2022 22:54:07 +0100
-Subject: [PATCH] dircolors: consider COLORTERM as well as TERM env vars
-
-COLORTERM is an environment used usually to expose truecolor support in
-terminal emulators. Therefore support matches on that in addition
-to TERM. Also set the default COLORTERM match pattern so that
-we apply colors if COLORTERM is any value.
-
-This implicitly supports a terminal like "foot"
-without a need for an explicit TERM entry.
-
-* NEWS: Mention the new feature.
-* src/dircolors.c (main): Match COLORTERM like we do for TERM.
-* src/dircolors.hin: Add default config to match any COLORTERM.
-* tests/misc/dircolors.pl: Add test cases.
----
-Backported from coreutils 75c9fc6740e93dba95f63a1e5e92bd5cf17f1743.
-See also https://lists.gnu.org/archive/html/coreutils/2022-02/msg00019.html
-
- NEWS | 3 +++
- src/dircolors.c | 15 ++++++++++++++-
- src/dircolors.hin | 7 +++++--
- tests/misc/dircolors.pl | 14 ++++++++++++++
- 4 files changed, 36 insertions(+), 3 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index f2fbcbb..646c132 100644
---- a/NEWS
-+++ b/NEWS
-@@ -64,6 +64,9 @@ GNU coreutils NEWS -*- outline -*-
- on (1024*5) buffer boundaries
- [bug introduced in coreutils-8.31]
-
-+ dircolors will now also match COLORTERM in addition to TERM environment
-+ variables. The default config will apply colors with any COLORTERM set.
-+
- ** Changes in behavior
-
- cp and install now default to copy-on-write (COW) if available.
-diff --git a/src/dircolors.c b/src/dircolors.c
-index b765ded..64ff665 100644
---- a/src/dircolors.c
-+++ b/src/dircolors.c
-@@ -243,6 +243,7 @@ dc_parse_stream (FILE *fp, char const *filename)
- size_t input_line_size = 0;
- char const *line;
- char const *term;
-+ char const *colorterm;
- bool ok = true;
-
- /* State for the parser. */
-@@ -253,6 +254,11 @@ dc_parse_stream (FILE *fp, char const *filename)
- if (term == NULL || *term == '\0')
- term = "none";
-
-+ /* Also match $COLORTERM. */
-+ colorterm = getenv ("COLORTERM");
-+ if (colorterm == NULL)
-+ colorterm = ""; /* Doesn't match default "?*" */
-+
- while (true)
- {
- char *keywd, *arg;
-@@ -299,10 +305,17 @@ dc_parse_stream (FILE *fp, char const *filename)
- else if (state != ST_TERMSURE)
- state = ST_TERMNO;
- }
-+ else if (c_strcasecmp (keywd, "COLORTERM") == 0)
-+ {
-+ if (fnmatch (arg, colorterm, 0) == 0)
-+ state = ST_TERMSURE;
-+ else if (state != ST_TERMSURE)
-+ state = ST_TERMNO;
-+ }
- else
- {
- if (state == ST_TERMSURE)
-- state = ST_TERMYES; /* Another TERM can cancel */
-+ state = ST_TERMYES; /* Another {COLOR,}TERM can cancel. */
-
- if (state != ST_TERMNO)
- {
-diff --git a/src/dircolors.hin b/src/dircolors.hin
-index b5d6452..6d2d3a4 100644
---- a/src/dircolors.hin
-+++ b/src/dircolors.hin
-@@ -8,8 +8,11 @@
- # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
- # slackware version of dircolors) are recognized but ignored.
-
--# Below are TERM entries, which can be a glob patterns, to match
--# against the TERM environment variable to determine if it is colorizable.
-+# Global config options can be specified before TERM or COLORTERM entries
-+
-+# Below are TERM or COLORTERM entries, which can be glob patterns, which
-+# restrict following config to systems with matching environment variables.
-+COLORTERM ?*
- TERM Eterm
- TERM ansi
- TERM *color*
-diff --git a/tests/misc/dircolors.pl b/tests/misc/dircolors.pl
-index 2c57104..464acfd 100755
---- a/tests/misc/dircolors.pl
-+++ b/tests/misc/dircolors.pl
-@@ -42,6 +42,20 @@ my @Tests =
- ['term-4', '-b', {IN => "TERM N*match\nowt 40;33\n"},
- {OUT => "LS_COLORS='';\nexport LS_COLORS\n"}],
-
-+ ['print-clash1', '-p', '--print-ls',
-+ {ERR => "dircolors: options --print-database and --print-ls-colors " .
-+ "are mutually exclusive\n" .
-+ "Try 'dircolors --help' for more information.\n"},
-+ {EXIT => 1}],
-+ ['print-clash2', '-b', '--print-database',
-+ {ERR => "dircolors: the options to output non shell syntax,\n" .
-+ "and to select a shell syntax are mutually exclusive\n" .
-+ "Try 'dircolors --help' for more information.\n"},
-+ {EXIT => 1}],
-+
-+ ['print-ls-colors', '--print-ls-colors', {IN => "OWT 40;33\n"},
-+ {OUT => "\x1B[40;33mtw\t40;33\x1B[0m\n"}],
-+
- # CAREFUL: always specify the -b option, unless explicitly testing
- # for csh syntax output.
- );
---
-2.34.1
-
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
index 150e67920b1..ddaba5484b5 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/metadata.xml
@@ -12,6 +12,7 @@
<flag name="hostname">Build the hostname program</flag>
<flag name="kill">Build the kill program</flag>
<flag name="multicall">Build all tools into a single `coreutils` program akin to busybox to save space</flag>
+ <flag name="openssl">Use openssl libcrypto hash routines for hash functions</flag>
<flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
</use>
<upstream>
diff --git a/sys-apps/cpint/metadata.xml b/sys-apps/cpint/metadata.xml
index 792d342c716..08ce25450ba 100644
--- a/sys-apps/cpint/metadata.xml
+++ b/sys-apps/cpint/metadata.xml
@@ -3,6 +3,6 @@
<pkgmetadata>
<maintainer type="project">
<email>s390@gentoo.org</email>
- <name>Gentoo Linux s390 Development</name>
+ <name>s390 architecture team</name>
</maintainer>
</pkgmetadata>
diff --git a/sys-apps/cpu-x/Manifest b/sys-apps/cpu-x/Manifest
new file mode 100644
index 00000000000..da2a55e560d
--- /dev/null
+++ b/sys-apps/cpu-x/Manifest
@@ -0,0 +1,2 @@
+DIST cpu-x-4.5.1.tar.gz 1916681 BLAKE2B cf0e14050a884cbd763fb5bfe56a93db4c3e4bf0322f55304d6fe09d5b38210ee4139641654aee205761d3327f1b498d0dc88640c6432c4a9b0c62193c0671da SHA512 25b2d51ae093c5cb607aa77e05be0f62df3dc1d2022d96a2cfe935fedcbe2f5f85d9da16e1df05377a7e02280365c165ee93a2c22d1e4364d008bd669a69b2ec
+DIST cpu-x-4.5.2.tar.gz 1919087 BLAKE2B d4f1564496f2aded5b40f1cce0ca3e5213486b266b4375035294d5564b9a4a59a2cb3ff87fd27280b2f32a3fe233a2f5dcc09d9a1acbefd16d270c0ff871b96e SHA512 a1700293930d7030f5240296f98c40d0e3e7e228678ebb3f87eebaa1939eec9905171ea3716968cad117dc6e4f173ebabe66c5f175b55e45b42b3d373a6f30e5
diff --git a/sys-apps/cpu-x/cpu-x-4.5.1.ebuild b/sys-apps/cpu-x/cpu-x-4.5.1.ebuild
new file mode 100644
index 00000000000..10628d3fa7e
--- /dev/null
+++ b/sys-apps/cpu-x/cpu-x-4.5.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="CPU-X"
+
+inherit cmake gnome2-utils xdg
+
+DESCRIPTION="A Free software that gathers information on CPU, motherboard and more"
+HOMEPAGE="https://thetumultuousunicornofdarkness.github.io/CPU-X/"
+SRC_URI="https://github.com/TheTumultuousUnicornOfDarkness/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+cpu force-libstatgrab +gpu +gui +ncurses +nls opencl +pci test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/pango
+ force-libstatgrab? ( sys-libs/libstatgrab )
+ !force-libstatgrab? ( sys-process/procps:= )
+ gui? ( >=x11-libs/gtk+-3.12:3 )
+ cpu? ( >=dev-libs/libcpuid-0.6.0:= )
+ gpu? ( >=media-libs/glfw-3.3
+ media-libs/libglvnd )
+ pci? ( sys-apps/pciutils )
+ ncurses? ( sys-libs/ncurses:=[tinfo] )
+ opencl? ( virtual/opencl )
+"
+
+DEPEND="
+ test? (
+ sys-apps/mawk
+ sys-apps/nawk
+ )
+
+ ${COMMON_DEPEND}
+"
+
+BDEPEND="
+ dev-lang/nasm
+ nls? ( sys-devel/gettext )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DFORCE_LIBSTATGRAB=$(usex force-libstatgrab)
+ -DWITH_GETTEXT=$(usex nls)
+ -DWITH_GTK=$(usex gui)
+ -DWITH_LIBCPUID=$(usex cpu)
+ -DWITH_LIBGLFW=$(usex gpu)
+ -DWITH_LIBPCI=$(usex pci)
+ -DWITH_LIBSTATGRAB=OFF
+ -DWITH_NCURSES=$(usex ncurses)
+ -DWITH_OPENCL=$(usex opencl)
+ )
+ use gui && mycmakeargs+=( -DGSETTINGS_COMPILE=OFF )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/sys-apps/cpu-x/cpu-x-4.5.2.ebuild b/sys-apps/cpu-x/cpu-x-4.5.2.ebuild
new file mode 100644
index 00000000000..10628d3fa7e
--- /dev/null
+++ b/sys-apps/cpu-x/cpu-x-4.5.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="CPU-X"
+
+inherit cmake gnome2-utils xdg
+
+DESCRIPTION="A Free software that gathers information on CPU, motherboard and more"
+HOMEPAGE="https://thetumultuousunicornofdarkness.github.io/CPU-X/"
+SRC_URI="https://github.com/TheTumultuousUnicornOfDarkness/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+cpu force-libstatgrab +gpu +gui +ncurses +nls opencl +pci test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/pango
+ force-libstatgrab? ( sys-libs/libstatgrab )
+ !force-libstatgrab? ( sys-process/procps:= )
+ gui? ( >=x11-libs/gtk+-3.12:3 )
+ cpu? ( >=dev-libs/libcpuid-0.6.0:= )
+ gpu? ( >=media-libs/glfw-3.3
+ media-libs/libglvnd )
+ pci? ( sys-apps/pciutils )
+ ncurses? ( sys-libs/ncurses:=[tinfo] )
+ opencl? ( virtual/opencl )
+"
+
+DEPEND="
+ test? (
+ sys-apps/mawk
+ sys-apps/nawk
+ )
+
+ ${COMMON_DEPEND}
+"
+
+BDEPEND="
+ dev-lang/nasm
+ nls? ( sys-devel/gettext )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DFORCE_LIBSTATGRAB=$(usex force-libstatgrab)
+ -DWITH_GETTEXT=$(usex nls)
+ -DWITH_GTK=$(usex gui)
+ -DWITH_LIBCPUID=$(usex cpu)
+ -DWITH_LIBGLFW=$(usex gpu)
+ -DWITH_LIBPCI=$(usex pci)
+ -DWITH_LIBSTATGRAB=OFF
+ -DWITH_NCURSES=$(usex ncurses)
+ -DWITH_OPENCL=$(usex opencl)
+ )
+ use gui && mycmakeargs+=( -DGSETTINGS_COMPILE=OFF )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/sys-apps/cpu-x/metadata.xml b/sys-apps/cpu-x/metadata.xml
new file mode 100644
index 00000000000..52d661f4aca
--- /dev/null
+++ b/sys-apps/cpu-x/metadata.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>bkohler@gentoo.org</email>
+ <name>Ben Kohler</name>
+ </maintainer>
+ <longdescription>
+ <pkg>sys-apps/cpu-x</pkg> is similar to CPU-Z (Windows), but, unlike
+ the latter, it is a Free and Open Source software, written in C and
+ designed for GNU/Linux. It can also be used in graphical mode by using
+ <pkg>x11-libs/gtk+</pkg>, than in text-based mode with the use of
+ <pkg>sys-libs/ncurses</pkg>.
+ </longdescription>
+ <longdescription lang="fr">
+ <pkg>sys-apps/cpu-x</pkg> est similaire à CPU-Z (Windows), mais,
+ contrairement à ce dernier, c'est un logiciel Libre et Open Source,
+ écrit en C et concu pour GNU/Linux. Il peut être aussi bien utilisé en
+ mode graphique en utlisant <pkg>x11-libs/gtk+</pkg>, qu'en mode textuel
+ avec l'utilisation de <pkg>sys-libs/ncurses</pkg>.
+ </longdescription>
+ <use>
+ <flag name="force-libstatgrab">Use <pkg>sys-libs/libstatgrab</pkg> to instead of <pkg>sys-process/procps</pkg></flag>
+ <flag name="cpu">Use the <pkg>dev-libs/libcpuid</pkg> library for CPU info</flag>
+ <flag name="gpu">Use the <pkg>media-libs/glfw</pkg> library for GPU info</flag>
+ <flag name="pci">Use the <pkg>sys-apps/pciutils</pkg> library for PCI info</flag>
+ <flag name="opencl">Use the <pkg>virtual/opencl</pkg> library</flag>
+ </use>
+ <use lang="fr">
+ <flag name="bandwidth">Intégrer bandwidth</flag>
+ <flag name="dmidecode">Intégrer dmidecode</flag>
+ <flag name="force-libstatgrab">Utiliser <pkg>sys-libs/libstatgrab</pkg> à la place de <pkg>sys-process/procps</pkg></flag>
+ <flag name="libcpuid">Utiliser la bibliothèque <pkg>dev-libs/libcpuid</pkg></flag>
+ <flag name="libglfw">Utiliser la bibliothèque <pkg>media-libs/glfw</pkg></flag>
+ <flag name="libpci">Utiliser la bibliothèque <pkg>sys-apps/pciutils</pkg></flag>
+ <flag name="opencl">Utiliser la bibliothèque <pkg>virtual/opencl</pkg></flag>
+ </use>
+ <upstream>
+ <maintainer status="active">
+ <name>X0rg</name>
+ </maintainer>
+ <changelog>https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog</changelog>
+ <doc>https://github.com/X0rg/CPU-X/wiki/</doc>
+ <bugs-to>https://github.com/X0rg/CPU-X/issues/</bugs-to>
+ <remote-id type="github">X0rg/CPU-X</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 86fd2a311a9..e227dc07c36 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1 +1 @@
-DIST cpuid-20220620.src.tar.gz 134487 BLAKE2B 37beeeef5bbeed47d762f093a568e18ac06b32b4c8c4d763656c5310c78b949c60aaf4e874b15485af15be1e31c389692a0ab277a95a0dcb0b66a7dbece50a52 SHA512 e06db43fb12efa1d112267993754965b8a2b07c914766a46a0fe6fdcf023606cfb132eac575726ad9ed7d0e6fc53d728a6d3d3d7abf2f484f002825c791da7b9
+DIST cpuid-20221003.src.tar.gz 138457 BLAKE2B 0eef33fc38ff0bb96bec2928a376cf849a5141e1fd161f1a2649e106543a0eb0b29b13e450ad11e251398dda155dc817944c5c81c3ff0b0fc2d7c92779c3ff0a SHA512 7e787caf59e980cf1eca8012d6269b61cd8bf0a1a79c4534d8bb9924b6eff2fa5c0408bc8581e50ef205a280e7861ca62a7d49e7378faff0f185a97463a115a1
diff --git a/sys-apps/cpuid/cpuid-20220620.ebuild b/sys-apps/cpuid/cpuid-20221003.ebuild
index eddf220e872..eddf220e872 100644
--- a/sys-apps/cpuid/cpuid-20220620.ebuild
+++ b/sys-apps/cpuid/cpuid-20221003.ebuild
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index 1cb0462e551..63e4e2c58cc 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1 +1,2 @@
DIST cracklib-words-2.9.7.gz 5537586 BLAKE2B 242afa5e3615b159c59d27c99b87f008f245351cc7e4bd8dc975e66b4ef98456841c6a213282744d39c221c8646dc8e0c5ad99f277f37ae3e64bc949f6b57187 SHA512 1fa34b0a2e16d6906982b248f1757bf5bf8154d8d7e8bab94a4ac25080c41434d3828a2c8dd5065e9be586f36480ab70375f09e0bb64eb495d96a460619e2bae
+DIST cracklib-words-2.9.8.gz 5537586 BLAKE2B ca56229852211094c17b2a612100b5b6e4e4f6aafa7cbfae8f779296370b01e5cae26d7d51dd69af6291946a1781cd19f8652bdff7f358c2e50d26c9e263c2fd SHA512 1700c56b9776b7ae4684b9ab1e784dd7707550bce2149301f662618a4f00a2eb0ba2d1a206c09aac22f7d95bc561544d412d2fdac5008fc3aabc4872e8a74afc
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.8.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.8.ebuild
new file mode 100644
index 00000000000..5d47659449b
--- /dev/null
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: ideally bump with sys-libs/cracklib
+DESCRIPTION="Large set of crack/cracklib dictionaries"
+HOMEPAGE="https://github.com/cracklib/cracklib/"
+SRC_URI="https://github.com/cracklib/cracklib/releases/download/v${PV}/${P}.gz"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+
+src_install() {
+ insinto /usr/share/dict
+ newins ${P} ${PN}
+}
+
+pkg_postinst() {
+ if [[ -n ${ROOT} ]] && create-cracklib-dict -h >&/dev/null ; then
+ ebegin "Regenerating cracklib dictionary"
+ create-cracklib-dict /usr/share/dict/* >/dev/null
+ eend $?
+ fi
+}
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 82c0c422477..48e5cac669f 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,9 +1,2 @@
-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
-DIST c-rbtree-8aa7bd1828eedb19960f9eef98d15543ec9f34eb.tar.gz 25957 BLAKE2B 76b67a5efeafbf68fe3f1db732d1ad878cee7c23596dda096649c30205582f3d7fca99c5b99ced69b027cd3100351da03aacad00c3aa24d3a0604b09093ecb99 SHA512 57305a5a438a2dd69662dec02117d2636e50f901cb92a251c3844a343108ebeeaa208bb09dbeb22dc1b8d1171719442f4ccc248d89909cdd7310b7db6cfcd6cb
-DIST c-shquote-83ccc2893385fcca1424b188f0f6c45a62f2b38d.tar.gz 10622 BLAKE2B 1c705c47ca22dfb3cb0a277ea96156806d1c0e9913da48a2baeea4e2e455e7f417f48db24c94770b7e471655a1c109a23679ce11ed802447e0b41ac3c60f822e SHA512 499fb764a2f72e1151c0007975720b56912f88f0ef92bb88c6b1870fcc8e815af8b377e1e6fb9829426757781134d9ec20cf04cda273ca2a5c128705b36dd3ef
-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-31.tar.xz 239520 BLAKE2B ba34308de7c598e72ac3874894fb90ebc6970840eb2fc193a2b3294033759b39d7d712695ddbc88c3b947842b0131e0a068ffe3cef616ce431d9a8c021f30593 SHA512 22fd53cff84e48ae1c11303b5340e16dc9b7124c9e562174c1f0af465c55d69bb8b2768063de281f6f791442126a29ab864ad6b8acf110247a500f6425eae5d9
+DIST dbus-broker-32.tar.xz 248196 BLAKE2B 511159673f0e3a2260e611b85b80719506e9eafe9d93d743891be664e4a79e3ade48f6ec047fa085c414087673290d6b958eec30d3b0d27048e2c1a1521d6c10 SHA512 aa23d058771f56e6378df0a17ac413813b6350b77e61128c0887f35a546f10534b1a6d598868e9f5c642244c3632a8ce5e315e6794305a56f5abbebd36bf822c
diff --git a/sys-apps/dbus-broker/dbus-broker-29.ebuild b/sys-apps/dbus-broker/dbus-broker-29.ebuild
deleted file mode 100644
index c9cca56ea57..00000000000
--- a/sys-apps/dbus-broker/dbus-broker-29.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2017-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
-else
- KEYWORDS="amd64 arm64 ppc64 ~riscv"
- SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
- declare -Ag SUBPROJECTS=(
- [c-dvar]=c8ea9712a94186512c22c32f32c421d6a2db6feb
- [c-ini]=204410a08d3a6c8221f6f0baf0355ce5af0232ed
- [c-list]=a0970f12f1f406a5578a5dedf3580cd682e55812
- [c-rbtree]=8aa7bd1828eedb19960f9eef98d15543ec9f34eb
- [c-shquote]=83ccc2893385fcca1424b188f0f6c45a62f2b38d
- [c-stdaux]=8652c488b8f1c29629a5179d4551d0a691ae5901
- [c-utf8]=0837214a9780b7d771a3b3ce9a49196ac0a9d52f
- )
- for sp in "${!SUBPROJECTS[@]}"; do
- commit=${SUBPROJECTS[${sp}]}
- SRC_URI+=" https://github.com/c-util/${sp}/archive/${commit}/${sp}-${commit}.tar.gz"
- done
- unset sp commit
-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
-"
-
-src_prepare() {
- if [[ ${PV} != 9999 ]]; then
- local sp commit
- for sp in "${!SUBPROJECTS[@]}"; do
- commit=${SUBPROJECTS[${sp}]}
- rmdir "subprojects/${sp}" || die
- mv "${WORKDIR}/${sp}-${commit}" "subprojects/${sp}" || die
- done
- fi
- default
-}
-
-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-32.ebuild b/sys-apps/dbus-broker/dbus-broker-32.ebuild
new file mode 100644
index 00000000000..b910903b5f1
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-32.ebuild
@@ -0,0 +1,65 @@
+# 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="apparmor audit doc +launcher selinux"
+
+DEPEND="
+ apparmor? (
+ >=sys-libs/libapparmor-3.0
+ )
+ 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}/dbus-broker-32-apparmor-libaudit.patch"
+)
+
+if [[ ${PV} == 9999 ]]; then
+src_unpack() {
+ git-r3_src_unpack
+ cd "${P}" || die
+ meson subprojects download || die
+}
+fi
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use apparmor)
+ $(meson_use audit)
+ $(meson_use doc docs)
+ $(meson_use launcher)
+ $(meson_use selinux)
+ )
+ meson_src_configure
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index cf73e0592fa..9345691d61b 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -18,9 +18,12 @@ HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="audit doc +launcher selinux"
+IUSE="apparmor audit doc +launcher selinux"
DEPEND="
+ apparmor? (
+ >=sys-libs/libapparmor-3.0
+ )
audit? (
>=sys-process/audit-3.0
>=sys-libs/libcap-ng-0.6
@@ -48,10 +51,11 @@ 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_use apparmor)
+ $(meson_use audit)
+ $(meson_use doc docs)
+ $(meson_use launcher)
+ $(meson_use selinux)
)
meson_src_configure
}
diff --git a/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch b/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch
new file mode 100644
index 00000000000..95bdb9a407e
--- /dev/null
+++ b/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch
@@ -0,0 +1,26 @@
+From ef1c9f03a6be40474486044b6a28780d12107d9b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 26 Sep 2022 14:07:29 -0400
+Subject: [PATCH] Drop '#include <libaudit.h>' from src/util/apparmor.c
+
+This header does not seem to be required.
+Tested with -Dapparmor=true and -Daudit=true/-Daudit=false.
+
+Bug: https://bugs.gentoo.org/873082
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ src/util/apparmor.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/util/apparmor.c b/src/util/apparmor.c
+index f319ffcf..4b7a7809 100644
+--- a/src/util/apparmor.c
++++ b/src/util/apparmor.c
+@@ -8,7 +8,6 @@
+
+ #include <c-rbtree.h>
+ #include <c-stdaux.h>
+-#include <libaudit.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/apparmor.h>
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 19ec71675e8..11d823d0f66 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,3 +1 @@
-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
+DIST dbus-1.15.2.tar.xz 1395516 BLAKE2B fdfaf8a1a407ddcac23ce5d22497b975b4b95e62a8afaa1ed8f5f25933ad4a113aea4a39c686c1e4a046e2a05b83ab7bb9c063f77012caaa7ecbdc8ea522259c SHA512 486eab8c4f87d75e988558724bff1b0708c969341ecb62bcb9d0b0612a653ac2674aa7caa4d129dd81c00af7989b122ee7837599262c9a0c5c7f9335ed3dacaf
diff --git a/sys-apps/dbus/dbus-1.12.20-r5.ebuild b/sys-apps/dbus/dbus-1.12.20-r5.ebuild
deleted file mode 100644
index a60671c3d11..00000000000
--- a/sys-apps/dbus/dbus-1.12.20-r5.ebuild
+++ /dev/null
@@ -1,284 +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 )
- 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-r2.ebuild b/sys-apps/dbus/dbus-1.12.22-r2.ebuild
deleted file mode 100644
index 78249a09918..00000000000
--- a/sys-apps/dbus/dbus-1.12.22-r2.ebuild
+++ /dev/null
@@ -1,290 +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 )
- 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-r2.ebuild b/sys-apps/dbus/dbus-1.14.0-r2.ebuild
deleted file mode 100644
index eb763dd3481..00000000000
--- a/sys-apps/dbus/dbus-1.14.0-r2.ebuild
+++ /dev/null
@@ -1,293 +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 )
- 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.15.2.ebuild
index 19c59de260f..9f299a3bba2 100644
--- a/sys-apps/dbus/dbus-1.14.0-r4.ebuild
+++ b/sys-apps/dbus/dbus-1.15.2.ebuild
@@ -1,14 +1,18 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
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
+# From 1.15.0 release notes:
+# "• Add a Meson build system. This is currently considered experimental,
+# but the intention is for it to replace Autotools and/or CMake in future
+# releases, preferably both. Please test!"
+# We haven't migrated to it yet as it's experimental but our elogind
+# patch needs adjusting too (and upstreaming, ideally!)
+# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/NEWS#L31
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"
@@ -17,7 +21,7 @@ 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"
+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 )"
@@ -34,7 +38,10 @@ BDEPEND="
COMMON_DEPEND="
>=dev-libs/expat-2.1.0
elogind? ( sys-auth/elogind )
- selinux? ( sys-libs/libselinux )
+ selinux? (
+ sys-process/audit
+ sys-libs/libselinux
+ )
systemd? ( sys-apps/systemd:0= )
X? (
x11-libs/libX11
@@ -63,14 +70,8 @@ DOC_CONTENTS="
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"
+ "${FILESDIR}/dbus-1.15.0-enable-elogind.patch"
+ "${FILESDIR}/dbus-1.15.0-daemon-optional.patch" # bug #653136
)
pkg_setup() {
@@ -122,6 +123,7 @@ multilib_src_configure() {
# not on an SELinux profile.
myconf=(
--localstatedir="${EPREFIX}/var"
+ --runstatedir="${EPREFIX}${rundir}"
$(use_enable static-libs static)
$(use_enable debug verbose-mode)
--disable-asserts
diff --git a/sys-apps/dbus/files/80-dbus b/sys-apps/dbus/files/80-dbus
deleted file mode 100644
index 5593e2cd739..00000000000
--- a/sys-apps/dbus/files/80-dbus
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# launches a session dbus instance
-
-dbuslaunch="`which 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/dbus/files/dbus-1.12.22-check-fd.patch b/sys-apps/dbus/files/dbus-1.12.22-check-fd.patch
deleted file mode 100644
index 9038411bb13..00000000000
--- a/sys-apps/dbus/files/dbus-1.12.22-check-fd.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 769a0462befb9829594a76e675526aba8579317e Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 27 Mar 2022 15:09:48 -0400
-Subject: [PATCH] sysdeps-unix: check fd before calling
- _dbus_fd_set_close_on_exec()
-
-If /proc/self/oom_score_adj does not exist, fd will invalid (-1).
-Attempting to set the CLOEXEC flag will obviously fail, and we lose the
-original errno value from open().
-
-Bug: https://bugs.gentoo.org/834725
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- dbus/dbus-sysdeps-util-unix.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
-index 314ce64b..8f079cbf 100644
---- a/dbus/dbus-sysdeps-util-unix.c
-+++ b/dbus/dbus-sysdeps-util-unix.c
-@@ -1633,7 +1633,8 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
- if (fd < 0)
- {
- fd = open ("/proc/self/oom_score_adj", O_RDWR);
-- _dbus_fd_set_close_on_exec (fd);
-+ if (fd >= 0)
-+ _dbus_fd_set_close_on_exec (fd);
- }
-
- if (fd >= 0)
---
-GitLab
-
diff --git a/sys-apps/dbus/files/dbus-1.14.0-oom_score_adj.patch b/sys-apps/dbus/files/dbus-1.14.0-oom_score_adj.patch
deleted file mode 100644
index 09452970808..00000000000
--- a/sys-apps/dbus/files/dbus-1.14.0-oom_score_adj.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 499cdfde1b3f5d812912e89b1a1a0d7a4fb83306 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@collabora.com>
-Date: Fri, 1 Apr 2022 18:58:34 +0100
-Subject: [PATCH 1/2] activation-helper: Never crash if unable to write
- oom_score_adj
-
-_dbus_warn() normally only logs a warning, but can be made fatal by
-environment variables. In particular, we do that during unit testing,
-which can result in a build-time test failure if dbus is built in a
-sandbox environment that prevents write access.
-
-_dbus_log() does only the logging part of _dbus_warn(), which seems
-more appropriate here.
-
-Signed-off-by: Simon McVittie <smcv@collabora.com>
----
- bus/activation-helper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bus/activation-helper.c b/bus/activation-helper.c
-index 8a4fd732..df0472ce 100644
---- a/bus/activation-helper.c
-+++ b/bus/activation-helper.c
-@@ -348,7 +348,7 @@ exec_for_correct_user (char *exec, char *user, DBusError *error)
- /* Resetting the OOM score adjustment is best-effort, so we don't
- * treat a failure to do so as fatal. */
- if (!_dbus_reset_oom_score_adj (&error_str))
-- _dbus_warn ("%s: %s", error_str, strerror (errno));
-+ _dbus_log (DBUS_SYSTEM_LOG_WARNING, "%s: %s", error_str, strerror (errno));
-
- if (!switch_user (user, error))
- return FALSE;
---
-GitLab
-
-
-From 5c8e5b7140c4f1f88684c7a83ce9587fff2def0c Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@collabora.com>
-Date: Fri, 1 Apr 2022 18:56:26 +0100
-Subject: [PATCH 2/2] sysdeps: Only open oom_score_adj read/write if we need to
- write it
-
-If we're running in a sandbox, we might not have write access to
-oom_score_adj. In the common case where we don't have any special
-protection from the OOM-killer, we can detect that with only read
-access, and skip the part where we open it for writing.
-
-(We would also not have write access to oom_score_adj if we're running
-with elevated Linux capabilities while not root, but that should never
-actually happen for dbus-daemon-launch-helper, which is setuid root
-for production use or has no capabilities during unit-testing.)
-
-Signed-off-by: Simon McVittie <smcv@collabora.com>
----
- dbus/dbus-sysdeps-util-unix.c | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
-index 8f079cbf..ca130cff 100644
---- a/dbus/dbus-sysdeps-util-unix.c
-+++ b/dbus/dbus-sysdeps-util-unix.c
-@@ -1627,12 +1627,12 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
- const char *error_str = NULL;
-
- #ifdef O_CLOEXEC
-- fd = open ("/proc/self/oom_score_adj", O_RDWR | O_CLOEXEC);
-+ fd = open ("/proc/self/oom_score_adj", O_RDONLY | O_CLOEXEC);
- #endif
-
- if (fd < 0)
- {
-- fd = open ("/proc/self/oom_score_adj", O_RDWR);
-+ fd = open ("/proc/self/oom_score_adj", O_RDONLY);
- if (fd >= 0)
- _dbus_fd_set_close_on_exec (fd);
- }
-@@ -1680,6 +1680,26 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
- goto out;
- }
-
-+ close (fd);
-+#ifdef O_CLOEXEC
-+ fd = open ("/proc/self/oom_score_adj", O_WRONLY | O_CLOEXEC);
-+
-+ if (fd < 0)
-+#endif
-+ {
-+ fd = open ("/proc/self/oom_score_adj", O_WRONLY);
-+ if (fd >= 0)
-+ _dbus_fd_set_close_on_exec (fd);
-+ }
-+
-+ if (fd < 0)
-+ {
-+ ret = FALSE;
-+ error_str = "open(/proc/self/oom_score_adj) for writing";
-+ saved_errno = errno;
-+ goto out;
-+ }
-+
- if (pwrite (fd, "0", sizeof (char), 0) < 0)
- {
- ret = FALSE;
-@@ -1700,7 +1720,7 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
- else
- {
- ret = FALSE;
-- error_str = "open(/proc/self/oom_score_adj)";
-+ error_str = "open(/proc/self/oom_score_adj) for reading";
- saved_errno = errno;
- goto out;
- }
---
-GitLab
-
diff --git a/sys-apps/dbus/files/dbus-1.14.0-x-autoconf-fixes.patch b/sys-apps/dbus/files/dbus-1.14.0-x-autoconf-fixes.patch
deleted file mode 100644
index d9eb2a611bf..00000000000
--- a/sys-apps/dbus/files/dbus-1.14.0-x-autoconf-fixes.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-https://gitlab.freedesktop.org/dbus/dbus/-/commit/7d462fe93844df711ff8433ad798b54e57f8609d.patch
-(dropped NEWS to avoid conflicts with more patches in future)
-
-From fdbb32bd1f3c972d3d5fd3998930749206a1095a Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 1 Mar 2022 15:56:30 +0100
-Subject: [PATCH 1/6] build: Treat --with-x[=yes] the same as --with-x=auto
-
-Previously, --with-x would disable the check for X11 libraries, which
-was not intended.
-
-(cherry picked from commit 99cc28e0eb1a37233c0f7d3595175d1f331550e7)
---- a/configure.ac
-+++ b/configure.ac
-@@ -1115,7 +1115,7 @@ if test "x$dbus_win" = xyes; then
-
- enable_x11_autolaunch=no
- have_x11=no
--else if test "x$with_x" = xauto; then
-+else if test "x$with_x" != xno; then
- PKG_CHECK_MODULES([X], [x11],
- [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
- [ have_x11=no ])
-GitLab
-From 5f2577aea3c5291dbb97e77c7384924851b30102 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 1 Mar 2022 16:01:29 +0100
-Subject: [PATCH 2/6] Move DBUS_X_* definitions into PKG_CHECK_MODULES block
-
-(cherry picked from commit 51e468d828785cbc7060678f6f257723ba11cd10)
---- a/configure.ac
-+++ b/configure.ac
-@@ -1117,15 +1117,15 @@ if test "x$dbus_win" = xyes; then
- have_x11=no
- else if test "x$with_x" != xno; then
- PKG_CHECK_MODULES([X], [x11],
-- [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
-+ [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
-+ have_x11=yes
-+ DBUS_X_LIBS="$X_LIBS"
-+ DBUS_X_CFLAGS="$X_CFLAGS"
-+ ],
- [ have_x11=no ])
-
- if test "x$have_x11" = xno; then
- AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
-- else
-- have_x11=yes
-- DBUS_X_LIBS="$X_LIBS"
-- DBUS_X_CFLAGS="$X_CFLAGS"
- fi
- else
- AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
-GitLab
-From 5dad12f34c54e2359adfe8e7f122681df1d24bcb Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 1 Mar 2022 16:05:52 +0100
-Subject: [PATCH 3/6] Emit an error when --with-x was given but no X11 libs
- were found
-
-(cherry picked from commit 17c88a894499da64460a0ef76db1d8b88ceb9eeb)
---- a/configure.ac
-+++ b/configure.ac
-@@ -1121,12 +1121,13 @@ else if test "x$with_x" != xno; then
- have_x11=yes
- DBUS_X_LIBS="$X_LIBS"
- DBUS_X_CFLAGS="$X_CFLAGS"
-- ],
-- [ have_x11=no ])
--
-- if test "x$have_x11" = xno; then
-- AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
-- fi
-+ ], [
-+ AS_IF([test "x$with_x" = xyes],
-+ [AC_MSG_ERROR([Couldn't find X11, tried with pkg-config.])],
-+ [AC_MSG_WARN([Couldn't find X11, tried with pkg-config.])]
-+ )
-+ have_x11=no
-+ ])
- else
- AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
- AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
-GitLab
-From e03554eb0bf2731e39c06191403f7544df9bb307 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 1 Mar 2022 16:08:06 +0100
-Subject: [PATCH 4/6] Add have_x11=no if --without-x was given to make later
- checks happy
-
-(cherry picked from commit bf3cb42c6db1f4479467d66a111b08a98afef31b)
---- a/configure.ac
-+++ b/configure.ac
-@@ -1129,6 +1129,7 @@ else if test "x$with_x" != xno; then
- have_x11=no
- ])
- else
-+ have_x11=no
- AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
- AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
- ])
-GitLab
-From 62361f47f9da2346a9ff9a8c4b4bd4a288dc44d5 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 1 Mar 2022 16:11:05 +0100
-Subject: [PATCH 5/6] Convert "if" calls to AS_IF macro for the block that
- handles X11
-
-(cherry picked from commit c71f013a64cd7f6de4c9cf3cf3b236239d713eb1)
---- a/configure.ac
-+++ b/configure.ac
-@@ -1108,14 +1108,14 @@ AC_ARG_ENABLE([x11-autolaunch],
- AS_HELP_STRING([--enable-x11-autolaunch], [build with X11 auto-launch support]),
- [], [enable_x11_autolaunch=auto])
-
--if test "x$dbus_win" = xyes; then
-- if test "x$enable_x11_autolaunch" = xyes; then
-+AS_IF([test "x$dbus_win" = xyes], [
-+ AS_IF([test "x$enable_x11_autolaunch" = xyes], [
- AC_MSG_ERROR([X11 auto-launch is not supported on Windows])
-- fi
-+ ])
-
- enable_x11_autolaunch=no
- have_x11=no
--else if test "x$with_x" != xno; then
-+], [test "x$with_x" != xno], [
- PKG_CHECK_MODULES([X], [x11],
- [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
- have_x11=yes
-@@ -1128,13 +1128,12 @@ else if test "x$with_x" != xno; then
- )
- have_x11=no
- ])
--else
-+], [
- have_x11=no
- AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
- AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
- ])
--fi
--fi
-+])
-
- if test "x$enable_x11_autolaunch,$have_x11" = xyes,no; then
- AC_MSG_ERROR([X11 auto-launch requires X headers/libraries])
-GitLab
diff --git a/sys-apps/dbus/files/dbus-daemon-optional.patch b/sys-apps/dbus/files/dbus-1.15.0-daemon-optional.patch
index 353dcb5761b..2b9cd03472d 100644
--- a/sys-apps/dbus/files/dbus-daemon-optional.patch
+++ b/sys-apps/dbus/files/dbus-1.15.0-daemon-optional.patch
@@ -1,18 +1,13 @@
+https://bugs.gentoo.org/653136
+
From 3c08d28fbae8b0ef3839ef26f8d2a713a9a684f9 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 21 Feb 2019 23:53:19 +0100
Subject: [PATCH] Make dbus daemon build optional
----
- bus/Makefile.am | 2 ++
- configure.ac | 17 ++++++++++++++++-
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/bus/Makefile.am b/bus/Makefile.am
-index 9ae3071..26a770c 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
-@@ -70,6 +70,7 @@ agentdir=$(LAUNCHD_AGENT_DIR)
+@@ -76,6 +76,7 @@ agentdir=$(LAUNCHD_AGENT_DIR)
agent_DATA=org.freedesktop.dbus-session.plist
endif
@@ -20,19 +15,17 @@ index 9ae3071..26a770c 100644
if DBUS_BUS_ENABLE_KQUEUE
DIR_WATCH_SOURCE=dir-watch-kqueue.c
else
-@@ -241,6 +242,7 @@ test_bus_LDADD = \
- $(top_builddir)/dbus/libdbus-internal.la \
- $(DBUS_BUS_LIBS) \
+@@ -230,6 +231,7 @@ EXTRA_DIST += \
+ tmpfiles.d/dbus.conf.in \
+ tmpfiles.d/meson.build \
$(NULL)
+endif DBUS_DAEMON
- install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/session.d
-diff --git a/configure.ac b/configure.ac
-index be6b065..854e846 100644
+ if HAVE_SYSTEMD
+ systemdsystemunit_DATA = \
--- a/configure.ac
+++ b/configure.ac
-@@ -202,6 +202,7 @@ AC_ARG_ENABLE([apparmor],
+@@ -211,6 +211,7 @@ AC_ARG_ENABLE([apparmor],
[enable_apparmor=$enableval],
[enable_apparmor=auto])
AC_ARG_ENABLE(libaudit,AS_HELP_STRING([--enable-libaudit],[build audit daemon support for SELinux]),enable_libaudit=$enableval,enable_libaudit=auto)
@@ -40,9 +33,9 @@ index be6b065..854e846 100644
AC_ARG_ENABLE(inotify, AS_HELP_STRING([--enable-inotify],[build with inotify support (linux only)]),enable_inotify=$enableval,enable_inotify=auto)
AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
-@@ -830,7 +831,20 @@ AC_CHECK_FUNCS(getpeerucred getpeereid)
-
- AC_CHECK_FUNCS(pipe2 accept4)
+@@ -658,7 +659,20 @@ AC_CHECK_MEMBER([struct unpcbid.unp_pid],
+ [],
+ [[#include <sys/un.h>]])
-PKG_CHECK_MODULES([EXPAT], [expat])
+# dbusdaemon checks
@@ -62,14 +55,11 @@ index be6b065..854e846 100644
save_cflags="$CFLAGS"
save_libs="$LIBS"
-@@ -1824,6 +1838,7 @@ echo "
+@@ -1748,6 +1762,7 @@ echo "
Building bus stats API: ${enable_stats}
Building SELinux support: ${have_selinux}
Building AppArmor support: ${have_apparmor}
+ Building daemon: ${have_daemon}
Building inotify support: ${have_inotify}
Building kqueue support: ${have_kqueue}
- Building systemd support: ${have_systemd}
---
-2.20.1
-
+ Building elogind support: ${have_elogind}
diff --git a/sys-apps/dbus/files/dbus-enable-elogind.patch b/sys-apps/dbus/files/dbus-1.15.0-enable-elogind.patch
index 5cb5d649cd9..a6c0e1bd215 100644
--- a/sys-apps/dbus/files/dbus-enable-elogind.patch
+++ b/sys-apps/dbus/files/dbus-1.15.0-enable-elogind.patch
@@ -1,35 +1,16 @@
---- a/dbus/dbus-userdb-util.c 2015-09-30 16:48:40.000000000 +0200
-+++ b/dbus/dbus-userdb-util.c 2016-11-03 11:09:42.550520587 +0100
-@@ -32,6 +32,9 @@
- #if HAVE_SYSTEMD
- #include <systemd/sd-login.h>
- #endif
-+#if HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#endif
-
- /**
- * @addtogroup DBusInternalsUtils
-@@ -54,7 +57,7 @@
- const DBusUserInfo *info;
- dbus_bool_t result = FALSE;
-
--#ifdef HAVE_SYSTEMD
-+#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND)
- /* check if we have logind */
- if (access ("/run/systemd/seats/", F_OK) >= 0)
- {
---- a/configure.ac 2016-11-03 11:13:58.286528265 +0100
-+++ b/configure.ac 2016-11-03 11:22:11.210543063 +0100
-@@ -185,6 +185,7 @@
+https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/53
+https://bugs.gentoo.org/599494
+--- a/configure.ac
++++ b/configure.ac
+@@ -215,6 +215,7 @@ AC_ARG_ENABLE(inotify, AS_HELP_STRING([--enable-inotify],[build with inotify sup
AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)
+AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto)
AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto)
+ AC_ARG_ENABLE(traditional-activation, AS_HELP_STRING([--disable-traditional-activation], [Do not build support for service activation without using SystemdService]), enable_traditional_activation="$enableval", enable_traditional_activation=yes)
- AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install]))
-@@ -1184,6 +1185,24 @@
+@@ -904,6 +905,24 @@ fi
AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes)
@@ -54,7 +35,7 @@
dnl systemd detection
if test x$enable_systemd = xno ; then
have_systemd=no;
-@@ -1290,7 +1309,7 @@
+@@ -1024,7 +1043,7 @@ if test x$with_valgrind != xno; then
fi
#### Set up final flags
@@ -63,11 +44,32 @@
AC_SUBST([LIBDBUS_LIBS])
### X11 detection
-@@ -1949,6 +1968,7 @@
+@@ -1731,6 +1750,7 @@ echo "
Building AppArmor support: ${have_apparmor}
Building inotify support: ${have_inotify}
Building kqueue support: ${have_kqueue}
+ Building elogind support: ${have_elogind}
Building systemd support: ${have_systemd}
+ Traditional activation: ${enable_traditional_activation}
Building X11 code: ${have_x11}
- Building Doxygen docs: ${enable_doxygen_docs}
+--- a/dbus/dbus-userdb-util.c
++++ b/dbus/dbus-userdb-util.c
+@@ -39,6 +39,9 @@
+ #ifdef HAVE_SYSTEMD
+ #include <systemd/sd-login.h>
+ #endif
++#if HAVE_ELOGIND
++#include <elogind/sd-login.h>
++#endif
+
+ /**
+ * @addtogroup DBusInternalsUtils
+@@ -65,7 +68,7 @@ dbus_bool_t
+ _dbus_is_console_user (dbus_uid_t uid,
+ DBusError *error)
+ {
+-#ifdef HAVE_SYSTEMD
++#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND)
+ /* check if we have logind */
+ if (access ("/run/systemd/seats/", F_OK) >= 0)
+ {
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index 468b0d47e15..5810c5e0adb 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,2 +1,3 @@
DIST dcfldd-1.7.1.tar.gz 89413 BLAKE2B ad7572d6df51116ea71647363d50fcb03e389cbf52fc327c97ae50357290ce1aefda0ba229e167bac322edf73009fe8dc72378dab07090321e41eeaf249433c0 SHA512 d1120ef9b50e379015d50d00b6c8b24978ec58c05434580d67a1707f5e1d41d1e294ca5a7f9d1e7bfeabcb9fd7976b384db93a78f70421870d26391404ee4ae6
DIST dcfldd-1.7.tar.gz 81892 BLAKE2B bf34dcd3e0430421c36dbd9d6b3f5ea2d4a4cb41151db8f14deb48d4169d1008fee2776f2ae821ea40ca7743f2354db62520bc919206e02a6e525ed6a38a0fec SHA512 e1dc4773438914a8102a692c7b7cbf486a9b03111820facb0134b4b9d058751695d1a7c64481852026412aacbb0fa04a18f833ff77ca30f154d5067a07057f31
+DIST dcfldd-1.8.tar.gz 89853 BLAKE2B c4c492500962bbe5329b2b67387424a99fce9853a9ab8788894e981e8327f5945f9f9ddf8a7bf219e1ff2a506725e2bcee7180e862be09023bef961842b989f0 SHA512 68b1d5806a723a3b499220a007faafb60fd1baa1924511a2e56be41828e2ac517d40e4f53160feb67d5202b25abdf6d304a1e8f100b49594f31dcf0198aaf7da
diff --git a/sys-apps/dcfldd/dcfldd-1.8.ebuild b/sys-apps/dcfldd/dcfldd-1.8.ebuild
new file mode 100644
index 00000000000..c294c5f36e9
--- /dev/null
+++ b/sys-apps/dcfldd/dcfldd-1.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools
+
+DESCRIPTION="enhanced dd with features for forensics and security"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/dcfldd"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+DOCS=(
+ AUTHORS
+ CONTRIBUTING.md
+ ChangeLog
+ NEWS
+ README.md
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
diff --git a/sys-apps/dchroot/dchroot-0.12.1.ebuild b/sys-apps/dchroot/dchroot-0.12.1.ebuild
index 7f02674ae0a..fef8cb146e1 100644
--- a/sys-apps/dchroot/dchroot-0.12.1.ebuild
+++ b/sys-apps/dchroot/dchroot-0.12.1.ebuild
@@ -1,36 +1,27 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit toolchain-funcs
+inherit autotools
DESCRIPTION="Utility for managing chroots for non-root users"
-HOMEPAGE="https://packages.debian.org/unstable/admin/dchroot"
-SRC_URI="mirror://debian/pool/main/d/dchroot/dchroot_${PV}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P/-/_}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="sys-apps/help2man"
RDEPEND="!dev-util/schroot[dchroot]"
+BDEPEND="sys-apps/help2man"
PATCHES=(
- "${FILESDIR}"/${PN}-0.12.1-no-werror.patch
+ "${FILESDIR}"/${P}-make.patch
)
src_prepare() {
- 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() {
- emake CC="$(tc-getCC)"
+ eautoreconf #874318
}
diff --git a/sys-apps/dchroot/files/dchroot-0.12.1-make.patch b/sys-apps/dchroot/files/dchroot-0.12.1-make.patch
new file mode 100644
index 00000000000..1c6be7a65c9
--- /dev/null
+++ b/sys-apps/dchroot/files/dchroot-0.12.1-make.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/722920
+https://bugs.gentoo.org/824542
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4,8 +4,9 @@
+
+ INSTALL=install
+-CFLAGS=-Wl,-z,now -O2 -Wall -Wstrict-prototypes -Werror -g \
++CC := @CC@
++CFLAGS := @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ \
+ -DDCHROOT_VERSION="\"@DCHROOT_VERSION@\""
+
+-all: dchroot
++all: dchroot docs
+
+ docs: dchroot.1
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
deleted file mode 100644
index 4cd27019045..00000000000
--- a/sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
index 73dda144f9a..8963b14ac40 100644
--- a/sys-apps/diffutils/metadata.xml
+++ b/sys-apps/diffutils/metadata.xml
@@ -1,8 +1,12 @@
<?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>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:gnu:diffutils</remote-id>
+ <remote-id type="savannah">diffutils</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 3b0473fab54..c411b41d00d 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,2 +1 @@
-DIST dmidecode-3.3.tar.xz 56372 BLAKE2B 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e SHA512 dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
DIST dmidecode-3.4.tar.xz 61420 BLAKE2B f9f0429c5128692c2d1d560580552285ea900c1c9ef6f68f0e2133ae1ef05b85a943e882f915d3ef969b7a7e3f3f6bbc4ec391e7bd3d98092976ddbf02421c49 SHA512 62990b6159e5a7c8688d37e44957e7948391d2c6afeabaa4514ba9dad2d08b020297676e2dbbfcb6471efc6fb6f3682750422931a953f78f358bb3dd3745e95b
diff --git a/sys-apps/dmidecode/dmidecode-3.3.ebuild b/sys-apps/dmidecode/dmidecode-3.3.ebuild
deleted file mode 100644
index 4bf9154f283..00000000000
--- a/sys-apps/dmidecode/dmidecode-3.3.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
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="https://www.nongnu.org/dmidecode/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv x86 ~x86-solaris"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
-DEPEND=""
-
-src_prepare() {
- default
- sed -i \
- -e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
- -e "/^docdir/s:dmidecode:${PF}:" \
- -e '/^PROGRAMS !=/d' \
- Makefile || die
-}
-
-src_compile() {
- emake \
- CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
- if [[ ${CHOST} == *-solaris* ]] ; then
- einfo "dmidecode needs root privileges to read /dev/xsvc"
- einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
- einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
- einfo "information without requiring root privileges."
- fi
-}
diff --git a/sys-apps/dmidecode/dmidecode-3.4.ebuild b/sys-apps/dmidecode/dmidecode-3.4.ebuild
index 9cff88ef840..82a023f1203 100644
--- a/sys-apps/dmidecode/dmidecode-3.4.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~x86-solaris"
+KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv x86 ~x86-solaris"
IUSE="selinux"
RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index ce7f0fee1d6..993154b8a26 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,2 +1 @@
-DIST dtc-1.5.0.tar.xz 152936 BLAKE2B 4ad9cf8f8fd0ccde0c7b8b66c0039eb9b012ed26e51387c06c03fa7950ca194878bbb23b50be5b80c4d4e18140d6316092a9f0eea87e5d713856635dcfc1b0ec SHA512 fd1e692a1b7bf7987f921ad17d9be6719f7b3aa7915873b45fa86f4ecb1398a0a62cdf53c1fddf98a0f7fed9bf34a79f684018bd01a2b5e88746b50879bf7102
DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
diff --git a/sys-apps/dtc/dtc-1.5.0-r2.ebuild b/sys-apps/dtc/dtc-1.5.0-r2.ebuild
deleted file mode 100644
index 3394d77c062..00000000000
--- a/sys-apps/dtc/dtc-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
- 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"
-fi
-
-DESCRIPTION="Open Firmware device tree compiler"
-HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs yaml"
-
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="yaml? ( dev-libs/libyaml )"
-DEPEND="${RDEPEND}"
-
-DOCS="
- Documentation/dt-object-internal.txt
- Documentation/dts-format.txt
- Documentation/manual.txt
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
- "${FILESDIR}"/${PN}-1.5.0-fdt_check_full-visibility.patch
- "${FILESDIR}"/${PN}-1.5.0-gcc-10.patch
-)
-
-_emake() {
- # valgrind is used only in 'make checkm'
- emake \
- NO_PYTHON=1 \
- NO_VALGRIND=1 \
- NO_YAML=$(usex !yaml 1 0) \
- \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- \
- V=1 \
- \
- PREFIX="${EPREFIX}/usr" \
- \
- LIBDIR="\$(PREFIX)/$(get_libdir)" \
- \
- "$@"
-}
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^CFLAGS =/s:=:+=:' \
- -e '/^CPPFLAGS =/s:=:+=:' \
- -e 's:-Werror::' \
- -e 's:-g -Os::' \
- Makefile || die
-
- tc-export AR CC PKG_CONFIG
-}
-
-src_compile() {
- _emake
-}
-
-src_test() {
- _emake check
-}
-
-src_install() {
- _emake DESTDIR="${D}" install
-
- use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
deleted file mode 100644
index 1a41da72cf8..00000000000
--- a/sys-apps/dtc/dtc-1.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
- 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"
-fi
-
-DESCRIPTION="Open Firmware device tree compiler"
-HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-DEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-DOCS="
- Documentation/dt-object-internal.txt
- Documentation/dts-format.txt
- Documentation/manual.txt
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
- "${FILESDIR}"/${PN}-1.5.0-fdt_check_full-visibility.patch
- "${FILESDIR}"/${PN}-1.5.0-gcc-10.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^CFLAGS =/s:=:+=:' \
- -e '/^CPPFLAGS =/s:=:+=:' \
- -e 's:-Werror::' \
- -e 's:-g -Os::' \
- -e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
- -e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
- Makefile || die
-
- tc-export AR CC PKG_CONFIG
- export V=1
-}
-
-src_install() {
- default
-
- use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
index d61376c56fb..64c82691f87 100644
--- a/sys-apps/dtc/dtc-1.6.0.ebuild
+++ b/sys-apps/dtc/dtc-1.6.0.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index 00244f88a14..4f65bb65312 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -1,8 +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
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
diff --git a/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch b/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch
deleted file mode 100644
index b9b0175c0bd..00000000000
--- a/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4d9522764985462741c7bb4af1ab231b9251476b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Wed, 10 Jan 2018 00:41:43 -0500
-Subject: [PATCH] dtdiff: change to POSIX shell
-
-This changes from the bash-specific process substitution feature to
-reading with pipes. It relies on /dev/fd or /proc/self/fd existing.
-
-URL: https://crbug.com/756559
-Signed-off-by: Mike Frysinger <vapier@chromium.org>
----
- dtdiff | 19 +++++++++++++------
- 1 file changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/dtdiff b/dtdiff
-index 5fa772b0ab62..4d1b71756c2f 100644
---- a/dtdiff
-+++ b/dtdiff
-@@ -1,8 +1,4 @@
--#! /bin/bash
--
--# This script uses the bash <(...) extension.
--# If you want to change this to work with a generic /bin/sh, make sure
--# you fix that.
-+#! /bin/sh
-
-
- DTC=dtc
-@@ -35,4 +31,15 @@ if [ $# != 2 ]; then
- exit 1
- fi
-
--diff -u <(source_and_sort "$1") <(source_and_sort "$2")
-+for dir in /dev/fd /proc/self/fd; do
-+ if [ -d "${dir}" ]; then
-+ break
-+ fi
-+done
-+
-+source_and_sort "$1" | (
-+ # Duplicate current stdin from the first file to fd 3 so we can change fd 0
-+ # to the second file.
-+ exec 3<&0
-+ source_and_sort "$2" | diff -u "${dir}/3" "${dir}/0"
-+)
---
-2.15.1
-
diff --git a/sys-apps/dtc/files/dtc-1.5.0-fdt_check_full-visibility.patch b/sys-apps/dtc/files/dtc-1.5.0-fdt_check_full-visibility.patch
deleted file mode 100644
index a5a3d7524c4..00000000000
--- a/sys-apps/dtc/files/dtc-1.5.0-fdt_check_full-visibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libfdt/version.lds b/libfdt/version.lds
-index 9f5d708..6b0f6d8 100644
---- a/libfdt/version.lds
-+++ b/libfdt/version.lds
-@@ -1,6 +1,7 @@
- LIBFDT_1.2 {
- global:
- fdt_next_node;
-+ fdt_check_full;
- fdt_check_header;
- fdt_move;
- fdt_string;
diff --git a/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch b/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch
deleted file mode 100644
index 80773bfaebb..00000000000
--- a/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://bugs.gentoo.org/706660
-https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=0e9225eb0dfec51def612b928d2f1836b092bc7e
-
-From 0e9225eb0dfec51def612b928d2f1836b092bc7e Mon Sep 17 00:00:00 2001
-From: Dirk Mueller <dmueller@suse.com>
-Date: Tue, 14 Jan 2020 18:53:41 +0100
-Subject: Remove redundant YYLOC global declaration
-
-gcc 10 will default to -fno-common, which causes this error at link
-time:
-
- (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
-
-This is because both dtc-lexer as well as dtc-parser define the same
-global symbol yyloc. Before with -fcommon those were merged into one
-defintion. The proper solution would be to to mark this as "extern",
-however that leads to:
-
- dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
- 26 | extern YYLTYPE yylloc;
- | ^~~~~~
-In file included from dtc-lexer.l:24:
-dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
- 127 | extern YYLTYPE yylloc;
- | ^~~~~~
-cc1: all warnings being treated as errors
-
-which means the declaration is completely redundant and can just be
-dropped.
-
-Signed-off-by: Dirk Mueller <dmueller@suse.com>
-Message-Id: <20200114175341.2994-1-dmueller@suse.com>
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
----
- dtc-lexer.l | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/dtc-lexer.l
-+++ b/dtc-lexer.l
-@@ -23,7 +23,6 @@ LINECOMMENT "//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
-
--YYLTYPE yylloc;
- extern bool treesource_error;
-
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
---
-cgit 1.2-0.3.lf.el7
-
diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest
index 4afcde07583..c56a9dcc2fd 100644
--- a/sys-apps/earlyoom/Manifest
+++ b/sys-apps/earlyoom/Manifest
@@ -1,2 +1,4 @@
DIST earlyoom-1.3.tar.gz 31399 BLAKE2B 3867540afb23493fbb532bcb72a5cfacca4ed297a053ff5e2c7e394bfa3640887e3e7c6430789bc1eda4b7a68680d8a74ab56b641fe9e5d4caa4406e2edb0667 SHA512 c5de742289e82c2098bd88c61dcb3e20eb022905a015b4894c95a4de3978ce18d794a9e7c17c97851ca9f8888728908f7bf978c014b3b69799bffa8b546d258a
DIST earlyoom-1.6.2.tar.gz 49006 BLAKE2B 85a02d4171ba1bb94d5ddf573b8f5ac58d28a0cf9766f4fb2c96be5b45eee7aab853008c36f9e3aac76685b70008051faa2fe339797ecf9137469f089935a6b3 SHA512 d622a5347591d2017f6e62255940482af431e647acf1b35ab035e0dbfd44da7fc52633e6dd6433e42a1348fd294d766550ba092260f3ec59bd51e545f08e466b
+DIST earlyoom-1.7-deps.tar.xz 1974036 BLAKE2B ff378ae64b6b293e3b9d9fa05607209a515edadd18edcb70e204de1e0808b06dfaca7e6dcddeffbda9dae8abbadf7ac6074df725997b96be8a8d8cc35ac4d8c8 SHA512 67072000f8695935f77494faca84c74c67de4b9a4b3b889b310ad674f28c7ed85a0d59e91f4d5caa06cc1d7c1e7ef31aa3a373851361b905dc29e6d4d04eeeb9
+DIST earlyoom-1.7.tar.gz 52210 BLAKE2B c8338434160e4ccaa5ee64299487ca47a3d94e894362c320cf8210caf895a34c7abb584654afcdcb6fc1e058d53c1fa7eb740477acb104ed295700faccbcbdc1 SHA512 5732632c38d9b511aaa81845b3d8f8afe737aa6498dca7e31accaf18bfcf271ba436946aa06a514a34c953f99343f9b197d8a2b8751e16d336aeb084944f3602
diff --git a/sys-apps/earlyoom/earlyoom-1.7.ebuild b/sys-apps/earlyoom/earlyoom-1.7.ebuild
new file mode 100644
index 00000000000..42e4a637324
--- /dev/null
+++ b/sys-apps/earlyoom/earlyoom-1.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GO_OPTIONAL=1
+inherit go-module systemd toolchain-funcs
+
+DESCRIPTION="Early OOM Daemon for Linux"
+HOMEPAGE="https://github.com/rfjakob/earlyoom"
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz )"
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="man test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ man? ( virtual/pandoc )
+ test? ( dev-lang/go )
+"
+
+src_unpack() {
+ default
+
+ use test && go-module_src_unpack
+}
+
+src_compile() {
+ tc-export CC
+
+ emake \
+ PREFIX="${EPREFIX}"/usr \
+ VERSION="v${PV}" \
+ SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
+ earlyoom earlyoom.service $(usev man 'earlyoom.1')
+}
+
+src_install() {
+ dobin earlyoom
+
+ use man && doman earlyoom.1
+
+ insinto /etc/default
+ newins earlyoom.default earlyoom
+
+ dodir /etc/conf.d
+ dosym -r /etc/default/earlyoom /etc/conf.d/earlyoom
+
+ newinitd "${FILESDIR}"/${PN}-r1 ${PN}
+ systemd_dounit earlyoom.service
+}
diff --git a/sys-apps/earlyoom/earlyoom-9999.ebuild b/sys-apps/earlyoom/earlyoom-9999.ebuild
index 6a2d2be6cf4..42e4a637324 100644
--- a/sys-apps/earlyoom/earlyoom-9999.ebuild
+++ b/sys-apps/earlyoom/earlyoom-9999.ebuild
@@ -1,47 +1,61 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit systemd
+GO_OPTIONAL=1
+inherit go-module systemd toolchain-funcs
DESCRIPTION="Early OOM Daemon for Linux"
HOMEPAGE="https://github.com/rfjakob/earlyoom"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git"
inherit git-r3
else
SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz )"
+
KEYWORDS="~amd64 ~x86"
fi
-IUSE="docs systemd test"
-RDEPEND=""
-DEPEND=""
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="man test"
+RESTRICT="!test? ( test )"
+
BDEPEND="
- docs? ( app-text/pandoc )
+ man? ( virtual/pandoc )
test? ( dev-lang/go )
"
-#tests don't work
-RESTRICT=test
+src_unpack() {
+ default
+
+ use test && go-module_src_unpack
+}
src_compile() {
- VERSION="v${PV}" emake earlyoom
- use docs && VERSION="v${PV}" emake earlyoom.1
- use systemd && emake PREFIX=/usr earlyoom.service
+ tc-export CC
+
+ emake \
+ PREFIX="${EPREFIX}"/usr \
+ VERSION="v${PV}" \
+ SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
+ earlyoom earlyoom.service $(usev man 'earlyoom.1')
}
src_install() {
dobin earlyoom
- use docs && doman earlyoom.1
+
+ use man && doman earlyoom.1
insinto /etc/default
newins earlyoom.default earlyoom
- doinitd "${FILESDIR}/${PN}"
- use systemd && systemd_dounit earlyoom.service
+ dodir /etc/conf.d
+ dosym -r /etc/default/earlyoom /etc/conf.d/earlyoom
+
+ newinitd "${FILESDIR}"/${PN}-r1 ${PN}
+ systemd_dounit earlyoom.service
}
diff --git a/sys-apps/earlyoom/metadata.xml b/sys-apps/earlyoom/metadata.xml
index b491101684a..36cf5295a65 100644
--- a/sys-apps/earlyoom/metadata.xml
+++ b/sys-apps/earlyoom/metadata.xml
@@ -8,4 +8,7 @@
<use>
<flag name="docs">Generate man page</flag>
</use>
+ <upstream>
+ <remote-id type="github">rfjakob/earlyoom</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/ed/metadata.xml b/sys-apps/ed/metadata.xml
index 73dda144f9a..021ef4fa578 100644
--- a/sys-apps/ed/metadata.xml
+++ b/sys-apps/ed/metadata.xml
@@ -1,8 +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>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="savannah">ed</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 5786d8857e9..df174c8a9e2 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,2 +1 @@
-DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
-DIST etckeeper-1.18.17.tar.gz 100705 BLAKE2B afbd800d0d808997d1f618d81abf5b9c756384db4f4e0a9984349e9c512fc03ab04c04e9d968f99b5ff0eaf59727e4673fd107a0f6e04f14a0327c9247a39124 SHA512 6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00
+DIST etckeeper-1.18.18.tar.gz 101845 BLAKE2B 2072b54db4023211e85fcbed82bd93412eb02707d5447b297bf98e65f1d534e02e790612d9771ae433a07aa6a462dd9b5c5528207d2bcfd4059232417e3186e1 SHA512 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b
diff --git a/sys-apps/etckeeper/etckeeper-1.18.17.ebuild b/sys-apps/etckeeper/etckeeper-1.18.17.ebuild
deleted file mode 100644
index 3e5e00bb340..00000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.17.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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/etckeeper-1.18.16-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.18.ebuild
index 1b87e32407f..3bc3ee63044 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.18.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit bash-completion-r1 prefix systemd tmpfiles
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 ~riscv ~sparc x86"
SLOT="0"
IUSE="cron test"
@@ -30,7 +30,10 @@ RDEPEND="app-portage/portage-utils
RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}"/${PN}-1.18.14-gentoo.patch )
+PATCHES=(
+ # TODO: submit upstream
+ "${FILESDIR}"/${PN}-1.18.18-gentoo.patch
+)
src_prepare() {
default
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
deleted file mode 100644
index c329deb0f5c..00000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-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/etckeeper/files/etckeeper-1.18.14-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch
index e677af993fe..298671c9000 100644
--- a/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch
@@ -1,17 +1,9 @@
-From 46e299da6914962007fb540a401a68a17d00bca3 Mon Sep 17 00:00:00 2001
+From 5ac7b1861a7e23935bc09cacfa6675d8a086877e Mon Sep 17 00:00:00 2001
From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sun, 26 Jan 2020 23:24:54 -0800
-Subject: [PATCH] 1.18.14-gentoo
+Subject: [PATCH] 1.18.18-gentoo
----
- Makefile | 1 -
- etckeeper.conf | 14 ++++++++++++--
- list-installed.d/50list-installed | 4 ++++
- update-ignore.d/01update-ignore | 4 ++++
- 4 files changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 73d2411..ffcf218 100644
+Signed-off-by: Sam James <sam@gentoo.org>
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
@@ -22,14 +14,12 @@ index 73d2411..ffcf218 100644
echo "** installation successful"
clean: etckeeper.spec etckeeper.version
-diff --git a/etckeeper.conf b/etckeeper.conf
-index f13de1c..16ff71d 100644
--- a/etckeeper.conf
+++ b/etckeeper.conf
@@ -33,11 +33,21 @@ DARCS_COMMIT_OPTIONS="-a"
# The high-level package manager that's being used.
- # (apt, pacman, pacman-g2, yum, dnf, zypper, apk etc)
+ # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps etc)
-HIGHLEVEL_PACKAGE_MANAGER=apt
+#HIGHLEVEL_PACKAGE_MANAGER=apt
+
@@ -39,7 +29,7 @@ index f13de1c..16ff71d 100644
+HIGHLEVEL_PACKAGE_MANAGER=emerge
# The low-level package manager that's being used.
- # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk etc)
+ # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk, xbps etc)
-LOWLEVEL_PACKAGE_MANAGER=dpkg
+#LOWLEVEL_PACKAGE_MANAGER=dpkg
+
@@ -50,35 +40,31 @@ index f13de1c..16ff71d 100644
# To push each commit to a remote, put the name of the remote here.
# (eg, "origin" for git). Space-separated lists of multiple remotes
-diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed
-index d89b8ce..2db838d 100755
--- a/list-installed.d/50list-installed
+++ b/list-installed.d/50list-installed
-@@ -23,5 +23,9 @@ else
- pkg info -E "*"
- elif [ "$LOWLEVEL_PACKAGE_MANAGER" = apk ]; then
+@@ -30,5 +30,9 @@ else
apk info -v | sort
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = xbps ]; then
+ xbps-query -l | awk '{print $2}' | sed -r 's/-([^-]+)$/ \1/g;'
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
+ qlist -ICv
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
+ cave print-packages -r installed
fi
fi
-diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore
-index 8733a85..53afbde 100755
--- a/update-ignore.d/01update-ignore
+++ b/update-ignore.d/01update-ignore
-@@ -103,6 +103,10 @@ writefile () {
- comment "new versions of conffiles, stored by apk"
- ignore "*.apk-new"
+@@ -107,8 +107,12 @@ writefile () {
+ comment "new versions of conffiles, stored by xbps"
+ ignore "*.new-*_[0-9]*"
nl
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then
+ comment "new and old versions of conffiles, stored by emerge"
+ ignore "._cfg*"
+ nl
fi
-
+-
++
comment "old versions of files"
---
-2.25.0
-
+ ignore "*.old"
+ # Not currently ignored as admins tend to rely on these files.
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index c51d14ff642..7d5fd537e08 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -4,3 +4,4 @@ DIST ethtool-5.15.tar.xz 318864 BLAKE2B 855c07e388bfabf37637f20e2714c6ca27717f38
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
+DIST ethtool-5.19.tar.xz 324472 BLAKE2B 44cc292db04f411a57a0a5ae0cdfbef733c7ee739fc252523c713489a13ae33de3927b500db796bc584fef3c83d7238dca2af4e6b6a5c594bbf21e87ed2380a7 SHA512 71103c6856a889161ef2bf81eadec69b2f3a84c94aa776d545f889dc1c55b91d566d3b7394dbd2cb70ed92ac19d5f26967b1f829c204f23831d1fb81a0464972
diff --git a/sys-apps/ethtool/ethtool-5.19.ebuild b/sys-apps/ethtool/ethtool-5.19.ebuild
new file mode 100644
index 00000000000..8d122a733c0
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-5.19.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/fakeroot/fakeroot-1.29.ebuild b/sys-apps/fakeroot/fakeroot-1.29.ebuild
index 8d511343efb..523ceccc2c7 100644
--- a/sys-apps/fakeroot/fakeroot-1.29.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.29.ebuild
@@ -12,7 +12,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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="acl debug nls test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 78b804808ad..2064c691fec 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -1,103 +1,81 @@
-DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST anyhow-1.0.35.crate 28928 BLAKE2B 74fec657b5c21455298198bd9feddbc5086c433f2c43de45950e33341ca9527f88f4ccb94eef248437e455394d54ec0dc13af33843deb799a0215abd1b1a874f SHA512 e93baa31f9eb04dcefc9e17fe030778337796490cec3467799f98dbfda77f55522457adde388c08b8893303e8a34292b863793f37956c4adfb7a88ba10fbd154
-DIST anyhow-1.0.52.crate 44224 BLAKE2B 79d68d3390d27e0e27f9db784ad10b5d7845dec7949fbc722f944ef3988419acd72c509b44a4544e99bea5e57407da5b1ce40a96277d307fc408c958ea915c31 SHA512 b87e0b304daff85894c34060b97379d8e3d9be03078275313035c7142c76b3e59922b25924ac98a0b1b70fc98746eb174ca4b7ef33a26e115f294c1f1200aa6a
+DIST anyhow-1.0.57.crate 44614 BLAKE2B b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433 SHA512 311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
+DIST argmax-0.3.0.crate 11172 BLAKE2B de9b84974cabc05c41b4d1f74f68ba18d8743fce84bc66da932215d2495de21204b219c669f3c20e95ab934918e7eb9bd5518f2d3097bdd2b367984771db2a33 SHA512 6415c45fd7c7d4ddac7c821ab4777dd0bc8e96475034db38270e308238990170f3475a4fe3faecc7d8a3ae2ae4a017ccd8bdc20a02ed153b38c429b226362078
DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d95b713bd44375e739037ae12451602fa539ebf98e73d39a6786728ad145e882117b98108d945ba96b810e83 SHA512 de62c0f31ad672f90a8038fa163c7cdaf474b35ec24592aee5549af7c76d43e6ed00f8d7237e15ab27576c27a7232033a217955de6a0a3b40c83661b3a7e1e8a
DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
-DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
-DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
-DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
-DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
-DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
-DIST ctrlc-3.1.7.crate 12854 BLAKE2B 7934273fc3763b6a6b763590f2f26f2479e9dd459e42222879cc40d9ccc109d78b02e69fec88d11781528897f5c7034b16bfd1eafaba13363981e46fb6fac703 SHA512 fe8aeb4168a7870f8ebcc212d9fa221740385d1f8498557e282b7dc0569b3e6cc03de0d124281809021ec8b9ebac9ec22b5418ca02ca8cf9810fd2d029e6ce6b
-DIST ctrlc-3.2.1.crate 12893 BLAKE2B d366e12c8d2d5f34399c9e8ff797e30870682bf8f7bcf4e1bcd50a7ab5c4610cc6db154fc9b4c1abf9852cf0fff1c7c927514ea7a2cdb9d199c6e1bae9368716 SHA512 7305e97a3f161db942ddc194d14f670087f88e3ccb5b94114fbd6afba04b4ac1cb063cf87ccf6fdf4678bb667b02f3cb2e6fc1ca8bc47b6ed8e36620cc4a1a8b
+DIST clap-3.1.18.crate 209664 BLAKE2B 97b499c2909045fe25ed77a22d55f32085e85876e18f00fc23f19fec5e87e1d1a7a9b1c6ac4c44cb6cd4a1fe7647effc9825be0621bd088b17a421ec6e738c0d SHA512 bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39
+DIST clap_complete-3.1.4.crate 31223 BLAKE2B ee08809da96889594fcd7f85a63ef9c4ba9bfae3feb5b7b7c491c39712b2b1d2e98e734ed4b138f919535ddcfb20cc093602cc1587ec58d97a62fe008e86714a SHA512 3a76e4e94090c8fceebdaed4e6674ab8af2e5282c72e19643998e55dcc8e07298153baf67b4bfa430ef814c92a3c3b8513d2c857eaddc7a586693bd3a9d2b1ec
+DIST clap_lex-0.2.0.crate 9581 BLAKE2B 47bef7e0b35c7a934deeb2821f0a552e05eaeeb68bbcdb82a013cd3b74f2cc42736207a394b9be8c46b3d253dac41dc22e96e1e2ccd09cc416743f22cbf78891 SHA512 d4acd8e2b8d1d19214fde1f0f21f0e0a755cb44e326893bc65350d742c2e260bda61f0abce5fdcb08fc5c4c835d0419cb02452d9f6a85cffa2b5dc7c4bc1e962
+DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
+DIST ctrlc-3.2.2.crate 12699 BLAKE2B 39d2e05a943280f3a62f3464bd77cad5f606ebf912c6430f4b49ec07a3cf2b1fb19ef5be5d589e931b9d79c5af882d51782b580d1a89a48bee221585c1212b1c SHA512 9536489c3b871685f20eabe7b8fa4a1a4db8e362e8e83b4b2fe244d98eb4da8f84737d26854505cbb53a311e6aab6327b0644689206a19dc5f7d3b88bac580d9
DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
-DIST dirs-sys-next-0.1.1.crate 10490 BLAKE2B a691f9603b649f648d410c7588a84c69adaff41179aa8eac899ed47082f171d765876864f08e3d0dbf3fa3798c1342b30e3bdf530ef06ed017c235a63b15d5a9 SHA512 e89af71b6bb4e23efb8ff189b42615672c2aa305fb8798393de2f9151c78cbfd5f3e45b066f5de64dfad69a84b15e72a1cdb4377f31ee9288018143017ed5730
DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
-DIST fd-8.2.1.tar.gz 83391 BLAKE2B a2dc300c0f65aba04eeb422aa46c93136f305b73ca70b1e0b9429e507652a203855070115f3d0c3bd8bcd4015a470439197749ec2020edf518a55d024dfdea71 SHA512 5e921cb3556899e086f0fbaae21842b532c486c75e91cbb8351e25f640467217ac89e8cfba044e855e2425222bfdbd01befa4f35251c8705b30b3503adf3a7bf
-DIST fd-8.3.1.tar.gz 94617 BLAKE2B 4b896a8411ea2d43d7c47960f132135bebc01f761cb7524e3d9a1fd5d54e71e25b296e18ccdb2a0dfb42d5cf7628b0595858341286345049bbecdf17a56a30c1 SHA512 1f37ed817629f580986c7534636dc2cac6658177dda4717e86bfa29c6122aae52e562c0a026c287687053e11430087578a9ca9a166997bfe99417490530d03fb
-DIST filetime-0.2.13.crate 14348 BLAKE2B cdb21f88ba00293c93f4831ec81b1c5468d6ca88fc58d3c3daa106c5476089df630ce6082280a77bf6da881dd95f3000f4abeb2469d8aad4d0efb6c3bdd80a2b SHA512 ba7d31b0946bc30782feee124dd904b4c3ba75d1bd81131e3bef06faeb019b51e7cc436a4fe86f3dc9615900fa27bce3f4965f13472ead173564054db8f6f786
-DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
+DIST fd-8.4.0.tar.gz 109403 BLAKE2B 5b142a14f2e5b3f6a1f973865fb5f1428f02ecf30d71f876c12ba53074350fd8c455ed88b388fce393145cbcacea78c0a04f5f3ac5872e1cb417ed6558ad87fe SHA512 467d8cb66398d247e0849228cfe7ebf70f8a7758e126a048f7f34dcd45b0d69d3ff4afc903092dc7d17f42c7b9029e92e88acfc1cbe282857a733a355804bc1c
+DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
-DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
-DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
+DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
-DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
+DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
-DIST humantime-2.0.1.crate 17381 BLAKE2B 254f2bc0ea87123b49c22e95ff2218abb5f611918ae5419b960b472ce3402c5baf9d66c3a586b0ad9b10639473a0dcb660b8a8d79f86e5d6bd48768cc6aeb0f8 SHA512 c3cb464801fcbeea7c04e148cda2467386b7f008642d2641bdffab85784c16aa2708e847740772674d62b746c66d404e3b8307ebaa9c2df836fb58b3b0278e62
DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
-DIST ignore-0.4.17.crate 53056 BLAKE2B 734e74210f13e5ad08864cc8b143fb780383cd36048e78da04a0475eaa760867dd4a385b37fdfaff0c5aca946d4aab19c4901df0833271a3ba05887ea5dec9c5 SHA512 52380126bb46478875093eb39972949625e1d9ada6fac7148faeccc22807d8e2a1e41c34549e7d9f884fd3cd6dc3d42b47a88b5b6de1089d7e3ee8014b3aea35
DIST ignore-0.4.18.crate 53174 BLAKE2B 41a209a310515af9fa066c88c92751e19e0859f411baf9946933203883098f52901f8c03250cab7f716abbd0da9c03c5e6fb270a5f9e26aafab4bf1d5f5bc045 SHA512 5d11a2415f015cce6ce72aa3d08a7cfb645ee7f1845b3445a924a92144438f209c992cc15d4ede3099d1eebe3fa28bde4e0eef1a3fbcb9dbced19a42051d21be
-DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
-DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
+DIST indexmap-1.8.2.crate 53219 BLAKE2B 6af0e386dcb4306505d93cae23fd47601c3e1c7159058f02ac435b312697da40538b1cbb0d17c3f2c4be579a4b0a9e8b59c2e145677a69c2f885d3d24afd5229 SHA512 f7780b2a478e2b95568bfa1d10167a02bd174fb9bbbf8ea84e6ff185a03d43be0ef403c2106df8289d399657584abfac6039d7cdb96b52300d7016452808c0f0
+DIST jemalloc-sys-0.5.0+5.3.0.crate 880194 BLAKE2B 8b243d8ac0383c8cfcbd67fa48fb9766cbfaacbd79b32238d732623342222444b47785e9f434954f1a1e6d7329d16b5f1142939bbfee832e7c86c5fb8f064c08 SHA512 d76212773f68f6015d302de4e785dd6b6c3cdbb40f794fb122da5ce00a8c7256249a7593973be44a425ef86ae3b82745c2d39c7bcd082229fa4dd06fce816fc7
+DIST jemallocator-0.5.0.crate 9390 BLAKE2B af2d6c4fc8b7212fb9a805b60e46116f509434336a3636f846a484cd559141456e4ff22c0079cf6e5e55199b6a0748b855a880629c52ba56cf0d893ab6a3c92f SHA512 6dfefc929547b8fc227c004caff5a859f57526a338e6d1c688965763468dabf3b25a69624be144103c50d44ec36fe9d52557267279511c68fa58ff2bc972cbc3
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
-DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c
-DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
-DIST lscolors-0.7.1.crate 17986 BLAKE2B 927e3d9155591c5223fccf78f011dfce21f29c7f9322de0e3a97703eec2b27ff1eb93890b9ef62cb0916ceb06bb88660b34443ef815aef621801f7917ff46b31 SHA512 65c618c25624b360a98f98142e0867d524d19e7060887993f35899a26a812e360d8b8d627d36a72fa3c604a1cb5615d6a425850087183b694083b9649e120776
-DIST lscolors-0.8.1.crate 20595 BLAKE2B a6e31be15536534251735b4b15a3468f27709ac62985c50e42a4e56a0582c8d2861388ab4e737e5561d28866d6f58f833f71423d7b4401742eb26c8bf4b082a7 SHA512 f8dada22fc5de271a1a92ff015b513410c8e434a93ec0dea8b135f85cc1a3f0b0d3c04c2666af472508e75cfa32040db803d52e9d6c057122ead5019c244af09
-DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
-DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
-DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
-DIST nix-0.18.0.crate 209962 BLAKE2B 3ff822e3d49a6c477d5da3702fc88bbe270202acb4f7c449a78969ada9b8fc8855a90ee194bd2943dd27c28286b88e1b22a6003e08260e19f7c8ed6036bc2891 SHA512 b86660bfa2533fdfb945a3ef840c692b5d96108e3e73b76d6489b65039cde87ae04935d2f10878cab1ea38f039083aebf4ec9b2bb6ba66ee204be700e3e96581
+DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
+DIST lscolors-0.10.0.crate 21103 BLAKE2B 886e8703818bbd286deebd57e1ccf846a2f8a44decea6e24496b1285033d1b07f9527a0078f943ab45df86d0a052152c0d734606129dfe32b027bf8f34dd7a7a SHA512 2ff4b1234cb42128f9eb53e3a35484ccde51621292c61ca6ff5442e6f5a343a3dfebafa9f2ba45f7bc3e2211f152e629e6812b786f53d277791555b67a4e3cd8
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
+DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
-DIST normpath-0.3.1.crate 15317 BLAKE2B 224e5e3e7a4d980f308c807dc20f5220262cbd57249986ee85160ee4a50d568bb975c02b44090e23960762077ad19c582b62d4da49dafe9122e0549433565a9b SHA512 4475dd71e17d644c7f05ac5640ef25c41b65cfa952f1092a25d8114897ad17f7e05dbef1256da488d786bd020cfd04532ff6fa85b8022211c9247c4a2687bd6d
-DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
-DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST nix-0.24.1.crate 263506 BLAKE2B 6e89beb88a924d4bd4d4cdb8b384cb4d3b080f3594817a663038d906b1e26b044f32271d5e1cb6f17053ba2b5133b6a2ba8b748aaa08cec2855159b14160f51b SHA512 eea2346477b5acbcc7c74fc0d3f99e35bc85f8195563599423cd838f258c388561e82feb66e9793528f55eea2cb015e899a335d6da82ca0c1b8acdff1b53efaa
+DIST normpath-0.3.2.crate 15503 BLAKE2B e333cefb6862e9aa155a117a804c56577135275a95e19cb772f7f9de0d42fcebd49774b35729e2190885f1ac5f5faf44dd806f10bd2d2c45860ff8816d89508b SHA512 6462d5fa5b1c2062fe91be9d53c6c37a2c6990b9695b2b255b91d81bfcc8bd8b19d55451bd5705869d0f730ed920f5d2db7706588b6ca3847d386e4d69e92111
+DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
+DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
-DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
-DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
-DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
+DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
+DIST os_str_bytes-6.1.0.crate 21150 BLAKE2B a3bea67d5dfdc3bdf535b8576a49b3b76aac6fb5e0c9b672910756cf2d8062694b973f4d38365e7e17237efe0429ef942adb0416f8a9fbeb18bac68e1ec250a4 SHA512 b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5
+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-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
+DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
-DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
-DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
-DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
-DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
-DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
-DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
+DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
+DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
+DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.82.crate 234316 BLAKE2B 1d115a4fd61cfebf62657f8faf7fe8786b3715ecf0413a5d117289853b4ecad399611d92d7bed26e590236a4689bff5599787c04f83de1db7f6c771eaa032853 SHA512 9406f62404f1dec3ea37a5e583a8dd7daf646fd5a1b11359aea3004010b3b416a44e4457695ba5beb12b3cbb9fe437de6f73018faa364c4e48060f6aab8ada1d
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
-DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
-DIST test-case-1.2.1.crate 13150 BLAKE2B d48d95fdb573a7ec6e6586560ce1e5fbd8f6434b4df0d27bfb107a61fd50d324bc5e563183ca37628efe816d187624b8a17e7dae6dc4e8e235209d400eecd254 SHA512 40465eb74bd4fce98a8245c007d180fd552b06acc1f65f8f6d3376f23fcc631935260f2c3a2df0976213b5bb395736dddb8ee32b1e69d038469cf55aacf5cc6e
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
-DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
+DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
+DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
+DIST test-case-2.1.0.crate 7459 BLAKE2B cc936e32ae0cbb31c467518da860a945a944a1d20978185709b2d6e37ae781c8600eaa27970017c62b090728ec6a5cca58b15dc5a70467a4c882f1b61d67a1d0 SHA512 d0fc7459ffec4c2922b5c4eb6ccb50dcd923c034cdc40ef8e62423204968d847d0a09377cb59d695407cb2c91dbc50f1fa2ab3bfa5de29f716c906b35dfb8a5b
+DIST test-case-macros-2.1.0.crate 9970 BLAKE2B 08bebb86304a39b3c2cef46a72255391bc510d53bfabaf100d2f974240d2966f7ec017d3c89f676fd7cd772937f6560e11524bea87b99245a1945e0acec1abc1 SHA512 fb1ab9647ba7bfd6701a742039bdd0e764c1423de05df619ad52f7bd7b639f114d7fbcf91e905e1d6bdbb9f198978fbee2e675486e23fc2ab7b5e9e6e2e4aa2b
+DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
+DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
+DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
+DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
-DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
-DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
-DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
-DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
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
-DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
diff --git a/sys-apps/fd/fd-8.2.1.ebuild b/sys-apps/fd/fd-8.2.1.ebuild
deleted file mode 100644
index 1bfaeaa3787..00000000000
--- a/sys-apps/fd/fd-8.2.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.15
-ansi_term-0.11.0
-ansi_term-0.12.1
-anyhow-1.0.35
-atty-0.2.14
-autocfg-1.0.1
-bitflags-1.2.1
-bstr-0.2.14
-cc-1.0.66
-cfg-if-0.1.10
-cfg-if-1.0.0
-clap-2.33.3
-crossbeam-utils-0.8.1
-ctrlc-3.1.7
-diff-0.1.12
-dirs-next-2.0.0
-dirs-sys-next-0.1.1
-filetime-0.2.13
-fnv-1.0.7
-fs_extra-1.2.0
-fuchsia-cprng-0.1.1
-getrandom-0.1.15
-globset-0.4.6
-hermit-abi-0.1.17
-humantime-2.0.1
-ignore-0.4.17
-jemalloc-sys-0.3.2
-jemallocator-0.3.2
-lazy_static-1.4.0
-libc-0.2.80
-log-0.4.11
-lscolors-0.7.1
-memchr-2.3.4
-nix-0.18.0
-num_cpus-1.13.0
-rand-0.4.6
-rand_core-0.3.1
-rand_core-0.4.2
-rdrand-0.4.0
-redox_syscall-0.1.57
-redox_users-0.3.5
-regex-1.4.2
-regex-syntax-0.6.21
-remove_dir_all-0.5.3
-same-file-1.0.6
-strsim-0.8.0
-tempdir-0.3.7
-term_size-0.3.2
-textwrap-0.11.0
-thread_local-1.0.1
-unicode-width-0.1.8
-users-0.11.0
-vec_map-0.8.2
-version_check-0.9.2
-walkdir-2.3.1
-wasi-0.9.0+wasi-snapshot-preview1
-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
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="Alternative to find that provides sensible defaults for 80% of the use cases"
-HOMEPAGE="https://github.com/sharkdp/fd"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- $(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD-2 ISC MIT Unlicense"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE=""
-
-DEPEND="!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="/usr/bin/fd"
-
-src_compile() {
- export SHELL_COMPLETIONS_DIR="${T}/shell_completions"
- # this enables to build with system jemallloc, but musl targets do not use it at all
- use elibc_musl || export JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)/libjemalloc.so"
- cargo_src_compile
-}
-
-src_install() {
- cargo_src_install
-
- newbashcomp "${T}"/shell_completions/fd.bash fd
- insinto /usr/share/fish/vendor_completions.d
- doins "${T}"/shell_completions/fd.fish
-
- # zsh completion is in contrib
- insinto /usr/share/zsh/site-functions
- doins contrib/completion/_fd
-
- dodoc README.md
- doman doc/*.1
-}
diff --git a/sys-apps/fd/fd-8.3.1.ebuild b/sys-apps/fd/fd-8.4.0.ebuild
index 3da4227d0d6..da274a6dd3e 100644
--- a/sys-apps/fd/fd-8.3.1.ebuild
+++ b/sys-apps/fd/fd-8.4.0.ebuild
@@ -6,67 +6,78 @@ EAPI=8
CRATES="
aho-corasick-0.7.18
ansi_term-0.12.1
- anyhow-1.0.52
+ anyhow-1.0.57
+ argmax-0.3.0
atty-0.2.14
- autocfg-1.0.1
+ autocfg-1.1.0
bitflags-1.3.2
bstr-0.2.17
- cc-1.0.72
+ cc-1.0.73
cfg-if-1.0.0
chrono-0.4.19
- clap-2.34.0
- crossbeam-utils-0.8.5
- ctrlc-3.2.1
+ clap-3.1.18
+ clap_complete-3.1.4
+ clap_lex-0.2.0
+ crossbeam-utils-0.8.8
+ ctrlc-3.2.2
diff-0.1.12
dirs-next-2.0.0
dirs-sys-next-0.1.2
- filetime-0.2.15
+ filetime-0.2.16
fnv-1.0.7
fs_extra-1.2.0
fuchsia-cprng-0.1.1
- getrandom-0.2.3
+ getrandom-0.2.6
globset-0.4.8
+ hashbrown-0.11.2
hermit-abi-0.1.19
humantime-2.1.0
ignore-0.4.18
- jemalloc-sys-0.3.2
- jemallocator-0.3.2
+ indexmap-1.8.2
+ jemalloc-sys-0.5.0+5.3.0
+ jemallocator-0.5.0
lazy_static-1.4.0
- libc-0.2.112
- log-0.4.14
- lscolors-0.8.1
- memchr-2.4.1
- memoffset-0.6.4
+ libc-0.2.126
+ log-0.4.17
+ lscolors-0.10.0
+ memchr-2.5.0
+ memoffset-0.6.5
nix-0.23.1
- normpath-0.3.1
- num-integer-0.1.44
- num-traits-0.2.14
+ nix-0.24.1
+ normpath-0.3.2
+ num-integer-0.1.45
+ num-traits-0.2.15
num_cpus-1.13.1
- once_cell-1.9.0
- proc-macro2-1.0.32
- quote-1.0.10
+ once_cell-1.12.0
+ os_str_bytes-6.1.0
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro2-1.0.39
+ quote-1.0.18
rand-0.4.6
rand_core-0.3.1
rand_core-0.4.2
rdrand-0.4.0
- redox_syscall-0.2.10
- redox_users-0.4.0
- regex-1.5.4
- regex-syntax-0.6.25
+ redox_syscall-0.2.13
+ redox_users-0.4.3
+ regex-1.5.6
+ regex-syntax-0.6.26
remove_dir_all-0.5.3
same-file-1.0.6
- strsim-0.8.0
- syn-1.0.82
+ strsim-0.10.0
+ syn-1.0.95
tempdir-0.3.7
- term_size-0.3.2
- test-case-1.2.1
- textwrap-0.11.0
- thread_local-1.1.3
+ termcolor-1.1.3
+ terminal_size-0.1.17
+ test-case-2.1.0
+ test-case-macros-2.1.0
+ textwrap-0.15.0
+ thiserror-1.0.31
+ thiserror-impl-1.0.31
+ thread_local-1.1.4
time-0.1.43
- unicode-width-0.1.9
- unicode-xid-0.2.2
+ unicode-ident-1.0.0
users-0.11.0
- vec_map-0.8.2
version_check-0.9.4
walkdir-2.3.2
wasi-0.10.2+wasi-snapshot-preview1
@@ -85,7 +96,7 @@ SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0 BSD-2 ISC MIT Unlicense"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE=""
DEPEND="!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )"
@@ -95,8 +106,11 @@ QA_FLAGS_IGNORED="/usr/bin/fd"
src_compile() {
export SHELL_COMPLETIONS_DIR="${T}/shell_completions"
- # this enables to build with system je<F24><F25><F24><F25>mallloc, but musl targets do not use it at all
- use elibc_musl || export JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)/libjemalloc.so"
+ # this enables to build with system jemallloc, but musl targets do not use it at all
+ if ! use elibc_musl; then
+ export JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)/libjemalloc.so"
+ export CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1 #https://github.com/tikv/jemallocator/issues/19
+ fi
cargo_src_compile
}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 39e70ed0ada..ffc539bd948 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,3 +1,3 @@
DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
-DIST file-5.42.tar.gz 1105846 BLAKE2B c557facb066ae0599db832ddbbc3fed7db2e057faefe832cb4bed8f860b63456217bee39f0c82b17902c3b91426e522681216d2d3ed689501fa00d69a4a09832 SHA512 33c3c339a561c6cf787cc06a16444a971c62068b01827612c948207a9714107b617bed8148cd67e6280cb1c62ad4dfb1205fb8486ea9c042ce7e19b067d3bb05
-DIST file-5.42.tar.gz.asc 195 BLAKE2B 9b930bcd6b98878e60cd72d8d71b40201ebbf3ab1dda7d2b0e3228abdc0c1e21473a012b9799dcac8638ded1bdbe03865c5e41ed4086076a7df6bf6aadbfe29d SHA512 a7105c48f6c671638f5fb7f18f9b193d108456655b4c734208e00aca36fab54dd330ec2fdc3ff29fb78adbc16874af4fb0916c560e50228f82003a8cd258491a
+DIST file-5.43.tar.gz 1162786 BLAKE2B aaaf32c5054fb83e912af6656e5e67947f45576ec3711c7cba5531ed780e142a448580e0db41a828c8a3c5d2f1bf0c8ed49bc9688499caaae4a08baa16b3610c SHA512 9d02f4e7a69d90468d6bd35df5ec240ddee8c2408b7df3e73427d7f18736baf77db0638a1fe8283f4e6abd1d5ad653890ed3a5a0d48bb52d4023ca4070ecdf06
+DIST file-5.43.tar.gz.asc 195 BLAKE2B d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f SHA512 c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.43-r1.ebuild
index dee13cbe1e8..10bf50a18e4 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.43-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
@@ -51,6 +51,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+ "${FILESDIR}/${P}-configure-clang16.patch"
)
src_prepare() {
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 7f27cf37781..81f60050024 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
@@ -28,17 +28,20 @@ HOMEPAGE="https://www.darwinsys.com/file/"
LICENSE="BSD-2"
SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
+IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DEPEND="
bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzip? ( app-arch/lzlib )
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}] )"
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )
seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
@@ -50,6 +53,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+ "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
)
src_prepare() {
@@ -61,8 +65,9 @@ src_prepare() {
elibtoolize
fi
- # don't let python README kill main README, bug ##60043
+ # 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
}
@@ -71,11 +76,14 @@ multilib_src_configure() {
local myeconfargs=(
--enable-fsect-man5
$(use_enable bzip2 bzlib)
+ $(multilib_native_use_enable lzip lzlib)
$(use_enable lzma xzlib)
$(use_enable seccomp libseccomp)
$(use_enable static-libs static)
$(use_enable zlib)
+ $(use_enable zstd zstdlib)
)
+
econf "${myeconfargs[@]}"
}
@@ -92,7 +100,7 @@ build_src_configure() {
}
need_build_file() {
- # when cross-compiling, we need to build up our own 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}"
@@ -145,7 +153,7 @@ multilib_src_install() {
}
multilib_src_install_all() {
- dodoc ChangeLog MAINT README
+ dodoc ChangeLog MAINT # README
# Required for `file -C`
insinto /usr/share/misc/magic
diff --git a/sys-apps/file/files/file-5.39-portage-sandbox.patch b/sys-apps/file/files/file-5.39-portage-sandbox.patch
index 3ea26641671..1880f6223c0 100644
--- a/sys-apps/file/files/file-5.39-portage-sandbox.patch
+++ b/sys-apps/file/files/file-5.39-portage-sandbox.patch
@@ -4,12 +4,6 @@ Date: Wed, 24 Jun 2020 11:18:45 +0200
Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox
Bug: https://bugs.gentoo.org/728978
----
- src/seccomp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index db9364ae..7f5d6f26 100644
--- a/src/seccomp.c
+++ b/src/seccomp.c
@@ -229,6 +229,8 @@ enable_sandbox_full(void)
@@ -21,6 +15,3 @@ index db9364ae..7f5d6f26 100644
#if 0
// needed by valgrind
---
-2.28.0
-
diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
index 4cc64801786..28a278e73f0 100644
--- a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
+++ b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
@@ -10,12 +10,6 @@ sys/stat.h in musl does this:
Counteract this with an #undef.
Bug: https://bugs.gentoo.org/789336
----
- src/seccomp.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index 3318367c..eb8b1e57 100644
--- a/src/seccomp.c
+++ b/src/seccomp.c
@@ -179,6 +179,7 @@ enable_sandbox_full(void)
@@ -26,6 +20,3 @@ index 3318367c..eb8b1e57 100644
ALLOW_RULE(fstatat64);
#endif
ALLOW_RULE(futex);
---
-2.32.0
-
diff --git a/sys-apps/file/files/file-5.43-configure-clang16.patch b/sys-apps/file/files/file-5.43-configure-clang16.patch
new file mode 100644
index 00000000000..15fd5b1c4a0
--- /dev/null
+++ b/sys-apps/file/files/file-5.43-configure-clang16.patch
@@ -0,0 +1,20 @@
+https://github.com/file/file/commit/4502517cc7316569d5902ab65c97b3b8e46f8a25
+https://github.com/file/file/commit/8c845b7bbad085678695d3e70467b8eec3dfa7af
+--- a/configure
++++ b/configure
+@@ -14037,13 +14037,14 @@ else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <time.h>
++#include <stdlib.h>
+ int
+ main (void)
+ {
+ #if !HAVE_DECL_DAYLIGHT
+ extern int daylight;
+ #endif
+-atoi(daylight);
++daylight = atoi("1");
+ ;
+ return 0;
+ }
diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml
index 9d92ca28bc2..01bf4264459 100644
--- a/sys-apps/file/metadata.xml
+++ b/sys-apps/file/metadata.xml
@@ -10,4 +10,7 @@
<remote-id type="cpe">cpe:/a:file_project:file</remote-id>
<remote-id type="github">file/file</remote-id>
</upstream>
+ <use>
+ <flag name="lzip">Enable <pkg>app-arch/lzip</pkg> decompression support via <pkg>app-arch/lzlib</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/sys-apps/findutils/findutils-4.9.0.ebuild b/sys-apps/findutils/findutils-4.9.0-r1.ebuild
index 87b3edc629d..520964bef11 100644
--- a/sys-apps/findutils/findutils-4.9.0.ebuild
+++ b/sys-apps/findutils/findutils-4.9.0-r1.ebuild
@@ -18,12 +18,19 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
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 )
- verify-sig? ( sec-keys/openpgp-keys-findutils )"
+RDEPEND="
+ selinux? ( sys-libs/libselinux )
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ test? (
+ ${PYTHON_DEPS}
+ dev-util/dejagnu
+ )
+ verify-sig? ( sec-keys/openpgp-keys-findutils )
+"
pkg_setup() {
use test && python-any-r1_pkg_setup
@@ -46,6 +53,8 @@ src_configure() {
append-ldflags -static
fi
+ append-lfs-flags
+
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
diff --git a/sys-apps/findutils/findutils-4.9.0-r2.ebuild b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
new file mode 100644
index 00000000000..86f171f6797
--- /dev/null
+++ b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+
+DESCRIPTION="GNU utilities for finding files"
+HOMEPAGE="https://www.gnu.org/software/findutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+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"
+IUSE="nls selinux static test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ selinux? ( sys-libs/libselinux )
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ test? (
+ ${PYTHON_DEPS}
+ dev-util/dejagnu
+ )
+ verify-sig? ( sec-keys/openpgp-keys-findutils )
+"
+
+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() {
+ if use static; then
+ append-flags -pthread
+ append-ldflags -static
+ fi
+
+ append-lfs-flags
+
+ 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
+ # rename to gfind, gxargs for better BSD compatibility
+ --program-prefix=g
+ )
+ 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
+}
+
+src_install() {
+ default
+
+ # symlink to the standard names
+ dosym gfind /usr/bin/find
+ dosym gxargs /usr/bin/xargs
+ dosym gfind.1 /usr/share/man/man1/find.1
+ dosym gxargs.1 /usr/share/man/man1/xargs.1
+}
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 91bf2e4aa95..ee1cc2f6e7b 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -14,8 +14,6 @@
untrusted applications using Linux namespaces and seccomp-bpf. It allows a process and all its descendants to
have their own private view of the globally shared kernel resources, such as the network stack, process table,
mount table.
-
- This is the regular version. For a long term support version see sys-apps/firejail-lts.
</longdescription>
<upstream>
<remote-id type="cpe">cpe:/a:firejail_project:firejail</remote-id>
diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r4.ebuild
index a1aee5e77b3..2bb0b89fed5 100644
--- a/sys-apps/flashrom/flashrom-1.2-r3.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-r4.ebuild
@@ -79,7 +79,7 @@ RDEPEND="atahpt? ( sys-apps/pciutils )
nicnatsemi? ( sys-apps/pciutils )
nicrealtek? ( sys-apps/pciutils )
ogp-spi? ( sys-apps/pciutils )
- pickit2-spi? ( virtual/libusb:0 )
+ pickit2-spi? ( virtual/libusb:1 )
rayer-spi? ( sys-apps/pciutils )
satamv? ( sys-apps/pciutils )
satasii? ( sys-apps/pciutils )
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index efb5ba4405d..5d3f570f6a3 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -56,4 +56,7 @@
Speed. flashrom is often much faster than most vendor flash tools.
Portability. Supports DOS, Linux, FreeBSD, NetBSD, OpenBSD, DragonFly BSD, Solaris, Mac OS X, and other Unix-like OSes. Partial Windows support is available (no internal programmer support at the moment, hence no "BIOS flashing").
</longdescription>
+ <upstream>
+ <remote-id type="github">flashrom/flashrom</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 11ec5d794be..f1034d53848 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,4 +1,3 @@
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.2.tar.xz 1626616 BLAKE2B a896c1ef5166be9085c7b66bde3df510e4d592f920795706c7d0b68f717ccfd0694b306797a862d3db35c71ced5dcdb71438119d95ff5455b4b6a6b6adfa0d0e SHA512 d7e1d0a9965332220f829caa5724d7547280db10f7428b4e9add87152da1d7dad97edcde85668501d5a50e6a7c1031bfd15e8f4cbc7196e1c0f7cc3d2e333fe1
-DIST flatpak-1.13.3.tar.xz 1679196 BLAKE2B bae60931eabdf61ae7de057dcd99014c65a7eccc9ed91aa75358ee058a22c2f55bd004355e0b2c52f3668d17404dcc7083339fcce35f3920fa3953e22e0a2417 SHA512 8aeef0b0c00a958b04d3d40b9bc6fa6afd3b4875fea6aa4a64ed1fe4e5e67a6e17543fa42e20d7e0e99e22d26821fb392849206f27f1ee7c6cf4c78f8aed2cfe
+DIST flatpak-1.14.0.tar.xz 1636864 BLAKE2B f7f211480577eb5bd422c49790ebfb84da5e5a03cc6dee3815af786bfcd347bd7b01e853c027a42a1510fba68d667c4a25f6b9f998753466baae61a765c73864 SHA512 88f011534a8da6c2421d7d24043756bfe6c46957b6d09ba96b269002a5f0d0372b51f4a8643af2020ef4ed8c5b5f102994ddab54a7052cfba15f8e3b160e8a83
+DIST flatpak-1.14.1.tar.xz 1626500 BLAKE2B bf33dcd5a0f0289e5bff32794012dcfc45dcdbb11ef0da5c68769c18b1bcd12fcc0308ea275a7532f59998db6afa019746313387b0f9636c7d9b91ceb7d66665 SHA512 1f22622b9a797b644b5fe9d26c3c4ec3f6b1a3b81a12d498e5aeeecb1a965c9aaa5c1d18843c938f116855bbbed3a8d9866997440f86241abe70eae13be7cdcb
diff --git a/sys-apps/flatpak/flatpak-1.12.3.ebuild b/sys-apps/flatpak/flatpak-1.12.3-r1.ebuild
index 8450f3e3691..6914f29a7ab 100644
--- a/sys-apps/flatpak/flatpak-1.12.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.3-r1.ebuild
@@ -33,8 +33,9 @@ RDEPEND="
dev-util/ostree[soup]
)
>=gnome-base/dconf-0.26:=
- >=net-libs/libsoup-2.4:=
- sys-apps/bubblewrap
+ gnome-base/gsettings-desktop-schemas
+ >=net-libs/libsoup-2.4:2.4=
+ >=sys-apps/bubblewrap-0.5.0
sys-apps/dbus
>=sys-fs/fuse-2.9.9:0=
sys-apps/xdg-dbus-proxy
diff --git a/sys-apps/flatpak/flatpak-1.12.7.ebuild b/sys-apps/flatpak/flatpak-1.12.7.ebuild
deleted file mode 100644
index a440306275f..00000000000
--- a/sys-apps/flatpak/flatpak-1.12.7.ebuild
+++ /dev/null
@@ -1,101 +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 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-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[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.13.2.ebuild b/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild
index c542d3a3434..8da6deeddf6 100644
--- a/sys-apps/flatpak/flatpak-1.13.2.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="doc introspection policykit seccomp systemd X"
RESTRICT+=" test"
@@ -29,13 +29,11 @@ RDEPEND="
dev-libs/json-glib:=
dev-libs/libassuan:=
>=dev-util/ostree-2020.8:=[gpg(+)]
- || (
- dev-util/ostree[curl]
- dev-util/ostree[soup]
- )
+ dev-util/ostree[curl]
>=gnome-base/dconf-0.26:=
- >=net-libs/libsoup-2.4:=
- sys-apps/bubblewrap
+ gnome-base/gsettings-desktop-schemas
+ net-misc/curl:=
+ >=sys-apps/bubblewrap-0.5.0
sys-apps/dbus
>=sys-fs/fuse-2.9.9:0=
sys-apps/xdg-dbus-proxy
@@ -59,7 +57,7 @@ BDEPEND="
sys-devel/bison
introspection? ( >=dev-libs/gobject-introspection-1.40 )
doc? (
- >=dev-util/gtk-doc-1.20
+ app-text/xmlto
dev-libs/libxslt
)
$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
@@ -91,7 +89,7 @@ src_configure() {
--with-system-dbus-proxy
$(use_enable X xauth)
$(use_enable doc documentation)
- $(use_enable doc gtk-doc)
+ $(use_enable doc docbook-docs)
$(use_enable introspection)
$(use_enable policykit system-helper)
$(use_enable seccomp)
diff --git a/sys-apps/flatpak/flatpak-1.13.3.ebuild b/sys-apps/flatpak/flatpak-1.14.1.ebuild
index c542d3a3434..d69ef1b584b 100644
--- a/sys-apps/flatpak/flatpak-1.13.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
inherit linux-info python-any-r1
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="doc introspection policykit seccomp systemd X"
RESTRICT+=" test"
@@ -29,13 +29,11 @@ RDEPEND="
dev-libs/json-glib:=
dev-libs/libassuan:=
>=dev-util/ostree-2020.8:=[gpg(+)]
- || (
- dev-util/ostree[curl]
- dev-util/ostree[soup]
- )
+ dev-util/ostree[curl]
>=gnome-base/dconf-0.26:=
- >=net-libs/libsoup-2.4:=
- sys-apps/bubblewrap
+ gnome-base/gsettings-desktop-schemas
+ net-misc/curl:=
+ >=sys-apps/bubblewrap-0.5.0
sys-apps/dbus
>=sys-fs/fuse-2.9.9:0=
sys-apps/xdg-dbus-proxy
@@ -59,7 +57,7 @@ BDEPEND="
sys-devel/bison
introspection? ( >=dev-libs/gobject-introspection-1.40 )
doc? (
- >=dev-util/gtk-doc-1.20
+ app-text/xmlto
dev-libs/libxslt
)
$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
@@ -91,7 +89,7 @@ src_configure() {
--with-system-dbus-proxy
$(use_enable X xauth)
$(use_enable doc documentation)
- $(use_enable doc gtk-doc)
+ $(use_enable doc docbook-docs)
$(use_enable introspection)
$(use_enable policykit system-helper)
$(use_enable seccomp)
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index b48706dafe7..0e8b6019fe9 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,2 +1 @@
-DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b
DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild
deleted file mode 100644
index 00464ef3dc8..00000000000
--- a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson python-any-r1 toolchain-funcs
-
-DESCRIPTION="EFI executable for fwupd"
-HOMEPAGE="https://fwupd.org"
-
-if [[ ${PV} = 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
-else
- SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
- virtual/pkgconfig"
-
-DEPEND="sys-boot/gnu-efi"
-
-RDEPEND="!<sys-apps/fwupd-1.6.0"
-
-src_prepare() {
- default
-
- python_fix_shebang "${S}/efi"
-}
-
-src_configure() {
- local emesonargs=(
- -Defi-cc="$(tc-getCC)"
- -Defi-ld="$(tc-getLD)"
- -Defi-objcopy="$(tc-getOBJCOPY)"
- -Defi_sbat_distro_id="gentoo"
- -Defi_sbat_distro_summary="Gentoo GNU/Linux"
- -Defi_sbat_distro_pkgname="${PN}"
- -Defi_sbat_distro_version="${PVR}"
- -Defi_sbat_distro_url="https://packages.gentoo.org/packages/${CATEGORY}/${PN}"
- )
-
- meson_src_configure
-}
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
index ade0d8be03f..69a7f4ed58d 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999 ]]; then
EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
else
SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
LICENSE="LGPL-2.1+"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 5c1ae4a880b..1e876937a4b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,2 @@
-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
-DIST fwupd-1.8.3.tar.gz 4267315 BLAKE2B 35e5855ea0d314fa5b1cc33ed4efa71e54c35b57c742748a5d6c7f4c1f88bfd9c2e5a84f2af72f6e5e63ddfc4f6521312fb7b1446922c76917f9abdd4d90e618 SHA512 271a1c2547f35322a7a7d83adc84d729ba73d810f6ac526d1c6aa2a9774dea1edc986b7d62481ebb70d43653577ced19f13f695dedf4012c82d814da70cb83f4
+DIST fwupd-1.8.5.tar.xz 3289548 BLAKE2B d82845ad4a6faaee966d43b8d9d5be0d4522ac6f2455ac8ef9d9c90dd0141a4feb7dd28f5c79526a49fd2ac4b785f92328a913a0fd13073fa2357aa996dd0700 SHA512 96856a56cb10b789bbbb82a33b702473cf1bdc32a9fddca6e48313ba3fefbe2f63a12a7290e3b4bd11939844f6989a0e15e96a4c2911cb900cd9e8d9c6c13f15
+DIST fwupd-1.8.7.tar.xz 3335636 BLAKE2B 1c4e8f369581f826a710274e0789fbcfe735ce58407d1c0f7472721895bf426e0ddf0fd3d014a35efe39726f8891faa7960aaa455482b435138ea116bddbc142 SHA512 374339178a1fbf85bc25b47077d0db351b3664a02ec9478c4a5381228125f3bd65ef0be9eb526574bd09ab665aadd6cd9e39f01ebbfebbd338ec191ba24c5a36
diff --git a/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch b/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch
deleted file mode 100644
index 297bde7d174..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-test-deps.py attempts to check the version of dev-python/markdown used
-by dev-util/gi-docgen by importing it. However, on Gentoo there is no
-guarantee that the gi-docgen executable and fwupd build scripts use
-the same Python interpreter.
-
---- a/meson.build
-+++ b/meson.build
-@@ -542,7 +542,7 @@
- fwupd_gir = []
- introspection = get_option('introspection').disable_auto_if(host_machine.system() != 'linux')
- r = run_command([python3, 'docs/test-deps.py'])
--docs_python_deps = get_option('docs').require(r.returncode() == 0, error_message: r.stdout())
-+docs_python_deps = get_option('docs')
- gidocgen_dep = dependency('gi-docgen',
- version: '>= 2021.1',
- native: true,
diff --git a/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch b/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch
deleted file mode 100644
index f4f628adc7c..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.3-gresource_quirks_paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -154,7 +154,7 @@
- error_message: 'meson >= 0.63.0 is needed for -Dgresource_quirks=enabled').allowed()
- fwupd_gresource_xml = custom_target('fwupd-resources-xml',
- input : [
-- 'org.freedesktop.fwupd.xml',
-+ join_paths(meson.current_source_dir(), 'org.freedesktop.fwupd.xml'),
- ] + plugin_quirks,
- output : 'fwupd.gresource.xml',
- command : [
diff --git a/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
new file mode 100644
index 00000000000..1cb3b41cb72
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
@@ -0,0 +1,215 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -10,20 +10,10 @@
+ subdir('fish-completion')
+ endif
+
+-if get_option('tests')
+-subdir('device-tests')
+-endif
+-
+ if build_daemon
+ subdir('motd')
+ endif
+
+-if get_option('tests')
+- if build_daemon
+- subdir('installed-tests')
+- endif
+-endif
+-
+ if build_standalone
+ install_data(['daemon.conf'],
+ install_dir: join_paths(sysconfdir, 'fwupd')
+--- a/plugins/acpi-dmar/meson.build
++++ b/plugins/acpi-dmar/meson.build
+@@ -47,7 +47,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-dmar-self-test', e, env: env) # added to installed-tests
+--- a/plugins/acpi-facp/meson.build
++++ b/plugins/acpi-facp/meson.build
+@@ -47,7 +47,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-facp-self-test', e, env: env) # added to installed-tests
+--- a/plugins/acpi-ivrs/meson.build
++++ b/plugins/acpi-ivrs/meson.build
+@@ -47,7 +47,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-ivrs-self-test', e, env: env) # added to installed-tests
+--- a/plugins/acpi-phat/meson.build
++++ b/plugins/acpi-phat/meson.build
+@@ -53,7 +53,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('acpi-phat-self-test', e, env: env) # added to installed-tests
+--- a/plugins/ata/meson.build
++++ b/plugins/ata/meson.build
+@@ -53,7 +53,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('ata-self-test', e, env: env) # added to installed-tests
+--- a/plugins/bcm57xx/meson.build
++++ b/plugins/bcm57xx/meson.build
+@@ -35,8 +35,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/bcm57xx.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -63,7 +61,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('bcm57xx-self-test', e, env: env)
+--- a/plugins/ccgx/meson.build
++++ b/plugins/ccgx/meson.build
+@@ -37,8 +37,6 @@
+ endif
+
+ if get_option('tests')
+- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -64,7 +62,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('ccgx-self-test', e, env: env)
+--- a/plugins/elantp/meson.build
++++ b/plugins/elantp/meson.build
+@@ -33,8 +33,6 @@
+ endif
+
+ if get_option('tests')
+- install_data(['tests/elantp.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -57,7 +55,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('elantp-self-test', e, env: env)
+--- a/plugins/linux-swap/meson.build
++++ b/plugins/linux-swap/meson.build
+@@ -44,7 +44,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('linux-swap-self-test', e) # added to installed-tests
+--- a/plugins/mtd/meson.build
++++ b/plugins/mtd/meson.build
+@@ -46,7 +46,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('mtd-self-test', e) # added to installed-tests
+--- a/plugins/nitrokey/meson.build
++++ b/plugins/nitrokey/meson.build
+@@ -47,7 +47,6 @@
+ link_with: [
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('nitrokey-self-test', e) # added to installed-tests
+--- a/plugins/pixart-rf/meson.build
++++ b/plugins/pixart-rf/meson.build
+@@ -31,8 +31,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/pixart.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -55,7 +53,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('pxi-self-test', e, env: env)
+--- a/plugins/redfish/meson.build
++++ b/plugins/redfish/meson.build
+@@ -47,14 +47,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/redfish-smbios.bin'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+- install_data(['tests/redfish.conf'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
+- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -89,7 +81,6 @@
+ fwupd,
+ fwupdplugin,
+ ],
+- install: true,
+ install_dir: installed_test_bindir,
+ )
+ test('redfish-self-test', e, env: env) # added to installed-tests
+--- a/src/tests/host-emulate/meson.build
++++ b/src/tests/host-emulate/meson.build
+@@ -8,7 +8,7 @@
+ output: '@0@.gz'.format(input_file),
+ capture: true,
+ command: [gzip, '-k', '--stdout', '@INPUT@'],
+- install: true,
++ install: false,
+ install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
+ )
+ endforeach
diff --git a/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch
new file mode 100644
index 00000000000..d82a326e0d0
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch
@@ -0,0 +1,357 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -10,20 +10,10 @@
+ subdir('fish-completion')
+ endif
+
+-if get_option('tests')
+-subdir('device-tests')
+-endif
+-
+ if build_daemon
+ subdir('motd')
+ endif
+
+-if get_option('tests')
+- if build_daemon
+- subdir('installed-tests')
+- endif
+-endif
+-
+ if build_standalone
+ install_data(['daemon.conf'],
+ install_dir: join_paths(sysconfdir, 'fwupd')
+--- a/plugins/acpi-dmar/meson.build
++++ b/plugins/acpi-dmar/meson.build
+@@ -28,7 +28,6 @@
+ plugin_libs,
+ plugin_builtin_acpi_dmar,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/acpi-facp/meson.build
++++ b/plugins/acpi-facp/meson.build
+@@ -28,7 +28,6 @@
+ plugin_libs,
+ plugin_builtin_acpi_facp,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/acpi-ivrs/meson.build
++++ b/plugins/acpi-ivrs/meson.build
+@@ -28,7 +28,6 @@
+ plugin_libs,
+ plugin_builtin_acpi_ivrs,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/acpi-phat/meson.build
++++ b/plugins/acpi-phat/meson.build
+@@ -31,7 +31,6 @@
+ plugin_libs,
+ plugin_builtin_acpi_phat,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/ata/meson.build
++++ b/plugins/ata/meson.build
+@@ -33,7 +33,6 @@
+ plugin_libs,
+ plugin_builtin_ata,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/bcm57xx/meson.build
++++ b/plugins/bcm57xx/meson.build
+@@ -25,8 +25,6 @@
+ plugin_builtins += plugin_builtin_bcm57xx
+
+ if get_option('tests')
+- install_data(['tests/bcm57xx.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -41,7 +39,6 @@
+ plugin_libs,
+ plugin_builtin_bcm57xx,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/ccgx/meson.build
++++ b/plugins/ccgx/meson.build
+@@ -28,8 +28,6 @@
+ plugin_builtins += plugin_builtin_ccgx
+
+ if get_option('tests')
+- install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -44,7 +42,6 @@
+ plugin_libs,
+ plugin_builtin_ccgx,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/dfu/meson.build
++++ b/plugins/dfu/meson.build
+@@ -70,7 +70,6 @@
+ plugin_libs,
+ plugin_builtin_dfu,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/elantp/meson.build
++++ b/plugins/elantp/meson.build
+@@ -20,8 +20,6 @@
+ plugin_builtins += plugin_builtin_elantp
+
+ if get_option('tests')
+- install_data(['tests/elantp.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -36,7 +34,6 @@
+ plugin_libs,
+ plugin_builtin_elantp,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/linux-swap/meson.build
++++ b/plugins/linux-swap/meson.build
+@@ -25,7 +25,6 @@
+ plugin_libs,
+ plugin_builtin_linux_swap,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/mtd/meson.build
++++ b/plugins/mtd/meson.build
+@@ -27,7 +27,6 @@
+ plugin_libs,
+ plugin_builtin_mtd,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/nitrokey/meson.build
++++ b/plugins/nitrokey/meson.build
+@@ -30,7 +30,6 @@
+ plugin_libs,
+ plugin_builtin_nitrokey,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/pixart-rf/meson.build
++++ b/plugins/pixart-rf/meson.build
+@@ -19,8 +19,6 @@
+ plugin_builtins += plugin_builtin_pxi
+
+ if get_option('tests')
+- install_data(['tests/pixart.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -35,7 +33,6 @@
+ plugin_libs,
+ plugin_builtin_pxi,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/redfish/meson.build
++++ b/plugins/redfish/meson.build
+@@ -40,14 +40,6 @@
+ )
+
+ if get_option('tests')
+- install_data(['tests/redfish-smbios.bin'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+- install_data(['tests/redfish.conf'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+- install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
+- install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
+- install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -68,7 +60,6 @@
+ fwupdplugin,
+ plugin_builtin_redfish,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/synaptics-mst/meson.build
++++ b/plugins/synaptics-mst/meson.build
+@@ -22,8 +22,6 @@
+ plugin_builtins += plugin_builtin_synaptics_mst
+
+ if get_option('tests')
+- install_data(['tests/synaptics-mst.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -47,7 +45,6 @@
+ c_args: [
+ cargs,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/synaptics-prometheus/meson.build
++++ b/plugins/synaptics-prometheus/meson.build
+@@ -18,8 +18,6 @@
+ plugin_builtins += plugin_builtin_synaprom
+
+ if get_option('tests')
+- install_data(['tests/synaptics-prometheus.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -35,7 +33,6 @@
+ plugin_builtin_synaprom,
+ ],
+ c_args: cargs,
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/synaptics-rmi/meson.build
++++ b/plugins/synaptics-rmi/meson.build
+@@ -25,8 +25,6 @@
+ plugin_builtins += plugin_builtin_synaptics_rmi
+
+ if get_option('tests')
+- install_data(['tests/synaptics-rmi-0x.builder.xml','tests/synaptics-rmi-10.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -41,7 +39,6 @@
+ plugin_libs,
+ plugin_builtin_synaptics_rmi,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/uefi-capsule/meson.build
++++ b/plugins/uefi-capsule/meson.build
+@@ -144,25 +144,6 @@
+ c_args: cargs
+ )
+ test('uefi-self-test', e, env: env)
+-
+-# to use these do `sudo systemctl edit fwupd.service` and set
+-# Environment="FWUPD_SYSFSFWDIR=/usr/share/installed-tests/fwupd"
+-install_data([
+- 'tests/efi/esrt/entries/entry0/capsule_flags',
+- 'tests/efi/esrt/entries/entry0/fw_class',
+- 'tests/efi/esrt/entries/entry0/fw_type',
+- 'tests/efi/esrt/entries/entry0/fw_version',
+- 'tests/efi/esrt/entries/entry0/last_attempt_status',
+- 'tests/efi/esrt/entries/entry0/last_attempt_version',
+- 'tests/efi/esrt/entries/entry0/lowest_supported_fw_version',
+- ],
+- install_dir: join_paths(installed_test_datadir, 'efi/esrt/entries/entry0'),
+-)
+-install_data([
+- 'tests/efi/efivars/CapsuleMax-39b68c46-f7fb-441b-b6ec-16b0f69821f3',
+- ],
+- install_dir: join_paths(installed_test_datadir, 'efi/efivars'),
+-)
+ endif
+
+ endif
+--- a/plugins/uf2/meson.build
++++ b/plugins/uf2/meson.build
+@@ -18,8 +18,6 @@
+ plugin_builtins += plugin_builtin_uf2
+
+ if get_option('tests')
+- install_data(['tests/uf2.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -34,7 +32,6 @@
+ plugin_libs,
+ plugin_builtin_uf2,
+ ],
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/vli/meson.build
++++ b/plugins/vli/meson.build
+@@ -46,7 +46,6 @@
+ plugin_builtin_vli,
+ ],
+ c_args: cargs,
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/plugins/wacom-usb/meson.build
++++ b/plugins/wacom-usb/meson.build
+@@ -22,8 +22,6 @@
+ plugin_builtins += plugin_builtin_wac
+
+ if get_option('tests')
+- install_data(['tests/wacom-usb.builder.xml'],
+- install_dir: join_paths(installed_test_datadir, 'tests'))
+ env = environment()
+ env.set('G_TEST_SRCDIR', meson.current_source_dir())
+ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+@@ -39,7 +37,6 @@
+ plugin_builtin_wac,
+ ],
+ c_args: cargs,
+- install: true,
+ install_rpath: libdir_pkg,
+ install_dir: installed_test_bindir,
+ )
+--- a/src/tests/host-emulate/meson.build
++++ b/src/tests/host-emulate/meson.build
+@@ -8,7 +8,6 @@
+ output: '@0@.gz'.format(input_file),
+ capture: true,
+ command: [gzip, '-k', '--stdout', '@INPUT@'],
+- install: true,
+ install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
+ )
+ endforeach
diff --git a/sys-apps/fwupd/fwupd-1.7.5.ebuild b/sys-apps/fwupd/fwupd-1.7.5.ebuild
deleted file mode 100644
index 28f7c27c049..00000000000
--- a/sys-apps/fwupd/fwupd-1.7.5.ebuild
+++ /dev/null
@@ -1,174 +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 bash-completion-r1 linux-info meson python-single-r1 vala 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 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)
- 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.0[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:= )
- dell? ( >=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.103 )
- 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
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${COMMON_DEPEND}
- sys-apps/dbus
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/pango[introspection]
-"
-
-pkg_setup() {
- python-single-r1_pkg_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
-
- vala_src_prepare
-}
-
-src_configure() {
- local plugins=(
- $(meson_use amt plugin_amt)
- $(meson_use dell plugin_dell)
- $(meson_use fastboot plugin_fastboot)
- $(meson_use flashrom plugin_flashrom)
- $(meson_use gusb plugin_uf2)
- $(meson_use logitech plugin_logitech_bulkcontroller)
- $(meson_use modemmanager plugin_modem_manager)
- $(meson_use nvme plugin_nvme)
- $(meson_use sqlite)
- $(meson_use spi plugin_intel_spi)
- $(meson_use synaptics plugin_synaptics_mst)
- $(meson_use synaptics plugin_synaptics_rmi)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi_capsule)
- $(meson_use uefi plugin_uefi_capsule_splash)
- $(meson_use uefi plugin_uefi_pk)
- )
- use ppc64 && plugins+=( -Dplugin_msr="false" )
- use riscv && plugins+=( -Dplugin_msr="false" )
-
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- -Dconsolekit="false"
- -Dcurl="true"
- -Ddocs="$(usex gtk-doc gtkdoc none)"
- -Defi_binary="false"
- -Dsupported_build="true"
- $(meson_use archive libarchive)
- $(meson_use bash-completion bash_completion)
- $(meson_use bluetooth bluez)
- $(meson_use elogind)
- $(meson_use gnutls)
- $(meson_use gusb)
- $(meson_use lzma)
- $(meson_use man)
- $(meson_use introspection)
- $(meson_use policykit polkit)
- $(meson_use 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
-}
diff --git a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
deleted file mode 100644
index dc4a17a94fa..00000000000
--- a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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 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 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)
- 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:= )
- dell? ( >=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.103 )
- 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
- )
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
- !<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${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="true"
- $(meson_use amt plugin_amt)
- $(meson_use dell plugin_dell)
- $(meson_use fastboot plugin_fastboot)
- $(meson_use flashrom plugin_flashrom)
- $(meson_use gusb plugin_uf2)
- $(meson_use logitech plugin_logitech_bulkcontroller)
- $(meson_use modemmanager plugin_modem_manager)
- $(meson_use nvme plugin_nvme)
- $(meson_use sqlite)
- $(meson_use spi plugin_intel_spi)
- $(meson_use synaptics plugin_synaptics_mst)
- $(meson_use synaptics plugin_synaptics_rmi)
- $(meson_use thunderbolt plugin_thunderbolt)
- $(meson_use tpm plugin_tpm)
- $(meson_use uefi plugin_uefi_capsule)
- $(meson_use uefi plugin_uefi_capsule_splash)
- $(meson_use uefi plugin_uefi_pk)
- )
- use ppc64 && plugins+=( -Dplugin_msr="false" )
- use riscv && plugins+=( -Dplugin_msr="false" )
-
- local emesonargs=(
- --localstatedir "${EPREFIX}"/var
- -Dbuild="$(usex minimal standalone all)"
- -Dconsolekit="false"
- -Dcurl="true"
- -Ddocs="$(usex gtk-doc gtkdoc none)"
- -Defi_binary="false"
- -Dsupported_build="true"
- $(meson_use archive libarchive)
- $(meson_use bash-completion bash_completion)
- $(meson_use bluetooth bluez)
- $(meson_use elogind)
- $(meson_use gnutls)
- $(meson_use gusb)
- $(meson_use lzma)
- $(meson_use man)
- $(meson_use introspection)
- $(meson_use policykit polkit)
- $(meson_use 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
-}
diff --git a/sys-apps/fwupd/fwupd-1.8.0-r1.ebuild b/sys-apps/fwupd/fwupd-1.8.0-r1.ebuild
deleted file mode 100644
index cc9c6194035..00000000000
--- a/sys-apps/fwupd/fwupd-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# 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 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"
- $(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
-}
diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.5.ebuild
index 4265a6081d1..cb1a7821aa1 100644
--- a/sys-apps/fwupd/fwupd-1.8.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.5.ebuild
@@ -5,16 +5,16 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..11} )
-inherit linux-info meson python-single-r1 vala udev xdg
+inherit 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"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
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 tpm uefi"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~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 tpm uefi"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^^ ( elogind minimal systemd )
dell? ( uefi )
@@ -24,6 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
modemmanager? ( gusb )
spi? ( lzma )
synaptics? ( gnutls )
+ test? ( gusb )
uefi? ( gnutls )
"
RESTRICT="!test? ( test )"
@@ -32,6 +33,9 @@ BDEPEND="$(vala_depend)
>=dev-util/meson-0.60.0
virtual/pkgconfig
gtk-doc? (
+ $(python_gen_cond_dep '
+ >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+ ')
>=dev-util/gi-docgen-2021.1
)
bash-completion? ( >=app-shells/bash-completion-2.0 )
@@ -93,21 +97,14 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.8.3-docgen_deps_test.patch
- "${FILESDIR}"/${PN}-1.8.3-gresource_quirks_paths.patch
+ "${FILESDIR}"/${PN}-1.8.4-installed_tests.patch
)
-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
+ vala_setup
+
# 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
@@ -115,8 +112,6 @@ src_prepare() {
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
sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
-i docs/meson.build || die
@@ -124,8 +119,6 @@ src_prepare() {
}
src_configure() {
- # TODO (maybe): acpi_phat, bcm57xx, cfu, cpu, emmc, ep963x, mtd, nitrokey,
- # parade_lspcon, pixart_rf, realtek_mst, scsi, redfish, upower
local plugins=(
-Dplugin_gpio="enabled"
$(meson_feature amt plugin_amt)
@@ -195,9 +188,11 @@ src_install() {
}
pkg_postinst() {
+ xdg_pkg_postinst
use minimal || udev_reload
}
pkg_postrm() {
+ xdg_pkg_postrm
use minimal || udev_reload
}
diff --git a/sys-apps/fwupd/fwupd-1.8.1.ebuild b/sys-apps/fwupd/fwupd-1.8.7.ebuild
index 3852c4032a8..fb3d311758a 100644
--- a/sys-apps/fwupd/fwupd-1.8.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.7.ebuild
@@ -3,26 +3,28 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
-inherit bash-completion-r1 linux-info meson python-single-r1 vala udev xdg
+inherit 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"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
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"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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 tpm uefi"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^^ ( elogind minimal systemd )
dell? ( uefi )
fastboot? ( gusb )
logitech? ( gusb )
minimal? ( !introspection )
+ modemmanager? ( gusb )
spi? ( lzma )
synaptics? ( gnutls )
+ test? ( gusb )
uefi? ( gnutls )
"
RESTRICT="!test? ( test )"
@@ -30,7 +32,12 @@ RESTRICT="!test? ( test )"
BDEPEND="$(vala_depend)
>=dev-util/meson-0.60.0
virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
+ gtk-doc? (
+ $(python_gen_cond_dep '
+ >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+ ')
+ >=dev-util/gi-docgen-2021.1
+ )
bash-completion? ( >=app-shells/bash-completion-2.0 )
introspection? ( dev-libs/gobject-introspection )
man? (
@@ -38,7 +45,7 @@ BDEPEND="$(vala_depend)
sys-apps/help2man
)
test? (
- thunderbolt? ( dev-util/umockdev )
+ dev-util/umockdev
net-libs/gnutls[tools]
)
"
@@ -53,7 +60,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
$(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 )
@@ -89,31 +95,29 @@ 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
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.6-installed_tests.patch
+)
src_prepare() {
default
+
+ vala_setup
+
# 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/doc/gtk-doc/" \
+ -i docs/meson.build || die
- sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
- -i data/builder/meson.build || die
+ python_fix_shebang "${S}"/contrib/*.py
}
src_configure() {
local plugins=(
-Dplugin_gpio="enabled"
- $(meson_feature amt plugin_amt)
+ $(meson_feature amt plugin_intel_me)
$(meson_feature dell plugin_dell)
$(meson_feature fastboot plugin_fastboot)
$(meson_feature flashrom plugin_flashrom)
@@ -124,7 +128,6 @@ src_configure() {
$(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)
@@ -139,7 +142,6 @@ src_configure() {
-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)"
@@ -149,6 +151,7 @@ src_configure() {
$(meson_feature cbor)
$(meson_feature elogind)
$(meson_feature gnutls)
+ $(meson_feature gtk-doc docs)
$(meson_feature gusb)
$(meson_feature lzma)
$(meson_use man)
@@ -165,6 +168,10 @@ src_configure() {
meson_src_configure
}
+src_test() {
+ LC_ALL="C" meson_src_test
+}
+
src_install() {
meson_src_install
@@ -180,9 +187,11 @@ src_install() {
}
pkg_postinst() {
+ xdg_pkg_postinst
use minimal || udev_reload
}
pkg_postrm() {
+ xdg_pkg_postrm
use minimal || udev_reload
}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 748aacf7996..e17d6e15e8f 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -22,7 +22,6 @@
<flag name="modemmanager">Build and install Modem Manager plugin</flag>
<flag name="spi">Install Intel-SPI plugin</flag>
<flag name="synaptics">Install synaptics plugin</flag>
- <flag name="thunderbolt">Install Thunderbolt plugin</flag>
<flag name="tpm">Install Trusted Platform Module plugin</flag>
<flag name="uefi">Enable UEFI support</flag>
</use>
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index ba6b006d35b..3e611eb96fd 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,2 +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
+DIST gawk-5.2.1.tar.xz 3411420 BLAKE2B 5dbbfe92ed4c11a38b2f995e9267dd2e392a9f393af1c63aaf3c5dd6d1681c01db900e05a118831125f914fcffe2218de7f30891ccc6f64abc5f572aef5feeff SHA512 f81da3e61987d1460326dc79fdbabacfd4660219bf66ec8ba18877500fd24e160761e401a5b868067f82bec46a6a808098f3f6a1f4c8b710e439cd3f99ffa56c
+DIST gawk-5.2.1.tar.xz.sig 488 BLAKE2B 5dcdc9ae90d4744a968cc750526a9c1c38915f85c56c2eca80b219ba8519c927ab55b7f569d55054b0499f7bf37d3413b97e9d3cf36f5573f9ecd4855663064e SHA512 97a9cfb069f235bef31892ec6e5c56ee6a8733129ae3d02e871d5407de4d7a6140fc0a87001b2b21e3cffd714d1b4d164876de47144dfdce6dea92c670ed0217
diff --git a/sys-apps/gawk/gawk-5.1.1-r2.ebuild b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
index 396c6f8f74f..3bdae58c563 100644
--- a/sys-apps/gawk/gawk-5.1.1-r2.ebuild
+++ b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
-LICENSE="GPL-2"
+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"
IUSE="mpfr nls readline"
diff --git a/sys-apps/gawk/gawk-5.2.1.ebuild b/sys-apps/gawk/gawk-5.2.1.ebuild
new file mode 100644
index 00000000000..53a5f803195
--- /dev/null
+++ b/sys-apps/gawk/gawk-5.2.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GAWK_IS_BETA=no
+
+DESCRIPTION="GNU awk pattern-matching language"
+HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
+
+if [[ ${GAWK_IS_BETA} == yes || ${PV} == *_beta* ]] ; then
+ if [[ ${PV} == *_beta* ]] ; then
+ # Beta versioning is sometimes for the release prior, e.g.
+ # 5.2.1_beta is labelled upstream as 5.2.0b.
+ MY_PV=${PV/_beta/b}
+ MY_PV=$(ver_cut 1-2 ${MY_PV}).$(($(ver_cut 3 ${MY_PV}) - 1))$(ver_cut 4- ${MY_PV})
+ MY_P=${PN}-${MY_PV}
+
+ S="${WORKDIR}"/${MY_P}
+ else
+ MY_P=${P}
+ fi
+
+ SRC_URI="https://www.skeeve.com/gawk/${MY_P}.tar.gz"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gawk.asc
+ inherit verify-sig
+
+ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
+ SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
+
+ 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
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="mpfr pma nls readline"
+
+RDEPEND="
+ mpfr? (
+ dev-libs/gmp:=
+ dev-libs/mpfr:=
+ )
+ readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-apps/texinfo-6.7
+ >=sys-devel/bison-3.5.4
+ nls? ( sys-devel/gettext )
+"
+
+if [[ ${GAWK_IS_BETA} != yes ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-gawk )"
+fi
+
+src_prepare() {
+ default
+
+ # Use symlinks rather than hardlinks, and disable version links
+ sed -i \
+ -e '/^LN =/s:=.*:= $(LN_S):' \
+ -e '/install-exec-hook:/s|$|\nfoo:|' \
+ Makefile.in doc/Makefile.in || die
+
+ # bug #413327
+ sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die
+
+ # Fix standards conflict on Solaris
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ sed -i \
+ -e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
+ -e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
+ extension/inplace.c || die
+ fi
+}
+
+src_configure() {
+ # Avoid automagic dependency on libsigsegv
+ export ac_cv_libsigsegv=no
+
+ local myeconfargs=(
+ --cache-file="${S}"/config.cache
+ --libexec='$(libdir)/misc'
+ $(use_with mpfr)
+ $(use_enable nls)
+ $(use_enable pma)
+ $(use_with readline)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ # Automatic dodocs barfs
+ rm -rf README_d || die
+
+ default
+
+ # Install headers
+ insinto /usr/include/awk
+ doins *.h
+ rm "${ED}"/usr/include/awk/config.h || die
+}
+
+pkg_postinst() {
+ # Symlink creation here as the links do not belong to gawk, but to any awk
+ if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
+ eselect awk update ifunset
+ else
+ local l
+ for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do
+ if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then
+ ln -s "${l##*/}" "${l/gawk/awk}" || die
+ fi
+ done
+
+ if ! [[ -e ${EROOT}/bin/awk ]] ; then
+ # /bin might not exist yet (stage1)
+ [[ -d "${EROOT}/bin" ]] || mkdir "${EROOT}/bin" || die
+
+ ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die
+ fi
+ fi
+}
+
+pkg_postrm() {
+ if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
+ eselect awk update ifunset
+ fi
+}
diff --git a/sys-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml
index fda45f78db6..66b0edfce4a 100644
--- a/sys-apps/gawk/metadata.xml
+++ b/sys-apps/gawk/metadata.xml
@@ -1,11 +1,20 @@
<?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>
-<use>
- <flag name="mpfr">use mpfr for high precision arithmetic (-M / --bignum)</flag>
-</use>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <use>
+ <flag name="mpfr">
+ Use <pkg>dev-libs/mpfr</pkg> for high precision arithmetic (-M / --bignum)
+ </flag>
+ <flag name="pma">
+ Experimental Persistent Memory Allocator (PMA) support which allows persistence
+ of variables, arrays, and user-defined functions across runs.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="savannah">gawk</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index bffbec5a87b..d25f2f43a4a 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1 @@
-DIST gentoo-functions-0.14.tar.gz 11330 BLAKE2B 72543941f2954e35d3671c1c482eda44ae00cf0c636a1d706c5b90c56dfbb985d20c156b6de650e5d33ff9fac0abaf9fc50b1172832c2bd5276f6adfe5baf3b8 SHA512 e1e0fee9f3e8b79478aaf2b9a54c8623c858e62f72f2885ea88f7006631cf513bdfaac7122f2a5fc97379bde57851793bf7d6c63a1c63a6923a7f13a73d803fc
-DIST gentoo-functions-0.15.tar.gz 11236 BLAKE2B da3df4ee809c33a7aa275757380584abcc70dc5f54d32b2e9d3336a9453cfc935e932df065a65a7458b885a449774713fead5aea99ea5e7ee522e5493d35482b SHA512 b2a42e5b43c487d62e036eade88b5cc8e0f4eb249c783837a0293cdbba4ed8a1eea8742d531885bcc56eefa337853c41d257b6a9880fc0e7420b490bb6f98fd4
-DIST gentoo-functions-0.16.tar.bz2 10769 BLAKE2B aa85c97bf07e86631f9d11fc93252099925fb798a12483bead1e270799f44d3107c28e370925c948484a3f490247caf4c17b0068a160af7f72bec0f941699c95 SHA512 aa1f1bfbdd1e7ea51b2cceaae36b15a457b726ecc4fbed5bb3e5475d88b8142642df97b729303085716b1e3c7c92da58fa3b6842af5a04152e9f4c563d3d4b12
DIST gentoo-functions-0.17.tar.bz2 10798 BLAKE2B 1b725945421ab36b1412f9addc22e9fe299c0e6460790ee2832b9f63d4c06b86bb0d054b01505640a5dc1e62f3cd257628717fec852116a4c8b2c9f9d2d149ee SHA512 6a3de93b5e4d761a53a622f41e6079606cc4ad8a964771d49dafdefbb632afdf722fd055d261e494aa0be956c4160c49a775ab40c927c5340b8e4da275ef51fb
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
deleted file mode 100644
index f78a9ce16ce..00000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
- SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${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 ~x86-winnt"
-fi
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-src_configure() {
- tc-export CC
- append-lfs-flags
- export ROOTPREFIX="${EPREFIX}"
- export PREFIX="${EPREFIX}/usr"
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild
deleted file mode 100644
index 9214af16efb..00000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
- SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
- 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 ~x86-winnt"
-fi
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-src_configure() {
- tc-export CC
- append-lfs-flags
- export ROOTPREFIX="${EPREFIX}"
- export PREFIX="${EPREFIX}/usr"
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.16.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.16.ebuild
deleted file mode 100644
index cf5513d3fcf..00000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
- SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
- 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 ~x86-winnt"
-fi
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-src_configure() {
- tc-export CC
- append-lfs-flags
- export ROOTPREFIX="${EPREFIX}"
- export PREFIX="${EPREFIX}/usr"
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild
index cf5513d3fcf..9cc9e93c735 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
else
SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
- 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 ~x86-winnt"
+ 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 ~x86-winnt"
fi
inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 2f58ee79e47..fb7803e4b3a 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1 +1,2 @@
DIST gnome-disk-utility-42.0.tar.xz 1740332 BLAKE2B 4d05876364a475d1e16651569862fe3e9bb97549463146e69722c55922c0609069334e198eff91208448dc0baf7fcefe6bab56612e89fd7412fea42ba20549d2 SHA512 c47c37262295ba455b483a7ebe7799e92f94b97d177327817bb088cddcc3ff1f5840c3e270651287ff6a88257ec7cfcd1abe4167bf7454bbf55e145c8f1dc7c9
+DIST gnome-disk-utility-43.0.tar.xz 1752240 BLAKE2B 906183e7f61c4e9d2206fe2c99034f06a0aa3869d253587325ae18b336dffc6d8523a2f4d89c4338ed64947e73c5a24de15dfdb15a9d42d77fe51fd2321bf159 SHA512 8cb1b10fba21c90bceec9521103defe092dea9a4c89a39ae44e4d5981dd0d1958649e7a2743535f0135a3c9179cad0e0aced98dfc805e19bdec81651abcecf48
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 40d5fcad3ce..24e660b4175 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="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
DEPEND="
>=media-libs/libdvdread-4.2.0:0=
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-43.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-43.0.ebuild
new file mode 100644
index 00000000000..558c13f868b
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-43.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="amd64 ~arm arm64 ~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.5.0: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
+"
+
+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/metadata.xml b/sys-apps/gnome-disk-utility/metadata.xml
index d45bf7909b2..1d4f056df52 100644
--- a/sys-apps/gnome-disk-utility/metadata.xml
+++ b/sys-apps/gnome-disk-utility/metadata.xml
@@ -1,17 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="fat">Include FAT16/FAT32 support
- (<pkg>sys-fs/dosfstools</pkg>)</flag>
-</use>
-<longdescription lang="en">
- Disks provides an easy way to inspect, format, partition, and configure disks
- and block devices. Using Disks, you can view SMART data, manage devices,
- benchmark physical disks, and image USB sticks.
-</longdescription>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="fat">Include FAT16/FAT32 support (<pkg>sys-fs/dosfstools</pkg>)</flag>
+ </use>
+ <longdescription lang="en">
+ Disks provides an easy way to inspect, format, partition, and configure disks
+ and block devices. Using Disks, you can view SMART data, manage devices,
+ benchmark physical disks, and image USB sticks.
+ </longdescription>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-disk-utility</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch
new file mode 100644
index 00000000000..470defd33cf
--- /dev/null
+++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch
@@ -0,0 +1,22 @@
+--- a/gptcl.cc
++++ b/gptcl.cc
+@@ -156,9 +156,10 @@
+
+ // Assume first non-option argument is the device filename....
+ device = (char*) poptGetArg(poptCon);
+- poptResetContext(poptCon);
+
+ if (device != NULL) {
++ device = strdup(device);
++ poptResetContext(poptCon);
+ JustLooking(); // reset as necessary
+ BeQuiet(); // Tell called functions to be less verbose & interactive
+ if (LoadPartitions((string) device)) {
+@@ -498,6 +499,7 @@
+ cerr << "Error encountered; not saving changes.\n";
+ retval = 4;
+ } // if
++ free(device);
+ } // if (device != NULL)
+ poptFreeContext(poptCon);
+ return retval;
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild
index de190d603dc..e7ed4b517d0 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild
@@ -7,7 +7,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"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -31,7 +31,8 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${P}-libuuid.patch" #844073
+ "${FILESDIR}/${PN}-1.0.9-libuuid.patch" #844073
+ "${FILESDIR}/${PN}-1.0.9-popt_segv.patch" #872131
)
src_prepare() {
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index 89b980f7599..999eae344cc 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,5 +1 @@
-DIST gradm-3.1-201603152148.tar.gz 91549 BLAKE2B a569ebbac10418ad69effb47a4102bdfd16cb99448d70550a71cad5ab2dca8076d03c4234819fa8ba9d3d50a57d676c2d703c2f308396a7d9ffdf527b1f1a5d8 SHA512 a423db1dfdaa0b068970b92dc970d6e10bfc20695437e92d967b064c3efe05114ab6de672eec984ab2f048b67b12ec8c6667a71bc584f03e5d2f0ebab1476158
-DIST gradm-3.1-201607172312.tar.gz 91667 BLAKE2B 207f86d12789ada00eeb3bc813863d671be54265eff7649a40960ab41296977d0e36dc60ebc482514e1803050026783d43017e7423e25e4d652f813cfb3e75c0 SHA512 61f14038ee555b99e4d0096dd01697d8adba45e057ffceadb44eafbdfba807b53030684c5073d169c005902acfa6baa673975ed4ab00ad035941c209f8f1d2e2
-DIST gradm-3.1-201608131257.tar.gz 91949 BLAKE2B e1dc55706a0c8492b2d0716cfe8abb4efdcd3829da725f412bd6882e28b34e0f52eb796fb9ff0b25db93512893d9d7dafe1aa54f44fa2f3b329adb48d4bc14b4 SHA512 0947abda8d4085fd6f4a569a29f146d6f093c7013ea3aba50df4fb740487b93696b63ab475eb862cfcd26aeb62cd69a55c3d6083b91a2eb9349ad566735f8cfe
-DIST gradm-3.1-201708012022.tar.gz 92238 BLAKE2B 220a2cba3f01e92adc6bf959cfa1721d6ea41247be2c6b742577c434071fe80d0135773e18b9a8a89f1c893c9cd03443e29af0e0b027c97422e4a743f8b6c960 SHA512 1c319ce5b102ad54d0c4d0c43222ed755719bb2568c9a4575b62965a73b0765265dc7068488e5e34df52ed9382b17e4bf1b32a8eef20a4d7a534f3f9a4ba2b3d
DIST gradm-3.1-201903191516.tar.gz 92504 BLAKE2B e302f77cd3b27e5288a63a578a8161784161b024ff9740e0fbbd75edc66e918025082cf6c860b7be21be14cea2cbe0ed38376a528309aabb574a5bb909bcd1be SHA512 224f87035c2604640f14a6cafc94b16aae765bbaf457675cc189fe7c8b73450281bc16456d1c59cc8926c920601293840a148f4193e708c83509aef2a25fbd9f
diff --git a/sys-apps/gradm/gradm-3.1.201603152148.ebuild b/sys-apps/gradm/gradm-3.1.201603152148.ebuild
deleted file mode 100644
index 5a4b2c5d4a9..00000000000
--- a/sys-apps/gradm/gradm-3.1.201603152148.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs udev versionator
-
-MY_PV="$(replace_version_separator 2 -)"
-
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="https://www.grsecurity.net/"
-SRC_URI="https://dev.gentoo.org/~blueness/hardened-sources/gradm/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND="
- sys-devel/bison
- sys-devel/flex
- pam? ( sys-libs/pam )"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
- "${FILESDIR}"/respect-gentoo-env-r3.patch
-)
-
-src_prepare() {
- default
- sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-}
-
-src_compile() {
- local target
- use pam || target="nopam"
-
- emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- fperms 711 /sbin/gradm
-}
-
-pkg_postinst() {
- ewarn
- ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode."
- ewarn
-}
diff --git a/sys-apps/gradm/gradm-3.1.201607172312.ebuild b/sys-apps/gradm/gradm-3.1.201607172312.ebuild
deleted file mode 100644
index 5a4b2c5d4a9..00000000000
--- a/sys-apps/gradm/gradm-3.1.201607172312.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs udev versionator
-
-MY_PV="$(replace_version_separator 2 -)"
-
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="https://www.grsecurity.net/"
-SRC_URI="https://dev.gentoo.org/~blueness/hardened-sources/gradm/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND="
- sys-devel/bison
- sys-devel/flex
- pam? ( sys-libs/pam )"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
- "${FILESDIR}"/respect-gentoo-env-r3.patch
-)
-
-src_prepare() {
- default
- sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-}
-
-src_compile() {
- local target
- use pam || target="nopam"
-
- emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- fperms 711 /sbin/gradm
-}
-
-pkg_postinst() {
- ewarn
- ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode."
- ewarn
-}
diff --git a/sys-apps/gradm/gradm-3.1.201608131257.ebuild b/sys-apps/gradm/gradm-3.1.201608131257.ebuild
deleted file mode 100644
index 5e731f31b54..00000000000
--- a/sys-apps/gradm/gradm-3.1.201608131257.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs udev versionator
-
-MY_PV="$(replace_version_separator 2 -)"
-
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="https://www.grsecurity.net/"
-SRC_URI="https://dev.gentoo.org/~blueness/hardened-sources/gradm/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND="
- sys-devel/bison
- sys-devel/flex
- pam? ( sys-libs/pam )"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
- "${FILESDIR}"/respect-gentoo-env-r3.patch
-)
-
-src_prepare() {
- default
- sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-}
-
-src_compile() {
- local target
- use pam || target="nopam"
-
- emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- fperms 711 /sbin/gradm
-}
-
-pkg_postinst() {
- ewarn
- ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode."
- ewarn
-}
diff --git a/sys-apps/gradm/gradm-3.1.201708012022.ebuild b/sys-apps/gradm/gradm-3.1.201708012022.ebuild
deleted file mode 100644
index 5e731f31b54..00000000000
--- a/sys-apps/gradm/gradm-3.1.201708012022.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs udev versionator
-
-MY_PV="$(replace_version_separator 2 -)"
-
-DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
-HOMEPAGE="https://www.grsecurity.net/"
-SRC_URI="https://dev.gentoo.org/~blueness/hardened-sources/gradm/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND="
- sys-devel/bison
- sys-devel/flex
- pam? ( sys-libs/pam )"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
- "${FILESDIR}"/respect-gentoo-env-r3.patch
-)
-
-src_prepare() {
- default
- sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-}
-
-src_compile() {
- local target
- use pam || target="nopam"
-
- emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- fperms 711 /sbin/gradm
-}
-
-pkg_postinst() {
- ewarn
- ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode."
- ewarn
-}
diff --git a/sys-apps/gradm/gradm-3.1.201903191516.ebuild b/sys-apps/gradm/gradm-3.1.201903191516.ebuild
index 95fe975573e..b948990c0c8 100644
--- a/sys-apps/gradm/gradm-3.1.201903191516.ebuild
+++ b/sys-apps/gradm/gradm-3.1.201903191516.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic toolchain-funcs udev
+
+inherit toolchain-funcs udev
MY_PV="$(ver_rs 2 -)"
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 68382ec881f..65caccff65b 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,6 +1,4 @@
-DIST grep-3.7.62-9a668.tar.xz 1687820 BLAKE2B 95f5deccb3b3b223cb429f5c515674bed5209e6ca1d295b5ddfcf09614c6c10f6c6f56df9931a3dc0926b48abced15ab1099d8e84840c74846cb89270e248473 SHA512 b24a11138e683d75e75b4f04a42f4d202526a691aa70c303af4d257e2a395a4266b4bc05afff4fff7ab0efc5564af3efe0f9108cbeddf406d4dc3f171a642f25
-DIST grep-3.7.62-9a668.tar.xz.sig 833 BLAKE2B 9be6a33b1d2e29eeaea6bfbcbeade37eb4d7c8b2fdf37ec82376b1cc158f02c6916c87c21378cd099f863787ae46e2bc7dd40df77b263fe971f50b7bbe67cced SHA512 5245b7af4202bd49ef8937eda3ad91949e6bd9e16e217c0a326e8d6abc17d8f47e068197cb5df16829298912eed0d811164da4d1d7bd3ce3ff679a87a281f33b
-DIST grep-3.7.98-c9ac.tar.xz 1701736 BLAKE2B ac7fa0a45179b25b241e2f57b6731f3ccd4a1950aeab749d47ef286f1723ec6324e894b452c24877224bf61f54584447a2cb4278d6911eca7debf92a7d0b8698 SHA512 9325db663350b47493434f01639f17a383ccf5b18d45c8de2d38d529b60982d426b1a09f0d653ff4e716933fb9a429e18c69a832d667f12c37ccab9d90a07f4b
-DIST grep-3.7.98-c9ac.tar.xz.sig 833 BLAKE2B d215edbe769bdbb1afbfe3cc560509ba7e1c9ddcbc149cdd173ffd41f4d195c66b2119847b7383dbd7f9ff613e9a21a34c28a14ad4c2422846ad4e5cfb0eb369 SHA512 7a781df1c1b072f752b70bbfd843f71d8ef76cc68d908d1f2e9dd6058b706a3ee2d8013ff73300c3d9d3019a5a98e901a088f2630de666a997eb52825955cadb
DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82
DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4
+DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
+DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
diff --git a/sys-apps/grep/grep-3.7_p20220425.ebuild b/sys-apps/grep/grep-3.7_p20220425.ebuild
deleted file mode 100644
index 342f35aa3db..00000000000
--- a/sys-apps/grep/grep-3.7_p20220425.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
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="https://www.gnu.org/software/grep/"
-
-if [[ ${PV} == *_p* ]] ; then
- # Subscribe to the 'platform-testers' ML to find these.
- # Useful to test on our especially more niche arches and report issues upstream.
- MY_COMMIT="62-9a668"
- MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
- SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
- SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
- S="${WORKDIR}"/${MY_P}
-else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
- 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
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="nls pcre static"
-
-# We lack dev-libs/libsigsegv[static-libs] for now
-REQUIRED_USE="static? ( !sparc )"
-
-LIB_DEPEND="pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
- sparc? ( dev-libs/libsigsegv )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- nls? ( virtual/libintl )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-BDEPEND="virtual/pkgconfig
- nls? ( sys-devel/gettext )
- verify-sig? ( sec-keys/openpgp-keys-grep )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
- default
-
- # bug #523898
- sed -i \
- -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
- -e "s:@grep@:${EPREFIX}/bin/grep:" \
- src/egrep.sh || die
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- # We used to turn this off unconditionally (bug #673524) but we now
- # allow it for cases where libsigsegv is better for userspace handling
- # of stack overflows.
- # In particular, it's necessary for sparc: bug #768135
- export ac_cv_libsigsegv=$(usex sparc)
-
- local myeconfargs=(
- --bindir="${EPREFIX}"/bin
- $(use_enable nls)
- $(use_enable pcre perl-regexp)
- )
-
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/grep/grep-3.7_p20220702.ebuild b/sys-apps/grep/grep-3.8.ebuild
index 7f5d56e74b2..7f5d56e74b2 100644
--- a/sys-apps/grep/grep-3.7_p20220702.ebuild
+++ b/sys-apps/grep/grep-3.8.ebuild
diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml
index 02999fd09e2..321c7b25447 100644
--- a/sys-apps/groff/metadata.xml
+++ b/sys-apps/groff/metadata.xml
@@ -1,11 +1,15 @@
<?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>
-<use>
- <flag name="uchardet">Enable automatic encoding detection via <pkg>app-i18n/uchardet</pkg></flag>
-</use>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <use>
+ <flag name="uchardet">Enable automatic encoding detection via <pkg>app-i18n/uchardet</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:gnu:groff</remote-id>
+ <remote-id type="savannah">groff</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index 671bd3bb338..aea538f805b 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -1,2 +1 @@
-DIST gsmartcontrol-1.1.3.tar.bz2 677998 BLAKE2B f444dd29602f6934b440650e57d5d981a3b9823a905ce3c178109b230e6536edd4f38ed0762872b38186774127a164feb7363bb45cbd80e9c0b34398c1a06092 SHA512 7a8bb79875a53d742923fc8ff8336d7fbbdaf2e1b1f64296840557997125d4dcfea9a93a5e8a834003d592083a180ee85ca0e29d3aecf0eb475a3d4fed460456
DIST gsmartcontrol-1.1.4.tar.bz2 691155 BLAKE2B 484452b85e848ca9d0539f9fb9e63fc60f837d5e5de1d85d6ef6340fba194ea52cb2026682b263b1391a59eee4ee846dad3863dc1f0bd00296015ddcf86dda9a SHA512 a59147f7adb76fa1cfc55198d175b38f7840c0ec07563bc020757d7609891c8f67953b87a867235821f90c52bc3c8e40a8d8a57a1429e4b75a3afb3a2ada42f1
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
deleted file mode 100644
index 66da4d4c59b..00000000000
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hard disk drive health inspection tool"
-HOMEPAGE="https://gsmartcontrol.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-cpp/gtkmm:3.0
- dev-libs/libpcre:3
- sys-apps/smartmontools
-"
-RDEPEND="${COMMON_DEPEND}
- x11-apps/xmessage
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- test? ( dev-util/gtk-builder-convert )
-"
-
-DOCS="TODO" # See 'dist_doc_DATA' value in Makefile.am
-
-src_prepare() {
- default
- append-cxxflags -std=c++11
-}
-
-src_configure() {
- econf $(use test tests)
-}
-
-src_install() {
- default
- rm -f "${ED}"/usr/share/doc/${PF}/LICENSE_* || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.4.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.4.ebuild
index 2dc9c0c0eba..472ebfc3afa 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.4.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index b8dd6b7e17d..42981fcdd84 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,2 +1,2 @@
-DIST hdparm-9.63.tar.gz 140252 BLAKE2B 41ee3dda11f17ec9c125b7d680f07ca2d88c3692e2436b8d2550dbd58546b1dde8e61cdf5312c5b09d687dad81826bd848c8eabcb3e01ab09ac6cfb082699238 SHA512 1d09dc2c79c31f45fa242dd5bf259e84281d1464e49ada9fd53bb6d58cb0458046e534a93f9d6de18478ca5db50b6d36ecbe5b784c0c681a1db29f15fadd525c
DIST hdparm-9.64.tar.gz 140307 BLAKE2B 0196f3ccec4005c542b834d8426cc6f64694783da3d4a064e898e25d17aab3aa0d9621276607169f2104c9a9804f9020554d836ded9efb16367a8ac4c9c9b146 SHA512 c561825143d8872cc2940bd6ba72162f91792bd63b6a8511058e79cc96feb6a4a9d22275581ef2eefab64a4035587b3a63175ccc58fa46f1059b4680d9d58ec4
+DIST hdparm-9.65.tar.gz 140425 BLAKE2B 79b1c16e7807f82a992ed7f22faef57045c56da4a281fbd8db3b8846b193ccc4b42329fa6abbebf8b652fbefb13aa0f18dfa726e802e8e1a45c94f414fb303b9 SHA512 4ffc8902b90cee10d68af8ddb9f3b9454d523ecd49cdaaed254b4d7a999462a8ad5ec1bb5d7684b09fefa41b5941ab533b167dad290003b51c795a633ca88913
diff --git a/sys-apps/hdparm/hdparm-9.64.ebuild b/sys-apps/hdparm/hdparm-9.64.ebuild
index 066375abdd7..eccb8be2c04 100644
--- a/sys-apps/hdparm/hdparm-9.64.ebuild
+++ b/sys-apps/hdparm/hdparm-9.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
# GPL-2 only
LICENSE="BSD 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"
IUSE="static"
PATCHES=(
diff --git a/sys-apps/hdparm/hdparm-9.63.ebuild b/sys-apps/hdparm/hdparm-9.65.ebuild
index 3488ffc7434..dff0610ab39 100644
--- a/sys-apps/hdparm/hdparm-9.63.ebuild
+++ b/sys-apps/hdparm/hdparm-9.65.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs flag-o-matic
@@ -9,7 +9,8 @@ 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
+# GPL-2 only
+LICENSE="BSD 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="static"
@@ -20,6 +21,7 @@ PATCHES=(
src_prepare() {
default
+
use static && append-ldflags -static
}
@@ -37,6 +39,7 @@ src_install() {
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/help2man/help2man-1.48.5.ebuild b/sys-apps/help2man/help2man-1.48.5.ebuild
index b55c7a1c9a5..4691eb994ba 100644
--- a/sys-apps/help2man/help2man-1.48.5.ebuild
+++ b/sys-apps/help2man/help2man-1.48.5.ebuild
@@ -7,7 +7,8 @@ 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"
+# nls/FSFAP for bindtextdomain.c
+LICENSE="GPL-3+ nls? ( FSFAP )"
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="nls"
diff --git a/sys-apps/help2man/help2man-1.49.2.ebuild b/sys-apps/help2man/help2man-1.49.2.ebuild
index bd9be868fe3..c85e5630dd6 100644
--- a/sys-apps/help2man/help2man-1.49.2.ebuild
+++ b/sys-apps/help2man/help2man-1.49.2.ebuild
@@ -7,7 +7,8 @@ DESCRIPTION="GNU utility to convert program --help output to a man page"
HOMEPAGE="https://www.gnu.org/software/help2man/ https://salsa.debian.org/bod/help2man"
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-LICENSE="GPL-3"
+# nls/FSFAP for bindtextdomain.c
+LICENSE="GPL-3+ nls? ( FSFAP )"
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="nls"
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index cf47cb22e1d..7202da39896 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1 +1 @@
-DIST hw-probe-1.6.4.tar.gz 162317 BLAKE2B 5fc5ddf032c6b2504430349089d95be5310a7ac7752a2b6c3c504240dae6572ee773f8360d6449e9122b20de904a7348a2bdc0af660de44f14cf37b16664ef2a SHA512 c812ebdb23f6b8a4df2f2849a29ecc1307c09f758aeb912face6e899510af69f9dee606fb0ff1807a6de1e89a5f7a8b3259b894cc823b9d25efbf26accf60ac4
+DIST hw-probe-1.6.5.tar.gz 163190 BLAKE2B 1d2ceb152d387018f427cd623897f8c4cc8828a6952c54bb9caa673797ac347b64d9daffcddeca16e8274e5ad42c2cff22efe3330209da1eee5476636167f0ad SHA512 68d6709ca4efe82e0e5de3b580c68f76fa31384af0c53645b6609cee14b944a410e58b12ac13f879d8d86220c1088cfaad17dc6edd24cf27700e449add6f6488
diff --git a/sys-apps/hw-probe/hw-probe-1.6.4.ebuild b/sys-apps/hw-probe/hw-probe-1.6.5.ebuild
index 49411921e68..49411921e68 100644
--- a/sys-apps/hw-probe/hw-probe-1.6.4.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.6.5.ebuild
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index 2f604cd491f..fed9069f87a 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -1,3 +1,3 @@
-DIST hwdata-0.358.tar.gz 2240851 BLAKE2B b164c267a6779fec2a4018fb8bad98e564794e46cdec77b6f1234444f0fb20f49f44303a400d3301b40b07cebe0cc590553ae5e01702032b53180826273eb416 SHA512 52c765786aa41551e47bad2358bbe50f8f6a60cd820696c6c341f08cbde695f86746660a3fdadd8fad5614b99a98616111011a17d115c25bbcaf03c891cc3e69
-DIST hwdata-0.360.tar.gz 2254316 BLAKE2B c2fae537f2ff594f73577cf72af9d6201bcd1dc26059786c1ae8cb7999d3774306244ea10aee0f9b4916f4a7547b549ccbd815ca9a93053e6ca069140e3a7232 SHA512 dc04bdfc21a7bb9903cc51156c9bf1f0d6c7c772db1a47f9d5b120e1e4955155fb5057ccc6679ae56ac790e5da3ca719a3a9b9cd9082eac261ef11e75c97a244
DIST hwdata-0.361.tar.gz 2263204 BLAKE2B 83f613dd75e677bb25e884c00e8c32aa97e1b030ac8642df2c35f895df815bf6b8c3333a150c448fb6a14a8cf6c6cec9ef351896a5762a45ea99c34c39790213 SHA512 942cf6fa17c2f6fa41d7c624aa7fd28d57d6ad7750eb7a01c8ce85a663154140af75108a8ab12d43375bae63574a594ea2117195a743c12e5c4cb2986f198454
+DIST hwdata-0.363.tar.gz 2283349 BLAKE2B dd7aa9c7d202882a31a5359cf674c9399b23b07f47d2fa706739201f60227922572619cef42f50835c4a01efab19773e24b0540a87f759b805755389f8d6f7f4 SHA512 b53ffad2bdeea1ac8c78832e693c44655dc86c401a3f6921ccedf45a88731d82b40b2f033bb90bcaa058b1b3e8361a90aa4eeba9779ee4741efc40ae8ff6282a
+DIST hwdata-0.364.tar.gz 2290206 BLAKE2B f41fbc85fffa0561ccee55c2bbb9c32f2f67532dd2cd8c3731a2805712969a5950f31b4e5662adf3b55c6226c31cb00f0670af4a1fbff1a7c19d46ba067792fd SHA512 94cae67d9155b7abbaa7fc9047702a6f166721477b6320736d7984efd7c7c3c028b9f794269750f0ef421275a7e243fe1ae59816f63576fffc1bcd8deb49c6e9
diff --git a/sys-apps/hwdata/hwdata-0.361.ebuild b/sys-apps/hwdata/hwdata-0.361.ebuild
index 719e257fb90..ac13533f7a8 100644
--- a/sys-apps/hwdata/hwdata-0.361.ebuild
+++ b/sys-apps/hwdata/hwdata-0.361.ebuild
@@ -11,7 +11,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"
diff --git a/sys-apps/hwdata/hwdata-0.360.ebuild b/sys-apps/hwdata/hwdata-0.363.ebuild
index 81b4b077100..9df06b92fe5 100644
--- a/sys-apps/hwdata/hwdata-0.360.ebuild
+++ b/sys-apps/hwdata/hwdata-0.363.ebuild
@@ -1,7 +1,9 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+inherit edo
DESCRIPTION="Hardware identification and configuration data"
HOMEPAGE="https://github.com/vcrhonek/hwdata"
@@ -10,6 +12,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"
+
RESTRICT="test"
src_configure() {
@@ -20,6 +23,6 @@ src_configure() {
--libdir="${EPREFIX}/lib"
--datadir="${EPREFIX}/usr/share"
)
- echo "${conf[@]}" >&2
- "${conf[@]}" || die
+
+ edo "${conf[@]}"
}
diff --git a/sys-apps/hwdata/hwdata-0.358.ebuild b/sys-apps/hwdata/hwdata-0.364.ebuild
index 3045467ded5..369d4ad0ce6 100644
--- a/sys-apps/hwdata/hwdata-0.358.ebuild
+++ b/sys-apps/hwdata/hwdata-0.364.ebuild
@@ -1,7 +1,9 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+inherit edo
DESCRIPTION="Hardware identification and configuration data"
HOMEPAGE="https://github.com/vcrhonek/hwdata"
@@ -10,6 +12,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"
+
RESTRICT="test"
src_configure() {
@@ -20,6 +23,6 @@ src_configure() {
--libdir="${EPREFIX}/lib"
--datadir="${EPREFIX}/usr/share"
)
- echo "${conf[@]}" >&2
- "${conf[@]}" || die
+
+ edo "${conf[@]}"
}
diff --git a/sys-apps/hwinfo/hwinfo-22.1-r1.ebuild b/sys-apps/hwinfo/hwinfo-22.1-r1.ebuild
new file mode 100644
index 00000000000..f26f8ed34b5
--- /dev/null
+++ b/sys-apps/hwinfo/hwinfo-22.1-r1.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.1.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}" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+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/hwinfo/hwinfo-22.1.ebuild b/sys-apps/hwinfo/hwinfo-22.1.ebuild
index a5474833329..eca80e98fb3 100644
--- a/sys-apps/hwinfo/hwinfo-22.1.ebuild
+++ b/sys-apps/hwinfo/hwinfo-22.1.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 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 76f8a6d1754..5404e01ac9d 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,5 +1,3 @@
DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
-DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df
-DIST hwloc-2.7.1.tar.bz2 6810477 BLAKE2B 26706b8835954b8baa9028eaf2da0f8ae6e57d1841d68daaa04d58a7b24a67e4e171eb439b8dbfb589a70eb1b5cced51f12a99bb7132591919c902374f89025f SHA512 35de85de3f5e75de30b5ac72d2c118dcb990a2427c9812910a03772857181fd7259a27352b34a968186d02ffc811644c3411d84ee37f2d0ff9b83628951b4863
DIST hwloc-2.8.0.tar.bz2 6896344 BLAKE2B 33f75987ee904d5ee9c62268695a2f7f59b0adc2e1601fc4407f525664b78a7fab04c75823ce9d190c8cb9ffc0ce983d7137555625d47bc1451a2d0c6f330055 SHA512 025c8ebc2945bdf696cc66fe2cfea0195694713a6098603fb4eaeac409d2f6c3386a7c2b4d7f3758d828f6b621e7f06ffb5745224cb1df2f8ff4f19b2a8a4a7b
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13-r1.ebuild
index 435ec3acffa..fa0401fa01a 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
# dev-util/nvidia-cuda-toolkit is always multilib
RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
- cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+ cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg(+)?,${MULTILIB_USEDEP}] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
pci? (
diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
deleted file mode 100644
index 763685d9bf3..00000000000
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal
-
-MY_PV="v$(ver_cut 1-2)"
-
-DESCRIPTION="Displays the hardware topology in convenient formats"
-HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
-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"
-IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
-
-# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
-# Anyone with hardware is welcome to step up and help test to get it re-added.
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
-
- cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
- cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
- gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
- netloc? ( !sys-apps/netloc )
- nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
- pci? (
- >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
- >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
- )
- udev? ( virtual/libudev )
- xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-# 2.69-r5 for --runstatedir
-BDEPEND="
- >=sys-devel/autoconf-2.69-r5
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
-DOCS=( AUTHORS NEWS README VERSION )
-
-src_prepare() {
- default
- eautoreconf
-
- if use cuda ; then
- append-cflags "-I${ESYSROOT}/opt/cuda/include"
- append-cppflags "-I${ESYSROOT}/opt/cuda/include"
- fi
-}
-
-multilib_src_configure() {
- export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" #393467
-
- if use cuda ; then
- local -x LDFLAGS="${LDFLAGS}"
- append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
- fi
-
- local myconf=(
- --disable-opencl
- --disable-plugin-ltdl
- --enable-plugins
- --enable-shared
- --runstatedir="${EPREFIX}/run"
- $(multilib_native_use_enable cuda)
- $(multilib_native_use_enable gl)
- $(use_enable cairo)
- $(use_enable cpuid)
- $(use_enable debug)
- $(use_enable udev libudev)
- $(use_enable netloc)
- $(use_enable nvml)
- $(use_enable pci)
- $(use_enable static-libs static)
- $(use_enable xml libxml2)
- $(use_with X x)
- )
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
- default
- case ${ARCH} in
- # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
- amd64|x86)
- systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;;
- esac
- mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
- bashcomp_alias hwloc-annotate \
- hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
- bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild b/sys-apps/hwloc/hwloc-2.6.0-r1.ebuild
index 8e0985a990d..9fbd4c477c6 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="cairo +cpuid cuda debug gl nvml +pci static-libs svg udev xml X"
# Anyone with hardware is welcome to step up and help test to get it re-added.
RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
- cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+ cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg(+)?,${MULTILIB_USEDEP}] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
diff --git a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
deleted file mode 100644
index 88cb06eb1df..00000000000
--- a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal
-
-MY_PV="v$(ver_cut 1-2)"
-DESCRIPTION="Displays the hardware topology in convenient formats"
-HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
-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 ~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).
-# anyone with hardware is welcome to step up and help test to get it re-added.
-# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4
-RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
- cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
- cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
- nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
- pci? (
- >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
- >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
- )
- udev? ( virtual/libudev:= )
- xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
- video_cards_nvidia? (
- x11-drivers/nvidia-drivers[static-libs]
- x11-libs/libXext
- x11-libs/libX11
- )"
-DEPEND="${RDEPEND}"
-# 2.69-r5 for --runstatedir
-BDEPEND=">=sys-devel/autoconf-2.69-r5
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
-
-DOCS=( AUTHORS NEWS README VERSION )
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # bug #393467
- export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
- if use video_cards_nvidia ; then
- addpredict /dev/nvidiactl
- fi
-
- if use cuda ; then
- append-cflags "-I${ESYSROOT}/opt/cuda/include"
- append-cppflags "-I${ESYSROOT}/opt/cuda/include"
-
- local -x LDFLAGS="${LDFLAGS}"
- append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
- fi
-
- local myconf=(
- --disable-opencl
-
- # netloc is deprecated upstream, about to be removed
- # bug #796797
- --disable-netloc
-
- --disable-plugin-ltdl
- --enable-plugins
- --enable-shared
- --runstatedir="${EPREFIX}/run"
- $(multilib_native_use_enable cuda)
- $(multilib_native_use_enable video_cards_nvidia gl)
- $(use_enable cairo)
- $(use_enable cpuid)
- $(use_enable debug)
- $(use_enable udev libudev)
- $(use_enable nvml)
- $(use_enable pci)
- $(use_enable static-libs static)
- $(use_enable xml libxml2)
- $(use_with X x)
- )
-
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
- default
-
- case ${ARCH} in
- # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
- amd64|x86)
- systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service"
- ;;
- esac
-
- mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
- bashcomp_alias hwloc-annotate \
- hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
- bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/hwloc/hwloc-2.8.0.ebuild b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index 88cb06eb1df..ffa2bf4b6ed 100644
--- a/sys-apps/hwloc/hwloc-2.8.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -12,14 +12,14 @@ 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 ~loong ~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).
# anyone with hardware is welcome to step up and help test to get it re-added.
# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4
RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
- cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+ cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg(+)?,${MULTILIB_USEDEP}] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
pci? (
diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index 3ace2eda36b..9b7c01dfe15 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -18,7 +18,6 @@
<flag name="cpuid">Enable the cpuid-based architecture specific support (x86 component)</flag>
<flag name="cuda">Enable CUDA device discovery using libcudart</flag>
<flag name="gl">Enable GL display device discovery (NVCtrl)</flag>
- <flag name="netloc">Enable Netloc</flag>
<flag name="numa">Add support for numa memory allocation</flag>
<flag name="nvml">Enable the NVML device discovery</flag>
<flag name="pci">Enable PCI device discovery using libpci</flag>
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index cad813324a0..7d5824b262f 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,3 +1,2 @@
-DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096
DIST i2c-tools-4.3.tar.xz 81276 BLAKE2B c7300224c8d32785cd067b632bf0e9591f05264b1572f44aebda5f30a95164732d606710c13739ccb7899476219ceb3033beaf95b718ed7e18122f9181dc13fc SHA512 8a6cc12d927d6291b9baf407bc15807280539a7048ec5c2edf77414432eab43b28353c42bc0e45b7b481502aa4c5588def08f130d97fc275f635d1f77488f501
diff --git a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
deleted file mode 100644
index 9900e3bbff0..00000000000
--- a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_OPTIONAL="1"
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
-HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
-SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="perl python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-RDEPEND+="
- perl? ( dev-lang/perl )"
-
-src_prepare() {
- default
- use python && distutils-r1_src_prepare
-
- # Cut out the eeprom/ & stub/ dirs as only perl scripts live there.
- if ! use perl ; then
- sed -i '/^SRCDIRS/s: eeprom stub : :g' Makefile || die
- fi
-}
-
-src_configure() {
- use python && distutils-r1_src_configure
-
- # Always build & use dynamic libs if possible.
- if tc-is-static-only ; then
- export BUILD_DYNAMIC_LIB=0
- export USE_STATIC_LIB=1
- export BUILD_STATIC_LIB=1
- else
- export BUILD_DYNAMIC_LIB=1
- export USE_STATIC_LIB=0
- export BUILD_STATIC_LIB=$(usex static-libs 1 0)
- fi
-}
-
-src_compile() {
- emake AR="$(tc-getAR)" CC="$(tc-getCC)" all-lib # parallel make
- emake CC="$(tc-getCC)"
- emake -C eepromer CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-
- if use python ; then
- cd py-smbus || die
- append-cppflags -I../include
- distutils-r1_src_compile
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" PREFIX="/usr" install-lib install
- dosbin eepromer/eeprom{,er}
- rm -rf "${D}"/usr/include || die # part of linux-headers
- dodoc CHANGES README
- local d
- for d in $(usex perl eeprom '') eepromer ; do
- docinto "${d}"
- dodoc "${d}"/README*
- done
-
- if use python ; then
- cd py-smbus || die
- docinto py-smbus
- dodoc README*
- distutils-r1_src_install
- fi
-}
diff --git a/sys-apps/i2c-tools/i2c-tools-4.3.ebuild b/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
index 8c54b56cce6..dcf55497396 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
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="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest
index 99e52049706..0a3f12d3cea 100644
--- a/sys-apps/ibm-powerpc-utils/Manifest
+++ b/sys-apps/ibm-powerpc-utils/Manifest
@@ -1 +1,2 @@
+DIST ibm-powerpc-utils-1.3.10.tar.gz 388572 BLAKE2B 683263df9f1a17a31d00325a7c760d81b51bccf74914215b78069b14c9cac7336457ab48891ed69467dc8c70e3886c1e22a614c6d53b9d24714f3ce744bd69fd SHA512 37b09268e9ce9041e7f823423f7517d5837625ebe33c28b9dcd8902580718327df0a835a1cf7f2659ef3e0b637f2bd008153114ea146996f3b1b97d6c078b46e
DIST ibm-powerpc-utils-1.3.8.tar.gz 355931 BLAKE2B cb1756640962f55eead8556abb714f938a066d9c63e990ee6467ecdb032eac7058ce8715dc8b8d403e3c03efe98a7af0c7d560158258e7097300befbb04f8472 SHA512 7c9057131315d8fac6154c410562d9cd1807f76241bcc190566ece05b0ddd2ddbe1097749b7e644ccc9691641d40460a877368162e9b951fe790f53f638f635e
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.10.ebuild
index d4d181b373a..17e4a78ed0f 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.10.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit autotools git-r3
+EAPI=8
+inherit autotools systemd
DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
HOMEPAGE="https://github.com/ibm-power-utilities/powerpc-utils"
-EGIT_REPO_URI="https://github.com/ibm-power-utilities/powerpc-utils"
+SRC_URI="https://github.com/ibm-power-utilities/${PN//ibm-}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
IUSE="+rtas"
+S="${WORKDIR}/${P//ibm-}"
+
SLOT="0"
LICENSE="GPL-2+"
-KEYWORDS=""
+KEYWORDS="~ppc ~ppc64"
RDEPEND="
!<sys-apps/powerpc-utils-1.1.3.18-r4
@@ -20,7 +22,6 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.3.5-docdir.patch
- "${FILESDIR}"/${P}-musl.patch # PR #63
)
src_prepare() {
@@ -29,5 +30,8 @@ src_prepare() {
}
src_configure() {
- econf $(use_with rtas librtas)
+ econf \
+ --disable-werror \
+ --with-systemd="$(systemd_get_systemunitdir)" \
+ $(use_with rtas librtas)
}
diff --git a/sys-apps/ibm-powerpc-utils/metadata.xml b/sys-apps/ibm-powerpc-utils/metadata.xml
index 8e4c5b31b32..3802586b75f 100644
--- a/sys-apps/ibm-powerpc-utils/metadata.xml
+++ b/sys-apps/ibm-powerpc-utils/metadata.xml
@@ -3,7 +3,7 @@
<pkgmetadata>
<maintainer type="project">
<email>ppc@gentoo.org</email>
- <name>Gentoo Linux PowerPC Development</name>
+ <name>PowerPC architecture team</name>
</maintainer>
<use>
<flag name="rtas">Add support for the Run Time Abstraction Services (RTAS)</flag>
diff --git a/sys-apps/ifd-gempc/Manifest b/sys-apps/ifd-gempc/Manifest
index b2fd1b53cd5..50aed48b4f5 100644
--- a/sys-apps/ifd-gempc/Manifest
+++ b/sys-apps/ifd-gempc/Manifest
@@ -1 +1,2 @@
DIST ifd-gempc-1.0.7.tar.gz 76712 BLAKE2B 5ae734ff97865a66d993fc67a2ee5537875773b8275a2125c8853ddf0006cea61f20cd38571be44126cb2cfeb16a6778d6917fd056616e24997a3aed85226e76 SHA512 dde143bd2ca46cca91f979ddbb300f0b5fea37ecfa0c67058d887fcd56edf58adecce85dd05c7af25329fdfcfdf5bf7a52d4dc24061231a234180aad3df44a93
+DIST ifd-gempc-1.0.8.tar.gz 75298 BLAKE2B 6a371a554751819bbd971dc9273fee0bfce4ef8d6fa0a8c261c6944f4689d032102630b3f103c557156de64bb3cf8f5035bdf6a141dcd1e8dd271c60a249de53 SHA512 e3410877120482c80695af832d27ea2fa6697106c3264c57c32fb46b556573a381a699b8a11307c4597e5cfb97f7bbdfc5662acd87a129d44e8adc979d507f4a
diff --git a/sys-apps/ifd-gempc/ifd-gempc-1.0.8.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.8.ebuild
new file mode 100644
index 00000000000..a9870055183
--- /dev/null
+++ b/sys-apps/ifd-gempc/ifd-gempc-1.0.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="GemCore based PC/SC reader drivers for pcsc-lite"
+HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC"
+SRC_URI="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ >=sys-apps/pcsc-lite-1.2.9_beta7
+ virtual/libusb:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README README.410 README.430 )
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake CC="$(tc-getCC)" DESTDIR="${D}" install
+ einstalldocs
+
+ local pcscdir="$($(tc-getPKG_CONFIG) --variable=usbdropdir libpcsclite)"
+ local conf="/etc/reader.conf.d/${PN}.conf"
+
+ insinto "$(dirname "${conf}")"
+ newins "${FILESDIR}/reader.conf" "$(basename "${conf}")"
+ sed -e "s:%PCSC_DRIVERS_DIR%:${pcscdir}:g" -e "s:%libGemPC410%:libGemPC410.so.${PV}:g" -i "${D}${conf}"
+}
+
+pkg_postinst() {
+ elog "NOTICE:"
+ elog "1. If you are using GemPC410, modify ${conf}"
+ elog "2. Run update-reader.conf, yes this is a command..."
+ elog "3. Restart pcscd"
+}
+
+pkg_postrm() {
+ #
+ # Without this, pcscd will not start next time.
+ #
+ local conf="/etc/reader.conf.d/${PN}.conf"
+ if ! [[ -f "${conf}" && -f "$(grep LIBPATH "${conf}" | sed 's/LIBPATH *//' | sed 's/ *$//g' | head -n 1)" ]]; then
+ [[ -f "${conf}" ]] && rm "${conf}"
+ update-reader.conf
+ elog "NOTICE:"
+ elog "You need to restart pcscd"
+ fi
+}
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 44c34e1956c..23a9ad95171 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,6 +1,2 @@
-DIST inxi-3.1.06.1.tar.gz 357819 BLAKE2B e6eb8a34807323d7f46ff029af797e3a13229813bf0cff4b8b874cd21ff1d38459e2181ddf3882b4ee0d29e8c788e2fce1c01f5c295911493292082192c56c2b SHA512 6621252048e95132cfec30e341f72f5942188f273488509614aab28e55ee9987b8f3820e1298c4d9a16b4f3464f1f270fb4c1d5e5a7bf0d2f616b4180193ab6b
-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
DIST inxi-3.3.20.1.tar.gz 565689 BLAKE2B 0b89e54e22d0c88b57fdc2dcb08fc3cbe6b79a724c12d8eafd2e6eb6639ee1346ef9ee34b09f446464bafa35df87489ff9b40ad9e8de67fbe82c1becdd5af8bf SHA512 bdc4de6d2978ff17bdd4a5366d66fb483a304c61448ef33be902080a75ae6e78eba6bcd31b9a799a1eff01f22cc8e72200f314209e36af4287d8e5256bca4d05
diff --git a/sys-apps/inxi/inxi-3.1.06.1.ebuild b/sys-apps/inxi/inxi-3.1.06.1.ebuild
deleted file mode 100644
index e23e51c9515..00000000000
--- a/sys-apps/inxi/inxi-3.1.06.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="bluetooth hddtemp opengl"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
- sys-apps/pciutils
- sys-apps/usbutils
- bluetooth? ( net-wireless/bluez )
- hddtemp? ( app-admin/hddtemp )
- opengl? ( x11-apps/mesa-progs )
- "
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
- dobin ${PN}
- doman ${PN}.1
-}
diff --git a/sys-apps/inxi/inxi-3.3.08.1.ebuild b/sys-apps/inxi/inxi-3.3.08.1.ebuild
deleted file mode 100644
index e4c69812d03..00000000000
--- a/sys-apps/inxi/inxi-3.3.08.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 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/inxi/inxi-3.3.12.1.ebuild b/sys-apps/inxi/inxi-3.3.12.1.ebuild
deleted file mode 100644
index e4c69812d03..00000000000
--- a/sys-apps/inxi/inxi-3.3.12.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 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/inxi/inxi-3.3.13.1.ebuild b/sys-apps/inxi/inxi-3.3.13.1.ebuild
deleted file mode 100644
index 49cc31d2432..00000000000
--- a/sys-apps/inxi/inxi-3.3.13.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/inxi/inxi-3.3.20.1.ebuild b/sys-apps/inxi/inxi-3.3.20.1.ebuild
index 8ceaca03391..4612496598d 100644
--- a/sys-apps/inxi/inxi-3.3.20.1.ebuild
+++ b/sys-apps/inxi/inxi-3.3.20.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="bluetooth hddtemp opengl"
RDEPEND="dev-lang/perl
diff --git a/sys-apps/ipmi-fan-control/Manifest b/sys-apps/ipmi-fan-control/Manifest
new file mode 100644
index 00000000000..eeeb875bd42
--- /dev/null
+++ b/sys-apps/ipmi-fan-control/Manifest
@@ -0,0 +1,98 @@
+DIST aho-corasick-0.7.19.crate 113070 BLAKE2B 5ddaa0d415d19cf9922b5723bf3480750634ea68cb66fd05bfa2bf57607eb6383ba86d8c55f70adb87b71b98caa73d8f6ebd075c006493530c81979032899b60 SHA512 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bindgen-0.60.1.crate 207507 BLAKE2B 570b3f8d38cc14f12e8230250e51b7896cb74baae8be0fbdb20b75de64f872262add4e106609f73e73a6f5e8f3dc106109c658f17ecede1df11a7d996ac8d280 SHA512 51548656bca17db37fe63c4443474a6b88b70e3e1aff7cf59e09213d82caf8252b414bcffbcf542d472abd731135658b7d214126763fc545643736024aca7a39
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bytes-1.2.1.crate 54857 BLAKE2B fae7e7b0e8023e4b5a9b7d5a390035dc5ee2b19f1fca03d885ad27611d45bd276c837bb63e9498e3f6d2f00d5573fd01f20115da21ccdf8606ce8d8bf5bd1b7f SHA512 39c19594f52af24b04eab319ab329e8ecb5732e4531184eb376677f57c8a6402c15bd171282498e69a4a472d82e308d0dc8140df0b7d923dca588aec90c4fd31
+DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST clang-sys-1.3.3.crate 37943 BLAKE2B 92ecba81573fc27de689752e7009514d0e51c4d09407d0345eee7a94f4713cfd01304b98370aa89d56a3b028912370f4967f8fda28ae9e3620fbb4af991da117 SHA512 fd922627ff66f9265aae30bf585bccab1efdea7f66b9fb95f45af0f316727bff7b791f36ef42010df5d8b3b474f36457fec03fdbb25c50cc8922c3b157387dc9
+DIST clap-3.2.22.crate 219438 BLAKE2B 32e256ba1a4257f5b49681ed5b71f0c79b6fe0c5f6eed72497050368a010a91b4d618ab529cafad54b0e78a6628c6dc5bb61d0baf59c4508557e5d8395f0032e SHA512 fe067057753c351ae5c2fbe78ca83588642faf2eea8d30c08f9d7b5bdc4f3c732349f1b6e1b0de88932049d1c8644771a09d9e592827b297c75de8061268a241
+DIST clap_derive-3.2.18.crate 28208 BLAKE2B 05a23083a8e792858819d7eebf057257b1d49b0e8246d3f24c6f812456cbabfc75d9271c295a0d44539bd531ea6808ca7490e787c1fcae63bce045422d33d280 SHA512 d5349b3d5711bd4900173aa5210d7c4aebb0bf70128e11f26b362f5acb43687f6ce5ef73e4d614ce9c1d649d34b68ff15ab8b65fdf1898fd295ee4b4a7523497
+DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
+DIST either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2
+DIST env_logger-0.9.1.crate 33425 BLAKE2B 86caabde93af971864275d97d80c14c195e0277d474fd3e93d5e1a510063def2e18680aa8ad1f934bb404fde55a5fe23170a3851e53d04a6925b9a8e19db5d62 SHA512 f97b63eb00e8565d8c6aabb306ed8a91ee4241ba35dd9b6e08e0029daf7fa5a54425553d4c0839e369e55fda2c85c9704f658fbb760a093f55c38429f6705d65
+DIST futures-0.3.24.crate 51399 BLAKE2B 03eb55cdcadb6646d01a485efc9ca0c679d8a71186d1dd97b078772ca298939e147537692216e2601b7d42cebe0c961b3a6693d7059c7ca735efa28fac8be07f SHA512 91f3f1b121923c239b1e3042048fd420a35506b4c1ed6527bcff0fffa8153049a384c4e0b21d59944327552c094db8de8977036c61127b27948979e0da6df949
+DIST futures-channel-0.3.24.crate 31963 BLAKE2B 2abaeb5249ce94271588cce9c6af9c96ba52d5a8900c69b5232e0e144e5e218bcd57788a3592e5b95aea84d73714552db131524d82de3655886f136789529c36 SHA512 2145a54fa7b89763c7c6352818b3e3b581190e131a3d3e7bf7b745a8e04ae6ecd9f5f1cc78ee65f7aabf1f786a25cae6b37d358cbbef34c494c34e217b84d7ac
+DIST futures-core-0.3.24.crate 14618 BLAKE2B 381b5f9dd5249550a859ef83987121c1574c91a2498e0e96ccdc5657cdcadc770319a4b50200cf3138bd504fe537ab2d5c701bd97d3e0e39f4a9e75d4a7459db SHA512 d39b19f0c2109d7937d8dd7f6ee45144ca3662746189a5856e0f9a29bb255bc915214c008e97475046703fa90ea28343984575fba394a93dd782b95f09963e67
+DIST futures-executor-0.3.24.crate 17745 BLAKE2B 835a8f835c319e513443c0c947bae83c4a4d1656acf17af333063e33f96eafc76105d45798ccfff3ac2fc362bd54b785bcd2bd406a4830962e75ecb63d710c82 SHA512 fa6385534511ddfe73e4bc80081879b0a425041557d83b1d59f3e44f86ec279327532d732ed4daa4b13e74a11460fa7a99713b00563cdad153ea13c0dade234c
+DIST futures-io-0.3.24.crate 8910 BLAKE2B 67de3c0fbb671897b7ed64967e057b03a9b018b5dcb3d78af4945d4415cceb6a866bc04de2910d124452cc3175a6cc5651af979f8fbe6343f9b96e174cb31279 SHA512 63257cf13e99b8968a797dcce9d572722858c7c91c212a52d05badcf10440824ce9c450bfe5eaeef5528369339a14144a8e94d7e8b2fc717de26fa21a16f2848
+DIST futures-macro-0.3.24.crate 11252 BLAKE2B 397a7675d735c9be21bdbb1f540445197f6cdf8c595c952483268cc19a9a06e673338f5713cc378b66f4a93bf5a8ba0d2edcce01390ffb9f0ec9337fd3b527d6 SHA512 05cdf441404a7656a092a0b9a9a2800412a8671e2d28b8b68b26e4b9121256acdf911851ea566847462e981ab4a2bbed3bba5500cf9560f3f61e6ce536afec81
+DIST futures-sink-0.3.24.crate 7854 BLAKE2B c0cac5188d84de0ebdbe13419c30dcc38594b8edf9952468eb1e04dacbb2d7f754f5b555a1aed5fba9704978a294974c25cceee27a9e4ec6d90b031f324a3ac3 SHA512 4da560975ea2ce2d6cf01042f9a3a16401d769a34e2d8bfe2b0fffc818ac0c729464efa0c2d45ecd280aa7b74d7bab1d17a5670db3d2f4904e4b0a5f4cc463eb
+DIST futures-task-0.3.24.crate 11836 BLAKE2B 1f697816b721f4a51150dc38909974c6c765231c451e0884ae41e1ca16df9b93a8890e1df3a5083330de73ffccc3cfeeb976644504e45306ac5ee99ef4cd87ad SHA512 a78a739176c20afac835ed7b1fec04772aee1f2127bf4a4d0e54bf1e78079e854794fb3cff5858108168d8d1bfef7da99221599c9c533bc3c3059ef07286d54c
+DIST futures-util-0.3.24.crate 155823 BLAKE2B 6fd86340f0fb96240e28f3e3885be9e555675b879e844643352241de81b55cc67023746b4c3fd941b2b38cddebcef41efbf72581d41cd30e7aba8f0330ad503e SHA512 30cfa53bc58101948ca6e828839186575cd8b092a629bf59a7e4df205309f82d0cd4ec70340f5e98c76fecf604934e553562f7c79ef382ac8451c640bd95c5be
+DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
+DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
+DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
+DIST ipmi-fan-control-0.4.0.tar.gz 44621 BLAKE2B 1d136061feb513e99f3ca1993bd61005010d8224d605c8e707ff302137b0487e78a9d8d4f816c8d071708842641410ed9a20a68660124bd6b4607f9b520427ce SHA512 1e388bdf29aee041a76e1f25430f25516a518c8cd21ccc5b89bc72aa63055e6ff831cdf6f14055cf0a4169a96fab662788ee9c6d7081c245aa1c6e729bf33626
+DIST itoa-1.0.3.crate 10481 BLAKE2B aa516e8b2fdea4e4e1260a0783fb7aa2672c1bccdf519c45c608fe3f3fd4fe652d7f56f0cd6eeb6a56bc324c68ff241f601660a0dc3c5ffdf7fa239f470078ec SHA512 1290c027ec8a13d2d15ace2b58a1d1a3a18730cd5fb55bc995826b8f4d04ede650b8315a8905f6737c4c4988690ae03bf32c86ab3a31ae068a67d5be04cd618b
+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.132.crate 595317 BLAKE2B 1b1ae80e034d94468befcafd4bae4c41f29424cbf3770b827dd1d7099cd2364db62cf2e7343da5010e230a47fbd91d320b162f7b54fa3955fd195b6976c3fb45 SHA512 48340dd173ed4d487f6504f4c32cb3c13dac8ad4da95469c8dd79386a7564d258a9ca42ccf1b174154717bafc1d3551b87c8fe35f7e4e062c8e33da9259fec50
+DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
+DIST lock_api-0.4.8.crate 25677 BLAKE2B 2d7fd36e83dbd345889d043e4566b35737b6929092a7ad313b2e09b606b2b4a562ad6b8e1fb5371c086c3d226ca585f08dc34e6205b402a1b96569348ae1e96f SHA512 2dd90be33a732cb8111b522cf65fbf37926ab3121c4dba20dbf66403805575ee597d90d776807c13be1a48ddc5920a691ef78dce734adc6a26b52d4ad44b9785
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
+DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
+DIST mio-0.8.4.crate 93013 BLAKE2B bc9722d2211195dcfaf574d83b2967d299eb02ff40b4fb4df2eb6b08d78e018ae1a9e198f43268ab2d38733feaa8298e9736dec9fb9add66c401d57406fd1292 SHA512 b44675c90daa37336a25e7eef53cdc664e6f52590ed4955bac82641baf8099d3d94850da79d985255eb74b61a499b1ea4a9d7309f6ea4c41454b3dbb090b70ee
+DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
+DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
+DIST once_cell-1.14.0.crate 31614 BLAKE2B b9ac8f889c86d4160ee026fca20b5135aa7bd60e8bfaf23946d003bcf0b666929a4da5859d874449d15b6ba0ec4c26e98273d020be50184b9d44ae90b8608175 SHA512 81531f06f32854e1794555e10ccd6ee2b6913bfefdd9eed52dd44a02e799fa6371cdf102cc67bc70d581a0cc4abb7dd16c9c12ede6df4ff38b20dc5908bad186
+DIST os_str_bytes-6.3.0.crate 22928 BLAKE2B 84e8197375742373bc7c7a3b459f8a9f97ffa0b8a2e517bee0d8ebb420a8509056cf56984612f44171c6b5e219b6ea91b14134fa6386b3cf3502b13ab92386c9 SHA512 34f861a15543933c9fcb560a835bd943231ffcef2c68126d8633f8e792d2d59a20765947feddb0c795a15329d74260d6c2bf74a1f10ee88f355f47240acbb42e
+DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
+DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
+DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
+DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
+DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
+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-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910
+DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
+DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
+DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
+DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
+DIST retry-2.0.0.crate 6688 BLAKE2B c3b2b9c67c13f927dfe533b85cdacf01d9a1d85eefe13bb964606d9f0892817a48ccfbc814de25b7d1fe120b5a7b4ced8438d2e323186053c6213d33bc36d1dc SHA512 e3e0f0e4a1c0b728edcb503f42a7bf828544f74152c4ac74f1acfe26aa5ade60fa901e4d7b38989651708cd23f28d837a2846c9e4d27d0ec0cb2772c8810d8cd
+DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST serde-1.0.144.crate 76387 BLAKE2B 7e66355c24e1116eec4a3ba4f9164570b6d4ab57196d39d19a0bca912c9d2acfb33d8e17e09bc07903984dad154034187d0ffcc8f9073b36336ac2b38ea012cf SHA512 d7388a40e4a5e0a65ec7b49193f2d53d758adcf26b98ca3bc6270351c7553add2f38a8434223a95826994c6d039dd91fc4f4020ce191410fe57bebd29e4938de
+DIST serde_derive-1.0.144.crate 54867 BLAKE2B d1eabf53f4efdf95c3c12a907090617e0aa02661fa0e3cc51bf0ef8dcdbf45f0382a57588565ce26ef7baca330c19ad216a8a0975247bc02af37c4440bdd6859 SHA512 d41208452b36b8d3f0644e58164c9c4e75f8cab2d8be09cfd1b38bdfc690e880a062e0eafe46dd4400d01f541b34c9acd3574504c4aa856afb00cfc2e9617a0a
+DIST serde_json-1.0.85.crate 144635 BLAKE2B 03d2de5563c8b8e9150b656b62329a87a5dc42c1fe389e40291a3b2a7232e2342b6e52f6625ecfaa8cde4420017a0db82b2ef332f82f2fc1caa50b98e544031b SHA512 b9ba5c8f5e5c977d31c720995317c99486897a064993784e8abd4e35e0c9ccf20d421552b4436cd88420b5e6fe1d7ebc411bbc2e803cf1732e133c29365834bc
+DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
+DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
+DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521
+DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56
+DIST socket2-0.4.7.crate 44619 BLAKE2B 9bf2560812db2c91498d12274e02d17c279efe5817d882faabc465de71b1cb8045f6eab3c8e6031f6fd18e0e77913f42daab07f01e8d83bfa5ea44cc6966466f SHA512 44487f2de30cd327cad1af31ad36aaaa0bf10c33b5c23b024ada8d7e41d064fb2adbc9edb14aa8aa1eba679d8530c373c7187fc68d9709ae736a5c1a2cf37088
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST syn-1.0.99.crate 236084 BLAKE2B 852493506271ee364ecb6e907fca55f18af9dc7ec4b4737e43e104d04064a37a2a59b31f5f780621785e44606d43e74adca5cf24c9ac1a8e186955c6b3e43b85 SHA512 47a9ec4d5e6702709c1069d1804d29880a1c5bbbed5a91c44e80eec657c62ceb223d6fbd942deef591463664766ae1997d154525f4e7a212bb84151418f40d10
+DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
+DIST textwrap-0.15.1.crate 55940 BLAKE2B 5db6b617e3d2546a74c240cc405568226dea66947fd8c79e9b8655e4292b39d3a7964688e97b1bd82e924a125b1271a7e4ee5cef9d01b6f6e659f6865ceb9c96 SHA512 dd710f1c36354243d09d1c5e4d217cf66c5a86df7e87d6dfe86cc26b3055cb456041f057cad78063a2ac17d4439f5abe7effb42cfad580aa82398d3fbbd09b12
+DIST thiserror-1.0.35.crate 18451 BLAKE2B 5ffe5fba8734291cd5304285ef327e4af2f2e2d9c7272d878ac2d3235761deeb789cfe55752b5876bb7949b02f2483ddc8749ce85f2241385249b5a4c479cf79 SHA512 2a55a0cb831cbec2529132a4d230360ba8f89f55b46d1116bb7a3461e92141d58935ff83b6d6e3c8eb99b690752f9aad2281c99dc9b3a242b3cf349d32d61912
+DIST thiserror-impl-1.0.35.crate 15433 BLAKE2B af40ee4a29ae92c02bd7681ff9c3f434462056a7386b3b8d7b370d1fff2235f0b674ed9c282daf48cab760cd6232962593ddd1afdb6de2f40092a42e0fd9ff0f SHA512 8669781bc8165126274813653ec9ccbce2df18f6549415571e5db28f64b7715e11ac3f87128769e14b6b49535aaf6964db6a382e0ac482c35fe983b88f9fb1cc
+DIST tokio-1.21.1.crate 605841 BLAKE2B c5dc71a9f9cbb4a943786a06f372122615500360b7f6276810ffb9980bb65ad6a03f307eb3650a79f14926de92676614613bcd48bff01102ee8ecd11e8b5a6b8 SHA512 2ae573a0d5e83d20f747d8b09a2afd712072caed6114aeaf3243becb3bc2eb89673b7f99ddd5edcdf1c0482d9bd6e51c707eb3136c6bbce8baff4c9a67e0bf0d
+DIST tokio-macros-1.8.0.crate 9346 BLAKE2B b334eb3f221ae22ad379db2ef7e4c88e6a01a69146726287b16a958a0c17fadc69063c2e6ca3cd1dbb21e764084c9ba64cfad705b5b5d448133349a7aed69437 SHA512 3fa620db09a8e911a2896c5c671494d3f5894b4014e868374e4f1331829975b287499c2f7a7615bf26a6b9abb3815b459c1fa684a738ea153ce09cecbfa57bc2
+DIST tokio-stream-0.1.10.crate 33880 BLAKE2B fde3b0a865c36ec59ee53d272ef42e090271069793130df4d17ff7a7b678e14e93d0cc8424720215acff3c75db2c63340eab5db8cfbdcbdafd816eeac5cbba8f SHA512 cbafc3c629d150b8743a3706c2ea40369ea339bdc9270c137eb781542fc485aa11d01095e0faf7db7e010a3e8ab53d8da3eae8b9e8724a7454077638b0d42a04
+DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
+DIST unicode-ident-1.0.4.crate 35491 BLAKE2B b92d4f09ec86fe1e0b403b8cb0787989c313f29e6b24961fc2ca046ee5e3b50f43f49469a290880412dd37fc1b46cbeb9123e9636e1f39e425f722a5aa44ad08 SHA512 db41d5c3f72cfaf654b4c250e18ac0ac077a816fd582f1548ed384653f467c15f85fcfbbb4ed2f9e8182587181abf1db14059d50f3e43b60434ddf38c8f65d89
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+DIST which-4.3.0.crate 9635 BLAKE2B 36556a9eca6d8702c0e3634abc458f7ff831aec28a7117f21f812c6f46cccd8db0e6ce7cc76f8033ba89d51858411251e5fecb0883542669269cade9c1a5aadb SHA512 cad05bd43dfcf9e50fd6e3b9dcd5d9a987175a0f44adbf204079117b70d0b42e6483e635287924698c51d0452f168e48e041453f18ff5720c0e2ec4c734d2578
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
+DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
+DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
+DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
+DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
+DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
diff --git a/sys-apps/ipmi-fan-control/ipmi-fan-control-0.4.0.ebuild b/sys-apps/ipmi-fan-control/ipmi-fan-control-0.4.0.ebuild
new file mode 100644
index 00000000000..d5ac8980817
--- /dev/null
+++ b/sys-apps/ipmi-fan-control/ipmi-fan-control-0.4.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ aho-corasick-0.7.19
+ atty-0.2.14
+ autocfg-1.1.0
+ bindgen-0.60.1
+ bitflags-1.3.2
+ bytes-1.2.1
+ cexpr-0.6.0
+ cfg-if-1.0.0
+ clang-sys-1.3.3
+ clap-3.2.22
+ clap_derive-3.2.18
+ clap_lex-0.2.4
+ either-1.8.0
+ env_logger-0.9.1
+ futures-0.3.24
+ futures-channel-0.3.24
+ futures-core-0.3.24
+ futures-executor-0.3.24
+ futures-io-0.3.24
+ futures-macro-0.3.24
+ futures-sink-0.3.24
+ futures-task-0.3.24
+ futures-util-0.3.24
+ getrandom-0.2.7
+ glob-0.3.0
+ hashbrown-0.12.3
+ heck-0.4.0
+ hermit-abi-0.1.19
+ humantime-2.1.0
+ indexmap-1.9.1
+ itoa-1.0.3
+ lazy_static-1.4.0
+ lazycell-1.3.0
+ libc-0.2.132
+ libloading-0.7.3
+ lock_api-0.4.8
+ log-0.4.17
+ memchr-2.5.0
+ minimal-lexical-0.2.1
+ mio-0.8.4
+ nom-7.1.1
+ num_cpus-1.13.1
+ once_cell-1.14.0
+ os_str_bytes-6.3.0
+ parking_lot-0.12.1
+ parking_lot_core-0.9.3
+ peeking_take_while-0.1.2
+ pin-project-lite-0.2.9
+ pin-utils-0.1.0
+ pkg-config-0.3.25
+ ppv-lite86-0.2.16
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro2-1.0.43
+ quote-1.0.21
+ rand-0.8.5
+ rand_chacha-0.3.1
+ rand_core-0.6.4
+ redox_syscall-0.2.16
+ regex-1.6.0
+ regex-syntax-0.6.27
+ retry-2.0.0
+ rustc-hash-1.1.0
+ ryu-1.0.11
+ scopeguard-1.1.0
+ serde-1.0.144
+ serde_derive-1.0.144
+ serde_json-1.0.85
+ shlex-1.1.0
+ signal-hook-registry-1.4.0
+ slab-0.4.7
+ smallvec-1.9.0
+ socket2-0.4.7
+ strsim-0.10.0
+ syn-1.0.99
+ termcolor-1.1.3
+ textwrap-0.15.1
+ thiserror-1.0.35
+ thiserror-impl-1.0.35
+ tokio-1.21.1
+ tokio-macros-1.8.0
+ tokio-stream-0.1.10
+ toml-0.5.9
+ unicode-ident-1.0.4
+ version_check-0.9.4
+ wasi-0.11.0+wasi-snapshot-preview1
+ which-4.3.0
+ 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
+ windows-sys-0.36.1
+ windows_aarch64_msvc-0.36.1
+ windows_i686_gnu-0.36.1
+ windows_i686_msvc-0.36.1
+ windows_x86_64_gnu-0.36.1
+ windows_x86_64_msvc-0.36.1
+"
+
+inherit cargo optfeature systemd
+
+DESCRIPTION="SuperMicro IPMI fan control daemon"
+HOMEPAGE="https://github.com/chenxiaolong/ipmi-fan-control"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/chenxiaolong/${PN}"
+else
+ SRC_URI="https://github.com/chenxiaolong/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris)"
+ # supported boards are x86_64 only, do not keyword elsewhere
+ # technically it could run on remote host and issue commands via ipmitool lanplus, but that's very edgy case
+ KEYWORDS="-* ~amd64"
+fi
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 GPL-3+ ISC MIT Unicode-DFS-2016 Unlicense"
+SLOT="0"
+
+BDEPEND="
+ sys-devel/clang
+ virtual/pkgconfig
+"
+
+RDEPEND="sys-libs/freeipmi"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ cargo_live_src_unpack
+ else
+ cargo_src_unpack
+ fi
+}
+
+src_install() {
+ cargo_src_install
+
+ sed -i \
+ -e "s|@BINDIR@|${EPREFIX}/usr/bin|" \
+ -e "s|@SYSCONFDIR@|${EPREFIX}/etc|" \
+ dist/ipmi-fan-control.service.in || die
+
+ # TODO: add openrc service
+ systemd_newunit dist/ipmi-fan-control.service.in ipmi-fan-control.service
+
+ insinto /etc
+ newins config.sample.toml "${PN}".toml
+}
+
+pkg_postinst() {
+ optfeature "S.M.A.R.T. drive temperature support" sys-apps/smartmontools
+}
diff --git a/sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild b/sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild
new file mode 100644
index 00000000000..9edc0bc051d
--- /dev/null
+++ b/sys-apps/ipmi-fan-control/ipmi-fan-control-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+inherit cargo optfeature systemd
+
+DESCRIPTION="SuperMicro IPMI fan control daemon"
+HOMEPAGE="https://github.com/chenxiaolong/ipmi-fan-control"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/chenxiaolong/${PN}"
+else
+ SRC_URI="https://github.com/chenxiaolong/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris)"
+ # supported boards are x86_64 only, do not keyword elsewhere
+ # technically it could run on remote host and issue commands via ipmitool lanplus, but that's very edgy case
+ KEYWORDS="-* ~amd64"
+fi
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 GPL-3+ ISC MIT Unicode-DFS-2016 Unlicense"
+SLOT="0"
+
+BDEPEND="
+ sys-devel/clang
+ virtual/pkgconfig
+"
+
+RDEPEND="sys-libs/freeipmi"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ cargo_live_src_unpack
+ else
+ cargo_src_unpack
+ fi
+}
+
+src_install() {
+ cargo_src_install
+
+ sed -i \
+ -e "s|@BINDIR@|${EPREFIX}/usr/bin|" \
+ -e "s|@SYSCONFDIR@|${EPREFIX}/etc|" \
+ dist/ipmi-fan-control.service.in || die
+
+ # TODO: add openrc service
+ systemd_newunit dist/ipmi-fan-control.service.in ipmi-fan-control.service
+
+ insinto /etc
+ newins config.sample.toml "${PN}".toml
+}
+
+pkg_postinst() {
+ optfeature "S.M.A.R.T. drive temperature support" sys-apps/smartmontools
+}
diff --git a/sys-apps/ipmi-fan-control/metadata.xml b/sys-apps/ipmi-fan-control/metadata.xml
new file mode 100644
index 00000000000..1f362533c3e
--- /dev/null
+++ b/sys-apps/ipmi-fan-control/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gyakovlev@gentoo.org</email>
+ <name>Georgy Yakovlev</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://github.com/chenxiaolong/ipmi-fan-control/issues</bugs-to>
+ <remote-id type="github">chenxiaolong/ipmi-fan-control</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index 92e4e34d2d2..f797fb9f833 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1 +1 @@
-DIST IPMICFG_1.33.2_build.220126.zip 2001713 BLAKE2B 12535eb2f0564a7f019e11267b19340daefa279e6f2005cc9360fe06130e30b9fee8cc03b79d2de25e1429e9eedb995026400cec6a8d3b0b66693fb35daa6c6e SHA512 352db617d772c28d77056b4571dd28eefb58795a79ed8032e34306dcb34a72177e22c70984c75e708fcb286b7377757a3d7400270a04dcf70c1e27534bbd38ce
+DIST IPMICFG_1.34.0_build.220906.zip 2239248 BLAKE2B 3a5579c248308824a1a77d00ced831ffb323823fc918e45e02fa7815d50c0028758db49700e3c663ac2b2e24c7a118771e34a23d7f02ae8605d6aa3bac9b4449 SHA512 5b0d8f9fb24387d1e9e6f8da5113fa15f7bd826bc5b75693b6ad90d75badb325f42aa526a14ebec8e0a411c3ea864743883890cf76b0d276d2fd579c5dbbdf21
diff --git a/sys-apps/ipmicfg/ipmicfg-1.33.2.220126.ebuild b/sys-apps/ipmicfg/ipmicfg-1.34.0.220906.ebuild
index 24e4375c565..a1760554ee8 100644
--- a/sys-apps/ipmicfg/ipmicfg-1.33.2.220126.ebuild
+++ b/sys-apps/ipmicfg/ipmicfg-1.34.0.220906.ebuild
@@ -9,7 +9,7 @@ MY_PV="$(ver_cut 1-3)"
DESCRIPTION="An in-band utility for configuring Supermicro IPMI devices"
HOMEPAGE="https://www.supermicro.com"
-SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
+SRC_URI="https://www.supermicro.com/Bios/sw_download/481/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}"
LICENSE="supermicro"
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 5c974ac3707..a38bac6ab78 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -1,3 +1,5 @@
+DIST enterprise-numbers-1.8.19.xz 1500100 BLAKE2B 15c21792bf46220c5908ecf4f0ddafe2fdf13a1799c054a0cb0cb647e7f489768855c4c25fba8a4408505ff0cf02d1a43408d5c4de557b1b30fe8abb477a7926 SHA512 e88cb459a9c8a3172770bcfefbec0a7ad7d65395063c8c0173fce776ea0beb7ad9f3610e636dfbd71d0af8c952c2b9bc6c25c815daa4ab281bed983cbe2ebcc4
DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67862eb4dfd6dc29b192afb20ad0c908cd93a16b4103c5de64d042df012417c8cadc03000f2b2a00779bcc582a430603cad5f3cf SHA512 4a854a56e8ed51997c320cbfba041d43cb98b14743ef80b67e701942068d3729604abaedb617655a83ca21a7e20ea5a622ede4de317ca492cefd46da784d28f3
DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433
+DIST ipmitool-1.8.19.tar.gz 641383 BLAKE2B e1db12bb7301cb4b551f87fbfcd405b3597a1f32c45447b2b239d9d43a2cdbe213ee5408291d50801035cc80e28078fb3a778ab28335665bc3316798c13ea1fc SHA512 2d91706e9feba4b2ce4808eca087b81b842c4292a5840830001919c06ec8babd8f8761b74bb9dcf8fbc7765f028a5b1a192a3c1b643f2adaa157fed6fb0d1ee3
DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
diff --git a/sys-apps/ipmitool/files/exchange-bmc-os-info.initd b/sys-apps/ipmitool/files/exchange-bmc-os-info.initd
new file mode 100644
index 00000000000..9c63983f21f
--- /dev/null
+++ b/sys-apps/ipmitool/files/exchange-bmc-os-info.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# /etc/init.d/exchange-bmc-os-info
+
+name="exchange-bmc-os-info"
+description="Exchange Information between BMC and OS"
+command=/usr/libexec/exchange-bmc-os-info
+command_args=""
+: "${DEVICENUM:=0}" # which BMC
+required_files=/dev/ipmi${DEVICENUM}
+
+depend() {
+ use hostname modules
+ keyword -docker -lxc -prefix -systemd-nspawn
+}
+
+start() {
+ "${command}" start
+}
+stop() {
+ "${command}" stop
+}
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd b/sys-apps/ipmitool/files/ipmievd.confd
index 42b194a771b..b860c23c7f8 100644
--- a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd
+++ b/sys-apps/ipmitool/files/ipmievd.confd
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# /etc/conf.d/ipmievd
@@ -14,9 +14,14 @@ INTERFACE="open"
# Commands:
# open Use OpenIPMI for asyncronous notification of events
# sel Poll SEL for notification of events
-
-COMMAND="open"
+#
+# 'pidfile=...' will be appended!
+COMMAND="open daemon"
# Options.
OPTIONS=""
+
+# Device number:
+# Used to target a specific BMC on a multi-node, multi-BMC system via the open interface
+DEVICENUM=0
diff --git a/sys-apps/ipmitool/files/ipmievd.initd b/sys-apps/ipmitool/files/ipmievd.initd
new file mode 100644
index 00000000000..e8ef2c39d45
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmievd.initd
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# /etc/init.d/ipmievd
+
+depend() {
+ use logger modules
+ keyword -docker -lxc -prefix -systemd-nspawn
+}
+
+# TODO: ipmievd has a mode where it could be used to monitor multiple BMCs via
+# DEVICENUM or remote systems, and it would be valid to run multiple instances.
+# That is not supported by this init script at this time.
+
+description="IPMI event daemon for sending events to syslog LOCAL4"
+
+: "${DEVICENUM:=0}"
+: "${INTERFACE:=open}"
+: "${COMMAND:=open daemon}"
+: "${OPTIONS:=}"
+
+daemon=ipmievd
+
+pidfile=/run/${daemon}.pid${DEVICENUM} # see manpage re suffix
+command=/usr/sbin/${daemon}
+cachefile=/run/${daemon}.${DEVICENUM}.sdr-cache
+command_args="-d ${DEVICENUM} -S ${cachefile} -I ${INTERFACE} ${OPTIONS} ${COMMAND} pidfile=${pidfile}"
+required_files=/dev/ipmi$DEVICENUM
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.19-CVE-2011-4339.patch b/sys-apps/ipmitool/files/ipmitool-1.8.19-CVE-2011-4339.patch
new file mode 100644
index 00000000000..4a25280662b
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.19-CVE-2011-4339.patch
@@ -0,0 +1,20 @@
+Description: CVE-2011-4339
+ insecure file permission when creating PID files
+ based on 112_fix_CVE-2011-4339
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651917
+Forwarded: https://sourceforge.net/p/ipmitool/patches/99/
+Last-Update: 2020-10-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff -Nuar --exclude '*.orig' ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/lib/helper.c ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/lib/helper.c
+--- ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/lib/helper.c 2020-08-07 00:53:06.000000000 -0700
++++ ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/lib/helper.c 2020-10-21 13:59:02.335206233 -0700
+@@ -917,7 +917,6 @@
+ lprintf(LOG_ERR, "chdir failed: %s (%d)", strerror(errno), errno);
+ exit(1);
+ }
+- umask(0);
+
+ for (fd=0; fd<64; fd++) {
+ if (fd != intf->fd)
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.19-fix-buffer-overflow.patch b/sys-apps/ipmitool/files/ipmitool-1.8.19-fix-buffer-overflow.patch
new file mode 100644
index 00000000000..ceeffde085a
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.19-fix-buffer-overflow.patch
@@ -0,0 +1,21 @@
+Description: fix buffer overflow
+ based on 101_fix_buf_overflow from Leo Iannacone <l3on@ubuntu.com>
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Bug: TSOL buffer overflow
+Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipmitool/+bug/633054
+Forwarded: https://sourceforge.net/p/ipmitool/patches/100/
+Last-Update: 2020-20-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff -Nuar --exclude '*.orig' ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/lib/ipmi_tsol.c ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/lib/ipmi_tsol.c
+--- ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/lib/ipmi_tsol.c 2020-08-07 00:53:06.000000000 -0700
++++ ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/lib/ipmi_tsol.c 2020-10-21 13:55:58.571536858 -0700
+@@ -374,7 +374,7 @@
+ char *recvip = NULL;
+ char in_buff[IPMI_BUF_SIZE];
+ char out_buff[IPMI_BUF_SIZE * 8];
+- char buff[IPMI_BUF_SIZE + 4];
++ char buff[IPMI_BUF_SIZE * 8 + 4];
+ int fd_socket, result, i;
+ int out_buff_fill, in_buff_fill;
+ int ip1, ip2, ip3, ip4;
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.19-manpage-longlines.patch b/sys-apps/ipmitool/files/ipmitool-1.8.19-manpage-longlines.patch
new file mode 100644
index 00000000000..6c0e00da3e1
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.19-manpage-longlines.patch
@@ -0,0 +1,55 @@
+Description: long lines in man-page
+ prevent "can't break line" warnings
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: not-needed
+Last-Update: 2020-10-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff -Nuar --exclude '*.orig' ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/doc/ipmitool.1.in ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/doc/ipmitool.1.in
+--- ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/doc/ipmitool.1.in 2020-08-07 00:53:06.000000000 -0700
++++ ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/doc/ipmitool.1.in 2020-10-21 14:00:23.383643880 -0700
+@@ -1038,7 +1038,7 @@
+ AMC slot B2 topology:
+ Port 0 =====> On Carrier Device ID 0, Port 3
+ Port 2 =====> AMC slot B1, Port 2
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++ *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-*
+ From Carrier file: carrierfru
+ On Carrier Device ID 0 topology:
+ Port 0 =====> AMC slot B1, Port 4
+@@ -1094,7 +1094,7 @@
+ \-Link Type: AMC.2 Ethernet
+ \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+ \-Link Group ID: 0 || Link Asym. Match: exact match
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++ *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-*
+ AMC slot B1 port 1 ==> On-Carrier Device 0 port 12
+ Matching Result
+ - From On-Carrier Device ID 0
+@@ -1107,7 +1107,7 @@
+ \-Link Type: AMC.2 Ethernet
+ \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+ \-Link Group ID: 0 || Link Asym. Match: exact match
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++ *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-*
+ On-Carrier Device vs AMC slot A2
+ AMC slot A2 port 0 ==> On-Carrier Device 0 port 3
+ Matching Result
+@@ -1121,7 +1121,7 @@
+ \-Link Type: AMC.2 Ethernet
+ \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+ \-Link Group ID: 0 || Link Asym. Match: exact match
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++ *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-*
+ AMC slot B1 vs AMC slot A2
+ AMC slot A2 port 2 ==> AMC slot B1 port 2
+ Matching Result
+@@ -1135,7 +1135,7 @@
+ \-Link Type: AMC.3 Storage
+ \-Link Type extension: Serial Attached SCSI (SAS/SATA)
+ \-Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match}
+- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
++ *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-*
+ .TP
+ \fIunmatch\fP <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fr
+ .br
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.19-missing-func-decl.patch b/sys-apps/ipmitool/files/ipmitool-1.8.19-missing-func-decl.patch
new file mode 100644
index 00000000000..5057fcaf052
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.19-missing-func-decl.patch
@@ -0,0 +1,32 @@
+https://github.com/ipmitool/ipmitool/pull/360
+
+From a9e262480722f5affd237ee10d0bbc8c55617cb7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 2 Sep 2022 07:30:10 -0700
+Subject: [PATCH] ipmi_fru.c: Provide missing function declarations
+
+Fixes build with clang-15+
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/ipmi_fru.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
+index 3d1d8a1a..5c5661cf 100644
+--- a/lib/ipmi_fru.c
++++ b/lib/ipmi_fru.c
+@@ -60,6 +60,13 @@ static const char *section_id[4] = {
+ "Board Section",
+ "Product Section"
+ };
++/* From lib/ipmi_hpmfwupg.c: */
++uint16_t
++ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);
++
++/* From src/plugins/ipmi_intf.c: */
++uint16_t
++ipmi_intf_get_max_response_data_size(struct ipmi_intf * intf);
+
+ static const char * combined_voltage_desc[] = {
+ "12 V",
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.19-nvidia-iana.patch b/sys-apps/ipmitool/files/ipmitool-1.8.19-nvidia-iana.patch
new file mode 100644
index 00000000000..31b1a42dcf5
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.19-nvidia-iana.patch
@@ -0,0 +1,23 @@
+Description: Add IANA ID for NVIDIA hardware
+ Add the NVIDIA IANA ID to the hardcoded list used in ipmitool <= 1.8.18.
+ After upstream commit "9d41136 ID:491 - Fetch vendor IDs from IANA", ipmitool
+ generates a list of vendor IDs dynamically at build time, so we can drop this
+ patch in future releases.
+Author: dann frazier <dannf@debian.org>
+Origin: backport
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903616
+Forwarded: not-needed
+Last-Update: 2020-10-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff -Nuar --exclude '*.orig' --exclude '*.rej' ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/include/ipmitool/ipmi.h ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/include/ipmitool/ipmi.h
+--- ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f.orig/include/ipmitool/ipmi.h 2020-08-07 00:53:06.000000000 -0700
++++ ipmitool-50d8c36edf9657720e25445a435dabc44572cf5f/include/ipmitool/ipmi.h 2020-10-21 14:04:11.675128602 -0700
+@@ -281,6 +281,7 @@
+ /* 4769 for [IBM Corporation] */
+ IPMI_OEM_IBM_4769 = 4769,
+ IPMI_OEM_MAGNUM = 5593,
++ IPMI_OEM_NVIDIA = 5703,
+ IPMI_OEM_TYAN = 6653,
+ IPMI_OEM_QUANTA = 7244,
+ IPMI_OEM_VIKING = 9237,
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd b/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd
deleted file mode 100644
index 256238ef5e2..00000000000
--- a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# /etc/init.d/ipmievd
-
-depend() {
- use logger
-}
-PN="ipmievd"
-
-start() {
- /sbin/modprobe -sq ipmi_msghandler
- /sbin/modprobe -sq ipmi_devintf
- /sbin/modprobe -sq ipmi_si
- ebegin "Starting ${PN}"
- start-stop-daemon --start --pidfile /var/run/${PN}.pid0 --exec /usr/sbin/${PN} -- -I ${INTERFACE} ${OPTIONS} ${COMMAND}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${PN}"
- start-stop-daemon --stop --pidfile /var/run/${PN}.pid0
- eend $?
-}
diff --git a/sys-apps/ipmitool/files/log_bmc.initd b/sys-apps/ipmitool/files/log_bmc.initd
new file mode 100644
index 00000000000..4064edf3b84
--- /dev/null
+++ b/sys-apps/ipmitool/files/log_bmc.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="log_bmc"
+description="Add SEL entries to indicate OS Boot status"
+command=/usr/libexec/log_bmc.sh
+command_args=""
+: "${DEVICENUM:=0}" # which BMC
+required_files=/dev/ipmi${DEVICENUM}
+
+depend() {
+ use modules
+ after ipmievd # to capture our own log event
+ keyword -docker -lxc -prefix -systemd-nspawn
+}
+
+start() {
+ # TODO: should this keep start so it only fires once per boot?
+ "${command}" os_boot
+}
+
+stop() {
+ "${command}" os_shutdown
+}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
deleted file mode 100644
index afe6d33c725..00000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Utility for controlling IPMI enabled devices"
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="9.debian"
-DEBIAN_PV="${PV/_p*}"
-DEBIAN_P="${PN}_${DEBIAN_PV}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-COMMIT_ID=7fd7c0f2ba39e223868a8d83d81d4074f057d6fc
-if [[ -n "${COMMIT_ID}" ]]; then
- S="${WORKDIR}/${PN}-${COMMIT_ID}"
- SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
-# is not available with version numbers or dates!
-SRC_URI+="
- https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz
- https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
- "
- #http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz
- # https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
-#IUSE="freeipmi openipmi status"
-IUSE="openbmc openipmi static"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86"
-LICENSE="BSD"
-
-RDEPEND="
- dev-libs/openssl:0=
- openbmc? ( sys-apps/systemd:0= )
- sys-libs/readline:0="
-DEPEND="${RDEPEND}
- openipmi? ( sys-libs/openipmi )
- virtual/os-headers"
- #freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-PATCHES=(
- #"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-# I hope all of this will get MUCH cleaner if upstream will just make a new
-# release! - robbat2 2020/10/21
-src_prepare() {
- default
- if [ -d "${S}"/debian ] ; then
- mv "${S}"/debian{,.package}
- ln -s "${WORKDIR}"/debian "${S}"
- eautoreconf
- # Upstream commit includes SOME of the debian changes, but not all of them
- sed -i \
- -e '/^#/d' \
- -e '/0120-openssl1.1.patch/d' \
- debian/patches/series
- for p in $(cat debian/patches/series) ; do
- echo ${p}
- if ! nonfatal eapply -p1 debian/patches/$p ; then
- echo "failed ${p}"
- fail=1
- fi
- done
- [[ $fail -eq 1 ]] && die "fail"
- fi
- pd="${WORKDIR}"/ipmitool_1.8.18-9.debian-ported-gentoo/
- PATCHES=(
- #"${pd}"/0000.0120-openssl1.1.patch
- "${pd}"/0001.0100-fix_buf_overflow.patch
- "${pd}"/0002.0500-fix_CVE-2011-4339.patch
- "${pd}"/0003.0600-manpage_longlines.patch
- #"${pd}"/0004.0110-getpass-prototype.patch
- #"${pd}"/0005.0115-typo.patch
- "${pd}"/0006.0125-nvidia-iana.patch
- "${pd}"/0007.0615-manpage_typo.patch
- #"${pd}"/0008.0130-Correct_lanplus_segment_violation.patch
- "${pd}"/0009.0005-gcc10.patch
- #"${pd}"/0010.0010-utf8.patch
- )
- for p in "${PATCHES[@]}" ; do
- eapply -p1 ${p} || die "failed ${p}"
- done
-
- eautoreconf
-
- # If this file is not present, then ipmitool will try to download it during make install!
- cp -al \
- "${WORKDIR}/enterprise-numbers.2020-10-21" \
- "${S}"/enterprise-numbers \
- || die "Could not place IANA enterprise-numbers"
-}
-
-src_configure() {
- # - LIPMI and BMC are the Solaris libs
- # - OpenIPMI is unconditionally enabled in the configure as there is compat
- # code that is used if the library itself is not available
- # FreeIPMI does build now, but is disabled until the other arches keyword it
- # `use_enable freeipmi intf-free` \
- # --enable-ipmievd is now unconditional
- WGET=/bin/true \
- CURL=/bin/true \
- econf \
- $(use_enable static) \
- --enable-ipmishell \
- --enable-intf-lan \
- --enable-intf-usb \
- $(use_enable openbmc intf-dbus) \
- --enable-intf-lanplus \
- --enable-intf-open \
- --enable-intf-serial \
- --disable-intf-bmc \
- --disable-intf-dummy \
- --disable-intf-free \
- --disable-intf-imb \
- --disable-intf-lipmi \
- --disable-internal-md5 \
- --with-kerneldir=/usr \
- --bindir=/usr/sbin
-
- # Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
- # include the below file to define some things.
- echo "#include <asm/byteorder.h>" >>config.h
-}
-
-src_install() {
- emake DESTDIR="${D}" PACKAGE="${PF}" install
-
- into /usr
- dosbin contrib/bmclanconf
- rm -f "${D}"/usr/share/doc/${PF}/COPYING
- docinto contrib
- cd "${S}"/contrib
- dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-
- newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd
- newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd
- # TODO: init script for contrib/bmc-snmp-proxy
- # TODO: contrib/exchange-bmc-os-info
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
deleted file mode 100644
index 8b34a72624b..00000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Utility for controlling IPMI enabled devices"
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="9.debian"
-DEBIAN_PV="${PV/_p*}"
-DEBIAN_P="${PN}_${DEBIAN_PV}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-COMMIT_ID=7fd7c0f2ba39e223868a8d83d81d4074f057d6fc
-if [[ -n "${COMMIT_ID}" ]]; then
- S="${WORKDIR}/${PN}-${COMMIT_ID}"
- SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
-# is not available with version numbers or dates!
-SRC_URI+="
- https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz
- https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
- "
- #http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz
- # https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
-#IUSE="freeipmi openipmi status"
-IUSE="openbmc openipmi static"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-LICENSE="BSD"
-
-RDEPEND="
- dev-libs/openssl:0=
- openbmc? ( sys-apps/systemd:0= )
- sys-libs/readline:0="
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-2.69-r5
- openipmi? ( sys-libs/openipmi )
- virtual/os-headers"
- #freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-PATCHES=(
- #"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-# I hope all of this will get MUCH cleaner if upstream will just make a new
-# release! - robbat2 2020/10/21
-src_prepare() {
- default
- if [ -d "${S}"/debian ] ; then
- mv "${S}"/debian{,.package}
- ln -s "${WORKDIR}"/debian "${S}"
- eautoreconf
- # Upstream commit includes SOME of the debian changes, but not all of them
- sed -i \
- -e '/^#/d' \
- -e '/0120-openssl1.1.patch/d' \
- debian/patches/series
- for p in $(cat debian/patches/series) ; do
- echo ${p}
- if ! nonfatal eapply -p1 debian/patches/${p} ; then
- echo "failed ${p}"
- fail=1
- fi
- done
- [[ $fail -eq 1 ]] && die "fail"
- fi
- pd="${WORKDIR}"/ipmitool_1.8.18-9.debian-ported-gentoo/
- PATCHES=(
- #"${pd}"/0000.0120-openssl1.1.patch
- "${pd}"/0001.0100-fix_buf_overflow.patch
- "${pd}"/0002.0500-fix_CVE-2011-4339.patch
- "${pd}"/0003.0600-manpage_longlines.patch
- #"${pd}"/0004.0110-getpass-prototype.patch
- #"${pd}"/0005.0115-typo.patch
- "${pd}"/0006.0125-nvidia-iana.patch
- "${pd}"/0007.0615-manpage_typo.patch
- #"${pd}"/0008.0130-Correct_lanplus_segment_violation.patch
- "${pd}"/0009.0005-gcc10.patch
- #"${pd}"/0010.0010-utf8.patch
- )
- for p in "${PATCHES[@]}" ; do
- eapply -p1 ${p} || die "failed ${p}"
- done
-
- # Gentoo chooses to install ipmitool in /usr/sbin
- # Where RedHat chooses /usr/bin
- sed -i -e \
- 's,/usr/bin/ipmitool,/usr/sbin/ipmitool,g' \
- "${S}"/contrib/* \
- || die "sed bindir failed"
-
- # Consistent RUNSTATEDIR
- sed -i -e \
- 's,/var/run,/run,g' \
- "${S}/doc/ipmievd.8.in" \
- "${S}"/contrib/* \
- "${S}"/lib/helper.c \
- "${S}"/src/ipmievd.c \
- || die "sed /var/run failed"
-
- eautoreconf
-
- # If this file is not present, then ipmitool will try to download it during make install!
- cp -al \
- "${WORKDIR}/enterprise-numbers.2020-10-21" \
- "${S}"/enterprise-numbers \
- || die "Could not place IANA enterprise-numbers"
-}
-
-src_configure() {
- # - LIPMI and BMC are the Solaris libs
- # - OpenIPMI is unconditionally enabled in the configure as there is compat
- # code that is used if the library itself is not available
- # FreeIPMI does build now, but is disabled until the other arches keyword it
- # `use_enable freeipmi intf-free` \
- # --enable-ipmievd is now unconditional
-
- # for pidfiles, runstatedir not respected in all parts of code
- append-cppflags -D_PATH_VARRUN=/run/
-
- # WGET & CURL are set to avoid network interaction, we manually inject the
- # IANA enterprise-numbers file instead.
- #
- # DEFAULT_INTF=open # default to OpenIPMI, do not take external input
- WGET=/bin/true \
- CURL=/bin/true \
- DEFAULT_INTF=open \
- econf \
- $(use_enable static) \
- --enable-ipmishell \
- --enable-intf-lan \
- --enable-intf-usb \
- $(use_enable openbmc intf-dbus) \
- --enable-intf-lanplus \
- --enable-intf-open \
- --enable-intf-serial \
- --disable-intf-bmc \
- --disable-intf-dummy \
- --disable-intf-free \
- --disable-intf-imb \
- --disable-intf-lipmi \
- --disable-internal-md5 \
- --with-kerneldir=/usr \
- --bindir=/usr/sbin \
- --runstatedir=/run \
- CFLAGS="${CFLAGS}"
-
- # Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
- # include the below file to define some things.
- echo "#include <asm/byteorder.h>" >>config.h
-
-}
-
-src_install() {
- emake DESTDIR="${D}" PACKAGE="${PF}" install
- rm -f "${D}"/usr/share/doc/${PF}/COPYING
- into /usr
-
- newinitd "${FILESDIR}"/${PN}-1.8.18-ipmievd.initd ipmievd
- newconfd "${FILESDIR}"/${PN}-1.8.18-ipmievd.confd ipmievd
-
- # Everything past this point is installing contrib/
- dosbin contrib/bmclanconf
-
- exeinto /usr/libexec
- doexe contrib/log_bmc.sh
- newinitd "${FILESDIR}/log_bmc-1.8.18.initd" log_bmc
-
- # contrib/exchange-bmc-os-info.init.redhat
- # contrib/exchange-bmc-os-info.service.redhat
- # contrib/exchange-bmc-os-info.sysconf
- exeinto /usr/libexec
- newexe contrib/exchange-bmc-os-info.init.redhat exchange-bmc-os-info
- insinto /etc/sysconfig
- newins contrib/exchange-bmc-os-info.sysconf exchange-bmc-os-info
- systemd_newunit contrib/exchange-bmc-os-info.service.redhat exchange-bmc-os-info.service
- newinitd "${FILESDIR}/exchange-bmc-os-info-1.8.18.initd" exchange-bmc-os-info
-
- # contrib/bmc-snmp-proxy
- # contrib/bmc-snmp-proxy.service
- # contrib/bmc-snmp-proxy.sysconf
- exeinto /usr/libexec
- doexe contrib/bmc-snmp-proxy
- insinto /etc/sysconfig
- newins contrib/bmc-snmp-proxy.sysconf bmc-snmp-proxy
- systemd_dounit contrib/bmc-snmp-proxy.service
- # TODO: initd for bmc-snmp-proxy
-
- insinto /usr/share/${PN}
- doins contrib/oem_ibm_sel_map
-
- docinto contrib
- cd "${S}"/contrib
- dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.19.ebuild b/sys-apps/ipmitool/ipmitool-1.8.19.ebuild
new file mode 100644
index 00000000000..d8fa5dd394b
--- /dev/null
+++ b/sys-apps/ipmitool/ipmitool-1.8.19.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Utility for controlling IPMI enabled devices"
+HOMEPAGE="https://github.com/ipmitool/ipmitool"
+
+COMMIT_ID=
+if [[ -n "${COMMIT_ID}" ]]; then
+ SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+ MY_P="${PN^^}_${PV//./_}"
+ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_P}"
+fi
+
+# to generate: `make enterprise-numbers` from git checkout of release tag
+SRC_URI+="
+ https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/enterprise-numbers-${PV}.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm64 hppa ~ia64 ppc ppc64 x86"
+IUSE="openbmc openipmi static"
+
+RDEPEND="dev-libs/openssl:0=
+ sys-libs/readline:0=
+ openbmc? ( sys-apps/systemd:0= )"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-2.69-r5
+ virtual/os-headers
+ openipmi? ( sys-libs/openipmi )"
+ #freeipmi? ( sys-libs/freeipmi )
+# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
+# but it doesn't actually need either.
+
+PATCHES=(
+ "${FILESDIR}/${P}-missing-func-decl.patch"
+ # yoinked out of debian's patchset, previously carried in a SRC_URI
+ # tarball
+ "${FILESDIR}/${P}-fix-buffer-overflow.patch"
+ "${FILESDIR}/${P}-CVE-2011-4339.patch"
+ "${FILESDIR}/${P}-manpage-longlines.patch"
+ "${FILESDIR}/${P}-nvidia-iana.patch"
+)
+
+src_prepare() {
+ default
+
+ # Gentoo chooses to install ipmitool in /usr/sbin
+ # Where RedHat chooses /usr/bin
+ sed -i -e \
+ 's,/usr/bin/ipmitool,/usr/sbin/ipmitool,g' \
+ "${S}"/contrib/* \
+ || die "sed bindir failed"
+
+ eautoreconf
+
+ # If this file is not present, then ipmitool will try to download it during make install!
+ cp -al "${WORKDIR}/enterprise-numbers-${PV}" "${S}/enterprise-numbers" \
+ || die "Could not place IANA enterprise-numbers"
+}
+
+src_configure() {
+ # - LIPMI and BMC are the Solaris libs
+ # - OpenIPMI is unconditionally enabled in the configure as there is compat
+ # code that is used if the library itself is not available
+ # FreeIPMI does build now, but is disabled until the other arches keyword it
+ # `use_enable freeipmi intf-free` \
+ # --enable-ipmievd is now unconditional
+
+ local econfargs=(
+ $(use_enable static) \
+ --enable-ipmishell \
+ --enable-intf-lan \
+ --enable-intf-usb \
+ $(use_enable openbmc intf-dbus) \
+ --enable-intf-lanplus \
+ --enable-intf-open \
+ --enable-intf-serial \
+ --disable-intf-bmc \
+ --disable-intf-dummy \
+ --disable-intf-free \
+ --disable-intf-imb \
+ --disable-intf-lipmi \
+ --disable-internal-md5 \
+ --with-kerneldir=/usr \
+ --bindir=/usr/sbin \
+ --runstatedir=/run \
+ CFLAGS="${CFLAGS}"
+ )
+
+ econf "${econfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PACKAGE="${PF}" install
+ into /usr
+
+ newinitd "${FILESDIR}/ipmievd.initd" ipmievd
+ newconfd "${FILESDIR}/ipmievd.confd" ipmievd
+
+ # From debian, less configurable than OpenRC
+ systemd_dounit "${FILESDIR}/ipmievd.service"
+
+ dosbin contrib/bmclanconf
+
+ exeinto /usr/libexec
+ doexe contrib/log_bmc.sh
+ newinitd "${FILESDIR}/log_bmc.initd" log_bmc
+
+ # contrib/exchange-bmc-os-info.init.redhat
+ # contrib/exchange-bmc-os-info.service.redhat
+ # contrib/exchange-bmc-os-info.sysconf
+ exeinto /usr/libexec
+ newexe contrib/exchange-bmc-os-info.init.redhat exchange-bmc-os-info
+
+ insinto /etc/sysconfig
+ newins contrib/exchange-bmc-os-info.sysconf exchange-bmc-os-info
+
+ systemd_newunit contrib/exchange-bmc-os-info.service.redhat exchange-bmc-os-info.service
+ newinitd "${FILESDIR}/exchange-bmc-os-info.initd" exchange-bmc-os-info
+
+ # contrib/bmc-snmp-proxy
+ # contrib/bmc-snmp-proxy.service
+ # contrib/bmc-snmp-proxy.sysconf
+ exeinto /usr/libexec
+ doexe contrib/bmc-snmp-proxy
+
+ insinto /etc/sysconfig
+ newins contrib/bmc-snmp-proxy.sysconf bmc-snmp-proxy
+
+ systemd_dounit contrib/bmc-snmp-proxy.service
+ # TODO: initd for bmc-snmp-proxy
+
+ insinto "/usr/share/${PN}"
+ doins contrib/oem_ibm_sel_map
+
+ cd "${S}/contrib"
+
+ docinto contrib
+ dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
+}
diff --git a/sys-apps/ipmitool/metadata.xml b/sys-apps/ipmitool/metadata.xml
index dc4d508dec2..5a7c948d805 100644
--- a/sys-apps/ipmitool/metadata.xml
+++ b/sys-apps/ipmitool/metadata.xml
@@ -13,5 +13,6 @@
<upstream>
<remote-id type="sourceforge">ipmitool</remote-id>
<remote-id type="launchpad">ubuntu</remote-id>
+ <remote-id type="github">ipmitool/ipmitool</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 5fdc81507f2..c01f03c9169 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,5 +1 @@
-DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
-DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
-DIST ipmiutil-3.1.6.tar.gz 1693461 BLAKE2B efc2b283d7655b8afb9d3d8da2e5458deea1c1b939f3ccdf2be0cdf3792ea60229099cce1b8e32f087972385feb01d604f1c63bddbfd031210d5acf8a6b1b9d7 SHA512 9bccfa2e0bba7f30e422d67f93ee6cff50c08cc8bceab5ba5bfd1b0a91e1af8a4a98a2eaa81364e8a1f38e0bd1ce6b99717d86957c6f689aa7329e7013f5b0ef
-DIST ipmiutil-3.1.7.tar.gz 1726396 BLAKE2B 7fa31f8aca61462fc08dd4fe420e27eecce2ee9fa5fb2676eb944e2ae6c09598aec5f06d59e4ed02faab077003b14085f944b6cf0b63f90b10f2660f363e997b SHA512 7522808e4a94c8627de0a95dde0e3eb463ba05948159b5181129b573ce8f9feba3543ef603c14e7cdcafcbd58ca5319536cc5534ea8191cce0ef9d33cc548274
DIST ipmiutil-3.1.8.tar.gz 1841037 BLAKE2B 69139fc2b82a701657c5fec6aa928a0ee2d7874a8ebc26631eca438f298e8bddd3afb578462979eb24cd51bd816263f13e9f38fec8b5d6fa4fcefb2519a652c9 SHA512 77a01be420d8362ddce2b2b2bd44ee53a70812b29b3dd7bc5add6429f0e43a48905ca0401e1855f2cca5e69086605eb7b84e2f4bf9cf33251934acc0fe51346f
diff --git a/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch b/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch
deleted file mode 100644
index ee991740620..00000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ipmiutil-2.9.8/configure.ac
-+++ ipmiutil-2.9.8/configure.ac
-@@ -162,7 +162,7 @@
- LANPLUS_CRYPTO=""
- LANPLUS_SAM="no"
- LD_SAMX=""
-- CFLAGS="-O2"
-+ #CFLAGS="-O2"
- SUBDIR_S="doc scripts util"
- if test "x$cross_compiling" = "xyes"; then
- # cross-compiling, so link with -static (e.g. Android ARM)
-@@ -334,7 +334,7 @@
- fi
- rm -f $tmpc $tmpo >/dev/null 2>&1
- echo $ECHO_N "checking compile fortify flags ... $ECHO_C"
-- cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-+ #cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- echo "int main() { alloca(100); return(1); }" >$tmpc
- $CC -o $tmpo $cfhard $tmpc >/dev/null 2>&1
- if test $? -ne 0 ; then
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch
deleted file mode 100644
index 8748256be5f..00000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch
+++ /dev/null
@@ -1,180 +0,0 @@
---- ipmiutil-3.1.5.orig/configure.ac 2019-11-25 06:53:08.000000000 -0800
-+++ ipmiutil-3.1.5/configure.ac 2020-01-25 22:55:20.577345441 -0800
-@@ -80,40 +80,46 @@
- # fi]
-
- drv_landesk=0
-+LANDESK_CFLAGS=""
-+LANDESK_LDADD=""
- dnl configure for LANDESK libipmiapi or not
- AC_ARG_ENABLE([landesk],
-- [ --enable-landesk adds landesk library support [[default=no]]],
-- [if test "x$enableval" = "xyes"; then
-- drv_landesk=1
-- LANDESK_CFLAGS="-DLINK_LANDESK"
-- LANDESK_LDADD="-lipmiapi -L../lib"
-- AC_SUBST(LANDESK_CFLAGS)
-- AC_SUBST(LANDESK_LDADD)
-- fi]
-- )
-+ AS_HELP_STRING([--enable-landesk], [enable landesk support (default=no)]),
-+ [],
-+ [enable_landesk=no])
-+
-+AS_IF([test "x$enable_landesk" = "xyes"], [
-+ drv_landesk=1
-+ LANDESK_CFLAGS="-DLINK_LANDESK"
-+ LANDESK_LDADD="-lipmiapi -L../lib"
-+ AC_SUBST(LANDESK_CFLAGS)
-+ AC_SUBST(LANDESK_LDADD)
-+ ])
-
- dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
- AC_ARG_ENABLE([lanplus],
-- [ --enable-lanplus enable lanplus support (default=yes)],[default=yes],
--[if test "x$enableval" = "xno"; then
-- drv_lanplus=""
-- LANPLUS_CFLAGS=""
-- LANPLUS_LDADD=""
-- LANPLUS_LIB=""
-- LANPLUS_CRYPTO=""
-- LANPLUS_SAM="no"
-- LD_SAMX=""
--else
-+ AS_HELP_STRING([--disable-lanplus], [enable lanplus support (default=yes)]),
-+ [],
-+ [enable_lanplus=yes])
-+
-+drv_lanplus=""
-+LANPLUS_CFLAGS=""
-+LANPLUS_LDADD=""
-+LANPLUS_LIB=""
-+LANPLUS_CRYPTO=""
-+LANPLUS_SAM="no"
-+LD_SAMX=""
-+AS_IF([test "x$enable_lanplus" = "xyes"], [
- drv_lanplus="lanplus"
- LANPLUS_CFLAGS="-DHAVE_LANPLUS"
- # LANPLUS_CFLAGS="-DHAVE_LANPLUS -I${projdir}/lib/lanplus/inc"
- # LANPLUS_LDADD="-L../lib -lintf_lanplus -L/usr/local/lib -lcrypto"
- LANPLUS_LDADD="-L../lib -lipmi_lanplus -L/usr/local/lib -lcrypto"
-- LANPLUS_LIB="../lib/libipmi_lanplus.a"
-+ LANPLUS_LIB="../lib/libipmi_lanplus.a"
- LANPLUS_CRYPTO="-lcrypto"
- LANPLUS_SAM="yes"
- LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
--fi ])
-+])
-
- dnl Configure libipmiutil.a for lanplus or not
- dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus
-@@ -128,21 +134,28 @@
- #fi
-
- # strings /lib/libssl.so* |grep EVP_sha256
--dnl configure for SHA256, build lanplus with SHA256 support, uses later openssl.
-+dnl configure for SHA256, build lanplus with SHA256 support
-+dnl requires openssl-1.0.1 which was released in 2012/03
- AC_ARG_ENABLE([sha256],
-- [ --enable-sha256 build with SHA256 support, requires later openssl.],
-- [if test "x$enableval" = "xyes"; then
-- LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
-- fi]
-- )
-+ AS_HELP_STRING([--disable-sha256], [build with SHA256 support (default=yes)]),
-+ dnl action if passed
-+ [],
-+ dnl action if not passed
-+ [enable_sha256=yes]
-+ )
-+AS_IF([test "x$enable_sha256" = "xyes"], [
-+ LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
-+])
-
- dnl configure for EKANALYZER, build with ekanalyzer function enabled
- AC_ARG_ENABLE([ekanalyzer],
-- [ --enable-ekanalyzer build with ekanalyzer function enabled.],
-- [if test "x$enableval" = "xyes"; then
-+ AS_HELP_STRING([--enable-ekanalyzer], [build with ekanalyzer function enabled.]),
-+ [],
-+ [enable_ekanalyzer=no]
-+ )
-+AS_IF([test "x$enable_ekanalyzer" = "xyes"], [
- OS_CFLAGS="$OS_CFLAGS -DHAVE_EKANAL"
-- fi]
-- )
-+ ])
-
- GPL_CFLAGS=""
- CROSS_LFLAGS=""
-@@ -152,17 +165,20 @@
- SYSTEMD_DIR=/usr/share/ipmiutil
-
- AC_ARG_ENABLE([useflags],
-- [ --enable-useflags include environment CFLAGS and LDFLAGS.],
-- [if test "x$enableval" = "xyes"; then
-+ AS_HELP_STRING([--enable-useflags], [include environment CFLAGS and LDFLAGS.]),
-+ [],
-+ [enable_useflags=no])
-+AS_IF([test "x$enable_useflags" = "xyes"], [
- CROSS_CFLAGS="$CFLAGS"
- CROSS_LFLAGS="$LDFLAGS"
-- fi]
-- )
-+])
-
- dnl configure for standalone, with no lanplus or GPL libs
- AC_ARG_ENABLE([standalone],
-- [ --enable-standalone build standalone, with no GPL or LanPlus libs.],
-- [if test "x$enableval" = "xyes"; then
-+ AS_HELP_STRING([--enable-standalone], [build standalone, with no GPL or LanPlus libs.]),
-+ [],
-+ [enable_standalone=no])
-+AS_IF([test "x$enable_standalone" = "xyes"], [
- GPL_CFLAGS=""
- LANPLUS_CFLAGS=""
- LANPLUS_LDADD=""
-@@ -176,27 +192,30 @@
- # cross-compiling, so link with -static (e.g. Android ARM)
- CROSS_LFLAGS="-static"
- CROSS_CFLAGS="-DCROSS_COMPILE"
-+ # TODO: how can this be effective? Configure only converts Makefile.in -> Makefile
-+ # Configure does not convert Makefile.am->Makefile.in
- sed -i -e 's/^# ipmiutil: $(METASOURCE:.c=.o)/ipmiutil:\t$(METASOURCE:.c=.o)\n\t$(CC) $(CFLAGS) $(LDFLAGS) -o ipmiutil $(METASOURCE:.c=.o) $(LDADD)/' util/Makefile.am
- fi
-- fi]
-- )
-+ ])
-
- dnl build libipmiutil with sensor modules
- AC_ARG_ENABLE([libsensors],
-- [ --enable-libsensors build libipmiutil with sensor modules [[default=no]]],
-- [if test "x$enableval" = "xyes"; then
-- LIBSENSORS="isensor2.o ievents2.o"
-- SAM2OBJ=""
-- fi]
-- )
-+ AS_HELP_STRING([--enable-libsensors], [build libipmiutil with sensor modules (default=no)]),
-+ [],
-+ [enable_libsensors=no])
-+AS_IF([test "x$enable_libsensors" = "xyes"], [
-+ LIBSENSORS="isensor2.o ievents2.o"
-+ SAM2OBJ=""
-+ ])
-
- dnl configure for GPL build or not (GPL files: md2.h, ipmi_ioctl.h)
- AC_ARG_ENABLE([gpl],
-- [ --enable-gpl build with some GPL code [[default=no]]],
-- [if test "x$enableval" = "xyes"; then
-- GPL_CFLAGS="-DALLOW_GPL"
-- fi]
-- )
-+ AS_HELP_STRING([--enable-gpl], [build with some GPL code (default=no)]),
-+ [],
-+ [enable_gpl=no])
-+AS_IF([test "x$enable_gpl" = "xyes"], [
-+ GPL_CFLAGS="-DALLOW_GPL"
-+ ])
-
- dnl Does this Linux have systemd enabled? Otherwise use sysv init.
- AC_ARG_ENABLE([systemd],
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch
deleted file mode 100644
index 16435dacd6b..00000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch
+++ /dev/null
@@ -1,184 +0,0 @@
---- ipmiutil-3.1.7/configure.ac
-+++ ipmiutil-3.1.7/configure.ac
-@@ -80,40 +80,46 @@
- # fi]
-
- drv_landesk=0
-+LANDESK_CFLAGS=""
-+LANDESK_LDADD=""
- dnl configure for LANDESK libipmiapi or not
- AC_ARG_ENABLE([landesk],
-- [ --enable-landesk adds landesk library support [[default=no]]],
-- [if test "x$enableval" = "xyes"; then
-- drv_landesk=1
-- LANDESK_CFLAGS="-DLINK_LANDESK"
-- LANDESK_LDADD="-lipmiapi -L../lib"
-- AC_SUBST(LANDESK_CFLAGS)
-- AC_SUBST(LANDESK_LDADD)
-- fi]
-- )
-+ AS_HELP_STRING([--enable-landesk], [enable landesk support (default=no)]),
-+ [],
-+ [enable_landesk=no])
-+
-+AS_IF([test "x$enable_landesk" = "xyes"], [
-+ drv_landesk=1
-+ LANDESK_CFLAGS="-DLINK_LANDESK"
-+ LANDESK_LDADD="-lipmiapi -L../lib"
-+ AC_SUBST(LANDESK_CFLAGS)
-+ AC_SUBST(LANDESK_LDADD)
-+ ])
-
- dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
- AC_ARG_ENABLE([lanplus],
-- [ --enable-lanplus enable lanplus support (default=yes)],[default=yes],
--[if test "x$enableval" = "xno"; then
-- drv_lanplus=""
-- LANPLUS_CFLAGS=""
-- LANPLUS_LDADD=""
-- LANPLUS_LIB=""
-- LANPLUS_CRYPTO=""
-- LANPLUS_SAM="no"
-- LD_SAMX=""
--else
-+ AS_HELP_STRING([--disable-lanplus], [enable lanplus support (default=yes)]),
-+ [],
-+ [enable_lanplus=yes])
-+
-+drv_lanplus=""
-+LANPLUS_CFLAGS=""
-+LANPLUS_LDADD=""
-+LANPLUS_LIB=""
-+LANPLUS_CRYPTO=""
-+LANPLUS_SAM="no"
-+LD_SAMX=""
-+AS_IF([test "x$enable_lanplus" = "xyes"], [
- drv_lanplus="lanplus"
- LANPLUS_CFLAGS="-DHAVE_LANPLUS"
- # LANPLUS_CFLAGS="-DHAVE_LANPLUS -I${projdir}/lib/lanplus/inc"
- # LANPLUS_LDADD="-L../lib -lintf_lanplus -L/usr/local/lib -lcrypto"
- LANPLUS_LDADD="-L../lib -lipmi_lanplus -L/usr/local/lib -lcrypto"
-- LANPLUS_LIB="../lib/libipmi_lanplus.a"
-+ LANPLUS_LIB="../lib/libipmi_lanplus.a"
- LANPLUS_CRYPTO="-lcrypto"
- LANPLUS_SAM="yes"
- LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
--fi ])
-+])
-
- dnl Configure libipmiutil.a for lanplus or not
- dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus
-@@ -128,21 +134,28 @@
- #fi
-
- # strings /lib/libssl.so* |grep EVP_sha256
--dnl configure for SHA256, build lanplus with SHA256 support, uses later openssl.
-+dnl configure for SHA256, build lanplus with SHA256 support
-+dnl requires openssl-1.0.1 which was released in 2012/03
- AC_ARG_ENABLE([sha256],
-- [ --enable-sha256 build with SHA256 support, requires later openssl.],
-- [if test "x$enableval" = "xyes"; then
-- LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
-- fi]
-- )
-+ AS_HELP_STRING([--disable-sha256], [build with SHA256 support (default=yes)]),
-+ dnl action if passed
-+ [],
-+ dnl action if not passed
-+ [enable_sha256=yes]
-+ )
-+AS_IF([test "x$enable_sha256" = "xyes"], [
-+ LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
-+])
-
- dnl configure for EKANALYZER, build with ekanalyzer function enabled
- AC_ARG_ENABLE([ekanalyzer],
-- [ --enable-ekanalyzer build with ekanalyzer function enabled.],
-- [if test "x$enableval" = "xyes"; then
-+ AS_HELP_STRING([--enable-ekanalyzer], [build with ekanalyzer function enabled.]),
-+ [],
-+ [enable_ekanalyzer=no]
-+ )
-+AS_IF([test "x$enable_ekanalyzer" = "xyes"], [
- OS_CFLAGS="$OS_CFLAGS -DHAVE_EKANAL"
-- fi]
-- )
-+ ])
-
- GPL_CFLAGS=""
- CROSS_LFLAGS=""
-@@ -152,17 +165,20 @@
- SYSTEMD_DIR=/usr/share/ipmiutil
-
- AC_ARG_ENABLE([useflags],
-- [ --enable-useflags include environment CFLAGS and LDFLAGS.],
-- [if test "x$enableval" = "xyes"; then
-+ AS_HELP_STRING([--enable-useflags], [include environment CFLAGS and LDFLAGS.]),
-+ [],
-+ [enable_useflags=no])
-+AS_IF([test "x$enable_useflags" = "xyes"], [
- CROSS_CFLAGS="$CFLAGS"
- CROSS_LFLAGS="$LDFLAGS"
-- fi]
-- )
-+])
-
- dnl configure for standalone, with no lanplus or GPL libs
- AC_ARG_ENABLE([standalone],
-- [ --enable-standalone build standalone, with no GPL or LanPlus libs.],
-- [if test "x$enableval" = "xyes"; then
-+ AS_HELP_STRING([--enable-standalone], [build standalone, with no GPL or LanPlus libs.]),
-+ [],
-+ [enable_standalone=no])
-+AS_IF([test "x$enable_standalone" = "xyes"], [
- GPL_CFLAGS=""
- LANPLUS_CFLAGS=""
- LANPLUS_LDADD=""
-@@ -176,10 +192,11 @@
- # cross-compiling, so link with -static (e.g. Android ARM)
- CROSS_LFLAGS="-static"
- CROSS_CFLAGS="-DCROSS_COMPILE"
-+ # TODO: how can this be effective? Configure only converts Makefile.in -> Makefile
-+ # Configure does not convert Makefile.am->Makefile.in
- sed -i -e 's/^# ipmiutil: $(METASOURCE:.c=.o)/ipmiutil:\t$(METASOURCE:.c=.o)\n\t$(CC) $(CFLAGS) $(LDFLAGS) -o ipmiutil $(METASOURCE:.c=.o) $(LDADD)/' util/Makefile.am
- fi
-- fi]
-- )
-+ ])
-
- AC_ARG_ENABLE([doc],
- [ --enable-doc build with documentation [[default=yes]]],
-@@ -192,20 +209,22 @@
-
- dnl build libipmiutil with sensor modules
- AC_ARG_ENABLE([libsensors],
-- [ --enable-libsensors build libipmiutil with sensor modules [[default=no]]],
-- [if test "x$enableval" = "xyes"; then
-- LIBSENSORS="isensor2.o ievents2.o"
-- SAM2OBJ=""
-- fi]
-- )
-+ AS_HELP_STRING([--enable-libsensors], [build libipmiutil with sensor modules (default=no)]),
-+ [],
-+ [enable_libsensors=no])
-+AS_IF([test "x$enable_libsensors" = "xyes"], [
-+ LIBSENSORS="isensor2.o ievents2.o"
-+ SAM2OBJ=""
-+ ])
-
- dnl configure for GPL build or not (GPL files: md2.h, ipmi_ioctl.h)
- AC_ARG_ENABLE([gpl],
-- [ --enable-gpl build with some GPL code [[default=no]]],
-- [if test "x$enableval" = "xyes"; then
-- GPL_CFLAGS="-DALLOW_GPL"
-- fi]
-- )
-+ AS_HELP_STRING([--enable-gpl], [build with some GPL code (default=no)]),
-+ [],
-+ [enable_gpl=no])
-+AS_IF([test "x$enable_gpl" = "xyes"], [
-+ GPL_CFLAGS="-DALLOW_GPL"
-+ ])
-
- dnl Does this Linux have systemd enabled? Otherwise use sysv init.
- AC_ARG_ENABLE([systemd],
diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
deleted file mode 100644
index 7f746df64c5..00000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools systemd
-
-DESCRIPTION="IPMI Management Utilities"
-HOMEPAGE="http://ipmiutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
- virtual/os-headers"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.9.8-flags.patch
- "${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
-)
-
-src_prepare() {
- default
-
- sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
- sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- econf --disable-systemd --enable-sha256
-}
-
-src_compile() {
- # Ulgy workaround. Upstream is misusing the make system here
- # and it doesn't even work.
- # Please check on each bump if this workaround is still required.
- pushd lib/lanplus &>/dev/null || die
- emake
- cp libipmi_lanplus.a .. || die
- popd &>/dev/null || die
-
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
- dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
-
- # Init scripts are only for Fedora
- rm -r "${ED%/}"/etc/init.d || die 'remove initscripts failed'
-}
diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
deleted file mode 100644
index 670520a6b9c..00000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools systemd
-
-DESCRIPTION="IPMI Management Utilities"
-HOMEPAGE="http://ipmiutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
- virtual/os-headers"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.9.8-flags.patch
- "${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
-)
-
-src_prepare() {
- default
-
- sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
- sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- econf --disable-systemd --enable-sha256
-}
-
-src_compile() {
- # Ulgy workaround. Upstream is misusing the make system here
- # and it doesn't even work.
- # Please check on each bump if this workaround is still required.
- pushd lib/lanplus &>/dev/null || die
- emake
- cp libipmi_lanplus.a .. || die
- popd &>/dev/null || die
-
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
- dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
-
- # Init scripts are only for Fedora
- rm -r "${ED%/}"/etc/init.d || die 'remove initscripts failed'
-
- if ! use static-libs ; then
- find "${ED}" -name '*.a' -delete || die
- fi
-}
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild
deleted file mode 100644
index 491bd22b5c9..00000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools systemd
-
-DESCRIPTION="IPMI Management Utilities"
-HOMEPAGE="http://ipmiutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
- virtual/os-headers"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.9.8-flags.patch
- "${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
- "${FILESDIR}"/${PN}-3.1.5-fix-configure.patch
-)
-
-src_prepare() {
- default
-
- sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
- sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
-
- # Don't compress man pages
- sed '/gzip -nf/d' -i doc/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- econf --disable-systemd --enable-sha256 --enable-lanplus
-}
-
-src_compile() {
- # Ulgy workaround. Upstream is misusing the make system here
- # and it doesn't even work.
- # Please check on each bump if this workaround is still required.
- pushd lib/lanplus &>/dev/null || die
- emake
- cp libipmi_lanplus.a .. || die
- popd &>/dev/null || die
-
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
- dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
-
- # Init scripts are only for Fedora
- rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
-
- if ! use static-libs ; then
- find "${ED}" -type f -name '*.a' -delete || die
- fi
-
- keepdir /var/lib/ipmiutil
-}
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
deleted file mode 100644
index 7403e510c6c..00000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.1.7.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 autotools systemd
-
-DESCRIPTION="IPMI Management Utilities"
-HOMEPAGE="http://ipmiutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
- virtual/os-headers"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.7-flags.patch
- "${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
- "${FILESDIR}"/${PN}-3.1.7-fix-configure.patch
-)
-
-src_prepare() {
- default
-
- sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
- sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
-
- # Don't compress man pages
- sed '/gzip -nf/d' -i doc/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-systemd
- --enable-sha256
- --enable-lanplus
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Ulgy workaround. Upstream is misusing the make system here
- # and it doesn't even work.
- # Please check on each bump if this workaround is still required.
- pushd lib/lanplus &>/dev/null || die
- emake
- cp libipmi_lanplus.a .. || die
- popd &>/dev/null || die
-
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
- dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
-
- # Init scripts are only for Fedora
- rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
-
- # --disable-static has no effect
- if ! use static-libs ; then
- find "${ED}" -type f -name '*.a' -delete || die
- fi
-
- keepdir /var/lib/ipmiutil
-}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 5e3eca8bba6..451a9b779cf 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,4 @@
DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600 SHA512 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068
DIST iproute2-5.19.0.tar.xz 892696 BLAKE2B ee287065d7c33c0fa97f0fc130bb3a4a3ad5ac9417ad74ce8489e64ec146ff97749d79bb6563043c8835eab91a51631576441d450693cb50808ad0d37b2ea648 SHA512 eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b
+DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 1cfb9b5a7892dec2b35e0eadbd957083e95fdc5077a1aa193329801ff25f9ed90a1fc4152756547be1fab8fe18d9a399001a4c3a61e951f64946156af6a90bae SHA512 be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a
diff --git a/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild b/sys-apps/iproute2/iproute2-5.19.0-r3.ebuild
index f0a6ca796fa..a201d0f6893 100644
--- a/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-5.19.0-r3.ebuild
@@ -195,6 +195,10 @@ src_install() {
insinto /usr/include
doins include/libnetlink.h
+ # Collides with net-analyzer/ifstat
+ # https://bugs.gentoo.org/868321
+ mv "${ED}"/sbin/ifstat{,-iproute2} || die
+
if use split-usr ; then
# Can remove compatibility symlink in a year: 2023-05-28.
# bug #547264
diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild b/sys-apps/iproute2/iproute2-6.0.0.ebuild
new file mode 100644
index 00000000000..46297152d6c
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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
+ "${FILESDIR}"/${PN}-default-color-auto.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,