Sync with portage [Mon Apr 5 01:07:21 MSK 2021].

2021-04-05 01:07:21 +03:00 · 2021-04-05 01:07:21 +03:00 · 716e35ae29
commit 716e35ae29
parent cd652c0ff0
2182 changed files with 24588 additions and 13333 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/http/Manifest
+++ b/acct-group/http/Manifest
--- a/acct-group/http/http-0.ebuild
+++ b/acct-group/http/http-0.ebuild
@ -0,0 +1,8 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=297
--- a/acct-group/http/metadata.xml
+++ b/acct-group/http/metadata.xml
@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/http/Manifest
+++ b/acct-user/http/Manifest
--- a/acct-user/http/http-0.ebuild
+++ b/acct-user/http/http-0.ebuild
@ -0,0 +1,14 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/caddy"
+
+ACCT_USER_HOME=/var/lib/http
+ACCT_USER_GROUPS=( "http" )
+ACCT_USER_ID="297"
+
+acct-user_add_deps
--- a/dev-haskell/network-protocol-xmpp/metadata.xml
+++ b/dev-haskell/network-protocol-xmpp/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
 	</maintainer>
 </pkgmetadata>
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/abrt/abrt-2.14.2.ebuild
+++ b/app-admin/abrt/abrt-2.14.2.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )

-inherit autotools python-single-r1 systemd xdg-utils
+inherit autotools python-single-r1 xdg-utils

 DESCRIPTION="Automatic bug detection and reporting tool"
 HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@ -1 +1 @@
-DIST exo-1.27.0.tar.gz 5345040 BLAKE2B 294ec2a0540259bbe0296e2866f62fd472bf20c7abac8a2660eef23b819b7191d0d1f7ef8b8937382a621a13a1ab3a9bb7af7834cf9fa0b6e1b278596c1cd6a7 SHA512 c03d0c60537e81743941401ae24b39ba036e4bced935fc00ff6b6f78c9db0a4bec67a96ab77ff62a5d94be4ddc04cfe05bc3ffe377c766a775f74315e1cd5111
+DIST exo-1.27.1.tar.gz 5344908 BLAKE2B 2672cd1e0e4ac59585c0ab376d130fc650db4a9ce8ac3ad7e28b3f22ebdabd4b6d61a477a2b1b8f4da098ef6ed296f6c9a8dae6cc734843c1d4dccb6cd2fbcc2 SHA512 e6d74968ad5677bef4b6c5b698281d1b27949214e3c1f87cbce15e622cfc800b4b0e958c6ea75f9a7eb1f8f3211f0e13bc6819dcc5e95cf996936b956c276619
--- a/app-admin/exo/exo-1.27.1.ebuild
+++ b/app-admin/exo/exo-1.27.1.ebuild
--- a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
@ -4,7 +4,7 @@
 EAPI=6

 CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
+inherit haskell-cabal

 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
 HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
@ -13,7 +13,6 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""

 DEPEND=">=dev-lang/ghc-6.12.1"

