Sync with portage [Sun Apr 10 21:47:08 MSK 2022].

2 years ago · cf05e45c86
parent fb8fe35529
commit cf05e45c86
1993 changed files with 16855 additions and 13056 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/openttd/Manifest
+++ b/acct-group/openttd/Manifest
--- a/acct-group/openttd/metadata.xml
+++ b/acct-group/openttd/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/openttd/openttd-0.ebuild
+++ b/acct-group/openttd/openttd-0.ebuild
@ -0,0 +1,10 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="A group for games-simulation/openttd"
+
+ACCT_GROUP_ID="513"
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/openttd/Manifest
+++ b/acct-user/openttd/Manifest
--- a/acct-user/openttd/metadata.xml
+++ b/acct-user/openttd/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
--- a/acct-user/openttd/openttd-0.ebuild
+++ b/acct-user/openttd/openttd-0.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for games-simulation/openttd"
+
+ACCT_USER_HOME="/var/lib/openttd"
+ACCT_USER_GROUPS=( "openttd" )
+ACCT_USER_ID="513"
+
+acct-user_add_deps
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/gzip/gzip-1.12.ebuild
+++ b/app-arch/gzip/gzip-1.12.ebuild
@ -17,7 +17,7 @@ SRC_URI+=" verify-sig? (

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"

 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
--- a/app-arch/libarchive/libarchive-3.6.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.6.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="

 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc

--- a/app-arch/lrzip/lrzip-0.651.ebuild
+++ b/app-arch/lrzip/lrzip-0.651.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/ckolivas/lrzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"

 RDEPEND="app-arch/bzip2
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@ -1,2 +1 @@
-DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
 DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8
--- a/app-arch/rpm/files/rpm-4.16.0-autotools.patch
+++ b/app-arch/rpm/files/rpm-4.16.0-autotools.patch
@ -1,13 +0,0 @@
-diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac
--- rpm-4.16.0.ORIG/configure.ac	2020-10-01 11:02:21.605485875 +0100
-+++ rpm-4.16.0/configure.ac	2020-10-01 11:05:34.077157904 +0100
-@@ -552,9 +552,6 @@
- 
- AM_CONDITIONAL([BDB], [test "x$have_bdb" != "xno"])
- AM_CONDITIONAL([WITH_INTERNAL_DB],[test "x$have_bdb" = "xinternal"])
-if test "x$have_bdb" = "xinternal"; then
-    AC_CONFIG_SUBDIRS(db3)
-fi
- 
- 
- #=================
--- a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch
+++ b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch
@ -1,34 +0,0 @@
-diff -uNr rpm-4.16.1.3.ORIG/configure.ac rpm-4.16.1.3/configure.ac
--- rpm-4.16.1.3.ORIG/configure.ac	2021-04-13 19:32:35.630955569 +0100
-+++ rpm-4.16.1.3/configure.ac	2021-04-13 19:32:54.939623251 +0100
-@@ -957,13 +957,7 @@
- AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
- AC_SUBST(RUNDIR)
- 
-if test X"$prefix" = XNONE ; then
-    usrprefix="$ac_default_prefix"
-else
-    usrprefix=$prefix
-fi
-
-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
-+RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
- AC_SUBST(RPMCONFIGDIR)
- 
- AC_SUBST(OBJDUMP)
-diff -uNr rpm-4.16.1.3.ORIG/rpm.am rpm-4.16.1.3/rpm.am
--- rpm-4.16.1.3.ORIG/rpm.am	2021-04-13 19:32:35.584956361 +0100
-+++ rpm-4.16.1.3/rpm.am	2021-04-13 19:32:54.940623234 +0100
-@@ -1,10 +1,8 @@
- # Internal binaries
-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
-rpmlibexecdir = $(prefix)/lib/rpm
-+rpmlibexecdir = $(pkglibexecdir)
- 
- # Host independent config files
-## HACK: it probably should be $(datadir)/rpm
-rpmconfigdir = $(prefix)/lib/rpm
-+rpmconfigdir = $(pkglibexecdir)
- 
- # Libtool version (current-revision-age) for all our libraries
- rpm_version_info = 10:3:1
--- a/app-arch/rpm/rpm-4.16.1.3.ebuild
+++ b/app-arch/rpm/rpm-4.16.1.3.ebuild
@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{2..4} )
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="https://rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# Tests are broken. See bug 657500
-RESTRICT="test"
-
-IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="!app-arch/rpm5
-	app-arch/libarchive
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dbus? ( sys-apps/dbus )
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/libgcrypt
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( ${LUA_DEPS} )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	test? ( sys-apps/fakechroot )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-
-	# Added USE=openmp and this check for bug #779769
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-4.16.0-autotools.patch
-	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
-	eapply "${FILESDIR}"/${P}-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# fix #492642
-	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
-
-	eapply_user
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	econf \
-		--without-selinux \
-		--with-crypto=libgcrypt \
-		$(use_enable python) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable dbus inhibit-plugin) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl) \
-		$(use_enable zstd zstd $(usex zstd yes no))
-}
-
-src_install() {
-	default
-
-	# remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary} || die
-	done
-
-	if ! use nls; then
-		rm -rf "${ED}"/usr/share/man/?? || die
-	fi
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CREDITS README*
-	if use doc; then
-		for docname in librpm; do
-			docinto "html/${docname}"
-			dodoc -r "doc/${docname}/html/."
-		done
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-
-	use python && python_optimize
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #657500):
-	if has usersandbox $FEATURES ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	emake check
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
-	fi
-}
--- a/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild
@ -23,7 +23,7 @@ else
 	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"

 	if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 	S="${WORKDIR}/${MY_P}"
 fi
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@ -1,3 +1,2 @@
 DIST borgmatic-1.5.21.tar.gz 278933 BLAKE2B b098334fa476304a8e63ceed37b3c2b9c67d0549bea6d06d8f0fd0f41f9812e79cea52f88fc15d2be29e491355f9544b6ccbe7c31936dfbd78eefd42e9ff2832 SHA512 e183269a0ac3ae049031832414d597ced8f75dd1f82d16379faec6d53566a1c19f51d613745e61077621381ee819d2f5dfc5cabaf9928a629f5cf3e13398503c
-DIST borgmatic-1.5.23.tar.gz 290506 BLAKE2B 9924d9df1cae7e4f97ff70eb16f84a2ee8a0fe0cd3a08add7a7ec59d269fb693f74350cdb45633fc4d76816614216a69a205504cac9c7608a635fc364253add6 SHA512 1b811fec2e814854459d10e4c90e552d90e0450d908931dbca5a838dc091c40dc6075c6fa09653a5aac69073e5b7600aed4beda4bc765daf0c6d8d2a00983ad7
 DIST borgmatic-1.5.24.tar.gz 291853 BLAKE2B d8c695c8faf713cd75e994d8ae7633674d01981047ce79d35d392b9db5a2dfb47c2be4a91e0f183ab2ead5877ee68983d0fdfd88ae7d28355d8029d39cbfdc04 SHA512 cfa1bd1dc6119497fba99d02e4f53322aede907ba8b30068b6c1dadc67f5e30466d2f1f0d83f1f15f71dfac08ef5b0adb376d24d62f1cd44992e7a45f99fde34
