summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/ananicy/ananicy-2.2.1-r1.ebuild4
-rw-r--r--app-admin/ananicy/metadata.xml9
-rw-r--r--app-admin/ansible-core/Manifest1
-rw-r--r--app-admin/ansible-core/ansible-core-2.14.13-r1.ebuild (renamed from app-admin/ansible-core/ansible-core-2.14.13.ebuild)2
-rw-r--r--app-admin/ansible-core/ansible-core-2.15.8-r1.ebuild (renamed from app-admin/ansible-core/ansible-core-2.15.8.ebuild)2
-rw-r--r--app-admin/ansible-core/ansible-core-2.16.2-r1.ebuild (renamed from app-admin/ansible-core/ansible-core-2.16.2.ebuild)2
-rw-r--r--app-admin/ansible-core/ansible-core-2.16.4-r1.ebuild (renamed from app-admin/ansible-core/ansible-core-2.16.4.ebuild)2
-rw-r--r--app-admin/ansible-core/ansible-core-2.16.5.ebuild54
-rw-r--r--app-admin/ansible-core/ansible-core-9999.ebuild2
-rw-r--r--app-admin/ansible-core/metadata.xml4
-rw-r--r--app-admin/ansible-lint/Manifest2
-rw-r--r--app-admin/ansible-lint/ansible-lint-24.2.0.ebuild4
-rw-r--r--app-admin/ansible-lint/ansible-lint-24.2.2.ebuild (renamed from app-admin/ansible-lint/ansible-lint-6.22.2.ebuild)4
-rw-r--r--app-admin/ansible-lint/metadata.xml4
-rw-r--r--app-admin/ansible-molecule/Manifest1
-rw-r--r--app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild87
-rw-r--r--app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch10
-rw-r--r--app-admin/ansible/metadata.xml4
-rw-r--r--app-admin/apache-tools/Manifest1
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.59.ebuild113
-rw-r--r--app-admin/apg/metadata.xml5
-rw-r--r--app-admin/awscli-bin/metadata.xml3
-rw-r--r--app-admin/awscli/Manifest8
-rw-r--r--app-admin/awscli/awscli-1.32.74.ebuild (renamed from app-admin/awscli/awscli-1.32.44.ebuild)0
-rw-r--r--app-admin/awscli/awscli-1.32.79.ebuild (renamed from app-admin/awscli/awscli-1.32.49.ebuild)0
-rw-r--r--app-admin/awscli/awscli-1.32.84.ebuild (renamed from app-admin/awscli/awscli-1.32.54.ebuild)0
-rw-r--r--app-admin/awscli/awscli-1.32.85.ebuild90
-rw-r--r--app-admin/awscli/awscli-1.32.86.ebuild90
-rw-r--r--app-admin/bitwarden-desktop-bin/Manifest2
-rw-r--r--app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.3.0.ebuild87
-rw-r--r--app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.4.1.ebuild87
-rw-r--r--app-admin/bitwarden-desktop-bin/metadata.xml5
-rw-r--r--app-admin/calamares/Manifest1
-rw-r--r--app-admin/calamares/calamares-3.2.60-r5.ebuild (renamed from app-admin/calamares/calamares-3.2.60-r4.ebuild)4
-rw-r--r--app-admin/calamares/calamares-3.3.5.ebuild167
-rw-r--r--app-admin/calamares/files/calamares-gentoo-branding.desc239
-rw-r--r--app-admin/checksec/checksec-2.6.0-r1.ebuild4
-rw-r--r--app-admin/clsync/metadata.xml5
-rw-r--r--app-admin/clustershell/metadata.xml4
-rw-r--r--app-admin/conky/Manifest2
-rw-r--r--app-admin/conky/conky-1.19.8.ebuild (renamed from app-admin/conky/conky-1.19.7.ebuild)6
-rw-r--r--app-admin/consul-template/Manifest4
-rw-r--r--app-admin/consul-template/consul-template-0.37.4.ebuild (renamed from app-admin/consul-template/consul-template-0.29.5.ebuild)11
-rw-r--r--app-admin/consul/Manifest6
-rw-r--r--app-admin/consul/consul-1.15.11.ebuild (renamed from app-admin/consul/consul-1.15.7.ebuild)13
-rw-r--r--app-admin/consul/consul-1.18.1.ebuild (renamed from app-admin/consul/consul-1.15.10.ebuild)15
-rw-r--r--app-admin/cpulimit/metadata.xml5
-rw-r--r--app-admin/cronlocker/metadata.xml3
-rw-r--r--app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r2.ebuild (renamed from app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild)4
-rw-r--r--app-admin/drush/drush-6.7.0-r6.ebuild4
-rw-r--r--app-admin/drush/drush-6.7.0-r7.ebuild (renamed from app-admin/drush/drush-6.7.0-r4.ebuild)8
-rw-r--r--app-admin/drush/files/drush-6.7.0-batch-signature-fix-r1.patch46
-rw-r--r--app-admin/entr/metadata.xml4
-rw-r--r--app-admin/exo/Manifest2
-rw-r--r--app-admin/exo/exo-1.76.2.ebuild (renamed from app-admin/exo/exo-1.76.0.ebuild)0
-rw-r--r--app-admin/fifo-cronolog/Manifest2
-rw-r--r--app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild (renamed from app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild)19
-rw-r--r--app-admin/git-credential-gopass/Manifest2
-rw-r--r--app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild21
-rw-r--r--app-admin/gopass-hibp/Manifest2
-rw-r--r--app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild21
-rw-r--r--app-admin/gopass-jsonapi/Manifest2
-rw-r--r--app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild25
-rw-r--r--app-admin/gopass-summon-provider/Manifest2
-rw-r--r--app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild21
-rw-r--r--app-admin/gopass/Manifest2
-rw-r--r--app-admin/gopass/gopass-1.15.13.ebuild45
-rw-r--r--app-admin/hcloud/Manifest3
-rw-r--r--app-admin/hcloud/hcloud-1.37.0.ebuild34
-rw-r--r--app-admin/hcloud/hcloud-1.42.0.ebuild4
-rw-r--r--app-admin/hcloud/hcloud-1.43.0.ebuild (renamed from app-admin/hcloud/hcloud-1.41.1.ebuild)11
-rw-r--r--app-admin/keepassxc/Manifest1
-rw-r--r--app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild110
-rw-r--r--app-admin/keepassxc/keepassxc-9999.ebuild20
-rw-r--r--app-admin/lib_users/lib_users-0.15-r1.ebuild44
-rw-r--r--app-admin/linode-cli/Manifest3
-rw-r--r--app-admin/linode-cli/linode-cli-5.48.3.ebuild (renamed from app-admin/linode-cli/linode-cli-5.48.2.ebuild)0
-rw-r--r--app-admin/linode-cli/linode-cli-5.48.4.ebuild30
-rw-r--r--app-admin/logcheck/files/logcheck-r4.cron11
-rw-r--r--app-admin/logcheck/files/logcheck.cron.d1
-rw-r--r--app-admin/logcheck/logcheck-1.4.3-r4.ebuild99
-rw-r--r--app-admin/mcelog/Manifest3
-rw-r--r--app-admin/mcelog/mcelog-195.ebuild54
-rw-r--r--app-admin/mcelog/mcelog-197.ebuild2
-rw-r--r--app-admin/mcelog/mcelog-198.ebuild (renamed from app-admin/mcelog/mcelog-196.ebuild)6
-rw-r--r--app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild (renamed from app-admin/ngxtop/ngxtop-0.0.3_pre141201-r2.ebuild)9
-rw-r--r--app-admin/opentofu/Manifest2
-rw-r--r--app-admin/opentofu/opentofu-1.6.2.ebuild (renamed from app-admin/terraform/terraform-1.3.9.ebuild)16
-rw-r--r--app-admin/perl-cleaner/Manifest1
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild45
-rw-r--r--app-admin/ps_mem/ps_mem-3.14-r1.ebuild5
-rw-r--r--app-admin/puppet-agent/Manifest4
-rw-r--r--app-admin/puppet-agent/puppet-agent-8.5.0.ebuild2
-rw-r--r--app-admin/puppet-agent/puppet-agent-8.5.1.ebuild (renamed from app-admin/puppet-agent/puppet-agent-8.3.1-r1.ebuild)0
-rw-r--r--app-admin/puppet/Manifest2
-rw-r--r--app-admin/puppet/puppet-8.5.0.ebuild2
-rw-r--r--app-admin/puppet/puppet-8.5.1.ebuild (renamed from app-admin/puppet/puppet-8.3.1-r1.ebuild)10
-rw-r--r--app-admin/puppetdb/puppetdb-8.4.1.ebuild2
-rw-r--r--app-admin/puppetserver/puppetserver-8.5.0.ebuild2
-rw-r--r--app-admin/pwman3/Manifest1
-rw-r--r--app-admin/pwman3/pwman3-0.11.1.ebuild31
-rw-r--r--app-admin/pwman3/pwman3-0.12.2.ebuild15
-rw-r--r--app-admin/pydf/metadata.xml5
-rw-r--r--app-admin/r10k/Manifest1
-rw-r--r--app-admin/r10k/r10k-4.0.2.ebuild48
-rw-r--r--app-admin/rasdaemon/Manifest2
-rw-r--r--app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch186
-rw-r--r--app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild76
-rw-r--r--app-admin/rasdaemon/rasdaemon-0.7.0.ebuild66
-rw-r--r--app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild85
-rw-r--r--app-admin/rasdaemon/rasdaemon-0.8.0.ebuild83
-rw-r--r--app-admin/redfishtool/redfishtool-1.1.8.ebuild2
-rw-r--r--app-admin/restart-services/Manifest3
-rw-r--r--app-admin/restart-services/restart-services-1.2.ebuild (renamed from app-admin/restart-services/restart-services-1.0.ebuild)2
-rw-r--r--app-admin/restart-services/restart-services-1.3.ebuild36
-rw-r--r--app-admin/rsyslog/Manifest4
-rw-r--r--app-admin/rsyslog/rsyslog-8.2402.0.ebuild2
-rw-r--r--app-admin/rsyslog/rsyslog-8.2404.0.ebuild (renamed from app-admin/rsyslog/rsyslog-8.2310.0.ebuild)44
-rw-r--r--app-admin/salt/Manifest1
-rw-r--r--app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch12
-rw-r--r--app-admin/salt/files/salt-3006.3-tests.patch26
-rw-r--r--app-admin/salt/salt-3005.5-r1.ebuild2
-rw-r--r--app-admin/salt/salt-3006.7-r1.ebuild3
-rw-r--r--app-admin/salt/salt-3007.0-r1.ebuild610
-rw-r--r--app-admin/serf/Manifest5
-rw-r--r--app-admin/serf/serf-0.10.0.ebuild55
-rw-r--r--app-admin/serf/serf-0.10.1-r1.ebuild (renamed from app-admin/serf/serf-0.9.8.ebuild)17
-rw-r--r--app-admin/stow/Manifest2
-rw-r--r--app-admin/stow/stow-2.4.0.ebuild34
-rw-r--r--app-admin/syslog-ng/syslog-ng-4.6.0.ebuild2
-rw-r--r--app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch18
-rw-r--r--app-admin/sysstat/sysstat-12.6.2-r2.ebuild85
-rw-r--r--app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild92
-rw-r--r--app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild2
-rw-r--r--app-admin/systemdgenie/metadata.xml1
-rw-r--r--app-admin/terraform/Manifest8
-rw-r--r--app-admin/terraform/terraform-1.6.5.ebuild40
-rw-r--r--app-admin/terraform/terraform-1.7.2.ebuild2
-rw-r--r--app-admin/terraform/terraform-1.7.5.ebuild (renamed from app-admin/terraform/terraform-1.7.0.ebuild)3
-rw-r--r--app-admin/testdisk/Manifest2
-rw-r--r--app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch46
-rw-r--r--app-admin/testdisk/metadata.xml1
-rw-r--r--app-admin/testdisk/testdisk-7.2.ebuild (renamed from app-admin/testdisk/testdisk-7.1-r2.ebuild)20
-rw-r--r--app-admin/usbview/usbview-3.1.ebuild2
-rw-r--r--app-admin/vault/Manifest8
-rw-r--r--app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch92
-rw-r--r--app-admin/vault/vault-1.15.6.ebuild (renamed from app-admin/vault/vault-1.14.8.ebuild)14
-rw-r--r--app-admin/vault/vault-1.16.1.ebuild87
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch11
-rw-r--r--app-admin/webapp-config/webapp-config-1.55-r4.ebuild91
-rw-r--r--app-admin/webapp-config/webapp-config-9999.ebuild8
-rw-r--r--app-admin/xkcdpass/Manifest4
-rw-r--r--app-admin/xkcdpass/files/xkcdpass-1.19.4-no-examples-in-site-packages.patch13
-rw-r--r--app-admin/xkcdpass/xkcdpass-1.19.4.ebuild42
-rw-r--r--app-admin/xkcdpass/xkcdpass-1.19.5.ebuild42
-rw-r--r--app-admin/xkcdpass/xkcdpass-1.19.8.ebuild4
-rw-r--r--app-admin/xkcdpass/xkcdpass-1.19.9.ebuild (renamed from app-admin/xkcdpass/xkcdpass-1.19.6.ebuild)6
157 files changed, 2873 insertions, 1280 deletions
diff --git a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
index cec32d45eaef..f3f8a39a1804 100644
--- a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
+++ b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/app-admin/ananicy/metadata.xml b/app-admin/ananicy/metadata.xml
index cb2e8d8db595..88aaec308a1f 100644
--- a/app-admin/ananicy/metadata.xml
+++ b/app-admin/ananicy/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>lssndrbarbieri@gmail.com</email>
- <name>Alessandro Barbieri</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<bugs-to>https://github.com/Nefelim4ag/Ananicy/issues</bugs-to>
<remote-id type="github">Nefelim4ag/Ananicy</remote-id>
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index 7c9344fb0d26..c721a898bd3f 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -2,3 +2,4 @@ DIST ansible-core-2.14.13.tar.gz 3145413 BLAKE2B 75b11feaaefa9a63c6f83f64c796cea
DIST ansible-core-2.15.8.tar.gz 3160606 BLAKE2B 439a3f584940e5ab46b43b0b47395e0618a3ea52c67ebcd51667f31220cb038dda35506e7843d177d555b77a55a9d2c6245a916741ab1dcdf222c535afb5f83d SHA512 020191ef4b005abbf799204da68270bd4f13a85c7f23cb9dffe85b1c5c093c0ad86e061211ab9fcc8fd0be9367717fb0baadefb1ebecd3579471120fb2e8647f
DIST ansible-core-2.16.2.tar.gz 3163899 BLAKE2B 6365dd573ae4a2f3ebfc870ae3ea399b268615333de2ddf7e21323189dfdd9bf61ae836b536c86d713f4a934468ed36835084e06e4b6d9b32c4b633f55353ad9 SHA512 6e2389fc6b34645c0f1566eca960da36616619a5ed5e35b46f3d659979fe519db20d89b4f598344a389f4b6ac33bb660ea91a1a6509002bbf4ac791ea3cb4cbd
DIST ansible-core-2.16.4.tar.gz 3170397 BLAKE2B 8226641621ce4b2a8cd564f831cd21e36345b2db6680f8d9f3d3388a05ff66df74f4d286300dbb1b73601a0bf4a781d266e62e9fd0c894a79f89d545930c854a SHA512 d05737eec9a6a0e71891821acd4540576b3a993f59d88c12c2da8e7f075bc11c712e0eba850b3f7a2643e3c970f51938267fed6fa7f99f2c4c205b64f9b13259
+DIST ansible-core-2.16.5.tar.gz 3171617 BLAKE2B cb620cf9fc9fd509edb62bf75ab19b5ffe80f4d8520be76bbeb030c74953945295e0f4f30102f51d20247d2ce4a18b15e488e47b4346319f5442979593402821 SHA512 dbe5d68fbc3a0ef611791d6995297bca5bba6aed1f4871964136ea81810458646bc78c2146739f887de3c2e3017cf4e6d4d09652e41c2ca046c4bc88eca6c5d8
diff --git a/app-admin/ansible-core/ansible-core-2.14.13.ebuild b/app-admin/ansible-core/ansible-core-2.14.13-r1.ebuild
index 756b42643396..113c9aeb164f 100644
--- a/app-admin/ansible-core/ansible-core-2.14.13.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.14.13-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
inherit distutils-r1
diff --git a/app-admin/ansible-core/ansible-core-2.15.8.ebuild b/app-admin/ansible-core/ansible-core-2.15.8-r1.ebuild
index 3013d29fa0b5..45fc573d4107 100644
--- a/app-admin/ansible-core/ansible-core-2.15.8.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.15.8-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
inherit distutils-r1
diff --git a/app-admin/ansible-core/ansible-core-2.16.2.ebuild b/app-admin/ansible-core/ansible-core-2.16.2-r1.ebuild
index 3013d29fa0b5..45fc573d4107 100644
--- a/app-admin/ansible-core/ansible-core-2.16.2.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.16.2-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
inherit distutils-r1
diff --git a/app-admin/ansible-core/ansible-core-2.16.4.ebuild b/app-admin/ansible-core/ansible-core-2.16.4-r1.ebuild
index 49da7dc95856..51f3b5d36db1 100644
--- a/app-admin/ansible-core/ansible-core-2.16.4.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.16.4-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
inherit distutils-r1
diff --git a/app-admin/ansible-core/ansible-core-2.16.5.ebuild b/app-admin/ansible-core/ansible-core-2.16.5.ebuild
new file mode 100644
index 000000000000..a9e25609de36
--- /dev/null
+++ b/app-admin/ansible-core/ansible-core-2.16.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+ EGIT_BRANCH="devel"
+else
+ inherit pypi
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+ <dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+BDEPEND="
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ test? (
+ 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
+}
diff --git a/app-admin/ansible-core/ansible-core-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild
index 17a70128adeb..a9e25609de36 100644
--- a/app-admin/ansible-core/ansible-core-9999.ebuild
+++ b/app-admin/ansible-core/ansible-core-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
inherit distutils-r1
diff --git a/app-admin/ansible-core/metadata.xml b/app-admin/ansible-core/metadata.xml
index 86dea112ad49..7e75c7575290 100644
--- a/app-admin/ansible-core/metadata.xml
+++ b/app-admin/ansible-core/metadata.xml
@@ -5,10 +5,6 @@
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
- <maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- <name>Patrice Clement</name>
- </maintainer>
<upstream>
<remote-id type="pypi">ansible-core</remote-id>
<remote-id type="github">ansible/ansible</remote-id>
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 6a7b426a5e91..2b8fc9c59daf 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,2 +1,2 @@
DIST ansible-lint-24.2.0.tar.gz 513719 BLAKE2B 54e05acf982cf13cb2142a10bf04250171f07936df14933525dfae68b312a0d92ceb30867603dc7ce686206b7de010f6ca4eb9ab532ca000fc3c15c77c354c81 SHA512 3276d28c7b85a6087a0142cc56442efddf9ff3e81155455c74686015a2ab45ece64847b0243373ad01145e67599d8449866c122efe8ae404cd819011e41c5235
-DIST ansible-lint-6.22.2.tar.gz 513988 BLAKE2B b46764751a84ff2a699203bf07f4a04362faa99d7433af6ead9f7ada9e581ff8b3d9bbf205a0127950e15e4413a72fc057cd10588dffec2fb9621f58620ae1ca SHA512 b48dec138a37754135e48007636f020524947342ab40f2b9dea36e10989e88ee6899e4742f1715feecfd7e239c80d3bed0581558c39eac783a84523507740180
+DIST ansible-lint-24.2.2.tar.gz 515822 BLAKE2B e9d8e689dfe4e4efbd4dad44ff3567f50412400ed979f2d60150f09f17c5f63f2441f25a33ecdf0112024ced07e62ac16b8a2dbc1c01d62855ec785fc75d1b9a SHA512 3de6b14e4b64ba577abcb67920a45dbf45fedb84e21091cd6a29e3c52a7a91555a152ee3e265624aafbf9dddba96d04241c2598a18f2103ce2cae48706142446
diff --git a/app-admin/ansible-lint/ansible-lint-24.2.0.ebuild b/app-admin/ansible-lint/ansible-lint-24.2.0.ebuild
index 3f90dcc0ab28..1995f0728a37 100644
--- a/app-admin/ansible-lint/ansible-lint-24.2.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-24.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 pypi
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ansible/ansible-lint"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
# Upstream has stated explicitly that all tests require Internet access
PROPERTIES="test_network"
diff --git a/app-admin/ansible-lint/ansible-lint-6.22.2.ebuild b/app-admin/ansible-lint/ansible-lint-24.2.2.ebuild
index c509d62a76e4..e8e336e27738 100644
--- a/app-admin/ansible-lint/ansible-lint-6.22.2.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-24.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 pypi
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ansible/ansible-lint"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~riscv"
# Upstream has stated explicitly that all tests require Internet access
PROPERTIES="test_network"
diff --git a/app-admin/ansible-lint/metadata.xml b/app-admin/ansible-lint/metadata.xml
index 094d18cbba43..8ec7574bc4cb 100644
--- a/app-admin/ansible-lint/metadata.xml
+++ b/app-admin/ansible-lint/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- <name>Patrice Clement</name>
- </maintainer>
- <maintainer type="person">
<email>marecki@gentoo.org</email>
<name>Marek Szuba</name>
</maintainer>
diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest
index b850ee05029c..948c0d4c840d 100644
--- a/app-admin/ansible-molecule/Manifest
+++ b/app-admin/ansible-molecule/Manifest
@@ -1 +1,2 @@
+DIST molecule-24.2.1.tar.gz 343228 BLAKE2B 9605b5a8e21d37597cbf35f0f6f811471909dde5496541b1d7cd130eb2b970125fdc291df6493f8716f38514df17d957094604ae49e64d16f2207a0d3682bd38 SHA512 3813163d72cee51987d340c8a1ed0e03d8abe509a601e94c3e32bf673a56edd83d0c2bde1347057fe8a4c2b37e11a068ef689dd669d4395da64bec3921f1403d
DIST molecule-5.1.0.tar.gz 335161 BLAKE2B 55c2f3c181bef6ab848cf7b52b19649fd861dbdbd68b92d3de9e0a1330755b9b887affd8f78e92ab33145ed60e7131d3cf1ffb7b4d8f10c1c3cab8dd58288af9 SHA512 4d025a512e3a6ac7f424318f06bb23b2c1ef1cc122d31d012430bfccf4efeeb3c7ddf2450abd78378c1c50f54fffb1fa8f366f14eebe58125f177ced8cec3ff5
diff --git a/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild
new file mode 100644
index 000000000000..5d55bc9dd5af
--- /dev/null
+++ b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+ >=dev-python/mkdocs-ansible-24.3.0
+ dev-python/mkdocs-autorefs
+ dev-python/mkdocstrings-python
+ media-gfx/cairosvg
+"
+PYPI_PN="molecule"
+
+inherit distutils-r1 docs optfeature pypi
+
+DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles"
+HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible/molecule/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="selinux"
+
+# Since around the time of the switch to the yy.m.patchlevel versioning scheme
+# the test suite has been completely incompatible with Portage, with several
+# tests which do pass under Tox failing even with disabled sandboxing.
+# Nb. As of 24.2.1 two tests fail even under Tox, for both PyPI and GitHub
+# tarballs.
+RESTRICT="test"
+
+RDEPEND="$(python_gen_cond_dep '
+ >=app-admin/ansible-core-2.12.10[${PYTHON_USEDEP}]
+ >=dev-python/ansible-compat-4.1.8[${PYTHON_USEDEP}]
+ >=dev-python/click-8.0[${PYTHON_USEDEP}]
+ <dev-python/click-9[${PYTHON_USEDEP}]
+ >=dev-python/click-help-colors-0.9[${PYTHON_USEDEP}]
+ >=dev-python/enrich-1.2.7[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-4.9.1[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ <dev-python/pluggy-2.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+ >=dev-python/rich-9.5.1[${PYTHON_USEDEP}]
+ selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] )
+')"
+BDEPEND="$(python_gen_cond_dep '
+ <dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/pillow[truetype,${PYTHON_USEDEP}]
+ media-fonts/roboto
+ )
+ test? (
+ >=app-admin/ansible-lint-6.12.1[${PYTHON_USEDEP}]
+ app-misc/check-jsonschema[${PYTHON_USEDEP}]
+ >=dev-python/ansi2html-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/filelock-3.9.0[${PYTHON_USEDEP}]
+ <dev-python/pexpect-5[${PYTHON_USEDEP}]
+ >=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-plus-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-xdist-3.1.0[${PYTHON_USEDEP}]
+ )
+')"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-24.2.1-mkdocs_google_fonts.patch
+)
+
+# test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py:
+# - quite a few of these tests use the network;
+# - test_command_dependency[shell] only works if Molecule has previously been installed;
+# - tests involving creation of a new scenario fail on ansible-lint errors, even though
+# a config file is deployed which should skip expected issues.
+EPYTEST_DESELECT=(
+ src/molecule/test/functional/test_command.py
+ src/molecule/test/unit/command/init/test_role.py
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+ optfeature_header "Some optional packages commonly used in Molecule scenarios:"
+ optfeature "checking playbooks for practices and behaviour that can be improved" app-admin/ansible-lint
+}
diff --git a/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch b/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch
new file mode 100644
index 000000000000..bf8883258f79
--- /dev/null
+++ b/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch
@@ -0,0 +1,10 @@
+--- a/mkdocs.yml
++++ b/mkdocs.yml
+@@ -9,6 +9,7 @@
+
+ theme:
+ name: ansible
++ font: false
+ features:
+ - announce.dismiss
+ - content.action.edit
diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml
index 73a2e474e953..32affbcfbda2 100644
--- a/app-admin/ansible/metadata.xml
+++ b/app-admin/ansible/metadata.xml
@@ -5,10 +5,6 @@
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
- <maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- <name>Patrice Clement</name>
- </maintainer>
<upstream>
<remote-id type="pypi">ansible</remote-id>
<remote-id type="github">ansible/ansible</remote-id>
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index ec4f70d5c0c4..3c228281999e 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,2 +1,3 @@
DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
+DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c SHA512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2
diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
new file mode 100644
index 000000000000..ff67bbf7dac4
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.59.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+ dev-libs/apr-util:1=
+ dev-libs/expat
+ dev-libs/libpcre2
+ virtual/libcrypt:=
+ kernel_linux? ( sys-apps/util-linux )
+ ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ dev-build/libtool"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+ "${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+ "${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+ default
+
+ # This package really should upgrade to using pcre's .pc file.
+ cat <<-\EOF > "${T}"/pcre2-config
+ #!/usr/bin/env bash
+ flags=()
+ for flag; do
+ if [[ ${flag} == "--version" ]]; then
+ flags+=( --modversion )
+ else
+ flags+=( "${flag}" )
+ fi
+ done
+ exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+ EOF
+ chmod a+x "${T}"/pcre2-config || die
+
+ # Only here for libtool and which patches
+ eautoreconf
+}
+
+src_configure() {
+ # Silly check.
+ tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+ tc-export PKG_CONFIG
+ export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+ export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+
+ local myeconfargs=(
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+ --sbindir="${EPREFIX}"/usr/sbin
+ --with-z="${EPREFIX}"/usr
+ --with-apr="${ESYSROOT}"/usr
+ --with-apr-util="${ESYSROOT}"/usr
+ --without-pcre
+ --with-pcre2="${T}"/pcre2-config
+ $(use_enable ssl)
+ $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+ )
+
+ # econf overwrites the stuff from config.layout.
+ econf "${myeconfargs[@]}"
+
+ sed -i \
+ -e '/^LTFLAGS/s:--silent::' \
+ build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+ emake -C support
+}
+
+src_install() {
+ emake -C support DESTDIR="${D}" install
+ dodoc CHANGES
+ doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+ docs/man/{htcacheclean,rotatelogs}.8
+
+ # Providing compatiblity symlinks for #177697 (which we'll stop to install
+ # at some point).
+ pushd "${ED}"/usr/sbin >/dev/null || die
+ local i
+ for i in *; do
+ dosym ${i} /usr/sbin/${i}2
+ done
+ popd >/dev/null || die
+
+ # Provide a symlink for ab-ssl
+ if use ssl ; then
+ dosym ab /usr/bin/ab-ssl
+ dosym ab /usr/bin/ab2-ssl
+ fi
+}
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 42a6908bb91a..926d74e0de11 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">wilx/apg</remote-id>
</upstream>
diff --git a/app-admin/awscli-bin/metadata.xml b/app-admin/awscli-bin/metadata.xml
index db463f3eeb66..b60727e29e46 100644
--- a/app-admin/awscli-bin/metadata.xml
+++ b/app-admin/awscli-bin/metadata.xml
@@ -5,4 +5,7 @@
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">aws/aws-cli</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 4114fb26c457..1a2f53966476 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,3 +1,5 @@
-DIST aws-cli-1.32.44.gh.tar.gz 2650447 BLAKE2B 880877517e3165f30fdcf9295ddc30dc7a127c1cba260fb2ff4c433311f7a7f1e5d221beb47cf008b68efe96a1b087720ae4de7868a90af76a35213eca2754f8 SHA512 9a0d702cf5a2e555118d6cd958c771de35e804add546de2e50bcd499744e43d37e273f543d6b2864635f79f82ce0e6ffc73b977c25304fe9d6aad063216261ee
-DIST aws-cli-1.32.49.gh.tar.gz 2654398 BLAKE2B fc2e9052b777e1e8bac60621993b55aa01bb0c0e66ad24008498d44b68ecffeaa903d8afd6e361768031c3954e061ed89e24d85fea23454fad8f6d7de4521cfa SHA512 4a5c1d9e92b7e615adb1d6afca0a01a62e55ac4ffd50b9d7634faf0a4e6108c035e78f9f60824bc9a53505ed4a376757ec4c9fc35fb26a2ba8850f7a206919bf
-DIST aws-cli-1.32.54.gh.tar.gz 2656395 BLAKE2B 7f41ac7bb0b11ef851cbc1793c202dd38045fda6af3694e1d2c29f2aa07047f116c6bceb5aec72e805494647f801b1523dadef5301322ed9c25426aaccc1289e SHA512 29e591d8f06091cd138c3ff10b15cd0344b5f12e6a4452ce1cde3e6439e1b70ded7f1b60c96c53a6ad699a3e6b49591e5d26b0190d7d6268792b77a883faa6fc
+DIST aws-cli-1.32.74.gh.tar.gz 2682208 BLAKE2B aba8be6e597a6d07197bd06d51f167f7a2dbed317c630572585cd006f6edfceac054726a20afe20faf6de381cbb75e352a7d6ab9e232b6e669fd59ca5888e122 SHA512 2f19b7c383c91528f15b93b00df285bdf32685c08e41e4f8f3a62cbbd5cff2615ca98c5eb925a5a2a2d13b452a0a08658749f4f7a48045a537ee7ec7e23cd663
+DIST aws-cli-1.32.79.gh.tar.gz 2685785 BLAKE2B 3bbfad927d9d882e6b502f47919ce963df498c614a92730c5d6b1fb4efd7a8bd805a5c8cc82c705b97d8ee0ddbee4d6ddfa9cb46661fe7e9337add53bda3d9a1 SHA512 e0e369b6a5fca4d72365e54ef99c862e2d6f68caed61ac431516777e82ec8b292cf50516f379d8e94787b2a0ee58ad6e68d0951624f1ed742079295c4d2987ce
+DIST aws-cli-1.32.84.gh.tar.gz 2691519 BLAKE2B 4cb78f14975d74013803af0f6397d959294cca6046ee19c1a907ca3e60fd224539d39535416ddcc2713b1de653b78ba03965dc78415dd915e80d11fcd6fbe02f SHA512 19d2030201806b336ede2c5e09f761e39959a156057d68316180145232e54013f2e5fa57023146488d407aa7e655fdb2245058e45eb5c4d6778eecd867f6eac1
+DIST aws-cli-1.32.85.gh.tar.gz 2692681 BLAKE2B 1b74cd51dd71ce01b492f21de40d25e7ea4b2e3e3572cf2346b0fd293a4ba2dbb870acb1f0b2f41494f5fb065d5eb20c6e3f98a4035d7426bf6926535c8ef83e SHA512 7f471978f4a306944d30ad2cacd3feaea6a821be79aa814300a2833824328414f878ee2d0a6d42371d38e3d841530be7f25f0e14b81360e81182d9c9e35227b5
+DIST aws-cli-1.32.86.gh.tar.gz 2692809 BLAKE2B b0c9956d7b2b81f05b8f59ccbcd14baca3acb9f006ac965d0df06d86309bdd4d71c430514d22ef5c5c871e6009a174e8abc25b47ab8cd4471230e301bc0e50a1 SHA512 ab689fc5997bd14223e76307c1c4609950b5e4a62932163bd68d8a4d7a9c09db55b17c4377cba3901cd9518ac2b6ccc191fd9c7692dd0e188bfdd475bfcfc0ac
diff --git a/app-admin/awscli/awscli-1.32.44.ebuild b/app-admin/awscli/awscli-1.32.74.ebuild
index b7c9ceb6d88f..b7c9ceb6d88f 100644
--- a/app-admin/awscli/awscli-1.32.44.ebuild
+++ b/app-admin/awscli/awscli-1.32.74.ebuild
diff --git a/app-admin/awscli/awscli-1.32.49.ebuild b/app-admin/awscli/awscli-1.32.79.ebuild
index 4a677affdbc4..4a677affdbc4 100644
--- a/app-admin/awscli/awscli-1.32.49.ebuild
+++ b/app-admin/awscli/awscli-1.32.79.ebuild
diff --git a/app-admin/awscli/awscli-1.32.54.ebuild b/app-admin/awscli/awscli-1.32.84.ebuild
index 4a677affdbc4..4a677affdbc4 100644
--- a/app-admin/awscli/awscli-1.32.54.ebuild
+++ b/app-admin/awscli/awscli-1.32.84.ebuild
diff --git a/app-admin/awscli/awscli-1.32.85.ebuild b/app-admin/awscli/awscli-1.32.85.ebuild
new file mode 100644
index 000000000000..4a677affdbc4
--- /dev/null
+++ b/app-admin/awscli/awscli-1.32.85.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# 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}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+BDEPEND="
+ test? (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ )
+"
+
+EPYTEST_XDIST=1
+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() {
+ local serial_tests=(
+ tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+ tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+ tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+ tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+ tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+ tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+ tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+ tests/unit/customizations/test_sessionmanager.py
+ tests/unit/test_compat.py::TestIgnoreUserSignals
+ tests/unit/test_help.py
+ tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+ )
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+ local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit}
+}
+
+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.32.86.ebuild b/app-admin/awscli/awscli-1.32.86.ebuild
new file mode 100644
index 000000000000..4a677affdbc4
--- /dev/null
+++ b/app-admin/awscli/awscli-1.32.86.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# 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}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+BDEPEND="
+ test? (
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ )
+"
+
+EPYTEST_XDIST=1
+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() {
+ local serial_tests=(
+ tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+ tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+ tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+ tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+ tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+ tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+ tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+ tests/unit/customizations/test_sessionmanager.py
+ tests/unit/test_compat.py::TestIgnoreUserSignals
+ tests/unit/test_help.py
+ tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+ )
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+ local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit}
+}
+
+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/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index 2380ee61ea57..3567b1970501 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1 +1,3 @@
DIST Bitwarden-2024.2.0-amd64.deb 79917282 BLAKE2B 2066dc71bed9cddbcedccfd9129e3e81ac9f8a71217d2c651fb8a067b3e318574e26104b447a7ccd6734efded64ef3620cf4a7e36f0a577ed98f5468839540cb SHA512 c9394914fd6c82096fc5336e73b539e250727c6917af97961df0bd7de241f955b9eb87da154f32972c73ea1ce59bf0d79660658277185c89e099360ec4c3ea26
+DIST Bitwarden-2024.3.0-amd64.deb 80463348 BLAKE2B 668fd4c18507b349e5892e7511b4898764a33d9da0a837379c7856caa054782fbf6a3337b03a779a8c8111d2458f560b31c32856850ff931694a8f18d889bdc9 SHA512 9297367e82e76870b7f12becfca6ec3bc0ce8f6515f4e17e9830d4df599891c839a8f5990c97b684528c8a4ad1c24ddd3bc99c1552620aee84b81c1cbf115771
+DIST Bitwarden-2024.4.1-amd64.deb 80470012 BLAKE2B 64b451c3fbbac303782c68a366c66c32c49d0ecb52bcbc085451157216cc99fa888941e8c911c14f6a68aa6bb0413463b4296f108386e7b5b3ca8925c6dcc871 SHA512 e6edcd84f44062ccfa4152baf7dab230915d006f7f31de0ffcbe1acb62525777c7d653a7cb7c51509fb9ebcf5ba4219df97e5128853813a54aadbfd92ff2c819
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.3.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.3.0.ebuild
new file mode 100644
index 000000000000..a98f129ada65
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.3.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker xdg-utils
+
+MY_PN="Bitwarden"
+
+DESCRIPTION="Bitwarden password manager desktop client"
+HOMEPAGE="https://bitwarden.com/"
+SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ app-crypt/libsecret
+ dev-libs/expat
+ dev-libs/glib
+ dev-libs/nspr
+ dev-libs/nss
+ dev-libs/wayland
+ media-libs/alsa-lib
+ media-libs/mesa
+ net-print/cups
+ sys-apps/dbus
+ sys-apps/util-linux
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libxshmfence
+ x11-libs/libXtst
+ x11-libs/pango
+"
+IDEPEND="
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+"
+
+QA_PREBUILT="
+ opt/Bitwarden/*.so*
+ opt/Bitwarden/bitwarden
+ opt/Bitwarden/chrome-sandbox
+ opt/Bitwarden/chrome_crashpad_handler
+"
+
+src_install() {
+ insinto /opt
+ doins -r opt/${MY_PN}
+ fperms 755 /opt/Bitwarden/bitwarden
+ fperms 4755 /opt/Bitwarden/chrome-sandbox
+
+ domenu usr/share/applications/bitwarden.desktop
+
+ local x
+ for x in 16 32 64 128 256 512; do
+ doicon -s ${x} usr/share/icons/hicolor/${x}*/*
+ done
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.4.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.4.1.ebuild
new file mode 100644
index 000000000000..a98f129ada65
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.4.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker xdg-utils
+
+MY_PN="Bitwarden"
+
+DESCRIPTION="Bitwarden password manager desktop client"
+HOMEPAGE="https://bitwarden.com/"
+SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ app-crypt/libsecret
+ dev-libs/expat
+ dev-libs/glib
+ dev-libs/nspr
+ dev-libs/nss
+ dev-libs/wayland
+ media-libs/alsa-lib
+ media-libs/mesa
+ net-print/cups
+ sys-apps/dbus
+ sys-apps/util-linux
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libxshmfence
+ x11-libs/libXtst
+ x11-libs/pango
+"
+IDEPEND="
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+"
+
+QA_PREBUILT="
+ opt/Bitwarden/*.so*
+ opt/Bitwarden/bitwarden
+ opt/Bitwarden/chrome-sandbox
+ opt/Bitwarden/chrome_crashpad_handler
+"
+
+src_install() {
+ insinto /opt
+ doins -r opt/${MY_PN}
+ fperms 755 /opt/Bitwarden/bitwarden
+ fperms 4755 /opt/Bitwarden/chrome-sandbox
+
+ domenu usr/share/applications/bitwarden.desktop
+
+ local x
+ for x in 16 32 64 128 256 512; do
+ doicon -s ${x} usr/share/icons/hicolor/${x}*/*
+ done
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/app-admin/bitwarden-desktop-bin/metadata.xml b/app-admin/bitwarden-desktop-bin/metadata.xml
index 4ab515d9e293..4f192903ad6e 100644
--- a/app-admin/bitwarden-desktop-bin/metadata.xml
+++ b/app-admin/bitwarden-desktop-bin/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>dlan@gentoo.org</email>
+ <name>Yixun Lan</name>
+ </maintainer>
<upstream>
<remote-id type="github">bitwarden/desktop</remote-id>
</upstream>
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 9301d4735645..30eda62874ab 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
+DIST calamares-3.3.5.tar.gz 4722988 BLAKE2B bc3270fbc2f804c46008f1f0a106719b779a07d7d5d3cc9f1ab17da7597ebb5dfebc8793036e19570b0048afb667df4b9fed55e813374d7465513ea048e00ffc SHA512 6846e13455e4fa38bd4d5061eece1baf5a972700f489dc1e35d988cfb5359650c63f79f9453431f1aff722af696260504c27f0c000490d781ab5fe03a5c46cf2
diff --git a/app-admin/calamares/calamares-3.2.60-r4.ebuild b/app-admin/calamares/calamares-3.2.60-r5.ebuild
index 370b7cfa23d3..592c5af31d92 100644
--- a/app-admin/calamares/calamares-3.2.60-r4.ebuild
+++ b/app-admin/calamares/calamares-3.2.60-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -44,7 +44,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde-frameworks/kservice:5
sys-apps/dbus
sys-apps/dmidecode
- sys-auth/polkit-qt
+ sys-auth/polkit-qt[qt5(+)]
>=sys-libs/kpmcore-4.0.0:5=
virtual/libcrypt:=
"
diff --git a/app-admin/calamares/calamares-3.3.5.ebuild b/app-admin/calamares/calamares-3.3.5.ebuild
new file mode 100644
index 000000000000..18227c7ccfcf
--- /dev/null
+++ b/app-admin/calamares/calamares-3.3.5.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{10..11} )
+
+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 qt6 +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+QT5_MIN="5.15.0"
+KF_QT5_MIN="5.78"
+QT6_MIN="6.5.0"
+KF_QT6_MIN="5.240"
+
+BDEPEND="
+ qt6? (
+ >=dev-qt/qttools-${QT6_MIN}:6[linguist]
+ >=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN}
+ )
+ !qt6? (
+ >=dev-qt/linguist-tools-${QT5_MIN}:5
+ >=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN}
+ )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ dev-cpp/yaml-cpp:=
+ $(python_gen_cond_dep '
+ >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}]
+ dev-libs/libpwquality[${PYTHON_USEDEP}]
+ ')
+ qt6? (
+ >=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml]
+ >=dev-qt/qtdeclarative-${QT6_MIN}:6
+ >=dev-qt/qtsvg-${QT6_MIN}:6
+ >=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
+ dev-qt/kdsingleapplication[qt6]
+ >=kde-frameworks/kconfig-${KF_QT6_MIN}:6
+ >=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
+ >=kde-frameworks/kcrash-${KF_QT6_MIN}:6
+ >=kde-frameworks/ki18n-${KF_QT6_MIN}:6
+ >=kde-frameworks/kpackage-${KF_QT6_MIN}:6
+ >=kde-frameworks/kparts-${KF_QT6_MIN}:6
+ >=kde-frameworks/kservice-${KF_QT6_MIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6
+ sys-auth/polkit-qt[qt6(-)]
+ >=sys-libs/kpmcore-24.01.75:6=
+ )
+ !qt6? (
+ >=dev-qt/qtconcurrent-${QT5_MIN}:5
+ >=dev-qt/qtdbus-${QT5_MIN}:5
+ >=dev-qt/qtdeclarative-${QT5_MIN}:5
+ >=dev-qt/qtgui-${QT5_MIN}:5
+ >=dev-qt/qtnetwork-${QT5_MIN}:5
+ >=dev-qt/qtsvg-${QT5_MIN}:5
+ >=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QT5_MIN}:5
+ >=dev-qt/qtxml-${QT5_MIN}:5
+ dev-qt/kdsingleapplication[-qt6]
+ >=kde-frameworks/kconfig-${KF_QT5_MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
+ >=kde-frameworks/kcrash-${KF_QT5_MIN}:5
+ >=kde-frameworks/ki18n-${KF_QT5_MIN}:5
+ >=kde-frameworks/kpackage-${KF_QT5_MIN}:5
+ >=kde-frameworks/kparts-${KF_QT5_MIN}:5
+ >=kde-frameworks/kservice-${KF_QT5_MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5
+ sys-auth/polkit-qt[qt5(+)]
+ >=sys-libs/kpmcore-20.04.0:5=
+ )
+ sys-apps/dbus
+ sys-apps/dmidecode
+ virtual/libcrypt:=
+"
+DEPEND="${COMMON_DEPEND}
+ test? (
+ !qt6? ( dev-qt/qttest:5 )
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-admin/sudo
+ dev-libs/libatasmart
+ net-misc/rsync
+ || (
+ sys-boot/grub:2
+ sys-apps/systemd[boot(-)]
+ sys-apps/systemd-utils[boot]
+ )
+ sys-boot/os-prober
+ sys-fs/squashfs-tools
+ sys-libs/timezone-data
+ virtual/udev
+ networkmanager? ( net-misc/networkmanager )
+ upower? ( sys-power/upower )
+"
+
+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
+
+ cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_CONFIG=ON
+ -DINSTALL_COMPLETION=ON
+ -DINSTALL_POLKIT=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+ -DWITH_PYTHON=ON
+ # Use system instead
+ -DWITH_PYBIND11=OFF
+ -DBUILD_APPDATA=ON
+ -DWITH_QT6="$(usex qt6)"
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ local myctestargs=(
+ # Skipped tests:
+ # load-dracut: tries and fails to find Dracut config
+ # libcalamaresnetworktest: needs network
+ # libcalamaresutilstest: inspects /tmp (expects namespace?)
+ #
+ # Need investigation:
+ # test_libcalamaresuipaste
+ # validate-netinstall
+ # validate-services-systemd
+ # localetest
+ # machineidtest
+ # packagechoosertest
+ #
+ # Requires removed dev-python/toml
+ # lint-displaymanager
+ #
+ # E1101
+ # lint-dummypython
+ -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)"
+ )
+
+ cmake_src_test
+}
+
+src_install() {
+ ecm_src_install
+ dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/files/calamares-gentoo-branding.desc b/app-admin/calamares/files/calamares-gentoo-branding.desc
new file mode 100644
index 000000000000..9b107b45e3e2
--- /dev/null
+++ b/app-admin/calamares/files/calamares-gentoo-branding.desc
@@ -0,0 +1,239 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Product branding information. This influences some global
+# user-visible aspects of Calamares, such as the product
+# name, window behavior, and the slideshow during installation.
+#
+# Additional styling can be done using the stylesheet.qss
+# file, also in the branding directory.
+---
+componentName: default
+
+
+### WELCOME / OVERALL WORDING
+#
+# These settings affect some overall phrasing and looks,
+# which are most visible in the welcome page.
+
+# This selects between different welcome texts. When false, uses
+# the traditional "Welcome to the %1 installer.", and when true,
+# uses "Welcome to the Calamares installer for %1." This allows
+# to distinguish this installer from other installers for the
+# same distribution.
+welcomeStyleCalamares: true
+
+# Should the welcome image (productWelcome, below) be scaled
+# up beyond its natural size? If false, the image does not grow
+# with the window but remains the same size throughout (this
+# may have surprising effects on HiDPI monitors).
+welcomeExpandingLogo: true
+
+### WINDOW CONFIGURATION
+#
+# The settings here affect the placement of the Calamares
+# window through hints to the window manager and initial
+# sizing of the Calamares window.
+
+# Size and expansion policy for Calamares.
+# - "normal" or unset, expand as needed, use *windowSize*
+# - "fullscreen", start as large as possible, ignore *windowSize*
+# - "noexpand", don't expand automatically, use *windowSize*
+windowExpanding: normal
+
+# Size of Calamares window, expressed as w,h. Both w and h
+# may be either pixels (suffix px) or font-units (suffix em).
+# e.g. "800px,600px"
+# "60em,480px"
+# This setting is ignored if "fullscreen" is selected for
+# *windowExpanding*, above. If not set, use constants defined
+# in CalamaresUtilsGui, 800x520.
+windowSize: 800px,520px
+
+# Placement of Calamares window. Either "center" or "free".
+# Whether "center" actually works does depend on the window
+# manager in use (and only makes sense if you're not using
+# *windowExpanding* set to "fullscreen").
+windowPlacement: center
+
+### PANELS CONFIGURATION
+#
+# Calamares has a main content area, and two panels (navigation
+# and progress / sidebar). The panels can be controlled individually,
+# or switched off. If both panels are switched off, the layout of
+# the main content area loses its margins, on the assumption that
+# you're doing something special.
+
+# Kind of sidebar (panel on the left, showing progress).
+# - "widget" or unset, use traditional sidebar (logo, items)
+# - "none", hide it entirely
+# - "qml", use calamares-sidebar.qml from branding folder
+# In addition, you **may** specify a side, separated by a comma,
+# from the kind. Valid sides are:
+# - "left" (if not specified, uses this)
+# - "right"
+# - "top"
+# - "bottom"
+# For instance, "widget,right" is valid; so is "qml", which defaults
+# to putting the sidebar on the left. Also valid is "qml,top".
+# While "widget,top" is valid, the widgets code is **not** flexible
+# and results will be terrible.
+sidebar: widget
+
+# Kind of navigation (button panel on the bottom).
+# - "widget" or unset, use traditional navigation
+# - "none", hide it entirely
+# - "qml", use calamares-navigation.qml from branding folder
+# In addition, you **may** specify a side, separated by a comma,
+# from the kind. The same sides are valid as for *sidebar*,
+# except the default is *bottom*.
+navigation: widget
+
+
+### STRINGS, IMAGES AND COLORS
+#
+# This section contains the "branding proper" of names
+# and images, rather than global-look settings.
+
+# These are strings shown to the user in the user interface.
+# There is no provision for translating them -- since they
+# are names, the string is included as-is.
+#
+# The four Url strings are the Urls used by the buttons in
+# the welcome screen, and are not shown to the user. Clicking
+# on the "Support" button, for instance, opens the link supportUrl.
+# If a Url is empty, the corresponding button is not shown.
+#
+# bootloaderEntryName is how this installation / distro is named
+# in the boot loader (e.g. in the GRUB menu).
+#
+# These strings support substitution from /etc/os-release
+# if KDE Frameworks 5.58 are available at build-time. When
+# enabled, ${varname} is replaced by the equivalent value
+# from os-release. All the supported var-names are in all-caps,
+# and are listed on the FreeDesktop.org site,
+# https://www.freedesktop.org/software/systemd/man/os-release.html
+# Note that ANSI_COLOR and CPE_NAME don't make sense here, and
+# are not supported (the rest are). Remember to quote the string
+# if it contains substitutions, or you'll get YAML exceptions.
+#
+# The *Url* entries are used on the welcome page, and they
+# are visible as buttons there if the corresponding *show* keys
+# are set to "true" (they can also be overridden).
+strings:
+ productName: ${PRETTY_NAME}
+ shortProductName: ${NAME}
+ version: ${VERSION_ID}
+ shortVersion: ${VERSION_ID}
+ versionedName: ${PRETTY_NAME} ${VERSION_ID}
+ shortVersionedName: ${NAME} ${VERSION_ID}
+ bootloaderEntryName: ${NAME}
+ productUrl: ${HOME_URL}
+ supportUrl: ${SUPPORT_URL}
+ knownIssuesUrl: ${BUG_REPORT_URL}
+ releaseNotesUrl: ${HOME_URL}
+ donateUrl: ${HOME_URL}
+
+# These images are loaded from the branding module directory.
+#
+# productBanner is an optional image, which if present, will be shown
+# on the welcome page of the application, above the welcome text.
+# It is intended to have a width much greater than height.
+# It is displayed at 64px height (also on HiDPI).
+# Recommended size is 64px tall, and up to 460px wide.
+# productIcon is used as the window icon, and will (usually) be used
+# by the window manager to represent the application. This image
+# should be square, and may be displayed by the window manager
+# as small as 16x16 (but possibly larger).
+# productLogo is used as the logo at the top of the left-hand column
+# which shows the steps to be taken. The image should be square,
+# and is displayed at 80x80 pixels (also on HiDPI).
+# productWallpaper is an optional image, which if present, will replace
+# the normal solid background on every page of the application.
+# It can be any size and proportion,
+# and will be tiled to fit the entire window.
+# For a non-tiled wallpaper, the size should be the same as
+# the overall window, see *windowSize* above (800x520).
+# productWelcome is shown on the welcome page of the application in
+# the middle of the window, below the welcome text. It can be
+# any size and proportion, and will be scaled to fit inside
+# the window. Use `welcomeExpandingLogo` to make it non-scaled.
+# Recommended size is 320x150.
+#
+# These filenames can also use substitutions from os-release (see above).
+images:
+ # productBanner: "banner.png"
+ productIcon: "squid.png"
+ productLogo: "squid.png"
+ # productWallpaper: "wallpaper.png"
+ productWelcome: "languages.png"
+
+# Colors for text and background components.
+#
+# - SidebarBackground is the background of the sidebar
+# - SidebarText is the (foreground) text color
+# - SidebarBackgroundCurrent sets the background of the current step.
+# Optional, and defaults to the application palette.
+# - SidebarTextCurrent is the text color of the current step.
+#
+# These colors can **also** be set through the stylesheet, if the
+# branding component also ships a stylesheet.qss. Then they are
+# the corresponding CSS attributes of #sidebarApp.
+style:
+ SidebarBackground: "#292F34"
+ SidebarText: "#FFFFFF"
+ SidebarTextCurrent: "#292F34"
+ SidebarBackgroundCurrent: "#D35400"
+
+### SLIDESHOW
+#
+# The slideshow is displayed during execution steps (e.g. when the
+# installer is actually writing to disk and doing other slow things).
+
+# The slideshow can be a QML file (recommended) which can display
+# arbitrary things -- text, images, animations, or even play a game --
+# during the execution step. The QML **is** abruptly stopped when the
+# execution step is done, though, so maybe a game isn't a great idea.
+#
+# The slideshow can also be a sequence of images (not recommended unless
+# you don't want QML at all in your Calamares). The images are displayed
+# at a rate of 1 every 2 seconds during the execution step.
+#
+# To configure a QML file, list a single filename:
+# slideshow: "show.qml"
+# To configure images, like the filenames (here, as an inline list):
+# slideshow: [ "/etc/calamares/slideshow/0.png", "/etc/logo.png" ]
+slideshow: "show.qml"
+
+# There are two available APIs for a QML slideshow:
+# - 1 (the default) loads the entire slideshow when the installation-
+# slideshow page is shown and starts the QML then. The QML
+# is never stopped (after installation is done, times etc.
+# continue to fire).
+# - 2 loads the slideshow on startup and calls onActivate() and
+# onLeave() in the root object. After the installation is done,
+# the show is stopped (first by calling onLeave(), then destroying
+# the QML components).
+#
+# An image slideshow does not need to have the API defined.
+slideshowAPI: 2
+
+
+# These options are to customize online uploading of logs to pastebins:
+# - type : Defines the kind of pastebin service to be used. Currently
+# it accepts two values:
+# - none : disables the pastebin functionality
+# - fiche : use fiche pastebin server
+# - url : Defines the address of pastebin service to be used.
+# Takes string as input. Important bits are the host and port,
+# the scheme is not used.
+# - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted.
+# The option must be set, to have the log option work.
+# Takes integer as input. If < 0, no limit will be forced,
+# else only last (approximately) 'n' KiB of log file will be pasted.
+# Please note that upload size may be slightly over the limit (due
+# to last minute logging), so provide a suitable value.
+uploadServer :
+ type : "fiche"
+ url : "http://termbin.com:9999"
+ sizeLimit : -1
diff --git a/app-admin/checksec/checksec-2.6.0-r1.ebuild b/app-admin/checksec/checksec-2.6.0-r1.ebuild
index 3be8fd79b6c4..0321a7407061 100644
--- a/app-admin/checksec/checksec-2.6.0-r1.ebuild
+++ b/app-admin/checksec/checksec-2.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE=""
S="${WORKDIR}"/${MY_PN}-${PV}
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index b72376271f95..b151837c352f 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>
Clsync recursively watches for source directory and executes external
program to sync the changes. Clsync is adapted to be used together with rsync.
diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml
index 42b405dcafb7..6589872592ea 100644
--- a/app-admin/clustershell/metadata.xml
+++ b/app-admin/clustershell/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- <name>Patrice Clement</name>
- </maintainer>
- <maintainer type="person">
<email>arkamar@gentoo.org</email>
<name>Petr Vaněk</name>
</maintainer>
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index d1d8812ba822..f55d8c5c81e5 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,2 +1,2 @@
DIST conky-1.19.6.tar.gz 1727487 BLAKE2B 2ef2b0acd354559679b9d7d442de7a709e932418e27459b02bdf2f8b6dbdcf7911964932ab9851bab213e7f68d9a82034acab96892752544ab1a26d68c174c09 SHA512 9f1900f495125c668835334239b69fc098c30fe450a384786d873eb3d3e955ff0f06ca70c3a94f47a4b38a42d4510be77efd13873411f11ff84d8bfdc2869fde
-DIST conky-1.19.7.tar.gz 1725945 BLAKE2B f5e6eb1675a1db25d96f28e10e23b55a2c2560d8854145193d6472b958295ab47015061187f5c5ca2b24573ec0e8574fdd2eab1003ebdb3bd5b74b7b00f68571 SHA512 54041cfa5c1d135d751fe8852523e7ad55815ecc9d9af87251e26edd38801e1e36be2f67b390376015090052f21f6c28992edd551c0dab8ae3c22f8facd3542e
+DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4
diff --git a/app-admin/conky/conky-1.19.7.ebuild b/app-admin/conky/conky-1.19.8.ebuild
index fc94496b9273..3c34a84c0eba 100644
--- a/app-admin/conky/conky-1.19.7.ebuild
+++ b/app-admin/conky/conky-1.19.8.ebuild
@@ -14,7 +14,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 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 test thinkpad
@@ -30,10 +30,10 @@ COMMON_DEPEND="
curl? ( net-misc/curl )
ical? ( dev-libs/libical:= )
iconv? ( virtual/libiconv )
- imlib? ( media-libs/imlib2[X] )
+ imlib? ( >=media-libs/imlib2-1.11.0[X] )
irc? ( net-libs/libircclient )
lua-cairo? ( x11-libs/cairo[X] )
- lua-imlib? ( media-libs/imlib2[X] )
+ lua-imlib? ( >=media-libs/imlib2-1.11.0[X] )
lua-rsvg? ( gnome-base/librsvg )
mysql? ( dev-db/mysql-connector-c )
ncurses? ( sys-libs/ncurses:= )
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index 1478714eb232..94b93a5de3bc 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -1,2 +1,2 @@
-DIST consul-template-0.29.4-deps.tar.xz 59446648 BLAKE2B 9ccd689f38eff50ad448a4226de918920c7acca9eb1e23d4e30f9999afc124224bb8f123b3dff4a1d433ea683ed523cd604a41472f50cb1919483040fc18c848 SHA512 3c60d88fdb82744f250cf02be3b3423f74360f18a43f4c4204ee97f73c370b878ecdbd5a300f96b74ffd9c7cde66f6c8b974392f7acc07a113b85ab6f1b6d8e9
-DIST consul-template-0.29.5.tar.gz 262722 BLAKE2B 1e3ddf259d76cf487872cebbe8c8b5bb313b89d073b26496340d39cc55c4e56ec531cbefec4bc1c0dd5c8bb3bd707c9bebfd15011e421badf12ea59a5bbbdbe3 SHA512 f753c2ec7f6c97ac73b34820b40568b5b16a3b8d4bebc7390905614a96744e8d4afd4a63b8b911989ba084ea91d85a21e3283d67a36bf65a685aa63154361a14
+DIST consul-template-0.37.4-deps.tar.xz 1548760 BLAKE2B 34a4e7926f41578071e60c715c534a8a50c49db3a78b06ae6ee49ed1a1c857faea753f27921cb6345bbc94f44ab81da58d3ffd1d27a0e29220bd2631bb35b58a SHA512 e28e29034407a5fbf78f9872b2cd85c0d6414cb5ec3c4b023b080c227583ae34ead6ab5b98c6ff4e1d278d9af137e895cedc79def10017d073f2b99561f1d483
+DIST consul-template-0.37.4.tar.gz 288565 BLAKE2B 69fc82a482c7fce4201621ee43aca689b328be4e34bb99e1cd552ba844787744a97fb64364adc7d9a180fd424d30881deaed45077851bc10fa037799ea99d189 SHA512 e36a5e444801c8700577df28fb3fbc7398b825d8f549d620c07445d86099a7597d0e95d56ce24daedd44eb573cc33e40dd1bb1e7a6def2c2a1788133bb811c38
diff --git a/app-admin/consul-template/consul-template-0.29.5.ebuild b/app-admin/consul-template/consul-template-0.37.4.ebuild
index 6727d40a8f93..adf2f99b89be 100644
--- a/app-admin/consul-template/consul-template-0.29.5.ebuild
+++ b/app-admin/consul-template/consul-template-0.37.4.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
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"
+SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+LICENSE="MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
SLOT="0"
KEYWORDS="~amd64"
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 7d80f2efa108..9532d6fa5036 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,3 +1,5 @@
-DIST consul-1.15.10-vendor.tar.gz 46702348 BLAKE2B a04d6f5a4d2f6f8885207f9f72537d4ea1a3adc5aab64873edf7f710984d3b25a602fb93cecc44ed82249280b51bbe1131701ab09f7ebb1b444c80e013fe271d SHA512 7aade3f90ee689ddca3058f12e7c9f2a691c4eba966993d770d8dc7b171cad54c3c8b6c3f52e03128a8d1b159dd66b6c8b284050c5475d77b51f9a22c4a6af8a
+DIST consul-1.15.11-deps.tar.xz 9566892 BLAKE2B 9459a93d78d3e4b991d0cdcfac22603c628c8f9fdacd8d50524a4c826cca66a575f6cd0bdf5fa9033e32b50336c53192567610ed73386f89c3c4e810c1412144 SHA512 d3876433b4ad3e7a062e059ef250bcfba23ede0595d8491f4b39c73c427e28c677b9f6e41317cf853ab8b3b2ce25151a4adf1a13b13a6a73c6e16de7382d2d05
+DIST consul-1.15.11.tar.gz 28951114 BLAKE2B 02378088d1bbc4313ec62d644b583c328bc9cc40ccc18516a1a14ae0d7f8d12007f1a5fa7c5e455ec2e782ba986ce60d37b92369b1f89f7dd69871702cd97b31 SHA512 1c5c8f9a3ad79aa34fd82a49e92ef5a21fb0470d60e3f3413901305121cbb677c75f72ffd5405554424b336d4e5ec426b7c35f458c04b1d5ab9350c2649cd688
DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B 7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64 SHA512 b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256
-DIST consul-1.15.7-vendor.tar.gz 46252048 BLAKE2B c63d69fb206895c535ffd60ada3589d99ec6aec81d7abe6b27169d4638bcc272f5d7c0b37d0bbe6be54f5e2d32f1e40fa1f4088da7fb4931f0c5c10007838197 SHA512 1e52f133f822cf11ee8498b7e92a7460c74d3ed4736c02e0957e3d950608f4aeaec8e8df7e9eb72ae7d4c31c4dcf5d827c9c42bdc7c4b991be53df22c150658a
+DIST consul-1.18.1-deps.tar.xz 10161908 BLAKE2B da7e3e63470f082bf0f1e92252a2d30cce90c4268e5ad3d180ab4bfed6601e92e26e0a108fe7477a1d596cf44114e97551712bce4c2b3d13c06c3fae0fa948e5 SHA512 f0d3961de4c38052209d79817ba6570fc43f3b9c472c959d591cc8fd23029f32070a98c59c70c02f56b80c214ae60d4a2711ca2ec31472758209538ba00ef786
+DIST consul-1.18.1.tar.gz 34424463 BLAKE2B 1c205471fa5d2500e4421eae37159dc3a3f8ebb46ab50266440302ca814834d39fddf0c27f4da5e78a103a2d7411eebf74bd256153b3954c6bc3c384de660a2f SHA512 023ee6f2dff82343f9c3382b531c8fa7f032e1820e09d18f67201c8ae839dfc89b145a8197be2f9c241709541a915a073dd117f5523e17ba0cdaa665bffc2f4c
diff --git a/app-admin/consul/consul-1.15.7.ebuild b/app-admin/consul/consul-1.15.11.ebuild
index 2b693c361655..f0597622b535 100644
--- a/app-admin/consul/consul-1.15.7.ebuild
+++ b/app-admin/consul/consul-1.15.11.ebuild
@@ -6,11 +6,12 @@ inherit go-module systemd
DESCRIPTION="A tool for service discovery, monitoring and configuration"
HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="8e803db6b98d10b2d310800f2aef7e20d3add03c"
+GIT_COMMIT="4fc94919996f7b7e5d16145f8d89cc5ee644b094"
-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"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
RESTRICT="test"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
@@ -22,11 +23,11 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
-S=${WORKDIR}/${P}-vendor
+S=${WORKDIR}/${P}
src_prepare() {
default
- sed -e 's|^GIT_DATE=.*|GIT_DATE=2023-10-31T14:10:44Z|' -i GNUmakefile || die
+ sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:43:41Z|' -i GNUmakefile || die
}
src_compile() {
diff --git a/app-admin/consul/consul-1.15.10.ebuild b/app-admin/consul/consul-1.18.1.ebuild
index 7fbf1eb317a7..b54c5f6b26e6 100644
--- a/app-admin/consul/consul-1.15.10.ebuild
+++ b/app-admin/consul/consul-1.18.1.ebuild
@@ -6,13 +6,14 @@ inherit go-module systemd
DESCRIPTION="A tool for service discovery, monitoring and configuration"
HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="a8dca2405236750fc23fb31dac21507882d111f6"
+GIT_COMMIT="98cb473cc11f2de0ccb61106381b0c7e92819c58"
-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"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
SLOT="0"
+RESTRICT="test"
KEYWORDS="~amd64 ~arm64 ~x86"
BDEPEND="dev-go/gox"
@@ -22,11 +23,9 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
-S=${WORKDIR}/${P}-vendor
-
src_prepare() {
default
- sed -e 's|^GIT_DATE=.*|GIT_DATE=2023-10-31T14:10:44Z|' -i GNUmakefile || die
+ sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:59:08Z|' -i Makefile || die
}
src_compile() {
diff --git a/app-admin/cpulimit/metadata.xml b/app-admin/cpulimit/metadata.xml
index 2f011b11fe67..301d5fbb3d91 100644
--- a/app-admin/cpulimit/metadata.xml
+++ b/app-admin/cpulimit/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">limitcpu</remote-id>
</upstream>
diff --git a/app-admin/cronlocker/metadata.xml b/app-admin/cronlocker/metadata.xml
index db463f3eeb66..5e93affc2408 100644
--- a/app-admin/cronlocker/metadata.xml
+++ b/app-admin/cronlocker/metadata.xml
@@ -5,4 +5,7 @@
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">viafintech/cronlocker</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r2.ebuild
index baf5e9023c3a..2a5bb8a3b82e 100644
--- a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild
+++ b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
diff --git a/app-admin/drush/drush-6.7.0-r6.ebuild b/app-admin/drush/drush-6.7.0-r6.ebuild
index d2eeb415631c..4f0d63ad593b 100644
--- a/app-admin/drush/drush-6.7.0-r6.ebuild
+++ b/app-admin/drush/drush-6.7.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,9 +12,7 @@ SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND=""
RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml]
dev-php/PEAR-Console_Table"
diff --git a/app-admin/drush/drush-6.7.0-r4.ebuild b/app-admin/drush/drush-6.7.0-r7.ebuild
index 888cfc09e2bd..1329345e4dc0 100644
--- a/app-admin/drush/drush-6.7.0-r4.ebuild
+++ b/app-admin/drush/drush-6.7.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,10 +11,8 @@ SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
-DEPEND=""
RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml]
dev-php/PEAR-Console_Table"
@@ -23,6 +21,8 @@ PATCHES=(
"${FILESDIR}/array-syntax.patch"
"${FILESDIR}/${P}-php8.0.patch"
"${FILESDIR}/${P}-gzip-mime.patch"
+ "${FILESDIR}/${P}-dont-pass-null-to-strtoupper.patch"
+ "${FILESDIR}/${P}-batch-signature-fix-r1.patch"
)
src_prepare() {
diff --git a/app-admin/drush/files/drush-6.7.0-batch-signature-fix-r1.patch b/app-admin/drush/files/drush-6.7.0-batch-signature-fix-r1.patch
new file mode 100644
index 000000000000..14ee72b7dc4a
--- /dev/null
+++ b/app-admin/drush/files/drush-6.7.0-batch-signature-fix-r1.patch
@@ -0,0 +1,46 @@
+From 1acd52cff0d516ebfa7f177c38ed7f851c4f472a Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 16 Aug 2023 21:21:39 -0400
+Subject: [PATCH] includes/batch.inc: synchronize sub and superclass signatures
+
+The DrushBatchContext class overrides the offsetSet() method of its
+superclass, ArrayObject, but changes its signature:
+
+ Error: Return type of DrushBatchContext::offsetSet($name, $value)
+ should either be compatible with ArrayObject::offsetSet(mixed $key,
+ mixed $value): void, or the #[\ReturnTypeWillChange] attribute should
+ be used to temporarily suppress the notice in .../batch.inc, line 37
+
+Renaming the parameter to $key and adding type hints fixes the issue.
+
+Signed-off-by: Michael Orlitzky <michael@orlitzky.com>
+---
+ includes/batch.inc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/includes/batch.inc b/includes/batch.inc
+index dd4adc9..d26fabb 100644
+--- a/includes/batch.inc
++++ b/includes/batch.inc
+@@ -34,14 +34,14 @@
+ * @see _drush_batch_worker().
+ */
+ class DrushBatchContext extends ArrayObject {
+- function offsetSet($name, $value) {
+- if ($name == 'message') {
++ function offsetSet(mixed $key, mixed $value): void {
++ if ($key == 'message') {
+ drush_log(strip_tags($value), 'ok');
+ }
+- elseif ($name == 'error_message') {
++ elseif ($key == 'error_message') {
+ drush_set_error('DRUSH_BATCH_ERROR', strip_tags($value));
+ }
+- parent::offsetSet($name, $value);
++ parent::offsetSet($key, $value);
+ }
+ }
+
+--
+2.43.2
+
diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml
index 431bdd3e3d24..82225571628c 100644
--- a/app-admin/entr/metadata.xml
+++ b/app-admin/entr/metadata.xml
@@ -5,10 +5,6 @@
<email>arkamar@gentoo.org</email>
<name>Petr Vaněk</name>
</maintainer>
- <maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- <name>Patrice Clement</name>
- </maintainer>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 142df76c673a..a981a07711e3 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1 +1 @@
-DIST exo-1.76.0.gh.tar.gz 10892774 BLAKE2B 836aeb6442e9d30d26d9e4e817de42b01d54e739ec77f90ff683d9a2e33830593ae5c0b828267b52f87b451e8ff7b1a207fa60c89c5443adef3e2efb5f6321ab SHA512 861ac2b2a2bbeb7d0b3cc829d2399be1f57b500656a178692b1d73ff78cdaa784c87c775061eedaf28eace68754935b855c4e927133b298b01f3bf79fa4b6675
+DIST exo-1.76.2.gh.tar.gz 10901510 BLAKE2B 4563eda367563077f50aa19bc65a477c3e7466ddff2e29953ff141bad24200beb742bf0106f1392365f1980dc4ac8e0c5a6ea21fc0190df13bace95f8eb0ee14 SHA512 a498f29dc6e563bd1e59bf69998d460ef623d681131a8fc7e64c906f154da2847f8b1593d7f6800afdc55d818adea86beafbdb3643e3965aed5fa546989fa4ad
diff --git a/app-admin/exo/exo-1.76.0.ebuild b/app-admin/exo/exo-1.76.2.ebuild
index 832c2c26b861..832c2c26b861 100644
--- a/app-admin/exo/exo-1.76.0.ebuild
+++ b/app-admin/exo/exo-1.76.2.ebuild
diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest
index ba3b49b49b23..959d598d56fb 100644
--- a/app-admin/fifo-cronolog/Manifest
+++ b/app-admin/fifo-cronolog/Manifest
@@ -1 +1 @@
-DIST fifo-cronolog-1.1.1.tar.bz2 3124 BLAKE2B 6e9cb35e0ed1b54c3baed4451742840dc1144294fc675822c1260d4d7d885a52f8835e60dcbed57c714e40e94e6d51b3ba78af9b9892883f5f520a7c57d30df8 SHA512 3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90
+DIST fifo-cronolog-1.2.3.tar.gz 4518 BLAKE2B c227304d98b2467a1ed7352399b1e53aba4dc005fa30a1be73b8cc96d61ee49d5f6a3703ccddd1ffef652c4090e9b5dfed9cce3f1254b959a1ccc07aac78b3f6 SHA512 557be1a663c5754a293092078b8a3710474bb1939c1ee65e4c560056238ca646e941e4ad82c0a90c02834fc90ddb2aae9047a4e73d42cf8c2c013f2a5d2c839c
diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild
index 1a34cb0f1110..27cfe32f20a1 100644
--- a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild
+++ b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild
@@ -3,9 +3,11 @@
EAPI=8
+inherit systemd
+
DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish and so on"
-HOMEPAGE="https://cgit.gentoo.org/proj/fifo-cronolog.git"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="https://gitweb.gentoo.org/proj/fifo-cronolog.git"
+SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz"
LICENSE="BSD-2 GPL-2"
SLOT="0"
@@ -13,13 +15,20 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="app-admin/cronolog"
+src_compile() {
+ emake all
+}
+
src_install() {
dosbin fifo-cronolog
+ dosym fifo-cronolog /usr/sbin/squid-cronolog
+ dosbin fifo-cronolog-setup
- newinitd fifo-cronolog.initd fifo-cronolog
- newconfd fifo-cronolog.confd fifo-cronolog
+ newinitd openrc/fifo-cronolog.initd fifo-cronolog
+ newconfd openrc/fifo-cronolog.confd fifo-cronolog
- dosym fifo-cronolog /usr/sbin/squid-cronolog
+ systemd_dounit systemd/fifo-cronolog@.service
+ dodoc README.md systemd/fifo-cronolog@example.service.env
}
pkg_postinst() {
diff --git a/app-admin/git-credential-gopass/Manifest b/app-admin/git-credential-gopass/Manifest
index 18406c2a756f..3366a7842e2a 100644
--- a/app-admin/git-credential-gopass/Manifest
+++ b/app-admin/git-credential-gopass/Manifest
@@ -1,2 +1,4 @@
DIST git-credential-gopass-1.15.11-deps.tar.xz 288548804 BLAKE2B 5c59db36a25762169ee3cbb9e5b7f9c91bd3d97b5ef6dea2e45f0345240bae05a6998359d3880fe5ed240b0c57888f7fe00229d6b0c930843ae1c3aa51004863 SHA512 ccc70e912e92c70de7ec49e824d559db2bd4ef0c907813ce0063b758b88c39c75dcc5d307d8527c13650edbcc0ebad20d981b8f2fcb32c32272e945bfe18a38b
DIST git-credential-gopass-1.15.11.tar.gz 24602 BLAKE2B 3f479403071af80a08f9d28e9cce3fa492829fb7d6eb230f73ff1d84eaf3c4435fc82f3bfb2a7b29aa96c9a6c1c446d3160df5e0d3e3ff89b9e873e344b9afcf SHA512 50f5496a0ae6f60b9074d9c1a29d6dbcddeb6a0976859b6071ccf1fdb2b6796038d2f6dd5f8a3ce4644c5c31ad5f3447037bc87e9276287172174058ef75adfa
+DIST git-credential-gopass-1.15.13-deps.tar.xz 29702324 BLAKE2B 5d4ee46252419ffa28994ba4fd2a3b4c3201be209d5f53b93ed6f15a32aa990c7be4e1a0f3d72c11883eb6d12cf11bf3b43ab735717a661d5ad5586d14334ed2 SHA512 d21d06eb4c8557b6466809865f35e89b2ed330d00b89cb91c16ef04cf65a96d36c4226081e4d85a5d0b0d2735b00b2bcfd922da423a3d0daafdd1b36a23d6938
+DIST git-credential-gopass-1.15.13.tar.gz 19323 BLAKE2B 6889fbb0f22b5a9ca882893bf0860bb41319e0f3ed01ea6c542caf8c94d4762116f5b84f907380dd723ffe1c57a7359a20cc1e05e7d3958d9f3a3debbd39c659 SHA512 f95d9ce853c5f9b46148d53504cad5992f701c776c3c4a2d53b10b7e94717651231ef5ab7cec7ab572c2badb75a0972c129ba09576598cf067bc4140f6c42196
diff --git a/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild b/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild
new file mode 100644
index 000000000000..50939531c011
--- /dev/null
+++ b/app-admin/git-credential-gopass/git-credential-gopass-1.15.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Gopass git-credentials helper"
+HOMEPAGE="https://github.com/gopasspw/git-credential-gopass"
+SRC_URI="https://github.com/gopasspw/git-credential-gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/go-1.16"
+RDEPEND="
+ dev-vcs/git
+ >=app-crypt/gnupg-2
+"
diff --git a/app-admin/gopass-hibp/Manifest b/app-admin/gopass-hibp/Manifest
index faab2b66f4e2..2c3e36606a58 100644
--- a/app-admin/gopass-hibp/Manifest
+++ b/app-admin/gopass-hibp/Manifest
@@ -1,2 +1,4 @@
DIST gopass-hibp-1.15.11-deps.tar.xz 288522100 BLAKE2B 623d425a5bbeea5c5746e18d0dd44d198fa4b54fd5112fc870a5e95f092324e4a477565260ee68bccf903601997561429ab5546c6b7aaa3cec6de816076fcbff SHA512 db7f26676aeb2c67ae0b8645e9feed57540adefc04bed4dba0072c6766cd020921def0a8dae8c26a29c10e26ad27d84983b76350d885118f8d6393e25fddaf3f
DIST gopass-hibp-1.15.11.tar.gz 28709 BLAKE2B 0ec749f89896067f1a1b444f1dbf4508e67129cd012ea565edadcb87779c9f6ea1b62d4ea5fe1bef37f5fde7615e8254c003dd36ad9f1be488f8679b10211383 SHA512 781393893567c7f0a8089a0a61e9bf794661a00ae01d7505dd7a851093d6f3d2b75bf5c494aaf6c9696f400b95debd737f3f4719cd974dc94c3bfc1eb7db91ea
+DIST gopass-hibp-1.15.13-deps.tar.xz 29737100 BLAKE2B 25cce3936716dda6fd1c760d055a6df6e412f50678295f139724eb84291f6a4447f6cfc05f57b636e67316fab29e94b164615d1ac86dd8738f46e8ddde9b5e71 SHA512 21afb52268e527d4b58bebdab62af8b812a0b2977532c0a99ea092d8e549221169c3f7260b75949d5abc689a9fb1ca6bdcb1e7235f1f2d6360a915c170059ba2
+DIST gopass-hibp-1.15.13.tar.gz 24047 BLAKE2B 79da4ca110585b6b928a27c7fdbf9094ce8110ac4d4bd99e645ae192caf816ab2f9f89d988bff60d84469853d3d08ffdda8eb51de9ccdf53474cedd3017b9687 SHA512 eb2eff7ffd16c166ee9ebfaa52273893b4f349fddba900ea966d0b39bf5f6f22b37cb76de8e0a327002138f1013d227bb066afcb9ff785b9afded97ebba17030
diff --git a/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild b/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild
new file mode 100644
index 000000000000..dcc9f7b6470b
--- /dev/null
+++ b/app-admin/gopass-hibp/gopass-hibp-1.15.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Gopass haveibeenpwnd.com integration"
+HOMEPAGE="https://github.com/gopasspw/gopass-hibp"
+SRC_URI="https://github.com/gopasspw/gopass-hibp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/go-1.16"
+RDEPEND="
+ dev-vcs/git
+ >=app-crypt/gnupg-2
+"
diff --git a/app-admin/gopass-jsonapi/Manifest b/app-admin/gopass-jsonapi/Manifest
index 31ad3cb6aedd..502172becc97 100644
--- a/app-admin/gopass-jsonapi/Manifest
+++ b/app-admin/gopass-jsonapi/Manifest
@@ -1,2 +1,4 @@
DIST gopass-jsonapi-1.15.11-deps.tar.xz 288583480 BLAKE2B f914d07a5b00f82bb1baa3114736fdde720a8bfb4b2378c60015501c281a14b595fff96c40b06c0f9f8d867e5b2004a43aa9eed4e3cf4016bdfb2a8acb221a78 SHA512 220f31aae7db0a268b4658f1464c8b1256958f2d220ebc028701db1ab2eda998b92d493e0facf741fc4d83135cf53d3fda5ac24f84365cd567da3d825623b0f6
DIST gopass-jsonapi-1.15.11.tar.gz 36121 BLAKE2B cc9832c9473d1ed0095ff10f6fbbe763d0b4a3a76fb891089f75a0cd0eb677e1c1c87598ff8beb1494d5790870c39d78df0c52ce9be68a127e0d8d725a9dcdc0 SHA512 7231edc6bf6a529761a193fda40fdf254ffdaab6853d9a265d4d7ff3fcdc08fb418f9c4f1a05f32180eccde5add1a5276fa01133fc90a61c57c4c9793a9abc3a
+DIST gopass-jsonapi-1.15.13-deps.tar.xz 149388536 BLAKE2B 2b5068a830edef67e330f918081bbdf218a2a0e80dc6c26e3d7b9d1d3779919dd869f57af32b0580f5be4787dc6df1325b5b1aba864c0bf0c2fd9d3e1c65364f SHA512 b6034103e0df9897cb95db3b8c9dc2895d7680385de14afcf7ab20db1d7eb537fa86ec56447267623b8493788802b1a1d6a9abff5c9d76f171847b79994cfa16
+DIST gopass-jsonapi-1.15.13.tar.gz 32433 BLAKE2B 6e16c2b060f2a380ede13840bea419b76b5e00cbc0dd29bbf72fc41900acfdeb6bb63908d09bfecbdc89c8c7266274a722fbb6d4b5848ee42fd986d36c3e30ca SHA512 e4b92558d17b27f4f4aada045ccfae4237e2021310ce1c64f3c29406c17f9f73ff61891ede96baebd741b4af15c0584ba8fe9fcb9693e288d17947e606d837b3
diff --git a/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild
new file mode 100644
index 000000000000..699540bb5843
--- /dev/null
+++ b/app-admin/gopass-jsonapi/gopass-jsonapi-1.15.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Gopass Browser Bindings"
+HOMEPAGE="https://github.com/gopasspw/gopass-jsonapi"
+SRC_URI="https://github.com/gopasspw/gopass-jsonapi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/go-1.16"
+RDEPEND="
+ dev-vcs/git
+ >=app-crypt/gnupg-2
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.15.3-skip-test.patch"
+)
diff --git a/app-admin/gopass-summon-provider/Manifest b/app-admin/gopass-summon-provider/Manifest
index 299ff6263011..e41c0b45e045 100644
--- a/app-admin/gopass-summon-provider/Manifest
+++ b/app-admin/gopass-summon-provider/Manifest
@@ -1,2 +1,4 @@
DIST gopass-summon-provider-1.15.11-deps.tar.xz 288548804 BLAKE2B 5c59db36a25762169ee3cbb9e5b7f9c91bd3d97b5ef6dea2e45f0345240bae05a6998359d3880fe5ed240b0c57888f7fe00229d6b0c930843ae1c3aa51004863 SHA512 ccc70e912e92c70de7ec49e824d559db2bd4ef0c907813ce0063b758b88c39c75dcc5d307d8527c13650edbcc0ebad20d981b8f2fcb32c32272e945bfe18a38b
DIST gopass-summon-provider-1.15.11.tar.gz 21218 BLAKE2B e042b2a003fa63fd79eaa24f3c50f1864238b7ae5c8d879c88c74c3795b6a9f97208c0b8ab51f3cde07a6a66155841a13517f49d900fd8fd49518775691e3926 SHA512 ae80aabe2216f37e1ac59509b3f7b2d785c0c0e20e7cc9fd42c170f7924be900e2b827daf117e174c69257595650ab287489017981c2988e6a5c1e4007ab1720
+DIST gopass-summon-provider-1.15.13-deps.tar.xz 29702324 BLAKE2B 5d4ee46252419ffa28994ba4fd2a3b4c3201be209d5f53b93ed6f15a32aa990c7be4e1a0f3d72c11883eb6d12cf11bf3b43ab735717a661d5ad5586d14334ed2 SHA512 d21d06eb4c8557b6466809865f35e89b2ed330d00b89cb91c16ef04cf65a96d36c4226081e4d85a5d0b0d2735b00b2bcfd922da423a3d0daafdd1b36a23d6938
+DIST gopass-summon-provider-1.15.13.tar.gz 16086 BLAKE2B b3b7656daf1189454c77772915120ab77615cf953ca1434919c901c5c0b708f0b1e124cfa63e9d8fa847d1aa12e403b630ccd023e16d6d3ef4d4cb507c7b36b9 SHA512 74809663c6b754894dc2f86c2153325b49bac862dbd29794b1997a11de34fd2bec4ddc583fefc19d4b920df64deedd7d9c508798d90426051d73648c3b545b7e
diff --git a/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild
new file mode 100644
index 000000000000..44e42f854afe
--- /dev/null
+++ b/app-admin/gopass-summon-provider/gopass-summon-provider-1.15.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Gopass Summon Provider"
+HOMEPAGE="https://github.com/gopasspw/gopass-summon-provider"
+SRC_URI="https://github.com/gopasspw/gopass-summon-provider/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/go-1.16"
+RDEPEND="
+ dev-vcs/git
+ >=app-crypt/gnupg-2
+"
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 4364fb4ba686..e65f6f8ffda2 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,2 +1,4 @@
DIST gopass-1.15.11-deps.tar.xz 288006888 BLAKE2B 527cef72eb493425111c6fd0a872bb31c63381226c823143e5d722cb59172a08901a50fce7042d329370bc83dd66205833e85608d68ce9b2037db89eb1a1b8a7 SHA512 978c5a915d382b8fe6360744c45c696f8c3c571df1341496537be73896d100eda78be1630b2f4a3ccd73d828d566a483bc057a302683aa4ddf92f46b8fa49e03
DIST gopass-1.15.11.tar.gz 2319860 BLAKE2B 923be5effa8ca5a77a12bcd2692d2a07b68c6d068a579022e359a5f6e485813c37dc7e34acfeb1f0deec4e1075a54dd75b408ef0e07713cf7ffc2cfde2e9ac38 SHA512 ec3231f6cf903ba3a70f4721f04613ddf0e28e820c98a708c861ae68c993162a1346f62332132c00abd218f82f0ed0da0f8b86297427e813b0688a8eee5128be
+DIST gopass-1.15.13-deps.tar.xz 284979668 BLAKE2B 12e42b897dfc613de810cc4c42e2318b5cad013e14b007daba454b800092f6e408e5ca10731b14d895673cd9426b322d94615a45954e3a0871b0b46533b6f6c9 SHA512 5e4a2f564d0140d77cdaf52a3784d75984db8b68152bf7137d3fbd727238e9509d56d280ceb1106fa47198bb8bc52980637652c10bd95524063bf1e3e962fdfb
+DIST gopass-1.15.13.tar.gz 2328529 BLAKE2B 276ea675c7978ac1627cb313b595d9f252cc3aae29245eca758aed3b6632ddcdfa0da93cdc06f4c0767a2d5f58ded41fcccfac774b5001351bb4b743e976c595 SHA512 b7fcc7814ccad0cf0e3116eac848df080338e313ddcbb0cc8413cb353a1596b250aed427c97e791326e04c6c4241dbb529e112398218f2a905fc0fb48bc49963
diff --git a/app-admin/gopass/gopass-1.15.13.ebuild b/app-admin/gopass/gopass-1.15.13.ebuild
new file mode 100644
index 000000000000..a01fea7d6355
--- /dev/null
+++ b/app-admin/gopass/gopass-1.15.13.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module optfeature
+
+DESCRIPTION="a simple but powerful password manager for the terminal"
+HOMEPAGE="https://www.gopass.pw/"
+SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+
+DEPEND=">=dev-lang/go-1.18"
+RDEPEND="
+ dev-vcs/git
+ >=app-crypt/gnupg-2
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.15.3-skip-tests.patch"
+)
+
+src_test() {
+ # https://github.com/gopasspw/gopass/blob/v1.15.3/.github/workflows/build.yml#L38
+ git config --global user.name nobody || die
+ git config --global user.email foo.bar@example.org || die
+
+ default
+}
+
+src_install() {
+ emake install DESTDIR="${ED}/usr"
+ einstalldocs
+}
+
+pkg_postinst() {
+ optfeature "browser integration" app-admin/gopass-jsonapi
+ optfeature "git credentials helper" app-admin/git-credential-gopass
+ optfeature "haveibeenpwnd.com integration" app-admin/gopass-hibp
+ optfeature "summon secrets helper" app-admin/gopass-summon-provider
+}
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 496cbb825952..b4908211a38b 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,3 +1,2 @@
-DIST hcloud-1.37.0.tar.xz 1868892 BLAKE2B 40268017c28877a5d26cb752e28511de591ca8dac9ab834b8ad5d15005306910a80501659ed1f827ca7184f1399a054519360c3a27d4081d08346bca53978537 SHA512 c785851a2085511bfb9b257a7267f51b4c8bcc9d14f6b595d772712aeb99c1d9db99a481b211bf110ee5c0fd260cc5a98d3dc5445a68807d5abeb050d0e89b81
-DIST hcloud-1.41.1.tar.xz 1869464 BLAKE2B 4ce755ae14bdfe5e90b673a31f3002ae812449593c3ba4fb08ec3ad0fe21cb2d57bf1dbe0f744d39b4844b165e49a86663a20bad1389d1468e052dbb6163deed SHA512 0e2236d0c4efabccca090866a87d7938d2eb39885b7901e3874c40e1ce672515376edc69471b411e862b1269ac538db380347738362bed1464064c4f6799f933
DIST hcloud-1.42.0.tar.xz 1876444 BLAKE2B e7ed2e01a7c6bb106a5c46e21e26d8b6bdd7636b64c7b354674364c3db8c1776f09f199ea022e2f311e873490b737490ea22045aa00147c6066ff0a7fb96d563 SHA512 dab916666ec17b9675ba0a559170859779289c36739ac4c3d72445c87fb440df475e55e52ed628fd8d1a52421c6df4d47b0b51713e476753a66da74b3a7bf11c
+DIST hcloud-1.43.0.tar.xz 1887388 BLAKE2B 2c2c931e51ab8a801b0548f2599b7162e46171412633e03af597d6750d210af3c19fb88da91d2890bf11fa642a0844646d51eb8b3d02d8f1f74db37a0cd56500 SHA512 4ee2d53de6c03676355f8f30edf97e3a0f2d4902f18dd9fb2498d23eb09428188809a2eb081c3c84c9ba595039de15bb7589ba6c8c1387cea3a76110a45332b1
diff --git a/app-admin/hcloud/hcloud-1.37.0.ebuild b/app-admin/hcloud/hcloud-1.37.0.ebuild
deleted file mode 100644
index 4a93fa28a173..000000000000
--- a/app-admin/hcloud/hcloud-1.37.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 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-1.18:="
-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/hcloud/hcloud-1.42.0.ebuild b/app-admin/hcloud/hcloud-1.42.0.ebuild
index 1525fc811206..c073e3b5e053 100644
--- a/app-admin/hcloud/hcloud-1.42.0.ebuild
+++ b/app-admin/hcloud/hcloud-1.42.0.ebuild
@@ -11,9 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
+KEYWORDS="amd64"
src_compile() {
ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN}
diff --git a/app-admin/hcloud/hcloud-1.41.1.ebuild b/app-admin/hcloud/hcloud-1.43.0.ebuild
index 8b7fa66f4318..3b520d19ac0d 100644
--- a/app-admin/hcloud/hcloud-1.41.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.43.0.ebuild
@@ -1,7 +1,9 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+inherit go-module
DESCRIPTION="A command-line interface for Hetzner Cloud"
HOMEPAGE="https://github.com/hetznercloud/cli"
@@ -11,13 +13,8 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
-DEPEND=">=dev-lang/go-1.18:="
-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"
+ ego build -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN}
}
src_test() {
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index e1a279ed1ea6..d9b76c352e07 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
DIST keepassxc-2.7.6-src.tar.xz 8474624 BLAKE2B 2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe SHA512 58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812
+DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477 SHA512 fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926
diff --git a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
new file mode 100644
index 000000000000..6d17e534e3b4
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 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/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P/_/-}"
+ else
+ SRC_URI="https://github.com/keepassxreboot/${PN}/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:3=
+ 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:=[minizip]
+ X? (
+ dev-qt/qtx11extras:5
+ )
+ autotype? (
+ x11-libs/libX11
+ x11-libs/libXtst
+ )
+ 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}/${PN}-2.7.4-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-lto
+
+ local -a 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_BROWSER_PASSKEYS="$(usex browser)"
+ -DWITH_XC_BOTAN3=ON
+ -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 186c07c60416..4b24b9ee85b7 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,10 +15,12 @@ if [[ "${PV}" != *9999 ]] ; then
S="${WORKDIR}/${P/_/-}"
else
SRC_URI="https://github.com/keepassxreboot/${PN}/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
@@ -42,24 +44,28 @@ RDEPEND="
dev-qt/qtwidgets:5
media-gfx/qrencode:=
sys-libs/readline:0=
- sys-libs/zlib:=
- X? ( dev-qt/qtx11extras:5 )
+ sys-libs/zlib:=[minizip]
+ 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}
+DEPEND="
+ ${RDEPEND}
dev-qt/qttest:5
"
BDEPEND="
dev-qt/linguist-tools:5
- doc? ( dev-ruby/asciidoctor )
+ doc? (
+ dev-ruby/asciidoctor
+ )
"
src_prepare() {
@@ -74,7 +80,7 @@ src_configure() {
# https://github.com/keepassxreboot/keepassxc/issues/5801
filter-lto
- local mycmakeargs=(
+ local -a 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
diff --git a/app-admin/lib_users/lib_users-0.15-r1.ebuild b/app-admin/lib_users/lib_users-0.15-r1.ebuild
new file mode 100644
index 000000000000..45ccbc10dde4
--- /dev/null
+++ b/app-admin/lib_users/lib_users-0.15-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-r1
+
+DESCRIPTION="Check for mapped libs and open files that are marked as deleted"
+HOMEPAGE="https://github.com/klausman/lib_users"
+SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ test? (
+ dev-python/nose2[${PYTHON_USEDEP}]
+ )"
+RDEPEND="${PYTHON_DEPS}"
+
+src_test() {
+ python_foreach_impl nose2 --verbosity=2
+}
+
+my_install() {
+ python_newscript lib_users.py lib_users
+ python_newscript fd_users.py fd_users
+ # lib_users_util/ contains a test script we don't want, so do things by hand
+ python_moduleinto lib_users_util
+ python_domodule lib_users_util/common.py
+ python_domodule lib_users_util/__init__.py
+}
+
+src_install() {
+ python_foreach_impl my_install
+ dodoc README.md TODO
+}
diff --git a/app-admin/linode-cli/Manifest b/app-admin/linode-cli/Manifest
index f5c159c9d423..822bb234b6ca 100644
--- a/app-admin/linode-cli/Manifest
+++ b/app-admin/linode-cli/Manifest
@@ -1,2 +1,3 @@
DIST linode-cli-5.47.1.tar.gz 128364 BLAKE2B db21cdd9a1bfbe17fb17b8b0e27ca36bb15c7d3b16ddde4dcc59a9ce64cd34d644d3d5d120efb88bb146767cf9b2c3ee820a847a2fcff487a11bc3abd6973870 SHA512 b61ac1e7c97a1395b150227fe822bc2e7199ed15a44c6d93d71bfdbc2f919827e87e89cf41a47b069be06144a849f5ab11c9dd7f38d138f80ce80563f55bf75a
-DIST linode-cli-5.48.2.tar.gz 141600 BLAKE2B fadabfb421945809ceba396324ac9930d1fd795bceab4e90023038881fb8ba5af1b19187f414e70b5a86ea7d560202c76669dfe76ba952bcbe958b7213aff241 SHA512 f2d0e3f62ff93fc9906d70b1121e73f98319dd8afc38ddb124d35295dffef085aa75c93d299538499ea71d087de19060fc3f52ab5f6b31ef47f46435f010b0fd
+DIST linode-cli-5.48.3.tar.gz 142927 BLAKE2B 48ae197d780f77a7a4dbf54d4e9959d28c117d90e052f401f563f1557dc11155afc5d16da1140e9ed2828fa3e19243e91205759636247d2fb893383975d89f43 SHA512 9efd3f0392848ebcd896becff191e94c90cbec01cc2b805c0262ecb3c40c51346d0b42891ddaadb9191d75e379083f68e4c9aa35f9ba7c6309c74ae3febbde7a
+DIST linode_cli-5.48.4.tar.gz 142928 BLAKE2B 28b1c90bb0709afc594b7023ef846b6d59e0376730f05d9701ebbc6744376f33536ad5a6f53b7b26a25805b258dc58378a76b0e6a4157e149f83e691d862dec8 SHA512 b07a3612afc329fc346b523412ac03932c84213d6bc23726f4c0e5edc737100bf65ec84f8131943439444fee268646789dc4d135cd61b2362311d1ab18601c3e
diff --git a/app-admin/linode-cli/linode-cli-5.48.2.ebuild b/app-admin/linode-cli/linode-cli-5.48.3.ebuild
index 2ce8851657d3..2ce8851657d3 100644
--- a/app-admin/linode-cli/linode-cli-5.48.2.ebuild
+++ b/app-admin/linode-cli/linode-cli-5.48.3.ebuild
diff --git a/app-admin/linode-cli/linode-cli-5.48.4.ebuild b/app-admin/linode-cli/linode-cli-5.48.4.ebuild
new file mode 100644
index 000000000000..0e1692e8e982
--- /dev/null
+++ b/app-admin/linode-cli/linode-cli-5.48.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Linode Command Line Interface"
+HOMEPAGE="https://github.com/linode/linode-cli https://www.linode.com/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Tests require network, a linode account and an API key.
+# WARNING: tests will incur costs and will wipe the account.
+RESTRICT="test"
+
+RDEPEND="
+ dev-python/boto3[${PYTHON_USEDEP}]
+ dev-python/linode-metadata[${PYTHON_USEDEP}]
+ dev-python/openapi3[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/rich[${PYTHON_USEDEP}]
+ <dev-python/urllib3-3[${PYTHON_USEDEP}]
+"
diff --git a/app-admin/logcheck/files/logcheck-r4.cron b/app-admin/logcheck/files/logcheck-r4.cron
new file mode 100644
index 000000000000..1a8809ffe154
--- /dev/null
+++ b/app-admin/logcheck/files/logcheck-r4.cron
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# To enable sync via cron, execute "runuser -u logcheck touch /etc/logcheck/cron-logcheck-enabled"
+if [[ ! -f /etc/logcheck/cron-logcheck-enabled ]]; then
+ exit
+fi
+if [ ! -d /var/lock/logcheck ]; then
+ mkdir -p /var/lock/logcheck
+ chown logcheck:logcheck /var/lock/logcheck
+fi
+/sbin/runuser -u logcheck -- nice -n10 /usr/sbin/logcheck "$@"
diff --git a/app-admin/logcheck/files/logcheck.cron.d b/app-admin/logcheck/files/logcheck.cron.d
new file mode 100644
index 000000000000..bd95c1a95b5c
--- /dev/null
+++ b/app-admin/logcheck/files/logcheck.cron.d
@@ -0,0 +1 @@
+@reboot sleep 60; /etc/cron.hourly/logcheck -R
diff --git a/app-admin/logcheck/logcheck-1.4.3-r4.ebuild b/app-admin/logcheck/logcheck-1.4.3-r4.ebuild
new file mode 100644
index 000000000000..0cd2197b813f
--- /dev/null
+++ b/app-admin/logcheck/logcheck-1.4.3-r4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
+HOMEPAGE="https://logcheck.org/"
+SRC_URI="https://salsa.debian.org/debian/logcheck/-/archive/debian/${PV}/logcheck-debian-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-debian-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cron systemd"
+# Test (emake system-test) requires access to system logs
+RESTRICT="test"
+
+DEPEND="
+ acct-group/logcheck
+ acct-user/logcheck[systemd?]
+"
+
+RDEPEND="
+ ${DEPEND}
+ !app-admin/logsentry
+ app-misc/lockfile-progs
+ dev-lang/perl
+ dev-perl/mime-construct
+ virtual/mailx
+ cron? ( sys-apps/util-linux )
+"
+
+DOC_CONTENTS="
+ Please read the guide at https://wiki.gentoo.org/wiki/Logcheck
+ for installation instructions.
+"
+
+src_prepare() {
+ default
+ # Set version from PV, without using dpkg
+ sed -i -e "s/^VERSION=unknown/VERSION=\"${PV}\"/" "${S}/src/logcheck" || die
+
+ # QA-fix remove call to non existent command | Bug: #911281
+ sed -i "/dpkg-parsechangelog/d" "${S}/Makefile" || die
+
+ # Add /var/log/messages to checked logs
+ echo "/var/log/messages" >> "${S}/etc/logcheck.logfiles.d/syslog.logfiles" || die
+
+ # QA-fix Remove install of empty dirs to be created at runtime
+ sed -i "/install -d \$(DESTDIR)\/var\/lock\/logcheck/d" "${S}/Makefile" || die
+
+ # Comment systemd journal check if systemd use flag is not set | Bug: #913857
+ if ! use systemd; then
+ sed -i -e "s/^journal/#journal/" "${S}/etc/logcheck.logfiles.d/journal.logfiles" || die
+ fi
+}
+
+src_install() {
+ default
+
+ keepdir /var/lib/logcheck
+
+ dodoc docs/README.*
+ doman docs/logtail.8 docs/logtail2.8
+
+ if use cron; then
+ exeinto /etc/cron.hourly
+ newexe "${FILESDIR}"/"${PN}"-r4.cron ${PN}
+ insinto /etc/cron.d
+ newins "${FILESDIR}"/${PN}.cron.d ${PN}
+ DOC_CONTENTS="${DOC_CONTENTS}\n
+ \n
+ Read /etc/cron.hourly/logcheck.cron to activate hourly cron-based check!\n
+ \n
+ To send mail after reboot you should enable the cronjob in /etc/cron.d/logcheck."
+ fi
+
+ if use systemd; then
+ DOC_CONTENTS="${DOC_CONTENTS}\n
+ \n
+ To enable the systemd timer, run the following command:\n
+ systemctl enable --now logcheck.timer"
+ fi
+
+ systemd_dounit "${FILESDIR}/${PN}."{service,timer}
+ newtmpfiles "${FILESDIR}/logcheck.tmpfiles" logcheck.conf
+
+ readme.gentoo_create_doc
+
+ fowners -R logcheck:logcheck /etc/logcheck /var/lib/logcheck
+}
+
+pkg_postinst() {
+ tmpfiles_process logcheck.conf
+
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 18caefbf08d6..a14181dcd744 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,3 +1,2 @@
-DIST mcelog-195.tar.gz 318965 BLAKE2B aebfcac2a5e5aab43cf3b08d169c75469c81d8724d2e907890bb5b947e1dbea8e418fdf4c00512112ddc67d1ddcc3a014409c7a546bd60c8e36b2e7af72480c7 SHA512 45436f5859a3ffd1c0eaf998282910ad317b85d03f15130a66a2d4e32e2653dbd86b2033db7f6b321a4b9692354adb92773c26958eb5d474954e12c9ab4a9cda
-DIST mcelog-196.tar.gz 318951 BLAKE2B 50871cd7a3c4dd6f4c4d613c7db4528d972ca37ba17b0a5aa4876d8fc92d4478c2247ea65748310ad6d4b950d1abc9bd0ea40193e72b36d38334547382477849 SHA512 37d14dac84792b4668cb38883cd59b7642c37abc89b783cf19c20b2664a13334372370c9a3718f26d7baf5a02344f80de9e6c6e3ff7386b9585c9dc5f332c011
DIST mcelog-197.tar.gz 319167 BLAKE2B cbeac1b29ab0b9b7d23470213f5b186f1c1c2a1095617436ccb9a29824fbf6d461642df32e69f7d743a2b3dfce5e06fcffbe5af3cc90a99c00bf9ba4796514b7 SHA512 4975f533fa6546b956190a33f51974614911aa8b707e07f73abf1e0055cd13997eeacaeedaf84762debcea9fd9b95e7d537befc0f818ba29873dd72be4ceed1a
+DIST mcelog-198.tar.gz 319372 BLAKE2B c1a6eed5b77843cd3963ac82d20270ed915562b3e2940ee685f4aa827b6e05c656eb55b57e380d582c8fda2f3d1ee3d13ff40c0771fd410d504d03e62f71eaeb SHA512 5168a1d1d83c7fa69438412db4b5f559528439f84ad65348b147117c7fdfe689c9ab3273350ff5321ed351ef0fe17065ee9073aac5115e87cf27878b8e2ff7df
diff --git a/app-admin/mcelog/mcelog-195.ebuild b/app-admin/mcelog/mcelog-195.ebuild
deleted file mode 100644
index 02b752831ace..000000000000
--- a/app-admin/mcelog/mcelog-195.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 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"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch
- "${FILESDIR}"/${PN}-129-debugflags.patch
-)
-
-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() {
- default
- 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/mcelog/mcelog-197.ebuild b/app-admin/mcelog/mcelog-197.ebuild
index 07d93a66d81f..b689f7a70a9c 100644
--- a/app-admin/mcelog/mcelog-197.ebuild
+++ b/app-admin/mcelog/mcelog-197.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/${P}.t
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="selinux"
RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
diff --git a/app-admin/mcelog/mcelog-196.ebuild b/app-admin/mcelog/mcelog-198.ebuild
index 88e6cd7ea15e..07d93a66d81f 100644
--- a/app-admin/mcelog/mcelog-196.ebuild
+++ b/app-admin/mcelog/mcelog-198.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
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"
+SRC_URI="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r2.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild
index ecc615db2851..873152bf9eb5 100644
--- a/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r2.ebuild
+++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1
@@ -17,11 +18,9 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-RDEPEND="
- dev-python/docopt[${PYTHON_USEDEP}]
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}]
dev-python/tabulate[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}"/${PN}-0.0.2-py3.patch )
diff --git a/app-admin/opentofu/Manifest b/app-admin/opentofu/Manifest
index 214190538ece..d8ffd6841e91 100644
--- a/app-admin/opentofu/Manifest
+++ b/app-admin/opentofu/Manifest
@@ -2,3 +2,5 @@ DIST opentofu-1.6.0-deps.tar.xz 332007504 BLAKE2B 1c2a7d2350944d34308baa0566977a
DIST opentofu-1.6.0.tar.gz 3696642 BLAKE2B e224ce14f04d07638d03b9a11ab251cd820acc86774f9c82f38f5bcfc38b62bbdbc70377e722a4dd2bd65f917ba0fc200ccaaeafdbd9430af66586491c7627eb SHA512 758f4ff79e526e9494e1e98dd927dbeb803b45df1f8bc15c3a9bca8343d7285b9130bfe5f19f6ddd7fd403b72d852b0d51542c058174e4bd5eed3c729b394bdb
DIST opentofu-1.6.1-deps.tar.xz 332000152 BLAKE2B bfa5bee3c7ba8cc79cd8f81137fb611abce0b806813475deab0e5546542910cc391252ebb3054badf3a8bfe17f25d30ce570065591aaa6148ad6bd7c42aa8e2e SHA512 10e5519b1be53a5ec1191dec8f73960da72ca53cc5284ef9a72139ce0e1db2a9213fbed696088644414ef0fb589c26a7980f695b79192f0e5f039f3dfcfc91e8
DIST opentofu-1.6.1.tar.gz 3709010 BLAKE2B 3d172a4228ff10608dc74da6980eda38ec9afa13ac4bbfeb4ae3fb3142af81fc30988a99fea01ee7988b7ad057efbe1b270b4b880e4152ec3d87939f29ae8614 SHA512 6d98e5f03340853ad3f516ad890fe297c4239c03c0c5d4b0e7efc490b734ce2948bbd3ee5d1375d9eade2ea4a6ef71dbb22a5dd48fc81df5a9440ce73090a92e
+DIST opentofu-1.6.2-deps.tar.xz 106556484 BLAKE2B fe6ed9507aa3589e34f8c3189d6ee03044b6397a650663c9746c94e45066dbc6e15529f9b4ed3c57649083580a7589596c0b710fdcf0ec832816e76d5137607e SHA512 d8c2e66ab9254d0031aa8fd7dc6fb0ef1aa748282a0b7d9d277398c2f50bceb097b52389a19b70c67d5d0abba9ef289f3d19a786436f16f7549b293bf6b46a48
+DIST opentofu-1.6.2.tar.gz 3708735 BLAKE2B 07c48de78e5510c87413447bf2393ee3e93a91ea562a28849e9db6342eccb7b85745cea0aaa3d8e3861a10127905f4b3614b77863b62a21a0a8c8f5163afac22 SHA512 25fac0e6837f2d125d35f780c3091139819a00ae3f96c2e62a1c3c544e425a60c9880c84b4e1aa6727771c5523c81e8dbab38d5151b854bbc470d7819746567c
diff --git a/app-admin/terraform/terraform-1.3.9.ebuild b/app-admin/opentofu/opentofu-1.6.2.ebuild
index 70ddcef89c94..544c2e0b5f16 100644
--- a/app-admin/terraform/terraform-1.3.9.ebuild
+++ b/app-admin/opentofu/opentofu-1.6.2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit go-module
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="The open source infrastructure as code tool"
+HOMEPAGE="https://www.opentofu.org/"
+SRC_URI="https://github.com/opentofu/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
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 ~riscv"
+KEYWORDS="~amd64"
BDEPEND="dev-go/gox"
@@ -24,9 +24,9 @@ src_compile() {
gox \
-os=$(go env GOOS) \
-arch=$(go env GOARCH) \
- -output bin/terraform \
+ -output bin/tofu \
-verbose \
- . || die
+ ./cmd/tofu || die
}
src_install() {
@@ -36,5 +36,5 @@ src_install() {
pkg_postinst() {
elog "If you would like to install shell completions please run:"
- elog " terraform -install-autocomplete"
+ elog " tofu -install-autocomplete"
}
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index c71b5fdc3041..c30f5f7e453f 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,2 +1 @@
-DIST perl-cleaner-2.30.tar.bz2 6963 BLAKE2B 8983060c7a904266ac82a67eba7b5d2184803b59c077f947a35d07e9af3046953705d31840b9508116578b8f3e8a8b97d77cf21eeac3b70f1c3fb5c1d71ae64e SHA512 436d26727bbb598bcd3c4f31e6b81e415a797cdba82dccfd55e54ee179bd2d6c1dc443e865f6f0a05b59f47ffd231dd10e55d5ea97a9a6875235ea1b49b68898
DIST perl-cleaner-2.31.tar.bz2 6914 BLAKE2B 4b13ae42ab06ad75b6dbcb1306f3f4f476315db4504d0ffbc4c56d4d66a2da3a751d3682305daca6bcbae1861d182f16296c92f9a8d25687e35ab03a6f8734e3 SHA512 c4df0437604d41dbfdce0b72d72f975d464cf0c44f417c708917f01829e498ef8d6b47a78cee517836cac9344791ad49db98f29da5f78599e80b000e41b8127e
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild
deleted file mode 100644
index 0991130f6f12..000000000000
--- a/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit prefix
-
-DESCRIPTION="User land tool for cleaning up old perl installs"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# TODO: Detect at runtime what's available and fallback if needed, possibly
-# integrate with eselect-package-manager, bug #779007.
-IUSE="pkgcore"
-
-[[ "${PV}" == "9999" ]] && BDEPEND="sys-apps/help2man"
-
-RDEPEND="
- app-shells/bash
- dev-lang/perl
- pkgcore? ( sys-apps/pkgcore )
- !pkgcore? (
- app-portage/portage-utils
- sys-apps/portage
- )
-"
-
-src_prepare() {
- default
- eprefixify ${PN}
-}
-
-src_install() {
- dosbin perl-cleaner
- doman perl-cleaner.1
-}
diff --git a/app-admin/ps_mem/ps_mem-3.14-r1.ebuild b/app-admin/ps_mem/ps_mem-3.14-r1.ebuild
index 59f3c0578f52..b5474c4c3e05 100644
--- a/app-admin/ps_mem/ps_mem-3.14-r1.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.14-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 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_COMPAT=( python3_{9..12} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1
@@ -16,7 +16,6 @@ SRC_URI="https://github.com/pixelb/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm64 ppc64 sparc x86"
-IUSE=""
python_install() {
distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 7893bb38e31c..a3659f8feffb 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,8 +1,8 @@
DIST puppet-agent_7.24.0-1focal_amd64.deb 31418478 BLAKE2B 201c0a5adbeca2b6f572d3f8b89df06314171e5c7bb95f574311cee5af1910bdf7f5574eaa5f514bcf0c1ceb5c04c30a2079069183c4b37dd90581596a70092e SHA512 7912360597c21abf048d578783262821210d6568dc41f79b2d21cdb08851f8bd4cbe5a6114aa8af302c9046de424b8b15fe34be1fc51b529f36ccb99445bc7dc
DIST puppet-agent_7.24.0-1focal_arm64.deb 31160744 BLAKE2B 22dfc3f0855c2e88c7202f2a9d98efd4ad9ef3a191ab9b5b8c37a6869306a47d1225d568fec9f0fc52cdf236f8258b5ca206a360049cc39e1825f1f8afc5d4af SHA512 db1b7cb25a04d6aeedd7f3bb125fe0fcac420c2881f9f3aba729143e253908376cd118073753de018d8fd1a6d7f38139766b4ec4bfb23f840ca7ee32143a8a48
-DIST puppet-agent_8.3.1-1focal_amd64.deb 35930206 BLAKE2B 8a636bfd9a76a364f03022a587bbe9bd8a596515d515cc41c1eb4d96f930366191df54217444cb4a7a471e201f5ac9673e101b1a3697a55abfc7e2b19ac9a45c SHA512 b455e4dd539159e568aa68acbb993e3c94a3d2724e8bdc9056a28c79737d54981c891bfb0d0e7084dd6c16bb13580eb535aacfe6dff34f9bf3ea6da32cfbe08b
-DIST puppet-agent_8.3.1-1focal_arm64.deb 35420834 BLAKE2B b95702ba60df28ca511c7ea1efeacf7b537d666987e76f83048552667d0ee1ae41041166d07f41a6d1f0e1e6eceea9af427c8e4feef0efa1108b33edf2b64001 SHA512 89d0183dd8762ec9e96ca218d179a5c6278c6b106e4679370dac5b96beb5bb6ec5c18f52a6d076a7ae71f9bbcb9466351b65f096b5c961cb6d8f03a2c7fe171e
DIST puppet-agent_8.4.0-1focal_amd64.deb 35930626 BLAKE2B ad299aaceba51bd2831c6aa15a1794c12e03026866e7b1fd59c49d078d7c32bc8af2f0eba9f699f21e0bde98147b3a7edb88db3ada2ec8cb9601c2ed64210240 SHA512 18148a6cbd237afc66bbce1bc5d9eec63426efd5d7a2625e4f8a7d962a97c25da7e5ef208972323ea10e35c174beaacacc131d7dd1043a9013f1d8c8ae8a8c70
DIST puppet-agent_8.4.0-1focal_arm64.deb 35421066 BLAKE2B 348f4cb16b83e0703fe8ec1fc6a5ebd992384c02f51b8d38d597d629b19f070f21e0f944ba1c6188bd9d93d0689e66ef10a4c717847ffca2534b4c6a3fa0eb4d SHA512 5ba2d6d41e6d98e0e7830fc6140500173e1e18efd9c228c84ec124c5154df847657f4c43f994d05830774fc6431b49d57081ded579ed1215927623c7b83155a7
DIST puppet-agent_8.5.0-1focal_amd64.deb 35945720 BLAKE2B 485fa3e93006c63265df27ba99e61e1c9b253f71976aa92af1bc0ee474b575c27d3e1d3ddde21a919f5a21e151777b1ab8f7d849f5927a48898ca58b14edaa8b SHA512 a252240e206fb93bfc882f88e593a93b29c61442bb7fc95e1d3465e30af6b7bd82a362287590a36460ed04d4759fc244d3eff118ef8790885112ef78206a14f9
DIST puppet-agent_8.5.0-1focal_arm64.deb 35436786 BLAKE2B 712f893f05f9f75bf7af0cf40556f0746a81fabbd8e588ad598f59856bfe4948c53eb92e2eaa7a621507183c572d17ecb2b426b13a91bbd0b98cc2463070a60e SHA512 ce1752d13b2d4b9442ef11006e8bc0edf98e855df051491efd2760b6919c41f0dda2030910e5794658ae99d3b8341e9bf64aa57c65069f9d83a3f328f1d2dd41
+DIST puppet-agent_8.5.1-1focal_amd64.deb 35945834 BLAKE2B 8c839eabf8abbc6cf87ab8a1c942b97be7fc08b9053695d07a7fc4bbf69886192063553c43f81e73521327cf8b89af18fe43d41ef3f71229d218fe123426f50c SHA512 324ea532d005a1bbb0f25fdd411f3f68a1c18371cb494f8934d73d87c19e3bbf46c653a9afbe767ed2ab6e788115f31ccef4bd084351ee6f73e4e656aab5d65a
+DIST puppet-agent_8.5.1-1focal_arm64.deb 35436770 BLAKE2B 16ead6317dab6f8b65b8ea5269eec5593697f4da6d1ec0323e074f4eab3c8518dab10af48853e591aecc62c63a5ff4e135cf02bb1d7f7d565c5200bfae98ff86 SHA512 f3acc097563d9a56cb677df72250ee25ab0e1e361eb40a2cd36b3d694854edc3850f08099b916aefbc16580f78a194e9f3bf33b1cb585836d55c6e8dcf03a379
diff --git a/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild
index f5524d744e1b..32089749d68e 100644
--- a/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-8.5.0.ebuild
@@ -11,7 +11,7 @@ arm64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
IUSE="puppetdb selinux"
RESTRICT="strip"
diff --git a/app-admin/puppet-agent/puppet-agent-8.3.1-r1.ebuild b/app-admin/puppet-agent/puppet-agent-8.5.1.ebuild
index 32089749d68e..32089749d68e 100644
--- a/app-admin/puppet-agent/puppet-agent-8.3.1-r1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-8.5.1.ebuild
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 18a8ec8de431..28216718f403 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,6 @@
DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c5e8ed762f8aeae260a67bd583c277cd4ea0f207021057d40c69078add06af88978522706dea59796bdd6071070 SHA512 bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9
DIST puppet-7.27.0.tar.gz 2825666 BLAKE2B dffc2329c28588a5b4a08996f5fbff95c092961aa68af6287c4216ffb3e5b6ab811df876b8efb0f6724d9990b21ad1c56d65bd9fd8d502008ba385f4460f0591 SHA512 a864357f5079c9fad53c2cff35f73f0bc25900359e25b5fb1130e3a3e6f77f63bc38ef59c0ce1b37913eb0acb1e42f39891ed7de0fe39ab138faa426ab2a9392
DIST puppet-7.28.0.tar.gz 2827538 BLAKE2B 65f25d9de60ed1b511acb5c9d72370198f68f3158cfede2ffda90ee23ebcfecfdabcf35459d1a048c3a204e13611f67852028233e4da4b9ed2ea08cad07a37c9 SHA512 d570452ceec764c657f4678f7179400d30f8513766edc6f020db35c3a4246c1d857615a647ca481920a7d1a40cf9a15057432468ccd4697e4335dca55e121faa
-DIST puppet-8.3.1.tar.gz 2879699 BLAKE2B 6710d345714e6400ef04aeac8dedb933f39443688bda0b24316a3456a6c6bf2719286472a0ce764ddafd40754f8cd95767a4c311c5b5e2bd72b8bc92ec4d0e85 SHA512 0aff032caf7a3966f7e369d6f1785f0ada16e419f96f34dafee61457d2e97979b7934195eb356e44ef323401fa40be5eef608a175b3c2907f25ca92901ec81d2
DIST puppet-8.4.0.tar.gz 2882328 BLAKE2B de46a8fbdc7522f022d19953845c73e6872ed430a9380f157809bb95e7d7315063f136b5159468708dcb5dcb4353cc89eacffffbd4045458351c63261a6d9bd0 SHA512 23d5aede9ba55e4e63a7f815fd1d274e97d5d0c35aa1b5444c24b223a59d5d913ac5b4652acc2258b1721a213e4c24e1e8b4a146ca6a1b81a1536a51ed856270
DIST puppet-8.5.0.tar.gz 1565122 BLAKE2B c787b981c64f2b52cc3c8998516599891980bb176cb3bce6596cb4b139fbae2f58e156fb007a3aa2bd2a5bb069dc63eb7fc36bde3f3533c27729fccfa19ee0e7 SHA512 1adf88f69b3b5a7071a2ee5dad66c3cd3fc1db57fdeaf7945f8cb167d1b76dcf12e85e17eefc418cda67952a4c75a6b43d320d0c0f1db610411d188304994cdc
+DIST puppet-8.5.1.tar.gz 1565085 BLAKE2B f352f9f70e090c4a32edd45ced5c01ed4eff891fb46c0f2d753ceeba43250960356ceb2d9047e7308732585ec114c5f728ec29a65b6a08348b74a9709ec92a89 SHA512 f1d661c34fc7c1381c6422ff7e027fdf4554a69939f5db926bf8a61a89583090fb8d28151f90093d3ca8037950ed911b0a5c7b8677a80ede72e83d9cbf89af7f
diff --git a/app-admin/puppet/puppet-8.5.0.ebuild b/app-admin/puppet/puppet-8.5.0.ebuild
index 7626f615fbf8..6ee8a0e304c8 100644
--- a/app-admin/puppet/puppet-8.5.0.ebuild
+++ b/app-admin/puppet/puppet-8.5.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
diff --git a/app-admin/puppet/puppet-8.3.1-r1.ebuild b/app-admin/puppet/puppet-8.5.1.ebuild
index da3eb9487a0c..6ee8a0e304c8 100644
--- a/app-admin/puppet/puppet-8.3.1-r1.ebuild
+++ b/app-admin/puppet/puppet-8.5.1.ebuild
@@ -59,18 +59,8 @@ RDEPEND+=" ${RDEPEND}
PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
all_ruby_prepare() {
- # Avoid spec that require unpackaged json-schema.
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
# fix systemd path
eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-
- # Avoid specs that can only run in the puppet.git repository. This
- # should be narrowed down to the specific specs.
- rm spec/integration/parser/compiler_spec.rb || die
-
- # Avoid failing spec that need further investigation.
- rm spec/unit/module_tool/metadata_spec.rb || die
}
each_ruby_install() {
diff --git a/app-admin/puppetdb/puppetdb-8.4.1.ebuild b/app-admin/puppetdb/puppetdb-8.4.1.ebuild
index d08261a3e451..4b5a495abffd 100644
--- a/app-admin/puppetdb/puppetdb-8.4.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-8.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND+=">=virtual/jdk-11"
DEPEND+="acct-user/puppetdb
diff --git a/app-admin/puppetserver/puppetserver-8.5.0.ebuild b/app-admin/puppetserver/puppetserver-8.5.0.ebuild
index b19d42ecbb7c..198d1e787156 100644
--- a/app-admin/puppetserver/puppetserver-8.5.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-8.5.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND+="
>=virtual/jdk-11
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index 29a35022f5d4..0f77c15a2e52 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,2 +1 @@
-DIST pwman3-0.11.1.tar.gz 76992 BLAKE2B cd7289781436f0f8b941d587c61b2d8a5cad52f3d57d01106d73b3da5930de2bd2df15fe5a4bcfbdce5e5733b7328764d6e4e2d18cba8a575cadad8835218e75 SHA512 111713e23b64a7492b5e2735b0d0117a81759bd9f25a87327a2aa4a465fbbc8a0aa0fbfa86b84cbcd40eb1540d05cdbc6fb81982fe61953df91979e674ce5640
DIST pwman3-0.12.2.tar.gz 76744 BLAKE2B 5223169a267f0c35bcb26499138c9b768c6e29c4ce39d4fb89c56eb72d24a9729159bed93af24e12f1e0e6c1569586772eb36954afd51afc7c97c9de898346e5 SHA512 587839e7d532ef3c53e2c429b086eb6bd59290ce43687034400f8e0772cc4e97c9296694ad83c5fa3fdde37b8d8fef5bc150e9f81fcb9fe8712ffafb4be8b400
diff --git a/app-admin/pwman3/pwman3-0.11.1.ebuild b/app-admin/pwman3/pwman3-0.11.1.ebuild
deleted file mode 100644
index af696aad1fb2..000000000000
--- a/app-admin/pwman3/pwman3-0.11.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-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/pwman3/pwman3-0.12.2.ebuild b/app-admin/pwman3/pwman3-0.12.2.ebuild
index 5fb9d641fba2..671c2afbb0dc 100644
--- a/app-admin/pwman3/pwman3-0.12.2.ebuild
+++ b/app-admin/pwman3/pwman3-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="sqlite"
DISTUTILS_USE_PEP517=setuptools
@@ -16,15 +16,22 @@ SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
+IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
>=dev-python/colorama-0.4.0[${PYTHON_USEDEP}]
"
-BDEPEND="test? ( dev-python/pexpect[${PYTHON_USEDEP}] )"
+BDEPEND="
+ test? (
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ )
+"
-distutils_enable_tests setup.py
+python_test() {
+ "${EPYTHON}" -m tests.test_pwman || die "Tests fail with ${EPYTHON}"
+}
pkg_postinst() {
optfeature "Support for mongodb" dev-python/pymongo
diff --git a/app-admin/pydf/metadata.xml b/app-admin/pydf/metadata.xml
index 4c0d3032d69c..115e9d64a669 100644
--- a/app-admin/pydf/metadata.xml
+++ b/app-admin/pydf/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- <name>Patrice Clement</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 05b315f32068..525219668f42 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,3 +1,4 @@
DIST r10k-3.16.0.tar.gz 253547 BLAKE2B 683fdd5588c7b3c3b47ae0d28d75fbfb929d5595c715531eed86b8d89f76708c91f38f9ca558040b36fac38c038211086a74fdf109b37350126bc78b25f8b751 SHA512 399a357cf8617427632516e0f439a40464ba0c8201ee7b6ce15c893ae029bfd9ae1438b76aff3b9601685d14febf8fc71dbdd2954eb3352d6ce713e769cb586d
DIST r10k-4.0.0.tar.gz 254074 BLAKE2B 8053d435691d33cd1d8b3c55c2cb3a153cd952112a93f2eeb4b715c6c0b92e9192c65f8809b4187d5ff4f5f6b9ed8f67a644d7920bf8d8294dd0b5d8fd735836 SHA512 a6b92fabcc405fe6678da724743e43d9dc3a286e3a973a3320ac94c25dd385315baaaf495dbd1706005d31f13d4c52f1c425148d3b397448fed07fd83acb04fa
DIST r10k-4.0.1.tar.gz 254147 BLAKE2B 83c71c39f50aaf390ef75b8d87a693ba8d131297fcb12c3e408665565e35119d3e9e2832b8172b0616145459368dd5af38bcecca666ac1020ba96a59abc83657 SHA512 74583a79637d8c60f3935cd7ea382fff189beb7d6825b10b9c6bfc0a625a62f81648795cefc878cec608d96ba2396749f7fc0a1c7bdfa9bfcf914848135a0675
+DIST r10k-4.0.2.tar.gz 254228 BLAKE2B b98a665200978a023dc2566bc4b3c141eed6c950d27dc0401c8c7e8d1096f5fa0562874bd1a0e1726dd687a046cf345c0ce5003d5a2a7f72bf397d91b07065c3 SHA512 5f4d9b5fdcd45ffe5b9c2ef95fff7b7ae3136adefcee754782815bb523d0281ec3ee50615600b2fe80ee9d98b75d80747072c425c4d15c795cd7dcb27d1f192b
diff --git a/app-admin/r10k/r10k-4.0.2.ebuild b/app-admin/r10k/r10k-4.0.2.ebuild
new file mode 100644
index 000000000000..28655c6c3ecb
--- /dev/null
+++ b/app-admin/r10k/r10k-4.0.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+SRC_URI="https://github.com/puppetlabs/r10k/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+ ~dev-ruby/colored2-3.1.2
+ >=dev-ruby/cri-2.15.10:0
+ dev-ruby/gettext-setup:1
+ >=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2
+ >=dev-ruby/ruby-gettext-3.0.2:0
+ ~dev-ruby/log4r-1.1.10
+ >=dev-ruby/minitar-0.9:0
+ >=dev-ruby/multi_json-1.10:0
+ dev-ruby/puppet_forge:5
+"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+ sed -e '/s.files/d' \
+ -i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid specs for unpackaged rugget git provider
+ rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+
+ # Avoid spec making assumptions on availability of relative symlinks
+ rm -f spec/integration/util/purageable_spec.rb || die
+}
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 4ce4630f3ac4..9a9fb8255bc2 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,3 +1 @@
-DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86 SHA512 634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30
-DIST rasdaemon-0.7.0.tar.bz2 433555 BLAKE2B cf73f59558d8a6f3138fea20e7096a1b1214dd44a4518da88a4b1f0c4c92a6df4eb7922e9a2e76d5012364219067cf66e220d8f54588ab22acf09937e41aa2dc SHA512 a7938ccd8171d849b5d89df6ab90942278c824a3dbd17abda8ae3d80ce5227cbc3fe23b31806609114482606d780ec7f0676a0fedfa950ed8cb5a59f3583bd57
DIST rasdaemon-0.8.0.tar.bz2 394983 BLAKE2B 24209f468fea2bc4e85dcac51e363e44a8a44b224b448ec1330bcd15a5b2b4b3cceeec78dbc86b4a88f5a378ecacba62cdba8e9c3e2b1b3a70be85a18af166ab SHA512 f6262f098fd2a08d35fef2c25e2452a202151d4cc93a1829e821abd564acf7dcf80b08f819cbd7f04244dcc9f1dec5d9138aa013bb43c8fcf19d340233275614
diff --git a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch b/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch
deleted file mode 100644
index 6a3beaae217c..000000000000
--- a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-https://github.com/mchehab/rasdaemon/pull/81
-
-From 9632f63c3855b119ab4b02300e27ab357bddcf03 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 29 Dec 2022 17:23:47 +0000
-Subject: [PATCH] configure.ac: fix bashisms
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-configure scripts need to be runnable with a POSIX-compliant /bin/sh.
-
-On many (but not all!) systems, /bin/sh is provided by Bash, so errors
-like this aren't spotted. Notably Debian defaults to /bin/sh provided
-by dash which doesn't tolerate such bashisms as '=='.
-
-This retains compatibility with bash.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,14 +27,14 @@ AC_ARG_ENABLE([all],
- AC_ARG_ENABLE([sqlite3],
- AS_HELP_STRING([--enable-sqlite3], [enable storing data at SQL lite database (currently experimental)]))
-
--AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_CHECK_LIB(sqlite3, sqlite3_open,[echo "found sqlite3"] , AC_MSG_ERROR([*** Unable to find sqlite3 library]), )
- SQLITE3_LIBS="-lsqlite3"
- AC_DEFINE(HAVE_SQLITE3,1,"have sqlite3")
- AC_SUBST([WITH_SQLITE3])
- ])
-
--AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_SQLITE3], [USE_SQLITE3="yes"], [USE_SQLITE3="no"])
-
- AC_SUBST([SQLITE3_LIBS])
-@@ -43,122 +43,122 @@ AC_SUBST([SQLITE3_LIBS])
- AC_ARG_ENABLE([aer],
- AS_HELP_STRING([--enable-aer], [enable PCIe AER events (currently experimental)]))
-
--AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_AER,1,"have PCIe AER events collect")
- AC_SUBST([WITH_AER])
- ])
--AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_AER], [USE_AER="yes"], [USE_AER="no"])
-
-
- AC_ARG_ENABLE([non_standard],
- AS_HELP_STRING([--enable-non-standard], [enable NON_STANDARD events (currently experimental)]))
-
--AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_NON_STANDARD,1,"have UNKNOWN_SEC events collect")
- AC_SUBST([WITH_NON_STANDARD])
- ])
--AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_NON_STANDARD], [USE_NON_STANDARD="yes"], [USE_NON_STANDARD="no"])
-
- AC_ARG_ENABLE([arm],
- AS_HELP_STRING([--enable-arm], [enable ARM events (currently experimental)]))
-
--AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_ARM,1,"have ARM events collect")
- AC_SUBST([WITH_ARM])
- ])
--AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_ARM], [USE_ARM="yes"], [USE_ARM="no"])
-
- AC_ARG_ENABLE([mce],
- AS_HELP_STRING([--enable-mce], [enable MCE events (currently experimental)]))
-
--AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_MCE,1,"have PCIe MCE events collect")
- AC_SUBST([WITH_MCE])
- ])
--AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_MCE], [USE_MCE="yes"], [USE_MCE="no"])
-
- AC_ARG_ENABLE([extlog],
- AS_HELP_STRING([--enable-extlog], [enable EXTLOG events (currently experimental)]))
-
--AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_EXTLOG,1,"have EXTLOG events collect")
- AC_SUBST([WITH_EXTLOG])
- ])
--AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_EXTLOG], [USE_EXTLOG="yes"], [USE_EXTLOG="no"])
-
- AC_ARG_ENABLE([devlink],
- AS_HELP_STRING([--enable-devlink], [enable devlink health events (currently experimental)]))
-
--AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_DEVLINK,1,"have devlink health events collect")
- AC_SUBST([WITH_DEVLINK])
- ])
--AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_DEVLINK], [USE_DEVLINK="yes"], [USE_DEVLINK="no"])
-
- AC_ARG_ENABLE([diskerror],
- AS_HELP_STRING([--enable-diskerror], [enable disk I/O error events (currently experimental)]))
-
--AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_DISKERROR,1,"have disk I/O errors collect")
- AC_SUBST([WITH_DISKERROR])
- ])
--AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_DISKERROR], [USE_DISKERROR="yes"], [USE_DISKERROR="no"])
-
- AC_ARG_ENABLE([memory_failure],
- AS_HELP_STRING([--enable-memory-failure], [enable memory failure events (currently experimental)]))
-
--AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_MEMORY_FAILURE,1,"have memory failure events collect")
- AC_SUBST([WITH_MEMORY_FAILURE])
- ])
--AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_MEMORY_FAILURE], [USE_MEMORY_FAILURE="yes"], [USE_MEMORY_FAILURE="no"])
-
- AC_ARG_ENABLE([abrt_report],
- AS_HELP_STRING([--enable-abrt-report], [enable report event to ABRT (currently experimental)]))
-
--AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_ABRT_REPORT,1,"have report event to ABRT")
- AC_SUBST([WITH_ABRT_REPORT])
- ])
--AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_ABRT_REPORT], [USE_ABRT_REPORT="yes"], [USE_ABRT_REPORT="no"])
-
- AC_ARG_ENABLE([hisi_ns_decode],
- AS_HELP_STRING([--enable-hisi-ns-decode], [enable HISI_NS_DECODE events (currently experimental)]))
-
--AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_HISI_NS_DECODE,1,"have HISI UNKNOWN_SEC events decode")
- AC_SUBST([WITH_HISI_NS_DECODE])
- ])
--AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_HISI_NS_DECODE], [USE_HISI_NS_DECODE="yes"], [USE_HISI_NS_DECODE="no"])
-
- AC_ARG_ENABLE([memory_ce_pfa],
- AS_HELP_STRING([--enable-memory-ce-pfa], [enable memory Corrected Error predictive failure analysis]))
-
--AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_MEMORY_CE_PFA,1,"have memory corrected error predictive failure analysis")
- AC_SUBST([WITH_MEMORY_CE_PFA])
- ])
--AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_MEMORY_CE_PFA], [USE_MEMORY_CE_PFA="yes"], [USE_MEMORY_CE_PFA="no"])
-
- AC_ARG_ENABLE([amp_ns_decode],
- AS_HELP_STRING([--enable-amp-ns-decode], [enable AMP_NS_DECODE events (currently experimental)]))
-
--AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
-+AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
- AC_DEFINE(HAVE_AMP_NS_DECODE,1,"have AMP UNKNOWN_SEC events decode")
- AC_SUBST([WITH_AMP_NS_DECODE])
- ])
--AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all == xyes])
-+AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all = xyes])
- AM_COND_IF([WITH_AMP_NS_DECODE], [USE_AMP_NS_DECODE="yes"], [USE_AMP_NS_DECODE="no"])
-
- test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
-
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild
deleted file mode 100644
index 63c05654e834..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="https://github.com/mchehab/rasdaemon"
-SRC_URI="https://github.com/mchehab/rasdaemon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-DEPEND="
- dev-db/sqlite
- elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="
- ${DEPEND}
- dev-perl/DBI
- dev-perl/DBD-SQLite
- sys-apps/dmidecode
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.6.8-bashisms-configure.patch
-)
-
-pkg_setup() {
- linux-info_pkg_setup
- local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
- check_extra_config
-}
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- local myconfargs=(
- --enable-sqlite3
- --enable-abrt-report
- --enable-aer
- --enable-arm
- --enable-extlog
- --enable-hisi-ns-decode
- --enable-mce
- --enable-non-standard
- --enable-devlink
- --enable-diskerror
- --enable-memory-ce-pfa
- --includedir="/usr/include/${PN}"
- --localstatedir=/var
- )
-
- use elibc_musl && append-libs -largp
-
- econf "${myconfargs[@]}"
-}
-
-src_install() {
- default
-
- keepdir "/var/lib/${PN}"
-
- systemd_dounit misc/*.service
-
- newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
- newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
- newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}
diff --git a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild
deleted file mode 100644
index c0ee30e744f2..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="https://github.com/mchehab/rasdaemon"
-SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-DEPEND="
- dev-db/sqlite
- elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="
- ${DEPEND}
- dev-perl/DBI
- dev-perl/DBD-SQLite
- sys-apps/dmidecode
-"
-BDEPEND="sys-devel/gettext"
-
-pkg_setup() {
- linux-info_pkg_setup
- local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
- check_extra_config
-}
-
-src_configure() {
- local myconfargs=(
- --enable-sqlite3
- --enable-abrt-report
- --enable-aer
- --enable-arm
- --enable-extlog
- --enable-hisi-ns-decode
- --enable-mce
- --enable-non-standard
- --enable-devlink
- --enable-diskerror
- --enable-memory-ce-pfa
- --includedir="/usr/include/${PN}"
- --localstatedir=/var
- )
-
- use elibc_musl && append-libs -largp
-
- econf "${myconfargs[@]}"
-}
-
-src_install() {
- default
-
- keepdir "/var/lib/${PN}"
-
- systemd_dounit misc/*.service
-
- newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
- newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
- newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}
diff --git a/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild
deleted file mode 100644
index aea9287acd6b..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="https://github.com/mchehab/rasdaemon"
-# This if can be dropped > 0.8.0, see https://github.com/mchehab/rasdaemon/issues/88
-if [[ ${PV} == 0.8.0 ]] ; then
- SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/refs%2Fheads%2Fmaster/${P}.tar.bz2"
-else
- SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="selinux"
-
-DEPEND="
- dev-db/sqlite
- dev-libs/libtraceevent
- elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="
- ${DEPEND}
- dev-perl/DBI
- dev-perl/DBD-SQLite
- sys-apps/dmidecode
- selinux? ( sec-policy/selinux-rasdaemon )
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.0-bashisms-configure.patch
-)
-
-pkg_setup() {
- linux-info_pkg_setup
- local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
- check_extra_config
-}
-
-src_prepare() {
- default
-
- # Only here for 0.8.0's bashism patch
- eautoreconf
-}
-
-src_configure() {
- local myconfargs=(
- --enable-sqlite3
- --enable-abrt-report
- --enable-aer
- --enable-arm
- --enable-extlog
- --enable-hisi-ns-decode
- --enable-mce
- --enable-non-standard
- --enable-devlink
- --enable-diskerror
- --enable-memory-ce-pfa
- --includedir="/usr/include/${PN}"
- --localstatedir=/var
- )
-
- use elibc_musl && append-libs -largp
-
- econf "${myconfargs[@]}"
-}
-
-src_install() {
- default
-
- keepdir "/var/lib/${PN}"
-
- systemd_dounit misc/*.service
-
- newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
- newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
- newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}
diff --git a/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild
deleted file mode 100644
index 932a683f6795..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.8.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="https://github.com/mchehab/rasdaemon"
-# This if can be dropped > 0.8.0, see https://github.com/mchehab/rasdaemon/issues/88
-if [[ ${PV} == 0.8.0 ]] ; then
- SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/refs%2Fheads%2Fmaster/${P}.tar.bz2"
-else
- SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-DEPEND="
- dev-db/sqlite
- dev-libs/libtraceevent
- elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="
- ${DEPEND}
- dev-perl/DBI
- dev-perl/DBD-SQLite
- sys-apps/dmidecode
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.0-bashisms-configure.patch
-)
-
-pkg_setup() {
- linux-info_pkg_setup
- local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
- check_extra_config
-}
-
-src_prepare() {
- default
-
- # Only here for 0.8.0's bashism patch
- eautoreconf
-}
-
-src_configure() {
- local myconfargs=(
- --enable-sqlite3
- --enable-abrt-report
- --enable-aer
- --enable-arm
- --enable-extlog
- --enable-hisi-ns-decode
- --enable-mce
- --enable-non-standard
- --enable-devlink
- --enable-diskerror
- --enable-memory-ce-pfa
- --includedir="/usr/include/${PN}"
- --localstatedir=/var
- )
-
- use elibc_musl && append-libs -largp
-
- econf "${myconfargs[@]}"
-}
-
-src_install() {
- default
-
- keepdir "/var/lib/${PN}"
-
- systemd_dounit misc/*.service
-
- newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
- newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
- newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}
diff --git a/app-admin/redfishtool/redfishtool-1.1.8.ebuild b/app-admin/redfishtool/redfishtool-1.1.8.ebuild
index 79a53b30f0b9..4c2064451254 100644
--- a/app-admin/redfishtool/redfishtool-1.1.8.ebuild
+++ b/app-admin/redfishtool/redfishtool-1.1.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/DMTF/Redfishtool"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
RDEPEND="
dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index 3aa1527fd16d..b8434950c777 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,2 +1,3 @@
DIST restart-services-0.17.0.tgz 25643 BLAKE2B 5999e12e38207d00266928504da05c00482c8297b7fee634f302f09cfa09e206bcf9d5a558d2a91e5de1d97318025fa995fbc3a61f0d0e74b8dfb1af3db8670b SHA512 c11ca431fbbc6899ab268e8979049144448479d953ed7373cc7483cca2c03cd4041a1ca1e47c0e810f91a18a43aa32cc305a4ea791e8b992246f972e0fbb19ab
-DIST restart-services-1.0.tgz 25872 BLAKE2B 912c3e2c3cd49732369a5a4452be1f171c33cd3364cf3224b4443f6f21ef0fccd4c533edd79214cc2dae00cea558409eacbcef4b1566bef402f1850537432c63 SHA512 9c4e269ac6db8bf13c512cc3556a9356b4b44960dd562cf633df6e03db57677c05738edc46010b01976a6b0ee2152ac1e8d410a6c9d98142295ff0cbd3f93df2
+DIST restart-services-1.2.tgz 27526 BLAKE2B 3936a4145767f917d4f1c856c65ee2b6445b495988e77ada488ff4b43d87abaaca7b9d59e48c89c59a666559d0416d5cf1a6171c5d903ee0385dabb922929882 SHA512 815fb40c4616afaf2e27877a4cbba86c0d44432cbf4be04991431e71f5e495dcb92f66bda020dca47d5363388455fbeaa3f3e35d2e9451785301386c73f724c0
+DIST restart-services-1.3.tgz 27740 BLAKE2B b49fce16771c055aa93b8ac55f5eb37af18cc66b3c63152c276a34b6e8b6e953af651d190e167f036c003d9d615727b3efb382c9e770d55a8885974e9158a750 SHA512 1f45d333be5d342d2bc206380c1fbe4713d2e02d17547b7c9e648ee7be568900042b7e240c16e8d018020ecefd018a5564268c57a32fe3d9f2f660fc062bc45a
diff --git a/app-admin/restart-services/restart-services-1.0.ebuild b/app-admin/restart-services/restart-services-1.2.ebuild
index 6a24cf48136e..10daef1472d7 100644
--- a/app-admin/restart-services/restart-services-1.0.ebuild
+++ b/app-admin/restart-services/restart-services-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/app-admin/restart-services/restart-services-1.3.ebuild b/app-admin/restart-services/restart-services-1.3.ebuild
new file mode 100644
index 000000000000..10daef1472d7
--- /dev/null
+++ b/app-admin/restart-services/restart-services-1.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tool to manage OpenRC and systemd services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ app-admin/lib_users
+ app-portage/portage-utils
+ || ( sys-apps/openrc sys-apps/systemd )
+"
+
+src_install() {
+ dosbin restart-services
+ doman restart-services.1
+ keepdir /etc/restart-services.d
+ insinto /etc
+ doins restart-services.conf
+ dodoc README CHANGES
+
+ sed -i -e 's/^#include/include/' "${ED}"/etc/restart-services.conf || die
+ cat > "${ED}"/etc/restart-services.d/00-local.conf <<- EOF || die
+ # You may put your local changes here or in any other *.conf file
+ # in this directory so you can leave /etc/restart-services.conf as is.
+ # Example:
+ # *extend* SV_ALWAYS to match 'myservice'
+ # SV_ALWAYS+=( myservice )
+ EOF
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 60ce26b8c5af..2d4f225b28ee 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,6 +1,6 @@
-DIST rsyslog-8.2310.0.tar.gz 3349174 BLAKE2B df451f473fdf1714d2ff2bf92afe5e53d00395eb21508fd00c628784fa577aaf6fed597f79c99e64f62bd3a5eadde0748ce08e6c082a24a507fa687055599d70 SHA512 f04e14ede8c35e1799eadc711a6e99dbe56d312c7909c7ebed4d4bd489d310a44a5c2d3ed23968fbf3ccff5b580870d0f3ceeb690deb1d1424420fc9d3220696
DIST rsyslog-8.2312.0.tar.gz 3358109 BLAKE2B 8b463c07a44efa60b6faeaa466498a2540eefc158efa759479cc6fc36acb04a718dd6ee4015f311343e6b66b6e074d5ed40db29cbcad6c71b42286a58cb92d7c SHA512 a65ca1c6fe2d9dd853d073d93cfd4d007c3533bd10c633113fcf94c4746192945ed0a2b2ff84f9174b55de90ade2a062a0bd556ffe375864fad3772ef8ce39e3
DIST rsyslog-8.2402.0.tar.gz 3404026 BLAKE2B fc33244f0e4699d446ffab19aa8078ac49518b1722a5d7e72e57d7768ef42565bc3fa54b6c594e857715b5d5439ef675811eee888c81aadec3d1e05d5416c51e SHA512 dea9a14abc6ea25b3e5b676eda6a772c0c6266afd95eea0446ea85b29b2f98c058e1495cbdc16dba1c78d5d0919980e4fdfc13ef597082e7f3bf8b6be4cb5723
-DIST rsyslog-doc-8.2310.0.tar.gz 6674428 BLAKE2B e951d564a63c57c1d9d130a315c4bc9f4c25c9cfaf83bece1bbda582eb40260f000c7d9805faca550d8df7b0f6074aff6cc86ff877706cad69909040c3dff5b1 SHA512 cf452f3705680fc81495e940ea7d5ae705a6dbfe0e2ce5a87865c3043f79daaec243df20e8aadd9fac6144a3df8f19d7c56fdf19ec68df78e2fdaffa45096143
+DIST rsyslog-8.2404.0.tar.gz 3408657 BLAKE2B 67170f1ba4ad61bd79088a313ee9b093ecaab512ce24ca56cfe605d4589276406abe593d791736ecb7b2f44be998b3836173272eb5dd69f7bc9ea8d5b49d462e SHA512 fda8032ab7f9cb6c46693edeb95d2b47ab7673836ff44d0686bbbd5a3759885f65a80e1a311c809c2332a19559b0297ac7d8e59e5f828372839f67dbf362e6b1
DIST rsyslog-doc-8.2312.0.tar.gz 6621561 BLAKE2B 2aca14d24606e3a125259cad5fa43af61da2b70ba0b1916e5496f3d4eb6a28b612287bb83c3fa610f0f367deedcec4f0b3e93a552643194fdcf552dff3d408b6 SHA512 2fe8ab0e37a6899a545c09ea2586c33ab89a3e3d93ff079f99b15e9b1743423bbe54931684ba8509ed4f578a4b55ea22f6306aca256ee2245f88115a5f44e400
DIST rsyslog-doc-8.2402.0.tar.gz 6525910 BLAKE2B 20bc3398db00cc2a0e92b610032cb86bcf17b71b31f70a47213b608c7ea9a1a81e9aad5caa74b7f23f0a28fdab7ef3627ec89f5910d535ac1ade5408b3300939 SHA512 dfffb6138cff6121020648c7ed20cec7c881020af956295f88ea297c3198ed6dd49a7fbcb651164c6a774520391d00743a3c34c7acc5f705b668c8048c289eea
+DIST rsyslog-doc-8.2404.0.tar.gz 6568723 BLAKE2B 4bc522f9146754a9ebae5f5f7ffb87cfa2da3d9b0832b902c73896d788a061ad4b99cd269b4fb8fc42917311ea5621dfd398428046c53883e9bba859252172ec SHA512 ea88fcf81fb45be515f1b8e7699efabba98eb7e5fcd2d5046424c303db95926a36baa1215143c05e39b9a86dcfdbc73c5c3a76dee382d7b8f1916653169df264
diff --git a/app-admin/rsyslog/rsyslog-8.2402.0.ebuild b/app-admin/rsyslog/rsyslog-8.2402.0.ebuild
index bb01f397f550..254da55994a5 100644
--- a/app-admin/rsyslog/rsyslog-8.2402.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2402.0.ebuild
@@ -24,7 +24,7 @@ else
)
"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
diff --git a/app-admin/rsyslog/rsyslog-8.2310.0.ebuild b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild
index 94d0e88e7958..bb01f397f550 100644
--- a/app-admin/rsyslog/rsyslog-8.2310.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2404.0.ebuild
@@ -3,26 +3,28 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit autotools linux-info python-any-r1 systemd
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
+HOMEPAGE="https://www.rsyslog.com/
+ https://github.com/rsyslog/rsyslog/"
-if [[ ${PV} == "9999" ]]; then
+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 ~ia64 ~ppc64 ~riscv ~sparc 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 )
+ doc? (
+ https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz
+ )
"
+
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
@@ -107,7 +109,7 @@ DEPEND="
elibc_musl? ( sys-libs/queue-standalone )
"
-if [[ ${PV} == "9999" ]]; then
+if [[ "${PV}" == "9999" ]]; then
BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
BDEPEND+=" >=app-alternatives/lex-2.5.39-r1"
BDEPEND+=" >=app-alternatives/yacc-2.4.3"
@@ -117,26 +119,27 @@ fi
CONFIG_CHECK="~INOTIFY_USER"
WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch )
+PATCHES=( "${FILESDIR}/${PN}-8.2112.0-pr5024-configure.patch" )
pkg_setup() {
use test && python-any-r1_pkg_setup
}
src_unpack() {
- if [[ ${PV} == "9999" ]]; then
+ if [[ "${PV}" == "9999" ]]; then
git-r3_fetch
git-r3_checkout
else
- unpack ${P}.tar.gz
+ unpack "${P}.tar.gz"
fi
if use doc; then
- if [[ ${PV} == "9999" ]]; 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}
+ _EGIT_BRANCH="${EGIT_BRANCH}"
+
unset EGIT_BRANCH
fi
@@ -151,7 +154,8 @@ src_unpack() {
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
+
+ unpack "${PN}-doc-${PV}.tar.gz"
fi
fi
}
@@ -189,12 +193,12 @@ src_configure() {
# 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
+ if use redis ; then
export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
fi
- local myeconfargs=(
+ local -a myeconfargs=(
--disable-debug-symbols
--disable-generate-man-pages
--without-valgrind-testbench
@@ -283,7 +287,6 @@ src_configure() {
$(use_enable uuid)
$(use_enable zeromq imczmq)
$(use_enable zeromq omczmq)
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
)
econf "${myeconfargs[@]}"
@@ -328,13 +331,13 @@ src_test() {
}
src_install() {
- local DOCS=(
+ local -a DOCS=(
AUTHORS
ChangeLog
"${FILESDIR}"/README.gentoo
)
- use doc && local HTML_DOCS=( "${S}/docs/build/." )
+ use doc && local -a HTML_DOCS=( "${S}/docs/build/." )
default
@@ -407,9 +410,10 @@ pkg_postinst() {
}
pkg_config() {
- if ! use ssl; then
+ if ! use ssl ; then
einfo "There is nothing to configure for rsyslog unless you"
einfo "used USE=ssl to build it."
+
return 0
fi
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 6175950c1ad8..779c5a6e36ea 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,3 +1,4 @@
DIST salt-3005.5.tar.gz 17940104 BLAKE2B c7a820bc946c2cd8124fb6f559608ab1dc3cd85d6f0e7d0a2a87b7bc0dda361178e83b307c2fecd8a47d59032f85dc9f4caeef5698e98c0e349d1c6979f9f68a SHA512 1332c9751a225dbf569601eb1932fe3ebea93c8d8be7485b1b8150d5200ad2e82954c970d59ba0e888860062d059db78a50bffe69fc367bdb7b2388b62e19f32
DIST salt-3006.5.tar.gz 20536455 BLAKE2B cf475dc5e919f6ab180578db2aae5f3655623b39b134d67609da4f607be909340c6e55c940cfb66f129cc75d40b5cdda094e866db116d8a45aa5eef26d8fa1eb SHA512 8aaf5c5d36d8aa17b3fe867cee470f7b3c5dd1f6abaf5bdb49a3df76d3498d0dc1fa305a069bc95ad057489db229454b38b0ea9c1ade1e46b5d9b57aeef10c23
DIST salt-3006.7.tar.gz 20562663 BLAKE2B b4ff9039509b1de7151060cb0e68252868d493e114e327a3c48bfc5584f67521a2106b41b77377f6d43ab5795399b6fe5860ce8e091459687c4a5b2378752729 SHA512 9d1759a7c0dfc9ad4fdc94460f0f3799483737207bfdc8ddd1424e5c6083ea74ef520f13c323d5cbd7f65c1d9bb13bbbeb5f2cafe6dcacbc2689e733794aef2d
+DIST salt-3007.0.tar.gz 20304228 BLAKE2B 3db95ce779cfd08d61536dcfb4ff6ac31788ad1d6d4665b640dcc430f5a33847f231f94fd574c5d8df7b14e2854511c80610a37cd19be5429c4643be8bd9e0eb SHA512 0e49d76dafdb981ee380ea89ceba2cddeae8cd95df1d188a6f8ba64a175c606aaf2f8101bacb040792255afdb46ae668cbc9464d0dbb055986e85cee4d5c130b
diff --git a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch
deleted file mode 100644
index ff47115af210..000000000000
--- a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
-index eb4d796418..ffa1589043 100644
---- a/requirements/zeromq.txt
-+++ b/requirements/zeromq.txt
-@@ -1,6 +1,4 @@
- -r base.txt
- -r crypto.txt
-
--pyzmq<=20.0.0 ; python_version < "3.6"
--pyzmq>=17.0.0 ; python_version < "3.9"
--pyzmq>19.0.2 ; python_version >= "3.9"
-+pyzmq
diff --git a/app-admin/salt/files/salt-3006.3-tests.patch b/app-admin/salt/files/salt-3006.3-tests.patch
deleted file mode 100644
index 4d30608775cb..000000000000
--- a/app-admin/salt/files/salt-3006.3-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/tests/pytests/unit/utils/event/test_event.py b/tests/pytests/unit/utils/event/test_event.py
-index e289e72dad..2abd4066c4 100644
---- a/tests/pytests/unit/utils/event/test_event.py
-+++ b/tests/pytests/unit/utils/event/test_event.py
-@@ -300,7 +300,7 @@ def test_connect_pull_should_debug_log_on_StreamClosedError():
- event = SaltEvent(node=None)
- with patch.object(event, "pusher") as mock_pusher:
- with patch.object(
-- salt.utils.event.log, "debug", auto_spec=True
-+ salt.utils.event.log, "debug", auto_spec=True, unsafe=True
- ) as mock_log_debug:
- mock_pusher.connect.side_effect = (
- salt.ext.tornado.iostream.StreamClosedError
-@@ -317,10 +317,10 @@ def test_connect_pull_should_error_log_on_other_errors(error):
- event = SaltEvent(node=None)
- with patch.object(event, "pusher") as mock_pusher:
- with patch.object(
-- salt.utils.event.log, "debug", auto_spec=True
-+ salt.utils.event.log, "debug", auto_spec=True, unsafe=True
- ) as mock_log_debug:
- with patch.object(
-- salt.utils.event.log, "error", auto_spec=True
-+ salt.utils.event.log, "error", auto_spec=True, unsafe=True
- ) as mock_log_error:
- mock_pusher.connect.side_effect = error
- event.connect_pull()
diff --git a/app-admin/salt/salt-3005.5-r1.ebuild b/app-admin/salt/salt-3005.5-r1.ebuild
index 00992ac88f15..835496219717 100644
--- a/app-admin/salt/salt-3005.5-r1.ebuild
+++ b/app-admin/salt/salt-3005.5-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_BRANCH="develop"
else
inherit pypi
- KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+ KEYWORDS="amd64 ~arm arm64 ~riscv x86"
fi
LICENSE="Apache-2.0"
diff --git a/app-admin/salt/salt-3006.7-r1.ebuild b/app-admin/salt/salt-3006.7-r1.ebuild
index e9171e89adf7..fee515b1a5ff 100644
--- a/app-admin/salt/salt-3006.7-r1.ebuild
+++ b/app-admin/salt/salt-3006.7-r1.ebuild
@@ -334,6 +334,9 @@ python_test() {
tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black
tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black
)
+ [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=(
+ tests/integration/modules/test_hosts.py::HostsModuleTest::test_set_host
+ )
# testsuite likes lots of files
ulimit -n 4096 || die
diff --git a/app-admin/salt/salt-3007.0-r1.ebuild b/app-admin/salt/salt-3007.0-r1.ebuild
new file mode 100644
index 000000000000..0400dc0b8b7a
--- /dev/null
+++ b/app-admin/salt/salt-3007.0-r1.ebuild
@@ -0,0 +1,610 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_1{0..2} )
+
+DISTUTILS_USE_PEP517=setuptools
+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"
+else
+ inherit pypi
+ KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="
+ cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+ mongodb neutron nova portage profile redis selinux test raet
+ +zeromq vim-syntax
+"
+
+RDEPEND="
+ sys-apps/pciutils
+ dev-libs/openssl:0=[-bindist(-)]
+ dev-python/aiohttp[${PYTHON_USEDEP}]
+ >=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-42.0.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.5[${PYTHON_USEDEP}]
+ dev-python/importlib-metadata[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
+ dev-python/libnacl[${PYTHON_USEDEP}]
+ dev-python/looseversion[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-24.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+ dev-python/python-gnupg[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/tomli[${PYTHON_USEDEP}]
+ dev-python/tornado[${PYTHON_USEDEP}]
+ dev-python/watchdog[${PYTHON_USEDEP}]
+ libcloud? (
+ >=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}]
+ dev-python/aiosignal[${PYTHON_USEDEP}]
+ >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
+ dev-python/async-timeout[${PYTHON_USEDEP}]
+ )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ libvirt? (
+ dev-python/libvirt-python[${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}]
+ )
+ cheetah? ( >=dev-python/cheetah3-3.2.2[${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[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ nova? (
+ $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3.1{0..1})
+ )
+ neutron? (
+ $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3.1{0..1})
+ )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )
+ zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+ sys-apps/findutils
+ dev-python/build[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ app-arch/zip
+ dev-python/apache-libcloud[${PYTHON_USEDEP}]
+ dev-python/boto3[${PYTHON_USEDEP}]
+ >=dev-python/certifi-2023.07.22[${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-2.0.0[${PYTHON_USEDEP}]
+ <dev-python/moto-5[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/bcrypt[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/pygit2[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-salt-factories-1.0.0_rc29[${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/pytest-custom-exit-code[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ net-dns/bind-tools
+ >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
+ dev-util/yamllint[${PYTHON_USEDEP}]
+ !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
+ )
+"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="
+ || ( raet zeromq )
+ test? ( cheetah genshi )
+ nova? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
+ neutron? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
+"
+RESTRICT="
+ !test? ( test )
+ x86? ( test )
+"
+
+PATCHES=(
+ "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+)
+
+python_prepare_all() {
+ local -a remove_test_files=(
+ # remove tests with external dependencies that may not be available, and
+ # tests that don't work in sandbox
+ tests/integration/externalapi/test_venafiapi.py
+ tests/integration/modules/test_rabbitmq.py
+ tests/integration/modules/test_supervisord.py
+ tests/integration/states/test_match.py
+ tests/pytests/functional/fileserver/hgfs/test_hgfs.py
+ tests/pytests/functional/loader/test_loader.py
+ tests/pytests/functional/modules/file/test_readlink.py
+ tests/pytests/functional/modules/file/test_symlink.py
+ tests/pytests/functional/modules/state/test_jinja_filters.py
+ tests/pytests/functional/modules/state/test_jinja_renderer.py
+ tests/pytests/functional/modules/state/test_mako_renderer.py
+ tests/pytests/functional/modules/state/test_pyobjects_renderer.py
+ tests/pytests/functional/modules/test_aptpkg.py
+ tests/pytests/functional/modules/test_dockermod.py
+ tests/pytests/functional/modules/test_etcd_mod.py
+ tests/pytests/functional/modules/test_grains.py
+ tests/pytests/functional/modules/test_mac_service.py
+ tests/pytests/functional/modules/test_saltcheck.py
+ tests/pytests/functional/modules/test_saltutil.py
+ tests/pytests/functional/modules/test_test.py
+ tests/pytests/functional/pillar/hg_pillar/test_hg_pillar.py
+ tests/pytests/functional/pillar/test_git_pillar.py
+ tests/pytests/functional/pillar/test_gpg.py
+ tests/pytests/functional/returners/test_etcd_return.py
+ tests/pytests/functional/runners/test_winrepo.py
+ tests/pytests/functional/sdb/test_etcd_db.py
+ tests/pytests/functional/state/test_masterless_tops.py
+ tests/pytests/functional/states/file/test_keyvalue.py
+ tests/pytests/functional/states/file/test_patch.py
+ tests/pytests/functional/states/file/test_rename.py
+ tests/pytests/functional/states/rabbitmq
+ tests/pytests/functional/states/test_docker_container.py
+ tests/pytests/functional/states/test_docker_network.py
+ tests/pytests/functional/states/test_etcd_mod.py
+ tests/pytests/functional/states/test_module.py
+ tests/pytests/functional/states/test_mysql.py
+ tests/pytests/functional/states/test_svn.py
+ tests/pytests/functional/states/test_virtualenv_mod.py
+ tests/pytests/functional/test_version.py
+ tests/pytests/functional/utils/test_vault.py
+ tests/pytests/integration/cli/test_syndic_eauth.py
+ tests/pytests/integration/daemons/test_memory_leak.py
+ tests/pytests/integration/grains/test_grains.py
+ tests/pytests/integration/master/test_clear_funcs.py
+ tests/pytests/integration/minion/test_reauth.py
+ tests/pytests/integration/modules/grains/test_append.py
+ tests/pytests/integration/modules/grains/test_module.py
+ tests/pytests/integration/modules/saltutil/test_grains.py
+ tests/pytests/integration/modules/saltutil/test_modules.py
+ tests/pytests/integration/modules/saltutil/test_wheel.py
+ tests/pytests/integration/modules/state/test_state_pillar_errors.py
+ tests/pytests/integration/modules/state/test_state_test.py
+ tests/pytests/integration/modules/test_cmdmod.py
+ tests/pytests/integration/modules/test_event.py
+ tests/pytests/integration/modules/test_file.py
+ tests/pytests/integration/modules/test_jinja.py
+ tests/pytests/integration/modules/test_pillar.py
+ tests/pytests/integration/modules/test_pip.py
+ tests/pytests/integration/modules/test_vault.py
+ tests/pytests/integration/modules/test_virt.py
+ tests/pytests/integration/modules/test_x509_v2.py
+ tests/pytests/integration/proxy/test_deltaproxy.py
+ tests/pytests/integration/proxy/test_shell.py
+ tests/pytests/integration/reactor/test_reactor.py
+ tests/pytests/integration/returners/test_noop_return.py
+ tests/pytests/integration/runners/state/orchestrate/test_orchestrate.py
+ tests/pytests/integration/runners/test_cache.py
+ tests/pytests/integration/runners/test_jobs.py
+ tests/pytests/integration/runners/test_manage.py
+ tests/pytests/integration/runners/test_saltutil.py
+ tests/pytests/integration/runners/test_vault.py
+ tests/pytests/integration/sdb/test_vault.py
+ tests/pytests/integration/ssh/state/test_pillar_override.py
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_requisite_fail.py
+ tests/pytests/integration/ssh/state/test_retcode_pillar_render_exception.py
+ tests/pytests/integration/ssh/state/test_retcode_render_exception.py
+ tests/pytests/integration/ssh/state/test_retcode_render_module_exception.py
+ tests/pytests/integration/ssh/state/test_retcode_run_fail.py
+ tests/pytests/integration/ssh/state/test_retcode_state_run_remote_exception.py
+ tests/pytests/integration/ssh/state/test_state.py
+ tests/pytests/integration/ssh/state/test_with_import_dir.py
+ tests/pytests/integration/ssh/test_cmdmod.py
+ tests/pytests/integration/ssh/test_config.py
+ tests/pytests/integration/ssh/test_cp.py
+ tests/pytests/integration/ssh/test_deploy.py
+ tests/pytests/integration/ssh/test_grains.py
+ tests/pytests/integration/ssh/test_jinja_mods.py
+ tests/pytests/integration/ssh/test_master.py
+ tests/pytests/integration/ssh/test_mine.py
+ tests/pytests/integration/ssh/test_pillar.py
+ tests/pytests/integration/ssh/test_pillar_compilation.py
+ tests/pytests/integration/ssh/test_pre_flight.py
+ tests/pytests/integration/ssh/test_publish.py
+ tests/pytests/integration/ssh/test_py_versions.py
+ tests/pytests/integration/ssh/test_raw.py
+ tests/pytests/integration/ssh/test_saltcheck.py
+ tests/pytests/integration/ssh/test_slsutil.py
+ tests/pytests/integration/states/test_beacon.py
+ tests/pytests/integration/states/test_file.py
+ tests/pytests/integration/states/test_include.py
+ tests/pytests/integration/states/test_ini_manage.py
+ tests/pytests/integration/states/test_state_test.py
+ tests/pytests/integration/states/test_x509_v2.py
+ tests/pytests/integration/utils/test_templates.py
+ tests/pytests/integration/wheel/test_key.py
+ tests/pytests/pkg/integration/test_check_imports.py
+ tests/pytests/pkg/integration/test_clean_zmq_teardown.py
+ tests/pytests/pkg/integration/test_enabled_disabled.py
+ tests/pytests/pkg/integration/test_help.py
+ tests/pytests/pkg/integration/test_logrotate_config.py
+ tests/pytests/pkg/integration/test_pkg.py
+ tests/pytests/pkg/integration/test_python.py
+ tests/pytests/scenarios/compat/test_with_versions.py
+ tests/pytests/unit/loader/test_lazy.py
+ tests/pytests/unit/modules/test_mongodb.py
+ tests/pytests/unit/modules/test_mysql.py
+ tests/pytests/unit/modules/test_schedule.py
+ tests/pytests/unit/pillar/test_consul_pillar.py
+ tests/pytests/unit/pillar/test_mysql.py
+ tests/pytests/unit/renderers/test_yamlex.py
+ tests/pytests/unit/roster/test_ansible.py
+ tests/pytests/unit/roster/test_dir.py
+ tests/pytests/unit/runners/test_reactor.py
+ tests/pytests/unit/states/file/test_keyvalue.py
+ tests/pytests/unit/utils/jinja/test_get_template.py
+ tests/pytests/unit/utils/jinja/test_salt_cache_loader.py
+ tests/pytests/unit/utils/test_cache.py
+ tests/pytests/unit/utils/test_etcd_util.py
+ tests/pytests/unit/utils/test_package.py
+ tests/pytests/unit/utils/test_versions.py
+ tests/unit/ext/test_ipaddress.py
+ tests/unit/modules/test_boto_elb.py
+ tests/unit/modules/test_boto_secgroup.py
+ tests/unit/modules/test_boto_vpc.py
+ tests/unit/modules/test_elasticsearch.py
+ tests/unit/modules/test_k8s.py
+ tests/unit/modules/test_kubernetesmod.py
+ tests/unit/modules/test_vsphere.py
+ tests/unit/netapi/rest_tornado/test_saltnado.py
+ tests/unit/states/test_boto_vpc.py
+ tests/unit/states/test_module.py
+ tests/unit/test_module_names.py
+ tests/unit/test_zypp_plugins.py
+ tests/unit/utils/test_extend.py
+ tests/unit/utils/test_pbm.py
+ tests/unit/utils/test_schema.py
+ tests/unit/utils/test_vmware.py
+ tests/unit/utils/test_vsan.py
+
+ # tests that require network access
+ tests/integration/cloud
+ tests/integration/netapi
+ tests/kitchen/test_kitchen.py
+ tests/kitchen/tests/wordpress/tests
+ tests/pytests/functional/cli/test_salt_cloud.py
+ tests/pytests/functional/cli/test_salt_run_.py
+ tests/pytests/functional/modules/test_ansiblegate.py
+ tests/pytests/functional/modules/test_http.py
+ tests/pytests/functional/modules/test_pip.py
+ tests/pytests/functional/netapi
+ tests/pytests/functional/utils/test_etcd_util.py
+ tests/pytests/functional/utils/test_http.py
+ tests/pytests/integration/cli/test_salt_proxy.py
+ tests/pytests/integration/daemons/test_masterapi.py
+ tests/pytests/integration/modules/state/test_state.py
+ tests/pytests/integration/modules/state/test_state_state_events.py
+ tests/pytests/integration/netapi
+ tests/pytests/integration/pillar/cache/test_pillar_cache.py
+ tests/pytests/integration/pillar/test_fileclient.py
+ tests/pytests/integration/pillar/test_pillar_include.py
+ tests/pytests/integration/proxy/test_simple.py
+ tests/pytests/integration/runners/state/orchestrate/test_events.py
+ tests/pytests/integration/wheel/test_pillar_roots.py
+ tests/pytests/pkg/downgrade/test_salt_downgrade.py
+ tests/pytests/pkg/integration/test_pip.py
+ tests/pytests/pkg/integration/test_pip_upgrade.py
+ tests/pytests/pkg/integration/test_salt_api.py
+ tests/pytests/pkg/integration/test_salt_call.py
+ tests/pytests/pkg/integration/test_salt_exec.py
+ tests/pytests/pkg/integration/test_salt_grains.py
+ tests/pytests/pkg/integration/test_salt_key.py
+ tests/pytests/pkg/integration/test_salt_minion.py
+ tests/pytests/pkg/integration/test_salt_output.py
+ tests/pytests/pkg/integration/test_salt_pillar.py
+ tests/pytests/pkg/integration/test_salt_state_file.py
+ tests/pytests/pkg/integration/test_salt_ufw.py
+ tests/pytests/pkg/integration/test_salt_user.py
+ tests/pytests/pkg/integration/test_systemd_config.py
+ tests/pytests/pkg/integration/test_version.py
+ tests/pytests/pkg/upgrade/test_salt_upgrade.py
+ tests/pytests/scenarios/cluster/test_cluster.py
+ tests/pytests/unit/client/ssh/test_ssh.py
+ tests/pytests/unit/cloud/clouds/vmware
+ tests/pytests/unit/loader/test_loading_modules.py
+ tests/pytests/unit/runners/test_net.py
+ tests/pytests/unit/states/file/test_mod_beacon.py
+ tests/pytests/unit/test_client.py
+ tests/pytests/unit/utils/test_aws.py
+ tests/pytests/unit/utils/test_http.py
+ tests/unit/modules/test_boto3_elasticsearch.py
+ tests/unit/modules/test_boto3_route53.py
+ tests/unit/modules/test_network.py
+ tests/unit/modules/test_zcbuildout.py
+ tests/unit/states/test_zcbuildout.py
+
+ # tests require root access
+ tests/integration/pillar/test_git_pillar.py
+ tests/integration/states/test_lxd_container.py
+ tests/integration/states/test_lxd_image.py
+ tests/integration/states/test_lxd_profile.py
+ tests/integration/states/test_supervisord.py
+ tests/pytests/functional/cache/test_mysql.py
+ tests/pytests/functional/cli/test_salt.py
+ tests/pytests/functional/modules/test_mysql.py
+ tests/pytests/functional/modules/test_vault.py
+ tests/pytests/functional/states/file/test_accumulated.py
+ tests/pytests/functional/utils/test_gitfs.py
+ tests/pytests/functional/utils/test_pillar.py
+ tests/pytests/scenarios/performance/test_performance.py
+ tests/pytests/unit/cloud/test_map.py
+ tests/pytests/unit/engines/test_slack_bolt_engine.py
+ tests/pytests/unit/modules/state/test_state.py
+ tests/pytests/unit/modules/state/test_top_file_merge.py
+ tests/pytests/unit/proxy/test_netmiko_px.py
+ tests/pytests/unit/proxy/test_ssh_sample.py
+ tests/pytests/unit/roster/test_sshknownhosts.py
+
+ # tests that require boto
+ tests/pytests/unit/engines/test_sqs_events.py
+
+ # first test always fails
+ tests/pytests/unit/utils/parsers/test_log_parsers.py
+ )
+
+ rm -r "${remove_test_files[@]}" || die
+
+ # axe the boto dep (bug #888235)
+ find "${S}/tests" -name 'test_boto_*.py' -delete || die
+
+ # removes contextvars, see bug: https://bugs.gentoo.org/799431
+ sed -i '/^contextvars/d' requirements/base.txt || die
+
+ # called_once should be assert_called_once_with
+ find "${S}/tests" -name '*.py' -print0 \
+ | xargs -0 -- sed -i -e 's:[.]called_once:.assert_called_once:g' -- || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ local -x USE_SETUPTOOLS=1
+ distutils-r1_python_install_all
+
+ local svc
+ 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() {
+ local -a EPYTEST_DESELECT=(
+ # doesn't like the distutils warning
+ tests/pytests/integration/cli/test_batch.py::test_batch_retcode
+ tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
+
+ # hangs indefinitely
+ tests/pytests/unit/test_minion.py::test_master_type_disable
+
+ # needs root
+ tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
+ tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+ tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert
+ tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_muliassert_failure
+
+ # don't like sandbox
+ tests/integration/modules/test_cp.py::CPModuleTest::test_get_file_str_https
+ tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_ftp
+ tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https
+ tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_dest_empty
+ tests/integration/modules/test_cp.py::CPModuleTest::test_get_url_https_no_dest
+ tests/integration/states/test_git.py::LocalRepoGitTest::test_latest_force_reset_true_fast_forward
+ tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
+ tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
+ tests/pytests/functional/modules/test_defaults.py::test_defaults_get
+ tests/pytests/functional/modules/test_system.py::test_get_system_date_time
+ tests/pytests/functional/modules/test_system.py::test_get_system_date_time_utc
+ tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
+ tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
+ tests/pytests/functional/states/file/test_append.py::test_issue_1896_file_append_source
+ tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043
+ tests/pytests/functional/states/file/test_comment.py::test_issue_62121
+ tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
+ tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
+ tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
+ tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
+ tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
+ tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
+ tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
+ tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
+ tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
+ tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
+ tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
+ tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
+ tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
+ tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
+ tests/pytests/functional/states/test_pip_state.py::test_22359_pip_installed_unless_does_not_trigger_warnings
+ tests/pytests/functional/states/test_pip_state.py::test_issue_2028_pip_installed_state
+ tests/pytests/functional/states/test_pip_state.py::test_issue_54755
+ tests/pytests/functional/states/test_pip_state.py::test_pip_installed_errors
+ tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed
+ tests/pytests/functional/states/test_pip_state.py::test_pip_installed_removed_venv
+ tests/pytests/functional/states/test_pip_state.py::test_pip_installed_specific_env
+ tests/pytests/functional/states/test_x509_v2.py::"test_private_key_managed_passphrase_changed_not_overwrite[existing_pk0]"
+ tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
+ tests/pytests/functional/utils/test_pillar.py::test_gitpython_env
+ tests/pytests/functional/utils/test_pillar.py::test_gitpython_fetch_request
+ tests/pytests/functional/utils/test_pillar.py::test_gitpython_multiple_repos
+ tests/pytests/functional/utils/test_pillar.py::test_pygit2_env
+ tests/pytests/functional/utils/test_pillar.py::test_pygit2_multiple_repos
+ tests/pytests/functional/utils/test_winrepo.py::test_gitpython_winrepo_simple
+ tests/pytests/functional/utils/test_winrepo.py::test_pygit2_winrepo_simple
+ tests/pytests/integration/minion/test_return_retries.py::test_pillar_timeout
+ tests/pytests/integration/minion/test_return_retries.py::test_publish_retry
+ tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[False]"
+ tests/pytests/integration/modules/saltutil/test_pillar.py::"test_pillar_refresh[True]"
+ tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order
+ tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings
+ tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_call
+ tests/pytests/integration/renderers/test_jinja.py::test_issue_54765_salt
+ tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args0-kwargs0]"
+ tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args1-kwargs1]"
+ tests/pytests/integration/ssh/state/test_pillar_override_template.py::"test_it[args2-kwargs2]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args0-20]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args1-20]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args2-20]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args3-20]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args4-0]"
+ tests/pytests/integration/ssh/state/test_retcode_highstate_verification_structure_fail.py::"test_it[args5-20]"
+ tests/pytests/integration/ssh/test_jinja_filters.py::test_dateutils_strftime
+ tests/pytests/integration/ssh/test_terraform.py::test_terraform_roster
+ tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
+ tests/pytests/unit/grains/test_core.py::test_get_machine_id
+ tests/pytests/unit/grains/test_package.py::test_grain_package_type
+ tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed
+ tests/pytests/unit/modules/test_beacons.py::test_add
+ tests/pytests/unit/modules/test_beacons.py::test_add_beacon_module
+ tests/pytests/unit/modules/test_beacons.py::test_delete
+ tests/pytests/unit/modules/test_beacons.py::test_delete_beacon_module
+ tests/pytests/unit/modules/test_beacons.py::test_disable
+ tests/pytests/unit/modules/test_beacons.py::test_enable
+ tests/pytests/unit/modules/test_beacons.py::test_enable_beacon_module
+ tests/pytests/unit/modules/test_beacons.py::test_save
+ tests/pytests/unit/modules/test_gpg.py::test_create_key_with_passphrase_with_gpg_passphrase_in_pillar
+ tests/pytests/unit/modules/test_gpg.py::test_create_key_without_passphrase
+ tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
+ tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
+ tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
+ tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
+ tests/pytests/unit/states/test_pkg.py::test_mod_beacon
+ tests/pytests/unit/states/test_service.py::test_mod_beacon
+ tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+ tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina
+ tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
+ tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror
+ tests/unit/utils/test_thin.py::SSHThinTestCase::test_thin_dir
+ tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
+ tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
+ tests/unit/utils/test_vt.py::VTTestCase::test_vt_size
+
+ # tests that need network access
+ tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source
+ tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures
+ tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps
+ tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
+ tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none
+ tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+ tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false
+ tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true
+ tests/pytests/unit/utils/test_http.py::test_query_proxy
+ tests/pytests/unit/utils/test_network.py::test_isportopen
+
+ # tests that need root access
+ tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command
+ tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_call_salt_command2
+ tests/unit/modules/test_saltcheck.py::SaltcheckTestCase::test_run_test_1
+ )
+ [[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=(
+ tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black
+ tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black
+ )
+ [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=(
+ tests/integration/modules/test_mine.py::MineTest::test_get_allow_tgt
+ tests/integration/modules/test_mine.py::MineTest::test_mine_delete
+ tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt
+ tests/integration/modules/test_mine.py::MineTest::test_send_allow_tgt_compound
+ tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall
+ tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_checkall_saltenv
+ tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_run
+ tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_saltenv
+ tests/integration/modules/test_saltcheck.py::SaltcheckModuleTest::test_saltcheck_state
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_highstate
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_json
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_nested
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_pprint
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_raw
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_txt
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml
+ tests/integration/output/test_output.py::OutputReturnTest::test_output_yaml_namespaced_dict_wrapper
+ tests/integration/output/test_output.py::OutputReturnTest::test_static_simple
+ tests/integration/runners/test_manage.py::ManageTest::test_down
+ tests/integration/runners/test_manage.py::ManageTest::test_up
+ tests/integration/shell/test_master_tops.py::MasterTopsTest::test_custom_tops_gets_utilized
+ tests/integration/states/test_archive.py::ArchiveTest::test_local_archive_extracted_with_skip_files_list_verify_and_keep_source_is_false
+ tests/pytests/functional/states/test_pip_state.py::test_issue_2087_missing_pip
+ tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]"
+ tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]"
+ tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]"
+ tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]"
+ tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]"
+ tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is
+ tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed
+ tests/pytests/unit/utils/vault/test_auth.py::"test_approle_auth_get_token_login[secret_id-approle]"
+ tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info
+ tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors
+ )
+
+ # 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)" || die
+ (
+ test_exports=(
+ TMPDIR
+ SHELL="/bin/bash"
+ USE_SETUPTOOLS=1
+ NO_INTERNET=1
+ PYTHONDONTWRITEBYTECODE=1
+ )
+ export "${test_exports[@]}"
+
+ cleanup() { rm -rf "${TMPDIR}" || die; }
+
+ trap cleanup EXIT
+
+ addwrite "${TMPDIR}"
+
+ epytest --run-slow
+ )
+}
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
index a66d0d5bd131..eeed98dadb74 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -1,6 +1,3 @@
-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-r1-deps.tar.xz 760452 BLAKE2B 3e2b55d59fd2d94e8cee9082346e827fc1d7ff7d3fb01663d4ae0001a5c29c47212a29c3a98a544dbd4576f157c4c49abea8477c204f96c012b3f4c469724886 SHA512 2a288309d3e5a9486231ddbcd86cee28e950c778dda60247a23692d7e57f0386fdc88e6aff45f5407acd4e604e122f7b010111668340eee1e77f85c80e69803a
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.0.ebuild b/app-admin/serf/serf-0.10.0.ebuild
deleted file mode 100644
index 540d5af97180..000000000000
--- a/app-admin/serf/serf-0.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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/serf/serf-0.9.8.ebuild b/app-admin/serf/serf-0.10.1-r1.ebuild
index 540d5af97180..97a6a9dac3d6 100644
--- a/app-admin/serf/serf-0.9.8.ebuild
+++ b/app-admin/serf/serf-0.10.1-r1.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
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"
+ https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz"
+LICENSE="MPL-2.0"
+LICENSE+=" Apache-2.0 BSD MIT"
SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
-IUSE=""
+KEYWORDS="~amd64"
RESTRICT+=" test"
-BDEPEND=""
RDEPEND="
acct-user/serf
acct-group/serf"
+PATCHES=("${S}/go-mod-sum.patch")
src_prepare() {
default
@@ -31,7 +30,7 @@ src_prepare() {
src_compile() {
mkdir -p ./bin
- go build -o ./bin/serf ./cmd/serf || die
+ ego build -o ./bin/serf ./cmd/serf || die
}
src_install() {
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index 07d6f52021dc..5b130944a5ec 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,2 +1,4 @@
DIST stow-2.3.1.tar.bz2 556921 BLAKE2B cd946dd1537bec063e21c91cc60c0c8f3a8a5609960536020e7e4b970ff2daa628151258487492b1b44fb5539e1d75a8955152fdfbe91384b7e174ab420a9cf6 SHA512 3d6cec3d50e2dc0ffa92646c45015ced3fca32cef9dd24418fada3fc2e4472a1f335877debb3a1284812aef281a432925c3a3e7afa112d92f127facd3150079c
DIST stow-2.3.1.tar.bz2.sig 833 BLAKE2B a236d67fca2dabb965021b7ef23ec680ffd48c1b23d3637cf4bd2c31da58b55ad9d190ee88c7f9bb8ce676f85a0bb133b963bc8252fea7c8d5bd5c0042c65681 SHA512 0a0ad10781c29ee6cd69dc8cb05592e779e5cb53412b8bc6c7bce12846c1e1480e2763eaaab329f2cf945a263d15217adb102387247bc2bec313856b3d7535c4
+DIST stow-2.4.0.tar.bz2 635343 BLAKE2B 578d3cf5084a97110eb90faed96d7ae1b167176795b7c4a3a65d5fc43a59983f5106fbb9d8ea136df92363e041f81c72483cd748cef9e051c2089795af53a6a6 SHA512 c479a0ba5d6af9a2a4860f4bf4095dbd586794e781766c22e6cda657bbf984915f4661e03825db02a300412aa49305e06b8107ffc96077bd64ba4e7a1eb27314
+DIST stow-2.4.0.tar.bz2.sig 833 BLAKE2B df8665e5d8189177138313de95ed1edcd1a38deca753f064cb9e6e1e5447c55467330c4d8f8ffefd05be12528788738e4ecd427db14bf36fdd070161b69a7422 SHA512 02bb9549a1d27c532f7dfbd42d5a6dcd92d0de7692f8e43c74ebd662c63e6cae656edc045379eb81e9908f88ee89100edd8b9fe416e4c13399357579c4836f66
diff --git a/app-admin/stow/stow-2.4.0.ebuild b/app-admin/stow/stow-2.4.0.ebuild
new file mode 100644
index 000000000000..a69e14905be7
--- /dev/null
+++ b/app-admin/stow/stow-2.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/adamspiers.asc
+inherit perl-functions verify-sig
+
+DESCRIPTION="GNU Stow is a symlink farm manager"
+HOMEPAGE="https://www.gnu.org/software/stow/ https://git.savannah.gnu.org/cgit/stow.git"
+SRC_URI="mirror://gnu/stow/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/perl:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ test? (
+ dev-perl/IO-stringy
+ virtual/perl-Test-Harness
+ dev-perl/Test-Output
+ )
+ verify-sig? ( sec-keys/openpgp-keys-adamspiers )
+"
+
+src_configure() {
+ perl_set_version
+ econf "--with-pmdir=${VENDOR_LIB}"
+}
diff --git a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild b/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild
index 1404fb49c931..22c7aa4bc2da 100644
--- a/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-4.6.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="amqp caps dbi geoip2 grpc http 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/sysstat/files/sysstat-12.6.2-defs_and_flags.patch b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch
new file mode 100644
index 000000000000..854a66219ff9
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -94,10 +94,14 @@
+ endif
+
+ # Compiler flags
++ifndef CPPFLAGS
++CPPFLAGS = @CPPFLAGS@
++endif
++CPPFLAGS += @DEFS@
+ ifndef CFLAGS
+ CFLAGS = @CFLAGS@
+ endif
+-CFLAGS += -Wall -Wstrict-prototypes -pipe -O2
++CFLAGS += $(CPPFLAGS)
+
+ ifndef DFLAGS
+ DFLAGS = @DFLAGS@
diff --git a/app-admin/sysstat/sysstat-12.6.2-r2.ebuild b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
new file mode 100644
index 000000000000..2645fb504348
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# 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://sebastien.godard.pagesperso-orange.fr/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="dcron debug nls lm-sensors selinux systemd"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="
+ nls? ( virtual/libintl )
+ lm-sensors? ( sys-apps/lm-sensors:= )
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ !dcron? ( !sys-process/dcron )
+ selinux? ( sec-policy/selinux-sysstat )
+"
+
+REQUIRED_USE="dcron? ( !systemd )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-12.6.2-check_overflow.patch
+ "${FILESDIR}"/${PN}-12.6.2-defs_and_flags.patch
+)
+
+src_prepare() {
+ if use dcron; then
+ sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die
+ fi
+ default
+}
+
+src_configure() {
+ tc-export AR
+
+ # --enable-lto only appends -flto
+ sa_lib_dir=/usr/lib/sa \
+ conf_dir=/etc \
+ econf \
+ $(use_enable !systemd use-crond) \
+ $(use_enable lm-sensors sensors) \
+ $(use_enable nls) \
+ $(usex debug --enable-debuginfo '') \
+ --disable-compress-manpg \
+ --disable-stripping \
+ --disable-pcp \
+ --enable-copy-only \
+ --enable-documentation \
+ --enable-install-cron \
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+ keepdir /var/log/sa
+
+ emake \
+ CHOWN=true \
+ DESTDIR="${D}" \
+ DOC_DIR=/usr/share/doc/${PF} \
+ MANGRPARG='' \
+ install
+
+ dodoc -r contrib/
+
+ newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+ systemd_dounit ${PN}.service
+
+ rm "${D}"/usr/share/doc/${PF}/COPYING || die
+}
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild
deleted file mode 100644
index 0c83ac608bfc..000000000000
--- a/app-admin/system-config-printer/system-config-printer-1.5.18-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="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}]
- ')
- keyring? ( app-crypt/libsecret[introspection] )
- policykit? ( net-print/cups-pk-helper )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-debugprint-exception.patch" ) # git master (1.5.19)
-
-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-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild
index 96a93369f31b..eac1dbdb254b 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.18-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="keyring policykit"
# Needs cups running, bug 284005
RESTRICT="test"
diff --git a/app-admin/systemdgenie/metadata.xml b/app-admin/systemdgenie/metadata.xml
index 274bd0f534a1..5066380bcf2b 100644
--- a/app-admin/systemdgenie/metadata.xml
+++ b/app-admin/systemdgenie/metadata.xml
@@ -13,5 +13,6 @@
<email>rthomsen6@gmail.com</email>
<name>Ragnar Thomsen</name>
</maintainer>
+ <remote-id type="kde-invent">system/systemdgenie</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index c84687c110fe..e816a967c38b 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,8 +1,4 @@
-DIST terraform-1.3.9-deps.tar.xz 246904620 BLAKE2B 26577614ff95fa03dcf0362050f0e2a10eaa500f71d992b2927f6c44475341e899f62141e203ce9231bf329dc03825076d3f615c693a6c33c11190d4420b042f SHA512 9587b6022d320a104f3ad67dda9f1b931e258f78e7f6b6f87a8302732206b55d7d4af555b09517994ea1f53f069d8e1b5e2ca05c129efbbe4d7c3b75cbd27c69
-DIST terraform-1.3.9.tar.gz 4964672 BLAKE2B bfe823a2c1bc8d6188d339c8b5d452be4873adf1063aa0a880457d7e5b4e042d2d8c2ba93eb20eb46bad209c184bfe628b5093d6bdd6163e1bc57934c6770ad2 SHA512 3e951142120b5d71830b5bde34ef3e8907b1585f461f51f83e16170a46e1fc21934d4d1935f1a49963add3d894f68a5cf267ef91293347d0dd9a4b90978ea751
-DIST terraform-1.6.5-deps.tar.xz 334283548 BLAKE2B 6222db5b66d9a49a7dba4806a1f5a07e0c7a871077bf960f556bcb55661957e41f4688babdd0f826a1a5b837520f98387de218fb8c90b7a902dda0f05566536d SHA512 dbbc303282ac918441a4018ceed6c6c448137f126a9125c322514a3336f27d6c312060c39d0d60a132caad2540be5bc274d7b30206b1df72af3e795bb140aab8
-DIST terraform-1.6.5.tar.gz 5635461 BLAKE2B afa99bf8e9787a4498e9868ceb91921e6be7bdd5d7ef60378a9173e9765f689fb4c6e8888ce5405c00a6fe855e22dc91fc46e911be8bbc1f0665d9f11bed1ebf SHA512 588b00bc86905021d5efb41ba62306c2a41c9cd2225fb1aeb956a7845be15d6aa3c7d0365e3b779ea7da415a562094ba091e6a4644add72ba3abe169f3a7d36a
-DIST terraform-1.7.0-deps.tar.xz 334327044 BLAKE2B 0f83b190af69766fde3c1906fd291f5d70fc9a2ee30ca4e61e5938b51dfca3a6cb942612fa97a4ea124b0fb4fdd6e4820cf314dd653419c7154e2d9e5e21be0d SHA512 80ecbdf3fe43e5eee25f774be47b01532d5f144d8564dc18443a501683fc2a10482682e983add24f1754bf02469035e7d5b0fd29378d3c851998e81c69eb45be
-DIST terraform-1.7.0.tar.gz 6132499 BLAKE2B 15c7e47a193643aa57d4b11e92ad7f479cd7397efb389bf63413ee11e755233f0d2fd5434d151f180892e018f708f0110678818bb5d8900b25ed62684b8ef21d SHA512 02b121ed9db658ef7623bf4d2725a593b735153ab0dab6964416cdd109273b4d749bc74a4f1edf64258227dab3a8eb4ddb5fe3868b7964acc93bcd126c5fe1c5
DIST terraform-1.7.2-deps.tar.xz 334339964 BLAKE2B 1f1e8b41dd164bb92271d8a29a8ec31a9aa34272c3ce8530518b0a2fdc1706a97581f6096b8bc564aa1291e6c53c1a5833a32af841fcc410b0c9880412a5edee SHA512 f8979165039a1c928a5de4759b96155b1c76ffa9ff5dd21081007f0b695f52b035d6cc8925cddfa20da3e252120642b2e58db3b76c47b4ccc845022440ac550b
DIST terraform-1.7.2.tar.gz 6135908 BLAKE2B 252fbc41171a00c5077d7f07af25d912507215d1dd51be2c73b79a185a60c2eb486e5dd6ffd55bce06e1d2996b908930b5dc3cd73069fe78f7ac2e75cf144c26 SHA512 e9843cfa4a1f830fac10908257d05d08a6490edd9caeb8b83b45a6d1d282f98b6db0d07a4b2bc12439a76c0eb6a0bd0ab343a30cd92de6670c1ad9473d51c6d1
+DIST terraform-1.7.5-deps.tar.xz 107757204 BLAKE2B 07f788ed4d97724190e2201e5e66318ee2906a4dbf680a7359c329f388f8e9a82dd45dcda874cceb1d51df4af0c6ce0d6de517522bdf24e753db19db32b34dda SHA512 988be8a5b2adad5300d67f1b6861f2fc15285910af5982e4215aebb443414e0445acd3f9de5d6bb569453f2478f146b93a0d79ecc6979173ba22d1f5902f7a97
+DIST terraform-1.7.5.tar.gz 6137112 BLAKE2B 8cf8c1ebd2ee79ba0332ebe8b5614700dfe3bcf2f74a52a72cf971da35a1b5c32d3ed611f9e3ff5360215529ef94804b5acee2041a7d4240749c4f866251af36 SHA512 344942400cee43e2ba0c6de933f618b7dc5a7997567e613bf420d7da1f6314f7f9a42ffc32b27974d86f8a7f867f67727f1472ea120510df16d73061b11166fe
diff --git a/app-admin/terraform/terraform-1.6.5.ebuild b/app-admin/terraform/terraform-1.6.5.ebuild
deleted file mode 100644
index fff5c2bc7b23..000000000000
--- a/app-admin/terraform/terraform-1.6.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="BUSL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-BDEPEND="dev-go/gox"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
- export CGO_ENABLED=0
- gox \
- -os=$(go env GOOS) \
- -arch=$(go env GOARCH) \
- -output bin/terraform \
- -verbose \
- . || die
-}
-
-src_install() {
- dobin bin/*
- einstalldocs
-}
-
-pkg_postinst() {
- elog "If you would like to install shell completions please run:"
- elog " terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-1.7.2.ebuild b/app-admin/terraform/terraform-1.7.2.ebuild
index 6366b8f6f5db..78692f4a1150 100644
--- a/app-admin/terraform/terraform-1.7.2.ebuild
+++ b/app-admin/terraform/terraform-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="BUSL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
BDEPEND="dev-go/gox
>=dev-lang/go-1.21.5"
diff --git a/app-admin/terraform/terraform-1.7.0.ebuild b/app-admin/terraform/terraform-1.7.5.ebuild
index d8faa6d78fd0..6366b8f6f5db 100644
--- a/app-admin/terraform/terraform-1.7.0.ebuild
+++ b/app-admin/terraform/terraform-1.7.5.ebuild
@@ -13,7 +13,8 @@ LICENSE="BUSL-1.1"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~riscv"
-BDEPEND="dev-go/gox"
+BDEPEND="dev-go/gox
+ >=dev-lang/go-1.21.5"
RESTRICT="test"
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index eb6decb01775..bef94bf92ce7 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1 +1 @@
-DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
+DIST testdisk-7.2.tar.bz2 855781 BLAKE2B 224fae052fa9264ee83fdf6804159c77257b9db4c96ff36c7cb1dc184ec4a9f0955f0d817de24ef1e5fe69e7ef1a20c140e73fc130fb092e6df3b02df2845239 SHA512 f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26
diff --git a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
deleted file mode 100644
index 4ef379f0021f..000000000000
--- a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 2b0a0fcde875a89e2beffbe5c43c7518f682b482 Mon Sep 17 00:00:00 2001
-From: Christophe Grenier <grenier@cgsecurity.org>
-Date: Wed, 6 Apr 2022 07:43:45 +0200
-Subject: [PATCH] src/ntfs_io.c: fix ntfs_device_testdisk_io_ioctl() prototype
- for ntfs-3g
-
----
-Gentoo note: link to upstream commit:
-https://git.cgsecurity.org/cgit/testdisk/commit/?id=2b0a0fcde875a89e2beffbe5c43c7518f682b482
-
- src/ntfs_io.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/ntfs_io.c b/src/ntfs_io.c
-index 5ca494a5..fa056724 100644
---- a/src/ntfs_io.c
-+++ b/src/ntfs_io.c
-@@ -159,6 +159,7 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device *dev, struct stat *bu
- return -1;
- }
-
-+#ifdef HAVE_LIBNTFS
- static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
- void *argp)
- {
-@@ -168,6 +169,17 @@ static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
- #endif
- return -1;
- }
-+#else
-+static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, unsigned long request,
-+ void *argp)
-+{
-+ log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n");
-+#ifdef ENOTSUP
-+ errno = ENOTSUP;
-+#endif
-+ return -1;
-+}
-+#endif
-
- /**
- * Device operations for working with unix style devices and files.
---
-2.37.4
-
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index adbd9697dcd6..0cde64481bdc 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -13,6 +13,7 @@
<flag name="ntfs">Include the ability to read NTFS filesystems</flag>
<flag name="reiserfs">Include reiserfs reading ability</flag>
<flag name="ewf">Include ewf library</flag>
+ <flag name="sudo">Enable sudo helper integration</flag>
</use>
<upstream>
<remote-id type="github">cgsecurity/testdisk</remote-id>
diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild
index 100c4ccc7787..ea419d0652ee 100644
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,13 +12,19 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-IUSE="ewf jpeg ntfs gui reiserfs static zlib"
+IUSE="ewf jpeg ntfs gui reiserfs static +sudo zlib"
REQUIRED_USE="static? ( !gui )"
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'ntfs_mbstoucs' # configure script checking NTFS, has fallbacks
+)
+
# WARNING: reiserfs support does NOT work with reiserfsprogs
# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+# sudo is detected during configure for extra functionality, see bug #892904
DEPEND="
+ sudo? ( app-admin/sudo )
static? (
sys-apps/util-linux[static-libs]
sys-fs/e2fsprogs[static-libs]
@@ -45,13 +51,15 @@ DEPEND="
!arm? ( ewf? ( app-forensics/libewf:= ) )
)
"
-RDEPEND="!static? ( ${DEPEND} )"
+RDEPEND="
+ sudo? ( app-admin/sudo )
+ !static? ( ${DEPEND} )
+"
BDEPEND="gui? ( dev-qt/linguist-tools:5 )"
DOCS=()
PATCHES=(
- "${FILESDIR}"/${P}-backport-ntfs-3g-ioctl-prototype.patch
)
src_configure() {
@@ -59,12 +67,12 @@ src_configure() {
export PATH="$(qt5_get_bindir):${PATH}"
local myconf=(
- --enable-sudo
- --without-ntfs
+ --without-ntfs # old NTFS implementation, use ntfs-3g instead.
$(use_with ewf)
$(use_with jpeg)
$(use_with ntfs ntfs3g)
$(use_enable gui qt)
+ $(use_enable sudo)
$(use_with reiserfs)
$(use_with zlib)
)
diff --git a/app-admin/usbview/usbview-3.1.ebuild b/app-admin/usbview/usbview-3.1.ebuild
index 84120651b862..0a78c3e5780f 100644
--- a/app-admin/usbview/usbview-3.1.ebuild
+++ b/app-admin/usbview/usbview-3.1.ebuild
@@ -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 ed9fdd0f316c..8eb33f53ee11 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,6 +1,10 @@
DIST vault-1.14.5-vendor.tar.gz 71839384 BLAKE2B 845416db5d69c400d5e9603bd42b2d73112b1cea884a03ac1345afad627b0d8ed0ff983d97b3086ed69462713cc706aa67f46164df4c1e4e3226aafb66cf0e89 SHA512 ac55e4f9b76ac80eb0f82e5d63ed234c65a9b5c737fcb6f7ad8c9cb9dbe303b6d18a11b329f8223d9fbdcea1a7ee982c622184537fce45fe005df89b8392bbe5
DIST vault-1.14.5-webui.tar.xz 1670796 BLAKE2B 8629de337f2c708553752409a1c8ddc94e421adb34c7b31116f4154e06eed6e7ffb0355cd7ff91d7ec42f1fb1a35737732d530a8587cf515a0636b0a5dbffb38 SHA512 32ff0d720282f0539288f3ee111b91d43b9098bd4ea309d11f638c9f0c4a0a9276fe2f940573d9d664dcea33945f08ac33488ad05d37b372042e859b6d2f7e97
-DIST vault-1.14.8-vendor.tar.gz 71869146 BLAKE2B 5875056d5ec53396ed53db7fd4891a6fbc3c5449a3f2409e11a409ed00cca2c0741e755a31c9d9c1b777c52a0b136cfc30be498a9321e9a0ff317b82e4c35d0e SHA512 e02c6fa1f09ccbb53420dc3919151a5783c4b861c8601ff5079db03a4be926d00a3a963130942f629dda8178275728ddfdcb537f1188e2279c67733883a0178c
-DIST vault-1.14.8-webui.tar.xz 1680312 BLAKE2B c698adc325633b1dc59dea3b09692da0476a5f3dbd1f69f1e68243fa903e4590b152846f2dabd4b7f5f492467fcdc52c0afd82bfe1a956b1b69f11da403fab9c SHA512 a25faa74614b31688bb91c4ac2b6a105426be632cc417e94ef14c60a388f076eaec006e07a9784047422b70ce9d9c9fd33e6fb8ef3595b7f1a6468739da8e1c6
DIST vault-1.14.9-vendor.tar.gz 71845081 BLAKE2B ea25a6ba8ac293971170688b4ce3845ba19a5af746c3d96860420d74f8c0af33ea118a47d17117dbd520675739c44ed76118ef126c5b53e4c4adb0924cda58d5 SHA512 00ff45f986889d17ebe59c27aeaf8132270e5f06883bf84ce10721c9e2943a25ad8b86be3271991c824369ad5545258b3c01600f1dda06487751ff806b1d76b9
DIST vault-1.14.9-webui.tar.xz 1677212 BLAKE2B db4da051a8c0a62e99c1f2070f3c022fc934350b255d21b360b3b3b53555942f1ac6c4ef15ed7d8a2519f05752406add63837317615afb387b0fc407f5ab8410 SHA512 2f54dd24fb9a4e2e774dd4212a605126a9d4e4975a97a01c88c94bce8e6f10174fe07235d402dd43ae31aacf4371f77272e4446d972d2e7304745186b0e6dbb7
+DIST vault-1.15.6-deps.tar.xz 20736608 BLAKE2B 53e21d0664f9bbd8c851a486334e04d3b3151aaee709c8fe88ab4969a81ebd4562cf3a350e383647140bd4826a0aa75b34ef136c81920b868dff7ae6f0522e37 SHA512 c1c24c2c646a441c551849af2d3165fc15db2b61f261608f44b7371214cdef0e76263b5b2f295c19606057e80316b4864fff64bc5603b99901fc8a5d900c6550
+DIST vault-1.15.6-webui.tar.xz 1721320 BLAKE2B 3f2d31767c6086e7b17f7445f0cff34ce4ebd7a6a1daeaede96443758096a6b8b94b971af5a74e8bcfb2c95c07b496b1babf3f8ce82f9b360fafe5a4d5138cac SHA512 6a532258a5c7734863967926d95699b2611959177b9dbf4e60cff115331237e65f3dbc41e842443ee5af9020c69280b27a511f887528dc914f9d9e642f9a3a63
+DIST vault-1.15.6.tar.gz 31923253 BLAKE2B 8a4e7b9d8d6753b6f717c6699b2d4822cecff299e3cebd8945d3c34232ff77611611d4e6259ab9c9c4ff91a2e52b7eef707df7da68960be36c314ceba18b124b SHA512 52be0e47f3028f9c1f3ce5d2a72356c955f20fcaf6e8396a6d5938226d72cd8353bed398ba66a6821fc609aaed465e82c3449aeaa0dfaabe80ff0412a73779b3
+DIST vault-1.16.1-deps.tar.xz 21476528 BLAKE2B 2ba0bd2165ce41bfae6fb56a0ff97fe4ed30ac5e16f30ceba14d618e30851b9bb31a964cf5035cd4089baf87c2cda5acd17558bb363acbbcc371ddf47b453c73 SHA512 a0262f421eacfc729a0bc98c137a580d3ca7b384b5b7a8e3bb81cc27b0791b81fdb9005ff9721159cccaf49f2ec6e86dafe7f4e2dde4b5c8d806a8bf1c68de2c
+DIST vault-1.16.1-webui.tar.xz 2213524 BLAKE2B 40c0811c84c849beba934f110afa21fe1ebe60f9a01750fcb4c6442f6a8ef28babd4c32157e6bb3eaf7545b683a81122f445a1a0d717cf7442a678e87206f67a SHA512 ca25ffaa85445070310fad9d5a05d6ff477729d64707a4da8bc433781d7f2283e18e680a9a06d6aa37496a21b148ac3bdc5eb3f475246ee3fe3cf4a8db096ffb
+DIST vault-1.16.1.tar.gz 32997180 BLAKE2B e8c6ccf19ce2c48eee1b4b7544c6d164bd98be3d06a08397b06049bbb6aed9304df592bcb5103e943a629aca4c2e83f661b16469e3353c022e3ca552fa1afedb SHA512 e970004343abb2792aeea4db55a002d1c18701d309caab4a49e3f387028083b70dfa67b7ff34b60c5d4d34ffa8ac3bef308b7218a0344dffde3b000b0e5d43a9
diff --git a/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch b/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch
new file mode 100644
index 000000000000..5b47f39cb81b
--- /dev/null
+++ b/app-admin/vault/files/vault-1.15.6-stubmaker-outside-git-repo-24678.patch
@@ -0,0 +1,92 @@
+From cd6d0e1c593e158b8641529410d95e4b1722d5b2 Mon Sep 17 00:00:00 2001
+From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
+Date: Thu, 4 Jan 2024 17:03:09 -0600
+Subject: [PATCH] Allow stubmaker to work outside of a git repository
+
+https://github.com/hashicorp/vault/pull/24678
+
+Fixes: https://github.com/hashicorp/vault/issues/24677
+---
+ tools/stubmaker/main.go | 58 +++++++++++++++++++++++------------------
+ 1 file changed, 33 insertions(+), 25 deletions(-)
+
+diff --git a/tools/stubmaker/main.go b/tools/stubmaker/main.go
+index 53676e08b8c84..15e95b6a45f60 100644
+--- a/tools/stubmaker/main.go
++++ b/tools/stubmaker/main.go
+@@ -43,15 +43,21 @@ func main() {
+ DetectDotGit: true,
+ })
+ if err != nil {
+- fatal(err)
++ if err.Error() != "repository does not exist" {
++ fatal(err)
++ }
++ repo = nil
+ }
+
+- wt, err := repo.Worktree()
+- if err != nil {
+- fatal(err)
+- }
+- if !isEnterprise(wt) {
+- return
++ var wt *git.Worktree
++ if repo != nil {
++ wt, err = repo.Worktree()
++ if err != nil {
++ fatal(err)
++ }
++ if !isEnterprise(wt) {
++ return
++ }
+ }
+
+ // Read the file and figure out if we need to do anything.
+@@ -80,26 +86,28 @@ func main() {
+
+ // We'd like to write the file, but first make sure that we're not going
+ // to blow away anyone's work or overwrite a file already in git.
+- head, err := repo.Head()
+- if err != nil {
+- fatal(err)
+- }
+- obj, err := repo.Object(plumbing.AnyObject, head.Hash())
+- if err != nil {
+- fatal(err)
+- }
++ if repo != nil {
++ head, err := repo.Head()
++ if err != nil {
++ fatal(err)
++ }
++ obj, err := repo.Object(plumbing.AnyObject, head.Hash())
++ if err != nil {
++ fatal(err)
++ }
+
+- st, err := wt.Status()
+- if err != nil {
+- fatal(err)
+- }
++ st, err := wt.Status()
++ if err != nil {
++ fatal(err)
++ }
+
+- tracked, err := inGit(wt, st, obj, outputFile)
+- if err != nil {
+- fatal(err)
+- }
+- if tracked {
+- fatal(fmt.Errorf("output file %s exists in git, not overwriting", outputFile))
++ tracked, err := inGit(wt, st, obj, outputFile)
++ if err != nil {
++ fatal(err)
++ }
++ if tracked {
++ fatal(fmt.Errorf("output file %s exists in git, not overwriting", outputFile))
++ }
+ }
+
+ // Now we can finally write the file
diff --git a/app-admin/vault/vault-1.14.8.ebuild b/app-admin/vault/vault-1.15.6.ebuild
index bca60ca1df89..2a8f84f25ca1 100644
--- a/app-admin/vault/vault-1.14.8.ebuild
+++ b/app-admin/vault/vault-1.15.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,10 +9,9 @@ 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}
- )"
+SRC_URI="https://github.com/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" webui? ( https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
SLOT="0"
@@ -22,7 +21,7 @@ IUSE="+webui"
BDEPEND="
app-arch/zip
dev-go/gox
- >=dev-lang/go-1.15.3"
+ >=dev-lang/go-1.21"
COMMON_DEPEND="acct-group/vault
acct-user/vault"
DEPEND="${COMMON_DEPEND}"
@@ -33,7 +32,8 @@ FILECAPS=(
)
RESTRICT="test"
-S=${WORKDIR}/${P}-vendor
+S=${WORKDIR}/${P}
+PATCHES=("${FILESDIR}/${P}-stubmaker-outside-git-repo-24678.patch")
src_unpack() {
default
diff --git a/app-admin/vault/vault-1.16.1.ebuild b/app-admin/vault/vault-1.16.1.ebuild
new file mode 100644
index 000000000000..9956d1f746c1
--- /dev/null
+++ b/app-admin/vault/vault-1.16.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/hashicorp/vault/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" webui? ( https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} )"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" 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.21"
+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}
+PATCHES=("${FILESDIR}/${PN}-1.15.6-stubmaker-outside-git-repo-24678.patch")
+
+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/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch
new file mode 100644
index 000000000000..cb1ba1a8593e
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch
@@ -0,0 +1,11 @@
+--- a/WebappConfig/protect.py
++++ b/WebappConfig/protect.py
+@@ -78,7 +78,7 @@
+
+ numbers = []
+ prefix = self.protect_prefix
+- rep = re.compile(prefix.replace('.','\.') + '(\d{4})_')
++ rep = re.compile(prefix.replace('.',r'\.') + r'(\d{4})_')
+
+ for i in entries:
+ rem = rep.match(i)
diff --git a/app-admin/webapp-config/webapp-config-1.55-r4.ebuild b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild
new file mode 100644
index 000000000000..cc2e8028b578
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 prefix
+
+if [[ ${PV} = 9999* ]]
+then
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+ sys-apps/gentoo-functions"
+RDEPEND="
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch
+)
+
+python_prepare_all() {
+ # make the source from svn mirror the one in the tarball
+ if [[ ${PV} == 9999* ]]; then
+ mkdir ../webapp-config || die "Cannot create temp directory."
+ cp -r * ../webapp-config || die "Cannot copy all into the temp directory."
+ mv ../webapp-config . || die "Cannot move temp directory to its final position."
+
+ # Installation fails if version is 1.55-git
+ sed -e 's/-git//' \
+ -i webapp-config/WebappConfig/version.py \
+ -i WebappConfig/version.py || die "Cannot fix version."
+ fi
+
+ distutils-r1_python_prepare_all
+ eprefixify WebappConfig/eprefix.py config/webapp-config
+}
+
+python_compile_all() {
+ emake -C doc/
+}
+
+python_test() {
+ PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v ||
+ die "Testing failed with ${EPYTHON}"
+}
+
+python_install() {
+ # According to this discussion:
+ # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+ # distutils does not provide for specifying two different script install
+ # locations. Since we only install one script here the following should
+ # be ok
+ distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # distutils-r1 installs the scripts in /usr/bin in PEP517 mode
+ mv "${ED}"/usr/bin "${ED}"/usr/sbin || die "Cannot rename scripts directory to /usr/sbin"
+
+ insinto /etc/vhosts
+ doins config/webapp-config
+
+ keepdir /usr/share/webapps
+ keepdir /var/db/webapps
+
+ dodoc AUTHORS
+ doman doc/*.[58]
+}
+
+pkg_postinst() {
+ elog "Now that you have upgraded webapp-config, you **must** update your"
+ elog "config files in /etc/vhosts/webapp-config before you emerge any"
+ elog "packages that use webapp-config."
+}
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 76caefb23e6d..cc2e8028b578 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 prefix
@@ -29,6 +29,10 @@ DEPEND="app-text/xmlto
RDEPEND="
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+PATCHES=(
+ "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch
+)
+
python_prepare_all() {
# make the source from svn mirror the one in the tarball
if [[ ${PV} == 9999* ]]; then
diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest
index d2e738335a39..b6b56c6115d9 100644
--- a/app-admin/xkcdpass/Manifest
+++ b/app-admin/xkcdpass/Manifest
@@ -1,4 +1,2 @@
-DIST xkcdpass-1.19.4.tar.gz 2572291 BLAKE2B f36299ab66bc02f95a7811ebdf40fa62f441a0ef1eac27af8d380fca9643eb9c2444c988392900e5add8a2a22f4ef33766bc5904fb350520b0b7572e95898ecd SHA512 2a83473f6e2426f34ee89297056ca7d3949044f7e818f6d6501fd7852ac1ba9f860f8287ad6d366f13f46f580b0f3f7e9a3dfa160b262b4d00b00ed1c9f5da59
-DIST xkcdpass-1.19.5.tar.gz 2572430 BLAKE2B e955780492d2771558bc1f0716913f4e84a408d98049b2f5f23d53a56e6d660bc1afb2539b3f422bdc98df05ae065c51f0303ddaf2e268994420a22580aba2a2 SHA512 8a560247cb860377ef723b26610a6f784a891b4c8dfb2c5b55187df70e326d6ff2f1d31128dfc4e7136cbc15108c470658d896056177900e0eb419d14458348f
-DIST xkcdpass-1.19.6.tar.gz 2572473 BLAKE2B 638aaa482f5d468e89daef7cb59dcba183b11280356a9e3a6aa518a0e8c0b9931057c1ffc6ebf3fd45111389a3f2952c4a668421f1b4822e64cbe0f1ade8d702 SHA512 ca61424432ab3749ee5a3fca884ed0897e5f342a84bfe208e4ae1dde3db60218f99f60d62cb77c05ccf8fd81ae393779869236aa2ee7cd7ebd3cf89663d47c13
DIST xkcdpass-1.19.8.tar.gz 2689908 BLAKE2B 68d0e6b2799773433962ee19ede47f5983839f4e4cecd4939205c2f0872228b4da5a107176d3931fc41aa47be8e51b7fb7383c1da1898684484be98913c088f9 SHA512 f218a9afdf103444558233f9fe32655d2c604f3553d2782a923f73baa4d69495871557a753a5f38be4607bd373df43cf425c0cc6675b0b1b34723098fdeff7b5
+DIST xkcdpass-1.19.9.tar.gz 2689919 BLAKE2B 089997c82569afa40fd2f7d2046b0dd284491d080597513f963c4e6af49ad20c4e01397af0f1dc3b91a23b95666b492eaaf85c3ac1c8f87d3250e012fd00bdc1 SHA512 b326160e181f0e0485514f10efa6cd8e98e139a8a89af37bad511713a7f46750f6da3ff1eeab20b850e0b5c607d0e329966d100d6bd4fe43b80d3edce090a2c1
diff --git a/app-admin/xkcdpass/files/xkcdpass-1.19.4-no-examples-in-site-packages.patch b/app-admin/xkcdpass/files/xkcdpass-1.19.4-no-examples-in-site-packages.patch
deleted file mode 100644
index c2ad0fe63460..000000000000
--- a/app-admin/xkcdpass/files/xkcdpass-1.19.4-no-examples-in-site-packages.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2f35f86..eed1e7b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -11,7 +11,7 @@ setup(
- description='Generate secure multiword passwords/passphrases, inspired by XKCD',
- long_description=open('README.rst', encoding='utf-8').read(),
- #packages=['xkcdpass'],
-- packages=find_namespace_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
-+ packages=find_namespace_packages(exclude=["examples", "*.tests", "*.tests.*", "tests.*", "tests"]),
- zip_safe=False,
- license='BSD',
- include_package_data=True,
diff --git a/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild
deleted file mode 100644
index 767282c1f31d..000000000000
--- a/app-admin/xkcdpass/xkcdpass-1.19.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Password generator inspired by XKCD 936"
-HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
-
-LICENSE="BSD CC-BY-3.0
- l10n_de? ( GPL-3 )
- l10n_it? ( CC-BY-SA-3.0 )
- l10n_no? ( CC-BY-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
-
-distutils_enable_tests pytest
-REQUIRED_USE="test? ( l10n_en )"
-
-PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch )
-
-src_prepare() {
- default
-
- use l10n_de || rm ${PN}/static/{ger-anlx,eff_large_de_sample.wordlist}
- use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy}
- use l10n_es || rm ${PN}/static/spa-mich
- use l10n_fi || rm ${PN}/static/fin-kotus
- use l10n_fr || rm ${PN}/static/fr-*
- use l10n_it || rm ${PN}/static/ita-wiki
- use l10n_no || rm ${PN}/static/nor-nb
- use l10n_pt || rm ${PN}/static/pt-*
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman ${PN}.1
-}
diff --git a/app-admin/xkcdpass/xkcdpass-1.19.5.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.5.ebuild
deleted file mode 100644
index 767282c1f31d..000000000000
--- a/app-admin/xkcdpass/xkcdpass-1.19.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Password generator inspired by XKCD 936"
-HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
-
-LICENSE="BSD CC-BY-3.0
- l10n_de? ( GPL-3 )
- l10n_it? ( CC-BY-SA-3.0 )
- l10n_no? ( CC-BY-4.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
-
-distutils_enable_tests pytest
-REQUIRED_USE="test? ( l10n_en )"
-
-PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch )
-
-src_prepare() {
- default
-
- use l10n_de || rm ${PN}/static/{ger-anlx,eff_large_de_sample.wordlist}
- use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy}
- use l10n_es || rm ${PN}/static/spa-mich
- use l10n_fi || rm ${PN}/static/fin-kotus
- use l10n_fr || rm ${PN}/static/fr-*
- use l10n_it || rm ${PN}/static/ita-wiki
- use l10n_no || rm ${PN}/static/nor-nb
- use l10n_pt || rm ${PN}/static/pt-*
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman ${PN}.1
-}
diff --git a/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild
index d76304959988..206d383064ae 100644
--- a/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild
+++ b/app-admin/xkcdpass/xkcdpass-1.19.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 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_COMPAT=( python3_{9..12} )
inherit distutils-r1 pypi
DESCRIPTION="Password generator inspired by XKCD 936"
diff --git a/app-admin/xkcdpass/xkcdpass-1.19.6.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.9.ebuild
index 767282c1f31d..206d383064ae 100644
--- a/app-admin/xkcdpass/xkcdpass-1.19.6.ebuild
+++ b/app-admin/xkcdpass/xkcdpass-1.19.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 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_COMPAT=( python3_{9..12} )
inherit distutils-r1 pypi
DESCRIPTION="Password generator inspired by XKCD 936"
@@ -21,8 +21,6 @@ IUSE="l10n_de +l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
distutils_enable_tests pytest
REQUIRED_USE="test? ( l10n_en )"
-PATCHES=( "${FILESDIR}"/xkcdpass-1.19.4-no-examples-in-site-packages.patch )
-
src_prepare() {
default