--- a/app-admin/pass/pass-1.7.4_pre20210216.ebuild
+++ b/app-admin/pass/pass-1.7.4_pre20210216.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://git.zx2c4.com/password-store"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos"
 	COMMIT_ID="918992c19231b33b3d4a3288a7288a620e608cb4"
 	SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${COMMIT_ID}.tar.xz"
 	S="${WORKDIR}/${PN}"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@ -91,7 +91,7 @@ src_prepare() {
 	fi

 	if use kde || use wxwidgets; then
-		need-wxwidgets unicode
+		setup-wxwidgets unicode
 		einfo "Preparing dependency list"
 		emake depend
 	fi
--- a/app-arch/p7zip/p7zip-16.02-r5.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r5.ebuild
@ -93,7 +93,7 @@ src_prepare() {
 	fi

 	if use kde || use wxwidgets; then
-		need-wxwidgets unicode
+		setup-wxwidgets unicode
 		einfo "Preparing dependency list"
 		emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
 	fi
--- a/app-arch/p7zip/p7zip-16.02-r7.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r7.ebuild
@ -1,33 +1,29 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 WX_GTK_VER="3.0"
-
-inherit eutils toolchain-funcs wxwidgets
+inherit multilib toolchain-funcs wrapper wxwidgets

 DESCRIPTION="Port of 7-Zip archiver for Unix"
 HOMEPAGE="http://p7zip.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+S="${WORKDIR}/${PN}_${PV}"

 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
-
 REQUIRED_USE="kde? ( wxwidgets )"

 RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
 	amd64? ( dev-lang/yasm )
 	x86? ( dev-lang/nasm )"

-S=${WORKDIR}/${PN}_${PV}
-
-DOCS=( ChangeLog README TODO )
-
 PATCHES=(
 	"${FILESDIR}"/${P}-darwin.patch
 	"${FILESDIR}"/CVE-2016-9296.patch
@ -61,7 +57,7 @@ src_prepare() {
 			-e '/Rar/d' \
 			-e '/RAR/d' \
 			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
-		rm -rf CPP/7zip/Compress/Rar || die
+		rm -r CPP/7zip/Compress/Rar || die
 	fi

 	if use abi_x86_x32; then
@ -75,7 +71,7 @@ src_prepare() {
 		# Mac OS X needs this special makefile, because it has a non-GNU
 		# linker, it doesn't matter so much for bitwidth, for it doesn't
 		# do anything with it
-		cp -f makefile.macosx_llvm_64bits makefile.machine
+		cp -f makefile.macosx_llvm_64bits makefile.machine || die
 		# bundles have extension .bundle but don't die because USE=-rar
 		# removes the Rar directory
 		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
@ -85,7 +81,7 @@ src_prepare() {
 			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
 	elif use x86-fbsd; then
 		# FreeBSD needs this special makefile, because it hasn't -ldl
-		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine || die
 	fi

 	if use static; then
@ -93,7 +89,7 @@ src_prepare() {
 	fi

 	if use kde || use wxwidgets; then
-		need-wxwidgets unicode
+		setup-wxwidgets unicode
 		einfo "Preparing dependency list"
 		emake CC=$(tc-getCC) CXX=$(tc-getCXX) depend
 	fi
@ -103,7 +99,6 @@ src_compile() {
 	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
 	if use kde || use wxwidgets; then
 		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
-#		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zFM
 	fi
 }

@ -112,23 +107,19 @@ src_test() {
 }

 src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
-	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
-	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+	# these wrappers cannot be symlinks, p7zip should be called with full path
+	make_wrapper 7zr /usr/$(get_libdir)/p7zip/7zr
+	make_wrapper 7za /usr/$(get_libdir)/p7zip/7za
+	make_wrapper 7z /usr/$(get_libdir)/p7zip/7z

 	if use kde || use wxwidgets; then
-		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
-#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
-
-#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+		make_wrapper 7zG /usr/$(get_libdir)/p7zip/7zG

 		dobin GUI/p7zipForFilemanager
-		exeinto /usr/$(get_libdir)/${PN}
-#		doexe bin/7z{G,FM}
+		exeinto /usr/$(get_libdir)/p7zip
 		doexe bin/7zG

-		insinto /usr/$(get_libdir)/${PN}
+		insinto /usr/$(get_libdir)/p7zip
 		doins -r GUI/Lang

 		insinto /usr/share/icons/hicolor/16x16/apps/
@ -138,30 +129,26 @@ src_install() {
 			rm GUI/kde4/p7zip_compress.desktop || die
 			insinto /usr/share/kservices5/ServiceMenus
 			doins GUI/kde4/*.desktop
-			dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
-			for item in "${ED}"/usr/share/kservices5/ServiceMenus/*.desktop; do
-				item="$(basename ${item})"
-				dosym ${EROOT}"/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
-			done
 		fi
 	fi

 	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
 	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1

-	exeinto /usr/$(get_libdir)/${PN}
+	exeinto /usr/$(get_libdir)/p7zip
 	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
 	doexe bin/*$(get_modname)
 	if use rar; then
-		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		exeinto /usr/$(get_libdir)/p7zip/Codecs
 		doexe bin/Codecs/*$(get_modname)
 	fi

 	doman man1/7z.1 man1/7za.1 man1/7zr.1

+	dodoc ChangeLog README TODO
 	if use doc; then
 		dodoc DOC/*.txt
 		docinto html
-		dodoc -r DOC/MANUAL/*
+		dodoc -r DOC/MANUAL/.
 	fi
 }
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/rear/rear-2.6.ebuild
+++ b/app-backup/rear/rear-2.6.ebuild
@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -55,6 +55,6 @@ pkg_postinst() {
 		udev_reload
 	fi

-	optfeature "if you want to save backups on smb/cifs servers" net-fs/cifs-utils
-	optfeature "if you want to encrypt your backups" dev-libs/openssl dev-libs/libressl
+	optfeature "saving backups on smb/cifs servers" net-fs/cifs-utils
+	optfeature "encrypting backups" dev-libs/openssl dev-libs/libressl
 }
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3-r1.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3-r1.ebuild
@ -36,6 +36,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"

+PATCHES=(
+	"${FILESDIR}/${P}-dont-mount-ISO-multiple-times.patch" # KDE-bug 434617
+)
+
 src_prepare() {
 	ecm_src_prepare
 	# kxmlgui, qtnetwork only required by dropbox
--- a/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch
+++ b/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch
@ -0,0 +1,41 @@
+From f136702d2adc8643ea12f1b6e3bf97925f1b33f0 Mon Sep 17 00:00:00 2001
+From: Kwon-Young Choi <kwon-young.choi@hotmail.fr>
+Date: Fri, 19 Mar 2021 17:10:31 +0100
+Subject: [PATCH] BackingFile property should be use with StorageVolume instead
+ of StorageAccess
+
+BUG: 434617
+
+When mounting an iso with `udisksctl`, first a loop device is created
+`/dev/loop0` then a second device `/dev/loop0p1` is used to mount it on
+a filesystem location.
+
+Querying for StorageAccess devices sometimes only returns the `/dev/loop0p1`
+device without the `/dev/loop0` device and the BackingFile property does not
+work on `/dev/loop0p1`.
+
+Solution: query for StorageVolume instead which returns all loop devices:
+`/dev/loop0` and `/dev/loop1`.
+
+Warning: Because StorageVolume returns more devices, the function
+`getDeviceFromBackingFile` could be a little bit slower.
+---
+ mountiso/mountisoaction.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mountiso/mountisoaction.cpp b/mountiso/mountisoaction.cpp
+index e5575ae..d198a89 100644
+--- a/mountiso/mountisoaction.cpp
+++ b/mountiso/mountisoaction.cpp
+@@ -78,7 +78,7 @@ MountIsoAction::MountIsoAction(QObject *parent, const QVariantList &)
+ const Solid::Device getDeviceFromBackingFile(const QString &backingFile)
+ {
+     const QList<Solid::Device> blockDevices =
+-        Solid::Device::listFromQuery("[ IS StorageAccess AND IS GenericInterface ]");
+        Solid::Device::listFromQuery("[ IS StorageVolume AND IS GenericInterface ]");
+ 
+     for (const Solid::Device &device : blockDevices) {
+         auto genericDevice = device.as<Solid::GenericInterface>();
+-- 
+GitLab
+
--- a/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
+++ b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
@ -1,5 +1,5 @@
--- Makefile
-+++ Makefile
+--- a/Makefile
+++ b/Makefile
@@ -2,17 +2,17 @@
 #               Copyright (c) 1999-2002 Georg Huettenegger
 #
--- a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
+++ b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
@ -1,34 +1,43 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs

 DESCRIPTION="Tool to change the parameters of a Plextor CD-ROM drive"
 HOMEPAGE="http://plextor-tool.sourceforge.net/"
 SRC_URI="mirror://sourceforge/plextor-tool/${P}.src.tar.bz2"
+S="${WORKDIR}"/${PN}/src

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static"

-S=${WORKDIR}/${PN}/src
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)

 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+	default
+
 	gunzip plextor-tool.8.gz || die
 }

 src_compile() {
 	local targets="plextor-tool"
+
 	use static && targets="${targets} pt-static"
-	echo ${targets} > my-make-targets
+
+	echo ${targets} > my-make-targets || die
+
 	emake CC="$(tc-getCC)" ${targets}
 }

 src_install() {
 	local targets=$(<my-make-targets)
+
 	dodoc ../doc/{NEWS,README} TODO
 	dobin ${targets}
 	doman plextor-tool.8
--- a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
+++ b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
@ -1,5 +1,5 @@
--- a/configure.in	2014-12-02 18:56:23.000000000 +0300
-+++ b/configure.in	2014-12-02 19:09:46.724190436 +0300
+--- a/configure.in
+++ b/configure.in
@@ -6,13 +6,13 @@
 
 dnl Checks for libraries.
--- a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
+++ b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Xbox xdvdfs ISO extraction utility"
-HOMEPAGE="https://sourceforge.net/projects/xbiso/"
-SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_prepare() {
-	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
-	epatch "${FILESDIR}/${P}-libs.patch"
-	mv configure.in configure.ac || die #426262
-	eautoreconf
-}
-
-src_configure() {
-	# for this package, interix behaves the same as BSD
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
-
-	econf --disable-ftp
-}
-
-src_install() {
-	dobin xbiso
-	dodoc CHANGELOG README
-}
--- a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
+++ b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

 src_prepare() {
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild
+++ b/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild
@ -45,8 +45,7 @@ src_install() {
 }

 pkg_postinst() {
-	einfo "If you wish to use the webserver mode,"
-	einfo "you need to install a supported web server."
-	optfeature "using apache2 webserver mode." www-servers/apache
-	optfeature "using nginx webserver mode." www-servers/nginx
+	optfeature_header "For webserver mode, install a supported web server:"
+	optfeature "using apache2 webserver mode" www-servers/apache
+	optfeature "using nginx webserver mode" www-servers/nginx
 }
--- a/app-crypt/acme-sh/acme-sh-9999.ebuild
+++ b/app-crypt/acme-sh/acme-sh-9999.ebuild
@ -41,8 +41,7 @@ src_install() {
 }

 pkg_postinst() {
-	einfo "If you wish to use the webserver mode,"
-	einfo "you need to install a supported web server."
-	optfeature "using apache2 webserver mode." www-servers/apache
-	optfeature "using nginx webserver mode." www-servers/nginx
+	optfeature_header "For webserver mode, install a supported web server:"
+	optfeature "using apache2 webserver mode" www-servers/apache
+	optfeature "using nginx webserver mode" www-servers/nginx
 }
--- a/app-crypt/acme/acme-1.13.0.ebuild
+++ b/app-crypt/acme/acme-1.13.0.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi

--- a/app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi

--- a/app-crypt/certbot-nginx/certbot-nginx-1.13.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.13.0.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi

--- a/app-crypt/certbot/certbot-1.13.0.ebuild
+++ b/app-crypt/certbot/certbot-1.13.0.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 S=${WORKDIR}/${P}/${PN}

--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit cuda eutils flag-o-matic toolchain-funcs multilib
+inherit cuda flag-o-matic toolchain-funcs

 MY_PN="john"
 MY_P="${MY_PN}-${PV}"
--- a/app-crypt/openpgp-keys-libvirt/Manifest
+++ b/app-crypt/openpgp-keys-libvirt/Manifest
@ -0,0 +1 @@
+DIST 453B65310595562855471199CA68BE8010084C9C.asc 3155 BLAKE2B 7126ccc1af0350ab179c137915bfb1ab7da715219a7f037a08f79d3e503d4fa424a01cf83cd57866c8fb22957e1b736d7c32e68035189b182b09ac9be696eda6 SHA512 49861840e534d1b1ed7d9ba16d825b5f861e05d82119adea8e3bf16355c6c3ed5cdab39c828f9e33f644ff9b806735ca2e70ddaa7c9e92aead87019515118006
--- a/app-crypt/openpgp-keys-libvirt/metadata.xml
+++ b/app-crypt/openpgp-keys-libvirt/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
+		<email>virtualization@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
--- a/app-crypt/openpgp-keys-libvirt/openpgp-keys-libvirt-20210401.ebuild
+++ b/app-crypt/openpgp-keys-libvirt/openpgp-keys-libvirt-20210401.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used by libvirt"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+SRC_URI="https://libvirt.org/sources/gpg_key.asc -> 453B65310595562855471199CA68BE8010084C9C.asc"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+S=${WORKDIR}
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - libvirt.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
@ -5,7 +5,7 @@ EAPI=7

 PYTHON_COMPAT=( python3_{7,8,9} )

-inherit eutils qmake-utils python-single-r1 desktop
+inherit qmake-utils python-single-r1 desktop

 DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
 HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
@ -2,15 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )

+PYTHON_COMPAT=( python3_{7,8} )
 CMAKE_MAKEFILE_GENERATOR="emake"

-inherit cmake-utils eutils flag-o-matic llvm python-any-r1
+inherit cmake-utils flag-o-matic llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
 	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"
--- a/app-doc/doxygen/doxygen-1.8.20.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.20.ebuild
@ -2,15 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )

+PYTHON_COMPAT=( python3_{7,8} )
 CMAKE_MAKEFILE_GENERATOR="emake"

-inherit cmake-utils eutils flag-o-matic llvm python-any-r1
+inherit cmake-utils flag-o-matic llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
 	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"
--- a/app-doc/doxygen/doxygen-1.9.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
@ -9,7 +9,6 @@ inherit cmake flag-o-matic llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
 	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"
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@ -9,7 +9,6 @@ inherit cmake flag-o-matic llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
 	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"
--- a/app-doc/gnucash-docs/gnucash-docs-4.4.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-4.4.ebuild
@ -60,6 +60,6 @@ src_install() {
 }

 pkg_postinst() {
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+	optfeature "generating PDF files" dev-java/fop
+	optfeature "viewing the docs" gnome-extra/yelp
 }
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
@ -36,10 +36,9 @@ src_prepare() {
 	# bug #440744
 	sed -i  -e 's/ -Wall -g -fexceptions//g' configure.ac || die
 	eautoreconf
-
-	need-wxwidgets unicode
 }

 src_configure() {
+	setup-wxwidgets unicode
 	econf $(use_enable nls)
 }
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -1,3 +1,6 @@
-DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9
 DIST libvirt-7.0.0.tar.xz 8567648 BLAKE2B 0c0b360c371a14b6d82dc6bef4b228bf7a4a17db1a8425d1354128b0705365a04440217ed0862761b2a8eaf81d81494177d777e734a9045bbc87fc613b56eb05 SHA512 dd6db5ec4971cf4c6059795fd81d5a3a889b10740e34c3c92271eda1c683c99df2c8f923398065d8a7c4f987a20eb1da617d5297ba8ea5a31f154412af50c343
+DIST libvirt-7.0.0.tar.xz.asc 833 BLAKE2B 7cc16442f39de660caa38801b12994ca312b250d6c3e5bbef38613702a03cd31cb9b7eaa792af4f8c1b737d67e62f18baa02b481e7fa4d6ec8fc9a07a44db4de SHA512 fb0b6240dbb4e827456f6c573bb3466f19282383bcee5bae8ece923260eca6d252f64b1adfac9a26fdac2a57bb9390aa4c0071e54d16d3e294230b3562764f18
 DIST libvirt-7.1.0.tar.xz 8645944 BLAKE2B 97a76091616b427fc64a6a3caf5d9b04d7b9aed7ff7a6d70536ca2eb95d902f0f5ed4b5e56fbdfc6c40f443fb68f4850cff0545256826e575e78fea97158e8f7 SHA512 475b212e920bf8587db4a551126d9eb417d4e18a72550f94feb1aec94821fbac8c84d67ffd59cfe4f8289b6b10ae5f6b579ee170c0d72cb0493ec7ec52183cd6
+DIST libvirt-7.1.0.tar.xz.asc 833 BLAKE2B 2610cff98967260a5005840e1b03cff16790da82d9a51f14d6b34453db3ba89aa34915bba69d57b333f50d17e2492c77e85ee4e6282b8fe5f4cd0f7ace638334 SHA512 6c92c91bc7f23b32deee3442008b44d6469a9cabf2ed39459afcbfce9b3f2b1b655514a068c4bcdc8909ba02a0a4762e8f845ae4dba8da18719acf45614ca6da
+DIST libvirt-7.2.0.tar.xz 8661052 BLAKE2B eae6b4e7422690dd780e1647e2a39dfdff0562f3e63bce9ca5ee34540dec3755269efaad459d1b516b56fdeb1503cc966ffa60378aaa18210b972b739716fe34 SHA512 f6bb26ca7cb5a8d342f1f39afd051ed76b71414e1b934557cf50784da17e4f2fb3301c2ace3b593fcdeb6a18ad559a007ad594111c2c348b9157d3a59d475928
+DIST libvirt-7.2.0.tar.xz.asc 833 BLAKE2B c389d80ef4f7627230b88446ef77daab1bf34e49e20cfb5c5418500fdf388af23aeb2458551548cb732c868f87f35a5c28acff8c01faebe985a6953953a69149 SHA512 526955a9f9d294635e63a4ed20c3e478fb4b5f3a63150a59ff30d84ad16a286ddb4c6508d0317c56df63a0d22a099085697df344fe2b15bce07acf9f05cda331
--- a/app-emulation/libvirt/files/libvirt-6.8.0-fix-libvirt-lxc-dbus.patch
+++ b/app-emulation/libvirt/files/libvirt-6.8.0-fix-libvirt-lxc-dbus.patch
@ -1,24 +0,0 @@
-https://bugs.gentoo.org/753761
-
-diff --git a/src/util/virgdbus.c b/src/util/virgdbus.c
-index 4360a6a..4ad1a5c 100644
--- a/src/util/virgdbus.c
-+++ b/src/util/virgdbus.c
-@@ -54,11 +54,15 @@ virGDBusBusInit(GBusType type, GError **error)
-     if (sharedBus) {
-         return g_bus_get_sync(type, NULL, error);
-     } else {
-+        GDBusConnectionFlags dbusFlags =
-+                G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
-+                G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION;
-+
-         address = g_dbus_address_get_for_bus_sync(type, NULL, error);
-        if (error)
-+        if (*error)
-             return NULL;
-         return g_dbus_connection_new_for_address_sync(address,
-                                                      G_DBUS_CONNECTION_FLAGS_NONE,
-+                                                      dbusFlags,
-                                                       NULL,
-                                                       NULL,
-                                                       error);
--- a/app-emulation/libvirt/files/libvirt-6.8.0-meson-properly-handle-libpcap-if-it-s-explicitly-dis.patch
+++ b/app-emulation/libvirt/files/libvirt-6.8.0-meson-properly-handle-libpcap-if-it-s-explicitly-dis.patch
@ -1,56 +0,0 @@
-From c8be9ccc36a32cc756d05b2c0838c43a57be15f7 Mon Sep 17 00:00:00 2001
-Message-Id: <c8be9ccc36a32cc756d05b2c0838c43a57be15f7.1607284606.git.mprivozn@redhat.com>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Thu, 8 Oct 2020 13:09:45 +0200
-Subject: [PATCH] meson: properly handle libpcap if it's explicitly disabled
-
-If libpcap is detected using pkg-config it would ignore the libpcap
-option.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
- meson.build | 25 +++++++++++++++----------
- 1 file changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index e5a8316668..ec252ddf39 100644
--- a/meson.build
-+++ b/meson.build
-@@ -1101,17 +1101,22 @@ if libparted_dep.found()
- endif
- 
- libpcap_version = '1.5.0'
-libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false)
-if not libpcap_dep.found()
-  pcap_config_prog = find_program('pcap-config', required: get_option('libpcap'))
-  if pcap_config_prog.found()
-    pcap_args = run_command(pcap_config_prog, '--cflags').stdout().strip().split()
-    pcap_libs = run_command(pcap_config_prog, '--libs').stdout().strip().split()
-    libpcap_dep = declare_dependency(
-      compile_args: pcap_args,
-      link_args: pcap_libs,
-    )
-+if not get_option('libpcap').disabled()
-+  libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false)
-+
-+  if not libpcap_dep.found()
-+    pcap_config_prog = find_program('pcap-config', required: get_option('libpcap'))
-+    if pcap_config_prog.found()
-+      pcap_args = run_command(pcap_config_prog, '--cflags').stdout().strip().split()
-+      pcap_libs = run_command(pcap_config_prog, '--libs').stdout().strip().split()
-+      libpcap_dep = declare_dependency(
-+        compile_args: pcap_args,
-+        link_args: pcap_libs,
-+      )
-+    endif
-   endif
-+else
-+  libpcap_dep = dependency('', required: false)
- endif
- if libpcap_dep.found()
-   conf.set('WITH_LIBPCAP', 1)
-- 
-2.26.2
-
--- a/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild
@ -5,7 +5,7 @@ EAPI=7

 PYTHON_COMPAT=( python3_{7,8,9} )

-inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 tmpfiles
+inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig

 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@ -13,7 +13,8 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	SLOT="0"
 else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
 	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	SLOT="0/${PV}"
 fi
@ -21,6 +22,7 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/"
 LICENSE="LGPL-2.1"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
 	apparmor audit +caps dtrace firewalld fuse glusterfs iscsi
 	iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
@ -44,7 +46,8 @@ BDEPEND="
 	dev-libs/libxslt
 	dev-perl/XML-XPath
 	dev-python/docutils
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )"

 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.
--- a/app-emulation/libvirt/libvirt-7.1.0.ebuild
+++ b/app-emulation/libvirt/libvirt-7.1.0.ebuild
@ -5,7 +5,7 @@ EAPI=7

 PYTHON_COMPAT=( python3_{7,8,9} )

-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig

 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@ -13,7 +13,8 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	SLOT="0"
 else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	SLOT="0/${PV}"
 fi
@ -21,6 +22,7 @@ fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
 LICENSE="LGPL-2.1"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
 	apparmor audit +caps dtrace firewalld fuse glusterfs iscsi
 	iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
@ -44,7 +46,8 @@ BDEPEND="
 	dev-libs/libxslt
 	dev-perl/XML-XPath
 	dev-python/docutils
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )"

 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.
--- a/app-emulation/libvirt/libvirt-6.8.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-6.8.0-r2.ebuild
@ -5,7 +5,7 @@ EAPI=7

 PYTHON_COMPAT=( python3_{7,8,9} )

-inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 tmpfiles
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig

 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@ -13,18 +13,20 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	SLOT="0"
 else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	SLOT="0/${PV}"
 fi

 DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
 LICENSE="LGPL-2.1"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="
-	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
-	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev +vepa
+	apparmor audit +caps dtrace firewalld fuse glusterfs iscsi
+	iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
+	parted pcap policykit +qemu rbd sasl selinux +udev
 	virtualbox +virt-network wireshark-plugins xen zfs
 "

@ -33,22 +35,19 @@ REQUIRED_USE="
 	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
 	lxc? ( caps libvirtd )
 	openvz? ( libvirtd )
-	policykit? ( dbus )
 	qemu? ( libvirtd )
-	vepa? ( macvtap )
 	virt-network? ( libvirtd )
 	virtualbox? ( libvirtd )
 	xen? ( libvirtd )"

 BDEPEND="
-	acct-user/qemu
-	policykit? ( acct-group/libvirt )
 	app-text/xhtml1
 	dev-lang/perl
 	dev-libs/libxslt
 	dev-perl/XML-XPath
 	dev-python/docutils
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )"

 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.
@ -56,6 +55,7 @@ BDEPEND="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
 	app-misc/scrub
 	>=dev-libs/glib-2.48.0
 	dev-libs/libgcrypt:0
@ -67,14 +67,15 @@ RDEPEND="
 	net-libs/libtirpc
 	net-libs/rpcsvc-proto
 	>=net-misc/curl-7.18.0
+	sys-apps/dbus
 	sys-apps/dmidecode
 	sys-devel/gettext
 	sys-libs/ncurses:0=
 	sys-libs/readline:=
+	virtual/acl
 	apparmor? ( sys-libs/libapparmor )
 	audit? ( sys-process/audit )
 	caps? ( sys-libs/libcap-ng )
-	dbus? ( sys-apps/dbus )
 	dtrace? ( dev-util/systemtap )
 	firewalld? ( >=net-firewall/firewalld-0.6.3 )
 	fuse? ( sys-fs/fuse:0= )
@ -83,6 +84,7 @@ RDEPEND="
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( net-libs/libssh )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
 	nfs? ( net-fs/nfs-utils )
 	numa? (
 		>sys-process/numactl-2.0.2
@ -93,7 +95,10 @@ RDEPEND="
 		sys-fs/lvm2[-device-mapper-only(-)]
 	)
 	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
 	qemu? (
 		>=app-emulation/qemu-1.5.0
 		dev-libs/yajl
@ -102,7 +107,7 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( >=sys-libs/libselinux-2.0.85 )
 	virt-network? (
-		net-dns/dnsmasq[script]
+		net-dns/dnsmasq[dhcp,ipv6,script]
 		net-firewall/ebtables
 		>=net-firewall/iptables-1.4.10[ipv6]
 		net-misc/radvd
@ -126,10 +131,7 @@ DEPEND="${BDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-6.8.0-fix-libvirt-lxc-dbus.patch
-	"${FILESDIR}"/${PN}-6.8.0-meson-properly-handle-libpcap-if-it-s-explicitly-dis.patch
 )

 pkg_setup() {
@ -173,9 +175,6 @@ pkg_setup() {
 	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
 		~DEVPTS_MULTIPLE_INSTANCES"

-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
 	use virt-network && CONFIG_CHECK+="
 		~BRIDGE_EBT_MARK_T
 		~BRIDGE_NF_EBTABLES
@ -201,24 +200,20 @@ pkg_setup() {
 		~NET_SCH_INGRESS
 		~NET_SCH_SFQ"

-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	if kernel_is ge 3 6; then
-		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-	fi
-
 	ERROR_USER_NS="Optional depending on LXC configuration."

 	if [[ -n ${CONFIG_CHECK} ]]; then
 		linux-info_pkg_setup
 	fi
+
+	python-any-r1_pkg_setup
 }

 src_prepare() {
 	touch "${S}/.mailmap" || die

 	default
+	python_fix_shebang .

 	# Tweak the init script:
 	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
@ -232,7 +227,6 @@ src_configure() {
 		$(meson_use apparmor apparmor_profiles)
 		$(meson_feature audit)
 		$(meson_feature caps capng)
-		$(meson_feature dbus)
 		$(meson_feature dtrace)
 		$(meson_feature firewalld)
 		$(meson_feature fuse)
@ -245,7 +239,6 @@ src_configure() {
 		$(meson_feature lvm storage_lvm)
 		$(meson_feature lvm storage_mpath)
 		$(meson_feature lxc driver_lxc)
-		$(meson_feature macvtap)
 		$(meson_feature nls)
 		$(meson_feature numa numactl)
 		$(meson_feature numa numad)
@ -259,14 +252,12 @@ src_configure() {
 		$(meson_feature sasl)
 		$(meson_feature selinux)
 		$(meson_feature udev)
-		$(meson_feature vepa virtualport)
 		$(meson_feature virt-network driver_network)
 		$(meson_feature virtualbox driver_vbox)
 		$(meson_feature wireshark-plugins wireshark_dissector)
 		$(meson_feature xen driver_libxl)
 		$(meson_feature zfs storage_zfs)

-		-Dhal=disabled
 		-Dnetcf=disabled
 		-Dsanlock=disabled

@ -280,19 +271,13 @@ src_configure() {

 		--localstatedir="${EPREFIX}/var"
 		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 	)

 	meson_src_configure
 }

 src_test() {
-	# remove problematic tests, bug #591416, bug #591418
-	sed -i -e 's#commandtest$(EXEEXT) # #' \
-		-e 's#virfirewalltest$(EXEEXT) # #' \
-		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-		tests/Makefile
-
 	export VIR_TEST_DEBUG=1
 	meson_src_test
 }
@ -300,11 +285,21 @@ src_test() {
 src_install() {
 	meson_src_install

-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig || die
-	rm -rf "${D}"/var || die
-	rm -rf "${D}"/run || die
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	# Fix up doc paths for revisions
+	if [[ $PV != $PVR ]]; then
+		mv "${D}"/usr/share/doc/${PN}-${PV}/* "${D}"/usr/share/doc/${PF} || die
+		rmdir "${D}"/usr/share/doc/${PN}-${PV} || die
+	fi

 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
@ -327,13 +322,6 @@ src_install() {
 	readme.gentoo_create_doc
 }

-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-}
-
 pkg_postinst() {
 	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
 		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@ -67,12 +67,6 @@
 	<flag name="pcap">
 		Support auto learning IP addreses for routing
 	</flag>
-	<flag name="macvtap">
-		Support for MAC-based TAP (macvlan/macvtap). For networking instead
-		of the normal TUN/TAP.
-	</flag>
-	<flag name="vepa">Virtual Ethernet Port Aggregator (VEPA) / 802.1Qbg
-		support. Relies on macvtap support.</flag>
 	<flag name="virt-network">
 		Enable virtual networking (NAT) support for guests. Includes all
 		the dependencies for NATed network mode. Effectively any network
--- a/app-emulation/lxc/lxc-4.0.6.ebuild
+++ b/app-emulation/lxc/lxc-4.0.6.ebuild
@ -167,7 +167,6 @@ pkg_postinst() {

 	elog "Please run 'lxc-checkconfig' to see optional kernel features."
 	elog
-	elog "Optional uninstalled dependencies:"
 	optfeature "automatic template scripts" app-emulation/lxc-templates
 	optfeature "Debian-based distribution container image support" dev-util/debootstrap
 	optfeature "snapshot & restore functionality" sys-process/criu
--- a/app-emulation/lxd/lxd-4.0.4-r7.ebuild
+++ b/app-emulation/lxd/lxd-4.0.4-r7.ebuild
@ -145,7 +145,6 @@ pkg_postinst() {
 	elog
 	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
 	elog
-	elog "Optional features:"
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
--- a/app-emulation/lxd/lxd-4.0.5.ebuild
+++ b/app-emulation/lxd/lxd-4.0.5.ebuild
@ -144,7 +144,6 @@ pkg_postinst() {
 	elog
 	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
 	elog
-	elog "Optional features:"
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
--- a/app-emulation/qemu/qemu-5.2.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r2.ebuild
@ -32,7 +32,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"

-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
 	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo multipath
--- a/app-emulation/qemu/qemu-5.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r3.ebuild
@ -33,7 +33,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"

-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
 	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo multipath
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -32,7 +32,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"

-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
 	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo multipath
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@ -1,2 +1,2 @@
 DIST spice-vdagent-0.19.0.tar.bz2 151356 BLAKE2B b7a99a7205d955b27edfe483746e3f267a6e0b7885c4b8146ba42d99b581cf4e1748b503a37a3d6b66623ef2515b42756f2e6a5a4775d56def7aa396bd0dfb4f SHA512 f5056dfe66df3ee8205549be22bbc8c17d2196c8448eda97f01659ff30c34d9929f330767d7fafec557dc5f7fb9b65eaf85973193b38df774042de9b72d6e60d
-DIST spice-vdagent-0.20.0.tar.bz2 152510 BLAKE2B b00caadab385f4208bd18b78a006831953f99387e55fd86226efffdf537426627f02bb46708173b700eecd21f598a0db94f454c5252b0f4bfb93c30b39d69d16 SHA512 a6288e056645c071834f9ce5800669cb64e0f86a5efeb8eec61ac1e11f1fd56f7da8ea19b28a94c88741d794a0290fac9bcf74d45bcef271c2c5abfb2573a8e1
+DIST spice-vdagent-0.21.0.tar.bz2 164103 BLAKE2B 298122b334f880ffb8d77d3a7d822b70debce56d62bc3004bbac37445f10236a47706d23501ee3f82520c45b65deec12c9578cf4a8b9ac138df8b1c0b8cdb784 SHA512 1ff1a89e75301b1c2c89f26ba4bce8d4df29bbff6387ade128ce847ca30162a2bc731c70c10a8d129518e64bbca6b8271fd11ff3e340899182a65a5295051bff
--- a/app-emulation/spice-vdagent/spice-vdagent-0.21.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.21.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-404d7478.patch
+++ b/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-404d7478.patch
@ -0,0 +1,31 @@
+diff --git a/common/quic.c b/common/quic.c
+index bc753ca5064a0326906b4aa8c18d8745747feb5c..681531677fbd6c3bca5e482c77bb709d4465ef8e 100644
+--- a/subprojects/spice-common/common/quic.c
+++ b/subprojects/spice-common/common/quic.c
+@@ -56,6 +56,9 @@ typedef uint8_t BYTE;
+ #define MINwminext 1
+ #define MAXwminext 100000000
+ 
+/* Maximum image size in pixels, mainly to avoid possible integer overflows */
+#define SPICE_MAX_IMAGE_SIZE (512 * 1024 * 1024 - 1)
+
+ typedef struct QuicFamily {
+     unsigned int nGRcodewords[MAXNUMCODES];      /* indexed by code number, contains number of
+                                                     unmodified GR codewords in the code */
+@@ -1165,6 +1168,16 @@ int quic_decode_begin(QuicContext *quic, uint32_t *io_ptr, unsigned int num_io_w
+     height = encoder->io_word;
+     decode_eat32bits(encoder);
+ 
+    if (width <= 0 || height <= 0) {
+        encoder->usr->warn(encoder->usr, "invalid size\n");
+        return QUIC_ERROR;
+    }
+
+    /* avoid too big images */
+    if ((uint64_t) width * height > SPICE_MAX_IMAGE_SIZE) {
+        encoder->usr->error(encoder->usr, "image too large\n");
+    }
+
+     quic_image_params(encoder, type, &channels, &bpc);
+ 
+     if (!encoder_reset_channels(encoder, channels, width, bpc)) {
--- a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-762e0aba.patch
+++ b/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-762e0aba.patch
@ -0,0 +1,13 @@
+diff --git a/common/quic.c b/common/quic.c
+index e2dee0fd68741512911d5d050053ad073cf29457..bc753ca5064a0326906b4aa8c18d8745747feb5c 100644
+--- a/subprojects/spice-common/common/quic.c
+++ b/subprojects/spice-common/common/quic.c
+@@ -1136,7 +1136,7 @@ int quic_decode_begin(QuicContext *quic, uint32_t *io_ptr, unsigned int num_io_w
+     int channels;
+     int bpc;
+ 
+-    if (!encoder_reset(encoder, io_ptr, io_ptr_end)) {
+    if (!num_io_words || !encoder_reset(encoder, io_ptr, io_ptr_end)) {
+         return QUIC_ERROR;
+     }
+ 
--- a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-b24fe6b6.patch
+++ b/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-b24fe6b6.patch
@ -0,0 +1,18 @@
+diff --git a/common/quic_family_tmpl.c b/common/quic_family_tmpl.c
+index 8a5f7d2c9be3f6b1bd82993703749268bab243b4..6cc051b36889f773fe5401e204db6245d99e27df 100644
+--- a/subprojects/spice-common/common/quic_family_tmpl.c
+++ b/subprojects/spice-common/common/quic_family_tmpl.c
+@@ -103,7 +103,12 @@ static s_bucket *FNAME(find_bucket)(Channel *channel, const unsigned int val)
+ {
+     spice_extra_assert(val < (0x1U << BPC));
+ 
+-    return channel->_buckets_ptrs[val];
+    /* The and (&) here is to avoid buffer overflows in case of garbage or malicious
+     * attempts. Is much faster then using comparisons and save us from such situations.
+     * Note that on normal build the check above won't be compiled as this code path
+     * is pretty hot and would cause speed regressions.
+     */
+    return channel->_buckets_ptrs[val & ((1U << BPC) - 1)];
+ }
+ 
+ #undef FNAME
--- a/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-ef1b6ff7.patch
+++ b/app-emulation/spice/files/spice-0.14.3-CVE-2020-14355-ef1b6ff7.patch
@ -0,0 +1,17 @@
+diff --git a/common/quic_tmpl.c b/common/quic_tmpl.c
+index ecd6f3f187c753a89b7dbb0657edc3ae82ffaaff..ebae992d642a657a7505b3ca0e8145310805f32f 100644
+--- a/subprojects/spice-common/common/quic_tmpl.c
+++ b/subprojects/spice-common/common/quic_tmpl.c
+@@ -563,7 +563,11 @@ static void FNAME_DECL(uncompress_row_seg)(const PIXEL * const prev_row,
+ do_run:
+         state->waitcnt = stopidx - i;
+         run_index = i;
+-        run_end = i + decode_state_run(encoder, state);
+        run_end = decode_state_run(encoder, state);
+        if (run_end < 0 || run_end > (end - i)) {
+            encoder->usr->error(encoder->usr, "wrong RLE\n");
+        }
+        run_end += i;
+ 
+         for (; i < run_end; i++) {
+             UNCOMPRESS_PIX_START(&cur_row[i]);
--- a/app-emulation/spice/spice-0.14.3-r1.ebuild
+++ b/app-emulation/spice/spice-0.14.3-r1.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit autotools python-any-r1 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="SPICE server"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="libressl lz4 sasl smartcard static-libs gstreamer test"
+
+# the libspice-server only uses the headers of libcacard
+RDEPEND="
+	dev-lang/orc[static-libs(+)?]
+	>=dev-libs/glib-2.22:2[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/jpeg:0=[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	!libressl? ( dev-libs/openssl:0=[static-libs(+)?] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)?] )
+	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
+	smartcard? ( >=app-emulation/libcacard-0.1.2 )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-0.14.0
+	smartcard? ( app-emulation/qemu[smartcard] )"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')"
+
+python_check_deps() {
+	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2020-14355-762e0aba.patch
+	"${FILESDIR}"/${P}-CVE-2020-14355-404d7478.patch
+	"${FILESDIR}"/${P}-CVE-2020-14355-ef1b6ff7.patch
+	"${FILESDIR}"/${P}-CVE-2020-14355-b24fe6b6.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	xdg_environment_reset
+
+	local myconf="
+		$(use_enable static-libs static)
+		$(use_enable lz4)
+		$(use_with sasl)
+		$(use_enable smartcard)
+		$(use_enable test tests)
+		--enable-gstreamer=$(usex gstreamer "1.0" "no")
+		--disable-celt051
+		"
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
+src_install() {
+	default
+	use static-libs || find "${D}" -name '*.la' -type f -delete || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -14,7 +14,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="gstreamer libressl lz4 opus sasl smartcard static-libs"
+IUSE="gstreamer libressl lz4 opus sasl smartcard static-libs test"

 # the libspice-server only uses the headers of libcacard
 RDEPEND="
@ -73,6 +73,7 @@ src_configure() {
 		$(meson_use sasl)
 		$(meson_feature opus)
 		$(meson_feature smartcard)
+		$(meson_use test tests)
 		-Dmanual=false
 		-Dtests=false
 	)
--- a/app-emulation/wine-staging/wine-staging-6.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.2.ebuild
@ -19,9 +19,9 @@ if [[ ${MY_PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
-    if [[ ${MINOR_V} != "0" ]] ; then
-        MINOR_V="x"
-    fi
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
@ -560,7 +560,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-emulation/wine-staging/wine-staging-6.3-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.3-r1.ebuild
@ -20,9 +20,9 @@ if [[ ${MY_PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
-    if [[ ${MINOR_V} != "0" ]] ; then
-        MINOR_V="x"
-    fi
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
@ -562,7 +562,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-emulation/wine-staging/wine-staging-6.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.4.ebuild
@ -20,9 +20,9 @@ if [[ ${MY_PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
-    if [[ ${MINOR_V} != "0" ]] ; then
-        MINOR_V="x"
-    fi
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
@ -559,7 +559,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-emulation/wine-staging/wine-staging-6.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.5.ebuild
@ -20,9 +20,9 @@ if [[ ${MY_PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
-    if [[ ${MINOR_V} != "0" ]] ; then
-        MINOR_V="x"
-    fi
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
@ -559,7 +559,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@ -20,9 +20,9 @@ if [[ ${MY_PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
-    if [[ ${MINOR_V} != "0" ]] ; then
-        MINOR_V="x"
-    fi
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
@ -559,7 +559,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
@ -480,7 +480,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild
@ -481,7 +481,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-emulation/wine-vanilla/wine-vanilla-6.3-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.3-r1.ebuild
@ -482,7 +482,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
@ -479,7 +479,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild
@ -479,7 +479,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@ -479,7 +479,7 @@ multilib_src_test() {
 		fi

 		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
+		virtx emake test
 	fi
 }

--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -31,10 +31,9 @@ src_install() {
 }

 pkg_postinst() {
-	elog "You may need to install the following optional packages for full functionality:"
-	optfeature "Support all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl]
-	optfeature "Display text in right-to-left scripts" dev-libs/fribidi
-	optfeature "Text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer
-	optfeature "Interactive translation (REPL)" app-editors/emacs app-misc/rlwrap
-	optfeature "Spell checking" app-text/aspell app-text/hunspell
+	optfeature "all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl]
+	optfeature "display text in right-to-left scripts" dev-libs/fribidi
+	optfeature "text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer
+	optfeature "interactive translation (REPL)" app-editors/emacs app-misc/rlwrap
+	optfeature "spell checking" app-text/aspell app-text/hunspell
 }
--- a/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild
@ -31,10 +31,9 @@ src_install() {
 }

 pkg_postinst() {
-	elog "You may need to install the following optional packages for full functionality:"
-	optfeature "Support all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl]
-	optfeature "Display text in right-to-left scripts" dev-libs/fribidi
-	optfeature "Text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer
-	optfeature "Interactive translation (REPL)" app-editors/emacs app-misc/rlwrap
-	optfeature "Spell checking" app-text/aspell app-text/hunspell
+	optfeature "all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl]
+	optfeature "display text in right-to-left scripts" dev-libs/fribidi
+	optfeature "text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer
+	optfeature "interactive translation (REPL)" app-editors/emacs app-misc/rlwrap
+	optfeature "spell checking" app-text/aspell app-text/hunspell
 }
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
--- a/app-laptop/hdapsd/hdapsd-20141203-r2.ebuild
+++ b/app-laptop/hdapsd/hdapsd-20141203-r2.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/evgeni/${PN}/releases/download/${PV}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="libconfig"

 BDEPEND=""
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild
+++ b/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild
@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
-inherit user golang-build golang-vcs-snapshot
+
+inherit golang-build golang-vcs-snapshot

 EGO_PN="github.com/prometheus/${PN}"
 EGIT_COMMIT="4a7436442837da72f9e211d99f0145dff3246b66"
@ -14,7 +15,6 @@ HOMEPAGE="https://github.com/prometheus/prom2json"
 SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""

 DEPEND="dev-util/promu"

--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/cdctl/cdctl-0.16.ebuild
+++ b/app-misc/cdctl/cdctl-0.16.ebuild
@ -1,29 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

-inherit eutils autotools toolchain-funcs
+inherit autotools

 DESCRIPTION="Utility to control your cd/dvd drive"
 HOMEPAGE="http://cdctl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cdctl/${P}.tar.gz"
+S="${WORKDIR}/${PN}"

 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""

-DEPEND=""
-
-S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${PN}-0.16-Makefile.in.patch )

 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.16-Makefile.in.patch
-
+	default
 	eautoreconf
 }
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
--- a/app-misc/color/color-1.2-r2.ebuild
+++ b/app-misc/color/color-1.2-r2.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-inherit eutils toolchain-funcs
+inherit toolchain-funcs

 DESCRIPTION="Easily add ANSI colouring to shell scripts"
 HOMEPAGE="http://www.runslinux.net/?page_id=10"
@ -12,7 +12,6 @@ SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""

 src_prepare() {
 	eapply "${FILESDIR}"/${PV}-ldflags.patch
--- a/app-misc/crunch/crunch-3.6.ebuild
+++ b/app-misc/crunch/crunch-3.6.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

-inherit eutils toolchain-funcs
+inherit toolchain-funcs

 DESCRIPTION="A wordlist generator"
 HOMEPAGE="https://sourceforge.net/projects/crunch-wordlist/"
@ -13,10 +13,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~x86"

-src_prepare() {
-	epatch_user
-}
-
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
--- a/app-misc/cw/cw-1.0.16-r3.ebuild
+++ b/app-misc/cw/cw-1.0.16-r3.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

-inherit eutils toolchain-funcs
+inherit toolchain-funcs

 DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands"
 HOMEPAGE="http://cwrapper.sourceforge.net/"
@ -12,15 +12,17 @@ SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""

-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-ldflags.patch \
-		"${FILESDIR}"/${PV}-path.patch \
-		"${FILESDIR}"/${PV}-collision.patch \
-		"${FILESDIR}"/${PV}-format-security.patch
+PATCHES=(
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-path.patch
+	"${FILESDIR}"/${PV}-collision.patch
+	"${FILESDIR}"/${PV}-format-security.patch
+)
+
+src_configure() {
 	tc-export CC
+	econf
 }

 src_compile() {
--- a/app-misc/cw/files/1.0.16-collision.patch
+++ b/app-misc/cw/files/1.0.16-collision.patch
@ -1,5 +1,3 @@
-diff --git a/src/cw.c b/src/cw.c
-index d7b4875..a7811d8 100644
 --- a/src/cw.c
 +++ b/src/cw.c
@@ -1336,7 +1336,7 @@ unsigned char is_cwfile(char *file){
@ -11,8 +9,6 @@ index d7b4875..a7811d8 100644
  return(0);
 }
 /* sets left and right borders. */
-diff --git a/src/cwu.c b/src/cwu.c
-index 823618d..63f566b 100644
 --- a/src/cwu.c
 +++ b/src/cwu.c
@@ -37,12 +37,12 @@ signed int main(signed int argc,char **argv){
--- a/app-misc/cw/files/1.0.16-format-security.patch
+++ b/app-misc/cw/files/1.0.16-format-security.patch
@ -1,8 +1,3 @@
- src/cw.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cw.c b/src/cw.c
-index d7b4875..3ec1ac1 100644
 --- a/src/cw.c
 +++ b/src/cw.c
@@ -643,7 +643,7 @@ void sighandler(signed int sig){
--- a/app-misc/cw/files/1.0.16-ldflags.patch
+++ b/app-misc/cw/files/1.0.16-ldflags.patch
@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 9a6e4ec..e510493 100644
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -19,11 +19,11 @@ all:
--- a/app-misc/cw/files/1.0.16-path.patch
+++ b/app-misc/cw/files/1.0.16-path.patch
@ -1,5 +1,3 @@
-diff --git a/bin/colorcfg b/bin/colorcfg
-index cf73b50..3e78c73 100755
 --- a/bin/colorcfg
 +++ b/bin/colorcfg
@@ -10,13 +10,7 @@ echo "[ cw/color wrapper: user setup script. ]"
--- a/app-misc/esekeyd/esekeyd-1.2.7.ebuild
+++ b/app-misc/esekeyd/esekeyd-1.2.7.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

 DESCRIPTION="Multimedia key daemon that uses the Linux event interface"
 HOMEPAGE="http://freshmeat.net/projects/esekeyd/"
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
-inherit eutils bash-completion-r1 toolchain-funcs
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs

 DESCRIPTION="program for making large letters out of ordinary text"
 HOMEPAGE="http://www.figlet.org/"
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST 453B65310595562855471199CA68BE8010084C9C.asc 3155 BLAKE2B 7126ccc1af0350ab179c137915bfb1ab7da715219a7f037a08f79d3e503d4fa424a01cf83cd57866c8fb22957e1b736d7c32e68035189b182b09ac9be696eda6 SHA512 49861840e534d1b1ed7d9ba16d825b5f861e05d82119adea8e3bf16355c6c3ed5cdab39c828f9e33f644ff9b806735ca2e70ddaa7c9e92aead87019515118006`