--- a/app-backup/borgmatic/borgmatic-1.5.23.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.23.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
-)
-
-# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
-# executable so making it work would require passing --install
-# to distutils_enable_tests. Given that this is the only test requiring
-# this and that all it does is make sure the NEWS file has been updated
-# for the current version, just skip it.
-EPYTEST_DESELECT=(
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/dbench/dbench-4.0.ebuild
+++ b/app-benchmarks/dbench/dbench-4.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ HOMEPAGE="https://www.samba.org/ftp/tridge/dbench/"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"

 DEPEND="dev-libs/popt"
 RDEPEND="${DEPEND}"
--- a/app-benchmarks/nbench/nbench-2.2.3-r2.ebuild
+++ b/app-benchmarks/nbench/nbench-2.2.3-r2.ebuild
@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"

 PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )

--- a/app-benchmarks/stress/stress-1.0.5.ebuild
+++ b/app-benchmarks/stress/stress-1.0.5.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="static"

 src_prepare() {
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/buildah/buildah-1.25.1.ebuild
+++ b/app-containers/buildah/buildah-1.25.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar

 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="selinux"

 RDEPEND="app-crypt/gpgme:=
--- a/app-containers/catatonit/catatonit-0.1.7.ebuild
+++ b/app-containers/catatonit/catatonit-0.1.7.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"

 PATCHES=("${DISTDIR}/${P}-automake.patch")

--- a/app-containers/containerd/containerd-1.5.11.ebuild
+++ b/app-containers/containerd/containerd-1.5.11.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"

 DEPEND="
--- a/app-containers/crun/crun-1.4.4.ebuild
+++ b/app-containers/crun/crun-1.4.4.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv"
-IUSE="+bpf +caps criu +seccomp systemd static-libs"
+IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"

 DEPEND="
 	dev-libs/yajl:=
@ -24,7 +24,8 @@ DEPEND="
 	seccomp? ( sys-libs/libseccomp )
 	systemd? ( sys-apps/systemd:= )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-container )"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
--- a/app-containers/docker-cli/docker-cli-20.10.14.ebuild
+++ b/app-containers/docker-cli/docker-cli-20.10.14.ebuild
@ -1,5 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public Lic
+# Distributed under the terms of the GNU General Public License v2
+
 EAPI=7
 GIT_COMMIT=a224086349
 EGO_PN="github.com/docker/cli"
@ -13,9 +14,10 @@ SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="hardened"
+IUSE="hardened selinux"

-RDEPEND="!<app-containers/docker-20.10.1"
+RDEPEND="!<app-containers/docker-20.10.1
+	selinux? ( sec-policy/selinux-docker )"
 BDEPEND="
 	>=dev-lang/go-1.16.6
 	dev-go/go-md2man"
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@ -1,3 +1 @@
-DIST podman-3.4.4.tar.gz 10945990 BLAKE2B 3de69c9bc3bd1334837d21cb2817a9e9757fbb561a0b047658c7401608ecf1fbe09d5cd0c65497a82150a67a3775c77705d0dbd314a54f7b3a1953733cfb2906 SHA512 cfd295bf50ce86ea70741c3e663b409ed47b1e560c962bc579f319151a0fe2b24cdd3045667660083cce89449a9c5de1508c94a9a02375165a72ce7c16166666
-DIST podman-4.0.2.tar.gz 11377152 BLAKE2B ab022c3e7ef40685301f08b2d939e936b07e08231d5b86a84fefa6ea7a60c8f20a5e15b79788d862c263336204a9cd8d7206748b4530f2f42ccdd31df370747f SHA512 f3c42b3b3c75ca451b4c22c2d6f9f1b9ab9437b118b16e19f17f92f28b5849f8e3de4ebc97d8d249f565a61ba187214928c25a031204163a59174e94ce300a59
 DIST podman-4.0.3.tar.gz 11392523 BLAKE2B 2d69fa8f52b061a931cf3dbe767edcb9eb5baf4f45fa77bcd9dd6e5541c126830c059a2bb97906f4fe9a4fd3257f77c801add06e1da910542ebafeaa2d032768 SHA512 a7c6f9a0f33641520c4143e6a3568129021783557f8ea7c846e4bc3f7da9bf70cb30b19cc7c6527809df2c46e6ded1d162a929dc4f44a5daafcf9d211b43b44a
