diff --git a/Manifest.files.gz b/Manifest.files.gz
index 504f7618a1f5..8c0439b952a7 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4d8be358db31..fd75f89fe05e 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 12b862e0e628..bcd145afad2f 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,4 +2,5 @@ DIST awscli-1.22.14.tar.gz 2120655 BLAKE2B ffba1bea0574830e6eb3e343b5d83a308e19b
DIST awscli-1.22.23.tar.gz 2128226 BLAKE2B b572d21d2ba226871fd84eb33d44e65c3f5c074a75bbfc0b35101bb6861b29262a1b9f0349f5c6663fd101dbfb648767f2baaae3a50220a1d2559dbb0b9b2626 SHA512 884de216931e812bf432c9f80967841db6da4cdb67f0dd25848225a08af770041d7a9e59b982615c53064f689dddbd96b5041e10adefa7cf3a18baa5fbbb7b4f
DIST awscli-1.22.24.tar.gz 2128390 BLAKE2B 6b23a629a66e6f962b953fdc89ab1e81530806ba6120ae92022c8227e61f31aba53cea880d94b26d81ee4a7b62c57b39e45fdbd3e5ce1b9a929111ecc4b759b6 SHA512 846b5c0aa4121cd5975cadfa6a3800118b2fa3616d80dde7676043aa57142ae092debb1eb35f159db580104a03b20e2e02f57d73d7bad9f17f9931dab5b51435
DIST awscli-1.22.25.tar.gz 2130417 BLAKE2B 1c150feb135d662cbae1e51cd0cd41744472d8a33ff84948ef1a1d6e49ea36ec5e9d85a6f8176d928dc3d1a74961bf6116e4bb01e4256c7cf01059bfb7e3db66 SHA512 0055805213057247fad6a13cb9cd9a90796723411999a55aa7bcd9f7b014709127654313877833a1257a14a2a61770232d142943c5dfae91ee1d9de91efd81d5
+DIST awscli-1.22.26.tar.gz 2131318 BLAKE2B 87651dc3a75bf0ca57142fb394b90ff3f60fbde724b7f6586c213fbf03169d5f4638133362b925a32235e518d7c8b56dea54a0bd224d4562a482e6303c7f81fb SHA512 276a137a3826922dc56316c59f46b1a741f57b5037a0a6345ece3732d31715e3fbf36faaa09b8969b161be2d54ef106c0cfd7bd6c3a3a31a540b8b42f9cf364c
DIST awscli-1.22.5.tar.gz 2111679 BLAKE2B 970e472e8de43664d060023fdab9f54ce848c5655d8aa417efeae1b1efb52989fd021817521db9dc9cd64580cabbf0c30f3d0178034bdb1edf41feebbc690f46 SHA512 9177fe9da0fb8e9e28777bbf8f2c3fe089a08851b57a49fecefab43417fff187584638d17394289bf6df3d18d9052fd958bd3fbc8064327120af04a0cbe30494
diff --git a/app-admin/awscli/awscli-1.22.26.ebuild b/app-admin/awscli/awscli-1.22.26.ebuild
new file mode 100644
index 000000000000..85073515ab9a
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.26.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(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.4.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install 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() {
+ distutils_install_for_testing
+ # 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/psmon/Manifest b/app-admin/psmon/Manifest
deleted file mode 100644
index d837616a0789..000000000000
--- a/app-admin/psmon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST psmon-1.39.tar.gz 57475 BLAKE2B 37998dabcfe5b329f74b7f6996fe3e8a350cc756a064e98549a38ade997115c3f03c57bf8b145c732edb021fe615be2a1210419f8b77666ad5caa79b74ccdc75 SHA512 08992023af29433da0fe8c48b610df3008b9ea14e197b52bc9582895275fc65cd0faca7e29f36356344219d6a61ef9350713aaa60377ce7ae49a882044b91e32
diff --git a/app-admin/psmon/metadata.xml b/app-admin/psmon/metadata.xml
deleted file mode 100644
index b826044dadb9..000000000000
--- a/app-admin/psmon/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
- A perl script that monitors processes to make sure they are running as
- the user has intended. Will respawn dead processes and/or kill illegal
- processes.
-
-
diff --git a/app-admin/psmon/psmon-1.39-r1.ebuild b/app-admin/psmon/psmon-1.39-r1.ebuild
deleted file mode 100644
index 758e8395e1c5..000000000000
--- a/app-admin/psmon/psmon-1.39-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GENTOO_DEPEND_ON_PERL_SUBSLOT="no"
-inherit perl-module
-
-DESCRIPTION="Monitors process table to slay aggressive, and spawn dead, processes"
-HOMEPAGE="http://www.psmon.com/"
-SRC_URI="http://www.psmon.com/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0
- dev-perl/Config-General
- dev-perl/Proc-ProcessTable
- dev-perl/Unix-Syslog
- virtual/perl-Getopt-Long"
-
-src_install() {
- perl-module_src_install
- insinto /etc
- doins etc/psmon.conf
-}
-
-pkg_postinst() {
- einfo "NOTICE: Please modify at least the NotifyEmail parameter found in"
- einfo "the /etc/psmon.conf file"
-}
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch b/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
deleted file mode 100644
index a9c761af98c2..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng-3.30.1-esmtp-pkgconfig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://bugs.gentoo.org/782643
-https://github.com/syslog-ng/syslog-ng/pull/3669/commits/b8284f8ecac588f6a321c779cce06cbe182611a5
-
-From b8284f8ecac588f6a321c779cce06cbe182611a5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?=
-
-Date: Sun, 9 May 2021 03:43:46 +0200
-Subject: [PATCH] configure: add pkg-config detection for libesmtp
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: László Várady
----
- configure.ac | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 86b67ba9a2..bd6efa8711 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1278,15 +1278,19 @@ if test "x$enable_smtp" != "xno" && test "x$with_libesmtp" != "xno"; then
- CPPFLAGS="$CPPFLAGS_SAVE"
- LDFLAGS="$LDFLAGS_SAVE"
- else
-- AC_MSG_CHECKING(for libESMTP)
-- if libesmtp-config --version >/dev/null 2>&1; then
-- AC_MSG_RESULT(yes)
-- LIBESMTP_CFLAGS="`libesmtp-config --cflags`"
-- LIBESMTP_LIBS="`libesmtp-config --libs`"
-- else
-- AC_MSG_RESULT(no)
-- libesmtp=no
-- fi
-+ PKG_CHECK_MODULES(LIBESMTP, libesmtp-1.0, libesmtp="yes", libesmtp="no")
-+ if test "x$libesmtp" = "xno"; then
-+ AC_MSG_CHECKING(for libESMTP with libesmtp-config)
-+ if libesmtp-config --version >/dev/null 2>&1; then
-+ AC_MSG_RESULT(yes)
-+ LIBESMTP_CFLAGS="`libesmtp-config --cflags`"
-+ LIBESMTP_LIBS="`libesmtp-config --libs`"
-+ libesmtp="yes"
-+ else
-+ AC_MSG_RESULT(no)
-+ libesmtp=no
-+ fi
-+ fi
- fi
- if test "x$enable_smtp" = "xyes" && test "x$libesmtp" = "xno"; then
- AC_MSG_ERROR(libESMTP not found)
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index ebba8e9ba9f3..2d1f0f4addf4 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/lxc/files/lxc-3.0.0-bash-completion.patch b/app-containers/lxc/files/lxc-3.0.0-bash-completion.patch
deleted file mode 100644
index 2a08eedb1c2d..000000000000
--- a/app-containers/lxc/files/lxc-3.0.0-bash-completion.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/config/bash/lxc.in b/config/bash/lxc.in
-index 43056882..0a22d4ad 100644
---- a/config/bash/lxc.in
-+++ b/config/bash/lxc.in
-@@ -1,4 +1,3 @@
--_have lxc-start && {
- _lxc_names() {
- COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
- }
-@@ -108,4 +107,3 @@ _have lxc-start && {
- complete -o default -F _lxc_generic_t lxc-create
-
- complete -o default -F _lxc_generic_o lxc-copy
--}
-diff --git a/configure.ac b/configure.ac
-index 50c99836..0569caec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -395,7 +395,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"])
- AM_COND_IF([ENABLE_BASH],
- [AC_MSG_CHECKING([bash completion directory])
- PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
-- bashcompdir="${sysconfdir}/bash_completion.d")
-+ bashcompdir="$datadir/bash-completion/completions")
- AC_MSG_RESULT([$bashcompdir])
- AC_SUBST(bashcompdir)
- ])
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 2295b2e0b2c5..5aa9fa7a435c 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -1,4 +1,2 @@
-DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 6278fa058efa15a689a982dcf0bce58bf320ac500bc8bd6cd4227f5f126a03dd85a65363d4d36b3437a0a2fd8e08e8a7332b96f9aba8e8eb2aa508d1129fec13 SHA512 dd99db21a4de95d95e6bd53dcbd68f4d9f0ffbd9e60d994340cd0b1e820068e671507a9718d1c56488c79ad49019f86637a4a8b9c945cdd3f70d59c9e2026fb1
-DIST lxd-4.0.7.tar.gz.asc 833 BLAKE2B a28e43d1fd0d5851a62121069703637e7ba25cbeb142507e4e162b254eddce2b5a13a100eedb202fbf3d8aa40f6e20b4fd587ef38f6c73a07d2bd9d8d9d00c8f SHA512 561d7cbf94a37e7ed03828ac98a2022dc1a4e11b80cdee3ad925bf4226b78b9e1d1b9c51ed070e60fba881b69e06dc70be2713026285b10de5cca59549ac5f82
DIST lxd-4.0.8.tar.gz 8898153 BLAKE2B c02bea1019079f59fff5fbb2c3d3ebf13e01751fd1c18b9aa44a9306a8f631cb0c0a55f77eb17945e44c040dfdad5c790bb2c2e3ab165356e3900c3d6cccec0e SHA512 9bf5ee91438bc14e916410254979838a110d21d8329c0eaa0a5eecfd378039a3ac10291197d2f680dc12484866f21ef724618e88e6c02038e6d2484d33571dd6
DIST lxd-4.0.8.tar.gz.asc 833 BLAKE2B 2073b113f34b2ab052e6e4f406016ac04631ec63269b79dd1e85ca5191aa73ed1f47f0e87f5155b6e5c6659138a182c4c403a66e20925cdb347f49e542e8139b SHA512 9b5f00f9d4a601e718ca91f623dd31e864963b7b8a9e9be6af8da2288b775c4fc8c60b0d6fcefa2a347d733d1e002a3714ac3dbfadf9a1188f9747e9682fe8b9
diff --git a/app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch b/app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
deleted file mode 100644
index 0b471688cc0d..000000000000
--- a/app-containers/lxd/files/lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9a128f32fc277dd0c07bc85c71dc25d123f8a831 Mon Sep 17 00:00:00 2001
-From: Christian Brauner
-Date: Wed, 4 Aug 2021 21:34:11 +0200
-Subject: [PATCH] syscall_wrappers: don't conflict with glibc provided
- close_range()
-
-Newer glibc version's provide a wrapper for close_range().
-
-Fixes: #9084
-Signed-off-by: Christian Brauner
----
- lxd/include/syscall_wrappers.h | 2 +-
- lxd/main_checkfeature.go | 2 +-
- lxd/main_forkexec.go | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lxd/include/syscall_wrappers.h b/lxd/include/syscall_wrappers.h
-index 4405a622b801..25e56a5cefac 100644
---- a/lxd/include/syscall_wrappers.h
-+++ b/lxd/include/syscall_wrappers.h
-@@ -16,7 +16,7 @@
- #define CLOSE_RANGE_UNSHARE (1U << 1)
- #endif
-
--static inline int close_range(unsigned int fd, unsigned int max_fd, unsigned int flags)
-+static inline int lxd_close_range(unsigned int fd, unsigned int max_fd, unsigned int flags)
- {
- return syscall(__NR_close_range, fd, max_fd, flags);
- }
-diff --git a/lxd/main_checkfeature.go b/lxd/main_checkfeature.go
-index 9511b684fa5d..0cc89207158d 100644
---- a/lxd/main_checkfeature.go
-+++ b/lxd/main_checkfeature.go
-@@ -496,7 +496,7 @@ static void is_close_range_aware(void)
- if (fd < 0)
- return;
-
-- if (close_range(fd, fd, CLOSE_RANGE_UNSHARE))
-+ if (lxd_close_range(fd, fd, CLOSE_RANGE_UNSHARE))
- return;
-
- close_range_aware = true;
-diff --git a/lxd/main_forkexec.go b/lxd/main_forkexec.go
-index 574f25eeb988..cfa4cd6bcda8 100644
---- a/lxd/main_forkexec.go
-+++ b/lxd/main_forkexec.go
-@@ -290,7 +290,7 @@ __attribute__ ((noinline)) static int __forkexec(void)
- if (!argvp || !*argvp)
- return log_error(EXIT_FAILURE, "No command specified");
-
-- ret = close_range(EXEC_PIPE_FD + 1, UINT_MAX, CLOSE_RANGE_UNSHARE);
-+ ret = lxd_close_range(EXEC_PIPE_FD + 1, UINT_MAX, CLOSE_RANGE_UNSHARE);
- if (ret) {
- // Fallback to close_inherited() when the syscall is not
- // available or when CLOSE_RANGE_UNSHARE isn't supported.
---
-2.32.0
-
diff --git a/app-containers/lxd/lxd-4.0.7-r2.ebuild b/app-containers/lxd/lxd-4.0.7-r2.ebuild
deleted file mode 100644
index 0d725dd9c643..000000000000
--- a/app-containers/lxd/lxd-4.0.7-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
- verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="acct-group/lxd
- app-arch/xz-utils
- >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
- dev-libs/dqlite
- dev-libs/lzo
- dev-libs/raft[lz4]
- >=dev-util/xdelta-3.0[lzma(+)]
- net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
- net-firewall/ebtables
- net-firewall/iptables[ipv6?]
- sys-apps/iproute2[ipv6?]
- sys-fs/fuse:*
- sys-fs/lxcfs
- sys-fs/squashfs-tools[lzma]
- virtual/acl"
-BDEPEND="dev-lang/go
- nls? ( sys-devel/gettext )
- verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
- ~CGROUPS
- ~IPC_NS
- ~NET_NS
- ~PID_NS
-
- ~SECCOMP
- ~USER_NS
- ~UTS_NS
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
- /usr/bin/lxc
- /usr/bin/lxc-to-lxd
- /usr/bin/lxd-agent
- /usr/bin/lxd-benchmark
- /usr/bin/lxd-p2c
- /usr/sbin/lxd"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-PATCHES=(
- "${FILESDIR}/${PN}-syscall_wrappers-don-t-conflict-with-glibc-provided.patch"
- "${FILESDIR}"/lxd-4.0.7-no-werror.patch
-)
-
-src_prepare() {
- default
-
- export GOPATH="${S}/_dist"
-
- sed -i \
- -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
- -e "s:make:make ${MAKEOPTS}:g" \
- Makefile || die
-
- # Fix hardcoded ovmf file path, see bug 763180
- sed -i \
- -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
- -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
- doc/environment.md \
- lxd/apparmor/instance_qemu.go \
- lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
- # Fix hardcoded virtfs-proxy-helper file path, see bug 798924
- sed -i \
- -e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
- lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
-
- cp "${FILESDIR}"/lxd-4.0.7-r1.service "${T}"/lxd.service || die
- if use apparmor; then
- sed -i \
- '/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
- "${T}"/lxd.service || die
- fi
-}
-
-src_configure() { :; }
-
-src_compile() {
- export GOPATH="${S}/_dist"
- export GO111MODULE=auto
- export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
- cd "${S}" || die
-
- for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
- go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
- done
-
- go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-
- # Needs to be built statically
- CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
- CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
-
- use nls && emake build-mo
-}
-
-src_test() {
- export GOPATH="${S}/_dist"
- export GO111MODULE=off
- go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
- local bindir="_dist/bin"
- export GOPATH="${S}/_dist"
-
- dosbin ${bindir}/lxd
-
- for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
- dobin ${bindir}/${l}
- done
-
- cd "${S}" || die
-
- newbashcomp scripts/bash/lxd-client lxc
-
- newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
- newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
- systemd_dounit "${T}"/lxd.service
-
- systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
- systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
- # Temporary fix for #817287
- keepdir /var/log/lxd
- fowners root:lxd /var/log/lxd
-
- dodoc AUTHORS doc/*
- use nls && domo po/*.mo
-}
-
-pkg_postinst() {
- elog
- elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- elog "including a Quick Start."
- elog
- elog "Please run 'lxc-checkconfig' to see all optional kernel features."
- elog
- optfeature "btrfs storage backend" sys-fs/btrfs-progs
- optfeature "lvm2 storage backend" sys-fs/lvm2
- optfeature "zfs storage backend" sys-fs/zfs
- elog
- elog "Be sure to add your local user to the lxd group."
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index bb85615697ee..638e844e7fe3 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/signify/signify-30-r1.ebuild b/app-crypt/signify/signify-30-r2.ebuild
similarity index 95%
rename from app-crypt/signify/signify-30-r1.ebuild
rename to app-crypt/signify/signify-30-r2.ebuild
index 5b65cb628875..6ca05ee0441f 100644
--- a/app-crypt/signify/signify-30-r1.ebuild
+++ b/app-crypt/signify/signify-30-r2.ebuild
@@ -19,7 +19,8 @@ LICENSE="BSD-1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RDEPEND=">=dev-libs/libbsd-0.7"
+RDEPEND="!net-mail/signify
+ >=dev-libs/libbsd-0.7"
DEPEND="${RDEPEND}"
BDEPEND="verify-sig? ( sec-keys/signify-keys-signify )"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 56d85b1c813d..e24dce9a96ed 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/devmanual/devmanual-0_pre20210118.ebuild b/app-doc/devmanual/devmanual-0_pre20210118.ebuild
index 979f6c407e78..c1b3757bd901 100644
--- a/app-doc/devmanual/devmanual-0_pre20210118.ebuild
+++ b/app-doc/devmanual/devmanual-0_pre20210118.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
inherit python-any-r1 readme.gentoo-r1
DESCRIPTION="The Gentoo Development Guide"
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index 9f8b6b8defcd..a2a70bcb35cd 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -4,6 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
inherit python-any-r1 readme.gentoo-r1
DESCRIPTION="The Gentoo Development Guide"
diff --git a/app-doc/selfhtml/Manifest b/app-doc/selfhtml/Manifest
deleted file mode 100644
index a1bf35c3c8d3..000000000000
--- a/app-doc/selfhtml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST selfhtml812.zip 8435931 BLAKE2B cad5a3284b09b73c23d43b3655c2f1df16832c2ac46c6b7e135d233396653de387e18da5d786e3899539dcc32fc30be4f977bc9a1ca687962666d53527b47da3 SHA512 95df63a90ee42e5c890aa42453987821ded0b89d008cebd334f853ce638670cda7f352923130853a8b8af10a4a8caf0b69a3f887aec514bc2c0bc8eb0e8450a5
diff --git a/app-doc/selfhtml/selfhtml-8.1.2.ebuild b/app-doc/selfhtml/selfhtml-8.1.2.ebuild
deleted file mode 100644
index a856a39ecf60..000000000000
--- a/app-doc/selfhtml/selfhtml-8.1.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-S=${WORKDIR}
-TARGET=/usr/share/doc/${PF}/html
-DESCRIPTION="\"The\" German HTML/XHTML/CSS/XML/DHTML/CGI/Perl/JavaScript Documentation"
-SRC_URI="http://aktuell.de.selfhtml.org/cgi-bin/selfdown/download.pl/${PN}${PV//\./}.zip"
-HOMEPAGE="http://selfhtml.org"
-DEPEND="app-arch/unzip"
-SLOT="0"
-LICENSE="selfhtml"
-KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86"
-IUSE=""
-
-src_install() {
- dodir "${TARGET}"
- cp -pR "${S}/"* "${D}${TARGET}"
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index f3b760d34989..2252c67d061a 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/neovim/neovim-0.5.1.ebuild b/app-editors/neovim/neovim-0.5.1.ebuild
index 6e99dc9e54d6..f75cc58cc162 100644
--- a/app-editors/neovim/neovim-0.5.1.ebuild
+++ b/app-editors/neovim/neovim-0.5.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/neovim/neovim.git"
else
SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+ KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
fi
LICENSE="Apache-2.0 vim"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 67fdd92b897a..b0320514d9eb 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch b/app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch
new file mode 100644
index 000000000000..92ff5d3182f8
--- /dev/null
+++ b/app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch
@@ -0,0 +1,73 @@
+https://bugs.gentoo.org/829055
+
+From b6c5f028a061557e2edb64eef897cd4a28b2afeb Mon Sep 17 00:00:00 2001
+From: Marco Wahl
+Date: Mon, 20 Dec 2021 22:27:50 +0100
+Subject: [PATCH] Fix parallel make of docs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* doc/Makefile: Split multiple target "org.texi orgguide.texi".
+* mk/org-fixup.el (org-make-manual, org-make-guide): New functions.
+ (org-make-manuals): Make obsolete.
+
+Reported by Ulrich Müller. https://list.orgmode.org/uee67gr96@gentoo.org/
+---
+ doc/Makefile | 10 ++++++++--
+ mk/org-fixup.el | 15 +++++++++++++++
+ 2 files changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 7fb96e65d..cb6d72bdc 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -27,11 +27,17 @@ guide:: orgguide.texi org-version.inc
+ ../mk/guidesplit.pl $@/*
+ endif
+
+-org.texi orgguide.texi: org-manual.org org-guide.org
++org.texi: org-manual.org
+ $(BATCH) \
+ --eval '(add-to-list `load-path "../lisp")' \
+ --eval '(load "../mk/org-fixup.el")' \
+- --eval '(org-make-manuals)'
++ --eval '(org-make-manual)'
++
++orgguide.texi: org-guide.org
++ $(BATCH) \
++ --eval '(add-to-list `load-path "../lisp")' \
++ --eval '(load "../mk/org-fixup.el")' \
++ --eval '(org-make-guide)'
+
+ org-version.inc: org.texi
+ @echo "org-version: $(ORGVERSION) ($(GITVERSION))"
+diff --git a/mk/org-fixup.el b/mk/org-fixup.el
+index c0eef23cb..0e26cc7e7 100644
+--- a/mk/org-fixup.el
++++ b/mk/org-fixup.el
+@@ -27,6 +27,21 @@
+ (require 'autoload)
+ (require 'org-compat "org-compat.el")
+
++(defun org-make-manual ()
++ "Generate the Texinfo file out of the Org manual."
++ (require 'ox-texinfo)
++ (find-file "../doc/org-manual.org")
++ (org-texinfo-export-to-texinfo))
++
++(defun org-make-guide ()
++ "Generate the Texinfo file out of the Org guide."
++ (require 'ox-texinfo)
++ (find-file "../doc/org-guide.org")
++ (org-texinfo-export-to-texinfo))
++
++(make-obsolete 'org-make-manuals
++ "use org-make-manual and org-make-guide."
++ "9.6")
+ (defun org-make-manuals ()
+ "Generate the Texinfo files out of Org manuals."
+ (require 'ox-texinfo)
+--
+2.34.1
+
diff --git a/app-emacs/org-mode/org-mode-9.5.ebuild b/app-emacs/org-mode/org-mode-9.5.ebuild
index d4f4644be22f..064ab2444a98 100644
--- a/app-emacs/org-mode/org-mode-9.5.ebuild
+++ b/app-emacs/org-mode/org-mode-9.5.ebuild
@@ -22,6 +22,8 @@ BDEPEND="doc? ( virtual/texi2dvi )"
SITEFILE="50${PN}-gentoo.el"
+PATCHES=("${FILESDIR}/${P}-parallel-make.patch")
+
src_compile() {
emake datadir="${EPREFIX}${SITEETC}/${PN}"
use doc && emake pdf card
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e1e88ea9b5b4..891b5e5b98bc 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild b/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..30c5865b473a
--- /dev/null
+++ b/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Graphical interface for QEMU and KVM emulators, using Qt5"
+HOMEPAGE="https://sourceforge.net/projects/aqemu"
+SRC_URI="https://github.com/tobimensch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vnc"
+
+RDEPEND="
+ app-emulation/qemu
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ vnc? ( net-libs/libvncserver )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS CHANGELOG README TODO )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.2-qtbindir.patch"
+ "${FILESDIR}/${PN}-0.9.2-include.patch"
+ "${FILESDIR}/${PN}-0.9.2-docs.patch"
+ "${FILESDIR}/${PN}-0.9.2-crash-fix.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DMAN_PAGE_COMPRESSOR=OFF
+ -DWITHOUT_EMBEDDED_DISPLAY=$(usex vnc OFF ON)
+ )
+
+ cmake_src_configure
+}
diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch b/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch
new file mode 100644
index 000000000000..ef4c1a146461
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch
@@ -0,0 +1,116 @@
+https://github.com/tobimensch/aqemu/pull/116
+https://bugs.gentoo.org/738020
+
+From dc19121a923c71eed248cd6310b9b06ec0af6abe Mon Sep 17 00:00:00 2001
+From: Moskaliou Nikita <44800696+nikitamos@users.noreply.github.com>
+Date: Sun, 5 Dec 2021 19:36:44 +0300
+Subject: [PATCH] Change widgets names
+
+Several widgets in the src/Main_Window.ui file had the same name ("widget"), for several users AQEMU crashed with SEGFAULT. So, the names were changed and now everything works fine
+--- a/src/Main_Window.ui
++++ b/src/Main_Window.ui
+@@ -226,7 +226,7 @@
+
+
+ -
+-
++
+
+
+ 24
+@@ -275,9 +275,6 @@
+
+ 64
+
+-
+- QComboBox::AdjustToMinimumContentsLength
+-
+
+
+ -
+@@ -294,9 +291,6 @@
+
+ 16
+
+-
+- QComboBox::AdjustToMinimumContentsLength
+-
+
-
+
+ 1
+@@ -395,9 +389,6 @@
+ 0
+
+
+-
+- QComboBox::AdjustToMinimumContentsLength
+-
+
+
+ -
+@@ -526,9 +517,6 @@
+
+ 8
+
+-
+- QComboBox::AdjustToMinimumContentsLength
+-
+
-
+
+ Floppy
+@@ -586,9 +574,6 @@
+
+ 8
+
+-
+- QComboBox::AdjustToMinimumContentsLength
+-
+
+
+ -
+@@ -618,9 +603,6 @@
+
+ 128
+
+-
+- QComboBox::AdjustToMinimumContentsLength
+-
+
-
+
+ en-us (default)
+@@ -1333,7 +1315,7 @@
+
+
+
+- widget
++ general_Machine_Sets
+ GB_Options
+ GB_Audio
+ GB_Memory
+@@ -2457,7 +2439,7 @@
+
+
+ -
+-
++
+
+
+ 6
+@@ -2515,7 +2497,7 @@
+
+
+ -
+-
++
+
+
+ 6
+@@ -3018,7 +3000,7 @@
+ 0
+ 0
+ 982
+- 32
++ 22
+
+
+