diff --git a/Manifest.files.gz b/Manifest.files.gz
index 79c828f754a6..c62a721f8584 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 383ac5e5c16e..d2f939d8d535 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/soju/Manifest b/acct-group/soju/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/soju/metadata.xml b/acct-group/soju/metadata.xml
new file mode 100644
index 000000000000..d8299f5a010f
--- /dev/null
+++ b/acct-group/soju/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ cat@catcream.org
+ Alfred Persson
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/soju/soju-0.ebuild b/acct-group/soju/soju-0.ebuild
new file mode 100644
index 000000000000..e5be123ff93f
--- /dev/null
+++ b/acct-group/soju/soju-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="User for the net-irc/soju IRC bouncer"
+ACCT_GROUP_ID=526
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index fc614005cab6..2133c9b4eca3 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/soju/Manifest b/acct-user/soju/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/soju/metadata.xml b/acct-user/soju/metadata.xml
new file mode 100644
index 000000000000..d8299f5a010f
--- /dev/null
+++ b/acct-user/soju/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ cat@catcream.org
+ Alfred Persson
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/soju/soju-0.ebuild b/acct-user/soju/soju-0.ebuild
new file mode 100644
index 000000000000..2ca7f2de748b
--- /dev/null
+++ b/acct-user/soju/soju-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the net-irc/soju IRC bouncer"
+ACCT_USER_ID=526
+ACCT_USER_HOME=/var/lib/soju
+ACCT_USER_HOME_PERMS=0755
+ACCT_USER_GROUPS=( soju )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index ea54d8e2669c..40fcc46d493d 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild
index 916cb3ed4b61..8a767daf36a1 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 010f5192dd94..2317fd2b1de5 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index ef04f38520cb..b82b286e87a6 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,6 +1,5 @@
DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
DIST ansible-core-2.12.10.tar.gz 7762154 BLAKE2B deffcc42c124a40ce34ce9a26a0c400b1199018cb05478ea8860500e1a507f9f604c1f40f0d006682fc14ad8f0cc3d035b8ffb1307ee37d26191be3c68e33253 SHA512 8b4eb0e923f976680e81ffbe942c4ddc7ddaaaffe83d14c20f78f7c6ab4f548f21920cdfa57b48de2bc24683028e744a92ac4ca45fecc459ea2b042de8c40737
-DIST ansible-core-2.13.5.tar.gz 13934317 BLAKE2B 27ac2040f3626d645e57fab4df9b1b6a349fb81bec4cc8bb87b4dd16351f43d71a6210e32e2906346500742be2bf94512a1b05ba95b7ac0dfeac89696dfc9760 SHA512 e57dca7d457cfbf8a805442dd274499e3a6e4652303dc9e838b46c7dba9a36f2262e548bf9b6ff66f4e4bed5fa648abf9bb9a881047d4c6c0d6efbc91269eca2
DIST ansible-core-2.13.6.tar.gz 13938462 BLAKE2B bf7bbeb5d5f7e27a2d72a61223559f79971aeb86d91688907c629388cf4c2578c88694f6ca23b22b6f8fe50cdaa909b34c05e9756258a062156a1e5d2bcea3b4 SHA512 2a91916e94bf65f76c450e548c6464660ef0e1a62e17f889785cb94c735c2bf153a2d8eff7a0dac90836a523f5768453bf18c4bdf3cbee0f8916d6cd0b11a902
DIST ansible-core-2.13.7.tar.gz 13940230 BLAKE2B fd3556514f7692b48a66987ff5a084b132217c910ba0b216f2533cd1e542a9b6da6d2aa96e8e32142ab3a6ed7357fc1b68b9827ceaf44b91238bfbcb15b5d026 SHA512 f46d8acb07fa1d397e6e640c52237ed70b575ae0760eeb82b9e41afc6c06d99d341856d6af3452edb82e63a708600c2f348782b8bebc18c0ea9b03a4df80594a
DIST ansible-core-2.14.0.tar.gz 13988948 BLAKE2B 7b68d72c292d8f3e8fb2d0d66fce0eca1de1b74ec1dc3ecaa2c4b37177d693567272260b3e98c9d81f7ff5e5cc4972dfa1f24c9f5e0119bb1da528388081d5fb SHA512 09e5b45608f7e1f341100dd89a6277a71a5ff0a45244cd6862a10d0f35a993c3cf649a5f9936ac726f7e903269f98a975804418516e602b8dd983bfca23c66cb
diff --git a/app-admin/ansible-core/ansible-core-2.13.5.ebuild b/app-admin/ansible-core/ansible-core-2.13.5.ebuild
deleted file mode 100644
index dc98f352bb3f..000000000000
--- a/app-admin/ansible-core/ansible-core-2.13.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-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
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- 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/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-lint/ansible-lint-6.8.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
index fb27321a99b1..2e40f9cbc06a 100644
--- a/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
diff --git a/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild
index df6b0f93eebd..dcb2f57e85ed 100644
--- a/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
diff --git a/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild
index f2381dac1ab3..0d91815abba5 100644
--- a/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild
@@ -52,6 +52,7 @@ EPYTEST_DESELECT=(
test/test_eco.py
test/test_examples.py::test_custom_kinds
test/test_examples.py::test_example
+ test/test_file_path_evaluation.py
test/test_import_playbook.py::test_task_hook_import_playbook
test/test_list_rules.py::test_list_rules_includes_opt_in_rules
test/test_list_rules.py::test_list_rules_with_format_option
@@ -64,6 +65,7 @@ EPYTEST_DESELECT=(
test/test_profiles.py::test_profile_listing
test/test_rules_collection.py::test_rich_rule_listing
test/test_rules_collection.py::test_rules_id_format
+ test/test_schemas.py::test_refresh_schemas
test/test_skip_inside_yaml.py::test_role_meta
test/test_utils.py::test_cli_auto_detect
test/test_utils.py::test_template_lookup
diff --git a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
index 0da494a9e37b..c7f2bb183135 100644
--- a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index fb3ca72855fe..a0c963489f5d 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1,4 @@
DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd15cf7a97978835b29cb8b87b671fa888163e28e825d1fc98006c57313677afed63236f4a55af415a70daf5fe305f SHA512 d81b34642533dfaf0c3dba5ecc8ba483efb3d82bd40afa469de2778666e932bec3c20e61ae579184fcbd7f1ec7c8d694617f334ebb3e910db3c9f6709d3b9385
-DIST ansible-6.5.0.tar.gz 38275680 BLAKE2B 5d17ba2b8b3a0ccb1ea9873c0d500ca7984d2d3db19d062807004da5c001ee44d33cd6707226887bef8f6bae0ea9584f8c2c63a8cb176a2244b3b2ad92e13454 SHA512 ddb77304c6a9617186fa0252a0da91632ffc21f910e02fc68e340ed37de0806586a2543700e996db7fb0bb9240a2ee20b7a462f005de200028748b38fbb2e293
DIST ansible-6.6.0.tar.gz 35620748 BLAKE2B 1e36ff72669902629cf1f373e9816b9d0a3136cb205867a24d67efc27b0ca3f2d361f3017fb1543c46da8693bb165ee6b354388611ab3e3186098513bd49f41d SHA512 51d06386dfb14ef826562dd4991556805d3e6014173965f0541e97b905984208a95889392dd3bb22027060ac767a354d53dfb9de774d5b461b15b236395d6fd1
DIST ansible-6.7.0.tar.gz 36371372 BLAKE2B 75cb14f158c36ded8313a1c5b798838afdf3a38ffc8e29a87c8e1e3e74c9aeca827432397ad83ed23a1d3aeaaef91822cc3c23aa226a307d93f84f54b25d71bb SHA512 676baf03626d5bf36aea7117d39ef71ba7878ab6bccdec1ee199bd699d559a5f3f6a0d9032ef120204093677b7fbbe1b575529d3aa692acd1a4447f9c2715f3a
diff --git a/app-admin/ansible/ansible-6.5.0.ebuild b/app-admin/ansible/ansible-6.5.0.ebuild
deleted file mode 100644
index 9a54e321f412..000000000000
--- a/app-admin/ansible/ansible-6.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-core-2.13.0
- =dev-libs/apr-1.5.0:1=
- dev-libs/apr-util:1=
- dev-libs/expat
- dev-libs/libpcre
- virtual/libcrypt:=
- kernel_linux? ( sys-apps/util-linux )
- ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-BDEPEND="
- sys-apps/which
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
- default
-
- # This package really should upgrade to using pcre's .pc file.
- cat <<-\EOF >"${T}"/pcre-config
- #!/bin/bash
- flags=()
- for flag; do
- if [[ ${flag} == "--version" ]]; then
- flags+=( --modversion )
- else
- flags+=( "${flag}" )
- fi
- done
- exec ${PKG_CONFIG} libpcre "${flags[@]}"
- EOF
- chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
- # Brain dead check.
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
- tc-export PKG_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
- --with-pcre="${T}"/pcre-config
- $(use_enable ssl)
- $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
- )
- # econf overwrites the stuff from config.layout.
- ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
- 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/apache-tools/apache-tools-2.4.54-r2.ebuild b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index b10f8a8bbb67..54c5ce8f759c 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
IUSE="ssl"
RESTRICT="test"
diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
similarity index 75%
rename from app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild
rename to app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
index 8b3560d27cf2..6f81b8aa7f99 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -11,14 +11,14 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
IUSE="ssl"
RESTRICT="test"
RDEPEND=">=dev-libs/apr-1.5.0:1=
dev-libs/apr-util:1=
dev-libs/expat
- dev-libs/libpcre
+ dev-libs/libpcre2
virtual/libcrypt:=
kernel_linux? ( sys-apps/util-linux )
ssl? ( dev-libs/openssl:0= )"
@@ -31,16 +31,17 @@ BDEPEND="
S="${WORKDIR}/httpd-${PV}"
PATCHES=(
- "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+ "${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}"/pcre-config
- #!/bin/bash
+ cat <<-\EOF > "${T}"/pcre2-config
+ #!/usr/bin/env bash
flags=()
for flag; do
if [[ ${flag} == "--version" ]]; then
@@ -49,19 +50,21 @@ src_prepare() {
flags+=( "${flag}" )
fi
done
- exec ${PKG_CONFIG} libpcre "${flags[@]}"
+ exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
EOF
- chmod a+x "${T}"/pcre-config || die
+ chmod a+x "${T}"/pcre2-config || die
- # Only here for which patch
+ # Only here for libtool and which patches
eautoreconf
}
src_configure() {
- # Brain dead check.
+ # 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
@@ -69,13 +72,15 @@ src_configure() {
--with-z="${EPREFIX}"/usr
--with-apr="${ESYSROOT}"/usr
--with-apr-util="${ESYSROOT}"/usr
- --with-pcre="${T}"/pcre-config
+ --without-pcre
+ --with-pcre2="${T}"/pcre2-config
$(use_enable ssl)
$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
)
+
# econf overwrites the stuff from config.layout.
- ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
econf "${myeconfargs[@]}"
+
sed -i \
-e '/^LTFLAGS/s:--silent::' \
build/rules.mk build/config_vars.mk || die
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f5a2c80d866c..60128030416e 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -9,4 +9,5 @@ DIST aws-cli-1.27.24.gh.tar.gz 2319169 BLAKE2B 6677fc6d09298fc37d5aae5e9b4addc87
DIST aws-cli-1.27.25.gh.tar.gz 2319262 BLAKE2B 1207b7879a82c538be9d1ee3dc8a69f20c6334afdd8d35c63ca3d44f264316680aa4d7d01b19a216ca2693748977b83851a2b75f1fd55b85989f2749ab05e827 SHA512 e46f684b219d0bce61ffae0737b2c485a4fb359b7e3ad3ef6180d5378daa49bb049033073594c63f44150266041b4a78634aced1a34fc98f08f0ca8e371558e2
DIST aws-cli-1.27.26.gh.tar.gz 2319897 BLAKE2B 65307b3c63656b751ad3d96ca6ffdb2e9778cdb11cb35c730dc22dad83ee4b0e1cb37afc4d1de7b2c1cbbabd4622610fc2385e7dbc21cfa2c9833a36d693b1ff SHA512 508f8ae1abe037786c3ee35204f4c84fb06bb7bb8471d75217bf914cf7c9aea897cbecb364554f8b39c75001769c894ede7a1b06dd761187aff468f19001708f
DIST aws-cli-1.27.27.gh.tar.gz 2320454 BLAKE2B 5ac7c2b872d23173dd3c1d0c586389b558c43de4bd0c1e0e5e45fee574d3d952aafb5591165fdd9eb2d14435df1342b27526dbd7ec1b7d63c1291e2d4d14bf80 SHA512 f5b9cf61b5045775142ae9868b3fd3193d82b09c4b0d52f05dadd173cc8dbc97699a2df458b17a97a5bc4743e14252fd9e7b6583fc9e49d8f26b96eb2c5d5d08
+DIST aws-cli-1.27.29.gh.tar.gz 2325759 BLAKE2B 693131da782ce248a00560617d3d1cd57e1dcac20ba8a6a560b5a1c06c7f6b18576efd4e0a2151d538e28b3f59593ded609e8fea3d29bce9f91bc270f888e23a SHA512 828a3fdda0b3156c1b09ed53b5c2c6486857bdd1e4e3d5cfd77e817bc6c1e53e1ff3f7ddf83c55e8ca93b2944f37333244adffa0f3b9416b1c4197db9b364dde
DIST aws-cli-1.27.8.gh.tar.gz 2301766 BLAKE2B 1873d92b8d2f6d3f29a65b4177927a1a14034da71dbc95ff6abf3f49df6cf3ee192412eeea15be14c8cf9fca0a5603f2c76b80b280f4feb95e661055abcd8b60 SHA512 e53828cac1b3e10e2ddd45312d71cdb748216dbc37c3e9833e7a1320b236c3bef6a13204a38b946d9182430f169fca1ddc77d3d06c1c2c6e05978dc61f675168
diff --git a/app-admin/awscli/awscli-1.27.16.ebuild b/app-admin/awscli/awscli-1.27.16.ebuild
index d839a50a6326..8edc745e5268 100644
--- a/app-admin/awscli/awscli-1.27.16.ebuild
+++ b/app-admin/awscli/awscli-1.27.16.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv ~x86"
+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-)"
diff --git a/app-admin/awscli/awscli-1.27.29.ebuild b/app-admin/awscli/awscli-1.27.29.ebuild
new file mode 100644
index 000000000000..9bcb01ac11e2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.29.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).z
+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.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+ tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+ )
+
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+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/consul/Manifest b/app-admin/consul/Manifest
index 9a80c0324370..c4b20a63a0f6 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,8 +1 @@
-DIST consul-1.12.5-deps.tar.xz 289550768 BLAKE2B d64d074987dd8abaed5defdfbcab1ffe56b89c52b4912fc098ff0dfc29ae5dda65ce1ae0d83ee23a1d9b4ce22b6a09680575480c65d56d8ad9ad9442afc64e46 SHA512 afec76f7a8769b165c6a3df3faac4e6371017f3c51e0f3cb5e45f2302d2db1b7779c5d857718606edac0799cf13410373643294d466519076dc9dce549a793ae
-DIST consul-1.12.5.tar.gz 25159461 BLAKE2B 4e2bdffd77d032037c6999bee0e2ba4ac6c83daee422097f7cec37c74375419336ec50b19abf9b17db9375a9ee69894ad6577499c137945f7f0557d38d6aa4dc SHA512 df735447dae074ac84dc9dbf5bf2e6d907152d233841137fc4ba632bad19b6db49a60cb79473e6432f76c99ac3c1e287be00416a6553eb3acef8b2fcc4c5dcda
-DIST consul-1.12.6.tar.gz 25112396 BLAKE2B 18b77e909bee012817cd11b784d451929781ac19cecbc3c7804f37d7ad42328df1aa0bbb3b83fd9c311c5f9a60ac710ff166ea9fcb4fe58cb30dff163d793e03 SHA512 755944b0b8e59cdc2e7e86fc5360b447398f27e3d7f91fc278d2f86548ec8cea4af2f12be44d602d96691d2479d6bf8a74e6506cb118c5057181bceae60e92d5
-DIST consul-1.13.3-deps.tar.xz 251812624 BLAKE2B 0ce8fe76298defc83c174d1d02ee25b28ce9253fdd6abafe810ed0e0b63b8f9c82a1b5650508ad746b46f39261b7e3f41395129780d0feed5b61be50c04469ac SHA512 0b7d662a9c48e2509208045194ca5fff477245977d87ba570a0218d4f34a91c4b19a28871eea7104b3918cd54da01b71f5f533e5d93215a7767038977993d6c5
-DIST consul-1.13.3.tar.gz 25380333 BLAKE2B 6dbb8f3e9e3dd6b7e5192a6f050000cfb48a7730e63e474f2d24787608f21781b5f3810400b42f38ad93995d048fe41cc9643ffa3923c297699cc1a8e975a44d SHA512 a978e25f89b7fb9ebc56fd2857493559756981b6e63e57d74b2749af9cce44897b7b5dc136a38d5861296105bedcc591adef972e18edb02efec1952c2f67add9
-DIST consul-1.14.0-vendor.tar.gz 39530717 BLAKE2B 62672e0383353bcccdfcaa25ffd7409b31d8ba650080f315d8a8b68d0be4afa60a12b45ec548be0ecd5a9a703c1888c781a985f1b67fe6128fd82f69a984c42a SHA512 a2ada95b7e890c3f466009a78fdd1dfb0aa46494583811531653230adf0ead98016d22cfdeba45d68e03a6aa7fe711660c17c438c6c9038cbc732021ec011e7a
-DIST consul-1.14.1-vendor.tar.gz 39669654 BLAKE2B bb4fbe3df71354ee46d5a08e532226f2a0cfd8f5eb46b20a9ba5a324e1166a64a9b6cd3e44c5eebbd16c3bd4ff6a72b3afbfe117b7cd1b7fc5b9bf68cf58aa73 SHA512 9bfef09a7df0a0d4230d7e25ba113b985a29532240f235592af480867fb2c803671e2ed6563bbb7f07c64c15a8b1a5b00a9a05151387a01049067a75ffade169
DIST consul-1.14.2-vendor.tar.gz 40549325 BLAKE2B af0135de2b781d69707246a8f7f48fb677d3b9cfff59ee95ae6c37cdbe634bc04c2e853ce3dd2f70bd9a7a1d72438cdcd382939a5e361e152180c7ae1905bf85 SHA512 8e4d160993272a99901b83821b2e29686a53c2700a3e9e2355080eaa15d74f0a0d8f0d8ff86f08a131549cb3e70f77f59da302bb3f6f6b7a367c2ccd6f3ccfd2
diff --git a/app-admin/consul/consul-1.12.5.ebuild b/app-admin/consul/consul-1.12.5.ebuild
deleted file mode 100644
index ae84b874b6af..000000000000
--- a/app-admin/consul/consul-1.12.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="778b5eaa98c8e68d5f9cacdaa0f8e472fff4d3d3"
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
- acct-group/consul
- acct-user/consul"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
- # The dev target sets causes build.sh to set appropriate XC_OS
- # and XC_ARCH, and skips generation of an unused zip file,
- # avoiding a dependency on app-arch/zip.
- GIT_DESCRIBE="v${PV}" \
- GIT_DIRTY="" \
- GIT_COMMIT="${GIT_COMMIT}" \
- emake dev-build
-}
-
-src_install() {
- dobin bin/consul
-
- keepdir /etc/consul.d
- insinto /etc/consul.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/consul
- fowners consul:consul /var/log/consul
-
- newinitd "${FILESDIR}/consul.initd" "${PN}"
- newconfd "${FILESDIR}/consul.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.12.6.ebuild b/app-admin/consul/consul-1.12.6.ebuild
deleted file mode 100644
index 0cf1172ec310..000000000000
--- a/app-admin/consul/consul-1.12.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="950fcb85a7a242ac8512391b81fae20c5b8be962"
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/consul-1.12.5-deps.tar.xz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
- acct-group/consul
- acct-user/consul"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
- # The dev target sets causes build.sh to set appropriate XC_OS
- # and XC_ARCH, and skips generation of an unused zip file,
- # avoiding a dependency on app-arch/zip.
- GIT_DESCRIBE="v${PV}" \
- GIT_DIRTY="" \
- GIT_COMMIT="${GIT_COMMIT}" \
- emake dev-build
-}
-
-src_install() {
- dobin bin/consul
-
- keepdir /etc/consul.d
- insinto /etc/consul.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/consul
- fowners consul:consul /var/log/consul
-
- newinitd "${FILESDIR}/consul.initd" "${PN}"
- newconfd "${FILESDIR}/consul.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.13.3.ebuild b/app-admin/consul/consul-1.13.3.ebuild
deleted file mode 100644
index 7e5166882447..000000000000
--- a/app-admin/consul/consul-1.13.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="b29e5894f2322c9294b1f03c9b264ae2e6ae0eb0"
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
- acct-group/consul
- acct-user/consul"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
- default
- sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-10-19T19:49:59Z|' -i GNUmakefile || die
-}
-
-src_compile() {
- # The dev target sets causes build.sh to set appropriate XC_OS
- # and XC_ARCH, and skips generation of an unused zip file,
- # avoiding a dependency on app-arch/zip.
- GIT_DESCRIBE="v${PV}" \
- GIT_DIRTY="" \
- GIT_COMMIT="${GIT_COMMIT}" \
- emake dev-build
-}
-
-src_install() {
- dobin bin/consul
-
- keepdir /etc/consul.d
- insinto /etc/consul.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/consul
- fowners consul:consul /var/log/consul
-
- newinitd "${FILESDIR}/consul.initd" "${PN}"
- newconfd "${FILESDIR}/consul.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.14.0.ebuild b/app-admin/consul/consul-1.14.0.ebuild
deleted file mode 100644
index fcfd8c276399..000000000000
--- a/app-admin/consul/consul-1.14.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="fdfdddb9e1803d5b2257c99af8c259773ed05b3d"
-
-SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
- acct-group/consul
- acct-user/consul"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
- default
- sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-11-15T16:39:54Z|' -i GNUmakefile || die
-}
-
-src_compile() {
- # The dev target sets causes build.sh to set appropriate XC_OS
- # and XC_ARCH, and skips generation of an unused zip file,
- # avoiding a dependency on app-arch/zip.
- GIT_DESCRIBE="v${PV}" \
- GIT_DIRTY="" \
- GIT_COMMIT="${GIT_COMMIT}" \
- emake dev-build
-}
-
-src_install() {
- dobin bin/consul
-
- keepdir /etc/consul.d
- insinto /etc/consul.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/consul
- fowners consul:consul /var/log/consul
-
- newinitd "${FILESDIR}/consul.initd" "${PN}"
- newconfd "${FILESDIR}/consul.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.14.1.ebuild b/app-admin/consul/consul-1.14.1.ebuild
deleted file mode 100644
index 1bcbba0d09f4..000000000000
--- a/app-admin/consul/consul-1.14.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="cac392a17d3f71048a949599a0f977bf9645df62"
-
-SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
- acct-group/consul
- acct-user/consul"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
- default
- sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-11-21T16:56:07Z|' -i GNUmakefile || die
-}
-
-src_compile() {
- # The dev target sets causes build.sh to set appropriate XC_OS
- # and XC_ARCH, and skips generation of an unused zip file,
- # avoiding a dependency on app-arch/zip.
- GIT_DESCRIBE="v${PV}" \
- GIT_DIRTY="" \
- GIT_COMMIT="${GIT_COMMIT}" \
- emake dev-build
-}
-
-src_install() {
- dobin bin/consul
-
- keepdir /etc/consul.d
- insinto /etc/consul.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/consul
- fowners consul:consul /var/log/consul
-
- newinitd "${FILESDIR}/consul.initd" "${PN}"
- newconfd "${FILESDIR}/consul.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.14.2.ebuild b/app-admin/consul/consul-1.14.2.ebuild
index 6033d7f63dfa..c78ede7b6e9e 100644
--- a/app-admin/consul/consul-1.14.2.ebuild
+++ b/app-admin/consul/consul-1.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-
LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
RESTRICT+=" test"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~x86"
BDEPEND="dev-go/gox"
COMMON_DEPEND="
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 937500fc77bd..f458805e36e4 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,2 +1,2 @@
-DIST lnav-0.10.1.tar.gz 5707151 BLAKE2B ae82b705830c6ea38e2fa4f3832a2fd1d8ce8b5ef00d6a3fe750e4f5e7080ae29fde845f2c5055e2684aad1959368ff90abdc130130f8d6f0152426487e7396c SHA512 fff9632c1acbef80ba9d4214fd3ef485727792353fe493cfa4f2e9412bb371f50f2e1a735ded3d7bd8b16df5e93e03b0f3def296770e7dd0ad2206fd9f94690d
DIST lnav-0.11.0.tar.gz 9586979 BLAKE2B fa333d2dbc3c2a5cb8b96ea4cbf84412be117b9d9ec999bab784e7aefab25cd01edcb65617468b8a1fbc46d554cf20a02bc901c9d75f2c5831359da37a19fd22 SHA512 f10938aacb1e170a6912090c5de8e85e9aae5bc456e57b49192a21020e7dfa20414d1f5b66fd25b3c1ea5a3d1fd3bd92af6fe7e0c6b73953688c3d861266fd97
+DIST lnav-0.11.1.tar.gz 10268167 BLAKE2B d490c6798685e80021437e1771742dee59c3b5109a43591581f4ddc15528c5b616ab915418fa78b7cf13a82bce582baf0516b5b2339f5fa32054359c21908852 SHA512 6c7d2b603ee04bb2cee16bf28b0161ebe7bf3ec838bed765f9852f79ee1ff8a56691dcaa66998e0ef58f16f16274bf93c7f2eb8f2e58264faf284bcfd25818ef
diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
deleted file mode 100644
index c7a49d45f1d7..000000000000
--- a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Certain tests commented out for stability reasons:
-# listview: Fails when building inside sandbox
-# mvattrline: Fails on some testers boxes. Documented here: https://github.com/tstack/lnav/issues/911
-# logfile: Flaky. Fails some times and not others. i.e. Race condition
-# tui: Can hang the build
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -355,14 +355,14 @@
- test_cli.sh \
- test_cmds.sh \
- test_config.sh \
-- test_listview.sh \
-+ #test_listview.sh \
- test_meta.sh \
-- test_mvwattrline.sh \
-+ #test_mvwattrline.sh \
- test_grep_proc.sh \
- test_grep_proc2 \
- test_json_format.sh \
- test_log_accel \
-- test_logfile.sh \
-+ #test_logfile.sh \
- test_reltime \
- test_remote.sh \
- test_scripts.sh \
-@@ -376,7 +376,7 @@
- test_sql_str_func.sh \
- test_sql_time_func.sh \
- test_sql_xml_func.sh \
-- test_tui.sh \
-+ #test_tui.sh \
- test_data_parser.sh \
- test_pretty_print.sh \
- test_view_colors.sh \
diff --git a/app-admin/lnav/files/lnav-0.10.1-gcc12.patch b/app-admin/lnav/files/lnav-0.10.1-gcc12.patch
deleted file mode 100644
index 6ed4a73cebb2..000000000000
--- a/app-admin/lnav/files/lnav-0.10.1-gcc12.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/839909
-https://github.com/tstack/lnav/pull/961
-
-From b8a31ae9b4bcd5690a2b3d2fbd6373caffbc4a57 Mon Sep 17 00:00:00 2001
-From: Peter Schiffer <3899107+pschiffe@users.noreply.github.com>
-Date: Mon, 21 Feb 2022 21:09:30 +0100
-Subject: [PATCH] Add `#include ` to `string_util.cc`
-
-Lnav fails to build on the next Fedora version due to the following error:
-```
-make[3]: Entering directory '/builddir/build/BUILD/lnav-0.10.1/src/base'
-g++ -std=c++14 -DHAVE_CONFIG_H -I. -I../../src -Wall -I../../src/ -I../../src/third-party -I../../src/fmtlib -I../../src/third-party/doctest-root -I/usr/local/include -D_ISOC99_SOURCE -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o string_util.o string_util.cc
-make[3]: Leaving directory '/builddir/build/BUILD/lnav-0.10.1/src/base'
-string_util.cc: In function 'std::string repeat(const std::string&, size_t)':
-string_util.cc:199:22: error: 'ostream_iterator' is not a member of 'std'
- 199 | std::fill_n(std::ostream_iterator(os), num, input);
- | ^~~~~~~~~~~~~~~~
-string_util.cc:38:1: note: 'std::ostream_iterator' is defined in header ''; did you forget to '#include '?
- 37 | #include "string_util.hh"
- +++ |+#include
- 38 |
-```
-
-Reason is probably the updated GNU toolchain, more info:
-https://fedoraproject.org/wiki/Changes/GNUToolchainF36
-
-This patch fixes the issue.
---- a/src/base/string_util.cc
-+++ b/src/base/string_util.cc
-@@ -29,6 +29,7 @@
-
- #include "config.h"
-
-+#include
- #include
- #include
-
diff --git a/app-admin/lnav/lnav-0.10.1.ebuild b/app-admin/lnav/lnav-0.11.1-r1.ebuild
similarity index 53%
rename from app-admin/lnav/lnav-0.10.1.ebuild
rename to app-admin/lnav/lnav-0.11.1-r1.ebuild
index efa86cff1cf6..dce0dbdd165c 100644
--- a/app-admin/lnav/lnav-0.10.1.ebuild
+++ b/app-admin/lnav/lnav-0.11.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools
+inherit autotools flag-o-matic
DESCRIPTION="A curses-based tool for viewing and analyzing log files"
HOMEPAGE="https://lnav.org"
@@ -11,41 +11,44 @@ SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="unicode test"
+KEYWORDS="~amd64 ~x86"
+IUSE="pcap test"
RESTRICT="!test? ( test )"
RDEPEND="
app-arch/bzip2:0=
app-arch/libarchive:=
>=dev-db/sqlite-3.9.0
- dev-libs/libpcre[cxx]
+ dev-libs/libpcre2
>=net-misc/curl-7.23.0
- sys-libs/ncurses:=[unicode(+)?]
- sys-libs/readline:0=
- sys-libs/zlib:0="
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ sys-libs/zlib:=
+ pcap? ( net-analyzer/wireshark[tshark] )"
+# The tests use ssh-keygen and use dsa and rsa keys (which is why ssl is required)
DEPEND="${RDEPEND}
- test? ( dev-cpp/doctest )"
+ test? (
+ net-misc/openssh[ssl]
+ dev-cpp/doctest
+ )"
-DOCS=( AUTHORS NEWS README )
+DOCS=( AUTHORS NEWS.md README )
PATCHES=(
- "${FILESDIR}"/${PN}-0.10.0-disable-tests.patch
- "${FILESDIR}"/${PN}-0.10.1-gcc12.patch
+ "${FILESDIR}"/${PN}-0.11.0-disable-tests.patch
)
src_prepare() {
default
eautoreconf
-
- # These tests use network and expect a running sshd, so we'll just delete them.
- echo "#! /bin/bash" > test/test_remote.sh || die
}
src_configure() {
+ filter-lto
+
econf \
--disable-static \
- $(use_with test system-doctest) \
- $(use_with unicode ncursesw)
+ --with-ncurses \
+ $(use_with test system-doctest)
}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 2d6b9a160eae..8c9bb675f204 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,3 +1,5 @@
DIST logrotate-3.19.0.tar.xz 166276 BLAKE2B bb19690ca092905e527f6a0a7915373a65b29d3b50d97456ed31aa9b5b5698b3ae266c8e247a167198dcd8891a7e330f4913dfefa3563e5b2de7a6e0d067a6c3 SHA512 7838e14a5b147f6e5edf6efdf743deeca39fdb563fc6f14aa010ac5b7bdef9c2bb8005415481d1b042b31975052d5ed6e75c4bcd7e378003427ebe5ec02a1f2c
DIST logrotate-3.20.1.tar.xz 166712 BLAKE2B 8481e0d746c6bcbe10f2686a921334c6f957c8d92520927de7bc8fb0b7631a444fedaa80f35bc2de7961b3d5833ce4ab885b1298b235b7f8b33cc3ae05438da6 SHA512 a9ed5796ab254f511d0029a8f29ef7557f62e12e3ea9af24e30b5b9f348b1c1a16df26d44314b78299916fb3b5000b9cd9eed7cee2cee8df11cfd8e40c79b092
DIST logrotate-3.20.1.tar.xz.asc 833 BLAKE2B afc02177335bcd580e0617af8c50846b371c2d00ecd8fe329c2e298dc8c48823137625f455cea3d983a0d9971733297fa2c4d98ba3c6f72d2c07f8f21108cfe4 SHA512 2dd207feec431b223ff12f09f6cce14409d45e5bb3abaf2275dd773c7ee7c59ed7d32395e5869bfed70c970be4158fd299e6e269838378843dcb63ca5ebfa029
+DIST logrotate-3.21.0.tar.xz 168532 BLAKE2B f7fa0050bde51e2517eac8456ecf87648bc8423621830894ceb2a3ff6b9dfe32c5b53df6a4ee59aa91bd563ed94376a635159535f4fdc170fbc673354bcef508 SHA512 c576df7d2bc1a1db2f99befdd0ea627aef2d97bdcd4a7cdea76870623ba92fb1f04f1af6d15b75e4a9085f4aef2ae5e9843c4094cdd01e24d89872ccaf9c0d4a
+DIST logrotate-3.21.0.tar.xz.asc 833 BLAKE2B b2099a0b8c15d1ea7f7325884027dff08dcc8305113411448797b8089d17026242a3f10bd6d7f3d865e3e339ec6fb5faf4ff48f8fd65bca3af4da8b335c3b5f1 SHA512 8f4c1853cd84f85c796b72b43048f4cf04e3409703e7669ee91e1d1aa5e9e5c04261fac1cdf85ec303508d5b6dbf126a44eb9ec819bcc772c664830d39e1068c
diff --git a/app-admin/logrotate/logrotate-3.21.0.ebuild b/app-admin/logrotate/logrotate-3.21.0.ebuild
new file mode 100644
index 000000000000..fed4e129a527
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.21.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/kamildudka.asc
+inherit systemd tmpfiles verify-sig
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl +cron selinux"
+
+DEPEND="
+ >=dev-libs/popt-1.5
+ selinux? ( sys-libs/libselinux )
+ acl? ( virtual/acl )
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-logrotate )
+ cron? ( virtual/cron )
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-kamildudka )"
+
+STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status"
+OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.15.0-ignore-hidden.patch
+)
+
+move_old_state_file() {
+ elog "logrotate state file is now located at ${STATEFILE}"
+ elog "See bug #357275"
+ if [[ -e "${OLDSTATEFILE}" ]] ; then
+ elog "Moving your current state file to new location: ${STATEFILE}"
+ mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
+ fi
+}
+
+install_cron_file() {
+ exeinto /etc/cron.daily
+ newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+src_prepare() {
+ default
+
+ sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+ econf \
+ $(use_with acl) \
+ $(use_with selinux) \
+ --with-state-file-path="${STATEFILE}"
+}
+
+src_install() {
+ dobin logrotate
+ doman logrotate.8
+ dodoc ChangeLog.md
+
+ insinto /etc
+ doins "${FILESDIR}"/logrotate.conf
+
+ use cron && install_cron_file
+
+ systemd_dounit examples/logrotate.{service,timer}
+ newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+ keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+ elog
+ elog "The ${PN} binary is now installed under /usr/bin. Please"
+ elog "update your links"
+ elog
+
+ move_old_state_file
+
+ tmpfiles_process ${PN}.conf
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you wish to have logrotate e-mail you updates, please"
+ elog "emerge virtual/mailx and configure logrotate in"
+ elog "/etc/logrotate.conf appropriately"
+ elog
+ elog "Additionally, /etc/logrotate.conf may need to be modified"
+ elog "for your particular needs. See man logrotate for details."
+ fi
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index f8dc6d3db9d2..e6f449c6b091 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,5 +1,3 @@
-DIST puppet-agent_7.19.0-1focal_amd64.deb 33779898 BLAKE2B 40ced6309bc82a2a917572b35d2e6271f53c1b56721cf5d389b7a297774c08fb430915880279a11c1b4d803582793340127b21283202b527e2ecf826176c314d SHA512 2d8658a0f1b684ae07b2a8a87e130d210283bdc78b1a10750605e970cc9a2310967c85bc054c9e018d38fbc955708d6ebdb205b5562df6ea475386be9ea02581
-DIST puppet-agent_7.19.0-1focal_arm64.deb 33570768 BLAKE2B 21f7c6c8a42a14156f209313f0dce40336a53fdb097abe620edcb92b2cceaa20e08adec8fc22241886eac3ad0a7ba94d805dc1e2d9bbd37853ff037a49f004fd SHA512 306236a7543f01b3fb95edbe3b442717a64aeb22d696c9961a770e9da40b2bb58835c6d9488b03109b81f8b748106189c361d5f047e9202700e0801486d18206
DIST puppet-agent_7.20.0-1focal_amd64.deb 33766302 BLAKE2B 665f4d4d8c3b096ec5f270428d0b865dc10b77c51113f65f9e66ab6bb72c3b21a07acd9433f2cc1e4e05c0fb30a11884f0bfe7a5a8a9a1d882bdd049a5490b84 SHA512 91b7eef80bc5e288f8a59a52d41340d1bc921e0754151952a3921575787e4cec1f101039c75a01ca6e7e4a5512224922be0c5be7a676d92bb19d3de291a7ab8c
DIST puppet-agent_7.20.0-1focal_arm64.deb 33547934 BLAKE2B 323d76ac12af0c97cf38b8a78454be89c900eebcc9b1517c716700badf8845c062d2c4eb2f633ed1b6ffc36cb42e7e16a3e4e815637e92c209bc6f3c40cfd525 SHA512 a04727c71cf241e352d14bcc09eb340199a7e42b18be574d822a793ff9d91ff1e1879d67724dbf2133a6a3842fa86ed45b048845c73a5669fab45dacea3e616a
DIST puppet-agent_7.21.0-1focal_amd64.deb 32897404 BLAKE2B 5075c0c77ae2199a3743edcc7fda94802f7b845b37084a613547705a3dc403259908698036bad95e36d7ba18c8b165971d98b81b64e56e6b40f3360e00c4fc5b SHA512 cad621b9add8c7397c681684696b78d57c149b174a43830c3c45ea1679aba791005b634a64b48b3a9d276fb00d7e1ca8e2a73f6a02756d020914f507a35dc56a
diff --git a/app-admin/puppet-agent/puppet-agent-7.19.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.19.0.ebuild
deleted file mode 100644
index 0776db0b3b8b..000000000000
--- a/app-admin/puppet-agent/puppet-agent-7.19.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd unpacker tmpfiles
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
-arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-# virtual/libcrypt:= is in here despite being a pre-built package
-# to ensure that the has_version logic for the symlink doesn't become stale
-CDEPEND="!app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- app-emulation/virt-what
- acct-user/puppet
- acct-group/puppet
- virtual/libcrypt:="
-
-DEPEND="
- ${CDEPEND}
- app-admin/augeas"
-RDEPEND="${CDEPEND}
- app-portage/eix
- sys-apps/dmidecode
- sys-libs/libselinux
- sys-libs/glibc
- sys-libs/readline:0/8
- sys-libs/libxcrypt[compat]
- sys-libs/ncurses:0[tinfo]
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/pxp-agent
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/pxp-agent
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- keepdir var/log/puppetlabs/puppet/
- chmod 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- dodir opt/puppetlabs/puppet/cache
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd2" puppet
- systemd_dounit lib/systemd/system/puppet.service
- systemd_dounit lib/systemd/system/pxp-agent.service
- newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
- dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-
- # Handling of the path to the crypt library during the ongoing migration
- # from glibc[crypt] to libxcrypt
- # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
- if has_version "sys-libs/glibc[crypt]"; then
- local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
- else
- local crypt_target='../../../../usr/lib/libcrypt.so.1'
- fi
- dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
-
-pkg_postinst() {
- tmpfiles_process puppet-agent.conf
-}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 4b5446af3f98..a28b469a3fa4 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,4 +1,3 @@
DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
-DIST puppet-7.19.0.tar.gz 2817098 BLAKE2B d2d756aa236461963ac260167f9500693ea94f1b2ce7b6f881c55712f78668ce5935528a74d3a77e5b02123aeb4404c1bbfc91237622dcb68e686e920302acb9 SHA512 952ae1e77e9d9aaa0a0a731f408550fd3bf483dda9bbb12845e534e6208321db774325da8621f36535d7601bd7b8611098e486ef733428b7108f613f5dade4e0
DIST puppet-7.20.0.tar.gz 2817232 BLAKE2B 479c4e162230371bd69509844fcd97d0d3392eb2e66578b38e6dc120dd3dd15804d73f70c1b29f1f3d9e57af539f82e605a86c9afff15e78ff48ddf482432c4d SHA512 6774bf03ad0ee80c0fd2cd8ebad60da56df7ed9818a526084fc2cf1ba2fecc81555fff200f5feef2b5d7a2275d90f44b24160de7221d682de470b511a7051f7f
DIST puppet-7.21.0.tar.gz 2819997 BLAKE2B 96de8ceefeea12c51288e05af5d7b126811d23388492053b0d581856f11976f0492064eb89bc585ff7f455df537d5c04fb318814945a158d531d32efdd54ff02 SHA512 b0fbdf63391054d0496c67be963f98e3d85e3a1536e50d6a3f09d0c49110bb4c92bebdc38a48cd50e824e27268150cda0643c6df0edb01b3587f00a591645ee6
diff --git a/app-admin/puppet/puppet-7.19.0.ebuild b/app-admin/puppet/puppet-7.19.0.ebuild
deleted file mode 100644
index b0c6d6d3ffe3..000000000000
--- a/app-admin/puppet/puppet-7.19.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit ruby-fakegem systemd tmpfiles
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
- dev-ruby/hiera
- dev-ruby/json:=
- dev-ruby/semantic_puppet
- >=dev-ruby/facter-3.0.0
- dev-ruby/concurrent-ruby
- augeas? ( dev-ruby/ruby-augeas )
- diff? ( dev-ruby/diff-lcs )
- doc? ( dev-ruby/rdoc )
- ldap? ( dev-ruby/ruby-ldap )
- shadow? ( dev-ruby/ruby-shadow )
- sqlite? ( dev-ruby/sqlite3 )
- virtual/ruby-ssl
- dev-ruby/hocon"
-
-ruby_add_bdepend "
- doc? ( dev-ruby/yard )
- test? (
- dev-ruby/mocha
- dev-ruby/rack
- dev-ruby/rspec-its
- )"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-# dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
- >=app-portage/eix-0.18.0
- acct-user/puppet
- acct-group/puppet"
-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() {
- each_fakegem_install
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- # systemd stuffs
- systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
- # tmpfiles stuff
- newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
- # openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
- keepdir /etc/puppetlabs/puppet/ssl
-
- keepdir /var/lib/puppet/facts
- keepdir /var/lib/puppet/files
- fowners -R puppet:puppet /var/lib/puppet
-
- fperms 0750 /var/lib/puppet
-
- fperms 0750 /etc/puppetlabs
- fperms 0750 /etc/puppetlabs/puppet
- fperms 0750 /etc/puppetlabs/puppet/ssl
- fowners -R :puppet /etc/puppetlabs
- fowners -R :puppet /var/lib/puppet
-
- # ext and examples files
- for f in $(find ext examples -type f) ; do
- docinto "$(dirname ${f})"
- dodoc "${f}"
- done
-}
-
-pkg_postinst() {
- tmpfiles_process puppet.conf
-
- elog
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
- elog "cause puppet to hang while installing packages."
- elog
- elog "Portage Puppet module with Gentoo-specific resources:"
- elog "http://forge.puppetlabs.com/gentoo/portage"
- elog
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
- elog "not already done so."
- elog
-}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index f88c7edcbe78..7bbd44cd9e1a 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,3 +1,2 @@
-DIST puppetserver-7.9.1.tar.gz 66383400 BLAKE2B 1804191a5453ebe55c5744687cce2f6d062e397be7b29a44d2749d0880ea20995ddbd9efdc9ddcde17021c011ff5b665f3e215e49143424f7fe470d915c3b6d1 SHA512 2b8e43220480cad0d1140fdc08491bf7296b72c2eb228da56d5b569f6b39dad1c3968af1942d3a1d1b34a57d994aaa2b91edff20f1d54905477a77f3062b580c
DIST puppetserver-7.9.2.tar.gz 59729859 BLAKE2B 15f9261ae81f280735080a75e083b4bbc5d4b9404bd52f02180173b6cab2ebfe20e38950dd6c94c5167478293056ac562994ff27a7ad955c69621c13ffa808e1 SHA512 0c047554e10ecf36d000c9f702b759e27b8168f1f2207d9b8e904c9579d8e37d8540327d898b0a9e1812ca3223aa15b7cf4da46d7a4247e5d4b8f1596f9d5f26
DIST puppetserver-7.9.3.tar.gz 59951239 BLAKE2B 818eee0e7bd115e0b335b1e13d7b0016933190e95a3bf71ad2498f87097de4251a1e6e2f9dfb933a1ee49c981ae0adf74f9994ec0e36a4b77aad567ab00e1fdd SHA512 d2ce573bf15c0db7cb7a9fd0a35a8286acc77ca9b2eddfe0f2dd8549034793600c04973d9f8a72ab543282325f18795727e05a723b3a3b67b027b382ded3d3eb
diff --git a/app-admin/puppetserver/puppetserver-7.9.1.ebuild b/app-admin/puppetserver/puppetserver-7.9.1.ebuild
deleted file mode 100644
index 7323a3ecf896..000000000000
--- a/app-admin/puppetserver/puppetserver-7.9.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents"
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="amd64"
-
-RDEPEND+="
- >=virtual/jdk-1.8.0
- app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
- acct-group/puppet"
-
-src_prepare() {
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
- sed -i 's/var\/run/run/g' install.sh || die
- default
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- insinto /opt/puppetlabs/server/apps/puppetserver
- insopts -m0774
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppet-server-release.jar
- insinto /etc/puppetlabs/puppetserver
- doins ext/config/logback.xml
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetserver/services.d
- doins ext/system-config/services.d/bootstrap.cfg
- doins ext/config/services.d/ca.cfg
- insinto /etc/puppetlabs/puppetserver/conf.d
- doins ext/config/conf.d/puppetserver.conf
- doins ext/config/conf.d/auth.conf
- doins ext/config/conf.d/global.conf
- doins ext/config/conf.d/web-routes.conf
- doins ext/config/conf.d/metrics.conf
- doins ext/config/conf.d/webserver.conf
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
- doins ext/cli/ca
- doins ext/cli/irb
- doins ext/cli/foreground
- doins ext/cli/gem
- doins ext/cli/ruby
- doins ext/cli/reload
- doins ext/cli/start
- doins ext/cli/stop
- insinto /opt/puppetlabs/server/apps/puppetserver/cli
- doins ext/cli_defaults/cli-defaults.sh
- insinto /opt/puppetlabs/server/apps/puppetserver/bin
- doins ext/bin/puppetserver
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
- # other sys stuff
- dodir /etc/puppetlabs/code
- # needed for systemd
- keepdir /var/log/puppetlabs/puppetserver
- dodir /etc/puppetlabs/puppet/ssl
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
- fperms -R 771 /etc/puppetlabs/puppet/ssl
- # systemd type things
- insinto /etc/systemd/system/puppetserver.service.d/
- systemd_dounit ext/redhat/puppetserver.service
- insinto /etc/default
- newins ext/default puppetserver
- # normal init type tasks
- dosym ../default/puppetserver /etc/conf.d/puppetserver
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetserver.logrotate.conf puppetserver
- # cleanup
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
- fowners -R puppet:puppet /opt/puppetlabs/server/data
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver
- fperms -R 700 /var/log/puppetlabs/puppetserver
- insinto /opt/puppetlabs/server/data
- doins ext/build-scripts/jruby-gem-list.txt
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt
- newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
- tmpfiles_process puppetserver.conf
-
- elog "to install you may want to run the following:"
- elog
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
- elog "puppet config set --section master codedir /etc/puppetlabs/code"
- elog
- elog "# install puppetserver gems"
- elog "cd /opt/puppetlabs/server/apps/puppetserver"
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
- elog "while read LINE; do"
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
- elog "while read LINE; do"
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
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
new file mode 100644
index 000000000000..4ef379f0021f
--- /dev/null
+++ b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
@@ -0,0 +1,46 @@
+From 2b0a0fcde875a89e2beffbe5c43c7518f682b482 Mon Sep 17 00:00:00 2001
+From: Christophe Grenier
+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 89a6073cc7db..adbd9697dcd6 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -14,4 +14,7 @@
Include reiserfs reading ability
Include ewf library
+
+ cgsecurity/testdisk
+
diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
new file mode 100644
index 000000000000..a891080e0dcc
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.1-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg-utils
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="ewf jpeg ntfs gui reiserfs static zlib"
+
+REQUIRED_USE="static? ( !gui )"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+DEPEND="
+ static? (
+ sys-apps/util-linux[static-libs]
+ sys-fs/e2fsprogs[static-libs]
+ sys-libs/ncurses:0[static-libs]
+ jpeg? ( media-libs/libjpeg-turbo:=[static-libs] )
+ ntfs? ( sys-fs/ntfs3g[static-libs] )
+ reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+ zlib? ( sys-libs/zlib[static-libs] )
+ !arm? ( ewf? ( app-forensics/libewf[static-libs] ) )
+ )
+ !static? (
+ sys-apps/util-linux
+ sys-fs/e2fsprogs
+ sys-libs/ncurses:0=
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ ntfs? ( sys-fs/ntfs3g:= )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+ zlib? ( sys-libs/zlib )
+ !arm? ( ewf? ( app-forensics/libewf:= ) )
+ )
+"
+RDEPEND="!static? ( ${DEPEND} )"
+BDEPEND="gui? ( dev-qt/linguist-tools:5 )"
+
+DOCS=()
+
+PATCHES=(
+ "${FILESDIR}"/${P}-backport-ntfs-3g-ioctl-prototype.patch
+)
+
+src_configure() {
+ export MOC="$(qt5_get_bindir)/moc"
+ export PATH="$(qt5_get_bindir):${PATH}"
+
+ local myconf=(
+ --enable-sudo
+ --without-ntfs
+ $(use_with ewf)
+ $(use_with jpeg)
+ $(use_with ntfs ntfs3g)
+ $(use_enable gui qt)
+ $(use_with reiserfs)
+ $(use_with zlib)
+ )
+
+ # this static method is the same used by upstream for their 'static' make
+ # target, but better, as it doesn't break.
+ use static && append-ldflags -static
+
+ econf "${myconf[@]}"
+
+ # perform safety checks for NTFS, REISERFS and JPEG
+ if use ntfs && ! grep -E -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+ die "Failed to find either NTFS or NTFS-3G library."
+ fi
+ if use reiserfs && grep -E -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+ die "Failed to find reiserfs library."
+ fi
+ if use jpeg && grep -E -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+ die "Failed to find jpeg library."
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index b9d8c90ebf94..6ab2aeae99a6 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/bzip3/bzip3-1.2.1.ebuild b/app-arch/bzip3/bzip3-1.2.1.ebuild
index 0d9329da48ca..4bbe2c3cdb5b 100644
--- a/app-arch/bzip3/bzip3-1.2.1.ebuild
+++ b/app-arch/bzip3/bzip3-1.2.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
else
SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+ KEYWORDS="amd64 arm64 ~loong ~x86"
fi
LICENSE="LGPL-3+"
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index ea9fc7d2fea6..111e1ec2fd9e 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,8 @@
+DIST xz-5.2.10.tar.gz 2123206 BLAKE2B fdd9e77e21ee65482401e0e43e0b291093a227d452991a9182562989b7a4388ceed30d5d54cd7f86320dcc073eb792032a49741880338a29043a8380507c4215 SHA512 c3814680fcad421efa71cf977217a62c34e3223900302a6fd7d505f310a7b338815feee2c8225b1232bd22b9e29c7dda3664e54dae2d80f816daec6adf560ca1
+DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733 SHA512 48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
DIST xz-5.2.8.tar.gz 2118089 BLAKE2B 28d4ede071ebd04fe6ce6b9ba88245aca432c7b3077a4857a14310001cbd1230026888d1813b5c163b86de3ec78c92418d9cb35f867f1a8ea65e5de593091676 SHA512 aaba9e4dfabc1ccb66b92f5930ca07219089c7c02396be80bd727073f90c824d2698f7aaaf156b881fdc6750da993e8a6289929d71225df8327bc3beed5cdee1
DIST xz-5.2.8.tar.gz.sig 566 BLAKE2B c3f20d6fabd42839c0265b9c5a308b43392705f4923f83e9aba808d5d2b03814b1af566c1ff078dc0a69143420a47e5ee0a0f8dcc6773595d1ee2a8e3922a88a SHA512 253c0877357cd7305f4c852cc2b946b196a4007b48b58824446729f8f2390f6465d6d2bb9087d1147a40a707940142a5eb7ada91f0323b95482b92eff05904f2
DIST xz-5.2.9.tar.gz 2122988 BLAKE2B 20e8552302ef73469edaf7dbdc8ca1df8df9ddd5e4b7399509f3f9204f7d19559db7b9a5da2185cb1b379b4d22a4773b68b81a0a2acc71230cf056a9b017ef92 SHA512 4e13c76d7d24deeb5def85f74f08f6ee7fea1873f61bfaa6b2e8771f5a1eb42587c9fca45b3a9cbbffe0d9550f6a7be4971fcb9096f03998f642daf14d33b0ec
DIST xz-5.2.9.tar.gz.sig 566 BLAKE2B 0f5807e2c963aaba2a65495cbe49c80047f022c0ac0f2d1b001e1c4d434605499148e01855e586595d4b0db99cd9c81f72bef8dadf5c9a61ba4f6f5d7da85d9d SHA512 871f71cf4e3ed77249fb8279301a77bd2ca174647cc4d0fe034bda349d5c52438f1aafe04294a1c260ad93d9ecda16ee8aece1655de79a898536b2a6e2a65ba8
-DIST xz-5.3.5beta.tar.gz 2244769 BLAKE2B e8037838e26f75f03070a27806b8ae3e25ae1d65f199e323148c02864fcd5d820a3a89b18b264cab6e4a03885211adddaa5221ab42150554cff262dbd2bde2c8 SHA512 fb3890100b8390162a87f2b415bd78e8e434e5417853fa76c71f40eee98c1f7a27eaa8486ecff19751abbe3761cb7ee5e9333b63eafe1c66d6265143a8404efb
-DIST xz-5.3.5beta.tar.gz.sig 566 BLAKE2B 151067af9bb21ab763c5ab8e299b623b9f18267280cb8fa653703691b98c19cec457b68a9987d5df931bf5fbc190c021d0bbd30840422e0c2b2d5876a5bb1812 SHA512 723457b736f6cb27c9a15234dd17dd290b4734007eed63afe6befe412219dd7cf304601ef2a328087f77a51212ab9560202fc04cf880e4c1ce84884210c78dc6
+DIST xz-5.4.0.tar.gz 2332619 BLAKE2B 7bcf2e48470b885ae48b1fd0d46ab504961e7c5b1358d8c57a6fe1ba32311f5ca837740cff7ba77767f0a25ef80ec68c3d43029f87af035131526cb71f961d0f SHA512 29b2cd25bb5b234b329ffe9547692d2c29be393db9d8d4ce70a66dfdaebd54433e79a89d80c57e58cd4559c3c68b9845507d5fedf3eec1c528a81e3d9ddbd811
+DIST xz-5.4.0.tar.gz.sig 566 BLAKE2B 6f8a6c81c0d91cea08b218e8f8ed74cea3b471a0adb0b5aac114f85d103977052b735ce5582e4fe5354dde17a7072d776f2fd64844531c3f67e60c770ccdc10e SHA512 9bebc2ad25ff63036e6cb07e9ea6767441138fd91ef59e6f068c370296a594135479477a18f086dbf06b7dda5188fa0da09c24a6b7b3e7222e4bca70104d20d2
diff --git a/app-arch/xz-utils/xz-utils-5.2.10.ebuild b/app-arch/xz-utils/xz-utils-5.2.10.ebuild
new file mode 100644
index 000000000000..fb35eaff7363
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.10.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+# to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+ inherit git-r3 autotools
+
+ # bug #272880 and bug #286068
+ BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+ inherit verify-sig
+
+ MY_P="${PN/-utils}-${PV/_}"
+ SRC_URI="
+ mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+ https://tukaani.org/xz/${MY_P}.tar.gz
+ verify-sig? (
+ https://tukaani.org/xz/${MY_P}.tar.gz.sig
+ )
+ "
+
+ if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ fi
+
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="+extra-filters nls static-libs"
+
+if [[ ${PV} != 9999 ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+fi
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == 9999 ]] ; then
+ eautopoint
+ eautoreconf
+ else
+ # Allow building shared libs on Solaris/x64
+ elibtoolize
+ fi
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --enable-threads
+ $(use_enable nls)
+ $(use_enable static-libs static)
+ )
+
+ if ! multilib_is_native_abi ; then
+ myconf+=(
+ --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
+ )
+ fi
+
+ if ! use extra-filters ; then
+ myconf+=(
+ # LZMA1 + LZMA2 for standard .lzma & .xz files
+ --enable-encoders=lzma1,lzma2
+ --enable-decoders=lzma1,lzma2
+
+ # those are used by default, depending on preset
+ --enable-match-finders=hc3,hc4,bt4
+
+ # CRC64 is used by default, though some (old?) files use CRC32
+ --enable-checks=crc32,crc64
+ )
+ fi
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ export gl_cv_posix_shell="${EPREFIX}"/bin/sh
+
+ # Undo Solaris-based defaults pointing to /usr/xpg5/bin
+ myconf+=( --disable-path-for-script )
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ default
+
+ gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name '*.la' -delete || die
+ rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+ preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+ preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/xz-utils/xz-utils-5.2.9.ebuild b/app-arch/xz-utils/xz-utils-5.2.9.ebuild
index 047765ed1ee5..fb35eaff7363 100644
--- a/app-arch/xz-utils/xz-utils-5.2.9.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.9.ebuild
@@ -28,7 +28,7 @@ else
"
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
S="${WORKDIR}/${MY_P}"
diff --git a/app-arch/xz-utils/xz-utils-5.3.5_beta.ebuild b/app-arch/xz-utils/xz-utils-5.4.0.ebuild
similarity index 100%
rename from app-arch/xz-utils/xz-utils-5.3.5_beta.ebuild
rename to app-arch/xz-utils/xz-utils-5.4.0.ebuild
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index e63fdc587a8d..9c3162618264 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bareos/bareos-21.1.5-r1.ebuild b/app-backup/bareos/bareos-21.1.5-r1.ebuild
index 1652a021f7bc..724051b6d17d 100644
--- a/app-backup/bareos/bareos-21.1.5-r1.ebuild
+++ b/app-backup/bareos/bareos-21.1.5-r1.ebuild
@@ -360,7 +360,10 @@ src_install() {
keepdir /var/lib/bareos
keepdir /var/lib/bareos/storage
- diropts -m0755 -o bareos -g bareos
+ # set log directory ownership
+ if ! use clientonly; then
+ diropts -m0755 -o bareos -g bareos
+ fi
keepdir /var/log/bareos
newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
index 74fcd0331c3a..212e403a0114 100644
--- a/app-backup/bareos/metadata.xml
+++ b/app-backup/bareos/metadata.xml
@@ -6,13 +6,13 @@
Marc Schiffbauer