--- a/app-containers/podman/podman-3.4.4.ebuild
+++ b/app-containers/podman/podman-3.4.4.ebuild
@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="3450a60d2196cc0bee8a3fc28a7c93a7370d4515"
-
-inherit bash-completion-r1 flag-o-matic go-module tmpfiles
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/"
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-IUSE="apparmor btrfs +cgroup-hybrid +fuse +rootless selinux"
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-	!cgroup-hybrid? ( app-containers/crun )
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	>=net-misc/cni-plugins-0.8.6
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-containers/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	fuse? ( sys-fs/fuse-overlayfs )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# Disable installation of python modules here, since those are
-	# installed by separate ebuilds.
-	local makefile_sed_args=(
-		-e '/^GIT_.*/d'
-		-e 's/$(GO) build/$(GO) build -v -work -x/'
-		-e 's/^\(install:.*\) install\.python$/\1/'
-		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
-	)
-
-	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
-	sed "${makefile_sed_args[@]}" -i Makefile || die
-
-	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
-		-i hack/get_release_info.sh || die
-}
-
-src_compile() {
-	local git_commiT=${EGIT_COMMIT}
-
-	# Filter unsupported linker flags
-	filter-flags '-Wl,*'
-
-	[[ -f hack/apparmor_tag.sh ]] || die
-	if use apparmor; then
-		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-	fi
-
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	if use btrfs; then
-		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-			hack/btrfs_installed_tag.sh || die
-	fi
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	if use selinux; then
-		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-	fi
-
-	# Avoid this error when generating pkg/varlink/iopodman.go:
-	# cannot find package "github.com/varlink/go/varlink/idl"
-	mkdir -p _output || die
-	ln -snf ../vendor _output/src || die
-	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
-	rm _output/src || die
-
-	export -n GOCACHE GOPATH XDG_CACHE_HOME
-	GOBIN="${S}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${git_commit}" \
-			GIT_COMMIT="${git_commit}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	insinto /usr/share/containers
-	doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
-
-	newconfd "${FILESDIR}"/podman.confd podman
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	dobashcomp completions/bash/*
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/*
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/*
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	PODMAN_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process podman.conf
-
-	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
-	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
--- a/app-containers/podman/podman-4.0.2.ebuild
+++ b/app-containers/podman/podman-4.0.2.ebuild
@ -1,163 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="342c8259381b63296e96ad29519bd4b9c7afbf97"
-
-inherit bash-completion-r1 flag-o-matic go-module tmpfiles
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/"
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-	!cgroup-hybrid? ( app-containers/crun )
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	>=net-misc/cni-plugins-0.8.6
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	init? ( app-containers/catatonit )
-	rootless? ( app-containers/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	fuse? ( sys-fs/fuse-overlayfs )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# Disable installation of python modules here, since those are
-	# installed by separate ebuilds.
-	local makefile_sed_args=(
-		-e '/^GIT_.*/d'
-		-e 's/$(GO) build/$(GO) build -v -work -x/'
-		-e 's/^\(install:.*\) install\.python$/\1/'
-		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
-	)
-
-	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
-	sed "${makefile_sed_args[@]}" -i Makefile || die
-}
-
-src_compile() {
-	local git_commit=${EGIT_COMMIT}
-
-	# Filter unsupported linker flags
-	filter-flags '-Wl,*'
-
-	[[ -f hack/apparmor_tag.sh ]] || die
-	if use apparmor; then
-		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-	fi
-
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	if use btrfs; then
-		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-			hack/btrfs_installed_tag.sh || die
-	fi
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	if use selinux; then
-		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-	fi
-
-	# Avoid this error when generating pkg/varlink/iopodman.go:
-	# cannot find package "github.com/varlink/go/varlink/idl"
-	mkdir -p _output || die
-	ln -snf ../vendor _output/src || die
-	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
-	rm _output/src || die
-
-	export -n GOCACHE GOPATH XDG_CACHE_HOME
-	GOBIN="${S}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${git_commit}" \
-			GIT_COMMIT="${git_commit}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	insinto /usr/share/containers
-	doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
-
-	newconfd "${FILESDIR}"/podman.confd podman
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	dobashcomp completions/bash/*
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/*
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/*
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	PODMAN_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process podman.conf
-
-	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
-	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
--- a/app-containers/podman/podman-4.0.3.ebuild
+++ b/app-containers/podman/podman-4.0.3.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.t
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"

-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
 RESTRICT+=" test"

@ -39,7 +39,8 @@ DEPEND="
 	${COMMON_DEPEND}
 	dev-go/go-md2man"
 RDEPEND="${COMMON_DEPEND}
-	fuse? ( sys-fs/fuse-overlayfs )"
+	fuse? ( sys-fs/fuse-overlayfs )
+	selinux? ( sec-policy/selinux-podman )"

 S=${WORKDIR}/${MY_P}

--- a/app-containers/runc/runc-1.1.1.ebuild
+++ b/app-containers/runc/runc-1.1.1.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P
 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apparmor hardened +kmem +seccomp test"
+IUSE="apparmor hardened +kmem +seccomp selinux test"

 DEPEND="seccomp? ( sys-libs/libseccomp )"

@ -25,6 +25,7 @@ RDEPEND="
 	${DEPEND}
 	!app-emulation/docker-runc
 	apparmor? ( sys-libs/libapparmor )
+	selinux? ( sec-policy/selinux-container )
 "

 BDEPEND="
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@ -1,4 +1,3 @@
-DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
 DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
--- a/app-crypt/acme/acme-1.23.0.ebuild
+++ b/app-crypt/acme/acme-1.23.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -1,4 +1,3 @@
-DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
 DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
--- a/app-crypt/certbot-apache/certbot-apache-1.23.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.23.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@ -1,4 +1,3 @@
-DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
 DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
--- a/app-crypt/certbot-nginx/certbot-nginx-1.23.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.23.0.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -1,4 +1,3 @@
-DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
 DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
--- a/app-crypt/certbot/certbot-1.23.0.ebuild
+++ b/app-crypt/certbot/certbot-1.23.0.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/app-crypt/signify/signify-30-r2.ebuild
+++ b/app-crypt/signify/signify-30-r2.ebuild
@ -17,7 +17,7 @@ SRC_URI="

 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"

 RDEPEND="!net-mail/signify
 	>=dev-libs/libbsd-0.7"
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
@ -16,7 +16,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="ssl"

 # app-crypt/ccid required for
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@ -1,2 +1,3 @@
 DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
+DIST bbdb-3.2.2a.tar.gz 198749 BLAKE2B 9f9bf9eb1414f66e19ab4e0771275cb15716257019063874000adfd3de56d047f531c440f585def481c79bf69b06b2fa1edb5b6f42ad0619bfb44318fdde9a3c SHA512 767aa7a046a9456dbf0b622a6efabe5c1d87c0022507b3bb6bec07be54e57a7285a9fe39f870599a248d5e78883300de870c168dc9918c2d1a139ef31fd53ac8
 DIST bbdb-3.2.tar.gz 189456 BLAKE2B b25efd6a3a156684e0a8f15db056683876c8dd1a44eb585db269746c7424cc18df5407e3a04defcbbd8a2c8438bbe2b16d55ab290e842951f6e475bfc34871fe SHA512 593ba5143b50f2818c19c94452efb2c5d7194ed5dc8deecf1d380da4f80e0fad2542b9a7ee68d8baca2bc2bfd84fa0459eb3cd18faaf998eb0956fcfb62dc5c8
--- a/app-emacs/bbdb/bbdb-3.2.2a.ebuild
+++ b/app-emacs/bbdb/bbdb-3.2.2a.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp autotools
+
+DESCRIPTION="The Insidious Big Brother Database"
+HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
+#SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+SRC_URI="https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="tex vm wanderlust"
+RESTRICT="test" #631700
+
+RDEPEND="vm? ( app-emacs/vm )
+	wanderlust? ( app-emacs/wanderlust )"
+BDEPEND="${RDEPEND}
+	sys-apps/texinfo"
+RDEPEND="${RDEPEND}
+	tex? ( virtual/latex-base )"
+
+SITEFILE="50${PN}-gentoo-3.2.el"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		"$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")" \
+		"$(use_with wanderlust wl-dir "${EPREFIX}${SITELISP}/wl")"
+}
+
+src_compile() {
+	emake -C lisp
+	emake -C doc
+}
+
+src_install() {
+	emake -C lisp DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if use tex; then
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins tex/bbdb.sty
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	use tex && texconfig rehash
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	use tex && texconfig rehash
+}
--- a/app-emacs/bbdb/metadata.xml
+++ b/app-emacs/bbdb/metadata.xml
@ -14,6 +14,7 @@
 <use>
  <flag name="tex">Install plain TeX support files</flag>
  <flag name="vm">Add support for <pkg>app-emacs/vm</pkg></flag>
+  <flag name="wanderlust">Add support for <pkg>app-emacs/wanderlust</pkg></flag>
 </use>
 <upstream>
  <remote-id type="sourceforge">bbdb</remote-id>
--- a/app-emacs/flycheck/Manifest
+++ b/app-emacs/flycheck/Manifest
@ -1 +1,2 @@
 DIST flycheck-32_p20210825.tar.gz 1042020 BLAKE2B 1663340de24980b3a1e58929e327841b743495dbd5d5c8306f007d0dfa989707015ceadaf6e5cac673eddb45adf9ec05dc35d8cb35af322c9cde6644194dd75d SHA512 472e25956d804e7f7ba8ebda2e3a7527eaaf3aee47fa5bd43a46ae651f94d857657cf4594f5a1ed0c169ec0ac610139956d182818ffeedf2c4132a5583ca870d
+DIST flycheck-32_p20220328.tar.gz 1037565 BLAKE2B 385d73e9ccae06db09d23819600317b807b7ff8cf0679be510cac27d539e57374fffd67575687067e8d6beeae66472b2831a5ece4adbe7b85da9b484dc8b6346 SHA512 f2c5dad66a1bae826f1b48242d3b1202cf41615fa2eadba55c4aabbbd9616ca873ba93c8c9f53cbefc22587b70ed1a2cd4fcbdcb2d6caf13d0c21c4d36e4ffc7
--- a/app-emacs/flycheck/files/50flycheck-gentoo-r1.el
+++ b/app-emacs/flycheck/files/50flycheck-gentoo-r1.el
@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/flycheck-autoloads")
--- a/app-emacs/flycheck/flycheck-32_p20220328.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20220328.ebuild
@ -0,0 +1,31 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="24.3"
+
+inherit elisp
+
+DESCRIPTION="Modern on-the-fly syntax checking extension for GNU Emacs"
+HOMEPAGE="https://www.flycheck.org/"
+COMMIT="3b5b4248074f016922c2674789d4a242528cf4c7"
+SRC_URI="https://github.com/flycheck/flycheck/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # test requires cask and ert-runner which are not packaged yet
+
+RDEPEND=">=app-emacs/dash-2.12.1
+	>=app-emacs/pkg-info-0.4"
+
+SITEFILE="50${PN}-gentoo-r1.el"
+DOCS=( README.md )
+ELISP_REMOVE="flycheck-buttercup.el flycheck-ert.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
--- a/app-emulation/86Box/86Box-3.3.ebuild
+++ b/app-emulation/86Box/86Box-3.3.ebuild
@ -23,6 +23,7 @@ DEPEND="
 	media-libs/rtmidi
 	net-libs/libslirp
 	sys-libs/zlib
+	qt5? ( x11-libs/libXi )
 "

 RDEPEND="
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -33,15 +33,15 @@ CDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+
 "
 DEPEND="
 		${CDEPEND}
 	test? (
 		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
--- a/app-emulation/guestfs-tools/Manifest
+++ b/app-emulation/guestfs-tools/Manifest
@ -1 +1,2 @@
 DIST guestfs-tools-1.46.1.tar.gz 12665804 BLAKE2B 7800954dfa961900035b127f6ac2556f584dd2d156143bf82fd1ba9fd1f327091706987192d91cb4251295d9565e56f769ab06bdac677160ac31d2e8f9d9a488 SHA512 d2bd0790343d54a2517237e56d1b982cd41335654fd205cfeec42a1b7cbbf4c0923597b767b8769dfe74766e078a817d520db251895990b922522030806d0b85
+DIST guestfs-tools-1.48.0.tar.gz 12682919 BLAKE2B 27b4e5c47af222691b067c19e997112acaf0360cc9c089dedb0327959ff8d80ff929e2fea369f9895ed6e1fc80a339ca89db3b9eb32cf23328fc71972447a13e SHA512 8576ef0e283a02a112f785e8f1656b41c93be29e12617ee8c83033b90758736ea3c2d4ecfb446a86c7913e2c0b39a7c5666e8ad22682419cc877543a3825c489
--- a/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild
+++ b/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild
@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with app-emulation/libguestfs and app-emulation/libguestfs-appliance (if any new release there)
+
+inherit flag-o-matic linux-info perl-functions strip-linguas toolchain-funcs
+
+MY_PV_1="$(ver_cut 1-2)"
+MY_PV_2="$(ver_cut 2)"
+[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/${MY_PV_1}"
+KEYWORDS="~amd64"
+IUSE="doc +ocaml +perl test"
+RESTRICT="!test? ( test )"
+
+# Failures - doc
+COMMON_DEPEND="
+	!<app-emulation/libguestfs-1.46.0-r1
+	app-arch/cpio
+	app-arch/lzma
+	app-arch/unzip[natspec]
+	app-arch/xz-utils
+	app-crypt/gnupg
+	>=app-emulation/libguestfs-${MY_PV_1}:=[ocaml?,perl?]
+	app-emulation/libvirt:=
+	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,filecaps]
+	dev-lang/perl:=
+	dev-libs/libpcre2:=
+	dev-libs/libxml2:2
+	dev-libs/jansson:=
+	>=sys-apps/fakechroot-2.8
+	sys-fs/squashfs-tools:*
+	sys-libs/ncurses:=
+	sys-libs/libxcrypt:=
+	virtual/libcrypt:=
+	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
+	perl? (
+		virtual/perl-Data-Dumper
+		virtual/perl-Getopt-Long
+		dev-perl/Module-Build
+		dev-perl/libintl-perl
+		virtual/perl-ExtUtils-MakeMaker
+		>=dev-perl/Sys-Virt-0.2.4
+		dev-perl/String-ShellQuote
+		test? ( virtual/perl-Test-Simple )
+	)
+"
+# Some OCaml is always required
+# bug #729674
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/ocaml-4.03:=[ocamlopt]
+	dev-ml/findlib[ocamlopt]
+	doc? ( app-text/po4a )
+	ocaml? (
+		dev-ml/ounit2[ocamlopt]
+		|| (
+			<dev-ml/ocaml-gettext-0.4.2
+			dev-ml/ocaml-gettext-stub[ocamlopt]
+		)
+	)
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/libguestfs-appliance
+"
+
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
+
+#PATCHES=(
+#	"${FILESDIR}"/${MY_PV_1}/
+#)
+
+pkg_setup() {
+	CONFIG_CHECK="~KVM ~VIRTIO"
+	[[ -n "${CONFIG_CHECK}" ]] && check_extra_config
+}
+
+src_configure() {
+	# bug #794877
+	tc-export AR
+
+	if use test ; then
+		# Skip Bash test
+		# (See 13-test-suite.log in linked bug)
+		# bug #794874
+		export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1
+
+		# This test requires libvirt support in libguestfs and it makes
+		# no difference at runtime. Just gracefully skip it to make life
+		# easier for e.g. arch testing.
+		if ! has_version 'app-emulation/libguestfs[libvirt]' ; then
+			export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
+		fi
+
+		# Needed for the inspector tests. Provided by libguestfs-appliance.
+		#export LIBGUESTFS_PATH="${BROOT}"/usr/share/guestfs/appliance/
+		# But the inspector tests seem fragile anyway...
+		export SKIP_TEST_VIRT_INSPECTOR_LUKS_SH=1
+		export SKIP_TEST_VIRT_INSPECTOR_SH=1
+	fi
+
+	# Disable feature test for kvm for more reason
+	# i.e: not loaded module in __build__ time,
+	# build server not supported kvm, etc. ...
+	#
+	# In fact, this feature is virtio support and requires
+	# configured kernel.
+	export vmchannel_test=no
+
+	# Give a nudge to help find libxcrypt[-system]
+	# We have a := dep on virtual/libcrypt to ensure this
+	# doesn't become stale.
+	# bug #703118, bug #789354
+	if ! has_version 'sys-libs/libxcrypt[system]' ; then
+		append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+		append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+	fi
+
+	econf \
+		$(usex doc '' PO4A=no) \
+		$(use_enable ocaml) \
+		$(use_enable perl)
+}
+
+src_install() {
+	strip-linguas -i po
+
+	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if use perl ; then
+		perl_delete_localpod
+	fi
+}
+
+pkg_postinst() {
+	if ! use ocaml ; then
+		einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed"
+	fi
+
+	if ! use perl ; then
+		einfo "Perl based tools NOT built"
+	fi
+}
--- a/app-emulation/libguestfs-appliance/Manifest
+++ b/app-emulation/libguestfs-appliance/Manifest
@ -1,2 +1,2 @@
-DIST appliance-1.38.0.tar.xz 96537604 BLAKE2B 8b425b624dec274f2913ab9ff89cc02fea6c9244d6e3ee64f054d2a91f7959d9dbc03d55e9f5b4f5df835007581a18914b5c790f55b01c3398412ce5a7e9309d SHA512 a423fd54627ffb9c2ae05b26ad60b9089f8119a99d30612a33921a2662ba42332ad0a7a7ad6c33b7042fc02a5c4dc9b563158650c6cb4a3eaaae6b764f7d7082
 DIST appliance-1.40.1.tar.xz 111566640 BLAKE2B b6ddd3b120a466ce343d67d9e058c201a78f5e605b8bbc2d47fc30c5eaaa874cc032b879a67c5f134b8fa65c58fc27893b062de0c3a21705b64766dd86df648f SHA512 2d63b2ce8850929b42ddc91518b0e2b37d13e358be94bb54899da6c310afa308d708a3443b9f3b3aa3c46f4f2079036a6a4b34027788f183c17a20b68fcf4e6e
+DIST appliance-1.46.0.tar.xz 145436856 BLAKE2B d9ed31f533a2772b0f506176b39bfdfdec1421fe4ff7934ccdb1db0cb2644d477211ec1a2d372d7e5dd0a8f278f47a39bff813b7bc4c9a038258a5f6358b4e91 SHA512 842119bdf95dbbd61328891e9bd0b557bed90ba79c6419ee18d1a79cd4a301ea6922339b9e80ac314ff3e16498e9d3c594861aebe8e0fc2db41d285eb8e5d578
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
@ -1,7 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8
+
+# Bump with app-emulation/libguestfs and app-emulation/libguestfs (if any new release there)

 CHECKREQS_DISK_USR=500M
 CHECKREQS_DISK_BUILD=500M
@ -18,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"

 BDEPEND="app-arch/xz-utils"
-# Mixing libguestfs versions causes weird problems. #501588
+# Mixing libguestfs versions causes weird problems, bug #501588
 RDEPEND="!<app-emulation/libguestfs-${PV}"

 src_unpack() {
@ -29,8 +31,9 @@ src_unpack() {

 src_install() {
 	dodir /usr/share/guestfs
-	cd "${ED}"/usr/share/guestfs || die
+	cd "${ED}"/usr/share/guestfs || Die
 	unpack ${A}
+
 	cd appliance || die
 	dodoc README*
 	# Don't rm README.* here, at least README.fixed is needed for libguestfs, see
@ -38,5 +41,10 @@ src_install() {
 	chmod 755 . || die
 	chmod 644 * || die

-	newenvd "${FILESDIR}"/env.file 99"${PN}"
+	newenvd "${FILESDIR}"/env.file 99${PN}
+}
+
+pkg_postinst() {
+	# bug #776790
+	elog "Please run . ${EROOT}/etc/profile before attempting to use this package!"
 }
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@ -1,3 +1,2 @@
-DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-DIST libguestfs-1.44.1.tar.gz 23798268 BLAKE2B a2266d28e611204f03fc88c7a51331b49eb9fb908a318024bbc98af6a283ef4ba80be9caa0fb7e10f4d8bf67be5aaddae73d213828956e59f3233ab280a0185b SHA512 db6eab7350d9318a5ad5f968b24ed77ab411c9be3476b62b2b8448cf06db2462af1e3c9d8b02b54011d43651c281d74db7cb8023426a3f09667aa5b3597c7c33
 DIST libguestfs-1.46.0.tar.gz 18500858 BLAKE2B 1d69d79fa33b5a6bdde00cdb3acdad51a6042d0307117ab6c230259dbc9646fe694df0d7e8f2cf2ae63f146ea756269ea7bf139e61786c46d42c33bb176937e1 SHA512 9b1670dff924e046ab82ff1ce6e25428d95b88700b507d4f1dd68a309641e376d14520c7b5aa5bbb81a6ba5c708ebcc46b6fe0970d903a3ed79e76d4ccdca614
+DIST libguestfs-1.48.0.tar.gz 18426132 BLAKE2B a0ace19998e6eb368fa8ad73242b7c35c72244e9b9881f3adb76dcc8ed6e9a77691012e5786a26680a944d0876091bbb1d0f9ac63c0f5046538acf4402f840ac SHA512 b2486f32a3958c2b3e68d3f547dcd192dc7f8c59e0efd8660cd27cae9c218ce4fc2a60480dcb6bb0d10d8abbc2d2f4796075aea1cfab5e3c7cd12c38d4352fe2
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r104.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r104.ebuild
@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools bash-completion-r1 linux-info lua-single perl-functions python-single-r1 strip-linguas xdg-utils flag-o-matic
-
-MY_PV_1="$(ver_cut 1-2)"
-MY_PV_2="$(ver_cut 2)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua +ocaml +perl python ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Failures - doc
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	!app-emulation/guestfs-tools
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.8.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	python? ( ${PYTHON_DEPS} )
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( ${LUA_DEPS} )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	>=dev-lang/ocaml-4.03:=[ocamlopt]
-	dev-ml/findlib[ocamlopt]
-	|| (
-		<dev-ml/ocaml-gettext-0.4.2
-		dev-ml/ocaml-gettext-stub[ocamlopt]
-	)
-	dev-ml/ounit2[ocamlopt]
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	test? ( introspection? ( dev-libs/gjs ) )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-# Upstream build scripts compile and install Lua bindings for the ABI version
-# obtained by running 'lua' on the build host
-BDEPEND="lua? ( ${LUA_DEPS} )"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/
-)
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-
-		use lua && lua-single_pkg_setup
-		use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	# Give a nudge to help find libxcrypt[-system]
-	# bug #703118, bug #789354
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
-	append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
-
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(use_with libvirt) \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		$(use_enable python) \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-	find "${ED}" -name '*.la' -delete || die
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-
-	if ! use ocaml ; then
-		einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed"
-	fi
-
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
--- a/app-emulation/libguestfs/libguestfs-1.46.0-r4.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.46.0-r4.ebuild
@ -3,6 +3,8 @@

 EAPI=7

+# Bump with app-emulation/guestfs-tools and app-emulation/libguestfs-appliance (if any new release there)
+
 LUA_COMPAT=( lua5-1 )
 PYTHON_COMPAT=( python3_{8,9,10} )

@ -30,6 +32,7 @@ COMMON_DEPEND="
 	>=app-admin/augeas-1.8.0
 	app-arch/cpio
 	app-arch/lzma
+	app-arch/rpm
 	app-arch/unzip[natspec]
 	app-arch/xz-utils
 	app-cdr/cdrtools
@ -49,7 +52,6 @@ COMMON_DEPEND="
 	sys-apps/file
 	sys-devel/gettext
 	sys-fs/squashfs-tools:*
-	>=sys-libs/db-4.6:*
 	sys-libs/libcap
 	sys-libs/readline:=
 	virtual/acl
--- a/app-emulation/libguestfs/libguestfs-1.44.1-r1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.44.1-r1.ebuild
@ -1,24 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

+# Bump with app-emulation/guestfs-tools and app-emulation/libguestfs-appliance (if any new release there)
+
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )

-inherit autotools linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs xdg-utils flag-o-matic
+inherit autotools flag-o-matic linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs

 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
 [[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"

-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
+DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images"
 HOMEPAGE="https://libguestfs.org/"
 SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"

 LICENSE="GPL-2 LGPL-2"
 SLOT="0/${MY_PV_1}"
-
 KEYWORDS="~amd64"
 IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua +ocaml +perl python ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
@ -27,33 +28,36 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"

 # Failures - doc
-
-# FIXME: selinux support is automagic
 COMMON_DEPEND="
-	!app-emulation/guestfs-tools
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
+	>=app-admin/augeas-1.8.0
 	app-arch/cpio
-	dev-lang/perl:=
+	app-arch/lzma
+	app-arch/rpm
+	app-arch/unzip[natspec]
+	app-arch/xz-utils
+	app-forensics/yara
 	app-cdr/cdrtools
+	app-crypt/gnupg
 	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
+	>=app-misc/hivex-1.3.1
+	dev-lang/perl:=
+	dev-libs/libconfig:=
+	dev-libs/libpcre2
 	dev-libs/libxml2:2=
+	dev-libs/jansson:=
+	>=dev-libs/yajl-2.0.4
+	net-libs/libtirpc:=
+	sys-libs/ncurses:0=
 	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.8.0
+	sys-apps/fakeroot
+	sys-apps/file
+	sys-devel/gettext
 	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	dev-libs/jansson:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
+	sys-libs/libcap
+	sys-libs/readline:=
+	virtual/acl
+	virtual/libcrypt:=
+	erlang? ( dev-lang/erlang )
 	perl? (
 		virtual/perl-ExtUtils-MakeMaker
 		>=dev-perl/Sys-Virt-0.2.4
@ -65,38 +69,34 @@ COMMON_DEPEND="
 	)
 	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
+	gtk? (
+		sys-apps/dbus
+		x11-libs/gtk+:3
+	)
 	introspection? (
 		>=dev-libs/glib-2.26:2
 		>=dev-libs/gobject-introspection-1.30.0:=
 	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	erlang? ( dev-lang/erlang )
 	inspect-icons? (
 		media-libs/netpbm
 		media-gfx/icoutils
 	)
-	virtual/acl
-	sys-libs/libcap
+	libvirt? ( app-emulation/libvirt )
 	lua? ( ${LUA_DEPS} )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
+	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
+	selinux? (
+		sys-libs/libselinux:=
+		sys-libs/libsemanage
 	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
+	systemtap? ( dev-util/systemtap )
 "
 # Some OCaml is always required
 # bug #729674
 DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
 	>=dev-lang/ocaml-4.03:=[ocamlopt]
+	dev-util/gperf
 	dev-ml/findlib[ocamlopt]
+	doc? ( app-text/po4a )
 	ocaml? (
 		dev-ml/ounit2[ocamlopt]
 		|| (
@ -104,13 +104,13 @@ DEPEND="${COMMON_DEPEND}
 			dev-ml/ocaml-gettext-stub[ocamlopt]
 		)
 	)
-	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	test? ( introspection? ( dev-libs/gjs ) )
 "
 BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
+	acct-group/kvm
 "
 # Upstream build scripts compile and install Lua bindings for the ABI version
 # obtained by running 'lua' on the build host
@ -119,7 +119,8 @@ BDEPEND="lua? ( ${LUA_DEPS} )"
 DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )

 PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/
+	#"${FILESDIR}"/${MY_PV_1}/
+	"${FILESDIR}"/1.44/
 )

 pkg_setup() {
@ -132,7 +133,7 @@ pkg_setup() {

 src_prepare() {
 	default
-	xdg_environment_reset
+
 	eautoreconf
 }

@ -154,33 +155,39 @@ src_configure() {
 	export vmchannel_test=no

 	# Give a nudge to help find libxcrypt[-system]
+	# We have a := dep on virtual/libcrypt to ensure this doesn't become stale.
 	# bug #703118, bug #789354
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
-	append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+	if ! has_version 'sys-libs/libxcrypt[system]' ; then
+		append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+		append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+	fi
+
+	# Avoid automagic SELinux dependency
+	export ac_cv_header_selinux_selinux_h=$(usex selinux)

 	econf \
-		$(use_with libvirt) \
 		--disable-appliance \
 		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		$(use_enable python) \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
 		--disable-haskell \
 		--disable-golang \
 		--disable-rust \
+		--disable-php \
+		--without-java \
+		--with-extra="-gentoo" \
+		--with-readline \
+		$(usex doc '' PO4A=no) \
+		$(use_enable ocaml) \
+		$(use_enable erlang) \
+		$(use_enable fuse) \
 		$(use_enable introspection gobject) \
 		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
+		$(use_with libvirt) \
 		$(use_enable lua) \
-		$(usex doc '' PO4A=no)
+		$(use_enable python) \
+		$(use_enable perl) \
+		$(use_enable ruby) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap probes)
 }

 src_install() {
@ -200,15 +207,11 @@ src_install() {
 }

 pkg_postinst() {
+	einfo "Please ensure you are in the 'kvm' group for decent performance!"
+
 	if ! use gtk ; then
 		einfo "virt-p2v NOT installed"
 	fi

-	if ! use ocaml ; then
-		einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed"
-	fi
-
-	if ! use perl ; then
-		einfo "Perl based tools NOT built"
-	fi
+	einfo "Note that common tools like virt-resize are now part of app-emulation/guestfs-tools"
 }
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-iptables/eselect-iptables-20220320.ebuild
+++ b/app-eselect/eselect-iptables/eselect-iptables-20220320.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~chutzpah/dist/iptables/${P}.tar.xz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"

 RDEPEND="app-admin/eselect"

--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/magicrescue/magicrescue-1.1.10-r1.ebuild
+++ b/app-forensics/magicrescue/magicrescue-1.1.10-r1.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Find deleted files in block devices"
+HOMEPAGE="https://github.com/jbj/magicrescue"
+SRC_URI="https://github.com/jbj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="sys-libs/gdbm"
+RDEPEND="${DEPEND}
+	!net-mail/safecat"
+# File collision with net-mail/safecat, #702004
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-remove_toolsdir.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "\
+			s:\$(INSTALLDIR)/share/magicrescue/recipes:\$(INSTALLDIR)/share/doc/${PF}/recipes:;\
+			s:\$(INSTALLDIR)/man/man1:\$(INSTALLDIR)/share/man/man1:;\
+			s:\$(INSTALLDIR)/share/magicrescue/tools:\$(INSTALLDIR)/bin:" Makefile.in || die "could not mangle Makefile.in"
+}
+
+src_configure() {
+	tc-export CC
+
+	# Not autotools, just looks like it sometimes
+	./configure --prefix=/usr || die
+}
--- a/app-forensics/volatility3/metadata.xml
+++ b/app-forensics/volatility3/metadata.xml
@ -25,5 +25,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">volatilityfoundation/volatility3</remote-id>
+		<remote-id type="pypi">volatility3</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/gramps/gramps-5.1.5.ebuild
+++ b/app-misc/gramps/gramps-5.1.5.ebuild
@ -18,7 +18,7 @@ SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="berkdb exif geo postscript +rcs +reports spell test"

 RESTRICT="!test? ( test )
--- a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
@ -7,7 +7,7 @@ inherit optfeature prefix

 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/libreoffice-l10n/libreoffice-l10n-7.3.2.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-7.3.2.2.ebuild
@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable

 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
 IUSE="offlinehelp"

 #
--- a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
@ -104,8 +104,8 @@ RESTRICT="!test? ( test )"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"

-#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"

 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@ -212,11 +212,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		kde-frameworks/kio:5
 		kde-frameworks/kwindowsystem:5
 	)
-	ldap? ( net-nds/openldap )
+	ldap? ( net-nds/openldap:= )
 	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c )
-	!mariadb? ( dev-db/mysql-connector-c )
+	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	!mariadb? ( dev-db/mysql-connector-c:= )
 	pdfimport? ( app-text/poppler:=[cxx] )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
 "
@ -269,6 +269,10 @@ BDEPEND="
 	virtual/pkgconfig
 	clang? (
 		|| (
+			(
+				sys-devel/clang:14
+				sys-devel/llvm:14
+				=sys-devel/lld-14*	)
 			(	sys-devel/clang:13
 				sys-devel/llvm:13
 				=sys-devel/lld-13*	)
@ -566,16 +570,16 @@ src_configure() {
 			--with-ant-home="${ANT_HOME}"
 		)
 		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
 		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
 		fi

 		use libreoffice_extensions_scripting-beanshell && \
 			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )

 		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
 	fi

 	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@ -104,13 +104,13 @@ RESTRICT="!test? ( test )"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"

-#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"

 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-arch/zip
-	app-crypt/gpgme[cxx]
+	app-crypt/gpgme:=[cxx]
 	app-text/hunspell:=
 	>=app-text/libabw-0.1.0
 	>=app-text/libebook-0.1
@ -269,6 +269,10 @@ BDEPEND="
 	virtual/pkgconfig
 	clang? (
 		|| (
+			(
+				sys-devel/clang:14
+				sys-devel/llvm:14
+				=sys-devel/lld-14*	)
 			(	sys-devel/clang:13
 				sys-devel/llvm:13
 				=sys-devel/lld-13*	)
@ -563,9 +567,9 @@ src_configure() {
 			--with-ant-home="${ANT_HOME}"
 		)
 		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
 		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
 		fi

 		use libreoffice_extensions_scripting-beanshell && \
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@ -269,6 +269,10 @@ BDEPEND="
 	virtual/pkgconfig
 	clang? (
 		|| (
+			(
+				sys-devel/clang:14
+				sys-devel/llvm:14
+				=sys-devel/lld-14*	)
 			(	sys-devel/clang:13
 				sys-devel/llvm:13
 				=sys-devel/lld-13*	)
@ -563,9 +567,9 @@ src_configure() {
 			--with-ant-home="${ANT_HOME}"
 		)
 		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
 		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+			myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
 		fi

 		use libreoffice_extensions_scripting-beanshell && \
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/pfl/pfl-3.2-r2.ebuild
+++ b/app-portage/pfl/pfl-3.2-r2.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+network-cron"

 DEPEND=""
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
@ -10,8 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MDDS_VER="2.0"
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	# Unkeyworded while libreoffice has no release making use of this slot
-	# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
--- a/app-text/pelican/pelican-4.7.2-r1.ebuild
+++ b/app-text/pelican/pelican-4.7.2-r1.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend

 inherit distutils-r1
@ -18,18 +18,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples markdown"

 RESTRICT="test"
-RDEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/docutils-0.16[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	>=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+	>=dev-python/rich-10.1[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-1.1[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
-DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+	markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+BDEPEND="test? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"

 DOCS=( README.rst )

--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-9999.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend

 inherit distutils-r1 git-r3
@ -18,18 +18,19 @@ SLOT="0"
 IUSE="doc examples markdown"

 RESTRICT="test"
-RDEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/docutils-0.16[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	>=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+	>=dev-python/rich-10.1[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-1.1[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
-DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+	markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+BDEPEND="test? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+
 DOCS=( README.rst )

 distutils_enable_tests nose
--- a/app-text/poppler/poppler-22.03.0.ebuild
+++ b/app-text/poppler/poppler-22.03.0.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/119"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi

--- a/app-text/sigil/sigil-1.9.2-r1.ebuild
+++ b/app-text/sigil/sigil-1.9.2-r1.ebuild
@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	app-text/hunspell:=
-	dev-libs/libpcre:3=[pcre16]
+	dev-libs/libpcre2:=[pcre16]
 	$(python_gen_cond_dep '
 		dev-python/css-parser[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/catch/catch-2.13.8.ebuild
+++ b/dev-cpp/catch/catch-2.13.8.ebuild
@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"

-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86"
 fi

 DESCRIPTION="Modern C++ header-only framework for unit-tests"
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/sqlite/sqlite-3.38.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.38.0.ebuild
@ -25,7 +25,7 @@ fi

 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
--- a/dev-db/sqlmap/metadata.xml
+++ b/dev-db/sqlmap/metadata.xml
@ -16,5 +16,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">sqlmapproject/sqlmap</remote-id>
+		<remote-id type="pypi">sqlmap</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@ -1,3 +1 @@
-DIST cache_tab-1.0.23.tar.gz 23362 BLAKE2B 6cd92120340600a3bf2444c716162e47c673dc4f2284324aba138552bbc840d2d9b26a506a66736a4d215129818ba51e3a4e5a12b9df4952a691995adc9815c0 SHA512 86875ccccc9384421c9040754ece7726891204f5afdcfe6da3e9e9a4fb2af0a670ab48ecc83f5fb379d8980c4a76e36c63b356fe0f5283e6cb131c75271d5c01
-DIST cache_tab-1.0.28.tar.gz 24031 BLAKE2B 0d74e9e8992c512aa5a38606661f9ab1c72fb78cb2c76994e0d9b51e5453d8413694db16f8e58775bfd926c2de81aa381aa8a68f3f5387c0fc4d85c649eecd1a SHA512 1fcd95fd1a8e129e366ac633db6e4e65f57f8903fd9cc1f84b32bdb9b95697a16c411f04929dbf49bddd7733f69b405328f67a8aa397396a5e97b488194accd0
 DIST cache_tab-1.0.29.tar.gz 60908 BLAKE2B 5e2d0e0db382b8a9596ec4728ab99426d070026218c04e3e6e55e41ea22181a6c5362f52bab97b9ffa5ba79ed70d1896684ccc113786573627150d0f3e479a32 SHA512 d47b9e28cf95c8d31256090ebcb4c39eaecf622ed13874f3809beef2e96374a6d14048082b59abddf3ca8d399a59a2dc54e4dfb4cf84e5ceec54276a7dd3f594
--- a/dev-erlang/cache_tab/cache_tab-1.0.23.ebuild
+++ b/dev-erlang/cache_tab/cache_tab-1.0.23.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="In-memory cache Erlang and Elixir library"
-HOMEPAGE="https://github.com/processone/cache_tab"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	>=dev-erlang/p1_utils-1.0.19"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/cache_tab/cache_tab-1.0.28.ebuild
+++ b/dev-erlang/cache_tab/cache_tab-1.0.28.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="In-memory cache Erlang and Elixir library"
-HOMEPAGE="https://github.com/processone/cache_tab"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	>=dev-erlang/p1_utils-1.0.22"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/eimp/Manifest
+++ b/dev-erlang/eimp/Manifest
@ -1,3 +1 @@
-DIST eimp-1.0.15.tar.gz 3476420 BLAKE2B 09836d8fcb4ff653da37f3be52ae2f2ec930e88d49e774d4915202fe96bab2eb3374786e294ceafe0e97bade804fb70945011ef6d8c8d655fc8a480468c7aee1 SHA512 53038a71c5bb834cd22d1c6cffaf2fbeb09317f2faf69156f6e908f8e70f5322f19ae18ab27ea881dacc4b28c2795529c7e747a83c8ded9037487c2665ad0c41
-DIST eimp-1.0.20.tar.gz 3477544 BLAKE2B 11785102419ca5e1f9c2a51fe29014fc044f2b5caeb70a1a78b664b9f619ef494687254e6e0148ed6a78fc32c6058e0f088e49d9bbc183a97003f3002365a297 SHA512 466fdff4e9be655a9de6d7c72564fc94f0328d471c691e27bfd839a1671a099dd562636de0f0b3d6432c146081008372591d3f527840390566be1bd3a906666a
 DIST eimp-1.0.21.tar.gz 3478113 BLAKE2B 1b2f1cb79edf4b017072872dac7969cb56978e5d2ff1c62f2976a49329793ec0a4c0b747f4f5c562eb202ee8a4f81bf7f466ba6039cc4c3e58542d8bb5aa0d06 SHA512 886b37006226510579044ce8616c367249665e67e2ff553aa5fdda3cd797352e691d4c3d7d3a77b7e558c391244da5ad9df488f2051ee52aa69632e18665339f
--- a/dev-erlang/eimp/eimp-1.0.15.ebuild
+++ b/dev-erlang/eimp/eimp-1.0.15.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Erlang Image Manipulation Process"
-HOMEPAGE="https://github.com/processone/eimp"
-SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
-
-RDEPEND=">=dev-lang/erlang-17.1
-	>=dev-erlang/p1_utils-1.0.19
-	media-libs/gd[png,jpeg,webp]"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_test() {
-	mkdir -p .eunit/priv/bin || die
-	cp priv/bin/eimp .eunit/priv/bin/ || die
-	rebar_src_test
-}
--- a/dev-erlang/eimp/eimp-1.0.20.ebuild
+++ b/dev-erlang/eimp/eimp-1.0.20.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Erlang Image Manipulation Process"
-HOMEPAGE="https://github.com/processone/eimp"
-SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
-
-RDEPEND=">=dev-lang/erlang-17.1
-	>=dev-erlang/p1_utils-1.0.21
-	media-libs/gd[png,jpeg,webp]"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_test() {
-	mkdir -p .eunit/priv/bin || die
-	cp priv/bin/eimp .eunit/priv/bin/ || die
-	rebar_src_test
-}
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@ -1,4 +1 @@
-DIST epam-1.0.10.tar.gz 47727 BLAKE2B 9107bc991a32cf866ea1809a4d36ebb8b00c8c38e9d4eb9333298851fb6f00d89ac5df1e19ee95132f00064ba01c36725cb5351a0188a32e5be655dec7c848b2 SHA512 a659011a9ee8fdf59bd4950c78dcd0f001bf3c4512dfae156d6d66908b918968c80f836bc9801c98f0c3bb90d7bb2df6a36f2066086d623c74c96647d3637054
 DIST epam-1.0.12.tar.gz 49074 BLAKE2B 258b51bf483fa7a8fb58b6d6f7482e2fde7d8013f7d99be3c3ef51992f23af0e2b788fdc71f45f26c9a59af36e39abef646e4c7381f7d997b5fe7e58b600ad64 SHA512 61a1d49c3316fb7f8fcc8b7d7c1ab0b5dd87fa31cecac679a850d191fe9171f7e01473b9979f8107c1c4567836e07ced67336dd5133dfdc5d4680cb3b6c3b270
-DIST epam-1.0.8.tar.gz 47334 BLAKE2B be914b0a5e4657e3ddb3e9bcb607448b14451e112c0b929159a962ca8bdc778e6d7d358fb4053b500e71fddc2fbd16ce6d5b543a5f592c9037d71b4ec09aacc7 SHA512 b09624b7d1650ae741bcfcdddceacf5bfd29bb3e00a4044498d6eaec328f8762423f71025fb89a8242c76934c56b8d60f1910fc390766382468f3d844723bef2
-DIST epam-1.0.9.tar.gz 47548 BLAKE2B b0a8c6e07d788160e153c75e6d8c6535f68279f1f404b25c0fe5ad1559251059a6efd38a9a30c5b180513f69fb22674ba772c29fa598bed5ddc6dcacd9f0f419 SHA512 f537dbfdba09b3f65775e2235e90e2e91951908d95cd10df05581c740d7254cce53a3a2f4131df75f5c6400b3b2cdf6b37651a554076e9cfa66fb3c627d8562c
--- a/dev-erlang/epam/epam-1.0.10.ebuild
+++ b/dev-erlang/epam/epam-1.0.10.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="epam for ejabberd to help with PAM authentication support"
-HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-DEPEND="
-	acct-group/epam
-	>=dev-lang/erlang-17.1
-	sys-libs/pam
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_install() {
-	rebar_src_install
-
-	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
-	fowners root:${PN} "${epam_path}"
-	fperms 4750 "${epam_path}"
-}
--- a/Show More
+++ b/Show More