summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/abrt/Manifest2
-rw-r--r--app-admin/abrt/abrt-2.15.0.ebuild127
-rw-r--r--app-admin/abrt/abrt-2.15.1.ebuild127
-rw-r--r--app-admin/abrt/files/abrt-2.0.12-r1-conf27
-rw-r--r--app-admin/abrt/files/abrt-2.0.12-r1-init76
-rw-r--r--app-admin/abrt/metadata.xml11
-rw-r--r--app-admin/analog/analog-6.0.13.ebuild2
-rw-r--r--app-admin/ansible-core/Manifest8
-rw-r--r--app-admin/ansible-core/ansible-core-2.12.10.ebuild (renamed from app-admin/ansible-core/ansible-core-2.12.8.ebuild)0
-rw-r--r--app-admin/ansible-core/ansible-core-2.13.5.ebuild (renamed from app-admin/ansible-core/ansible-core-2.13.3.ebuild)0
-rw-r--r--app-admin/ansible-core/ansible-core-2.13.6.ebuild (renamed from app-admin/ansible-core/ansible-core-2.13.4.ebuild)0
-rw-r--r--app-admin/ansible-core/ansible-core-2.14.0-r1.ebuild (renamed from app-admin/ansible-core/ansible-core-2.12.9.ebuild)22
-rw-r--r--app-admin/ansible-core/ansible-core-9999.ebuild2
-rw-r--r--app-admin/ansible-core/metadata.xml2
-rw-r--r--app-admin/ansible-lint/Manifest5
-rw-r--r--app-admin/ansible-lint/ansible-lint-6.8.2.ebuild (renamed from app-admin/ansible-lint/ansible-lint-6.5.2.ebuild)6
-rw-r--r--app-admin/ansible-lint/ansible-lint-6.8.6.ebuild (renamed from app-admin/ansible-lint/ansible-lint-6.7.0.ebuild)21
-rw-r--r--app-admin/ansible-lint/ansible-lint-6.9.0.ebuild78
-rw-r--r--app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch32
-rw-r--r--app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch (renamed from app-admin/ansible-lint/files/ansible-lint-6.6.1_test-module-check.patch)13
-rw-r--r--app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch59
-rw-r--r--app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild3
-rw-r--r--app-admin/ansible/Manifest5
-rw-r--r--app-admin/ansible/ansible-5.9.0.ebuild29
-rw-r--r--app-admin/ansible/ansible-6.5.0.ebuild (renamed from app-admin/ansible/ansible-6.2.0.ebuild)0
-rw-r--r--app-admin/ansible/ansible-6.6.0.ebuild (renamed from app-admin/ansible/ansible-6.3.0.ebuild)0
-rw-r--r--app-admin/ansible/metadata.xml6
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild2
-rw-r--r--app-admin/augeas/Manifest1
-rw-r--r--app-admin/augeas/augeas-1.13.0.ebuild53
-rw-r--r--app-admin/augeas/files/augeas-1.13.0-selinux.patch19
-rw-r--r--app-admin/augeas/metadata.xml21
-rw-r--r--app-admin/awscli/Manifest9
-rw-r--r--app-admin/awscli/awscli-1.25.81.ebuild72
-rw-r--r--app-admin/awscli/awscli-1.27.11.ebuild (renamed from app-admin/awscli/awscli-1.25.82.ebuild)14
-rw-r--r--app-admin/awscli/awscli-1.27.16.ebuild (renamed from app-admin/awscli/awscli-1.25.83.ebuild)14
-rw-r--r--app-admin/awscli/awscli-1.27.18.ebuild (renamed from app-admin/awscli/awscli-1.25.85.ebuild)14
-rw-r--r--app-admin/awscli/awscli-1.27.8.ebuild (renamed from app-admin/awscli/awscli-1.25.75.ebuild)14
-rw-r--r--app-admin/awscli/metadata.xml1
-rw-r--r--app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0-r1.ebuild (renamed from app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild)7
-rw-r--r--app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1-r1.ebuild (renamed from app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1.ebuild)7
-rw-r--r--app-admin/calamares/Manifest1
-rw-r--r--app-admin/calamares/calamares-3.2.32.1-r1.ebuild96
-rw-r--r--app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch83
-rw-r--r--app-admin/clsync/metadata.xml2
-rw-r--r--app-admin/clustershell/Manifest2
-rw-r--r--app-admin/clustershell/clustershell-1.8.3-r1.ebuild44
-rw-r--r--app-admin/clustershell/clustershell-1.8.4.ebuild67
-rw-r--r--app-admin/clustershell/files/clustershell-1.8.4-current-thread.patch95
-rw-r--r--app-admin/clustershell/files/clustershell-1.8.4-setrlimit-division.patch21
-rw-r--r--app-admin/clustershell/files/clustershell-1.8.4-skip-tests.patch63
-rw-r--r--app-admin/conky/Manifest2
-rw-r--r--app-admin/conky/conky-1.13.1.ebuild2
-rw-r--r--app-admin/conky/conky-1.15.0.ebuild (renamed from app-admin/conky/conky-1.12.2.ebuild)83
-rw-r--r--app-admin/conky/metadata.xml1
-rw-r--r--app-admin/consul-template/Manifest1
-rw-r--r--app-admin/consul-template/consul-template-0.29.5.ebuild58
-rw-r--r--app-admin/consul/Manifest7
-rw-r--r--app-admin/consul/consul-1.12.5.ebuild2
-rw-r--r--app-admin/consul/consul-1.12.6.ebuild51
-rw-r--r--app-admin/consul/consul-1.13.3.ebuild (renamed from app-admin/consul/consul-1.13.2.ebuild)4
-rw-r--r--app-admin/consul/consul-1.14.0.ebuild57
-rw-r--r--app-admin/consul/consul-1.14.1.ebuild57
-rw-r--r--app-admin/cpulimit/cpulimit-2.4.ebuild2
-rw-r--r--app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild2
-rw-r--r--app-admin/doas/doas-6.8.2.ebuild2
-rw-r--r--app-admin/eclean-kernel/Manifest2
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild20
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild13
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild6
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-9999.ebuild6
-rw-r--r--app-admin/eclean-kernel/metadata.xml4
-rw-r--r--app-admin/exo/Manifest2
-rw-r--r--app-admin/exo/exo-1.60.0.ebuild (renamed from app-admin/exo/exo-1.59.2.ebuild)0
-rw-r--r--app-admin/github-backup-utils/Manifest1
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild56
-rw-r--r--app-admin/gnome-abrt/Manifest2
-rw-r--r--app-admin/gnome-abrt/gnome-abrt-1.4.1.ebuild57
-rw-r--r--app-admin/gnome-abrt/gnome-abrt-1.4.2.ebuild57
-rw-r--r--app-admin/gnome-abrt/metadata.xml11
-rw-r--r--app-admin/gopass/gopass-1.14.4.ebuild2
-rw-r--r--app-admin/hardinfo/Manifest1
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.6-fix-function-declarations.patch226
-rw-r--r--app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild2
-rw-r--r--app-admin/hardinfo/hardinfo-0.6_alpha_pre20221113.ebuild38
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild2
-rw-r--r--app-admin/hcloud/Manifest1
-rw-r--r--app-admin/hcloud/hcloud-1.30.4.ebuild34
-rw-r--r--app-admin/hddtemp/metadata.xml7
-rw-r--r--app-admin/helm/Manifest4
-rw-r--r--app-admin/helm/helm-3.10.1.ebuild (renamed from app-admin/helm/helm-3.8.1.ebuild)8
-rw-r--r--app-admin/helm/helm-3.9.4.ebuild2
-rw-r--r--app-admin/keepassxc/Manifest2
-rw-r--r--app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch14
-rw-r--r--app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch13
-rw-r--r--app-admin/keepassxc/keepassxc-2.7.3.ebuild101
-rw-r--r--app-admin/keepassxc/keepassxc-2.7.4.ebuild101
-rw-r--r--app-admin/keepassxc/keepassxc-9999.ebuild5
-rw-r--r--app-admin/keepassxc/metadata.xml2
-rw-r--r--app-admin/lnav/lnav-0.11.0.ebuild2
-rw-r--r--app-admin/logstash-bin/Manifest2
-rw-r--r--app-admin/logstash-bin/logstash-bin-7.17.7.ebuild88
-rw-r--r--app-admin/makepasswd/makepasswd-1.10.ebuild2
-rw-r--r--app-admin/mcelog/Manifest1
-rw-r--r--app-admin/mcelog/mcelog-190.ebuild51
-rw-r--r--app-admin/metalog/metadata.xml1
-rw-r--r--app-admin/openrc-settingsd/metadata.xml18
-rw-r--r--app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch11
-rw-r--r--app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild (renamed from app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild)17
-rw-r--r--app-admin/puppet-agent/Manifest4
-rw-r--r--app-admin/puppet-agent/puppet-agent-7.20.0.ebuild (renamed from app-admin/puppet-agent/puppet-agent-7.18.0.ebuild)0
-rw-r--r--app-admin/puppet/Manifest2
-rw-r--r--app-admin/puppet/puppet-7.20.0.ebuild (renamed from app-admin/puppet/puppet-7.18.0.ebuild)2
-rw-r--r--app-admin/puppetdb/Manifest1
-rw-r--r--app-admin/puppetdb/puppetdb-7.11.0.ebuild90
-rw-r--r--app-admin/puppetserver/Manifest2
-rw-r--r--app-admin/puppetserver/puppetserver-7.9.2.ebuild (renamed from app-admin/puppetserver/puppetserver-7.9.0.ebuild)0
-rw-r--r--app-admin/pwman3/Manifest1
-rw-r--r--app-admin/pwman3/pwman3-0.10.0-r1.ebuild32
-rw-r--r--app-admin/rsyslog/Manifest6
-rw-r--r--app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch29
-rw-r--r--app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch40
-rw-r--r--app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild490
-rw-r--r--app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild2
-rw-r--r--app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild (renamed from app-admin/rsyslog/rsyslog-8.2110.0-r1.ebuild)12
-rw-r--r--app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild2
-rw-r--r--app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild12
-rw-r--r--app-admin/salt/Manifest3
-rw-r--r--app-admin/salt/files/salt-3004.1-jinja-3.patch40
-rw-r--r--app-admin/salt/files/salt-3005.1-importlib-metadata-5.patch37
-rw-r--r--app-admin/salt/files/salt-3005.1-no-entry-points.patch13
-rw-r--r--app-admin/salt/files/salt-3005.1-tests.patch40
-rw-r--r--app-admin/salt/salt-3002.9-r1.ebuild (renamed from app-admin/salt/salt-3002.9.ebuild)24
-rw-r--r--app-admin/salt/salt-3003.4-r1.ebuild205
-rw-r--r--app-admin/salt/salt-3003.5-r2.ebuild (renamed from app-admin/salt/salt-3003.5-r1.ebuild)24
-rw-r--r--app-admin/salt/salt-3004.2-r2.ebuild (renamed from app-admin/salt/salt-3004.2-r1.ebuild)24
-rw-r--r--app-admin/salt/salt-3005-r1.ebuild (renamed from app-admin/salt/salt-3005.ebuild)3
-rw-r--r--app-admin/salt/salt-3005.1.ebuild (renamed from app-admin/salt/salt-3004.1-r4.ebuild)108
-rw-r--r--app-admin/serf/Manifest2
-rw-r--r--app-admin/serf/serf-0.10.1.ebuild55
-rw-r--r--app-admin/stow/metadata.xml11
-rw-r--r--app-admin/sudo/Manifest2
-rw-r--r--app-admin/sudo/sudo-1.9.12_p1.ebuild286
-rw-r--r--app-admin/sudo/sudo-9999.ebuild14
-rw-r--r--app-admin/supervisor/supervisor-4.2.4.ebuild4
-rw-r--r--app-admin/sysklogd/metadata.xml3
-rw-r--r--app-admin/syslog-ng/Manifest1
-rw-r--r--app-admin/syslog-ng/metadata.xml2
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.34.1.ebuild4
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.35.1.ebuild2
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.36.1.ebuild4
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.37.1.ebuild2
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.38.1.ebuild173
-rw-r--r--app-admin/sysstat/Manifest2
-rw-r--r--app-admin/sysstat/sysstat-12.7.1.ebuild (renamed from app-admin/sysstat/sysstat-12.6.0.ebuild)3
-rw-r--r--app-admin/system-config-printer/Manifest1
-rw-r--r--app-admin/system-config-printer/metadata.xml27
-rw-r--r--app-admin/system-config-printer/system-config-printer-1.5.17.ebuild90
-rw-r--r--app-admin/system-config-printer/system-config-printer-1.5.18.ebuild4
-rw-r--r--app-admin/systemdgenie/Manifest2
-rw-r--r--app-admin/systemdgenie/systemdgenie-0.99.0_p20221120.ebuild (renamed from app-admin/systemdgenie/systemdgenie-0.99.0.ebuild)19
-rw-r--r--app-admin/terraform/terraform-1.2.7.ebuild2
-rw-r--r--app-admin/tmpreaper/Manifest2
-rw-r--r--app-admin/tmpreaper/tmpreaper-1.6.17.ebuild (renamed from app-admin/tmpreaper/tmpreaper-1.6.16.ebuild)2
-rw-r--r--app-admin/ulogd/Manifest1
-rw-r--r--app-admin/ulogd/ulogd-2.0.8.ebuild142
-rw-r--r--app-admin/usbview/usbview-3.0.ebuild4
-rw-r--r--app-admin/vault/Manifest12
-rw-r--r--app-admin/vault/vault-1.10.7.ebuild2
-rw-r--r--app-admin/vault/vault-1.10.8.ebuild (renamed from app-admin/vault/vault-1.10.6.ebuild)0
-rw-r--r--app-admin/vault/vault-1.11.5.ebuild (renamed from app-admin/vault/vault-1.11.3.ebuild)0
-rw-r--r--app-admin/vault/vault-1.12.0.ebuild86
-rw-r--r--app-admin/vault/vault-1.12.1.ebuild86
-rw-r--r--app-admin/whowatch/files/whowatch-1.8.4-configure-clang16.patch24
-rw-r--r--app-admin/whowatch/metadata.xml3
-rw-r--r--app-admin/whowatch/whowatch-1.8.6-r2.ebuild (renamed from app-admin/whowatch/whowatch-1.8.6-r1.ebuild)1
-rw-r--r--app-admin/xtail/xtail-2.1-r1.ebuild37
-rw-r--r--app-admin/xtail/xtail-2.1_p8.ebuild2
178 files changed, 2777 insertions, 2301 deletions
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
deleted file mode 100644
index ad62600d11c..00000000000
--- a/app-admin/abrt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST abrt-2.15.0.tar.gz 6122114 BLAKE2B ac075a15d4621596bbe3009bf2e4725040139d78077f85bd4daebbe86504f9aa0a12dcedcf3b5b65404bc2851e93e6b1113dcc37923832c826d572ab9810ef94 SHA512 2d6c1287c1f01990aeb30f956f465c7a6399a6e53dc667602e263c136f94bc4090b58876acba678b29671c0db89ae8e7dd6994cf8d0d2d9fbc375f54ae6cd935
-DIST abrt-2.15.1.tar.gz 6122174 BLAKE2B e3b767929cc2303dcf90a935e0c9ba30641638666925d4707fb0dbed135d8635cd0a58c712f2965969218c64856a5fa3bd20a79410c0e6a5f176a7e82059dda0 SHA512 745c513969b78ee7c76c310a8c2fc0bafd1e50375130fa773ad950bf123ee50cfa237da9b331f2c0af2851b35b162cbc908f2e00d59283867ed8ffd72236d0ea
diff --git a/app-admin/abrt/abrt-2.15.0.ebuild b/app-admin/abrt/abrt-2.15.0.ebuild
deleted file mode 100644
index 6a77875e260..00000000000
--- a/app-admin/abrt/abrt-2.15.0.ebuild
+++ /dev/null
@@ -1,127 +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 autotools python-single-r1 tmpfiles xdg
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project https://github.com/abrt/abrt"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="selinux test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.56:2
- >=dev-libs/libreport-2.13.0:=[gtk,python]
- dev-libs/libxml2:2
- >=gnome-base/gsettings-desktop-schemas-3.15.1
- net-libs/libsoup:2.4
- sys-apps/dbus
- sys-apps/systemd:0=
- sys-auth/polkit
- sys-libs/libcap
- sys-fs/inotify-tools
- x11-libs/gtk+:3
- x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
- acct-user/abrt
- acct-group/abrt
- app-arch/cpio
- app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
- dev-libs/elfutils
- dev-libs/json-c:0=
- sys-apps/util-linux
- >=sys-devel/gdb-7
- $(python_gen_cond_dep '
- dev-libs/satyr[${PYTHON_USEDEP}]
- dev-python/argcomplete[${PYTHON_USEDEP}]
- dev-python/argh[${PYTHON_USEDEP}]
- dev-python/humanize[${PYTHON_USEDEP}]
- ')
-"
-BDEPEND="
- $(python_gen_cond_dep 'dev-python/python-systemd[${PYTHON_USEDEP}]')
- test? (
- $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
- )
- app-text/asciidoc
- app-text/xmlto
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- >=sys-devel/gettext-0.17
-"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- python_fix_shebang .
- default
-
- # Install under proper directory
- sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
-
- # Ensure this works for systems with and without /usr merge
- sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die
-
- # Fix hardcoded "pytest-3"
- sed -i -e "s:pytest-3:pytest:" \
- configure.ac src/python-problem/tests/Makefile.am src/cli/test || die
-
- # pyhook test is sensitive to the format of python's error messages, and
- # fails with certain python versions
- sed -e '/pyhook.at/ d' \
- -i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
- ./gen-version || die # Needed to be run before autoreconf
- eautoreconf
-}
-
-src_configure() {
- myeconfargs=(
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-bodhi
- # package breaks due to not finding libreport-web with bodhi plugin enabled
- --without-rpm
- $(usex selinux "" "--without-selinux")
- --with-python3
- --without-pythondoc
- # package breaks due to no sphinx-build-3
- $(use_with test pythontests)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- python_optimize
-
- # /var/spool/abrt is created by dev-libs/libreport
- diropts -m 700 -o abrt -g abrt
- keepdir /var/spool/abrt-upload
-
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
- newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-
- # Drop empy dirs, handled by tmpfiles
- rm -r "${ED}"/var/run/ || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- tmpfiles_process abrt.conf
-}
diff --git a/app-admin/abrt/abrt-2.15.1.ebuild b/app-admin/abrt/abrt-2.15.1.ebuild
deleted file mode 100644
index 6a77875e260..00000000000
--- a/app-admin/abrt/abrt-2.15.1.ebuild
+++ /dev/null
@@ -1,127 +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 autotools python-single-r1 tmpfiles xdg
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project https://github.com/abrt/abrt"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="selinux test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.56:2
- >=dev-libs/libreport-2.13.0:=[gtk,python]
- dev-libs/libxml2:2
- >=gnome-base/gsettings-desktop-schemas-3.15.1
- net-libs/libsoup:2.4
- sys-apps/dbus
- sys-apps/systemd:0=
- sys-auth/polkit
- sys-libs/libcap
- sys-fs/inotify-tools
- x11-libs/gtk+:3
- x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
- acct-user/abrt
- acct-group/abrt
- app-arch/cpio
- app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
- dev-libs/elfutils
- dev-libs/json-c:0=
- sys-apps/util-linux
- >=sys-devel/gdb-7
- $(python_gen_cond_dep '
- dev-libs/satyr[${PYTHON_USEDEP}]
- dev-python/argcomplete[${PYTHON_USEDEP}]
- dev-python/argh[${PYTHON_USEDEP}]
- dev-python/humanize[${PYTHON_USEDEP}]
- ')
-"
-BDEPEND="
- $(python_gen_cond_dep 'dev-python/python-systemd[${PYTHON_USEDEP}]')
- test? (
- $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
- )
- app-text/asciidoc
- app-text/xmlto
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- >=sys-devel/gettext-0.17
-"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- python_fix_shebang .
- default
-
- # Install under proper directory
- sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
-
- # Ensure this works for systems with and without /usr merge
- sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die
-
- # Fix hardcoded "pytest-3"
- sed -i -e "s:pytest-3:pytest:" \
- configure.ac src/python-problem/tests/Makefile.am src/cli/test || die
-
- # pyhook test is sensitive to the format of python's error messages, and
- # fails with certain python versions
- sed -e '/pyhook.at/ d' \
- -i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
- ./gen-version || die # Needed to be run before autoreconf
- eautoreconf
-}
-
-src_configure() {
- myeconfargs=(
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-bodhi
- # package breaks due to not finding libreport-web with bodhi plugin enabled
- --without-rpm
- $(usex selinux "" "--without-selinux")
- --with-python3
- --without-pythondoc
- # package breaks due to no sphinx-build-3
- $(use_with test pythontests)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- python_optimize
-
- # /var/spool/abrt is created by dev-libs/libreport
- diropts -m 700 -o abrt -g abrt
- keepdir /var/spool/abrt-upload
-
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
- newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-
- # Drop empy dirs, handled by tmpfiles
- rm -r "${ED}"/var/run/ || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- tmpfiles_process abrt.conf
-}
diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-conf b/app-admin/abrt/files/abrt-2.0.12-r1-conf
deleted file mode 100644
index 073eb0daf82..00000000000
--- a/app-admin/abrt/files/abrt-2.0.12-r1-conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# abrtd command-line options
-# Default: ""
-ABRTD_OPTS=""
-
-# Run abrt-harvest-vmcore to make new kdump dumps available for abrtd
-START_VMCORE="yes"
-
-# Install abrt-ccpp hook to watch for segfaults
-START_CCPP="yes"
-
-# Call abrt-dump-oops to log kernel oops
-START_OOPS="yes"
-# log file to watch for kernel oops
-# Default: "/var/log/messages"
-OOPS_WATCH_LOG="/var/log/messages"
-# abrt-dump-oops command-line options
-# Default: "-xD"
-OOPS_DUMP_OPTS="-xD"
-
-# Call abrt-dump-xorg to log X crashes
-START_XORG="yes"
-# log file to watch for X crashes
-# Default: "/var/log/Xorg.0.log"
-XORG_WATCH_LOG="/var/log/Xorg.0.log"
-# abrt-dump-xorg command-line options
-# Default: "-xD"
-XORG_DUMP_OPTS="-xD"
diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-init b/app-admin/abrt/files/abrt-2.0.12-r1-init
deleted file mode 100644
index 3fb32b7c3e4..00000000000
--- a/app-admin/abrt/files/abrt-2.0.12-r1-init
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Automated crash detection service"
-
-depend() {
- need dbus logger
-}
-
-start() {
- ebegin "Starting abrtd"
- start-stop-daemon --start --quiet --pidfile /var/run/abrt/abrtd.pid \
- --exec /usr/sbin/abrtd -- ${ABRTD_OPTS}
- eend $?
-
- if [ "${START_VMCORE}" = "yes" ]; then
- ebegin "Running abrt-harvest-vmcore"
- /usr/sbin/abrt-harvest-vmcore
- eend $?
- fi
-
- if [ "${START_CCPP}" = "yes" ]; then
- ebegin "Installing abrt-ccpp hook"
- /usr/sbin/abrt-install-ccpp-hook install
- eend $?
- fi
-
- if [ "${START_OOPS}" = "yes" ]; then
- ebegin "Starting abrt-dump-oops"
- start-stop-daemon --start --quiet \
- --pidfile /var/run/abrt/abrt-dump-oops.pid \
- --make-pidfile --background \
- --exec /usr/bin/abrt-watch-log -- \
- -F "`/usr/bin/abrt-dump-oops -m`" ${OOPS_WATCH_LOG} -- \
- /usr/bin/abrt-dump-oops ${OOPS_DUMP_OPTS}
- eend $?
- fi
-
- if [ "${START_XORG}" = "yes" ]; then
- ebegin "Starting abrt-dump-xorg"
- start-stop-daemon --start --quiet \
- --pidfile /var/run/abrt/abrt-dump-xorg.pid \
- --make-pidfile --background \
- --exec /usr/bin/abrt-watch-log -- \
- -F "`/usr/bin/abrt-dump-xorg -m`" ${XORG_WATCH_LOG} -- \
- /usr/bin/abrt-dump-xorg ${XORG_DUMP_OPTS}
- eend $?
- fi
-}
-
-stop() {
- if [ "${START_XORG}" = "yes" ]; then
- ebegin "Stopping abrt-dump-xorg"
- start-stop-daemon --stop --quiet \
- --pidfile /var/run/abrt/abrt-dump-xorg.pid
- eend $?
- fi
-
- if [ "${START_OOPS}" = "yes" ]; then
- ebegin "Stopping abrt-dump-oops"
- start-stop-daemon --stop --quiet \
- --pidfile /var/run/abrt/abrt-dump-oops.pid
- eend $?
- fi
-
- if [ "${START_CCPP}" = "yes" ]; then
- ebegin "Uninstalling abrt-ccpp hook"
- /usr/sbin/abrt-install-ccpp-hook uninstall
- eend $?
- fi
-
- ebegin "Stopping abrtd"
- start-stop-daemon --stop --quiet --pidfile /var/run/abrt/abrtd.pid
- eend $?
-}
diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml
deleted file mode 100644
index fec035a2a9f..00000000000
--- a/app-admin/abrt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>pacho@gentoo.org</email>
- <name>Pacho Ramos</name>
- </maintainer>
- <upstream>
- <remote-id type="github">abrt/abrt</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-admin/analog/analog-6.0.13.ebuild b/app-admin/analog/analog-6.0.13.ebuild
index 55d754de895..feec9dbc5b4 100644
--- a/app-admin/analog/analog-6.0.13.ebuild
+++ b/app-admin/analog/analog-6.0.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.c-amie.co.uk/static/analog/${PV//.}/${MY_P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~riscv sparc x86"
DEPEND="
app-arch/unzip
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index cbb00999615..222adbb1bf0 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,5 +1,5 @@
DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
-DIST ansible-core-2.12.8.tar.gz 7760983 BLAKE2B 9050033ca76f7f3bb6d5043d58e7a4b2473ee1eb21b5665654e5a571e8ebe408897661ad0f13c4f4b0d1569c1df904434cc4911e1b561b229d8ab16109127930 SHA512 1bb30dba44f11b0655000350b54cae30b85258dccc130d5cd2b1a5c70e0ebe93abd8fe41d5830da34b6fe622276f69f18a0f47bf9d0b0269338a7efbd5820e44
-DIST ansible-core-2.12.9.tar.gz 7758384 BLAKE2B ed32d1ae9b82e96fe9a2ba2175e2a90961d3a6bb20baecd405e6c0bd1384ac61b9a1f1a1b7bd9f290d89d89c4451129f9049dd9c1dd7897a6d96f1730de4e423 SHA512 da88489c81293e8361067a17891f9330582b3d21c88584e3268f84511811364ce93c4e1b88b3796faea11274c76c64aa8af74608fce9a074fcc8fc3760d2b90b
-DIST ansible-core-2.13.3.tar.gz 13924100 BLAKE2B aabb87a327f2cd4b3a8f8a30d00b09d50ddf05bbd8720e446275004ba98e87bc1de513dfaedf9ee617c77235c92f171b590295ca8a92d03f47829eacf39e7cb8 SHA512 9be80d0dcd10d012c871b5c95b2357430dfa6809bff794158a4ae06a40761c01db60a966115d7a9141028c96d79a1d99d6bfb191788dc1c467dd0107dba7058c
-DIST ansible-core-2.13.4.tar.gz 13929408 BLAKE2B 17e27afebf9ce47d49fe9d171549cc46eca13604474545feb1c6e30432334d38a50e76a2fed71e978ebf44dad925ea66d63142599e07f78cbae8a2d25e923d02 SHA512 62678ad80b2073552070f154c55707c1b89bcb9d2d56235d76bb4701344e387d250590a931340cb676a605677cf69ab56b1b15b30d75859de4b294662dc50ee0
+DIST ansible-core-2.12.10.tar.gz 7762154 BLAKE2B deffcc42c124a40ce34ce9a26a0c400b1199018cb05478ea8860500e1a507f9f604c1f40f0d006682fc14ad8f0cc3d035b8ffb1307ee37d26191be3c68e33253 SHA512 8b4eb0e923f976680e81ffbe942c4ddc7ddaaaffe83d14c20f78f7c6ab4f548f21920cdfa57b48de2bc24683028e744a92ac4ca45fecc459ea2b042de8c40737
+DIST ansible-core-2.13.5.tar.gz 13934317 BLAKE2B 27ac2040f3626d645e57fab4df9b1b6a349fb81bec4cc8bb87b4dd16351f43d71a6210e32e2906346500742be2bf94512a1b05ba95b7ac0dfeac89696dfc9760 SHA512 e57dca7d457cfbf8a805442dd274499e3a6e4652303dc9e838b46c7dba9a36f2262e548bf9b6ff66f4e4bed5fa648abf9bb9a881047d4c6c0d6efbc91269eca2
+DIST ansible-core-2.13.6.tar.gz 13938462 BLAKE2B bf7bbeb5d5f7e27a2d72a61223559f79971aeb86d91688907c629388cf4c2578c88694f6ca23b22b6f8fe50cdaa909b34c05e9756258a062156a1e5d2bcea3b4 SHA512 2a91916e94bf65f76c450e548c6464660ef0e1a62e17f889785cb94c735c2bf153a2d8eff7a0dac90836a523f5768453bf18c4bdf3cbee0f8916d6cd0b11a902
+DIST ansible-core-2.14.0.tar.gz 13988948 BLAKE2B 7b68d72c292d8f3e8fb2d0d66fce0eca1de1b74ec1dc3ecaa2c4b37177d693567272260b3e98c9d81f7ff5e5cc4972dfa1f24c9f5e0119bb1da528388081d5fb SHA512 09e5b45608f7e1f341100dd89a6277a71a5ff0a45244cd6862a10d0f35a993c3cf649a5f9936ac726f7e903269f98a975804418516e602b8dd983bfca23c66cb
diff --git a/app-admin/ansible-core/ansible-core-2.12.8.ebuild b/app-admin/ansible-core/ansible-core-2.12.10.ebuild
index aebbfcec8b5..aebbfcec8b5 100644
--- a/app-admin/ansible-core/ansible-core-2.12.8.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.12.10.ebuild
diff --git a/app-admin/ansible-core/ansible-core-2.13.3.ebuild b/app-admin/ansible-core/ansible-core-2.13.5.ebuild
index dc98f352bb3..dc98f352bb3 100644
--- a/app-admin/ansible-core/ansible-core-2.13.3.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.5.ebuild
diff --git a/app-admin/ansible-core/ansible-core-2.13.4.ebuild b/app-admin/ansible-core/ansible-core-2.13.6.ebuild
index 3655837bc68..3655837bc68 100644
--- a/app-admin/ansible-core/ansible-core-2.13.4.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.6.ebuild
diff --git a/app-admin/ansible-core/ansible-core-2.12.9.ebuild b/app-admin/ansible-core/ansible-core-2.14.0-r1.ebuild
index 10e608c937a..619c37647ef 100644
--- a/app-admin/ansible-core/ansible-core-2.12.9.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.14.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_USE_SETUPTOOLS=bdepend
inherit distutils-r1
@@ -22,7 +22,6 @@ fi
LICENSE="GPL-3"
SLOT="0"
-IUSE="test"
RESTRICT="test"
RDEPEND="
@@ -35,27 +34,20 @@ RDEPEND="
dev-python/netaddr[${PYTHON_USEDEP}]
dev-python/pexpect[${PYTHON_USEDEP}]
>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
- <dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
+ <dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
net-misc/sshpass
virtual/ssh
"
-DEPEND="
+BDEPEND="
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
test? (
- ${RDEPEND}
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-vcs/git
+ dev-python/botocore[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
)"
+distutils_enable_tests pytest
+
python_compile() {
export ANSIBLE_SKIP_CONFLICT_CHECK=1
distutils-r1_python_compile
}
-
-python_test() {
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
diff --git a/app-admin/ansible-core/ansible-core-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild
index 10e608c937a..928f307ff69 100644
--- a/app-admin/ansible-core/ansible-core-9999.ebuild
+++ b/app-admin/ansible-core/ansible-core-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_USE_SETUPTOOLS=bdepend
inherit distutils-r1
diff --git a/app-admin/ansible-core/metadata.xml b/app-admin/ansible-core/metadata.xml
index 92fba021250..86dea112ad4 100644
--- a/app-admin/ansible-core/metadata.xml
+++ b/app-admin/ansible-core/metadata.xml
@@ -23,5 +23,5 @@ some documentation, and a tiny subset of modules and plugins to allow for a
functioning controller. All other modules, including most of those
bundled with in Ansible 2.9 and older, must be installed separately,
e.g. from collections.
-</longdescription>
+ </longdescription>
</pkgmetadata>
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index f9eaa3509ef..dbdcdc75dae 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,2 +1,3 @@
-DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5
-DIST ansible-lint-6.7.0.gh.tar.gz 275573 BLAKE2B 56788efbd44f6c2d8f1dd946d26f4c784c5c9e077355823d143a7b95196a3b5ce672a987639da6f051832320585fe7106d92c293a0707c9886142eebdaa812f5 SHA512 39d5292c5d262a6ee6fe60b41d531d362c95b466fe28524d314c0f2554e50906db050df93c7dc6374b99e6ef283754844e08484d24570bbbaf637d08e0af4ae2
+DIST ansible-lint-6.8.2.gh.tar.gz 288616 BLAKE2B 4ae9c344d834a3d69a05689df296c7915e6eb7cb2a85b773f3adcc4efd898c3e1c9f32d8b1efda31afb7a5466d1966aa754cd5529c7dcfd6c1f45517d39e1750 SHA512 101be050772f6df827a697faa5ff9650c98959d9bd6e7a025a19c0ac94faa6b06e114b9122ae8f09f650be565b226189f4706ef8dd0f27548774664adccf3d18
+DIST ansible-lint-6.8.6.gh.tar.gz 293630 BLAKE2B aa43acb9cca21d3cdafebddb18d82781ab708d5696edc51567a8c56cc3eacb3bd96d08f97436eab54e69866f55fa6fc6537eb62e44e4d26eb3ee46ee13e7322d SHA512 0beb16ecff432444a25d3efa70f67eb55437faed593dfbb4bcaf080b06558403e711218f5a021268a2450ceeab1127d8dc8de027d1e4889350f20ca3d9ed9dca
+DIST ansible-lint-6.9.0.gh.tar.gz 297551 BLAKE2B ed616155ba169a61092bac247da2c232541f1a131f8cb275744a33a8076de7d97542dc394d29a17430085b5571f578fe1657f29239a18d8afe38a0f544fdb12f SHA512 e3d708e19af0d5578516bfcc9a755a968a412593e775cdbc4817c057dbc5659f4a54e63d7757036f4783353d022302a24842f934d431ff5225702f752614599f
diff --git a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
index 71e510a4133..fb27321a99b 100644
--- a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
RDEPEND="
>=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
@@ -40,10 +40,11 @@ BDEPEND="
)"
PATCHES=(
- "${FILESDIR}"/${PN}-6.5.2_test-module-check.patch
+ "${FILESDIR}"/${PN}-6.8.1_test-module-check.patch
)
# Skip problematic tests:
+# - test_rules_id_format has been giving an internal error since 6.5.4 or so (TODO: follow this up with upstream)
# - test_call_from_outside_venv doesn't play nicely with the sandbox
# - all the others require Internet access, mostly in order to access Ansible Galaxy
EPYTEST_DESELECT=(
@@ -61,6 +62,7 @@ EPYTEST_DESELECT=(
test/test_prerun.py::test_require_collection_wrong_version
test/test_profiles.py::test_profile_listing
test/test_rules_collection.py::test_rich_rule_listing
+ test/test_rules_collection.py::test_rules_id_format
test/test_skip_inside_yaml.py::test_role_meta
test/test_utils.py::test_cli_auto_detect
test/test_utils.py::test_template_lookup
diff --git a/app-admin/ansible-lint/ansible-lint-6.7.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild
index a483735e3a3..df6b0f93eeb 100644
--- a/app-admin/ansible-lint/ansible-lint-6.7.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild
@@ -3,14 +3,13 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
HOMEPAGE="https://github.com/ansible/ansible-lint"
-# PyPI tarballs do not contain all the data files needed by the tests
SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="MIT"
@@ -19,9 +18,8 @@ KEYWORDS="~amd64 ~riscv"
RDEPEND="
>=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
- >=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}]
- dev-python/black[${PYTHON_USEDEP}]
- >=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
+ >=dev-python/ansible-compat-2.2.4[${PYTHON_USEDEP}]
+ >=dev-python/black-22.1.0[${PYTHON_USEDEP}]
dev-python/filelock[${PYTHON_USEDEP}]
>=dev-python/jsonschema-4.9.0[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
@@ -35,20 +33,25 @@ BDEPEND="
>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
test? (
>=dev-python/flaky-3.7.0[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
)"
PATCHES=(
- "${FILESDIR}"/${PN}-6.6.1_test-module-check.patch
+ "${FILESDIR}"/${PN}-6.8.6_test-module-check.patch
)
# Skip problematic tests:
+# - test_rules_id_format has been giving an internal error since 6.5.4 or so (TODO: follow this up with upstream)
+# - similar problem with test_example_custom_module and 6.8.6
# - test_call_from_outside_venv doesn't play nicely with the sandbox
# - all the others require Internet access, mostly in order to access Ansible Galaxy
EPYTEST_DESELECT=(
+ test/test_ansiblesyntax.py::test_null_tasks
test/test_cli_role_paths.py::test_run_playbook_github
test/test_eco.py
+ test/test_examples.py::test_example_custom_module
test/test_examples.py::test_custom_kinds
test/test_import_playbook.py::test_task_hook_import_playbook
test/test_list_rules.py::test_list_rules_includes_opt_in_rules
@@ -61,6 +64,7 @@ EPYTEST_DESELECT=(
test/test_prerun.py::test_require_collection_wrong_version
test/test_profiles.py::test_profile_listing
test/test_rules_collection.py::test_rich_rule_listing
+ test/test_rules_collection.py::test_rules_id_format
test/test_skip_inside_yaml.py::test_role_meta
test/test_utils.py::test_cli_auto_detect
test/test_utils.py::test_template_lookup
@@ -69,10 +73,7 @@ EPYTEST_DESELECT=(
distutils_enable_tests pytest
+# Test suite fails to start without this. Bug in the eclass, maybe?
python_test() {
- # Since 6.2.1, without this the test suite still gets confused by the presence of ansible-lint modules
- # in both ${ED} and ${S}.
- cd "${S}" || die
-
epytest test
}
diff --git a/app-admin/ansible-lint/ansible-lint-6.9.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.9.0.ebuild
new file mode 100644
index 00000000000..f2381dac1ab
--- /dev/null
+++ b/app-admin/ansible-lint/ansible-lint-6.9.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
+HOMEPAGE="https://github.com/ansible/ansible-lint"
+SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+ >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
+ >=dev-python/ansible-compat-2.2.5[${PYTHON_USEDEP}]
+ >=dev-python/black-22.8.0[${PYTHON_USEDEP}]
+ >=dev-python/filelock-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-4.17.0[${PYTHON_USEDEP}]
+ >=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
+ >=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ruamel-yaml-0.17.21[${PYTHON_USEDEP}]
+ >=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}]
+ >=dev-util/yamllint-1.26.3[${PYTHON_USEDEP}]"
+BDEPEND="
+ >=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/flaky-3.7.0[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
+ >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.8.6_test-module-check.patch
+)
+
+# Skip problematic tests:
+# - test_rules_id_format has been giving an internal error since 6.5.4 or so (TODO: follow this up with upstream)
+# - test_call_from_outside_venv doesn't play nicely with the sandbox
+# - all the others require Internet access, mostly in order to access Ansible Galaxy
+EPYTEST_DESELECT=(
+ test/test_ansiblesyntax.py::test_null_tasks
+ test/test_cli_role_paths.py::test_run_playbook_github
+ test/test_eco.py
+ test/test_examples.py::test_custom_kinds
+ test/test_examples.py::test_example
+ test/test_import_playbook.py::test_task_hook_import_playbook
+ test/test_list_rules.py::test_list_rules_includes_opt_in_rules
+ test/test_list_rules.py::test_list_rules_with_format_option
+ test/test_list_rules.py::test_list_tags_includes_opt_in_rules
+ test/test_main.py::test_call_from_outside_venv
+ test/test_prerun.py::test_install_collection
+ test/test_prerun.py::test_prerun_reqs_v1
+ test/test_prerun.py::test_prerun_reqs_v2
+ test/test_prerun.py::test_require_collection_wrong_version
+ test/test_profiles.py::test_profile_listing
+ test/test_rules_collection.py::test_rich_rule_listing
+ test/test_rules_collection.py::test_rules_id_format
+ test/test_skip_inside_yaml.py::test_role_meta
+ test/test_utils.py::test_cli_auto_detect
+ test/test_utils.py::test_template_lookup
+ test/test_verbosity.py::test_default_verbosity
+)
+
+distutils_enable_tests pytest
+
+# Test suite fails to start without this. Bug in the eclass, maybe?
+python_test() {
+ epytest test
+}
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch
deleted file mode 100644
index 8e6cb512b63..00000000000
--- a/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Let the package managers handle dependencies, m'kay?
-
---- a/conftest.py
-+++ b/conftest.py
-@@ -7,27 +7,6 @@
- import pytest
- from ansible.module_utils.common.yaml import HAS_LIBYAML
-
--# checking if user is running pytest without installing test dependencies:
--missing = []
--for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]:
-- if not importlib.util.find_spec(module):
-- missing.append(module)
--if missing:
-- print(
-- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
-- file=sys.stderr,
-- )
-- sys.exit(1)
--
--if not HAS_LIBYAML:
-- # While presence of libyaml is not required for runtime, we keep this error
-- # fatal here in order to be sure that we spot libyaml errors during testing.
-- print(
-- "FATAL: For testing, we require pyyaml to be installed with its native extension, missing it would make testing 3x slower and risk missing essential bugs.",
-- file=sys.stderr,
-- )
-- sys.exit(1)
--
-
- os.environ["NO_COLOR"] = "1"
-
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.6.1_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch
index 0f6e9aadde9..8c2ca1a9650 100644
--- a/app-admin/ansible-lint/files/ansible-lint-6.6.1_test-module-check.patch
+++ b/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch
@@ -1,6 +1,6 @@
--- a/conftest.py
+++ b/conftest.py
-@@ -7,29 +7,6 @@
+@@ -8,40 +8,6 @@
import pytest
from ansible.module_utils.common.yaml import HAS_LIBYAML
@@ -15,6 +15,17 @@
- file=sys.stderr,
- )
- sys.exit(1)
+-# we need to be sure that we have the requirements installed as some tests
+-# might depend on these.
+-try:
+- subprocess.check_output(
+- ["ansible-galaxy", "collection", "install", "-r", "requirements.yml"],
+- stderr=subprocess.PIPE,
+- text=True,
+- )
+-except subprocess.CalledProcessError as exc:
+- print(f"{exc}\n{exc.stderr}\n{exc.stdout}", file=sys.stderr)
+- sys.exit(1)
-
-if not HAS_LIBYAML and sys.version_info >= (3, 9, 0):
- # While presence of libyaml is not required for runtime, we keep this error
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch
new file mode 100644
index 00000000000..5302a54cc32
--- /dev/null
+++ b/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch
@@ -0,0 +1,59 @@
+--- a/conftest.py
++++ b/conftest.py
+@@ -7,56 +7,6 @@
+
+ import pytest
+
+-# checking if user is running pytest without installing test dependencies:
+-missing = []
+-for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]:
+- if not importlib.util.find_spec(module):
+- missing.append(module)
+-if missing:
+- print(
+- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
+- file=sys.stderr,
+- )
+- sys.exit(1)
+-# we need to be sure that we have the requirements installed as some tests
+-# might depend on these.
+-try:
+- from ansible_compat.prerun import get_cache_dir
+-
+- cache_dir = get_cache_dir(".")
+- subprocess.check_output(
+- [
+- "ansible-galaxy",
+- "collection",
+- "install",
+- "-p",
+- f"{cache_dir}/collections",
+- "-r",
+- "requirements.yml",
+- ],
+- stderr=subprocess.PIPE,
+- text=True,
+- )
+-except subprocess.CalledProcessError as exc:
+- print(f"{exc}\n{exc.stderr}\n{exc.stdout}", file=sys.stderr)
+- sys.exit(1)
+-
+-# flake8: noqa: E402
+-from ansible.module_utils.common.yaml import ( # pylint: disable=wrong-import-position
+- HAS_LIBYAML,
+-)
+-
+-if not HAS_LIBYAML and sys.version_info >= (3, 9, 0):
+- # While presence of libyaml is not required for runtime, we keep this error
+- # fatal here in order to be sure that we spot libyaml errors during testing.
+- #
+- # For 3.8.x we do not do this check, as libyaml does not have an arm64 build for py38.
+- print(
+- "FATAL: For testing, we require pyyaml to be installed with its native extension, missing it would make testing 3x slower and risk missing essential bugs.",
+- file=sys.stderr,
+- )
+- sys.exit(1)
+-
+
+ os.environ["NO_COLOR"] = "1"
+
diff --git a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
index 3e827f95a34..0da494a9e37 100644
--- a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
IUSE="selinux"
RDEPEND="$(python_gen_cond_dep '
@@ -48,7 +48,6 @@ BDEPEND="$(python_gen_cond_dep '
>=dev-python/ansi2html-1.6.0[${PYTHON_USEDEP}]
dev-python/filelock[${PYTHON_USEDEP}]
<dev-python/pexpect-5[${PYTHON_USEDEP}]
- >=dev-python/pytest-html-3.0.0[${PYTHON_USEDEP}]
>=dev-python/pytest-mock-3.3.1[${PYTHON_USEDEP}]
>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
>=dev-python/pytest-testinfra-6.1.0[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 2c806efb7ed..45fe5659eac 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1,4 @@
DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd15cf7a97978835b29cb8b87b671fa888163e28e825d1fc98006c57313677afed63236f4a55af415a70daf5fe305f SHA512 d81b34642533dfaf0c3dba5ecc8ba483efb3d82bd40afa469de2778666e932bec3c20e61ae579184fcbd7f1ec7c8d694617f334ebb3e910db3c9f6709d3b9385
-DIST ansible-5.9.0.tar.gz 36756162 BLAKE2B 4c713f0a45536aadbd20451c5b5ac37b474cb1d1f9fbfa6031b228a549bfd65e1ae0ee76d6fcd08a0de43d7d07eaebf90d08d00764acad438bcffcdb09c5d58b SHA512 88b26b1ba59a39370ee4a27eedda441d6e6ce8ba8eb857353572c692e49b189e95ed80e5063917c52799fb15bc3608d4c1ada013a7d650909714ca8ea5dd3bbb
-DIST ansible-6.2.0.tar.gz 35390078 BLAKE2B 1e7a5f69e837fe3ec383ee3f1d631ad7ecbd502e582752edef85b3e2841b38ba78af1e7f080b4da007283291d487e481141bc4261b351f48be45874a3399789f SHA512 7e0751fdedef6bd92a01c06e23dd482bb4b4795ef5a17754eea8f8297cebddb84b4d20041affec6589297214cd820cddaea4618d2f3a158daebb556c4a87bdb0
-DIST ansible-6.3.0.tar.gz 35480527 BLAKE2B ddc064f6dc4b1fe820f375d150cc5f50875de4bf721eb31e88d0c279e91e96a6fd4d7981e0110f4fc7d424eeb4c44637c611442b4586d756106c437e240f3118 SHA512 3832159065d6400caade84de1ff5f31d64d7b5d9c3a61ae9bb2ad207e410166dac3537c68d0ec3df7c4b8aec61ee48cc4b690e3117a987efa9306c6cbee534e0
+DIST ansible-6.5.0.tar.gz 38275680 BLAKE2B 5d17ba2b8b3a0ccb1ea9873c0d500ca7984d2d3db19d062807004da5c001ee44d33cd6707226887bef8f6bae0ea9584f8c2c63a8cb176a2244b3b2ad92e13454 SHA512 ddb77304c6a9617186fa0252a0da91632ffc21f910e02fc68e340ed37de0806586a2543700e996db7fb0bb9240a2ee20b7a462f005de200028748b38fbb2e293
+DIST ansible-6.6.0.tar.gz 35620748 BLAKE2B 1e36ff72669902629cf1f373e9816b9d0a3136cb205867a24d67efc27b0ca3f2d361f3017fb1543c46da8693bb165ee6b354388611ab3e3186098513bd49f41d SHA512 51d06386dfb14ef826562dd4991556805d3e6014173965f0541e97b905984208a95889392dd3bb22027060ac767a354d53dfb9de774d5b461b15b236395d6fd1
diff --git a/app-admin/ansible/ansible-5.9.0.ebuild b/app-admin/ansible/ansible-5.9.0.ebuild
deleted file mode 100644
index 187c0ab3ccc..00000000000
--- a/app-admin/ansible/ansible-5.9.0.ebuild
+++ /dev/null
@@ -1,29 +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 distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-core-2.12.0
- <app-admin/ansible-core-2.13"
-
-python_compile() {
- local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
- distutils-r1_python_compile
-}
-python_install() {
- local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
- distutils-r1_python_install
-}
diff --git a/app-admin/ansible/ansible-6.2.0.ebuild b/app-admin/ansible/ansible-6.5.0.ebuild
index 9a54e321f41..9a54e321f41 100644
--- a/app-admin/ansible/ansible-6.2.0.ebuild
+++ b/app-admin/ansible/ansible-6.5.0.ebuild
diff --git a/app-admin/ansible/ansible-6.3.0.ebuild b/app-admin/ansible/ansible-6.6.0.ebuild
index cf0da827da5..cf0da827da5 100644
--- a/app-admin/ansible/ansible-6.3.0.ebuild
+++ b/app-admin/ansible/ansible-6.6.0.ebuild
diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml
index f9e237e272d..73a2e474e95 100644
--- a/app-admin/ansible/metadata.xml
+++ b/app-admin/ansible/metadata.xml
@@ -15,7 +15,7 @@
<bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
</upstream>
<longdescription lang="en">
-Radically simple deployment, model-driven configuration management, and
-command execution framework.
-</longdescription>
+ Radically simple deployment, model-driven configuration management, and
+ command execution framework.
+ </longdescription>
</pkgmetadata>
diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index e12bf1fadea..b10f8a8bbb6 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
IUSE="ssl"
RESTRICT="test"
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 558441a320e..3d3ac875f1b 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1 +1,2 @@
DIST augeas-1.12.0.tar.gz 2429279 BLAKE2B cd90203fec1a81b114d95bb50e168b852923136f34c83974d3427cbedd4eb0d335d3952057507b38ded5c7011be2b56725565ea106cb32a0ca43b7c81250b29e SHA512 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40
+DIST augeas-1.13.0.tar.gz 2562588 BLAKE2B 0a8e62c999a425b89bfa2b1b2cdf7c7894ca39b59d577ca2f7ce9bf33e51f2fffe2510518a8666d59fcf7f8479cae3b2a41efe4478830f89fa20d1fbeb6c9716 SHA512 a6a9ee76f3e48780df1928f2fdfa5cc826695fe6233ff90d069d05806cb020aed3c6b2ce6b9047925a203973eefcd7c254fc3ddd1db7473821c8ade4fda58d5f
diff --git a/app-admin/augeas/augeas-1.13.0.ebuild b/app-admin/augeas/augeas-1.13.0.ebuild
new file mode 100644
index 00000000000..b7a33bcffad
--- /dev/null
+++ b/app-admin/augeas/augeas-1.13.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="https://github.com/hercules-team/augeas/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=app-doc/NaturalDocs-1.40
+ virtual/pkgconfig
+ test? ( dev-lang/ruby )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-selinux.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # selinux needs to be implemented
+ econf --without-selinux
+}
+
+src_compile() {
+ addpredict /usr/share/NaturalDocs/Config/Languages.txt
+ addpredict /usr/share/NaturalDocs/Config/Topics.txt
+
+ default
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-admin/augeas/files/augeas-1.13.0-selinux.patch b/app-admin/augeas/files/augeas-1.13.0-selinux.patch
new file mode 100644
index 00000000000..e1af18805a2
--- /dev/null
+++ b/app-admin/augeas/files/augeas-1.13.0-selinux.patch
@@ -0,0 +1,19 @@
+https://github.com/hercules-team/augeas/commit/f38398a2d07028b892eac59449a35e1a3d645fac
+
+From f38398a2d07028b892eac59449a35e1a3d645fac Mon Sep 17 00:00:00 2001
+From: Leo-Schmit <63145459+Leo-Schmit@users.noreply.github.com>
+Date: Tue, 20 Sep 2022 13:41:31 +0200
+Subject: [PATCH] Replace deprecated 'security_context_t' with 'char *' (#747)
+
+--- a/src/transform.c
++++ b/src/transform.c
+@@ -918,7 +918,7 @@ static int transfer_file_attrs(FILE *from, FILE *to,
+ struct stat st;
+ int ret = 0;
+ int selinux_enabled = (is_selinux_enabled() > 0);
+- security_context_t con = NULL;
++ char *con = NULL;
+
+ int from_fd;
+ int to_fd = fileno(to);
+
diff --git a/app-admin/augeas/metadata.xml b/app-admin/augeas/metadata.xml
index b374ce3fe23..900379c4291 100644
--- a/app-admin/augeas/metadata.xml
+++ b/app-admin/augeas/metadata.xml
@@ -2,16 +2,19 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>prometheanfire@gentoo.org</email>
+ <email>prometheanfire@gentoo.org</email>
</maintainer>
<longdescription lang="en">
-A library for programmatically editing configuration files. Augeas parses
-configuration files into a tree structure, which it exposes through its
-public API. Changes made through the API are written back to the initially
-read files.
+ A library for programmatically editing configuration files. Augeas parses
+ configuration files into a tree structure, which it exposes through its
+ public API. Changes made through the API are written back to the initially
+ read files.
-The transformation works very hard to preserve comments and formatting
-details. It is controlled by ``lens'' definitions that describe the file
-format and the transformation into a tree.
-</longdescription>
+ The transformation works very hard to preserve comments and formatting
+ details. It is controlled by ``lens'' definitions that describe the file
+ format and the transformation into a tree.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">hercules-team/augeas</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 29642e8d6a8..9fddbf2132b 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,5 +1,4 @@
-DIST aws-cli-1.25.75.gh.tar.gz 2270365 BLAKE2B 68cd58d03e0712133104dbb145c6d4bcedf8925e59088d0f2c7ecb7c91beb572a3c8c33f55d95e1a2e0e462648c06cde2460e595942e8adb33c3dcab8ec6a2fc SHA512 c21de74e0ae7380a810d11bad53f0233bc50c8959f047d58c4f4c2cd23231fab34dbba1dac6096790adb28b1ca99e22e70019bcda32738df6e984b2bb46abaa8
-DIST aws-cli-1.25.81.gh.tar.gz 2273195 BLAKE2B 3bf3ca742b08c0bf4367ae1bfabcf8c2626010d60cc11ff66250753f62609eba80053c1d8696cc3184ba9f947f995a8bb95489b01f60a3fa7e1a8cbb4961652c SHA512 4f10de492a56b158d88671c149d4ed4171fbbde8fe84de15a446e31a7d8003a4562439eabd369cb80dcf91987caab6aef05e5b3f5684aeea47ba0d323883c53c
-DIST aws-cli-1.25.82.gh.tar.gz 2273453 BLAKE2B 11c307a78df654634a7ae75cc8a7ce7d37697aa9ce792a3ad2b1a250291f2ff3574bea13219c072f223e4f27b7e5df757b49971374a5962f19b57ae00f77cd44 SHA512 90737a8cc9aac60970e705c5637672b74e89278926196c1363252038401e12bcb31672c878d2a3b6f213f5a5aac308e5b170e90342f6d270793aead3c8485eaf
-DIST aws-cli-1.25.83.gh.tar.gz 2273842 BLAKE2B 3b3986f539302830d981478cf485c9a724a0c1bd216b6a3952781eeeb96e58d0f7cf575a899e79e55dc2252d90c15c1cf2cbde755fa4f89ac4fcabbab788896a SHA512 7194d281477bc8f94b91901fdea57a1da44e703a04d28df9bb63a7f17370ec31eb640128f07b902a46892ca77377e706a0d99f6d53699a572c9cb2ef7d0f6c04
-DIST aws-cli-1.25.85.gh.tar.gz 2274915 BLAKE2B 074651fd32ec378c8f574266ff2a2e43ddb3d16fc7cb73dda75895819d948216acefe6e5c0da1ef059e36c4b684a6b360f996e3ff905abfc71a4c68dc78ad64d SHA512 ca6b6012fbe69467adfeade7f4b7c4cf40c50f2c62aee71c1e459bfa6597d3510e8ba087752c23ca77306e49cffbb68dde95167eed0d9313ab1488855b2aa4dd
+DIST aws-cli-1.27.11.gh.tar.gz 2303984 BLAKE2B f773a631bd2f172697a013e11765307edfac0957f7bff7d05e74c326239491c03629859b5d7b4ec85a831e28acd47cbbf4a2393c8ae512fbf393142cfb7ca13d SHA512 ad9eee70eb95d2c9c71978425e96b80a42569efca6e20c5caeb6af7b27aa893b3bfe68fed8e13b18e20626c4cd9599e8efe93dacde5bcc5c347b815376819ea5
+DIST aws-cli-1.27.16.gh.tar.gz 2309698 BLAKE2B b81d5b1dcc8219a977bfc3cfa41053c12ff8cc363bcb8e3afd9b206d69240a7b4f5ef742d2e74cf21f46bc3a36271a516bf15e1ca34272ad64b4b1dc0c67e4e2 SHA512 1570b82cb2e6cbfb14754b539840b12a606c7a81490bb45239c851757b8e3ac694b41c5842a0b0df825d355d6d6182c6fd6b3c3f26e1c7070150814959c52260
+DIST aws-cli-1.27.18.gh.tar.gz 2313270 BLAKE2B 2f5dc87a2e306d024c03b6cc175736798a28fe5b125aba7e6af9fe1297e44e37fae6990df216cf58c6cdf47ac7b5fc583bed9d5125df063f328544286f4f0f82 SHA512 6f5b0b333af0f842d940cc80f0c18c55feb06c7a4cc609c2db8332126f7e868ccff6f84bfd031bf8d590ca38be9aa258527433e6fab9d63de6a96c64ae740ca2
+DIST aws-cli-1.27.8.gh.tar.gz 2301766 BLAKE2B 1873d92b8d2f6d3f29a65b4177927a1a14034da71dbc95ff6abf3f49df6cf3ee192412eeea15be14c8cf9fca0a5603f2c76b80b280f4feb95e661055abcd8b60 SHA512 e53828cac1b3e10e2ddd45312d71cdb748216dbc37c3e9833e7a1320b236c3bef6a13204a38b946d9182430f169fca1ddc77d3d06c1c2c6e05978dc61f675168
diff --git a/app-admin/awscli/awscli-1.25.81.ebuild b/app-admin/awscli/awscli-1.25.81.ebuild
deleted file mode 100644
index 511be374181..00000000000
--- a/app-admin/awscli/awscli-1.25.81.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- !app-admin/awscli-bin
-"
-BDEPEND="
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.25.82.ebuild b/app-admin/awscli/awscli-1.27.11.ebuild
index 511be374181..9bcb01ac11e 100644
--- a/app-admin/awscli/awscli-1.25.82.ebuild
+++ b/app-admin/awscli/awscli-1.27.11.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit bash-completion-r1 distutils-r1 multiprocessing
@@ -24,8 +24,8 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
@@ -56,6 +56,14 @@ src_prepare() {
}
python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+ tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+ )
+
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
}
diff --git a/app-admin/awscli/awscli-1.25.83.ebuild b/app-admin/awscli/awscli-1.27.16.ebuild
index 511be374181..9bcb01ac11e 100644
--- a/app-admin/awscli/awscli-1.25.83.ebuild
+++ b/app-admin/awscli/awscli-1.27.16.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit bash-completion-r1 distutils-r1 multiprocessing
@@ -24,8 +24,8 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
@@ -56,6 +56,14 @@ src_prepare() {
}
python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+ tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+ )
+
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
}
diff --git a/app-admin/awscli/awscli-1.25.85.ebuild b/app-admin/awscli/awscli-1.27.18.ebuild
index 511be374181..9bcb01ac11e 100644
--- a/app-admin/awscli/awscli-1.25.85.ebuild
+++ b/app-admin/awscli/awscli-1.27.18.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit bash-completion-r1 distutils-r1 multiprocessing
@@ -24,8 +24,8 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
@@ -56,6 +56,14 @@ src_prepare() {
}
python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+ tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+ )
+
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
}
diff --git a/app-admin/awscli/awscli-1.25.75.ebuild b/app-admin/awscli/awscli-1.27.8.ebuild
index 1cdb0506419..7f48b14ec3b 100644
--- a/app-admin/awscli/awscli-1.25.75.ebuild
+++ b/app-admin/awscli/awscli-1.27.8.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit bash-completion-r1 distutils-r1 multiprocessing
@@ -24,8 +24,8 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~riscv x86"
-# botocore is x.(y+2).(z-1)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
@@ -56,6 +56,14 @@ src_prepare() {
}
python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+ tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+ )
+
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
}
diff --git a/app-admin/awscli/metadata.xml b/app-admin/awscli/metadata.xml
index 16fb0066807..c7866d2a5c1 100644
--- a/app-admin/awscli/metadata.xml
+++ b/app-admin/awscli/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<stabilize-allarches/>
<upstream>
+ <remote-id type="github">aws/aws-cli</remote-id>
<remote-id type="pypi">awscli</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0-r1.ebuild
index 6803b000b97..37c4e935a97 100644
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0-r1.ebuild
@@ -17,10 +17,11 @@ SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-accessibility/at-spi2-core:2
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
app-crypt/libsecret
- dev-libs/atk
dev-libs/expat
dev-libs/glib
sys-libs/glibc
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1-r1.ebuild
index 6803b000b97..37c4e935a97 100644
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1.ebuild
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.9.1-r1.ebuild
@@ -17,10 +17,11 @@ SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-accessibility/at-spi2-core:2
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
app-crypt/libsecret
- dev-libs/atk
dev-libs/expat
dev-libs/glib
sys-libs/glibc
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 78f41b19dd7..9301d473564 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
diff --git a/app-admin/calamares/calamares-3.2.32.1-r1.ebuild b/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
deleted file mode 100644
index bbb5ce9445a..00000000000
--- a/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- dev-cpp/yaml-cpp:=
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-libs/libpwquality[${PYTHON_USEDEP}]
- ')
- dev-qt/qtconcurrent:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kcrash:5
- kde-frameworks/kpackage:5
- kde-frameworks/kparts:5
- kde-frameworks/kservice:5
- sys-apps/dbus
- sys-apps/dmidecode
- sys-auth/polkit-qt
- >=sys-libs/kpmcore-4.0.0:5=
- virtual/libcrypt:=
-"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- app-admin/sudo
- dev-libs/libatasmart
- net-misc/rsync
- || ( sys-boot/grub:2 sys-boot/systemd-boot )
- sys-boot/os-prober
- sys-fs/squashfs-tools
- sys-libs/timezone-data
- virtual/udev
- networkmanager? ( net-misc/networkmanager )
- upower? ( sys-power/upower )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.patch )
-
-src_prepare() {
- ecm_src_prepare
- export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
- PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
- PYTHON_CFLAGS="$(python_get_CFLAGS)"\
- PYTHON_LIBS="$(python_get_LIBS)"
-
- sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
- calamares.desktop || die
- sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
- calamares.desktop || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_CONFIG=ON
- -DWEBVIEW_FORCE_WEBKIT=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
- -DWITH_PYTHONQT=OFF
- )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
- dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch
deleted file mode 100644
index 346e1bfb402..00000000000
--- a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/src/libcalamares/CMakeLists.txt
-+++ b/src/libcalamares/CMakeLists.txt
-@@ -216,12 +216,6 @@
- )
-
- calamares_add_test(
-- libcalamaresnetworktest
-- SOURCES
-- network/Tests.cpp
--)
--
--calamares_add_test(
- libcalamarespartitiontest
- SOURCES
- partition/Tests.cpp
-@@ -238,12 +232,6 @@
- endif()
-
- calamares_add_test(
-- libcalamaresutilstest
-- SOURCES
-- utils/Tests.cpp
--)
--
--calamares_add_test(
- libcalamaresutilspathstest
- SOURCES
- utils/TestPaths.cpp
---- a/src/modules/locale/CMakeLists.txt
-+++ b/src/modules/locale/CMakeLists.txt
-@@ -37,18 +37,3 @@
- yamlcpp
- SHARED_LIB
- )
--
--calamares_add_test(
-- localetest
-- SOURCES
-- Tests.cpp
-- Config.cpp
-- LocaleConfiguration.cpp
-- SetTimezoneJob.cpp
-- timezonewidget/TimeZoneImage.cpp
-- DEFINITIONS
-- SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images"
-- DEBUG_TIMEZONES=1
-- LIBRARIES
-- Qt5::Gui
--)
---- a/src/modules/packagechooser/CMakeLists.txt
-+++ b/src/modules/packagechooser/CMakeLists.txt
-@@ -58,13 +58,3 @@
- ${_extra_libraries}
- SHARED_LIB
- )
--
--calamares_add_test(
-- packagechoosertest
-- GUI
-- SOURCES
-- Tests.cpp
-- LIBRARIES
-- calamares_viewmodule_packagechooser
-- ${_extra_libraries}
--)
---- a/src/modules/users/CMakeLists.txt
-+++ b/src/modules/users/CMakeLists.txt
-@@ -70,15 +70,6 @@
- )
-
- calamares_add_test(
-- usershostnametest
-- SOURCES
-- TestSetHostNameJob.cpp
-- SetHostNameJob.cpp
-- LIBRARIES
-- Qt5::DBus # HostName job can use DBus to systemd
--)
--
--calamares_add_test(
- userstest
- SOURCES
- Tests.cpp
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index aaa161dc2b8..84cf8e32189 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -13,7 +13,7 @@
and multicast notifing clsync instances on another nodes to prevent loop
syncing. Clsync can use advanced features for isolation: capabilities, cgroups,
namespaces, seccomp, code hardening.
-</longdescription>
+ </longdescription>
<use>
<flag name="apidoc">Provide doxygen generated API docs.</flag>
<flag name="clsync">Build clsync binary. Most likely you want it. However it is possible to build only libclsync without clsync itself. </flag>
diff --git a/app-admin/clustershell/Manifest b/app-admin/clustershell/Manifest
index 6f30a4d35ad..d0d4d2bb301 100644
--- a/app-admin/clustershell/Manifest
+++ b/app-admin/clustershell/Manifest
@@ -1 +1 @@
-DIST clustershell-1.8.3.tar.gz 363975 BLAKE2B 3a7bb9103398e96f57f53d0d5d5edc6895ce02b6983e8fed34d65cad83a6d4e86f40b9576f41631e499a99adc8be5f4f422005b8ddc7ac8325fe11abd2c99477 SHA512 5108773e2958d1dae0aa6966d764e9af9d41024f65271005b202468f2bd1a3b63acc977729324fe1305d400dc8b06b0c4672e8d8ded207fa77cef69fb0005108
+DIST clustershell-1.8.4.gh.tar.gz 367622 BLAKE2B 1487697a49d37902f9763094da1a156f5e7cc2ab0487814207bb9da03b1109f1ce55034fc92e72262d4b9920d5c52b9f6de84ce1ff04b06d042b0a6d005f1049 SHA512 582393e56d94e62e126d91f8af074a7b57d0e781a5c929cfc374e61324c412c32fcf9a8e063a78cb805c2ff34641887a1adfc7ef9f377b881077f719dbc2adc3
diff --git a/app-admin/clustershell/clustershell-1.8.3-r1.ebuild b/app-admin/clustershell/clustershell-1.8.3-r1.ebuild
deleted file mode 100644
index 1bd9e3fc1a8..00000000000
--- a/app-admin/clustershell/clustershell-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python framework for efficient cluster administration"
-HOMEPAGE="https://cea-hpc.github.com/clustershell/"
-SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-BDEPEND="
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RDEPEND="
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-libs/openssl:0="
-
-RESTRICT="test" # currently fail
-
-python_install() {
- distutils-r1_python_install
- python_optimize
-}
-
-python_test() {
- cd tests || die
- nosetests -sv --all-modules || die
-}
-
-pkg_postinst() {
- einfo
- einfo "Some default system-wide config files have been installed into"
- einfo "/etc/${PN}"
- einfo
-}
diff --git a/app-admin/clustershell/clustershell-1.8.4.ebuild b/app-admin/clustershell/clustershell-1.8.4.ebuild
new file mode 100644
index 00000000000..9ad14aaab93
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.8.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://github.com/cea-hpc/clustershell/"
+SRC_URI="
+ https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+ test? (
+ app-shells/pdsh
+ net-misc/openssh
+ sys-devel/bc
+ )
+"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+
+PATCHES=(
+ # python3.10 related fixes taken from upstream
+ "${FILESDIR}/${P}-setrlimit-division.patch"
+ "${FILESDIR}/${P}-current-thread.patch"
+
+ "${FILESDIR}/${P}-skip-tests.patch"
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ default
+
+ # remove test sets that require working ssh connection
+ rm tests/{CLIClush,TaskDistant*,TreeWorker}Test.py || die
+}
+
+python_test() {
+ cd tests || die
+ # Automatic discovery does not work
+ "${EPYTHON}" -m unittest_or_fail -v *.py || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ doman doc/man/man*/*
+
+ mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+ einfo "Some default system-wide config files have been installed into"
+ einfo "/etc/${PN}"
+}
diff --git a/app-admin/clustershell/files/clustershell-1.8.4-current-thread.patch b/app-admin/clustershell/files/clustershell-1.8.4-current-thread.patch
new file mode 100644
index 00000000000..bf9c7edb6a9
--- /dev/null
+++ b/app-admin/clustershell/files/clustershell-1.8.4-current-thread.patch
@@ -0,0 +1,95 @@
+Backported from upstream commit 314767d65c39 ("Fix for python-3.10") [1].
+
+[1] https://github.com/cea-hpc/clustershell/commit/314767d65c397fadc5ce0ae205a35d7bb47a68a8
+
+diff --git a/lib/ClusterShell/Task.py b/lib/ClusterShell/Task.py
+index b9142e6..8c9e1b9 100644
+--- a/lib/ClusterShell/Task.py
++++ b/lib/ClusterShell/Task.py
+@@ -254,7 +254,7 @@ class Task(object):
+ self._cond.acquire()
+ try:
+ self.suspend_count = min(self.suspend_count, 0)
+- self._cond.notifyAll()
++ self._cond.notify_all()
+ finally:
+ self._cond.release()
+
+@@ -347,7 +347,7 @@ class Task(object):
+ def _is_task_self(self):
+ """Private method used by the library to check if the task is
+ task_self(), but do not create any task_self() instance."""
+- return self.thread == threading.currentThread()
++ return self.thread == threading.current_thread()
+
+ def default_excepthook(self, exc_type, exc_value, tb):
+ """Default excepthook for a newly Task. When an exception is
+@@ -765,7 +765,7 @@ class Task(object):
+
+ def _resume(self):
+ """Resume task - called from self thread."""
+- assert self.thread == threading.currentThread()
++ assert self.thread == threading.current_thread()
+ try:
+ try:
+ self._reset()
+@@ -780,7 +780,7 @@ class Task(object):
+ # task becomes joinable
+ self._join_cond.acquire()
+ self._suspend_cond.atomic_inc()
+- self._join_cond.notifyAll()
++ self._join_cond.notify_all()
+ self._join_cond.release()
+
+ def resume(self, timeout=None):
+@@ -954,14 +954,14 @@ class Task(object):
+ # termination (late join()s)
+ # must be called after _terminated is set to True
+ self._join_cond.acquire()
+- self._join_cond.notifyAll()
++ self._join_cond.notify_all()
+ self._join_cond.release()
+
+ # destroy task if needed
+ if kill:
+ Task._task_lock.acquire()
+ try:
+- del Task._tasks[threading.currentThread()]
++ del Task._tasks[threading.current_thread()]
+ finally:
+ Task._task_lock.release()
+
+@@ -1376,7 +1376,7 @@ def task_self(defaults=None):
+ provided as a convenience is available in the top-level ClusterShell.Task
+ package namespace.
+ """
+- return Task(thread=threading.currentThread(), defaults=defaults)
++ return Task(thread=threading.current_thread(), defaults=defaults)
+
+ def task_wait():
+ """
+@@ -1385,7 +1385,7 @@ def task_wait():
+ convenience and is available in the top-level ClusterShell.Task package
+ namespace.
+ """
+- Task.wait(threading.currentThread())
++ Task.wait(threading.current_thread())
+
+ def task_terminate():
+ """
+diff --git a/tests/TaskPortTest.py b/tests/TaskPortTest.py
+index 697f144..4014a89 100644
+--- a/tests/TaskPortTest.py
++++ b/tests/TaskPortTest.py
+@@ -28,7 +28,7 @@ class TaskPortTest(unittest.TestCase):
+ def ev_msg(self, port, msg):
+ # receive msg
+ assert msg == "toto"
+- assert port.task.thread == threading.currentThread()
++ assert port.task.thread == threading.current_thread()
+ TaskPortTest.got_msg = True
+ port.task.abort()
+
+--
+2.35.1
+
diff --git a/app-admin/clustershell/files/clustershell-1.8.4-setrlimit-division.patch b/app-admin/clustershell/files/clustershell-1.8.4-setrlimit-division.patch
new file mode 100644
index 00000000000..9ecd807591a
--- /dev/null
+++ b/app-admin/clustershell/files/clustershell-1.8.4-setrlimit-division.patch
@@ -0,0 +1,21 @@
+Python3.10 related fix taken from upstream [1,2].
+
+[1] https://github.com/cea-hpc/clustershell/pull/487
+[2] https://github.com/cea-hpc/clustershell/commit/5ac85daf74056ec7e60778efec94c746a150142c
+
+diff --git a/tests/CLIConfigTest.py b/tests/CLIConfigTest.py
+index 2853398..db6cec5 100644
+--- a/tests/CLIConfigTest.py
++++ b/tests/CLIConfigTest.py
+@@ -229,7 +229,7 @@ class CLIClushConfigTest(unittest.TestCase):
+ display = Display(options, config)
+
+ # force a lower soft limit
+- resource.setrlimit(resource.RLIMIT_NOFILE, (hard2/2, hard))
++ resource.setrlimit(resource.RLIMIT_NOFILE, (hard2//2, hard))
+ # max_fdlimit should increase soft limit again
+ set_fdlimit(config.fd_max, display)
+ # verify
+--
+2.35.1
+
diff --git a/app-admin/clustershell/files/clustershell-1.8.4-skip-tests.patch b/app-admin/clustershell/files/clustershell-1.8.4-skip-tests.patch
new file mode 100644
index 00000000000..4374ae4b525
--- /dev/null
+++ b/app-admin/clustershell/files/clustershell-1.8.4-skip-tests.patch
@@ -0,0 +1,63 @@
+This is a Gentoo specific patch for skipping tests that do not work due
+to various reasons:
+1. hostname may be set to localhost
+2. test fails which are most probably caused by weird test interaction.
+ The issue is reported to upstream in [1].
+
+[1] https://github.com/cea-hpc/clustershell/issues/488
+
+diff --git a/tests/TaskEventTest.py b/tests/TaskEventTest.py
+index f8a4048..900008b 100644
+--- a/tests/TaskEventTest.py
++++ b/tests/TaskEventTest.py
+@@ -475,6 +475,7 @@ class TaskEventTest(unittest.TestCase):
+ self.assertEqual(eh.cnt_pickup, 3)
+ self.assertEqual(eh.cnt_hup, 3)
+
++ @unittest.skip("because of an issue https://github.com/cea-hpc/clustershell/issues/488")
+ def test_ev_pickup_fanout_legacy(self):
+ """test ev_pickup event with fanout (legacy)"""
+ task = task_self()
+@@ -498,6 +499,7 @@ class TaskEventTest(unittest.TestCase):
+ finally:
+ task.set_info("fanout", fanout)
+
++ @unittest.skip("because of an issue https://github.com/cea-hpc/clustershell/issues/488")
+ def test_ev_pickup_fanout(self):
+ """test ev_pickup event with fanout"""
+ task = task_self()
+diff --git a/tests/TreeWorkerTest.py b/tests/TreeWorkerTest.py
+index d5c221a..969d3c9 100644
+--- a/tests/TreeWorkerTest.py
++++ b/tests/TreeWorkerTest.py
+@@ -99,6 +99,7 @@ class TEventHandler(TEventHandlerBase):
+ self.ev_timedout_cnt += 1
+
+
++@unittest.skipIf(HOSTNAME == 'localhost', "does not work with hostname set to 'localhost'")
+ class TreeWorkerTest(unittest.TestCase):
+ """
+ TreeWorkerTest: test TreeWorker
+diff --git a/tests/WorkerExecTest.py b/tests/WorkerExecTest.py
+index 6f99f10..0894f99 100644
+--- a/tests/WorkerExecTest.py
++++ b/tests/WorkerExecTest.py
+@@ -45,6 +45,7 @@ class ExecTest(unittest.TestCase):
+ self.assertEqual(task_self().max_retcode(), 1)
+ self.assertEqual(task_self().node_buffer('localhost'), b'')
+
++ @unittest.skipIf(HOSTNAME == 'localhost', "does not work with hostname set to 'localhost'")
+ def test_timeout(self):
+ """test ExecWorker with a timeout"""
+ nodes = "localhost,%s" % HOSTNAME
+@@ -67,6 +68,7 @@ class ExecTest(unittest.TestCase):
+ self.assertRaises(WorkerError, self.execw,
+ nodes="localhost", handler=None, command="echo %")
+
++ @unittest.skipIf(HOSTNAME == 'localhost', "does not work with hostname set to 'localhost'")
+ def test_rank_placeholder(self):
+ """test ExecWorker with several nodes and %n (rank)"""
+ nodes = "localhost,%s" % HOSTNAME
+--
+2.35.1
+
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index eb757a6c087..c517dc30884 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,2 +1,2 @@
-DIST conky-1.12.2.tar.gz 2407428 BLAKE2B b8d1b40dc4b547679b5ab4bf0328aabaac868025433729f48baf572c536da4a527a073a6d47f36c179851aecef58535dccb956e3a695700f06bf8e6ab170ae1f SHA512 55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a
DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516
+DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841
diff --git a/app-admin/conky/conky-1.13.1.ebuild b/app-admin/conky/conky-1.13.1.ebuild
index f909139904b..cf2c7c6dbc1 100644
--- a/app-admin/conky/conky-1.13.1.ebuild
+++ b/app-admin/conky/conky-1.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~riscv sparc x86"
IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib
intel-backlight iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc
mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd
diff --git a/app-admin/conky/conky-1.12.2.ebuild b/app-admin/conky/conky-1.15.0.ebuild
index 79a82febb40..d3d700c1507 100644
--- a/app-admin/conky/conky-1.12.2.ebuild
+++ b/app-admin/conky/conky-1.15.0.ebuild
@@ -1,11 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-3 )
+PYTHON_COMPAT=( python{3_9,3_10,3_11} )
-inherit cmake linux-info lua-single readme.gentoo-r1 xdg
+inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
DESCRIPTION="An advanced, highly configurable system monitor for X"
HOMEPAGE="https://github.com/brndnmtthws/conky"
@@ -13,15 +14,13 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~riscv sparc x86"
-IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib
- intel-backlight iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc
- mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd
- thinkpad truetype vim-syntax weather-metar webserver wifi X xinerama
- xmms2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
+ intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
+ mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
+ webserver wifi X xinerama xmms2"
COMMON_DEPEND="
- cmus? ( media-sound/cmus )
curl? ( net-misc/curl )
ical? ( dev-libs/libical:= )
iconv? ( virtual/libiconv )
@@ -33,12 +32,11 @@ COMMON_DEPEND="
mysql? ( dev-db/mysql-connector-c )
ncurses? ( sys-libs/ncurses:= )
nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
systemd? ( sys-apps/systemd )
truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
wifi? ( net-wireless/wireless-tools )
- weather-metar? ( net-misc/curl )
webserver? ( net-libs/libmicrohttpd )
X? (
x11-libs/libX11
@@ -53,15 +51,38 @@ COMMON_DEPEND="
RDEPEND="
${COMMON_DEPEND}
apcupsd? ( sys-power/apcupsd )
+ cmus? ( media-sound/cmus )
hddtemp? ( app-admin/hddtemp )
moc? ( media-sound/moc )
- nano-syntax? ( app-editors/nano )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+ extras? (
+ app-editors/nano
+ || ( app-editors/vim app-editors/gvim )
+ )
"
DEPEND="
${COMMON_DEPEND}
- doc? ( app-text/docbook2X dev-libs/libxslt )
"
+BDEPEND="
+ doc? (
+ virtual/pandoc
+ $(python_gen_any_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ ')
+ )
+ extras? (
+ $(python_gen_any_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+python_check_deps() {
+ use doc || use extras || return 0
+ python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
REQUIRED_USE="
imlib? ( X )
@@ -79,27 +100,23 @@ DOCS=( README.md AUTHORS )
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
-There are pretty html docs available at the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
+There are pretty html docs available at https://conky.cc/.
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
pkg_setup() {
- use ipv6 && linux-info_pkg_setup
-
+ linux-info_pkg_setup
lua-single_pkg_setup
+ if use doc || use extras; then
+ python-any-r1_pkg_setup
+ fi
}
src_prepare() {
cmake_src_prepare
-
xdg_environment_reset
-
- sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
- cmake/ConkyPlatformChecks.cmake || die
}
src_configure() {
@@ -127,6 +144,7 @@ src_configure() {
-DBUILD_CMUS=$(usex cmus)
-DBUILD_CURL=$(usex curl)
-DBUILD_DOCS=$(usex doc)
+ -DBUILD_EXTRAS=$(usex extras)
-DBUILD_HDDTEMP=$(usex hddtemp)
-DBUILD_HTTP=$(usex webserver)
-DBUILD_I18N=yes
@@ -136,7 +154,7 @@ src_configure() {
-DBUILD_IMLIB2=$(usex imlib)
-DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
-DBUILD_IOSTATS=$(usex iostats)
- -DBUILD_IPV6=$(usex ipv6)
+ -DBUILD_IPV6=yes
-DBUILD_IRC=$(usex irc)
-DBUILD_JOURNAL=$(usex systemd)
-DBUILD_LUA_CAIRO=$(usex lua-cairo)
@@ -152,7 +170,6 @@ src_configure() {
-DBUILD_PORT_MONITORS=$(usex portmon)
-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-DBUILD_RSS=$(usex rss)
- -DBUILD_WEATHER_METAR=$(usex weather-metar)
-DBUILD_WLAN=$(usex wifi)
-DBUILD_XFT=$(usex truetype)
-DBUILD_XINERAMA=$(usex xinerama)
@@ -162,23 +179,25 @@ src_configure() {
-DRELEASE=yes
)
+ if use doc || use extras; then
+ mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+ fi
+
cmake_src_configure
}
src_install() {
cmake_src_install
- if use vim-syntax; then
+ if use extras; then
insinto /usr/share/vim/vimfiles/ftdetect
doins "${S}"/extras/vim/ftdetect/conkyrc.vim
insinto /usr/share/vim/vimfiles/syntax
- doins "${S}"/extras/vim/syntax/conkyrc.vim
- fi
+ doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
- if use nano-syntax; then
insinto /usr/share/nano/
- doins "${S}"/extras/nano/conky.nanorc
+ doins "${BUILD_DIR}"/extras/nano/conky.nanorc
fi
readme.gentoo_create_doc
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index adb290e7c2f..41e021e389b 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -18,6 +18,7 @@
<flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag>
<flag name="bundled-toluapp">Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags</flag>
<flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
+ <flag name="extras">Enable syntax highlighting for <pkg>app-editors/nano</pkg>and app-editors/vim</flag>
<flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
<flag name="intel-backlight">Enable support for Intel backlight</flag>
<flag name="iostats">Enable support for per-task I/O statistics</flag>
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index b5f4e046311..9f9605c3205 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -4,3 +4,4 @@ DIST consul-template-0.29.1-deps.tar.xz 59041120 BLAKE2B dd822c41cf9fdfe773ed48e
DIST consul-template-0.29.1.tar.gz 254592 BLAKE2B 4ad5e7c1bf2edc06d72ec1ed48f9546c698d22f8562c4c9924106891c44511b912abecc94517ed2359592b709f1f8fd05fcb00cea52893de29c62b34b61fd71e SHA512 edcfe45a3d98b9affda8b5d07fb375a647a78473c7041a87f1f5a2aa2faef2bfdef26a7037d228f6a86d0c446397e7452e7005ce16beff2bc68edabf2268a6f9
DIST consul-template-0.29.4-deps.tar.xz 59446648 BLAKE2B 9ccd689f38eff50ad448a4226de918920c7acca9eb1e23d4e30f9999afc124224bb8f123b3dff4a1d433ea683ed523cd604a41472f50cb1919483040fc18c848 SHA512 3c60d88fdb82744f250cf02be3b3423f74360f18a43f4c4204ee97f73c370b878ecdbd5a300f96b74ffd9c7cde66f6c8b974392f7acc07a113b85ab6f1b6d8e9
DIST consul-template-0.29.4.tar.gz 262539 BLAKE2B 487902c2a05561db325e6d2638a70d2733a27dd31f678b65883d0b4925b4efa38fe4fbe6c7128c9473af4d4a21f467288a2c1945da399f6feab39216b67dd5aa SHA512 3bc5fcd1877fe125398d6bf0bd4938af88cacf726441af3e82142e651ab458185593eec3cb7c5916669a0e39dff8059c049556509ec279bf572f03b4c915d757
+DIST consul-template-0.29.5.tar.gz 262722 BLAKE2B 1e3ddf259d76cf487872cebbe8c8b5bb313b89d073b26496340d39cc55c4e56ec531cbefec4bc1c0dd5c8bb3bd707c9bebfd15011e421badf12ea59a5bbbdbe3 SHA512 f753c2ec7f6c97ac73b34820b40568b5b16a3b8d4bebc7390905614a96744e8d4afd4a63b8b911989ba084ea91d85a21e3283d67a36bf65a685aa63154361a14
diff --git a/app-admin/consul-template/consul-template-0.29.5.ebuild b/app-admin/consul-template/consul-template-0.29.5.ebuild
new file mode 100644
index 00000000000..6727d40a8f9
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.29.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+DESCRIPTION="Generic template rendering and notifications with Consul"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/consul-template-0.29.4-deps.tar.xz"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+ acct-group/consul-template
+ acct-user/consul-template"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# TODO: debug test failures
+RESTRICT+=" test"
+
+src_prepare() {
+ default
+ # remove -s and -w from the linker flags
+ sed \
+ -e '/-s \\/d' \
+ -e '/-w \\/d' \
+ -i Makefile || die
+}
+
+src_compile() {
+ emake GOBIN="${S}"/bin dev
+}
+
+src_test() {
+ emake GOBIN="${S}"/bin test
+}
+
+src_install() {
+ dobin bin/${PN}
+ dodoc CHANGELOG.md README.md
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index fb564830e2c..0b1ddfdf75a 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,4 +1,7 @@
DIST consul-1.12.5-deps.tar.xz 289550768 BLAKE2B d64d074987dd8abaed5defdfbcab1ffe56b89c52b4912fc098ff0dfc29ae5dda65ce1ae0d83ee23a1d9b4ce22b6a09680575480c65d56d8ad9ad9442afc64e46 SHA512 afec76f7a8769b165c6a3df3faac4e6371017f3c51e0f3cb5e45f2302d2db1b7779c5d857718606edac0799cf13410373643294d466519076dc9dce549a793ae
DIST consul-1.12.5.tar.gz 25159461 BLAKE2B 4e2bdffd77d032037c6999bee0e2ba4ac6c83daee422097f7cec37c74375419336ec50b19abf9b17db9375a9ee69894ad6577499c137945f7f0557d38d6aa4dc SHA512 df735447dae074ac84dc9dbf5bf2e6d907152d233841137fc4ba632bad19b6db49a60cb79473e6432f76c99ac3c1e287be00416a6553eb3acef8b2fcc4c5dcda
-DIST consul-1.13.2-deps.tar.xz 252165800 BLAKE2B b954d36ecd06c2aca46eab6680fb31c709f5d05b6645a7d5b042cdd98ae088a1d38fda6e801eede95b32d4c690f59e05161d8a70de0831d8ba47dfa8c529d32c SHA512 4468a11d53cdb9ab70b9286f5b168681d6805401fbdad0f79d02a0a98e869e0c52c098ab90c4ea3291811876444582057efe72c1972b9bb6cbfd13dfda82453b
-DIST consul-1.13.2.tar.gz 25412424 BLAKE2B db6b5f86ef73d1273f2657e6d36640f6bf9252a215f914ec4fc7451cce1e3659725fecc1254401223ead034834443df18eaf54155db466e160bc70101944a8cc SHA512 2af6dd62b178aee975a05efd5c5c3b1d763b64226b6e5ff66060ff31e0b7deaba1603bd5fb4507ff48158acb087f1e4190b6b1961cef6a8809aac6a0473d85f9
+DIST consul-1.12.6.tar.gz 25112396 BLAKE2B 18b77e909bee012817cd11b784d451929781ac19cecbc3c7804f37d7ad42328df1aa0bbb3b83fd9c311c5f9a60ac710ff166ea9fcb4fe58cb30dff163d793e03 SHA512 755944b0b8e59cdc2e7e86fc5360b447398f27e3d7f91fc278d2f86548ec8cea4af2f12be44d602d96691d2479d6bf8a74e6506cb118c5057181bceae60e92d5
+DIST consul-1.13.3-deps.tar.xz 251812624 BLAKE2B 0ce8fe76298defc83c174d1d02ee25b28ce9253fdd6abafe810ed0e0b63b8f9c82a1b5650508ad746b46f39261b7e3f41395129780d0feed5b61be50c04469ac SHA512 0b7d662a9c48e2509208045194ca5fff477245977d87ba570a0218d4f34a91c4b19a28871eea7104b3918cd54da01b71f5f533e5d93215a7767038977993d6c5
+DIST consul-1.13.3.tar.gz 25380333 BLAKE2B 6dbb8f3e9e3dd6b7e5192a6f050000cfb48a7730e63e474f2d24787608f21781b5f3810400b42f38ad93995d048fe41cc9643ffa3923c297699cc1a8e975a44d SHA512 a978e25f89b7fb9ebc56fd2857493559756981b6e63e57d74b2749af9cce44897b7b5dc136a38d5861296105bedcc591adef972e18edb02efec1952c2f67add9
+DIST consul-1.14.0-vendor.tar.gz 39530717 BLAKE2B 62672e0383353bcccdfcaa25ffd7409b31d8ba650080f315d8a8b68d0be4afa60a12b45ec548be0ecd5a9a703c1888c781a985f1b67fe6128fd82f69a984c42a SHA512 a2ada95b7e890c3f466009a78fdd1dfb0aa46494583811531653230adf0ead98016d22cfdeba45d68e03a6aa7fe711660c17c438c6c9038cbc732021ec011e7a
+DIST consul-1.14.1-vendor.tar.gz 39669654 BLAKE2B bb4fbe3df71354ee46d5a08e532226f2a0cfd8f5eb46b20a9ba5a324e1166a64a9b6cd3e44c5eebbd16c3bd4ff6a72b3afbfe117b7cd1b7fc5b9bf68cf58aa73 SHA512 9bfef09a7df0a0d4230d7e25ba113b985a29532240f235592af480867fb2c803671e2ed6563bbb7f07c64c15a8b1a5b00a9a05151387a01049067a75ffade169
diff --git a/app-admin/consul/consul-1.12.5.ebuild b/app-admin/consul/consul-1.12.5.ebuild
index 62a5094a577..ae84b874b6a 100644
--- a/app-admin/consul/consul-1.12.5.ebuild
+++ b/app-admin/consul/consul-1.12.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
RESTRICT+=" test"
SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~x86"
BDEPEND="dev-go/gox"
COMMON_DEPEND="
diff --git a/app-admin/consul/consul-1.12.6.ebuild b/app-admin/consul/consul-1.12.6.ebuild
new file mode 100644
index 00000000000..0cf1172ec31
--- /dev/null
+++ b/app-admin/consul/consul-1.12.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+GIT_COMMIT="950fcb85a7a242ac8512391b81fae20c5b8be962"
+
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/consul-1.12.5-deps.tar.xz"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+ acct-group/consul
+ acct-user/consul"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake dev-build
+}
+
+src_install() {
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/consul
+ fowners consul:consul /var/log/consul
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.13.2.ebuild b/app-admin/consul/consul-1.13.3.ebuild
index b27512262c6..7e516688244 100644
--- a/app-admin/consul/consul-1.13.2.ebuild
+++ b/app-admin/consul/consul-1.13.3.ebuild
@@ -6,7 +6,7 @@ inherit go-module systemd
DESCRIPTION="A tool for service discovery, monitoring and configuration"
HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="0e046bbb34f12b4a38c6c2dc6497426761f0b02f"
+GIT_COMMIT="b29e5894f2322c9294b1f03c9b264ae2e6ae0eb0"
SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
@@ -25,7 +25,7 @@ COMMON_DEPEND="
src_prepare() {
default
- sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-08-11T19:07:00Z|' -i GNUmakefile || die
+ sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-10-19T19:49:59Z|' -i GNUmakefile || die
}
src_compile() {
diff --git a/app-admin/consul/consul-1.14.0.ebuild b/app-admin/consul/consul-1.14.0.ebuild
new file mode 100644
index 00000000000..fcfd8c27639
--- /dev/null
+++ b/app-admin/consul/consul-1.14.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+GIT_COMMIT="fdfdddb9e1803d5b2257c99af8c259773ed05b3d"
+
+SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+ acct-group/consul
+ acct-user/consul"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/${P}-vendor
+
+src_prepare() {
+ default
+ sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-11-15T16:39:54Z|' -i GNUmakefile || die
+}
+
+src_compile() {
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake dev-build
+}
+
+src_install() {
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/consul
+ fowners consul:consul /var/log/consul
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.14.1.ebuild b/app-admin/consul/consul-1.14.1.ebuild
new file mode 100644
index 00000000000..1bcbba0d09f
--- /dev/null
+++ b/app-admin/consul/consul-1.14.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+GIT_COMMIT="cac392a17d3f71048a949599a0f977bf9645df62"
+
+SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+ acct-group/consul
+ acct-user/consul"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/${P}-vendor
+
+src_prepare() {
+ default
+ sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-11-21T16:56:07Z|' -i GNUmakefile || die
+}
+
+src_compile() {
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake dev-build
+}
+
+src_install() {
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/consul
+ fowners consul:consul /var/log/consul
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/cpulimit/cpulimit-2.4.ebuild b/app-admin/cpulimit/cpulimit-2.4.ebuild
index 984249c13da..13e5d1a8631 100644
--- a/app-admin/cpulimit/cpulimit-2.4.ebuild
+++ b/app-admin/cpulimit/cpulimit-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
IUSE=""
DEPEND=""
diff --git a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild
index a37424d8def..f032feaacc8 100644
--- a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild
+++ b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://michael.orlitzky.com/code/djbdns-logparse.xhtml"
SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
LICENSE="AGPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-admin/doas/doas-6.8.2.ebuild b/app-admin/doas/doas-6.8.2.ebuild
index 25d4f3a7608..8d775443d9b 100644
--- a/app-admin/doas/doas-6.8.2.ebuild
+++ b/app-admin/doas/doas-6.8.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="pam persist"
BDEPEND="virtual/yacc"
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index 7c6638b3e8a..04f0fc76cae 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,3 +1 @@
-DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
-DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
DIST eclean-kernel-2.99.3.tar.gz 20031 BLAKE2B 70830639eb00bde810e29361dec7c7b90f5b85b79b5be865f23cf45254cbf6139ef335fb5bfef08e2512512e57867df62f6468ce8de1da58cc9a4cfa27a26244 SHA512 edbe373b81a2eb5c7fca8794f9577c68ab66305e9085cc7535cd5d8a8fdd549b2035cb0b5f3e5a69cc735146c2eef81dc5c1f5284ef255420aca0cda9e518b14
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
deleted file mode 100644
index 0c366b25ea8..00000000000
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
-SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild b/app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild
deleted file mode 100644
index ae41700c874..00000000000
--- a/app-admin/eclean-kernel/eclean-kernel-1.99.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Clean up old and stale kernel files"
-HOMEPAGE="https://github.com/mgorny/eclean-kernel2"
-SRC_URI="https://github.com/mgorny/eclean-kernel2/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
index 27c2c00785a..1ddf5d99f8d 100644
--- a/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
-SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/projg2/eclean-kernel/"
+SRC_URI="https://github.com/projg2/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
@@ -21,7 +21,7 @@ RDEPEND="
kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )
lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
- zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
+ zstd? ( dev-python/python-zstandard[${PYTHON_USEDEP}] )
"
distutils_enable_tests pytest
diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
index c4682a7d191..879888b0e4b 100644
--- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 git-r3
DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
-EGIT_REPO_URI="https://github.com/mgorny/eclean-kernel.git"
+HOMEPAGE="https://github.com/projg2/eclean-kernel/"
+EGIT_REPO_URI="https://github.com/projg2/eclean-kernel.git"
LICENSE="BSD"
SLOT="0"
@@ -21,7 +21,7 @@ RDEPEND="
kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )
lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
- zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
+ zstd? ( dev-python/python-zstandard[${PYTHON_USEDEP}] )
"
distutils_enable_tests pytest
diff --git a/app-admin/eclean-kernel/metadata.xml b/app-admin/eclean-kernel/metadata.xml
index 6c3f7b45181..11fd9db9c6d 100644
--- a/app-admin/eclean-kernel/metadata.xml
+++ b/app-admin/eclean-kernel/metadata.xml
@@ -11,7 +11,7 @@
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
- <bugs-to>https://github.com/mgorny/eclean-kernel2/issues/</bugs-to>
- <remote-id type="github">mgorny/eclean-kernel2</remote-id>
+ <bugs-to>https://github.com/projg2/eclean-kernel2/issues/</bugs-to>
+ <remote-id type="github">projg2/eclean-kernel2</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index e460e75f9f4..426f4ddec0b 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1 +1 @@
-DIST exo-1.59.2.tar.gz 5614063 BLAKE2B 358b3fa7935c092e5942d2864b4f25a6d78689558fbd4d11b7bacab29a2d93907e21e098f45896a2f2bca923d6f2addcc5fd04aa2aed56826ca78184dcc0c724 SHA512 7e935ff794a6c7e3236a6f2557f5a9c1d2662e7333d137bbbb866d4d1b889dc07b604643ffebaf20da4fa97bfe09fc1e84f57159c38edc2e4ea902a51b7cf680
+DIST exo-1.60.0.tar.gz 5506221 BLAKE2B 5b3f424e8572f33b5571582de7c2154edd8d52c9225947623b83bcf6d93dd32529785602aa89184c0083c1a2c7c5a7541ba847d5e6849c53033bebcb210fa3f6 SHA512 18041184e14b5f353477331f9f4fe83834f73e5996ba8124b109518dcaaf3d36b8e8727a011603c4a5e7836f9d4d7380041665317598d470f0456dfb87f2e284
diff --git a/app-admin/exo/exo-1.59.2.ebuild b/app-admin/exo/exo-1.60.0.ebuild
index 6149acedfa1..6149acedfa1 100644
--- a/app-admin/exo/exo-1.59.2.ebuild
+++ b/app-admin/exo/exo-1.60.0.ebuild
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 8f3cc293f9d..c11b5468fc2 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -1,4 +1,3 @@
-DIST github-backup-utils-2.22.0.tar.gz 102576 BLAKE2B ce9007c8a5d2843ccc2b3d11b03c13840b89d6ae7906d63420cc0e18191766c92c91e1072723439610ae8bdfdd0174601d1e3b7211cd6a1c9a748f9f793ff760 SHA512 e77b4afc6f90b16caf61dc4313787dab0751590b4819dca2d7e21acd0ca774d19ea359171b76f2892ca0fb4f86fd4240e77b00e107de79d496fea429fb12cee8
DIST github-backup-utils-3.0.0.tar.gz 104088 BLAKE2B f01229e6b152231eb832dec8bef41bb158cc200bbdd3c59c1abab299c572902efe6d27d093491bd8b0bf8f3e834d2938eb0127d5f28700ba75dcbdbcc8a21bb8 SHA512 e86420ef9d86d44560e27e00361ff1bb8ba7c15fb116ad9981e3196bc4c7c25bcff9a9f7dc8dae9bbbb9b2f3380b434199dbbe1ef7db5b1ba04ec1233aec320d
DIST github-backup-utils-3.3.2.tar.gz 109517 BLAKE2B b9c48de60f10d1d20eda96d0fa69c7d1835c0cdca7dbb3a3659e2a527706d6d793c426d5032e2bd1ead58255cdca6cdf424da0cb6a06484c4a5b5a9b0d4bcbba SHA512 c8013d5775a0ad8193266c36b0afa91bd452dfd70499c74239c6e62a0c9d88ecd92e16495ad4bd64319e42ad7b781125c136b1a9945146d09add5a2165d31b16
DIST github-backup-utils-3.5.0.tar.gz 113871 BLAKE2B e6835c3efe04332df792827e2fdc54449e73a1fec055e7677174a1eaf2b4c9d43a2bc4c82741b056265fbf4eeea75ad62819d9d357d800ff3d4befcf5fcd4e39 SHA512 d77e30fe426b231c8d8aa1ca7867861a3427a5829d46184283a1beaea22b697dd6cf7343d1e65f40c9f6f9bcd05fea0c45892080292707b6b897599d4cbb566b
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
deleted file mode 100644
index 15865bbb263..00000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Python3 support: https://github.com/github/backup-utils/pull/627
-PYTHON_COMPAT=( python3_{7,8} )
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# moreutils parallel is now used for speedups in main code:
-# https://github.com/github/backup-utils/pull/635
-RDEPEND="net-misc/rsync
- sys-apps/moreutils"
-
-# tests invoke parallel & rsync
-DEPEND="test? (
- ${RDEPEND}
- dev-util/checkbashisms
- ${PYTHON_DEPS}
-)"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
- :;
-}
-
-src_install() {
- dobin bin/*
- insinto usr/share/${PN}
- doins share/${PN}/version
-
- exeinto usr/share/${PN}
- doexe share/${PN}/bm.sh
- doexe share/${PN}/ghe-*
-
- insinto etc/${PN}
- newins backup.config-example backup.config
-
- dodoc -r docs/*
-}
-
-src_test() {
- emake test
-}
diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
deleted file mode 100644
index 6036cc9a445..00000000000
--- a/app-admin/gnome-abrt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gnome-abrt-1.4.1.tar.gz 115107 BLAKE2B 6706e65f099056118b40e821325aa7861ef256bdf17d824a5222eeaa3355761bfc8f188e7b0a35305f47b66000c0992daa164d955bdf9d3f6005a1eb85b2a3c2 SHA512 c14397f94d39ce1a94247215679a36c0d1db5fee6a162956d5d87a4585207dbc1cafc60bd9b6b5e3cd5f8437a398ab4a983002d6d2a241a01d7d4da6b93060ae
-DIST gnome-abrt-1.4.2.tar.gz 115442 BLAKE2B b98a67619a9ca69708eef099614d936c015bfbe2b9cc2e9090f5a60dcd34a7d4eaa37aa7769ce04e52b400f0c8bebac3a933c1c323b11e8b84e347557ff0cc36 SHA512 41639ef3ee7ba090cd62da45d029c9f59613d6b844d59768385f0fc5a074185f6f350a4100aa35aad9a4c528524d2905f130904f6b4c31a4df22d621e0395253
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.4.1.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.4.1.ebuild
deleted file mode 100644
index f86e1b32f7a..00000000000
--- a/app-admin/gnome-abrt/gnome-abrt-1.4.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson python-r1
-
-DESCRIPTION="A utility for viewing problems that have occurred with the system"
-HOMEPAGE="https://github.com/abrt/gnome-abrt"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=x11-libs/gtk+-3.10.0:3
- >=dev-libs/libreport-2.14.0:0=[python,${PYTHON_USEDEP}]
- >=app-admin/abrt-2.14.0
- >=dev-python/pygobject-3.29.1:3[${PYTHON_USEDEP}]
- >=dev-python/pyxdg-0.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- app-text/asciidoc
- app-text/xmlto
- )
- virtual/pkgconfig
- >=sys-devel/gettext-0.17
-"
-
-src_configure() {
- local emesonargs=(
- $(meson_use doc docs)
- -Dlint=false
- )
-
- python_foreach_impl meson_src_configure
-}
-
-src_compile() {
- python_foreach_impl meson_src_compile
-}
-
-src_install() {
- python_foreach_impl meson_src_install
- python_foreach_impl python_optimize
-}
-
-src_test() {
- python_foreach_impl meson_src_test
-}
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.4.2.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.4.2.ebuild
deleted file mode 100644
index 9a67800ff33..00000000000
--- a/app-admin/gnome-abrt/gnome-abrt-1.4.2.ebuild
+++ /dev/null
@@ -1,57 +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 meson python-r1
-
-DESCRIPTION="A utility for viewing problems that have occurred with the system"
-HOMEPAGE="https://github.com/abrt/gnome-abrt"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=x11-libs/gtk+-3.10.0:3
- >=dev-libs/libreport-2.14.0:0=[python,${PYTHON_USEDEP}]
- >=app-admin/abrt-2.14.0
- >=dev-python/pygobject-3.29.1:3[${PYTHON_USEDEP}]
- >=dev-python/pyxdg-0.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- app-text/asciidoc
- app-text/xmlto
- )
- virtual/pkgconfig
- >=sys-devel/gettext-0.17
-"
-
-src_configure() {
- local emesonargs=(
- $(meson_use doc docs)
- -Dlint=false
- )
-
- python_foreach_impl meson_src_configure
-}
-
-src_compile() {
- python_foreach_impl meson_src_compile
-}
-
-src_install() {
- python_foreach_impl meson_src_install
- python_foreach_impl python_optimize
-}
-
-src_test() {
- python_foreach_impl meson_src_test
-}
diff --git a/app-admin/gnome-abrt/metadata.xml b/app-admin/gnome-abrt/metadata.xml
deleted file mode 100644
index d84abd7b0dd..00000000000
--- a/app-admin/gnome-abrt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>pacho@gentoo.org</email>
- <name>Pacho Ramos</name>
- </maintainer>
- <upstream>
- <remote-id type="github">abrt/gnome-abrt</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-admin/gopass/gopass-1.14.4.ebuild b/app-admin/gopass/gopass-1.14.4.ebuild
index dfc7428cb88..a3475de0856 100644
--- a/app-admin/gopass/gopass-1.14.4.ebuild
+++ b/app-admin/gopass/gopass-1.14.4.ebuild
@@ -232,7 +232,7 @@ SRC_URI+=" ${RAW_SRC_URI}"
LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
RESTRICT="strip test"
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
index b55288452f1..0cfdc861f16 100644
--- a/app-admin/hardinfo/Manifest
+++ b/app-admin/hardinfo/Manifest
@@ -1 +1,2 @@
DIST hardinfo-0.6_alpha_pre20201116.tar.gz 1294614 BLAKE2B d585be00603a5da2873d0e15829039f3f5212e2ab294b71d7f53299d7eecdfbb2d46ee8d56913039bf03807cebe3f100f41ce6560a1a33fcd712eab59c2a92a9 SHA512 34ce849f2d1a9ea129502abfb186b43a0d8ddecc853d2edc3128389944a34efa3580c6d8a35b8fc40b55d64cc8f3c0d33b97f198a449ed0cacdbff2520853c1c
+DIST hardinfo-0.6_alpha_pre20221113-a798cbaed6f1b083cc3c26dbede74cf40947d0ef.tar.gz 1411038 BLAKE2B 8a6ca1a8e2bd53804cd6f55f0b9ce89d24d61aff9e267636301331d329229cd11778ea087e1906e7313cb1bd077ca69766e6fdf86c21985deba51f942cedf904 SHA512 faa7db1c8a7ac4f432a27cf10d21b453091136dd2d171b63f0b91eeea65c3cec25e7b4c2a845dfb64ff572ee6acaddfec56bd51f7292ed8b3674b44755a7a631
diff --git a/app-admin/hardinfo/files/hardinfo-0.6-fix-function-declarations.patch b/app-admin/hardinfo/files/hardinfo-0.6-fix-function-declarations.patch
new file mode 100644
index 00000000000..c2aaa2e4acd
--- /dev/null
+++ b/app-admin/hardinfo/files/hardinfo-0.6-fix-function-declarations.patch
@@ -0,0 +1,226 @@
+Clang16 will not allow implicit function declaration etc. by default.
+This overhauls the whole source code to make this build with clang16
+defaults.
+
+Bug: https://bugs.gentoo.org/875500
+PR to merge this upstream: https://github.com/lpereira/hardinfo/pull/681
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/includes/computer.h
++++ b/includes/computer.h
+@@ -178,4 +178,8 @@ extern GHashTable *memlabels;
+ void init_memory_labels(void);
+ void scan_memory_do(void);
+
++void scan_boots_real(void);
++void scan_languages(OperatingSystem * os);
++void scan_groups_do(void);
++
+ #endif /* __COMPUTER_H__ */
+--- a/includes/devices.h
++++ b/includes/devices.h
+@@ -66,6 +66,14 @@ void scan_printers_do(void);
+ void scan_sensors_do(void);
+ void sensor_init(void);
+ void sensor_shutdown(void);
++void __scan_dtree(void);
++void scan_gpu_do(void);
++gboolean __scan_udisks2_devices(void);
++void __scan_ide_devices(void);
++void __scan_scsi_devices(void);
++void __scan_input_devices(void);
++void __scan_usb(void);
++void __scan_dmi(void);
+
+ extern gchar *battery_list;
+ extern gchar *input_icons;--- a/includes/hardinfo.h
++++ b/includes/hardinfo.h
+@@ -230,4 +230,6 @@ gg_strescape (const gchar *source,
+ gboolean note_cond_bullet(gboolean cond, gchar *note_buff, const gchar *desc_str);
+ gboolean note_require_tool(const gchar *tool, gchar *note_buff, const gchar *desc_str);
+
++int cpu_procs_cores_threads(int *p, int *c, int *t);
++
+ #endif /* __HARDINFO_H__ */
+--- a/includes/udisks2_util.h
++++ b/includes/udisks2_util.h
+@@ -56,3 +56,5 @@ void udisks2_init();
+ void udisks2_shutdown();
+ GSList *get_udisks2_temps();
+ GSList *get_udisks2_all_drives_info();
++void udiskt_free(udiskt *u);
++void udiskd_free(udiskd *u);
+--- a/modules/benchmark/bench_results.c
++++ b/modules/benchmark/bench_results.c
+@@ -20,6 +20,7 @@
+
+ #include <inttypes.h>
+ #include <json-glib/json-glib.h>
++#include "nice_name.h"
+
+ /* in dmi_memory.c */
+ uint64_t memory_devices_get_system_memory_MiB();
+--- a/modules/computer/boots.c
++++ b/modules/computer/boots.c
+@@ -21,6 +21,8 @@
+ #include "hardinfo.h"
+ #include "computer.h"
+
++extern void scan_os(gboolean reload);
++
+ void
+ scan_boots_real(void)
+ {
+--- a/modules/devices/dmi.c
++++ b/modules/devices/dmi.c
+@@ -146,7 +146,7 @@ gboolean dmi_get_info(void)
+ return dmi_succeeded;
+ }
+
+-void __scan_dmi()
++void __scan_dmi(void)
+ {
+ gboolean dmi_ok;
+
+--- a/modules/devices/gpu.c
++++ b/modules/devices/gpu.c
+@@ -24,8 +24,6 @@
+ #include "devices.h"
+ #include "gpu_util.h"
+
+-void scan_gpu_do(void);
+-
+ gchar *gpu_list = NULL;
+ gchar *gpu_summary = NULL;
+
+--- a/modules/devices/inputdevices.c
++++ b/modules/devices/inputdevices.c
+@@ -20,6 +20,7 @@
+
+ #include "hardinfo.h"
+ #include "devices.h"
++#include "usb_util.h"
+
+ gchar *input_icons = NULL;
+
+--- a/modules/devices/pci.c
++++ b/modules/devices/pci.c
+@@ -177,7 +177,7 @@ void scan_pci_do(void) {
+ gchar *pci_icons = g_strdup("");
+
+ pcid_list list = pci_get_device_list(0,0);
+- list = g_slist_sort(list, pcid_cmp_by_addy);
++ list = g_slist_sort(list, (GCompareFunc)pcid_cmp_by_addy);
+ GSList *l = list;
+
+ int c = 0;
+--- a/includes/network.h
++++ b/includes/network.h
+@@ -9,5 +9,7 @@ extern gchar *network_interfaces;
+ extern gchar *network_icons;
+
+ void scan_net_interfaces(void);
++void scan_samba(void);
++void scan_nfs_shared_directories(void);
+
+-#endif /* __NETWORK_H__ */
+\ No newline at end of file
++#endif /* __NETWORK_H__ */
+--- a/shell/callbacks.c
++++ b/shell/callbacks.c
+@@ -27,9 +27,11 @@
+ #include "report.h"
+ #include "syncmanager.h"
+ #include "xmlrpc-server.h"
++#include "uri_handler.h"
+
+ #include "config.h"
+
++
+ void cb_sync_manager()
+ {
+ Shell *shell = shell_get_main_shell();
+--- a/shell/report.c
++++ b/shell/report.c
+@@ -23,6 +23,7 @@
+ #include <iconcache.h>
+ #include <hardinfo.h>
+ #include <config.h>
++#include "uri_handler.h"
+
+ static ReportDialog *report_dialog_new(GtkTreeModel * model,
+ GtkWidget * parent);
+--- a/shell/shell.c
++++ b/shell/shell.c
+@@ -32,6 +32,7 @@
+ #include "iconcache.h"
+ #include "menu.h"
+ #include "stock.h"
++#include "uri_handler.h"
+
+ #include "callbacks.h"
+
+--- a/hardinfo/hardinfo.c
++++ b/hardinfo/hardinfo.c
+@@ -27,6 +27,8 @@
+
+ #include <binreloc.h>
+
++#include "dmi_util.h"
++
+ ProgramParameters params = { 0 };
+
+ int main(int argc, char **argv)
+--- a/includes/storage_util.h
++++ b/includes/storage_util.h
+@@ -18,4 +18,5 @@ GSList *get_udisks2_drives_ext();
+ u2driveext* u2drive_ext(udiskd * udisks_drive_data);
+ void u2driveext_free(u2driveext *u);
+
+-void udisks2_shutdown();
++void udisks2_shutdown(void);
++void storage_shutdown(void);
+--- a/modules/devices.c
++++ b/modules/devices.c
+@@ -39,6 +39,7 @@
+ #include "devices.h"
+ #include "dt_util.h"
+ #include "udisks2_util.h"
++#include "storage_util.h"
+ #include "pci_util.h"
+
+ gchar *callback_processors();
+--- a/modules/benchmark.c
++++ b/modules/benchmark.c
+@@ -31,6 +31,7 @@
+
+ #include "appf.h"
+ #include "benchmark.h"
++#include "cpu_util.h"
+
+ #include "benchmark/bench_results.c"
+
+--- a/modules/benchmark/sysbench.c
++++ b/modules/benchmark/sysbench.c
+@@ -19,6 +19,7 @@
+
+ #include "hardinfo.h"
+ #include "benchmark.h"
++#include "cpu_util.h"
+
+ #define STATMSG "Performing Alexey Kopytov's sysbench memory benchmark"
+
+--- a/modules/devices/printers.c
++++ b/modules/devices/printers.c
+@@ -16,6 +16,10 @@
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#ifndef _XOPEN_SOURCE
++#define _XOPEN_SOURCE
++#endif /* _XOPEN_SOURCE */
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
diff --git a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
index f33802bc1fe..3185f5988b5 100644
--- a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
+++ b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lpereira/hardinfo/archive/${GIT_COMMIT}.tar.gz -> ${
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
IUSE="debug"
RDEPEND="dev-libs/glib:2
diff --git a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20221113.ebuild b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20221113.ebuild
new file mode 100644
index 00000000000..0a54f97486b
--- /dev/null
+++ b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20221113.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake
+
+GIT_COMMIT="a798cbaed6f1b083cc3c26dbede74cf40947d0ef"
+
+DESCRIPTION="System information and benchmark tool for Linux systems"
+HOMEPAGE="https://github.com/lpereira/hardinfo"
+SRC_URI="https://github.com/lpereira/hardinfo/archive/${GIT_COMMIT}.tar.gz -> ${P}-${GIT_COMMIT}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/glib:2
+ dev-libs/json-glib
+ net-libs/libsoup:2.4
+ sys-libs/zlib
+ x11-libs/cairo
+ >=x11-libs/gtk+-3.0:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+
+PATCHES=( "${FILESDIR}"/hardinfo-0.6-fix-function-declarations.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DHARDINFO_GTK3=1
+ -DHARDINFO_DEBUG=$(usex debug 1 0)
+ )
+ cmake_src_configure
+}
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
index a39733bcf46..b52c2d17eb3 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
DEPEND=">=dev-lang/ghc-6.12.1:="
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 61880caaecf..60c333cdae8 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1 +1,2 @@
DIST hcloud-1.30.3.tar.xz 1690980 BLAKE2B 115a6769d5bd5e6a10d812502506f9921a7659a262eea7088c88205e9fc748a570c1c9830e5061923f1be18a64d96104e6e930c9edc3316645e5d86450fbf69c SHA512 64bc692b8d098149815ba63aec8346a7f4f2ff7461fac3369343595a733a5c727b41ec8341e4eee1a98804b14bfc5a94ff9fc0621abb798d381d9bc802818b77
+DIST hcloud-1.30.4.tar.xz 1725492 BLAKE2B 25af9abb1bcc3e7dce880774716c1abe8e4c7da52e5ae7e7bf1c872e50ee0f66358b981df3401cb97ede1b6c6950b97751b8200a72713d9dcf557891b3e7d81e SHA512 d3572be3ebce21d3dece129d391261fd1ff8a769660509cd67946815d1782d5dcf003b2539b3eb9a9b6e40bfd9b452e438fc7b0ff2805a7808ad8ad9f32c3ed0
diff --git a/app-admin/hcloud/hcloud-1.30.4.ebuild b/app-admin/hcloud/hcloud-1.30.4.ebuild
new file mode 100644
index 00000000000..82ba00ab5dc
--- /dev/null
+++ b/app-admin/hcloud/hcloud-1.30.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+QA_FLAGS_IGNORED=".*"
+
+src_compile() {
+ go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_test() {
+ # For upstream a simple test is run 'hcloud version'
+ ./hcloud version
+ if [[ $? -ne 0 ]]
+ then
+ die "Test failed"
+ fi
+}
+
+src_install() {
+ dobin ${PN}
+}
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
index f057c474627..c3e338c7db9 100644
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@@ -3,8 +3,9 @@
<pkgmetadata>
<!-- maintainer-needed -->
<use>
- <flag name="network-cron">
- Monthly cronjob to update hddtemp.db.
- </flag>
+ <flag name="network-cron">Monthly cronjob to update hddtemp.db.</flag>
</use>
+ <upstream>
+ <remote-id type="savannah-nongnu">hddtemp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 4ce12b6e9d0..ceaf44e8517 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,4 +1,4 @@
-DIST helm-3.8.1-deps.tar.xz 374838312 BLAKE2B 13700d77faef89828a98b0410f1539c4370848d3f741881dfff4fb6d08b50d152052b4c1fa7ce4fe19d1d08583530c89f9e8ca35ede178b08c05dbecbdf36fbb SHA512 5686ca6c3f9b114032dda78842c3e3d2012f97d5721455aedc204ffae8a6bdafcb5191beaaca0e89cb827a7846fe65658d4440c2982b36b008e8aa235be41736
+DIST helm-3.10.1-deps.tar.xz 125283080 BLAKE2B 3a7354a910174a2b6e80da90da37c7e5884273cdec2657e101e444587f92fcdda243e3539c481a1339bc1c20314ded1126b7953064758756d590bd82fb9bca42 SHA512 99ad12cc7b7b873f3b1988e5f9d53c55b8d54a29081804e6d4f9b233aebaeb9d0454c7e5aff9ca4a370fda96f4fda8f40e5fade3af4075da15340e44ee8f3973
DIST helm-3.9.4-deps.tar.xz 126444776 BLAKE2B b506593f17afcc1c4e70b99eed44c2142c114503c92f01c19ae7bbf92867899a9058d80806bb16ff470e1c81bf2490183651d522a242487aa1c5ce29d7f63ad3 SHA512 ed07887c740d74b66d489eb5e0419a3e61cfc575684a8c02b507cb297bdbc12d80beb6a13b502349c3fc9806db16e0d2625d3f13747baf68d108cca22eb9c7c7
-DIST k8s-helm-3.8.1.tar.gz 715683 BLAKE2B 2b0fc2a844f848e2a696be54224c1ca6027bf461c0885b3e082b57a09117b6ebc2500b35f1e6ad03cdc7ad4d0f18b3b6c24a1e79782b1b0492effc6a80031a93 SHA512 c4c3c8272ac4d83fad7dcdd41f81e9123ee71b01b6ebf352c3f3836048d7d240e144a52fd78e156c1957020bb1e4a868059486a4a4c3d37e4be150203a1e6158
+DIST k8s-helm-3.10.1.tar.gz 701955 BLAKE2B 869e93ffdedbfd0dc405b287ca6fcd7dc3943f6d51b13c5482a48589235ada7e080aa8d0fcbd3b640e486c90e795bf563a5c6367f4f6116be6357a6cd1052113 SHA512 5d72ef0031b9988ad3d263ed349dd0e1770ccdbeb0e05e057f375a5b6c3bdf5d214f8d7bd004b8500846269e4acdde6f51206d8c422a4a4af7341baa6cdd348e
DIST k8s-helm-3.9.4.tar.gz 704880 BLAKE2B c96e474ca882fe0b7ba5d9045f04a4e6af62f4d9d3c735f0ae89d03eac06c0c8118ba1b7ffcb7594ad23707c88c7e10d781de4701b8300e124ae767f8917dae1 SHA512 8a02d094744036bcbfeefdd369b2e5e725c0e08cc2891e07aaebf4656fc62030e91ea00b97c1f8ebe33f2e436927d380b24e416509c944468165d35c892bf846
diff --git a/app-admin/helm/helm-3.8.1.ebuild b/app-admin/helm/helm-3.10.1.ebuild
index c0d0f73bf80..ff7b42ae974 100644
--- a/app-admin/helm/helm-3.8.1.ebuild
+++ b/app-admin/helm/helm-3.10.1.ebuild
@@ -3,8 +3,8 @@
EAPI=8
inherit bash-completion-r1 go-module
-GIT_COMMIT=5cb9af4b1b271d11d7a97a71df3ac337dd94ad37
-GIT_SHA=5cb9af4b
+GIT_COMMIT=9f88ccb6aee40b9a0535fcc7efea6055e1ef72c9
+GIT_SHA=9f88ccb6
MY_PV=${PV/_rc/-rc.}
DESCRIPTION="Kubernetes Package Manager"
@@ -12,9 +12,9 @@ HOMEPAGE="https://github.com/helm/helm https://helm.sh"
SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~riscv"
RESTRICT=" test"
diff --git a/app-admin/helm/helm-3.9.4.ebuild b/app-admin/helm/helm-3.9.4.ebuild
index d707e550387..68afbf1f982 100644
--- a/app-admin/helm/helm-3.9.4.ebuild
+++ b/app-admin/helm/helm-3.9.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/helm/helm https://helm.sh"
SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~riscv"
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index f0479c7ab83..40e3c23e67d 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,3 @@
DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
+DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842
+DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb
diff --git a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch
new file mode 100644
index 00000000000..52ca2b7eb61
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch
@@ -0,0 +1,14 @@
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 776c40d9..477bf179 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -233,9 +233,6 @@ if(WITH_XC_BROWSER)
+ LIBS ${TEST_LIBRARIES})
+ endif()
+
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+- LIBS testsupport cli ${TEST_LIBRARIES})
+-
+ if(WITH_GUI_TESTS)
+ add_subdirectory(gui)
+ endif(WITH_GUI_TESTS)
diff --git a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
new file mode 100644
index 00000000000..ccee26cb5ba
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
@@ -0,0 +1,13 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -231,10 +231,6 @@ if(WITH_XC_BROWSER)
+ LIBS ${TEST_LIBRARIES})
+ endif()
+
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+- LIBS testsupport cli ${TEST_LIBRARIES})
+-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")
+-
+ if(WITH_GUI_TESTS)
+ add_subdirectory(gui)
+ endif(WITH_GUI_TESTS)
diff --git a/app-admin/keepassxc/keepassxc-2.7.3.ebuild b/app-admin/keepassxc/keepassxc-2.7.3.ebuild
new file mode 100644
index 00000000000..fe3795ec295
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+ https://github.com/keepassxreboot/keepassxc/"
+
+if [[ "${PV}" != *9999 ]] ; then
+ if [[ "${PV}" == *_beta* ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P/_/-}"
+ else
+ #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+ fi
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+ [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+ app-crypt/argon2:=
+ dev-libs/botan:2=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-gfx/qrencode:=
+ sys-libs/readline:0=
+ sys-libs/zlib:=
+ X? ( dev-qt/qtx11extras:5 )
+ autotype? (
+ x11-libs/libX11
+ x11-libs/libXtst
+ )
+ keeshare? ( sys-libs/zlib:=[minizip] )
+ yubikey? (
+ dev-libs/libusb:1
+ sys-apps/pcsc-lite
+ )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ doc? ( dev-ruby/asciidoctor )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_prepare() {
+ if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
+ printf '%s' "${PV}" > .version || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # https://github.com/keepassxreboot/keepassxc/issues/5801
+ filter-flags -flto*
+
+ local mycmakeargs=(
+ # Gentoo users enable ccache via e.g. FEATURES=ccache or
+ # other means. We don't want the build system to enable it for us.
+ -DWITH_CCACHE=OFF
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_DOCS="$(usex doc)"
+ -DWITH_XC_BROWSER="$(usex browser)"
+ -DWITH_XC_FDOSECRETS=ON
+ -DWITH_XC_KEESHARE="$(usex keeshare)"
+ -DWITH_XC_NETWORKING="$(usex network)"
+ -DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_UPDATECHECK=OFF
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ -DWITH_XC_X11="$(usex X)"
+ )
+ if [[ "${PV}" == *_beta* ]] ; then
+ mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+ fi
+ cmake_src_configure
+}
diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
new file mode 100644
index 00000000000..7608f162fbf
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+ https://github.com/keepassxreboot/keepassxc/"
+
+if [[ "${PV}" != *9999 ]] ; then
+ if [[ "${PV}" == *_beta* ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P/_/-}"
+ else
+ #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+ fi
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+ [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+ app-crypt/argon2:=
+ dev-libs/botan:2=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-gfx/qrencode:=
+ sys-libs/readline:0=
+ sys-libs/zlib:=
+ X? ( dev-qt/qtx11extras:5 )
+ autotype? (
+ x11-libs/libX11
+ x11-libs/libXtst
+ )
+ keeshare? ( sys-libs/zlib:=[minizip] )
+ yubikey? (
+ dev-libs/libusb:1
+ sys-apps/pcsc-lite
+ )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ doc? ( dev-ruby/asciidoctor )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_prepare() {
+ if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
+ printf '%s' "${PV}" > .version || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # https://github.com/keepassxreboot/keepassxc/issues/5801
+ filter-flags -flto*
+
+ local mycmakeargs=(
+ # Gentoo users enable ccache via e.g. FEATURES=ccache or
+ # other means. We don't want the build system to enable it for us.
+ -DWITH_CCACHE=OFF
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_DOCS="$(usex doc)"
+ -DWITH_XC_BROWSER="$(usex browser)"
+ -DWITH_XC_FDOSECRETS=ON
+ -DWITH_XC_KEESHARE="$(usex keeshare)"
+ -DWITH_XC_NETWORKING="$(usex network)"
+ -DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_UPDATECHECK=OFF
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ -DWITH_XC_X11="$(usex X)"
+ )
+ if [[ "${PV}" == *_beta* ]] ; then
+ mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+ fi
+ cmake_src_configure
+}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 985aebc0d67..0e1b46d2f29 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -6,7 +6,8 @@ EAPI=8
inherit cmake flag-o-matic xdg
DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
+HOMEPAGE="https://keepassxc.org/
+ https://github.com/keepassxreboot/keepassxc/"
if [[ "${PV}" != *9999 ]] ; then
if [[ "${PV}" == *_beta* ]] ; then
@@ -67,7 +68,7 @@ src_prepare() {
printf '%s' "${PV}" > .version || die
fi
- cmake_src_prepare
+ cmake_src_prepare
}
src_configure() {
diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
index a608739dade..dc74e3197e6 100644
--- a/app-admin/keepassxc/metadata.xml
+++ b/app-admin/keepassxc/metadata.xml
@@ -14,7 +14,7 @@
<flag name="browser">Enables browser plugin support</flag>
<flag name="keeshare">Enable KeeShare sharing integration</flag>
<flag name="network">Enable network support</flag>
- <flag name="yubikey">Enable database unlocking via YubiKey.</flag>
+ <flag name="yubikey">Enable database unlocking via hardware keys supporting YubiKey-style HMAC-SHA1 protocol</flag>
</use>
<longdescription>
KeePassXC provides a safe location for your passwords and similar
diff --git a/app-admin/lnav/lnav-0.11.0.ebuild b/app-admin/lnav/lnav-0.11.0.ebuild
index f55799d7af6..7847867ce5a 100644
--- a/app-admin/lnav/lnav-0.11.0.ebuild
+++ b/app-admin/lnav/lnav-0.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="pcap test"
RESTRICT="!test? ( test )"
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 3d9824eccfa..e0a837dbfe5 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,2 +1,4 @@
DIST logstash-7.17.5-linux-x86_64.tar.gz 363609474 BLAKE2B b6f6065a997a7401ad6e14d5f1fd6b2a924cf734cab0b7e07444cb800420f3c7b2634cd0be693ce0cddce909f49675b00764fa05ca4f3c3ab75a72387fffd629 SHA512 6508b9ba1a6672fd560773d2282501f9d022bf67a75f2b046ec31219cc78cbf8d35040827838948c69458089a9b30fdf21cbb5c2cc3f67c0812662265e9518dc
+DIST logstash-7.17.7-linux-x86_64.tar.gz 364120719 BLAKE2B 42622b2a4f3b53151de4effcc248e2225d2a2bb42a2e8ee5b0408c671050c27006910a956cdf8c4ad97ae9cce36a119d86d8234a86eeae3f19cdaa3da36bda3c SHA512 eb8d01ad82808598c4d34da9194f069a0c55e86d70a9d0c7d78555fc47d156ec4b19ed1df9096b953171e8ee918ec97db6a46c7871fe328ee544848b22812bdc
DIST logstash-oss-7.17.5-linux-x86_64.tar.gz 363419923 BLAKE2B 7423ca08f5821439059be89be46df2a3927722ee48a7fcb95b1015f0539526c6ad99a4e11e85e5d6ff2aa340ad5421d1ce9ac26043dd70b1b4ebeeba8c4eaab3 SHA512 d86cc76f52975128c6e9ccec6217a1f289b88048b19cc6c19f8247c614c056532b960f7e4a9f3c7b7a4ea81596e9ca3b7df19249811445273668403f18af5c74
+DIST logstash-oss-7.17.7-linux-x86_64.tar.gz 363922131 BLAKE2B 2cc8754b0edd5d1354c258e6da163a6cd806d8e9e58f291b4c81e5a39a6b9c267fea807a4b062e7cb171adce926cb711a075f29804d1629d07bb28bcef47620f SHA512 f8a9a09bcc234598cf47334f59bb8651255ed16780baec0547f21cdd79c47caa5da1330c652c0dfb0bb147ac262e1ec9320e80b76f37ad89e05350c6239e4dad
diff --git a/app-admin/logstash-bin/logstash-bin-7.17.7.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.7.ebuild
new file mode 100644
index 00000000000..bcfbba4ea84
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.17.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+ !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+ acct-user/logstash
+ virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ local d
+ for d in aarch64-FreeBSD aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \
+ i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
+ ppc-AIX s390x-Linux sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \
+ x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do
+ rm -r vendor/jruby/lib/jni/$d || die
+ done
+
+ # remove bundled java
+ rm -r jdk || die
+}
+
+src_install() {
+ keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+ keepdir "/var/log/${MY_PN}"
+
+ insinto "/usr/share/${MY_PN}"
+ newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+ rm -v config/{pipelines.yml,startup.options} || die
+ insinto /etc/${MY_PN}
+ doins -r config/.
+ doins "${FILESDIR}/pipelines.yml"
+ rm -rv config data || die
+
+ insinto "/opt/${MY_PN}"
+ doins -r .
+ fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+ newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+ newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+ insinto /usr/share/eselect/modules
+ doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+ ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+ ewarn "Install the plugins via eselect module that will automatically re-install"
+ ewarn "all self installed plugins after Logstash upgrades."
+ elog
+ elog "Installing plugins:"
+ elog "eselect logstash-plugin install logstash-output-gelf"
+ elog
+
+ elog "Reinstalling self installed plugins (installed via eselect module):"
+ eselect logstash-plugin reinstall
+
+ elog
+ elog "Sample configuration:"
+ elog "${EROOT}/usr/share/${MY_PN}"
+ elog
+ elog "The default pipeline configuration expects the configuration(s) to be found in:"
+ elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10.ebuild
index 01909b500c1..c445af8a5b5 100644
--- a/app-admin/makepasswd/makepasswd-1.10.ebuild
+++ b/app-admin/makepasswd/makepasswd-1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-lang/perl"
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 4ea53304840..3e30d27af4e 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,2 +1,3 @@
DIST mcelog-182.tar.gz 314857 BLAKE2B fc0716a468ce3eb4fd08806913c7e5e7481f0181f1217bf6e7bc6d675651dd04adac3cd0927428a6f88b15ddd919fbb1c26a4cfd977c3d902906fc09170bb1b3 SHA512 546fd30d16b00efb79e0df49c4c2d7cff08280762f04c4f67c3ceed500dcd19ba63a6eeb55f6ee444f9bbae04431745eb8aa3ded609c10e6be69cf5dd7722443
DIST mcelog-189.tar.gz 314373 BLAKE2B fcd0a2c52eaa8e75b5d4233190e5daccef2500fba024f505a109bd4b4b69881fc65fe28a15c7a1dea7fcc8ad7d3c6a67e14891ae486d5fa352ccaeae7a71fbd7 SHA512 391123c6153788c533dc8caa749997732495206d59801fde80380c2dbc188236a78bd18bfb6fb27fa9112f436dd3e66314f75ce5aed2c85f3a821fe0c12ff7ea
+DIST mcelog-190.tar.gz 314409 BLAKE2B 287b5ccba24ef7afe4b2653f2ab8ddd9ae94451e1131941d61031042a039cb9ed633f75b0ddf0035f3fef023cdf67c5c0b01169d0afac4ae47f9badcc55d16ef SHA512 26347d5255c602189961c63f8bf44f0c73b8f7fb0d455108c604a84e73e00303646961759101aab42157d12a7678f8c47277829b0460b0832a64c8b5c913d952
diff --git a/app-admin/mcelog/mcelog-190.ebuild b/app-admin/mcelog/mcelog-190.ebuild
new file mode 100644
index 00000000000..b365ebd2434
--- /dev/null
+++ b/app-admin/mcelog/mcelog-190.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+DEPEND="${PYTHON_DEPS}"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~X86_MCE"
+ kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+ eapply_user
+ tc-export CC
+ python_fix_shebang genconfig.py
+}
+
+src_install() {
+ default
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit ${PN}.service
+
+ dodoc *.pdf
+}
diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
index acdb1bbf359..61646ab7d05 100644
--- a/app-admin/metalog/metadata.xml
+++ b/app-admin/metalog/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">metalog</remote-id>
+ <remote-id type="github">hvisage/metalog</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-admin/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
index e9500dd5af8..c24b007e3b9 100644
--- a/app-admin/openrc-settingsd/metadata.xml
+++ b/app-admin/openrc-settingsd/metadata.xml
@@ -1,12 +1,14 @@
<?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="systemd">Use the versions of dbus and polkit files provided by
- <pkg>sys-apps/systemd</pkg></flag>
-</use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="systemd">Use the versions of dbus and polkit files provided by <pkg>sys-apps/systemd</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="gitlab">postmarketOS/openrc-settingsd</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch
new file mode 100644
index 00000000000..315983c9af3
--- /dev/null
+++ b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch
@@ -0,0 +1,11 @@
+--- a/procinfo.cpp
++++ b/procinfo.cpp
+@@ -211,7 +211,7 @@ int mainLoop(bool perSecond, bool showTotals, bool showTotalsMem, bool fullScree
+ try {
+ rows = getNetStats(perSecond, showTotals, skipIfaces, elapsed);
+ } catch (string exceptionMessage) {
+- print(exceptionMessage.c_str());
++ print("%s", exceptionMessage.c_str());
+ }
+ print("\n");
+ prettyPrint(rows, rowWidth, true);
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild
index c1fe7c22496..d9384bee0dd 100644
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools
+inherit autotools flag-o-matic
DESCRIPTION="Completely rewrite of the old system monitoring app procinfo"
HOMEPAGE="https://sourceforge.net/projects/procinfo-ng/"
@@ -13,17 +13,26 @@ LICENSE="|| ( GPL-2 LGPL-2.1 )"
SLOT="0"
KEYWORDS="amd64 ~hppa x86"
-RDEPEND="sys-libs/ncurses:0="
+RDEPEND="sys-libs/ncurses:="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-autotools.patch
"${FILESDIR}"/${P}-man.patch
+ "${FILESDIR}"/${P}-wformat-security.patch
)
src_prepare() {
default
+
mv configure.{in,ac} || die
eautoreconf
}
+
+src_configure() {
+ # bug #719790
+ append-cxxflags -std=c++03
+
+ default
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 2660f00cb16..e7eff448d61 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,4 +1,4 @@
-DIST puppet-agent_7.18.0-1focal_amd64.deb 33767214 BLAKE2B def38171c1e0cad50cdffc8aada569af0996b1b7e3f788ffa3c5e3b05d0456d2776f2d12a4cf2f8a9227ebf3c1c13b52fa28f210249b04a54de1fbbc19f26c30 SHA512 387d3e1ca3a05c107411dc7a126b2984e8dacf3580823022c0010f33b08305b6722d8a1babee7825b8f60769589b1f166991931f66a484d94a17ac7d437141e1
-DIST puppet-agent_7.18.0-1focal_arm64.deb 33559710 BLAKE2B af2a4657c95dc7208b5c2f7494b9cec03f1c9ed0e73c06c150f492fa474d5620f5a58b23b7d928d4117a9b2b8c6384514b7f7000e7a6639582ebe97ab82571a7 SHA512 fafabbd00c4ef03b3bd6d9680bc78ada42ffefa8bc8186f24203be277e01267363f0ff35f176f3f04057c46ff437bbb957d4416ce5b6ffc1b3e1f79492c2ce7b
DIST puppet-agent_7.19.0-1focal_amd64.deb 33779898 BLAKE2B 40ced6309bc82a2a917572b35d2e6271f53c1b56721cf5d389b7a297774c08fb430915880279a11c1b4d803582793340127b21283202b527e2ecf826176c314d SHA512 2d8658a0f1b684ae07b2a8a87e130d210283bdc78b1a10750605e970cc9a2310967c85bc054c9e018d38fbc955708d6ebdb205b5562df6ea475386be9ea02581
DIST puppet-agent_7.19.0-1focal_arm64.deb 33570768 BLAKE2B 21f7c6c8a42a14156f209313f0dce40336a53fdb097abe620edcb92b2cceaa20e08adec8fc22241886eac3ad0a7ba94d805dc1e2d9bbd37853ff037a49f004fd SHA512 306236a7543f01b3fb95edbe3b442717a64aeb22d696c9961a770e9da40b2bb58835c6d9488b03109b81f8b748106189c361d5f047e9202700e0801486d18206
+DIST puppet-agent_7.20.0-1focal_amd64.deb 33766302 BLAKE2B 665f4d4d8c3b096ec5f270428d0b865dc10b77c51113f65f9e66ab6bb72c3b21a07acd9433f2cc1e4e05c0fb30a11884f0bfe7a5a8a9a1d882bdd049a5490b84 SHA512 91b7eef80bc5e288f8a59a52d41340d1bc921e0754151952a3921575787e4cec1f101039c75a01ca6e7e4a5512224922be0c5be7a676d92bb19d3de291a7ab8c
+DIST puppet-agent_7.20.0-1focal_arm64.deb 33547934 BLAKE2B 323d76ac12af0c97cf38b8a78454be89c900eebcc9b1517c716700badf8845c062d2c4eb2f633ed1b6ffc36cb42e7e16a3e4e815637e92c209bc6f3c40cfd525 SHA512 a04727c71cf241e352d14bcc09eb340199a7e42b18be574d822a793ff9d91ff1e1879d67724dbf2133a6a3842fa86ed45b048845c73a5669fab45dacea3e616a
diff --git a/app-admin/puppet-agent/puppet-agent-7.18.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.20.0.ebuild
index 0776db0b3b8..0776db0b3b8 100644
--- a/app-admin/puppet-agent/puppet-agent-7.18.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.20.0.ebuild
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index a4487a4863b..291db5bb89a 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,3 +1,3 @@
DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
-DIST puppet-7.18.0.tar.gz 2816776 BLAKE2B 7c653744a9aa694c6e7558295d33fa8de1958f333cb274a51119ce543846ce649755d5c37ba677d1cdcf2417b237611073ef523aa7a109a3e3dc0e75bd986614 SHA512 428268c9d8333c0624023a3d4b55b5dddfaa890eb6d88a31486c8de5112db4d1dce7553050de81c4b5ffd0fec74c5d10f3c09c3fb1826ffc196808f2b45495d4
DIST puppet-7.19.0.tar.gz 2817098 BLAKE2B d2d756aa236461963ac260167f9500693ea94f1b2ce7b6f881c55712f78668ce5935528a74d3a77e5b02123aeb4404c1bbfc91237622dcb68e686e920302acb9 SHA512 952ae1e77e9d9aaa0a0a731f408550fd3bf483dda9bbb12845e534e6208321db774325da8621f36535d7601bd7b8611098e486ef733428b7108f613f5dade4e0
+DIST puppet-7.20.0.tar.gz 2817232 BLAKE2B 479c4e162230371bd69509844fcd97d0d3392eb2e66578b38e6dc120dd3dd15804d73f70c1b29f1f3d9e57af539f82e605a86c9afff15e78ff48ddf482432c4d SHA512 6774bf03ad0ee80c0fd2cd8ebad60da56df7ed9818a526084fc2cf1ba2fecc81555fff200f5feef2b5d7a2275d90f44b24160de7221d682de470b511a7051f7f
diff --git a/app-admin/puppet/puppet-7.18.0.ebuild b/app-admin/puppet/puppet-7.20.0.ebuild
index b0c6d6d3ffe..0d57b77fea3 100644
--- a/app-admin/puppet/puppet-7.18.0.ebuild
+++ b/app-admin/puppet/puppet-7.20.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 9b62c55e6a8..0fd923192d7 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,2 +1 @@
-DIST puppetdb-7.11.0.tar.gz 49070151 BLAKE2B ec59603b5fa2fe38a1d848e5e4e9926bb9e9c53bfda55c5093d6ede3ef0ee2cdd2cffe8f6fa8599d4b1a533b251c13871453cf7bc378edeecff69364579db650 SHA512 160123cea5af42c6196893a3993c4fdcf3c6690e43f56d2e01342b9fd5facd8777d3eee5c7ec658535f222cf1a6e52b3ec955e4b1ddff4c3346b363be36420a5
DIST puppetdb-7.11.1.tar.gz 49075994 BLAKE2B deb1a031999f18988c44b1439670ebb370d654a7dd99f20f44cdce027fa48088eadc96adca4fc8efe298c4dcc9b62d0d607262d8a5de4d07de0f2405a0f05a36 SHA512 98238e61ae7798912e345d69ff321bd7236dea6d5230a1f9ae37c533993d29611890522dde085e18e83b87bccb5a53e49e4ad38b930bb09ce7e9f22d45776a60
diff --git a/app-admin/puppetdb/puppetdb-7.11.0.ebuild b/app-admin/puppetdb/puppetdb-7.11.0.ebuild
deleted file mode 100644
index 7eb8ddf2bae..00000000000
--- a/app-admin/puppetdb/puppetdb-7.11.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="PuppetDB collects data generated by Puppet"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
- acct-group/puppetdb"
-
-src_prepare() {
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
- sed -i 's/sysconfig/conf\.d/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
- sed -i 's/var\/run/run/g' install.sh || die
- default
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- dodir /opt/puppetlabs/server/data/puppetdb
- insinto /opt/puppetlabs/server/apps/puppetdb
- insopts -m0744
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppetdb.jar
- insinto /etc/puppetlabs/puppetdb
- doins ext/config/logback.xml
- doins ext/config/bootstrap.cfg
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetdb/conf.d
- doins ext/config/conf.d/jetty.ini
- doins ext/config/conf.d/repl.ini
- doins ext/config/conf.d/database.ini
- doins ext/config/conf.d/config.ini
- doins ext/config/conf.d/auth.conf
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
- doins ext/cli/foreground
- doins ext/cli/ssl-setup
- doins ext/cli/config-migration
- doins ext/cli/foreground
- doins ext/cli/anonymize
- doins ext/cli/reload
- doins ext/cli/start
- doins ext/cli/stop
- insinto /opt/puppetlabs/server/apps/puppetdb/bin
- doins ext/bin/puppetdb
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
- dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
- # init type tasks
- newconfd ext/default puppetdb
- systemd_dounit ext/redhat/puppetdb.service
- newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
- newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetdb.logrotate.conf puppetdb
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
- tmpfiles_process puppetdb.conf
-
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
- elog
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index b4202e516a5..deeea983ebb 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,2 +1,2 @@
-DIST puppetserver-7.9.0.tar.gz 66386534 BLAKE2B 8aac7501c9923eb67bd06e965dd766ddce290b2eaaa8c752f6c7124a13d24364ede22847fdd1171d0e71b45bae191bc3c9b0c89cc5ebf9ed78d5230b8e28bfcf SHA512 6f0acabbf332072306386b4d942532270e202801bf98dcd436884c85b969437ca51adefb51a0f99556432c4c204e03ee8d3fecdecadf5e046b037ce06619a27c
DIST puppetserver-7.9.1.tar.gz 66383400 BLAKE2B 1804191a5453ebe55c5744687cce2f6d062e397be7b29a44d2749d0880ea20995ddbd9efdc9ddcde17021c011ff5b665f3e215e49143424f7fe470d915c3b6d1 SHA512 2b8e43220480cad0d1140fdc08491bf7296b72c2eb228da56d5b569f6b39dad1c3968af1942d3a1d1b34a57d994aaa2b91edff20f1d54905477a77f3062b580c
+DIST puppetserver-7.9.2.tar.gz 59729859 BLAKE2B 15f9261ae81f280735080a75e083b4bbc5d4b9404bd52f02180173b6cab2ebfe20e38950dd6c94c5167478293056ac562994ff27a7ad955c69621c13ffa808e1 SHA512 0c047554e10ecf36d000c9f702b759e27b8168f1f2207d9b8e904c9579d8e37d8540327d898b0a9e1812ca3223aa15b7cf4da46d7a4247e5d4b8f1596f9d5f26
diff --git a/app-admin/puppetserver/puppetserver-7.9.0.ebuild b/app-admin/puppetserver/puppetserver-7.9.2.ebuild
index 7323a3ecf89..7323a3ecf89 100644
--- a/app-admin/puppetserver/puppetserver-7.9.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.9.2.ebuild
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index 47c45d71e33..45f878ee43d 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,2 +1 @@
-DIST pwman3-0.10.0.tar.gz 75726 BLAKE2B ba7331bd3d36ac23d9151a5ebd4a343e2d8c523ba8b324850139a9ba4af8404ddf23380b3eaef523251e8f4137c5c56b6ab509c3927690fc612962ff872ea820 SHA512 a6dc24b2e1405a91f35a9a9155dde5409e35ce733bacee8858930d82443c09b8017e2701bc8c45688483b6c40554e4d6266f6cd21dc6f205b13f96e7de4f57c2
DIST pwman3-0.11.1.tar.gz 76992 BLAKE2B cd7289781436f0f8b941d587c61b2d8a5cad52f3d57d01106d73b3da5930de2bd2df15fe5a4bcfbdce5e5733b7328764d6e4e2d18cba8a575cadad8835218e75 SHA512 111713e23b64a7492b5e2735b0d0117a81759bd9f25a87327a2aa4a465fbbc8a0aa0fbfa86b84cbcd40eb1540d05cdbc6fb81982fe61953df91979e674ce5640
diff --git a/app-admin/pwman3/pwman3-0.10.0-r1.ebuild b/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
deleted file mode 100644
index 2e7f722ba09..00000000000
--- a/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A lightweight password-manager with multiple database backends"
-HOMEPAGE="https://pwman3.github.io/pwman3/"
-SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
- >=dev-python/colorama-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( dev-python/pexpect[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-pkg_postinst() {
- optfeature "Support for mongodb" dev-python/pymongo
- optfeature "Support for postgresql" dev-python/psycopg:2
- optfeature "Support for mysql" dev-python/pymysql
-}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 4088d36413f..c40e37e87a4 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,12 +1,10 @@
DIST rsyslog-8.2102.0.tar.gz 3123684 BLAKE2B f5c4e00d68ec82ed3f7b89dd5e888bebda9c4eb38185dfd8ecd96c1bf77380385aaddac73ab1de8364e1239a3de746f160c18b0f135d006f473f9e40be2c18a1 SHA512 281b0e5d5cb548c39a6e514e5fd5b1bdbe8ca0bdd9234f4fea581ed7679f76d2d75b65d14c3c5e799f86f91600074ff75b467aa1ff27cdbec0f4197261c5aec0
-DIST rsyslog-8.2110.0.tar.gz 3217225 BLAKE2B df239609b7a5e08d2a5b1ab5823d45868ac75e1359876e032d4de633165878310f43bfacabab2df4b5657789f77dd2d93814d2fe2aa39e18b267b9bb9234c975 SHA512 b3ec40a272e1fee3034fb24a21ae6c773878b013c04bd01279f6b3bba65a98287c3497a3c4c3e46f8c91311117b3dc491a11a7e193f7ee0347b769c4162b48aa
DIST rsyslog-8.2112.0.tar.gz 3230105 BLAKE2B deee27f0b1e2b9783bef4d90e396c92c772465156ae8242172548794d628edb5d1e9a95d9ee2aeb2b301ec4b691572391ea7db7b1e8fdb1d14c65e3857857799 SHA512 32ee475d4ef34a68aa43997a97472d21f45c27052c528c1904786df608977189a53e8bb88f310dc2ebe3bf11857824e4e2188c5b85591a005b6977f90a6b17c3
-DIST rsyslog-8.2204.0.tar.gz 3242825 BLAKE2B 1e7a75f151053c28bf8e1215f8f1da58ee2232127b4edae6c1a59ff236b2ff0aea57fb175bcdde9a3bd3ce516015422a2eda1f857fdeb56489555de27cf2deda SHA512 d26ab950788b8931b895719f7d8a42509f709b69a76e4188df16f72be050863ee402310ad9300840fed4ac089638497725d67433172778be7b2932fa82210472
DIST rsyslog-8.2206.0.tar.gz 3246829 BLAKE2B cfe88f12821146011914610e33cb907bd96f19b6e67c0eb3f9bd88b749eebd3a91ae27e445688842a806719cfe9757778d3f9705cd2d6a497d358015c9ddf36b SHA512 000d2a05ef4823879e615a347f62f76d3af7d43cddb119e7f57a8470aade00139475368579385ba008a1d5979082128ef6148e0fac2478f6e0ccb26e68d317b7
DIST rsyslog-8.2208.0.tar.gz 3262298 BLAKE2B c13920c755a24d8060335f3281a349d2f32c3c99de7351991e09e62302f6d9f61f4390b7945e30816c7d28afe5f757f6a49b2855e40e3f2f518a423662196b1b SHA512 e63f2465011722eb1bc99676ef6afd66e655af4fb9d751b3d8776499d054c422b195c65fef9ea6b9012d9fb334b7ed8a1c918167fecff389cbb79aa6b74acb73
+DIST rsyslog-8.2210.0.tar.gz 3266727 BLAKE2B fc94e7d9b7d828c35e6117ff44d40aa421b79ecd9072cc143177cb77ac6e84adaa5e2b9ae9a66e4bb70d8b93411715f63f0e3707e53c965ef892d9146ec43c92 SHA512 c665b7f7a3c5ef31c9b62b50f815cfbb52db0cbe4a06934f4f1c3cd2a56fb49c319d33857ee92ab843aa5894cac16c16b8eccdf83714f31ab57a95049c4af231
DIST rsyslog-doc-8.2102.0.tar.gz 6419104 BLAKE2B 134c7ccde6f7435b35840fa37f5774223ac1ebd7dc10db961900a7b1600483156518433c7f70d0981e96ea750e1916ab53e346abacf58066bf141e85c719ae00 SHA512 a5dc4fb9bd8892fac693c5692b926c8d7d9fa36667d6b4c6eccba750713af88d4317f6232efc2a16de38c2e58c4a8bc4d04c9ebb2e7ebc3b0878d53eef20dd2e
-DIST rsyslog-doc-8.2110.0.tar.gz 6533014 BLAKE2B 16670903ddbbc14ef5ebc726964d1fa879849294401825a4e2c65e0ca06924830c2c882b98ab6eb6c2f639dfcf683b8c7659b49965b4280d441935126364ce9c SHA512 f0081b28d7394af30d4e1873a040208ec358d45c7336c69e99e2d6d4a2aae86a25a65d3c803b6570668e24625e50e01d5af3f9fa90f1c8cc82b45b1b6bd7a7e0
DIST rsyslog-doc-8.2112.0.tar.gz 6545985 BLAKE2B 4f6cfbbf8062a70faa67dd7168ad35bcbe2c81f80560ddb48229a332ce8ac861efe3bdaa1baeddbdd086c3e9ac8912746ba58bc64ab62f3caba8b8cc1b0014fd SHA512 8588d5fd1a79fce785db85ba162ed2fa9e5375590ee8e6d8569e75334d36683a1b977e930c096a6b3dac15596c066b46fc3105fcc5e8232ab11cf43c6eed3a55
-DIST rsyslog-doc-8.2204.0.tar.gz 6553264 BLAKE2B b4691a6bba44ec37bf310c4f7b307f85bc5d30954296ad62f77ff0f5041badf5fc40fc5680b940f6f3929da8956928dea890f7f2547f7db5e1e4141ef0855b48 SHA512 361528b95c1f02cdc2b2ca8ba5252c8215996e81ef1602e08c46be4e1fd8c1c287dd7d52ae9b2b58c0ec7fe38d7079a89e10642ac3f34fe0b6c5737968999fb4
DIST rsyslog-doc-8.2206.0.tar.gz 6553532 BLAKE2B 51288f5e819393ad6b5af1acfa030b262c1a97c9cc791606c16792201eb8f7bbc9750bb004e7592a99fa1261b971911a6c2bbe6c0b82a6c3bb067b077ce22641 SHA512 23d686241bb6422146602420e21a53208ff82f39f76258d7147dc0b5c06863f8229e1e2df06bfcae63408d06e70b68f7a0b0d216671b78302527d436091a698a
DIST rsyslog-doc-8.2208.0.tar.gz 6563848 BLAKE2B ec68684f1d7d895833f656ba6224a8013213a12b1bc7a28a268f2f629c25a3fbac7c379091f17eae24b6d71278c087e4a4cbed1656554de743fe5616a96559bf SHA512 428c2fe9e5025928d4a9d33f05f4eb20ac1bbde052b7fa2a8a0e45bfffe111eecc94eb2b6ec129de1011f0eabb106b4fb41d402b2a270e4148d3b1081e3b1da0
+DIST rsyslog-doc-8.2210.0.tar.gz 6572454 BLAKE2B feb865e3585ee441117f38de61748a6ca99767dae113cfcf2cd0d0a124cc692889be713134163fc91f4ab43b9fe530e3c7c0b84e4bd4e70081c4539297ae1406 SHA512 e7847a9307a91fdf87d6cf91d2391eb75869679905b9598310c456fb3fe1864fc06dbdc649778f5b3788e47ffda0a6d89cb894258e55db441f7df7e74b0ae9f4
diff --git a/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch b/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch
deleted file mode 100644
index 88b4a6f6c6c..00000000000
--- a/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 440fd1d51c5aa7763d3d810b542a7e373a6738eb Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl@debian.org>
-Date: Tue, 19 Oct 2021 23:00:50 +0200
-Subject: [PATCH] testbench: skip omfwd_fast_imuxsock.sh if liblogging-stdlog
- is not available
-
-Fixes #4712
----
- tests/omfwd_fast_imuxsock.sh | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/tests/omfwd_fast_imuxsock.sh b/tests/omfwd_fast_imuxsock.sh
-index bb35b58d18..10f9f19c18 100755
---- a/tests/omfwd_fast_imuxsock.sh
-+++ b/tests/omfwd_fast_imuxsock.sh
-@@ -4,6 +4,13 @@
- . ${srcdir:=.}/diag.sh init
- skip_platform "SunOS" "We have no ATOMIC BUILTINS, so OverallQueueSize counting of imdiag is NOT threadsafe and the counting will fail on SunOS"
-
-+./syslog_caller -fsyslog_inject-l -m0 > /dev/null 2>&1
-+no_liblogging_stdlog=$?
-+if [ $no_liblogging_stdlog -ne 0 ];then
-+ echo "liblogging-stdlog not available - skipping test"
-+ exit 77
-+fi
-+
- # export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout"
- export NUMMESSAGES=100000
-
diff --git a/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch
new file mode 100644
index 00000000000..4f6c6cf944b
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch
@@ -0,0 +1,40 @@
+From e2beca531157a4c0a27bcdda689bc53373e305b3 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Thu, 20 Oct 2022 18:08:11 +0200
+Subject: [PATCH] core bugfix: local hostname invalid if no global() config
+ object given
+
+The local hostname is invalidly set to "[localhost]" on rsyslog startup
+if no global() config object is present in rsyslog.conf. Sending a HUP
+corrects the hostname.
+
+This is a regression from ba00a9f25293f
+
+closes https://github.com/rsyslog/rsyslog/issues/4975,
+closes https://github.com/rsyslog/rsyslog/issues/4825
+---
+ runtime/glbl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/runtime/glbl.c b/runtime/glbl.c
+index 3a9350b903..ed9a307804 100644
+--- a/runtime/glbl.c
++++ b/runtime/glbl.c
+@@ -1396,6 +1396,7 @@ glblDoneLoadCnf(void)
+ stddbg = -1;
+ }
+
++finalize_it:
+ /* we have now read the config. We need to query the local host name now
+ * as it was set by the config.
+ *
+@@ -1404,8 +1405,7 @@ glblDoneLoadCnf(void)
+ * are taken from that queue, the hostname will be adapted.
+ */
+ queryLocalHostname();
+-
+-finalize_it: RETiRet;
++ RETiRet;
+ }
+
+
diff --git a/app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild
deleted file mode 100644
index 5deb90e1c97..00000000000
--- a/app-admin/rsyslog/rsyslog-8.2204.0-r1.ebuild
+++ /dev/null
@@ -1,490 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
- inherit git-r3
-else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
- SRC_URI="
- https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
- doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
- "
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- kubernetes? ( normalize )
- ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
- virtual/pkgconfig
- test? (
- jemalloc? ( <sys-libs/libfaketime-0.9.7 )
- !jemalloc? ( sys-libs/libfaketime )
- ${PYTHON_DEPS}
- )"
-
-RDEPEND="
- >=dev-libs/libfastjson-0.99.8:=
- >=dev-libs/libestr-0.1.9
- >=sys-libs/zlib-1.2.5
- curl? ( >=net-misc/curl-7.35.0 )
- dbi? ( >=dev-db/libdbi-0.8.3 )
- elasticsearch? ( >=net-misc/curl-7.35.0 )
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
- imhttp? (
- dev-libs/apr-util
- www-servers/civetweb
- virtual/libcrypt:=
- )
- impcap? ( net-libs/libpcap )
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
- kerberos? ( virtual/krb5 )
- kubernetes? ( >=net-misc/curl-7.35.0 )
- mdblookup? ( dev-libs/libmaxminddb:= )
- mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
- mysql? ( dev-db/mysql-connector-c:= )
- normalize? (
- >=dev-libs/liblognorm-2.0.3:=
- )
- clickhouse? ( >=net-misc/curl-7.35.0 )
- omhttpfs? ( >=net-misc/curl-7.35.0 )
- omudpspoof? ( >=net-libs/libnet-1.1.6 )
- postgres? ( >=dev-db/postgresql-8.4.20:= )
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
- redis? (
- >=dev-libs/hiredis-0.11.0:=
- dev-libs/libevent[threads]
- )
- relp? ( >=dev-libs/librelp-1.2.17:= )
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
- rfc5424hmac? (
- >=dev-libs/openssl-0.9.8y:0=
- )
- snmp? ( >=net-analyzer/net-snmp-5.7.2 )
- ssl? (
- gnutls? ( >=net-libs/gnutls-2.12.23:0= )
- openssl? (
- dev-libs/openssl:0=
- )
- )
- systemd? ( >=sys-apps/systemd-234 )
- uuid? ( sys-apps/util-linux:0= )
- xxhash? ( dev-libs/xxhash:= )
- zeromq? (
- >=net-libs/czmq-4:=[drafts]
- )"
-
-DEPEND="
- ${RDEPEND}
- elibc_musl? ( sys-libs/queue-standalone )
-"
-
-if [[ ${PV} == "9999" ]]; then
- BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
- BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
- BDEPEND+=" >=sys-devel/bison-2.4.3"
- BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_fetch
- git-r3_checkout
- else
- unpack ${P}.tar.gz
- fi
-
- if use doc; then
- if [[ ${PV} == "9999" ]]; then
- local _EGIT_BRANCH=
- if [[ -n "${EGIT_BRANCH}" ]]; then
- # Cannot use rsyslog commits/branches for documentation repository
- _EGIT_BRANCH=${EGIT_BRANCH}
- unset EGIT_BRANCH
- fi
-
- git-r3_fetch "${DOC_REPO_URI}"
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
- if [[ -n "${_EGIT_BRANCH}" ]]; then
- # Restore previous EGIT_BRANCH information
- EGIT_BRANCH=${_EGIT_BRANCH}
- fi
- else
- cd "${S}" || die "Cannot change dir into '${S}'"
- mkdir docs || die "Failed to create docs directory"
- cd docs || die "Failed to change dir into '${S}/docs'"
- unpack ${PN}-doc-${PV}.tar.gz
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # https://github.com/rsyslog/rsyslog/issues/3626
- sed -i \
- -e '\|^#!/bin/bash$|a exit 77' \
- tests/mmkubernetes-cache-expir*.sh \
- || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
- eautoreconf
-}
-
-src_configure() {
- # Maintainer notes:
- # * Guardtime support is missing because libgt isn't yet available
- # in portage.
- # * Hadoop's HDFS file system output module is currently not
- # supported in Gentoo because nobody is able to test it
- # (JAVA dependency).
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
- # upstream PR 129 and 136) so we need to export HIREDIS_*
- # variables because rsyslog's build system depends on pkg-config.
-
- if use redis; then
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
- fi
-
- local myeconfargs=(
- --disable-debug-symbols
- --disable-generate-man-pages
- --without-valgrind-testbench
- --disable-liblogging-stdlog
- $(use_enable test testbench)
- $(use_enable test libfaketime)
- $(use_enable test extended-tests)
- # Input Plugins without dependencies
- --enable-imbatchreport
- --enable-imdiag
- --enable-imfile
- --enable-improg
- --enable-impstats
- --enable-imptcp
- # Message Modificiation Plugins without dependencies
- --enable-mmanon
- --enable-mmaudit
- --enable-mmcount
- --enable-mmfields
- --enable-mmjsonparse
- --enable-mmpstrucdata
- --enable-mmrm1stspace
- --enable-mmsequence
- --enable-mmtaghostname
- --enable-mmutf8fix
- # Output Modification Plugins without dependencies
- --enable-mail
- --enable-omprog
- --enable-omruleset
- --enable-omstdout
- --enable-omuxsock
- # Misc
- --enable-fmhash
- --enable-fmunflatten
- $(use_enable xxhash fmhash-xxhash)
- --enable-pmaixforwardedfrom
- --enable-pmciscoios
- --enable-pmcisconames
- --enable-pmdb2diag
- --enable-pmlastmsg
- $(use_enable normalize pmnormalize)
- --enable-pmnull
- --enable-pmpanngfw
- --enable-pmsnare
- # DB
- $(use_enable dbi libdbi)
- $(use_enable mongodb ommongodb)
- $(use_enable mysql)
- $(use_enable postgres pgsql)
- $(use_enable redis imhiredis)
- $(use_enable redis omhiredis)
- # Debug
- $(use_enable debug)
- $(use_enable debug diagtools)
- $(use_enable debug valgrind)
- # Misc
- $(use_enable clickhouse)
- $(use_enable curl fmhttp)
- $(use_enable elasticsearch)
- $(use_enable gcrypt libgcrypt)
- $(use_enable imhttp)
- $(use_enable impcap)
- $(use_enable jemalloc)
- $(use_enable kafka imkafka)
- $(use_enable kafka omkafka)
- $(use_enable kerberos gssapi-krb5)
- $(use_enable kubernetes mmkubernetes)
- $(use_enable normalize mmnormalize)
- $(use_enable mdblookup mmdblookup)
- $(use_enable omhttp)
- $(use_enable omhttpfs)
- $(use_enable omudpspoof)
- $(use_enable rabbitmq omrabbitmq)
- $(use_enable relp)
- $(use_enable rfc3195)
- $(use_enable rfc5424hmac mmrfc5424addhmac)
- $(use_enable snmp)
- $(use_enable snmp mmsnmptrapd)
- $(use_enable gnutls)
- $(use_enable openssl)
- $(use_enable systemd imjournal)
- $(use_enable systemd omjournal)
- $(use_enable usertools)
- $(use_enable uuid)
- $(use_enable zeromq imczmq)
- $(use_enable zeromq omczmq)
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use doc && [[ "${PV}" == "9999" ]]; then
- einfo "Building documentation ..."
- local doc_dir="${S}/docs"
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
- sphinx-build -b html source build || die "Building documentation failed!"
- fi
-}
-
-src_test() {
- local _has_increased_ulimit=
-
- # Sometimes tests aren't executable (i.e. when added via patch)
- einfo "Adjusting permissions of test scripts ..."
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
- die "Failed to adjust test scripts permission"
-
- if ulimit -n 3072; then
- _has_increased_ulimit="true"
- fi
-
- if ! emake --jobs 1 check; then
- eerror "Test suite failed! :("
-
- if [[ -z "${_has_increased_ulimit}" ]]; then
- eerror "Probably because open file limit couldn't be set to 3072."
- fi
-
- if has userpriv ${FEATURES}; then
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
- "before you submit a bug report."
- fi
-
- fi
-}
-
-src_install() {
- local DOCS=(
- AUTHORS
- ChangeLog
- "${FILESDIR}"/README.gentoo
- )
-
- use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
- default
-
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
- systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
-
- keepdir /var/empty/dev
- keepdir /var/spool/${PN}
- keepdir /etc/ssl/${PN}
- keepdir /etc/${PN}.d
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
- insinto /etc/rsyslog.d/
- newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
- if use mysql; then
- insinto /usr/share/${PN}/scripts/mysql
- doins plugins/ommysql/createDB.sql
- fi
-
- if use postgres; then
- insinto /usr/share/${PN}/scripts/pgsql
- doins plugins/ompgsql/createDB.sql
- fi
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- local advertise_readme=0
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
-
- advertise_readme=1
-
- if use mysql || use postgres; then
- echo
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
- elog " /usr/share/doc/${PF}/scripts"
- fi
-
- if use ssl; then
- echo
- elog "To create a default CA and certificates for your server and clients, run:"
- elog " emerge --config =${PF}"
- elog "on your logging server. You can run it several times,"
- elog "once for each logging client. The client certificates will be signed"
- elog "using the CA certificate generated during the first run."
- fi
- fi
-
- if [[ ${advertise_readme} -gt 0 ]]; then
- # We need to show the README file location
-
- echo ""
- elog "Please read"
- elog ""
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
- elog ""
- elog "for more details."
- fi
-}
-
-pkg_config() {
- if ! use ssl; then
- einfo "There is nothing to configure for rsyslog unless you"
- einfo "used USE=ssl to build it."
- return 0
- fi
-
- if ! hash certtool &>/dev/null; then
- die "certtool not found! Is net-libs/gnutls[tools] is installed?"
- fi
-
- # Make sure the certificates directory exists
- local CERTDIR="${EROOT}/etc/ssl/${PN}"
- if [[ ! -d "${CERTDIR}" ]]; then
- mkdir "${CERTDIR}" || die
- fi
- einfo "Your certificates will be stored in ${CERTDIR}"
-
- # Create a default CA if needed
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = Portage automated CA
- ca
- cert_signing_key
- expiration_days = 3650
- _EOF
-
- certtool --generate-self-signed \
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
- --template "${T}/${PF}.$$" || die
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
- # Create the server certificate
- echo
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for server ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_server
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" &>/dev/null
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- else
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
- fi
-
- # Create a client certificate
- echo
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
- read -r CN
-
- einfo "Creating private key and certificate for client ${CN}..."
- certtool --generate-privkey \
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
- cat > "${T}/${PF}.$$" <<- _EOF
- cn = ${CN}
- tls_www_client
- dns_name = ${CN}
- expiration_days = 3650
- _EOF
-
- certtool --generate-certificate \
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
- --template "${T}/${PF}.$$" || die
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
- rm -f "${T}/${PF}.$$"
-
- echo
- einfo "Here is the documentation on how to encrypt your log traffic:"
- einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild
index 87f42ed5e63..5db833d557e 100644
--- a/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
SRC_URI="
https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-admin/rsyslog/rsyslog-8.2110.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
index 425135a780f..06d51ff743a 100644
--- a/app-admin/rsyslog/rsyslog-8.2110.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="8"
-PYTHON_COMPAT=( python3_{7..10} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
inherit autotools linux-info python-any-r1 systemd
@@ -16,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
SRC_URI="
https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@@ -41,6 +42,7 @@ REQUIRED_USE="
"
BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+ sys-apps/lsb-release
virtual/pkgconfig
test? (
jemalloc? ( <sys-libs/libfaketime-0.9.7 )
@@ -112,7 +114,7 @@ if [[ ${PV} == "9999" ]]; then
BDEPEND+=" >=dev-python/docutils-0.12"
fi
-PATCHES=( "${FILESDIR}"/${P}-skip-omfwd_fast_imuxsock-test.patch )
+PATCHES=( "${FILESDIR}"/${P}-5004-hostname.patch )
CONFIG_CHECK="~INOTIFY_USER"
WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
@@ -187,12 +189,14 @@ src_configure() {
--disable-generate-man-pages
--without-valgrind-testbench
--disable-liblogging-stdlog
+ --disable-imfile-tests # Some imfile tests fail (noticed in version 8.2208.0)
$(use_enable test testbench)
$(use_enable test libfaketime)
$(use_enable test extended-tests)
# Input Plugins without dependencies
--enable-imbatchreport
--enable-imdiag
+ --enable-imdocker
--enable-imfile
--enable-improg
--enable-impstats
diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
index 87fb7869e0f..459081339bb 100644
--- a/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit toolchain-funcs
SRC_URI="https://github.com/hattedsquirrel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU"
HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor"
diff --git a/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild b/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild
index aa763072c39..96e15892d05 100644
--- a/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild
+++ b/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild
@@ -26,7 +26,17 @@ pkg_setup() {
linux-mod_pkg_setup
BUILD_TARGETS="modules"
- BUILD_PARAMS="CC=$(tc-getCC) KERNEL_BUILD=${KERNEL_DIR}"
+ BUILD_PARAMS="KERNEL_BUILD=${KERNEL_DIR}"
+ if linux_chkconfig_present CC_IS_CLANG; then
+ BUILD_PARAMS+=" CC=${CHOST}-clang"
+ if linux_chkconfig_present LD_IS_LLD; then
+ BUILD_PARAMS+=' LD=ld.lld'
+ if linux_chkconfig_present LTO_CLANG_THIN; then
+ # kernel enables cache by default leading to sandbox violations
+ BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+ fi
+ fi
+ fi
}
src_install() {
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 830615c9303..1dedeb2a1f3 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,6 +1,5 @@
DIST salt-3002.9.tar.gz 15817470 BLAKE2B 31fb6dbb61a9f0ab22ca761810a934792e9fa9c78628f925e63d3d54d00fa4ea0b4aa806ba3ea92f7397ba3291281bf8989d9a288fb3114c7911cdebfc9acd6a SHA512 f34fd05960a68cba51f34cf8b7c737bd84d00472cec80628f082d16e54cf70705e191ac4b6690bf406a8a11e26c8155e4bdbdec34ede5f0721fd9b5e637a0ed1
-DIST salt-3003.4.tar.gz 16031515 BLAKE2B 34902aba7ab64f4ddbacbad1b776b9b2218caf22fb843879a80bd5c30b6c28f4c22a050bbaf0e9735507a78c887f52bcae7d1833ffeb51a543ec22fda79252e6 SHA512 35419fbb3f9a0f3e87579f740b717d6902cab0d85397b16d1e94d9516bf5f5d269b4f8bca370fd376abd9b7c8a6ad7ef4c8e8a8fdd31655fd17c810989e79693
DIST salt-3003.5.tar.gz 16056545 BLAKE2B ede3f0c63175f093dca07bee1bfb659cc608336ae92f532fc45868bd7eca659498c42e5d44324492744b802ade088adac869277679989550e217c1a135d6566d SHA512 ebda2056b4d6d216a0689b919d00aa78f615c355d21703d1939dbb6b00e9ad9347be4ee5b861282521f2d337bf7bf2fdc85e6942016358088a094d854fb33be9
-DIST salt-3004.1.tar.gz 17685649 BLAKE2B 64950cdc8420228f935d4a21fc20872da9ecf7c51b866ec3c59b46486b84a739b002acc44fa909eed93ce3dc6bedc9804df05d3d9ee5a9a13cd9d041ba70f876 SHA512 9353a8dc2a1c6e272318c6f35059236c5d78b6c8930f715275b701c12fca3be1fe930eb533f3f0c22933ba60967b0980300b922fe486cee9a62e6cdb568bdf91
DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef
+DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
DIST salt-3005.tar.gz 17894520 BLAKE2B 67e755bdbe772991f620d09f61836f8ccfa2039722c3281ec4cfaa8ef76e34c57e4db861cc652545e37eb965ab765f6b6ba0250407d7d7448aa5d4685ad9492a SHA512 c2019a97a5a98b4810cdace826d5e0a6d2890a984da4b95109c1b9328a2fd11cafd2fb0ef9752adeea1d36f8b2a69b3a4a6a5a092b6a7f050c60ec52da314a18
diff --git a/app-admin/salt/files/salt-3004.1-jinja-3.patch b/app-admin/salt/files/salt-3004.1-jinja-3.patch
deleted file mode 100644
index 98f21bc3512..00000000000
--- a/app-admin/salt/files/salt-3004.1-jinja-3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
-index 0cb70bf64a..322c2f7f46 100644
---- a/salt/utils/jinja.py
-+++ b/salt/utils/jinja.py
-@@ -25,10 +25,11 @@ import salt.utils.json
- import salt.utils.stringutils
- import salt.utils.url
- import salt.utils.yaml
--from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes
-+from jinja2 import BaseLoader, TemplateNotFound, nodes
- from jinja2.environment import TemplateModule
- from jinja2.exceptions import TemplateRuntimeError
- from jinja2.ext import Extension
-+from markupsafe import Markup
- from salt.exceptions import TemplateError
- from salt.utils.decorators.jinja import jinja_filter, jinja_global, jinja_test
- from salt.utils.odict import OrderedDict
-@@ -706,7 +707,7 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
- return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
-
-
--@jinja2.contextfunction
-+@jinja2.pass_context
- def show_full_context(ctx):
- return salt.utils.data.simple_types_filter(
- {key: value for key, value in ctx.items()}
-diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
-index 6502831aff..dec847364a 100644
---- a/tests/unit/utils/test_jinja.py
-+++ b/tests/unit/utils/test_jinja.py
-@@ -22,7 +22,8 @@ import salt.utils.files
- import salt.utils.json
- import salt.utils.stringutils
- import salt.utils.yaml
--from jinja2 import DictLoader, Environment, Markup, exceptions
-+from jinja2 import DictLoader, Environment, exceptions
-+from markupsafe import Markup
- from salt.exceptions import SaltRenderError
- from salt.utils.decorators.jinja import JinjaFilter
- from salt.utils.jinja import (
diff --git a/app-admin/salt/files/salt-3005.1-importlib-metadata-5.patch b/app-admin/salt/files/salt-3005.1-importlib-metadata-5.patch
new file mode 100644
index 00000000000..e4b19d6bfd7
--- /dev/null
+++ b/app-admin/salt/files/salt-3005.1-importlib-metadata-5.patch
@@ -0,0 +1,37 @@
+commit b676e6338a7c094cb3335d11f851ac0e12222017
+Author: MKLeb <calebb@vmware.com>
+Date: Wed Oct 5 15:49:37 2022 -0400
+
+ Allow entrypoint compatibility for importlib-metadata>=5.0.0
+
+diff --git a/salt/utils/entrypoints.py b/salt/utils/entrypoints.py
+index 3effa0b494..ac65ae2df4 100644
+--- a/salt/utils/entrypoints.py
++++ b/salt/utils/entrypoints.py
+@@ -38,13 +38,20 @@ def iter_entry_points(group, name=None):
+ entry_points_listing = []
+ entry_points = importlib_metadata.entry_points()
+
+- for entry_point_group, entry_points_list in entry_points.items():
+- if entry_point_group != group:
+- continue
+- for entry_point in entry_points_list:
+- if name is not None and entry_point.name != name:
++ # pre importlib-metadata 5.0.0
++ if hasattr(entry_points, "items"):
++ for entry_point_group, entry_points_list in entry_points.items():
++ if entry_point_group != group:
+ continue
+- entry_points_listing.append(entry_point)
++ for entry_point in entry_points_list:
++ if name is not None and entry_point.name != name:
++ continue
++ entry_points_listing.append(entry_point)
++ # starting with importlib-metadata 5.0.0
++ for entry_point in entry_points.select(group=group):
++ if name is not None and entry_point.name != name:
++ continue
++ entry_points_listing.append(entry_point)
+
+ return entry_points_listing
+
diff --git a/app-admin/salt/files/salt-3005.1-no-entry-points.patch b/app-admin/salt/files/salt-3005.1-no-entry-points.patch
new file mode 100644
index 00000000000..5d1da8f751e
--- /dev/null
+++ b/app-admin/salt/files/salt-3005.1-no-entry-points.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index bd11ff95f7..3b83f7b6ff 100755
+--- a/setup.py
++++ b/setup.py
+@@ -1173,7 +1173,7 @@ class SaltDistribution(distutils.dist.Distribution):
+ return scripts
+
+ @property
+- def _property_entry_points(self):
++ def _property_entry_points_disabled(self):
+ entrypoints = {
+ "pyinstaller40": [
+ "hook-dirs = salt.utils.pyinstaller:get_hook_dirs",
diff --git a/app-admin/salt/files/salt-3005.1-tests.patch b/app-admin/salt/files/salt-3005.1-tests.patch
new file mode 100644
index 00000000000..101574bdd30
--- /dev/null
+++ b/app-admin/salt/files/salt-3005.1-tests.patch
@@ -0,0 +1,40 @@
+diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
+index 8c648f5288..5886813e28 100644
+--- a/tests/unit/utils/test_schema.py
++++ b/tests/unit/utils/test_schema.py
+@@ -528,7 +528,7 @@ class ConfigTestCase(TestCase):
+ jsonschema.validate(
+ {"personal_access_token": "foo"}, Requirements.serialize()
+ )
+- if JSONSCHEMA_VERSION >= _LooseVersion("3.0.0"):
++ if JSONSCHEMA_VERSION >= _LooseVersion("3.0.0") and JSONSCHEMA_VERSION < _LooseVersion("4.17.0"):
+ self.assertIn(
+ "'ssh_key_file' is a required property", excinfo.exception.message
+ )
+@@ -1851,7 +1851,7 @@ class ConfigTestCase(TestCase):
+ jsonschema.validate(
+ {"item": {"sides": "4", "color": "blue"}}, TestConf.serialize()
+ )
+- if JSONSCHEMA_VERSION >= _LooseVersion("3.0.0"):
++ if JSONSCHEMA_VERSION >= _LooseVersion("3.0.0") and JSONSCHEMA_VERSION < _LooseVersion("4.17.0"):
+ self.assertIn("'4'", excinfo.exception.message)
+ self.assertIn("is not of type", excinfo.exception.message)
+ self.assertIn("'boolean'", excinfo.exception.message)
+@@ -1974,7 +1974,7 @@ class ConfigTestCase(TestCase):
+
+ with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+ jsonschema.validate({"item": ["maybe"]}, TestConf.serialize())
+- if JSONSCHEMA_VERSION >= _LooseVersion("3.0.0"):
++ if JSONSCHEMA_VERSION >= _LooseVersion("3.0.0") and JSONSCHEMA_VERSION < _LooseVersion("4.17.0"):
+ self.assertIn("'maybe'", excinfo.exception.message)
+ self.assertIn("is not one of", excinfo.exception.message)
+ self.assertIn("'yes'", excinfo.exception.message)
+@@ -2036,7 +2036,7 @@ class ConfigTestCase(TestCase):
+
+ with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+ jsonschema.validate({"item": ["maybe"]}, TestConf.serialize())
+- if JSONSCHEMA_VERSION >= _LooseVersion("3.0.0"):
++ if JSONSCHEMA_VERSION >= _LooseVersion("3.0.0") and JSONSCHEMA_VERSION < _LooseVersion("4.17.0"):
+ self.assertIn("'maybe'", excinfo.exception.message)
+ self.assertIn("is not one of", excinfo.exception.message)
+ self.assertIn("'yes'", excinfo.exception.message)
diff --git a/app-admin/salt/salt-3002.9.ebuild b/app-admin/salt/salt-3002.9-r1.ebuild
index e3287689891..57cc741d1ea 100644
--- a/app-admin/salt/salt-3002.9.ebuild
+++ b/app-admin/salt/salt-3002.9-r1.ebuild
@@ -37,13 +37,14 @@ RDEPEND="
dev-python/markupsafe[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]
+ dev-python/tomli[${PYTHON_USEDEP}]
dev-python/watchdog[${PYTHON_USEDEP}]
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ <dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
libvirt? (
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
@@ -63,10 +64,10 @@ RDEPEND="
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
nova? (
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
+ >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
)
neutron? (
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
+ >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
)
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
@@ -183,18 +184,5 @@ python_test() {
}
pkg_postinst() {
- if use python_targets_python3_8; then
- if use nova; then
- ewarn "Salt's nova functionality will not work with python3.8 since"
- ewarn "dev-python/python-novaclient does not support it yet"
- fi
- if use neutron; then
- ewarn "Salt's neutron functionality will not work with python3.8 since"
- ewarn "dev-python/python-neutronclient does not support it yet"
- fi
- if use libvirt; then
- ewarn "Salt's libvirt functionality will not work with python3.8 since"
- ewarn "dev-python/libvirt-python does not support it yet"
- fi
- fi
+ :
}
diff --git a/app-admin/salt/salt-3003.4-r1.ebuild b/app-admin/salt/salt-3003.4-r1.ebuild
deleted file mode 100644
index 50ee0911545..00000000000
--- a/app-admin/salt/salt-3003.4-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
- https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
- EGIT_BRANCH="develop"
- SRC_URI=""
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
- mongodb neutron nova openssl portage profile redis selinux test raet
- +zeromq vim-syntax"
-
-RDEPEND="
- sys-apps/pciutils
- >=dev-python/distro-1.5[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/libnacl[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
- dev-python/watchdog[${PYTHON_USEDEP}]
- libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- libvirt? (
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
- )
- openssl? (
- dev-libs/openssl:0=[-bindist(-)]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- nova? (
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
- )
- neutron? (
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
- )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
- vim-syntax? ( app-vim/salt-vim )
- zeromq? ( >=dev-python/pyzmq-19.1.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/moto-1.3.14[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- =dev-python/pytest-salt-factories-0.121*[${PYTHON_USEDEP}]
- dev-python/pytest-tempdir[${PYTHON_USEDEP}]
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/libcloud[${PYTHON_USEDEP}]
- net-dns/bind-tools
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.19.63[${PYTHON_USEDEP}] )
- )"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
- test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
- "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
- "${FILESDIR}/salt-3002-tests.patch"
- "${FILESDIR}/salt-3003.3-tests.patch"
- "${FILESDIR}/salt-3003.1-tests.patch"
- "${FILESDIR}/salt-3004.1-jinja-3.patch"
- "${FILESDIR}/salt-3003.4-tests.patch"
- "${FILESDIR}/salt-3003.4-relax-pyzmq-dep.patch"
-)
-
-python_prepare_all() {
- # remove tests with external dependencies that may not be available, and
- # tests that don't work in sandbox
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
- rm tests/unit/states/test_boto_vpc.py || die
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
- rm tests/pytests/functional/transport/server/test_req_channel.py || die
-
- # tests that require network access
- rm tests/unit/{states,modules}/test_zcbuildout.py || die
- rm -r tests/integration/cloud || die
- rm -r tests/kitchen/tests/wordpress/tests || die
- rm tests/kitchen/test_kitchen.py || die
- rm tests/unit/modules/test_network.py || die
-
- # tests require root access
- rm tests/integration/pillar/test_git_pillar.py || die
- rm tests/integration/states/test_supervisord.py || die
- rm tests/pytests/unit/client/test_ssh.py || die
-
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
- # pycryptodome rather than pycryptodomex
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
-
- distutils-r1_python_prepare_all
-}
-
-python_prepare() {
- einfo "Fixing collections.abc warnings for ${EPYTHON}"
- local abc
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-}
-
-python_install_all() {
- local svc
- USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-}
-
-python_test() {
- # testsuite likes lots of files
- ulimit -n 4096 || die
-
- # ${T} is too long a path for the tests to work
- local TMPDIR
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)"
- (
- export TMPDIR
- cleanup() { rm -rf "${TMPDIR}" || die; }
-
- trap cleanup EXIT
-
- addwrite "${TMPDIR}"
-
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
- "${EPYTHON}" -m pytest -vv \
- || die "testing failed with ${EPYTHON}"
- )
-}
-
-pkg_postinst() {
- if use python_targets_python3_8; then
- if use nova; then
- ewarn "Salt's nova functionality will not work with python3.8 since"
- ewarn "dev-python/python-novaclient does not support it yet"
- fi
- if use neutron; then
- ewarn "Salt's neutron functionality will not work with python3.8 since"
- ewarn "dev-python/python-neutronclient does not support it yet"
- fi
- if use libvirt; then
- ewarn "Salt's libvirt functionality will not work with python3.8 since"
- ewarn "dev-python/libvirt-python does not support it yet"
- fi
- fi
-}
diff --git a/app-admin/salt/salt-3003.5-r1.ebuild b/app-admin/salt/salt-3003.5-r2.ebuild
index e46b069a8ed..32ca2ccd2aa 100644
--- a/app-admin/salt/salt-3003.5-r1.ebuild
+++ b/app-admin/salt/salt-3003.5-r2.ebuild
@@ -37,13 +37,14 @@ RDEPEND="
dev-python/markupsafe[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
+ dev-python/tomli[${PYTHON_USEDEP}]
dev-python/watchdog[${PYTHON_USEDEP}]
libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] )
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ <dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
libvirt? (
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
@@ -63,10 +64,10 @@ RDEPEND="
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
nova? (
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
+ >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
)
neutron? (
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
+ >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
)
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
@@ -192,18 +193,5 @@ python_test() {
}
pkg_postinst() {
- if use python_targets_python3_8; then
- if use nova; then
- ewarn "Salt's nova functionality will not work with python3.8 since"
- ewarn "dev-python/python-novaclient does not support it yet"
- fi
- if use neutron; then
- ewarn "Salt's neutron functionality will not work with python3.8 since"
- ewarn "dev-python/python-neutronclient does not support it yet"
- fi
- if use libvirt; then
- ewarn "Salt's libvirt functionality will not work with python3.8 since"
- ewarn "dev-python/libvirt-python does not support it yet"
- fi
- fi
+ :
}
diff --git a/app-admin/salt/salt-3004.2-r1.ebuild b/app-admin/salt/salt-3004.2-r2.ebuild
index c1dde00d1ca..c420cc03e20 100644
--- a/app-admin/salt/salt-3004.2-r1.ebuild
+++ b/app-admin/salt/salt-3004.2-r2.ebuild
@@ -38,13 +38,14 @@ RDEPEND="
dev-python/markupsafe[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
+ dev-python/tomli[${PYTHON_USEDEP}]
dev-python/watchdog[${PYTHON_USEDEP}]
libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] )
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ <dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
libvirt? (
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
@@ -64,10 +65,10 @@ RDEPEND="
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
nova? (
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
+ >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
)
neutron? (
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
+ >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
)
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
@@ -192,18 +193,5 @@ python_test() {
}
pkg_postinst() {
- if use python_targets_python3_8; then
- if use nova; then
- ewarn "Salt's nova functionality will not work with python3.8 since"
- ewarn "dev-python/python-novaclient does not support it yet"
- fi
- if use neutron; then
- ewarn "Salt's neutron functionality will not work with python3.8 since"
- ewarn "dev-python/python-neutronclient does not support it yet"
- fi
- if use libvirt; then
- ewarn "Salt's libvirt functionality will not work with python3.8 since"
- ewarn "dev-python/libvirt-python does not support it yet"
- fi
- fi
+ :
}
diff --git a/app-admin/salt/salt-3005.ebuild b/app-admin/salt/salt-3005-r1.ebuild
index 9d6aa316cc1..56568c4de1e 100644
--- a/app-admin/salt/salt-3005.ebuild
+++ b/app-admin/salt/salt-3005-r1.ebuild
@@ -40,8 +40,9 @@ RDEPEND="
>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
+ dev-python/tomli[${PYTHON_USEDEP}]
dev-python/watchdog[${PYTHON_USEDEP}]
+ <dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
libcloud? (
dev-python/aiohttp[${PYTHON_USEDEP}]
dev-python/aiosignal[${PYTHON_USEDEP}]
diff --git a/app-admin/salt/salt-3004.1-r4.ebuild b/app-admin/salt/salt-3005.1.ebuild
index 5352a20caf1..f5eeccf44bb 100644
--- a/app-admin/salt/salt-3004.1-r4.ebuild
+++ b/app-admin/salt/salt-3005.1.ebuild
@@ -4,6 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
inherit systemd distutils-r1
DESCRIPTION="Salt is a remote execution and configuration manager"
@@ -17,34 +18,42 @@ if [[ ${PV} == 9999* ]]; then
SRC_URI=""
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+IUSE="
+ cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
mongodb neutron nova openssl portage profile redis selinux test raet
- +zeromq vim-syntax"
+ +zeromq vim-syntax
+"
RDEPEND="
sys-apps/pciutils
>=dev-python/distro-1.5[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
dev-python/libnacl[${PYTHON_USEDEP}]
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
+ dev-python/tomli[${PYTHON_USEDEP}]
dev-python/watchdog[${PYTHON_USEDEP}]
- libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] )
+ libcloud? (
+ dev-python/aiohttp[${PYTHON_USEDEP}]
+ dev-python/aiosignal[${PYTHON_USEDEP}]
+ dev-python/async-timeout[${PYTHON_USEDEP}]
+ >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}]
+ )
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
libvirt? (
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
)
openssl? (
dev-libs/openssl:0=[-bindist(-)]
@@ -64,10 +73,10 @@ RDEPEND="
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
selinux? ( sec-policy/selinux-salt )
nova? (
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
+ >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
)
neutron? (
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
+ >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
)
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
@@ -78,24 +87,31 @@ BDEPEND="
test? (
${RDEPEND}
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ dev-python/certifi[${PYTHON_USEDEP}]
+ dev-python/cherrypy[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
dev-python/mako[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ >=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
dev-python/passlib
dev-python/pip[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- >=dev-python/pytest-salt-factories-1.0.0_rc13[${PYTHON_USEDEP}]
+ >=dev-python/pytest-7.0.1[${PYTHON_USEDEP}]
+ >=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}]
dev-python/pytest-tempdir[${PYTHON_USEDEP}]
dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
dev-python/pytest-subtests[${PYTHON_USEDEP}]
+ dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+ dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+ dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
dev-python/flaky[${PYTHON_USEDEP}]
dev-python/libcloud[${PYTHON_USEDEP}]
net-dns/bind-tools
>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
+ dev-util/yamllint[${PYTHON_USEDEP}]
!x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
- )"
+ )
+"
DOCS=( README.rst AUTHORS )
@@ -108,20 +124,23 @@ PATCHES=(
"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
"${FILESDIR}/salt-3002-tests.patch"
"${FILESDIR}/salt-3003.1-tests.patch"
- "${FILESDIR}/salt-3004.1-jinja-3.patch"
- "${FILESDIR}/salt-3004.1-tests.patch"
- "${FILESDIR}/salt-3004.1-relax-pyzmq-dep.patch"
- "${FILESDIR}/salt-3004.1-py310.patch"
+ "${FILESDIR}/salt-3005-relax-pyzmq-dep.patch"
+ "${FILESDIR}/salt-3005-tests.patch"
+ "${FILESDIR}/salt-3005.1-no-entry-points.patch"
+ "${FILESDIR}/salt-3005.1-importlib-metadata-5.patch"
+ "${FILESDIR}/salt-3005.1-tests.patch"
)
python_prepare_all() {
# remove tests with external dependencies that may not be available, and
# tests that don't work in sandbox
rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+ rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
rm tests/unit/states/test_boto_vpc.py || die
rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
rm tests/pytests/functional/transport/server/test_req_channel.py || die
+ rm tests/pytests/functional/utils/test_async_event_publisher.py || die
+ rm tests/pytests/functional/runners/test_winrepo.py || die
# tests that require network access
rm tests/unit/{states,modules}/test_zcbuildout.py || die
@@ -131,11 +150,15 @@ python_prepare_all() {
rm tests/unit/modules/test_network.py || die
rm tests/pytests/functional/modules/test_pip.py || die
rm tests/pytests/unit/client/ssh/test_ssh.py || die
+ rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
# tests require root access
rm tests/integration/pillar/test_git_pillar.py || die
rm tests/integration/states/test_supervisord.py || die
+ # removes contextvars, see bug: https://bugs.gentoo.org/799431
+ sed -i '/^contextvars/d' requirements/base.txt || die
+
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
# pycryptodome rather than pycryptodomex
@@ -144,16 +167,6 @@ python_prepare_all() {
distutils-r1_python_prepare_all
}
-python_prepare() {
- einfo "Fixing collections.abc warnings for ${EPYTHON}"
- local abc
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-}
-
python_install_all() {
local svc
USE_SETUPTOOLS=1 distutils-r1_python_install_all
@@ -172,9 +185,25 @@ python_test() {
# testsuite likes lots of files
ulimit -n 4096 || die
+ local -a disable_tests=(
+ # doesn't like the distutils warning
+ batch_retcode
+ multiple_modules_in_batch
+ # hangs indefinitely
+ master_type_disable
+ # needs root
+ runas_env_sudo_group
+ # don't like sandbox
+ split_multibyte_characters_{shiftjis,unicode}
+ # doesn't like sandbox env
+ log_sanitize
+ )
+ local textexpr
+ testexpr=$(printf 'not %s and ' "${disable_tests[@]}")
+
# ${T} is too long a path for the tests to work
local TMPDIR
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)"
+ TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
(
export TMPDIR
cleanup() { rm -rf "${TMPDIR}" || die; }
@@ -184,24 +213,7 @@ python_test() {
addwrite "${TMPDIR}"
USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
- "${EPYTHON}" -m pytest -vv \
+ "${EPYTHON}" -m pytest -vv -k "${testexpr%and }" \
|| die "testing failed with ${EPYTHON}"
)
}
-
-pkg_postinst() {
- if use python_targets_python3_8; then
- if use nova; then
- ewarn "Salt's nova functionality will not work with python3.8 since"
- ewarn "dev-python/python-novaclient does not support it yet"
- fi
- if use neutron; then
- ewarn "Salt's neutron functionality will not work with python3.8 since"
- ewarn "dev-python/python-neutronclient does not support it yet"
- fi
- if use libvirt; then
- ewarn "Salt's libvirt functionality will not work with python3.8 since"
- ewarn "dev-python/libvirt-python does not support it yet"
- fi
- fi
-}
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
index 7d67866ffe5..a66d0d5bd13 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -1,4 +1,6 @@
DIST serf-0.10.0-deps.tar.xz 24363004 BLAKE2B f0fed10ffa8ff536263f6fde5a87e9584c35a681e7821a91d123aa8bd149ca1b9024d454f8163de458e4b928e887736c3247661afbc3f46b2ba38bef09d4516d SHA512 73815e512fda8aa00241bff84e1ee2414106a4b1a6189e66aa80967152acafde56eeafd15b87cbaefcbedc093f1c42cfb19b9d5776473c4c580416c2b671931a
DIST serf-0.10.0.tar.gz 446394 BLAKE2B 627e9ee776e217db09dde4bb22d1f317c884f887d918ba69de9bb65160eb00280c1ae5f53119570732f462c35381bd24a81405761b8ec63193295b6245298049 SHA512 53cb42b4a5f94fbb9e099739af0e31bb00cc261ea16325c3e5b9f081bb31299b5b8e42bc92d0f83ae78e511854589a95ab011930f373c1ad148c152b73adf485
+DIST serf-0.10.1-deps.tar.xz 24356192 BLAKE2B f635b7f4ea496aeac3148132ff0c4fcd2de037a2fc4c7c0c3943f2531b816a8002eb1e14a2204a30c206630f94400f953ae872e18bd2164c1d688f80961d54b8 SHA512 401e5bb706b3bf6521401ad4d40b02b331e71c6a0886796002046c83dffcffc735b803634d96bff5220d1069f418881daa9432412c4bcf6b7f3b37036d1a3a20
+DIST serf-0.10.1.tar.gz 447396 BLAKE2B a5b1aadf2e7d9b807406d8bd1d2db799f7a629a4db3abb3558c405b7bf81b5bef618157e51887ac631f3b42ca9eab3107ead8ead938ed0a1267299b2c47e0a18 SHA512 50febac6a634b7e19e58a2591371228fe7c1865673f48d082ed57cff1ac9c404d6a3b328d85b82cb92f05973a34396b824fdd9cb81f3e12c586b3f56d6734fa8
DIST serf-0.9.8-deps.tar.xz 24178272 BLAKE2B 6a82fa025245f0c393b55d87a10195a9ed5f314b3cb772b54b01b858b9f6b393991cc206f269b39efe9a9061aeff948191ae48070eb7c1e5bf77781c97173952 SHA512 ec12d4b27044f58e897984adb3855413e2d3a624f62dffe981353bb5bfbbcbe64501080ef543bc446633716bbfe3ef29c3c93c44db8599b5639e2ef8d20d8eee
DIST serf-0.9.8.tar.gz 444968 BLAKE2B 023413f75444f8e785bd7c5029e84ef58abca1c227f69dd8c16111c30afb38ff331e39cd8c30539f133229829bb9517516ff0e18e49b2dc9fb53df2ed40224b3 SHA512 1501ad6587f77840f7ad95d2886aafa3c28ffa533e862df0ebe5a4822078de09370c2ca1826d47dc6ff84e8598fb3711125a16e399a935ac39bad887e532c402
diff --git a/app-admin/serf/serf-0.10.1.ebuild b/app-admin/serf/serf-0.10.1.ebuild
new file mode 100644
index 00000000000..540d5af9718
--- /dev/null
+++ b/app-admin/serf/serf-0.10.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/serf"
+DESCRIPTION="Service orchestration and management tool"
+HOMEPAGE="https://www.serfdom.io/"
+SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
+IUSE=""
+RESTRICT+=" test"
+BDEPEND=""
+RDEPEND="
+ acct-user/serf
+ acct-group/serf"
+
+src_prepare() {
+ default
+ sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \
+ -e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \
+ -e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \
+ -i GNUmakefile || die
+}
+
+src_compile() {
+ mkdir -p ./bin
+ go build -o ./bin/serf ./cmd/serf || die
+}
+
+src_install() {
+ local x
+
+ dobin "${S}/bin/${PN}"
+
+ keepdir /etc/serf.d
+ insinto /etc/serf.d
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners serf:serf "${x}"
+ done
+
+ newinitd "${FILESDIR}/serf.initd" "${PN}"
+ newconfd "${FILESDIR}/serf.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/serf.service"
+}
diff --git a/app-admin/stow/metadata.xml b/app-admin/stow/metadata.xml
index 641cbd3703e..bf29ceda881 100644
--- a/app-admin/stow/metadata.xml
+++ b/app-admin/stow/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="person">
- <email>sam@gentoo.org</email>
- <name>Sam James</name>
- </maintainer>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="savannah">stow</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index fd7558ec2a9..469a46808a2 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,2 +1,4 @@
DIST sudo-1.9.11p3.tar.gz 4826520 BLAKE2B f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd SHA512 ad5c3d623547d1e3016e1a721676fee6d6b7348e77b2c234041e0af40c7220e8934c8c27beef0d12fa6df11708d37de711dacfefc135d26de46abca7f91c55d1
DIST sudo-1.9.11p3.tar.gz.sig 566 BLAKE2B 8caf03b051222f0446eaf333b48563aa18d52acbd9f7e2d880f0a97043df1ec8d25d87cfd7b1b9543ab8f52f5dacff4cf031fe3e6b94593d576d1d351eb05aa4 SHA512 ea728cddbab50746a2cbb8ce6cb55df3def1c5e806a1d91ec6f2d65c8d246079bdb5799b961ab0da1cc2c347a36d93cc00d32c10856141a467b25e1224876e50
+DIST sudo-1.9.12p1.tar.gz 4908060 BLAKE2B 976d00fb16b0d26b2714a188e379ccba102e0fa67b8ec6278e5435728af0cc9ba23d63db64a87d4e14d59cd52d3f62401943eb7c0f9c33317179ff764a9f950c SHA512 6f564112aa1e0e9cd223adb280bd430d513109c031e52deca308501234dedc0d7418f13cbb9b4249ac58d997cfdae1908c280c26733acbc55dbf9db45dff239a
+DIST sudo-1.9.12p1.tar.gz.sig 566 BLAKE2B 09f51a9f8eddaafc83bc5faac84ef0c0c37148beec025c777c1a19fd6ca88ecf354390f3557c31c74d13944093eb0ad921a2b7bdff04415f901fee549617e5f8 SHA512 6ec0596ad69fd6afc95d15a6e0ff871449e4534a651311371a4a604c258a34af6b41202cd2c636213d3128a811c5824338454cad764e1c05413ef02b551b7ae2
diff --git a/app-admin/sudo/sudo-1.9.12_p1.ebuild b/app-admin/sudo/sudo-1.9.12_p1.ebuild
new file mode 100644
index 00000000000..35748ea38ec
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.12_p1.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pam libtool tmpfiles toolchain-funcs
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit mercurial
+ EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
+ inherit verify-sig
+
+ uri_prefix=
+ case ${P} in
+ *_beta*|*_rc*) uri_prefix=beta/ ;;
+ esac
+
+ SRC_URI="
+ https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+ verify-sig? (
+ https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+ )
+ "
+
+ if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris"
+ fi
+
+ BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+ sys-libs/zlib:=
+ virtual/libcrypt:=
+ gcrypt? ( dev-libs/libgcrypt:= )
+ ldap? (
+ >=net-nds/openldap-2.1.30-r1:=
+ sasl? (
+ dev-libs/cyrus-sasl
+ net-nds/openldap:=[sasl]
+ )
+ )
+ pam? ( sys-libs/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ selinux? ( sys-libs/libselinux )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
+ ssl? ( dev-libs/openssl:0= )
+ sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+ ${DEPEND}
+ >=app-misc/editor-wrapper-3
+ virtual/editor
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ selinux? ( sec-policy/selinux-sudo )
+ sendmail? ( virtual/mta )
+"
+BDEPEND+="
+ sys-devel/bison
+ virtual/pkgconfig
+"
+
+REQUIRED_USE="
+ ?? ( pam skey )
+ ?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+ default
+
+ elibtoolize
+}
+
+set_secure_path() {
+ # First extract the default ROOTPATH from build env
+ SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+
+ case "${SECURE_PATH}" in
+ */usr/sbin*)
+ ;;
+ *)
+ SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+ ;;
+ esac
+
+ if [[ -z ${SECURE_PATH} ]] ; then
+ ewarn " Failed to detect SECURE_PATH, please report this"
+ fi
+
+ # Then remove duplicate path entries
+ cleanpath() {
+ local newpath thisp IFS=:
+ for thisp in $1 ; do
+ if [[ :${newpath}: != *:${thisp}:* ]] ; then
+ newpath+=:${thisp}
+ else
+ einfo " Duplicate entry ${thisp} removed..."
+ fi
+ done
+ SECURE_PATH=${newpath#:}
+ }
+ cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+ # Finally, strip gcc paths, bug #136027
+ rmpath() {
+ local e newpath thisp IFS=:
+ for thisp in ${SECURE_PATH} ; do
+ for e ; do
+ [[ ${thisp} == ${e} ]] && continue 2 ;
+ done
+ newpath+=:${thisp}
+ done
+ SECURE_PATH=${newpath#:}
+ }
+ rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+}
+
+src_configure() {
+ local SECURE_PATH
+
+ set_secure_path
+
+ # bug #767712
+ tc-export PKG_CONFIG
+
+ # - audit: somebody got to explain me how I can test this before I
+ # enable it.. - Diego
+ # - plugindir: autoconf code is crappy and does not delay evaluation
+ # until `make` time, so we have to use a full path here rather than
+ # basing off other values.
+ local myeconfargs=(
+ # We set all of the relevant options by ourselves (patched
+ # into the toolchain) and setting these in the build system
+ # actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
+ # (it'll downgrade to =2). So, this has no functional effect on
+ # the hardening for users. It's safe.
+ --disable-hardening
+
+ # requires some python eclass
+ --disable-python
+ --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+ --enable-zlib=system
+ --with-editor="${EPREFIX}"/usr/libexec/editor
+ --with-env-editor
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+ --with-rundir="${EPREFIX}"/run/sudo
+ --with-vardir="${EPREFIX}"/var/db/sudo
+ --without-linux-audit
+ --without-opie
+ $(use_enable gcrypt)
+ $(use_enable nls)
+ $(use_enable sasl)
+ $(use_enable ssl openssl)
+ $(use_with ldap)
+ $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+ $(use_with offensive insults)
+ $(use_with offensive all-insults)
+ $(use_with pam)
+ $(use_with pam pam-login)
+ $(use_with secure-path secure-path "${SECURE_PATH}")
+ $(use_with selinux)
+ $(use_with sendmail)
+ $(use_with skey)
+ $(use_with sssd)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use ldap ; then
+ dodoc README.LDAP.md
+
+ cat <<-EOF > "${T}"/ldap.conf.sudo
+ # See ldap.conf(5) and README.LDAP.md for details
+ # This file should only be readable by root
+
+ # supported directives: host, port, ssl, ldap_version
+ # uri, binddn, bindpw, sudoers_base, sudoers_debug
+ # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+ EOF
+
+ if use sasl ; then
+ cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+ # SASL directives: use_sasl, sasl_mech, sasl_auth_id
+ # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+ EOF
+ fi
+
+ insinto /etc
+ doins "${T}"/ldap.conf.sudo
+ fperms 0440 /etc/ldap.conf.sudo
+
+ insinto /etc/openldap/schema
+ newins docs/schema.OpenLDAP sudo.schema
+ fi
+
+ if use pam ; then
+ pamd_mimic system-auth sudo auth account session
+ pamd_mimic system-auth sudo-i auth account session
+ fi
+
+ keepdir /var/db/sudo/lectured
+ fperms 0700 /var/db/sudo/lectured
+ # bug #652958
+ fperms 0711 /var/db/sudo
+
+ # Don't install into /run as that is a tmpfs most of the time
+ # (bug #504854)
+ rm -rf "${ED}"/run || die
+
+ # bug #697812
+ find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+ tmpfiles_process sudo.conf
+
+ # bug #652958
+ local sudo_db="${EROOT}/var/db/sudo"
+ if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+ chmod 711 "${sudo_db}" || die
+ fi
+
+ if use ldap ; then
+ ewarn
+ ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
+ ewarn
+ if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+ ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+ ewarn "configured in ${ROOT}/etc/nsswitch.conf."
+ ewarn
+ ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
+ ewarn " sudoers: ldap files"
+ ewarn
+ fi
+ fi
+ if use prefix ; then
+ ewarn
+ ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
+ ewarn "with root privileges, as follows:"
+ ewarn
+ ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
+ ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
+ ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
+ ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+ ewarn
+ fi
+
+ elog "To use the -A (askpass) option, you need to install a compatible"
+ elog "password program from the following list. Starred packages will"
+ elog "automatically register for the use with sudo (but will not force"
+ elog "the -A option):"
+ elog ""
+ elog " [*] net-misc/ssh-askpass-fullscreen"
+ elog " net-misc/x11-ssh-askpass"
+ elog ""
+ elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+ elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 046d001b413..d4ffc349677 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -10,6 +10,7 @@ MY_P="${MY_P/beta/b}"
DESCRIPTION="Allows users or groups to run commands as other users"
HOMEPAGE="https://www.sudo.ws/"
+
if [[ ${PV} == 9999 ]] ; then
inherit mercurial
EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
@@ -22,19 +23,24 @@ else
*_beta*|*_rc*) uri_prefix=beta/ ;;
esac
- SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ SRC_URI="
+ https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
verify-sig? (
https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
- )"
- if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ )
+ "
+
+ if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
fi
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
fi
+S="${WORKDIR}/${MY_P}"
+
# Basic license is ISC-style as-is, some files are released under
# 3-clause BSD license
LICENSE="ISC BSD"
@@ -73,8 +79,6 @@ BDEPEND+="
virtual/pkgconfig
"
-S="${WORKDIR}/${MY_P}"
-
REQUIRED_USE="
?? ( pam skey )
?? ( gcrypt ssl )
diff --git a/app-admin/supervisor/supervisor-4.2.4.ebuild b/app-admin/supervisor/supervisor-4.2.4.ebuild
index 27a705ecefd..d7da676a848 100644
--- a/app-admin/supervisor/supervisor-4.2.4.ebuild
+++ b/app-admin/supervisor/supervisor-4.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="repoze ZPL BSD HPND GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
RDEPEND="acct-group/supervisor"
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
index 820601cdf92..deb7717010d 100644
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/metadata.xml
@@ -9,4 +9,7 @@
<flag name="logger">Build the logger program</flag>
<flag name="logrotate">use <pkg>app-admin/logrotate</pkg> for rotating logs rather than custom cron scripts</flag>
</use>
+ <upstream>
+ <remote-id type="github">troglobit/sysklogd</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index bcde9834862..c5fe4997131 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -2,3 +2,4 @@ DIST syslog-ng-3.34.1.tar.gz 5903489 BLAKE2B ae94dacb324f2db68fdaad6d41d1974e450
DIST syslog-ng-3.35.1.tar.gz 5901321 BLAKE2B 9ee93c22358703bc95c951f6fc9207da0291b3d5a6dedf0222302ca16576f49734d31891265c8c1d218a0308a76074301babbaa39b37e1564107e2ab6adf8a92 SHA512 7a0aa149d3e01b256e0f3168ceabebcbeadb0d8bbee6838d646cb425571b26330cccbcdd3a221f7b57a4605e875f48e48cd367825623299dc43d5ba77f94c50d
DIST syslog-ng-3.36.1.tar.gz 5968598 BLAKE2B b74536e20ae2a2eac056fe278f2e7973b3c97657cd80962ee551812633045dbdeb65fe34b66448d565a6f1b9edb2f1066fc1934d3f7ffbd43b9527a73a181e58 SHA512 b74c10e708616f7f5f5d529de5c1a3ce8ac888c05aa4b0fcf390d70082e9bc3432f3752998a5a258663fd47b8e4d0c2735240a3e4eda28178579b18308ebb376
DIST syslog-ng-3.37.1.tar.gz 6033219 BLAKE2B fe3787daec137d5eb61c6bf55d6066b642e7944738ec0655fcc7ddf8d0c841a734ec423b0710f424576fa78bbecfb1121475921e6f8bf896c10470c89dbf98c8 SHA512 beebd89c54a415469dc58630ac1900d632ef351f6a13fad4a95ce7bb1760b16d6cfdcede02225a35e97ebce7dae151c6aa228f3d378463e8b873c4f71ed86ab7
+DIST syslog-ng-3.38.1.tar.gz 5405048 BLAKE2B 7819cbe0caab7f580ca9f71181c84d64da838a238a6f8b8b79c8816e37e5691e72e1284de57d5066d3c681d8751950e5a32d65a1b1af4e064dd82f2c59899fe3 SHA512 3a3ef5c72d8c211ed2914791380061dcd48ea1ea95f636a1a8649dc5dee731a11e9ae000a37cbeeba624f4053b623b697e6c7f945a81153106c2365f4f09a847
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index ba670d623e0..d14d65a0a57 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -22,6 +22,6 @@
<flag name="spoof-source">Enable support for spoofed source addresses</flag>
</use>
<upstream>
- <remote-id type="github">balabit/syslog-ng</remote-id>
+ <remote-id type="github">syslog-ng/syslog-ng</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
index 1f9d4085ac7..d6092f45069 100644
--- a/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
MY_PV_MM=$(ver_cut 1-2)
DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
index e90b2ae809a..370e085506e 100644
--- a/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
MY_PV_MM=$(ver_cut 1-2)
DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
index 18cd7826fd7..7f390a0ad89 100644
--- a/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
@@ -8,12 +8,12 @@ inherit autotools python-single-r1 systemd
MY_PV_MM=$(ver_cut 1-2)
DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
test? ( python )"
diff --git a/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
index 6914d08d03e..29cc2377063 100644
--- a/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.37.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools python-single-r1 systemd
MY_PV_MM=$(ver_cut 1-2)
DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
new file mode 100644
index 00000000000..29cc2377063
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://www.syslog-ng.com/products/open-source-log-management/"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( python )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.10.1:2
+ >=dev-libs/ivykis-0.42.4
+ >=dev-libs/libpcre-6.1:=
+ !dev-libs/eventlog
+ amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+ caps? ( sys-libs/libcap )
+ dbi? ( >=dev-db/libdbi-0.9.0 )
+ geoip2? ( dev-libs/libmaxminddb:= )
+ http? ( net-misc/curl )
+ json? ( >=dev-libs/json-c-0.9:= )
+ kafka? ( >=dev-libs/librdkafka-1.0.0:= )
+ mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+ python? ( ${PYTHON_DEPS} )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ smtp? ( net-libs/libesmtp:= )
+ snmp? ( net-analyzer/net-snmp:0= )
+ spoof-source? ( net-libs/libnet:1.1= )
+ systemd? ( sys-apps/systemd:= )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+ test? ( dev-libs/criterion )"
+BDEPEND="
+ >=sys-devel/bison-3.7.6
+ sys-devel/flex
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+ contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+ "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ local f
+
+ use python && python_fix_shebang .
+
+ # remove bundled libs
+ rm -r lib/ivykis || die
+
+ # drop scl modules requiring json
+ if use !json; then
+ sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
+ fi
+
+ # drop scl modules requiring http
+ if use !http; then
+ sed -i -r '/slack|telegram/d' scl/Makefile.am || die
+ fi
+
+ # use gentoo default path
+ if use systemd; then
+ sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+ -i contrib/systemd/syslog-ng@default || die
+ fi
+
+ for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+ sed \
+ -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+ "/etc/init.d/syslog-ng reload")#g" \
+ "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+ done
+
+ for f in syslog-ng.conf.gentoo.hardened.in \
+ syslog-ng.conf.gentoo.in; do
+ sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+ done
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --disable-docs
+ --disable-java
+ --disable-java-modules
+ --disable-riemann
+ --enable-manpages
+ --localstatedir=/var/lib/syslog-ng
+ --sysconfdir=/etc/syslog-ng
+ --with-embedded-crypto
+ --with-ivykis=system
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng
+ --with-pidfile-dir=/var/run
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ $(use_enable amqp)
+ $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+ $(use_enable caps linux-caps)
+ $(use_enable dbi sql)
+ $(use_enable geoip2)
+ $(use_enable http)
+ $(use_enable ipv6)
+ $(use_enable json)
+ $(use_enable kafka)
+ $(use_enable mongodb)
+ $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+ $(use_enable pacct)
+ $(use_enable python)
+ $(use_enable redis)
+ $(use_enable smtp)
+ $(use_enable snmp afsnmp)
+ $(use_enable spoof-source)
+ $(use_enable systemd)
+ $(use_enable tcpd tcp-wrapper)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ # Install default configuration
+ insinto /etc/default
+ doins contrib/systemd/syslog-ng@default
+
+ insinto /etc/syslog-ng
+ newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+
+ insinto /etc/logrotate.d
+ newins "${T}/syslog-ng.logrotate" syslog-ng
+
+ newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+ newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+ keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+ find "${D}" -name '*.la' -delete || die
+
+ use python && python_optimize
+}
+
+pkg_postinst() {
+ # bug #355257
+ if ! has_version app-admin/logrotate ; then
+ elog "It is highly recommended that app-admin/logrotate be emerged to"
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
+ elog "for logrotate to use."
+ fi
+
+ if use systemd; then
+ ewarn "The service file for systemd has changed to support multiple instances."
+ ewarn "To start the default instance issue:"
+ ewarn "# systemctl start syslog-ng@default"
+ fi
+}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 8990d74b24f..5cd08b7ba05 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1 +1 @@
-DIST sysstat-12.6.0.tar.gz 1454167 BLAKE2B 84213e1d63e6d44e889e9763c9f47c769805baf65715199b1ddb3472ce68c37b3b46229af43ecf0cd85d6c09be85273e90b96a975304cf2f6695298b3e552630 SHA512 f4d0e0dead0cce84782e985c8074871c45e77949c2bcfefd5642280e961f39e9eaa9f9fc93c013d79deba6e3703626894dd665ff64db72550d1c24f404780a5f
+DIST sysstat-12.7.1.tar.gz 1464847 BLAKE2B dd4cb510d45879665945d7c3efcb9e1011f6b77d152c7f989ef6a3e8f203c05c1ca708959030cb864c31810ec27a5e880a9cfcd805f26c4f3537d55bdd9fd763 SHA512 5c1da0f5a1bf26091f029c5ea138f836616becb1e531843aa2c150a66ddc1f07b43cffeac98445855bf70319942fe22838a682c2f7685893bead7d8de7e9e2a8
diff --git a/app-admin/sysstat/sysstat-12.6.0.ebuild b/app-admin/sysstat/sysstat-12.7.1.ebuild
index d836219c2e4..530eee90702 100644
--- a/app-admin/sysstat/sysstat-12.6.0.ebuild
+++ b/app-admin/sysstat/sysstat-12.7.1.ebuild
@@ -2,10 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+
inherit systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+HOMEPAGE="http://sebastien.godard.pagesperso-orange.fr/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 06675bedc70..db636a4a995 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,3 +1,2 @@
DIST system-config-printer-1.5.16.tar.xz 1382124 BLAKE2B 37548bd470f8e80026e014d4077a79a38ad54258d620654536890b67b688fc790c9a9a269b321f2e12d63ec21f24858866e39b41089195c528ddbdf1351bba5f SHA512 ed20a409def66bdea7de4cd5b397891eca220c841e1b5c8cab98e45f87389ae8ba881d9e24072dd07203141fc34c49c4b67cf099791857c007971e3b7d2e2fc2
-DIST system-config-printer-1.5.17.tar.xz 1385792 BLAKE2B c17dce0ef2988028a95e4ad7b9ead18aa13ab07452f5df9a6fb07f4728ce2ed7aa51e8997e7086d517f6965ec1f306fbd6e7f68683e6da66d18bc75408af9220 SHA512 e56fb45e76a93de122bef99774574f77168014b855cd75e1939fb2d6e56ddb27496679a7932cd6255b950599541c3fb3b82386735bfb6dc13eed59f9a259668e
DIST system-config-printer-1.5.18.tar.xz 1396808 BLAKE2B 910e853829ee876edc597a3103b5ab857b3b8c1cb87096f25213b1088e35d9f4d320dad61f55b530283a7650b07abe028a53b4e144b33b1b66c733cb2caa8011 SHA512 33dc9c52d92f4234e055fb10a99cadd58424dcdb62554797b44bdd5319f1c3662bd2fa33417ac3a3f5ec51216d64e81e1897f3e671eb49f6be34057d7c38f3f4
diff --git a/app-admin/system-config-printer/metadata.xml b/app-admin/system-config-printer/metadata.xml
index b1e4e8c877a..e34a1cb2846 100644
--- a/app-admin/system-config-printer/metadata.xml
+++ b/app-admin/system-config-printer/metadata.xml
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>reavertm@gentoo.org</email>
- <name>Maciej Mrozowski</name>
-</maintainer>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
-</maintainer>
+ <maintainer type="person">
+ <email>reavertm@gentoo.org</email>
+ <name>Maciej Mrozowski</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">OpenPrinting/system-config-printer</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.17.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.17.ebuild
deleted file mode 100644
index da888acedc1..00000000000
--- a/app-admin/system-config-printer/system-config-printer-1.5.17.ebuild
+++ /dev/null
@@ -1,90 +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} )
-PYTHON_REQ_USE="xml(+)"
-inherit python-single-r1 systemd udev xdg
-
-DESCRIPTION="Graphical user interface for CUPS administration"
-HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
-SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gnome-keyring policykit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# Additional unhandled dependencies
-# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
-# python samba client: smbc
-# selinux: needed for troubleshooting
-COMMON_DEPEND="${PYTHON_DEPS}
- dev-libs/glib:2
- net-print/cups[dbus]
- virtual/libusb:1
- >=virtual/udev-172
- x11-libs/gtk+:3[introspection]
- x11-libs/libnotify[introspection]
- x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=app-text/xmlto-0.0.22
- dev-perl/XML-Parser
- dev-util/desktop-file-utils
- >=sys-devel/gettext-0.20
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pycups[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
- ')
- gnome-keyring? ( app-crypt/libsecret[introspection] )
- policykit? ( net-print/cups-pk-helper )
-"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myeconfargs=(
- --with-xmlto
- --enable-nls
- --with-desktop-vendor=Gentoo
- --with-udev-rules
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- python_optimize cupshelpers
-}
-
-src_install() {
- default
- python_fix_shebang "${ED}"
- python_optimize
- python_domodule cupshelpers
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
index da888acedc1..3243ed4e708 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.18.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="xml(+)"
inherit python-single-r1 systemd udev xdg
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="gnome-keyring policykit"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/systemdgenie/Manifest b/app-admin/systemdgenie/Manifest
index 29a42c7aed4..5992b0686bd 100644
--- a/app-admin/systemdgenie/Manifest
+++ b/app-admin/systemdgenie/Manifest
@@ -1 +1 @@
-DIST systemdgenie-0.99.0.tar.xz 29104 BLAKE2B f2da14ae035fa04bd775dedb8bdd7fe41612c019a47fe02e1994a7304677970193ba54aacbb7d0fd8e31832eb01ae1f12b8dc7a869b0c6529dcd18b1fece2b52 SHA512 9600ffa05737bbf8d7deaece3fc78392dbb4228aa2f001ca3e34fb6390c1a9104884f61eec90ae204550a8cee0281b92f34f64652f9881967430fb695f6bb3f4
+DIST systemdgenie-0.99.0_p20221120-01bf2322.tar.gz 164282 BLAKE2B 06e297855d5364d05c067cac484f03fce8035ee0de042d31bb24eb178cbeb30821d474bbda0152ba1800801e544a0b6bd4f8a309052574cd335ccc97697b5e81 SHA512 fb402763f899866440bc7a9766af74569062443dcf077c76b0a62b145850641c35c15fbe73cf425777d8b2f9c4112a4d52c51745e568badd5b432cbeba8d8462
diff --git a/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild b/app-admin/systemdgenie/systemdgenie-0.99.0_p20221120.ebuild
index 379964f0857..2aca5b1742c 100644
--- a/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
+++ b/app-admin/systemdgenie/systemdgenie-0.99.0_p20221120.ebuild
@@ -1,24 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-KFMIN=5.60.0
-QTMIN=5.12.3
+KDE_ORG_COMMIT=01bf232264e1d2511cacb0c22b49dc43d1705d57
+KFMIN=5.99.0
+QTMIN=5.15.5
inherit ecm kde.org
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~ppc64"
-fi
-
-DESCRIPTION="Systemd managment utility"
+DESCRIPTION="Systemd management utility"
HOMEPAGE="https://invent.kde.org/system/systemdgenie"
LICENSE="GPL-2+"
SLOT="5"
+KEYWORDS="~amd64 ~ppc64"
-BDEPEND="sys-devel/gettext"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -33,3 +29,4 @@ DEPEND="
sys-apps/systemd:=
"
RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
diff --git a/app-admin/terraform/terraform-1.2.7.ebuild b/app-admin/terraform/terraform-1.2.7.ebuild
index 411e61a46d0..193e06323d6 100644
--- a/app-admin/terraform/terraform-1.2.7.ebuild
+++ b/app-admin/terraform/terraform-1.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~riscv"
BDEPEND="dev-go/gox"
diff --git a/app-admin/tmpreaper/Manifest b/app-admin/tmpreaper/Manifest
index 183b7889875..ec74884f756 100644
--- a/app-admin/tmpreaper/Manifest
+++ b/app-admin/tmpreaper/Manifest
@@ -1,2 +1,2 @@
DIST tmpreaper_1.6.14.tar.gz 158981 BLAKE2B 1c9ec124c6e57c0aab5d555594950dda37f06a6404a0d111da05be7a48bf6141e09e942c090d3f79ccf855f958a7b32f0d64c73da68b412da74465e39bdb72ae SHA512 e78fab0cd2cc8c851e2806be70c102697bff86230e181bfad1c76b15fe5455fb431bc0dd16bebf77a2e9bb64b5f5a1474d24254ff780d4d72d343ea0e6e30ccb
-DIST tmpreaper_1.6.16.tar.gz 158816 BLAKE2B cd0bbb3bc414800d73c49a5fd724af21e7f81d4ad07256f6a1f8f4943d53d74580dc11066938f417ea7a2c6105159f262363457c6ba082eeaa11817ef7128c96 SHA512 2f155a2c081f6af73e164dc1698b74430e4839864c6773b74d239ccc2f0aea5dbfbf5904c1738ef34a735a2451173b0000190ff8f3af291574b09b119410d412
+DIST tmpreaper_1.6.17.tar.gz 158894 BLAKE2B 537e8020a9db4adc9dee5b967e89242573d340c8b1d3540ab2de76d9a74bae391ff398d19b71c4017bde04716f01f8958bb73957215b1b44628e5ae7ad805f8b SHA512 8272cb0232f8188f8ad45be40442b686d18bbf508dcd440d3f901f4dbf7d17e05da91ee3bfa5d23d163041fdb08de81d525ac45945f10bc7ff886ac468fc4ce0
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.16.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.17.ebuild
index 9ebd2cb8098..63119a32342 100644
--- a/app-admin/tmpreaper/tmpreaper-1.6.16.ebuild
+++ b/app-admin/tmpreaper/tmpreaper-1.6.17.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
DESCRIPTION="A utility for removing files based on when they were last accessed"
HOMEPAGE="https://packages.debian.org/sid/tmpreaper"
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 04c8ace89f1..05b3b354d9e 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1 +1,2 @@
DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
+DIST ulogd-2.0.8.tar.bz2 435434 BLAKE2B 8922a722d635b24dd8bed9bff9e96cbbdf1ac790defd3b205b6867f32d7abcd6dff1c37097305ed3ed627d66da1bdb1f7aa2a9fe7e29a2b2104959a986207478 SHA512 9f99f6f35bad5da4559d788dc3ba3dae17d4ae972737cae3313ecf68f08eaf5f55514fce6f30503437e4158fd30a06438b9249d5d20f6343964cbf690f87309d
diff --git a/app-admin/ulogd/ulogd-2.0.8.ebuild b/app-admin/ulogd/ulogd-2.0.8.ebuild
new file mode 100644
index 00000000000..4953e9e6535
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.8.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info readme.gentoo-r1 systemd
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
+SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
+
+DEPEND="
+ || ( net-firewall/iptables net-firewall/nftables )
+ >=net-libs/libnfnetlink-1.0.1
+ dbi? ( dev-db/libdbi )
+ json? ( dev-libs/jansson:= )
+ nfacct? (
+ >=net-libs/libmnl-1.0.4
+ >=net-libs/libnetfilter_acct-1.0.3
+ )
+ nfct? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
+ nflog? ( >=net-libs/libnetfilter_log-1.0.1 )
+ mysql? ( dev-db/mysql-connector-c:= )
+ pcap? ( net-libs/libpcap )
+ postgres? ( dev-db/postgresql:= )
+ sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="
+ ${DEPEND}
+ acct-user/ulogd
+ acct-group/ulogd
+ selinux? ( sec-policy/selinux-ulogd )
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ app-text/linuxdoc-tools
+ app-text/openjade
+ app-text/texlive-core
+ dev-texlive/texlive-fontsrecommended
+ virtual/latex-base
+ )
+"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+ You must have at least one logging stack enabled to make ulogd work.
+ Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
+"
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ if use nfacct && kernel_is lt 3 3 0; then
+ ewarn "NFACCT input plugin requires a kernel >= 3.3."
+ fi
+
+ if use ulog && kernel_is ge 3 17 0; then
+ ewarn "ULOG target has been removed in the 3.17 kernel release."
+ ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Change default settings to:
+ # - keep log files in /var/log/ulogd instead of /var/log;
+ # - create sockets in /run instead of /tmp.
+ sed -i \
+ -e "s|var/log|var/log/${PN}|g" \
+ -e 's|tmp|run|g' \
+ ulogd.conf.in || die
+}
+
+src_configure() {
+ append-lfs-flags
+
+ local myeconfargs=(
+ $(use_enable dbi)
+ $(use_enable json)
+ $(use_enable nfacct)
+ $(use_enable nfct)
+ $(use_enable nflog)
+ $(use_enable mysql)
+ $(use_enable pcap)
+ $(use_enable postgres pgsql)
+ $(use_enable sqlite sqlite3)
+ $(use_enable ulog)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ # Prevent access violations from bitmap font files generation.
+ export VARTEXFONTS="${T}/fonts"
+ emake -C doc
+ fi
+}
+
+src_install() {
+ use doc && HTML_DOCS=( doc/${PN}.html )
+
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+
+ readme.gentoo_create_doc
+ doman ${PN}.8
+
+ use doc && dodoc doc/${PN}.{dvi,ps,txt}
+ use mysql && dodoc doc/mysql-*.sql
+ use postgres && dodoc doc/pgsql-*.sql
+ use sqlite && dodoc doc/sqlite3.table
+
+ insinto /etc
+ doins ${PN}.conf
+ fowners root:ulogd /etc/${PN}.conf
+ fperms 640 /etc/${PN}.conf
+
+ newinitd "${FILESDIR}/${PN}.init" ${PN}
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ diropts -o ulogd -g ulogd
+ keepdir /var/log/ulogd
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/usbview/usbview-3.0.ebuild b/app-admin/usbview/usbview-3.0.ebuild
index 217b6dadb3e..c1a37d825fc 100644
--- a/app-admin/usbview/usbview-3.0.ebuild
+++ b/app-admin/usbview/usbview-3.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit linux-info
+inherit linux-info xdg
DESCRIPTION="Display the topology of devices on the USB bus"
HOMEPAGE="http://www.kroah.com/linux-usb/ https://github.com/gregkh/usbview"
@@ -11,7 +11,7 @@ SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
RDEPEND="
dev-libs/glib:2
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 3fccb887149..492ac0c2039 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,8 +1,12 @@
-DIST vault-1.10.6-vendor.tar.gz 50107281 BLAKE2B 121889bce4b01ef38ac4d727e8f195b164521dae4a27a1ed03051b8f18a53d15e2ddcfa16ae72871b9aca0b8c49533b0ada08ba1c26502f430187067fe6e9535 SHA512 08bb8bd2e4e4cd7fa6008776da5cca254ccc2689ef02e1a095fdf736de57f6713a6c49a7573014326bd1c93378d3a47076c37b519f49c2a5b618c47f9fee4554
-DIST vault-1.10.6-webui.tar.xz 1258100 BLAKE2B f63a05ed6715574ae0c89ee447734fa279f6d63dd51e04e37bd057067b2e46cd765609db94bf79769a2138137ce18738cb0a91a092b03fa8fd4ce6082ea166f4 SHA512 fc9c8cb7911ddae0b6d13efa9d6a768c7935fc4bb8c21e43eafa0a7866b718e8f381b51c38fc72378e53d95b81c9af89367139308c50a91396350b6adfdfb7e4
DIST vault-1.10.7-vendor.tar.gz 50109804 BLAKE2B 59a10957b34842fe0eb24cbb2de108c1fdf11b2ea6c31472944d5e607a78a5e1272caa105ef38fce733fe082e4c4257903804bacc78694f41d1149ca632f96e5 SHA512 4efb49e48fd217d3483a7114cc797d1f78c8d01a9358270905576e3056fe42a157a0056994ddceaf9ceee9b725611836b85bca80c8daec306d2c0fad772219f1
DIST vault-1.10.7-webui.tar.xz 1258120 BLAKE2B 82acff201b446be456377f9470552626ba85aeb0233e029f34979c2a45547803e297c9cb1a051400181c41369116ffa1b72d14512bf4adf6f7aecb90b4df33d2 SHA512 1e8eb28f0033a8748c10bd63033e4f5f72c4fd9343b328e1fb98ac4ebfb999ab64bb29502cc3b9a805fa725844077b38c9795b4fb5ea3c6c9c67cdd9d5bd5bd7
-DIST vault-1.11.3-vendor.tar.gz 52098996 BLAKE2B 98f590661d59fb7fe13cc90269592c9dd556dca5feb3834cc056d966bdea7164acd29483cb4179781089ff30a18c7c253414688b5e8127483539779f478099e9 SHA512 9be3d9401574005608b7d2e72856966cf93786d0a4c1e945b51a00f66e0d3152039efccd9d415378914492d6c544e1a3d2a8707406c3331521a5fe960c9cf44b
-DIST vault-1.11.3-webui.tar.xz 1335776 BLAKE2B bf98149a8bd71286b0dcacab9847723536c616db6cdc78f4dafd0dacdab2d5d2a203eadbe0bd0f6937f6132cf06e4ec488c1c290a96f9b7f5b88dd4b186ca570 SHA512 136f61519ed4ebf765ea3c76cfba7732c615c7187a821265cbb4b31d9d11c5141fc8e3ad701e15246eaad550ac27a08185d32b26ed4b734eb592de8767d3004f
+DIST vault-1.10.8-vendor.tar.gz 50130552 BLAKE2B 916d5eb0a1574547ce42e7747e57356e423d131692fcc0742dfd1c610b548ba661c7c9ef4f9ab2264f55e85df4ba463c05b6e10daae89c52bf40f0e876785fe3 SHA512 e66ec97793fa9c998dba9ed3cb9b3a6023dae6ee30517ecd51952cf70ddf2e57288be0b8dc925b342a2b10a3b3d2960cac0f87803309cdefc25abf51bfc9be25
+DIST vault-1.10.8-webui.tar.xz 1258244 BLAKE2B d6e6100048b52bcef1a9c10f9e5e42c05121a0256ac0a171d9c8d7942758eebf72967c5a9c76da3df59fa578a3ac9256cd0075719ab6751e13e806d8a93b760a SHA512 60b7ff82562ab3c061219221a2f9ce49ad53b494ace7d14252b25334c7a0c5dab0ac62de28e20bfe73cdcae438368ecfe1fd9a94b2ce1a434dde939898e30f4d
DIST vault-1.11.4-vendor.tar.gz 52097178 BLAKE2B 3f0fdddff8d9a834dff77bfb696c8c440660083f20c328c84a2b45e270defaa19fb461abf1a7ecca23ef8f8b2ad57cca33fa19103c87a8c9d5d2c947562a96c7 SHA512 5ada435c7bc75f06c381f4f75ca4717044cc17ec009283647175d1a68fdacb3175052e2292d7a739ae8475715e8592d3bf7f3fe4f3e8dc027688a15b771ca935
DIST vault-1.11.4-webui.tar.xz 1335580 BLAKE2B 9c2c58448083e781e74d4bd9e6bc9128224a9d10020c6b30af111c869a86467bde4683825908b892f20f7024eda081d026d2fa01b9ee0fb02fa94d7f412dacb4 SHA512 6739ac2845eaf2e82b7f5177bbfc42ccaf05a1fd1c50b2e53e296faf8a631846f9495d2d19269735723cc60f2ecbd5c90533a9fa88efd7c8d9c8c6575e4801d9
+DIST vault-1.11.5-vendor.tar.gz 52130355 BLAKE2B 0047b52439c12512e6da4b797742b079ca2dcd6f858b7f27637e409c3061de04a9d38b4d05269bd440c2178fd9547b1323bc680d65cb74a3ce98816303d72c1f SHA512 70db863583ee5f1180068b70ddf8baaf95e61a31d816db2e212703e1052c1a70b7098bfd53b2b28319dbf21e168b660e16cc5907b503e5e558c6763540d70eba
+DIST vault-1.11.5-webui.tar.xz 1335704 BLAKE2B 7a8161070fd9762645a01e00fb88ab7ef4847810856e0c7e9a478cb149401db53789ca4d377a06ed4843b3cc77c655cee7036510c5625bc503f6dd9f7e347420 SHA512 d6b49dd31877bf8a9cf7b7588df58163c35c9fe5fe225b595ca421209acd4c823b71d21195a2f217dc8b63a825b5323b3475e1fe42be6d2c8d471d91e6f75097
+DIST vault-1.12.0-vendor.tar.gz 53774794 BLAKE2B 2aa91274bcd3efe2c34c9acdc3000af9903e2d1d67dcd0484b4046a78dbc140b460d2f5f9dc73f96302991245da5381483d4c24444f83c0f642b56956e9ea6a4 SHA512 42593ea9b731d02c8a6d6ec7adb2adb7dc5b5a41c549a44991eb66e79dce8b3cac3553157ef1c34202f662279de1da03da87271090649a6c773f53d5d6971e25
+DIST vault-1.12.0-webui.tar.xz 1413084 BLAKE2B 5f681ac61b14694e64be0a55445d0849b9b7481dc2456c923297f496b60d843ffae2d7f27b029ed33b4e7efd3029d99c1cb30110da3ad3162ee4135f3856d60e SHA512 4399f2e4c85712cd83b8265315186d6f7161fa545e0708a56ff7c56fbde335eb2ab9a357720850c0007e55679b94edbaadd3c2318671676e658f270f4d04de34
+DIST vault-1.12.1-vendor.tar.gz 53818036 BLAKE2B 58bf72efa345d737dd74a58bd56be3740d19fa5849d11f4aa4bc3ccb46ca42e84b1aa85bcf9f76e4ae5a72c3b954519a1ac989ff0f779c5fd25a42fe17b573c6 SHA512 55ccb2c61e6baf69627e1443ce6f524c2d6f8bf1ff59103173acd74e1a3a0a79a90a5dab95790f002ca7261e80c38dc2c8c27f95553bac65e2d0fa7f48254b23
+DIST vault-1.12.1-webui.tar.xz 1413308 BLAKE2B 1a6008bc67f08037a0dbd966d004c424b249597cd9f1002e30a23262bd1df6ddc388e7d863ff3f62350d8a4b3807de40a1d33da08ade1fe5ec84d4cecc64ade8 SHA512 87d30c77772fa982a110cfe4fa0d118b302796e7dcdfa71b94e6bd1cca0369cb0555169ef48acc68e16d11a1ab47ef096cc91e204be3189f4779125449cd9cd1
diff --git a/app-admin/vault/vault-1.10.7.ebuild b/app-admin/vault/vault-1.10.7.ebuild
index 6024fed54e0..1e115bc0fbe 100644
--- a/app-admin/vault/vault-1.10.7.ebuild
+++ b/app-admin/vault/vault-1.10.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz
LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
IUSE="+webui"
BDEPEND="
diff --git a/app-admin/vault/vault-1.10.6.ebuild b/app-admin/vault/vault-1.10.8.ebuild
index 1e115bc0fbe..1e115bc0fbe 100644
--- a/app-admin/vault/vault-1.10.6.ebuild
+++ b/app-admin/vault/vault-1.10.8.ebuild
diff --git a/app-admin/vault/vault-1.11.3.ebuild b/app-admin/vault/vault-1.11.5.ebuild
index 004b6dd49b5..004b6dd49b5 100644
--- a/app-admin/vault/vault-1.11.3.ebuild
+++ b/app-admin/vault/vault-1.11.5.ebuild
diff --git a/app-admin/vault/vault-1.12.0.ebuild b/app-admin/vault/vault-1.12.0.ebuild
new file mode 100644
index 00000000000..aaad01680ce
--- /dev/null
+++ b/app-admin/vault/vault-1.12.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+ webui? (
+ https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+ )"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="+webui"
+
+BDEPEND="
+ app-arch/zip
+ dev-go/gox
+ >=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+ acct-user/vault"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_unpack() {
+ default
+}
+
+src_prepare() {
+ default
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
+ -i scripts/build.sh || die
+ sed -e "/hooks/d" \
+ -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+ -e "s/gofumpt/gofmt/g" \
+ -i Makefile || die
+ if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+ rm -rf "${S}/http/web_ui" || die
+ mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+ die "mv failed"
+ else
+ mkdir -p "${S}/http/web_ui" || die
+ touch "${S}/http/web_ui/no_web_ui" || die
+ fi
+}
+
+src_compile() {
+ mkdir "${T}"/bin || die
+ BUILD_TAGS="$(usex webui ui '')" \
+ GOPATH="${T}" \
+ XC_ARCH=$(go env GOARCH) \
+ XC_OS=$(go env GOOS) \
+ XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+ emake bin
+}
+
+src_install() {
+ dobin bin/${PN}
+ dodoc CHANGELOG.md CONTRIBUTING.md README.md
+ insinto /etc/${PN}.d
+ doins "${FILESDIR}/"*.json.example
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-admin/vault/vault-1.12.1.ebuild b/app-admin/vault/vault-1.12.1.ebuild
new file mode 100644
index 00000000000..aaad01680ce
--- /dev/null
+++ b/app-admin/vault/vault-1.12.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+ webui? (
+ https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+ )"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="+webui"
+
+BDEPEND="
+ app-arch/zip
+ dev-go/gox
+ >=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+ acct-user/vault"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_unpack() {
+ default
+}
+
+src_prepare() {
+ default
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
+ -i scripts/build.sh || die
+ sed -e "/hooks/d" \
+ -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+ -e "s/gofumpt/gofmt/g" \
+ -i Makefile || die
+ if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+ rm -rf "${S}/http/web_ui" || die
+ mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+ die "mv failed"
+ else
+ mkdir -p "${S}/http/web_ui" || die
+ touch "${S}/http/web_ui/no_web_ui" || die
+ fi
+}
+
+src_compile() {
+ mkdir "${T}"/bin || die
+ BUILD_TAGS="$(usex webui ui '')" \
+ GOPATH="${T}" \
+ XC_ARCH=$(go env GOARCH) \
+ XC_OS=$(go env GOOS) \
+ XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+ emake bin
+}
+
+src_install() {
+ dobin bin/${PN}
+ dodoc CHANGELOG.md CONTRIBUTING.md README.md
+ insinto /etc/${PN}.d
+ doins "${FILESDIR}/"*.json.example
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-admin/whowatch/files/whowatch-1.8.4-configure-clang16.patch b/app-admin/whowatch/files/whowatch-1.8.4-configure-clang16.patch
new file mode 100644
index 00000000000..243a1e543a0
--- /dev/null
+++ b/app-admin/whowatch/files/whowatch-1.8.4-configure-clang16.patch
@@ -0,0 +1,24 @@
+https://github.com/mtsuszycki/whowatch/pull/12
+
+From 62688e7316de7d4c80591f83afc97d55d73ad272 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Sat, 26 Nov 2022 17:45:23 +0100
+Subject: [PATCH] configure.ac: Do not call undeclared exit function
+
+Implicit function declarations were removed from the C language in
+1999, and future compilers are likely to treat them as errors by
+default.
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,8 +120,8 @@ fd_set rfds;
+ struct timeval tv = {1, 0};
+ FD_ZERO(&rfds); FD_SET(0,&rfds);
+ select(1,&rfds,0,0,&tv);
+-if(tv.tv_sec == 0) exit(0);
+-else exit(1);
++if(tv.tv_sec == 0) return 0;
++else return 1;
+ }
+ ]])],[AC_MSG_RESULT(yes); AC_DEFINE([RETURN_TV_IN_SELECT],[1],[define if select() modifies the time value])],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
+
+
diff --git a/app-admin/whowatch/metadata.xml b/app-admin/whowatch/metadata.xml
index a1b469c0cd7..fab25be381f 100644
--- a/app-admin/whowatch/metadata.xml
+++ b/app-admin/whowatch/metadata.xml
@@ -5,4 +5,7 @@
<longdescription>
A interactive who program that displays information about the users currently logged into the machine.
</longdescription>
+ <upstream>
+ <remote-id type="github">mtsuszycki/whowatch</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-admin/whowatch/whowatch-1.8.6-r1.ebuild b/app-admin/whowatch/whowatch-1.8.6-r2.ebuild
index 75f41120c58..bc6d1d06f68 100644
--- a/app-admin/whowatch/whowatch-1.8.6-r1.ebuild
+++ b/app-admin/whowatch/whowatch-1.8.6-r2.ebuild
@@ -19,6 +19,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-1.8.4-tinfo.patch
+ "${FILESDIR}"/${PN}-1.8.4-configure-clang16.patch
)
src_prepare() {
diff --git a/app-admin/xtail/xtail-2.1-r1.ebuild b/app-admin/xtail/xtail-2.1-r1.ebuild
deleted file mode 100644
index 9f010062d31..00000000000
--- a/app-admin/xtail/xtail-2.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tail multiple logfiles at once, even if rotated"
-HOMEPAGE="http://www.unicom.com/sw/xtail/"
-SRC_URI="
- http://www.unicom.com/sw/xtail/${P}.tar.gz
- http://www.unicom.com/files/20120219-patch-aalto.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-PATCHES=(
- "${WORKDIR}"/0001-Use-ISO8601-Fix-Gcc-header-Use-C-c.patch
- "${WORKDIR}"/0001-xtail.1-remove-SIGQUIT.patch
- "${WORKDIR}"/xtail_2.1-5-debian-local-changes.patch
-)
-
-src_configure() {
- tc-export CC
- default
-}
-
-src_install() {
- dobin xtail
- doman xtail.1
- dodoc README
- newdoc ../README README.patches
-}
diff --git a/app-admin/xtail/xtail-2.1_p8.ebuild b/app-admin/xtail/xtail-2.1_p8.ebuild
index 1ff57c0e443..c9d84ca2880 100644
--- a/app-admin/xtail/xtail-2.1_p8.ebuild
+++ b/app-admin/xtail/xtail-2.1_p8.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
BDEPEND="app-arch/unzip"