From d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 29 Jan 2021 18:03:51 +0000
Subject: gentoo resync : 29.01.2021

---
 app-emulation/Manifest.gz                          | Bin 20335 -> 20506 bytes
 app-emulation/crossover-bin/Manifest               |   2 +-
 .../crossover-bin/crossover-bin-20.0.2-r1.ebuild   | 220 ++++++
 .../crossover-bin/crossover-bin-20.0.2.ebuild      | 216 ------
 app-emulation/docker-compose/Manifest              |   8 +-
 .../docker-compose-1.28.0_rc1.ebuild               |  73 --
 .../docker-compose-1.28.0_rc2.ebuild               |  73 --
 .../docker-compose-1.28.0_rc3.ebuild               |  73 --
 .../docker-compose/docker-compose-1.28.2.ebuild    |  73 ++
 app-emulation/firecracker-bin/Manifest             |   3 +
 .../firecracker-bin/firecracker-bin-0.24.1.ebuild  |  79 ++
 app-emulation/free42/Manifest                      |   6 +-
 app-emulation/free42/free42-2.5.20.ebuild          |  50 --
 app-emulation/free42/free42-2.5.21.ebuild          |  50 --
 app-emulation/free42/free42-2.5.24.ebuild          |  50 ++
 app-emulation/libcacard/Manifest                   |   2 +-
 app-emulation/libcacard/libcacard-2.6.0.ebuild     |  10 +-
 app-emulation/libguestfs/Manifest                  |   4 +-
 .../libguestfs/libguestfs-1.36.13-r2.ebuild        |   2 +-
 .../libguestfs/libguestfs-1.36.15-r2.ebuild        |   2 +-
 app-emulation/qemu/Manifest                        |   5 +-
 app-emulation/qemu/qemu-5.1.0-r2.ebuild            | 859 ---------------------
 app-emulation/qemu/qemu-5.1.0-r3.ebuild            |   2 +-
 app-emulation/qemu/qemu-5.2.0-r1.ebuild            |   2 +-
 app-emulation/vendor-reset/Manifest                |   5 +
 app-emulation/vendor-reset/files/modload.conf      |   1 +
 app-emulation/vendor-reset/metadata.xml            |  11 +
 .../vendor-reset/vendor-reset-0.1.0.ebuild         |  46 ++
 .../vendor-reset/vendor-reset-9999.ebuild          |  46 ++
 29 files changed, 553 insertions(+), 1420 deletions(-)
 create mode 100644 app-emulation/crossover-bin/crossover-bin-20.0.2-r1.ebuild
 delete mode 100644 app-emulation/crossover-bin/crossover-bin-20.0.2.ebuild
 delete mode 100644 app-emulation/docker-compose/docker-compose-1.28.0_rc1.ebuild
 delete mode 100644 app-emulation/docker-compose/docker-compose-1.28.0_rc2.ebuild
 delete mode 100644 app-emulation/docker-compose/docker-compose-1.28.0_rc3.ebuild
 create mode 100644 app-emulation/docker-compose/docker-compose-1.28.2.ebuild
 create mode 100644 app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild
 delete mode 100644 app-emulation/free42/free42-2.5.20.ebuild
 delete mode 100644 app-emulation/free42/free42-2.5.21.ebuild
 create mode 100644 app-emulation/free42/free42-2.5.24.ebuild
 delete mode 100644 app-emulation/qemu/qemu-5.1.0-r2.ebuild
 create mode 100644 app-emulation/vendor-reset/Manifest
 create mode 100644 app-emulation/vendor-reset/files/modload.conf
 create mode 100644 app-emulation/vendor-reset/metadata.xml
 create mode 100644 app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
 create mode 100644 app-emulation/vendor-reset/vendor-reset-9999.ebuild

(limited to 'app-emulation')

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7de474b1c2d1..3ee4f25a9799 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index ad1aca1fe754..957f079cc319 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -3,5 +3,5 @@ DIST install-crossover-19.0.2.bin 227350041 BLAKE2B aeb5424ac02e05662cb4baca2caf
 DIST install-crossover-20.0.2.bin 221393525 BLAKE2B c74db640952002364729c8884234e5fb369a00315d0cfd99276a4294e19953417e1ecc1c60887b3de45bd617570825279d278e69112eddd06d188c890435bcff SHA512 b8d10ef499833cb6158eec22cc635f3e4ecd0a5ebdd9b86df79e23d7f4e4ae1f6a7a2f36d9116e4ba17fd86adfa20bcd19cce66eaa1427fb8ed9667593e5422b
 EBUILD crossover-bin-19.0.1-r1.ebuild 7728 BLAKE2B aaf5ffbc0e41f9e4bdb6fc329223cd8c0f78abc012a1ba163fb09096a875c7634859fe563dcccd33f68315dc8c76d048854a0aa913a4ee42a114fb5dc4177075 SHA512 11fa2f78352abac1ddcc91952e73c91fa427fe2ccf72dd601a66afe1dd4e42e8766df3cbc0b64e36a0911f2be152663d3785df88e101fe18b15e13e7af1234ab
 EBUILD crossover-bin-19.0.2.ebuild 7234 BLAKE2B 2cab2470a4806342ea278f51e85ba35f8f49e37cbd69f8d0c3b6ae5b99d4eb9bae0116b8c63c3ea6fffcd2e448a15a719c684459b42363a299e9c2c594621101 SHA512 cf5817c0c8865b5f5b9296014acdc8a907be38d8712b7b1dfa6b2cfe66219a5fcc34e4c2f3b158390c143ee500361fef2868adabc5865905852ea8767c10ec9a
-EBUILD crossover-bin-20.0.2.ebuild 7459 BLAKE2B 3c2c7036e0fb6bd7150a59280b0ce215fbd01c41e9fdaa59209d270b9c9b318259eccafb47b9bf21d3a61a88c0bf2c2b272b77d09d9c53b03f40b7bbab7e684a SHA512 1a7ebf7ee5c1b2149ca529b2704616524375ef483e898b83148d5373bf16aabd555b8a3430acbf077278a9aaa130174029f21b7e8ac2570abde4d7c51aee6d1a
+EBUILD crossover-bin-20.0.2-r1.ebuild 7571 BLAKE2B 6e6a9284cfcd5a7c69bc43fac97ad8cd81d438dbf2fd98c4ca8626d0080c6ccf788522cc4d54347bd809cd632395587696c0d4fba2e62ab1d5ed02ab181d18e2 SHA512 78702a2640f00dcb6d3313850f75c4ae9a0ab7800bbdf7e9c8634ed347b2925a1661d15401b2725614bddca414b061bfc9b22709fb4ef35c120e25f9750f9acc
 MISC metadata.xml 495 BLAKE2B 09ff077822c1862d7f7d20bee57ebf1dcc48831a9539b280e8b09344e278bdc35d122debdca7cdab10d10cd546eb005a157e896670eba3206af2281dc7228f90 SHA512 da97a48eb9e984ee10581e455be37ac9adb2ab897d837f9ed91e5b368ce1800ff3468a5290fff53b3d93e7c56d6c5cb56936d0d09168c10f19356fa5729dcf0d
diff --git a/app-emulation/crossover-bin/crossover-bin-20.0.2-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-20.0.2-r1.ebuild
new file mode 100644
index 000000000000..155f19b237aa
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-20.0.2-r1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support"
+HOMEPAGE="https://www.codeweavers.com/products/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="bindist test"
+
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="
+	opt/cxoffice/lib/.*
+	opt/cxoffice/lib64/.*
+	opt/cxoffice/bin/cabextract
+	opt/cxoffice/bin/cxburner
+	opt/cxoffice/bin/cxntlm_auth
+	opt/cxoffice/bin/wineserver
+	opt/cxoffice/bin/wineserver32
+	opt/cxoffice/bin/wineserver64
+	opt/cxoffice/bin/wine64-preloader
+	opt/cxoffice/bin/unrar
+	opt/cxoffice/bin/wine-preloader
+	opt/cxoffice/bin/cxdiag
+	opt/cxoffice/bin/cxdiag64
+	opt/cxoffice/bin/cxgettext
+	opt/cxoffice/bin/wineloader
+	opt/cxoffice/bin/wineloader64
+"
+QA_TEXTRELS="
+	opt/cxoffice/bin/wineserver32
+	opt/cxoffice/lib/wine/*
+	opt/cxoffice/lib/libwine.so*
+"
+
+S="${WORKDIR}"
+
+DEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	dev-lang/perl
+	dev-util/bbe
+"
+
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	!prefix? ( sys-libs/glibc )
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
+	capi? ( net-libs/libcapi[abi_x86_32(-)] )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[abi_x86_32(-)]
+		jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] )
+		media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)]
+	)
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opencl? ( virtual/opencl[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	pcap? ( net-libs/libpcap[abi_x86_32(-)] )
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	dev-libs/openssl
+	dev-util/desktop-file-utils
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-),osmesa?]
+	media-libs/tiff:0[abi_x86_32(-)]
+	sys-auth/nss-mdns[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/libunwind[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXcursor[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-libs/vte:2.91[introspection]
+"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE}"
+	einfo "and place ${A} into your DISTDIR directory"
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:xdg_install_icons(:&\"${ED}\".:" \
+		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm"
+
+	# Remove unnecessary files, license.txt file kept as it's used by
+	# multiple files (apart of the menu to show the license)
+	rm -r guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	# Install crossover symlink, bug #476314
+	dosym ../cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}/opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}/opt/cxoffice"
+
+	# Disable auto-update
+	sed -i -e 's/;;\"AutoUpdate\" = \"1\"/\"AutoUpdate\" = \"0\"/g' share/crossover/data/cxoffice.conf || die
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
+
+	# Konqueror in its infinite wisdom decides to try opening things for
+	# writing, which are sandbox violations. This breaks the install process if
+	# it is installed, so we ninja edit it to false so it so doesn't run.
+	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	# Revert ninja edit
+	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
+		|| die "Could not remove uninstall menus"
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-e "s:${ED}::" \
+		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
+		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+	sed -i -e "s:${ED}:/:" \
+		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
+		|| die "Could not fix paths of *.desktop files"
+
+	# Workaround missing libs
+	# https://www.codeweavers.com/support/forums/general/?t=26;mhl=198658;msg=198658
+	if use gphoto2; then
+		bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" >tmp || die
+		mv tmp "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" || die
+		bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/bin/cxdiag" >tmp || die
+		mv tmp "${ED}/opt/cxoffice/bin/cxdiag" || die
+		fperms a+x "/opt/cxoffice/bin/cxdiag"
+	fi
+	# It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900
+	# https://bugs.gentoo.org/721108
+	if use pcap; then
+		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" >tmp || die
+		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" >tmp64 || die
+		mv tmp "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" || die
+		mv tmp64 "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "${P} is open source software with the exception of the GUI."
+	einfo "Source code can be obtained from:"
+	einfo
+	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
+}
diff --git a/app-emulation/crossover-bin/crossover-bin-20.0.2.ebuild b/app-emulation/crossover-bin/crossover-bin-20.0.2.ebuild
deleted file mode 100644
index 7b5c4dc5c737..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-20.0.2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support"
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="
-	opt/cxoffice/lib/.*
-	opt/cxoffice/lib64/.*
-	opt/cxoffice/bin/cabextract
-	opt/cxoffice/bin/cxburner
-	opt/cxoffice/bin/cxntlm_auth
-	opt/cxoffice/bin/wineserver
-	opt/cxoffice/bin/wineserver32
-	opt/cxoffice/bin/wineserver64
-	opt/cxoffice/bin/wine64-preloader
-	opt/cxoffice/bin/unrar
-	opt/cxoffice/bin/wine-preloader
-	opt/cxoffice/bin/cxdiag
-	opt/cxoffice/bin/cxdiag64
-	opt/cxoffice/bin/cxgettext
-	opt/cxoffice/bin/wineloader
-	opt/cxoffice/bin/wineloader64
-"
-QA_TEXTRELS="
-	opt/cxoffice/bin/wineserver32
-	opt/cxoffice/lib/wine/*
-	opt/cxoffice/lib/libwine.so*
-"
-
-S="${WORKDIR}"
-
-DEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	dev-lang/perl
-	dev-util/bbe
-"
-
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	!prefix? ( sys-libs/glibc )
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	capi? ( net-libs/libcapi[abi_x86_32(-)] )
-	cups? ( net-print/cups[abi_x86_32(-)] )
-	gsm? ( media-sound/gsm[abi_x86_32(-)] )
-	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
-	lcms? ( media-libs/lcms:2 )
-	ldap? ( net-nds/openldap[abi_x86_32(-)] )
-	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[abi_x86_32(-)]
-		jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] )
-		media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)]
-	)
-	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
-	nls? ( sys-devel/gettext[abi_x86_32(-)] )
-	openal? ( media-libs/openal[abi_x86_32(-)] )
-	opencl? ( virtual/opencl[abi_x86_32(-)] )
-	opengl? (
-		virtual/glu[abi_x86_32(-)]
-		virtual/opengl[abi_x86_32(-)]
-	)
-	pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-	png? ( media-libs/libpng:0[abi_x86_32(-)] )
-	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
-	ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] )
-	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
-	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
-	dev-libs/gobject-introspection
-	dev-util/desktop-file-utils
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/freetype:2[abi_x86_32(-)]
-	media-libs/mesa[abi_x86_32(-),osmesa?]
-	media-libs/tiff:0[abi_x86_32(-)]
-	sys-auth/nss-mdns[abi_x86_32(-)]
-	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/libunwind[abi_x86_32(-)]
-	sys-libs/ncurses-compat:5[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libSM[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXcursor[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXi[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-"
-
-pkg_nofetch() {
-	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
-	# self unpacking zip archive; unzip warns about the exe stuff
-	unpack_zip ${A}
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:xdg_install_icons(:&\"${ED}\".:" \
-		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
-		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
-		"${S}/lib/perl/CXMenuXDG.pm"
-
-	# Remove unnecessary files, license.txt file kept as it's used by
-	# multiple files (apart of the menu to show the license)
-	rm -r guis/ || die "Could not remove files"
-	use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
-	# Install crossover symlink, bug #476314
-	dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
-	# Install documentation
-	dodoc README changelog.txt
-	rm README changelog.txt || die "Could not remove README and changelog.txt"
-
-	# Install files
-	dodir /opt/cxoffice
-	#cp -r ./* "${ED}/opt/cxoffice" \
-	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
-		|| die "Could not install into ${ED}/opt/cxoffice"
-
-	# Disable auto-update
-	sed -i -e 's/;;\"AutoUpdate\" = \"1\"/\"AutoUpdate\" = \"0\"/g' share/crossover/data/cxoffice.conf || die
-	# Install configuration file
-	insinto /opt/cxoffice/etc
-	doins share/crossover/data/cxoffice.conf
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
-
-	# Konqueror in its infinite wisdom decides to try opening things for
-	# writing, which are sandbox violations. This breaks the install process if
-	# it is installed, so we ninja edit it to false so it so doesn't run.
-	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
-		|| die "Could not apply workaround for konqueror"
-
-	# Install menus
-	# XXX: locate_gui.sh automatically detects *-application-merged directories
-	# This means what we install will vary depending on the contents of
-	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
-	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
-		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
-		|| die "Could not install menus"
-
-	# Revert ninja edit
-	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
-		|| die "Could not apply workaround for konqueror"
-
-	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
-		|| die "Could not remove uninstall menus"
-	sed -i \
-		-e "s:\"${ED}\".::" \
-		-e "s:${ED}::" \
-		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
-		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
-	sed -i -e "s:${ED}:/:" \
-		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
-		|| die "Could not fix paths of *.desktop files"
-
-	# Workaround missing libs
-	# https://www.codeweavers.com/support/forums/general/?t=26;mhl=198658;msg=198658
-	if use gphoto2; then
-		bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" >tmp || die
-		mv tmp "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" || die
-		bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/bin/cxdiag" >tmp || die
-		mv tmp "${ED}/opt/cxoffice/bin/cxdiag" || die
-		fperms a+x "/opt/cxoffice/bin/cxdiag"
-	fi
-	# It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900
-	# https://bugs.gentoo.org/721108
-	if use pcap; then
-		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" >tmp || die
-		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" >tmp64 || die
-		mv tmp "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" || die
-		mv tmp64 "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" || die
-	fi
-}
-
-pkg_postinst() {
-	einfo "${P} is open source software with the exception of the GUI."
-	einfo "Source code can be obtained from:"
-	einfo
-	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 70f0f7debd3f..63376dcf3ae5 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -2,12 +2,8 @@ AUX docker-compose-1.27.0_rc3-setup-py.patch 1840 BLAKE2B 15269cc09ad609008afbf2
 AUX docker-compose-1.28.0_rc2-setup-py.patch 1844 BLAKE2B d33325e712bd3d3d5eb0dc1969d41e9b71876901414aa29da75f881007bcade7af8e66a2b24cd3e9ceb0be545050c93e8b21814d4d396024aa7ccd365e13b5e5 SHA512 9cf33c42ee436905aa58343c2acaa1147ff241d06f4002f86073a0ee3632a2fc67a70f87502ffc208b7f38294d11431d7fc0da23d064ebea1262117230ba167a
 DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80
 DIST docker-compose-1.28.0.tar.gz 318112 BLAKE2B 2e721f2aed08f8c63c7c75aa91e6ee28d997763a7d93921e9a62c41b7d48943221aa2135e6ba3925db67b2376f662f81ef71df15180895ea4d5ced1edd0cc493 SHA512 c673f25ff993e7dcaf75512c378339bb7435d96310bf9a47ee3fd3a515967b323ed911b77c030a8e9c1d04b8aca235565a0ca0eaeab401c4ac48110712da405e
-DIST docker-compose-1.28.0_rc1.tar.gz 313984 BLAKE2B 3307aab3ec842d21de73ab282905016f6b0934a2ce9d1dde474ea1e7c5894cea028363c03ec9f597cb3e9b2910e9286b2ffb3070885b20787f28767fec909a73 SHA512 87704f16bd2d6551fed0b3d38264e10cf12604f40a68637ac9dacc3aebe618872f54a890aa6bb1412143055021751bcba1b542d51b252e78b0b8948e2b8cc8fd
-DIST docker-compose-1.28.0_rc2.tar.gz 314331 BLAKE2B c2e169152a6da067e47ca7654b3866fd2b46779bbf35f917008dc71a4c70ede1704bd3f6e5f2231b42d50d6d11ae9df402ed1b01832c26d5d14bdb4db33e7432 SHA512 0320f96b177034c5575797540d38981d591fe22d39ee2e1c338589189333c9eac5e595103bc7295b43b90f697b5a09daffa7f611b395e6bcf81fdce3a391eed6
-DIST docker-compose-1.28.0_rc3.tar.gz 317485 BLAKE2B 5954ebf8224b8701decf7b7c4447592f0a8ce5472e5c9307364c605e2a260ae36c69ceb95b6dc254701650873ea8f443e8767a7ba96bbeec44343b94fb8c5d36 SHA512 0d09d306c38b6c9990f5801fe12c7554694f1a270c13babeb8aecda06c428f4c8d37153439c43fd02fe3ffd59fe4f38ad48d066abfb81fcc1ce8e23e6b353ef3
+DIST docker-compose-1.28.2.tar.gz 318196 BLAKE2B 60827043135b1b1455ce0fe8cd3b6bdfad025af80d32b805e7a7a9df7949808b6575555e860a2d0f57bf07af44cb7847b38146accbb2c4eec9a8919bc4ec4141 SHA512 ababba47717e31187243478ba4a9d4082e2f64a05a0bf48cbafb2a44b62138d7dfb1cbb88da4c388b559cb35d53bcf4c42617f6ae02412b7a65f02cb09255e45
 EBUILD docker-compose-1.27.4.ebuild 2110 BLAKE2B be9b90255ec650ca4abf0331e440e08bff51cfa73df3650db71ca8c0e39727072521678cfa0e5183e0301c26191da00fa627fafa3c70a0faf049acbfa3c701cd SHA512 6074b7b0ec6b634f265bfcb7d89f249396108e9f8aeee5d833913780513a2734931da3586e8e728b6512c1c549a3853bfa88b7a3ec0009877bfda2fa9e7182f5
 EBUILD docker-compose-1.28.0.ebuild 2112 BLAKE2B 1632274da8e0e70186f519023cf00b6b776d58998c9fc3f4185d5a637d2ae2054237dbbcd9fcf9d2bdc1c4ce2a318f6c1a9cabf2a6bef2eaeba10ffae8008603 SHA512 1d927e646e8a38a1c436d64c071ea45e363915d209e1ea776fecb79cc384891bc1485cae25da3fd5ab902fc39ad527e3c8e584a61c0af6e0e7bcb7dbb95b359d
-EBUILD docker-compose-1.28.0_rc1.ebuild 2112 BLAKE2B 3a483383fd0b410fc4f2675a8df27ca2e5f1e61363abffc5cb180e8744973c40265027776c02e76063e7422e8c92131f5817f6898aec0ef72bbd552668de06ce SHA512 2ecef6032c24a4c7dc226dee463a3d0d1651a8f3f6f261f4c8aef682a6e4c217608def560055bfb88287eb9ccec6784944e56e72c701f98cfaf999e3a7a74425
-EBUILD docker-compose-1.28.0_rc2.ebuild 2112 BLAKE2B 1632274da8e0e70186f519023cf00b6b776d58998c9fc3f4185d5a637d2ae2054237dbbcd9fcf9d2bdc1c4ce2a318f6c1a9cabf2a6bef2eaeba10ffae8008603 SHA512 1d927e646e8a38a1c436d64c071ea45e363915d209e1ea776fecb79cc384891bc1485cae25da3fd5ab902fc39ad527e3c8e584a61c0af6e0e7bcb7dbb95b359d
-EBUILD docker-compose-1.28.0_rc3.ebuild 2112 BLAKE2B 1632274da8e0e70186f519023cf00b6b776d58998c9fc3f4185d5a637d2ae2054237dbbcd9fcf9d2bdc1c4ce2a318f6c1a9cabf2a6bef2eaeba10ffae8008603 SHA512 1d927e646e8a38a1c436d64c071ea45e363915d209e1ea776fecb79cc384891bc1485cae25da3fd5ab902fc39ad527e3c8e584a61c0af6e0e7bcb7dbb95b359d
+EBUILD docker-compose-1.28.2.ebuild 2112 BLAKE2B 1632274da8e0e70186f519023cf00b6b776d58998c9fc3f4185d5a637d2ae2054237dbbcd9fcf9d2bdc1c4ce2a318f6c1a9cabf2a6bef2eaeba10ffae8008603 SHA512 1d927e646e8a38a1c436d64c071ea45e363915d209e1ea776fecb79cc384891bc1485cae25da3fd5ab902fc39ad527e3c8e584a61c0af6e0e7bcb7dbb95b359d
 MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e
diff --git a/app-emulation/docker-compose/docker-compose-1.28.0_rc1.ebuild b/app-emulation/docker-compose/docker-compose-1.28.0_rc1.ebuild
deleted file mode 100644
index 21b5b42471fc..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.28.0_rc1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-PATCHES=(
-	# Bug #679968 -- https://bugs.gentoo.org/679968
-	# Bug #681002 -- https://bugs.gentoo.org/681002
-	"${FILESDIR}"/${PN}-1.27.0_rc3-setup-py.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	default
-}
-
-python_test() {
-	distutils_install_for_testing
-	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.28.0_rc2.ebuild b/app-emulation/docker-compose/docker-compose-1.28.0_rc2.ebuild
deleted file mode 100644
index b76ffd2a6855..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.28.0_rc2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-PATCHES=(
-	# Bug #679968 -- https://bugs.gentoo.org/679968
-	# Bug #681002 -- https://bugs.gentoo.org/681002
-	"${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	default
-}
-
-python_test() {
-	distutils_install_for_testing
-	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.28.0_rc3.ebuild b/app-emulation/docker-compose/docker-compose-1.28.0_rc3.ebuild
deleted file mode 100644
index b76ffd2a6855..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.28.0_rc3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-PATCHES=(
-	# Bug #679968 -- https://bugs.gentoo.org/679968
-	# Bug #681002 -- https://bugs.gentoo.org/681002
-	"${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	default
-}
-
-python_test() {
-	distutils_install_for_testing
-	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.28.2.ebuild b/app-emulation/docker-compose/docker-compose-1.28.2.ebuild
new file mode 100644
index 000000000000..b76ffd2a6855
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.28.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-5[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/firecracker-bin/Manifest b/app-emulation/firecracker-bin/Manifest
index ffd699d3f3f8..146d44846548 100644
--- a/app-emulation/firecracker-bin/Manifest
+++ b/app-emulation/firecracker-bin/Manifest
@@ -2,10 +2,13 @@ DIST firecracker-v0.23.0-aarch64 1596888 BLAKE2B 94453641206b32c42f86542d7c38a1e
 DIST firecracker-v0.23.0-x86_64 2041024 BLAKE2B cb6a0d356a734ffb28ef6b88517983d1b9efac4127f8979fad085dab503446471d851ec00ff4da39b216f6fc9ba6a5d9d744455c0f1c1cbd7ef881d624536873 SHA512 5a24a95805240c1125f7fd17e69d5fea92781c3767f0a884aa8e433200e8f469b33502342d47843e5612d83d3157df59bf94a960a202978ca70dcf8f31865882
 DIST firecracker-v0.23.1-aarch64 3328424 BLAKE2B 2191e73700c9107fc30e84a044c0377c4486ecfee99deba99b0f6400036befca0d2f3f101154d851f0d7423208f8afc28e87678ed6005235ea9757a1913df3f6 SHA512 a1f5245cbe637f42f1145eb9daf3578610102535a046ea4be93dcd122194fd90305fde32840d59c50b798aa8326ea0d7ed715ab96f980a7d0e66608c33aa7ce0
 DIST firecracker-v0.23.1-x86_64 3290472 BLAKE2B 62315d4962b4debbdac383098e656e6c469b491f7303a7aaab06c885ec653b202f6a49a43ae0b76188d2f73b229c68435e19d316992eed64645decef3f611d5e SHA512 4bfb756a2ee2942a158857dfe82de838b52bc161d0ba97255eace1af4b57c3a630dfbb51413433a4fbfb3d95ba02719a608c1ea3f28a5485d005daa2c71abbef
+DIST firecracker-v0.24.1-aarch64.tgz 1427360 BLAKE2B 17d85c6843dfa90bf871d5ff7dc5f5286c7bd11559cb9a507f57fafaba7d5abbf1019239ea39529e29a8bb4fa32b9a8a44f096f1379dc2d3d801502890690024 SHA512 cbedc62e5b98cdfd6dfb565bc1b977d84fcd0fa28eb36e18922ec56c3c2dfa34c84c549c7a4e23aee9d16c53b212ef87128d42e68f1a6b9997cbec42e613a82d
+DIST firecracker-v0.24.1-x86_64.tgz 1434986 BLAKE2B a6b206042fe4dfa873cfa1da4f591242f0224d2c98b367635534497d2bf82e218c409e473be618bd2902594ea24a8c710c853f2f1a00ac96f917a100e80aec0b SHA512 b719520464e3d5c9ff072c73639af71895bfcca9ac4964f2a255ed2d8d3b264a92566f7b87078c163c0f1ce21b9d5bd11cb38eb7cb784c5e18581ee531a0bcaf
 DIST jailer-v0.23.0-aarch64 1350040 BLAKE2B def85c85daa27c648c638ed14128fef941a416269c536c55413116a686d5a0e614976fd718576a6e275ff12a1873885e1d569e2e054cb054f1278ecbe1279d74 SHA512 48de8688cf40e696f0a56689a2e6256f2be159fb1b593b223a9547c4760c1e94e245e1de77bfeeefbeffb8046b33768da1915482a62d6b36321b8c225bdef791
 DIST jailer-v0.23.0-x86_64 1457312 BLAKE2B 9a92c415e27a8442da18ab3134023acdc7b49f1246d332a864fb700180914c6b9a7f8747b1eef1657290df5287a946e0d5b0b689bd0b7a60486b472ba7b55290 SHA512 203d24794c3125afdd8cb1b07e69da4fcc40bdc9a3ec7c8e8a2deb8dc1a691156294eb4168c2422f631136a4fed7413136631b3957999fe00fb645aaed16f87d
 DIST jailer-v0.23.1-aarch64 2812344 BLAKE2B ef0b98a5438880d8473117dc051421faf4c9f4640fe017ba9cedeb88a02ff2a34fe6e0333bb7cb31cd436a95536efe5237d6a49ead6c7d1d3777928cc54f0baf SHA512 38876afcf6c5883b30156246b4b74905157b668a3e6fbe852b38a09a7f5ab5814fb9eaec87ef94390d2a40806c7b387b4266c8a0c4b4fba5e720f61d571bbcd7
 DIST jailer-v0.23.1-x86_64 2589888 BLAKE2B b22a908d551b3da8f882b9c18031f0904808d8f77783c046f9a8855e713074ea61327b7c8c5f875361728bd33e33e4cd84431ead5f1fae68bdca8161e88bdd1c SHA512 a6829ffbacd35349214087f4ba1b88304c6bfd23b50d9f97319a93fae5c94c6d0590649fbd0917f9d82b6a2a6faab1f7e37a447864a4960e0b77407ae535212a
 EBUILD firecracker-bin-0.23.0.ebuild 2668 BLAKE2B a8d81736e88bdba6216d6ce24f500fdb4be820cf3bd8a1b6ca1a27c67e068f05d2a9d4dc3944c7ad7c1acedf6ecac6f4984cbdd3b1c8f3ca72f5550e3b714fba SHA512 297f046eef8e3a18d50aa26591b3923c6e2bf8f24986e947b685186df88fd7fd974466f77423410ce6120a0195e9bc9ada1aecde47d825e554da22edba3e2afc
 EBUILD firecracker-bin-0.23.1.ebuild 2668 BLAKE2B a8d81736e88bdba6216d6ce24f500fdb4be820cf3bd8a1b6ca1a27c67e068f05d2a9d4dc3944c7ad7c1acedf6ecac6f4984cbdd3b1c8f3ca72f5550e3b714fba SHA512 297f046eef8e3a18d50aa26591b3923c6e2bf8f24986e947b685186df88fd7fd974466f77423410ce6120a0195e9bc9ada1aecde47d825e554da22edba3e2afc
+EBUILD firecracker-bin-0.24.1.ebuild 2465 BLAKE2B 7e2fd7232b1d7409f10ea156e0813fa39da049858a71ff079fd14bf410141c63d5a9f87491befbd830bf3f323c5495ab7a8a945feecf741f5fa5a03d1985f4aa SHA512 9b910ba0af4ea9410dc573338e09396ea85d5850c957888b14c0bc92d7e4d78980335e252d8379eef3e2ee3bea5dead28b43890f7448df4bfef1bd9e57a23437
 MISC metadata.xml 385 BLAKE2B 5637756b0993be1ae2695067acc7fdbeaae6c0d5e5cac29563a15bd54815d9b9e2c21d516754e95214f2007846c7b477ad7f70f3f42007d70552313e12e57942 SHA512 83790f17e3b5da6bea49d28a82b7eeb8caba881042450f63570cac4d3bd5d64c326ccc053b5b2f225b9fc68a8379707a77d2a484e51d9ce93399bab25058a123
diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild
new file mode 100644
index 000000000000..c5d9f0f46db0
--- /dev/null
+++ b/app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="Secure and fast microVMs for serverless computing (static build)"
+HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
+SRC_URI="
+	amd64? (
+		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64.tgz
+	)
+	arm64? (
+		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64.tgz
+	)"
+
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test strip"
+
+RDEPEND="!app-emulation/firecracker
+	acct-group/kvm"
+
+QA_PREBUILT="/usr/bin/firecracker
+	/usr/bin/jailer"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 4 14; then
+		eerror "Firecracker requires a host kernel of 4.14 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE ~VHOST_VSOCK"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use"
+			ERROR_TUN+=" virtual network devices."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			ERROR_VHOST_VSOCK="To use AF_VSOCK sockets for communication"
+			ERROR_VHOST_VSOCK+=" between host and guest, you will need to enable"
+			ERROR_VHOST_VSOCK+=" the vhost virtio-vsock driver in your kernel."
+
+			if use amd64 || use amd64-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	if use amd64; then
+		my_arch=x86_64
+	elif use arm64; then
+		my_arch=aarch64
+	fi
+
+	newbin "release-v${PV}/firecracker-v${PV}-${my_arch}" firecracker
+	newbin "release-v${PV}/jailer-v${PV}-${my_arch}" jailer
+}
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index c479d3261fdf..a6125ea9b667 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -3,11 +3,9 @@ AUX free42-2.0.10-fix-makefile.patch 1888 BLAKE2B 113bfc1f296ea3d35d6b4f8aea5f59
 AUX free42-2.5.16-fix-makefile.patch 1144 BLAKE2B 9bb78c5b5bde9fef99eace62c55e32ba769b7d900dd0ee06331dce908508d660d3324d547517bb6e806924511642970148d4a7332017b65743ee613e96ace4a9 SHA512 5bc11081460274078b87760054e3d554355eca651fe782a96d5bab7a450b61f3c007c3b9967c31412c74ce26d88f9cbd684307e5c0699427292233c3f0974093
 AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5d25ab0a30cc1329ba79442d687f9fcd22e2edd080a43d816c8843e58827592c8c1932714fdd0012f8e643bb4c28d5cf23f9ade4 SHA512 73107855344c054318c678cffff9e39c89718d7d7d6445fc158109b8f678ebb95780a80584aa556c6076bf4c98c1d788dca09c9b727992374543c245c7400976
 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
-DIST free42-nologo-2.5.20.tgz 7414358 BLAKE2B f1e0963e6a808121efc4d9bd82863d8c7898f65504d4c59f6a6beadc0c4e5c1335ce4c65d25550a3f4d5c080e1933ad30f6325661af4a513f69941c48adda1a5 SHA512 04a01f29ed5a3c9374de98ead6c54191dbde6b0e3d9923b5c89f18f868630b50235711820e751e4a1e3efc0600b1a7a105e8800f660d67124458a8f2826c840f
-DIST free42-nologo-2.5.21.tgz 7416422 BLAKE2B e86d24a9d2a1fb10e2e1ed0ec9abb43fa5bab3717432402968682ac7e18b27ea0876c72466942220d234d720fc76cd239bafa993d1aba21ab845be26b53d3132 SHA512 25cec0ca7c5b9271de3d6ebf6254dbf54c6127b958e19a0c5b824c3aeffe0c84edfb6dd75eef8930c7db15c46c052bf01cdb06b0c60ac7cd2272492fe4016924
 DIST free42-nologo-2.5.22.tgz 7418457 BLAKE2B 18086ef181d846291b9f8762c9c293997e3d61e92a80e5556c41b7a777c4324151b0662d6b8a79e9b191b83312c97e46691e90577eed276ea315a12d73c5a5d4 SHA512 16c7cfb44f0fac12e3516b065f085af884b2652af9c1acb61251c8ede5c45b34f65bc8a3e53f0aa685ff5e1a74c7a17d9c8f76bc89537d790f878d8924a1080c
+DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b
 EBUILD free42-2.0.20.ebuild 947 BLAKE2B 24fb1ce5c86a3dca83f459cb992aa238c3f25848be5ff00b505956d8118ecf0c0574b9647df02821f20ab47c0f8505f2c89dff9951b9b7307b114e5351cea715 SHA512 cce77ea9b6e4e5367f147091eb70cbf4e980885343510d424cba9fa8265ab0087cdaacd3f49673979fc4256219201bd9fda281a992d7bd7ea898111ae3b160d5
-EBUILD free42-2.5.20.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f
-EBUILD free42-2.5.21.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f
 EBUILD free42-2.5.22.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f
+EBUILD free42-2.5.24.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304
 MISC metadata.xml 345 BLAKE2B 2693f9fd6f59806e57f9691b8b77ec0979e3ee819866bc1d9e3b3f311995a0b1fb7ae00a23b50f603064e1d35215fdd8fa6eb715fc83cd613eb828fd87f78eb2 SHA512 afbf038baa3610520f7d9b63b54acc98552b16241bf3f7efebe4048b572bf65098c74896647eed4611c29444f7d16914233744f08069468eededf34ba7a5d758
diff --git a/app-emulation/free42/free42-2.5.20.ebuild b/app-emulation/free42/free42-2.5.20.ebuild
deleted file mode 100644
index bd3148a0b387..000000000000
--- a/app-emulation/free42/free42-2.5.20.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PN}-nologo-${PV}"
-
-DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="https://thomasokken.com/free42/"
-SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa"
-
-DEPEND="dev-libs/atk
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( CREDITS HISTORY README )
-S="${WORKDIR}/${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
-	"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	local myconf
-	use alsa && myconf="AUDIO_ALSA=yes"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
-	emake -C gtk clean
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
-}
-
-src_install() {
-	default
-	dobin gtk/free42bin gtk/free42dec
-}
diff --git a/app-emulation/free42/free42-2.5.21.ebuild b/app-emulation/free42/free42-2.5.21.ebuild
deleted file mode 100644
index bd3148a0b387..000000000000
--- a/app-emulation/free42/free42-2.5.21.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PN}-nologo-${PV}"
-
-DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="https://thomasokken.com/free42/"
-SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa"
-
-DEPEND="dev-libs/atk
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( CREDITS HISTORY README )
-S="${WORKDIR}/${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
-	"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	local myconf
-	use alsa && myconf="AUDIO_ALSA=yes"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
-	emake -C gtk clean
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
-}
-
-src_install() {
-	default
-	dobin gtk/free42bin gtk/free42dec
-}
diff --git a/app-emulation/free42/free42-2.5.24.ebuild b/app-emulation/free42/free42-2.5.24.ebuild
new file mode 100644
index 000000000000..d25a89b2d1c4
--- /dev/null
+++ b/app-emulation/free42/free42-2.5.24.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
+	"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/libcacard/Manifest b/app-emulation/libcacard/Manifest
index f58b056843ec..d056a28bbbce 100644
--- a/app-emulation/libcacard/Manifest
+++ b/app-emulation/libcacard/Manifest
@@ -1,4 +1,4 @@
 AUX libcacard-2.6.0-simpletlv-test-fix.patch 1195 BLAKE2B 77b22b09e9c1ea080adc7763bb0d0c5d91a6f3b74c39e7446aba65adaeb94c47884a195f9a88021f4ebbb7f9a3c8f3ea23c31e2f9c40878465fa6df6a3fbfacf SHA512 9251b661884cccd627a874cc9cad9385f19208680cbce4a99e50fd8b1a94740fded075ec3c4fecef923dd50785cffeeae377cf88e6e9f6d3601e9cf5c0794adc
 DIST libcacard-2.6.0.tar.xz 364828 BLAKE2B 3a07243abb91dab05d89bf073fabb4a0ef7e820765066a8d87e72086b88cc726de77d1fdc5118e05ed47077d76ae0a57ff591a2e4e8623c3484c6cbf00cd025e SHA512 d6dfe6fe6cd2711bf8f71edc134a7caf459fc2a9c4f664ab2f1c28cc9ee8efe7a2d5a15c4dc735956638176e07e22416cad5e8e926aa7cab3fa95ded853f5982
-EBUILD libcacard-2.6.0.ebuild 991 BLAKE2B d8b2a15e6292461b350b23aa77736c0b0d75e13e747b1e7834d35e9944661792dc467f04118c0842e8298261384c293e4042874c10b8dbab72e8ff3520d40ad4 SHA512 8a76588db85ac2208b000dbd38ebfa71d9233d88cf2e7a3513962192eebe6c6b1bb9f0360c754540365a6c2fb2d3219c2f9fbaf0efb15ea761253fbc351a9cfa
+EBUILD libcacard-2.6.0.ebuild 997 BLAKE2B 2db19c41a8220d9de808ca7763502714dfeff3db2a0f6cfabb0ded517be02945cc51adba0c63bbc74e5d3f644d84a40240e969f9743533327b483e89852e9501 SHA512 a7755c0a733133e79cd6a954829b49d242f885f185f7f991e6ecc5abd860ff241c26aacce367daab2b7af4f698bf1ea6eda6b06f450efd8c831987957e6b7f6d
 MISC metadata.xml 401 BLAKE2B 585a9670acb4d98be5545e72793dd1998e8b1a01b9636899924a4a56cf1593e334bc562c615664c14897c78f975efb9844ff2935fce6ce2a443fbf318c371027 SHA512 32692892c082887a0fd59fe2ddcf68da7d46d6e79bac6d02e2420d80252f92d0a0868ebc100e94f92fdbc8a71155731c31c6fed1eebaa80d296b69aa1f25cede
diff --git a/app-emulation/libcacard/libcacard-2.6.0.ebuild b/app-emulation/libcacard/libcacard-2.6.0.ebuild
index c196a512a7ca..60300c338e3c 100644
--- a/app-emulation/libcacard/libcacard-2.6.0.ebuild
+++ b/app-emulation/libcacard/libcacard-2.6.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="virtual Common Access Card (CAC) library emulator"
 HOMEPAGE="https://www.spice-space.org/"
@@ -15,12 +15,12 @@ IUSE="+passthrough static-libs"
 RDEPEND=">=dev-libs/nss-3.13
 	>=dev-libs/glib-2.22
 	passthrough? ( >=sys-apps/pcsc-lite-1.8 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-simpletlv-test-fix.patch"
-	)
+)
 
 src_prepare() {
 	default
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index df5b28e64a5c..0caf98572563 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -13,8 +13,8 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2
 DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
 DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-EBUILD libguestfs-1.36.13-r2.ebuild 4076 BLAKE2B f696a859f85d99796e80d4e1a8a3a6321fbdbb462d2a9973540e98ed8d5565350f3f5c014edd8a1612ff2614ff34ee3093a0f67dcdf66aadfded07ee45eaed44 SHA512 44402367a66b8426e2599d5083af0d455c6ce49641b645c371c28e02bd917cd7b3ad9a8f198fb1708bdc38f87cae56cd66c606e2c9b0c88cca8fbeb98751256c
-EBUILD libguestfs-1.36.15-r2.ebuild 4280 BLAKE2B 6ce5ba5de75fb295ba38eaf57dd4ffa0b39b6665756b43ee114be0c7be6707545d72fbcf13b1bf26272e3b5d178011b1f2242c202c7981e2d0327978eee2e8d9 SHA512 6426e1613a2762558a0d364117e78df1cb8df23620c2b5481721170c94de28b501070f916c3bd6e7458a682b1f225ba04278954bdcd36642273903c826b7d62f
+EBUILD libguestfs-1.36.13-r2.ebuild 4066 BLAKE2B a69aef4ca7f87b3187cfd0683ca72fbe6aa79083318996b0108546246ff271c5144aaa388bbada0fd9dc763b97933838cf746c3b05381e94d7139daca8faafc4 SHA512 17a673845828e3e406892fdb91b1b5319351c261e874b59bdbba600147ae0c190d80bd919a0d6e3bfe9af33611f4ce358a129d904459deed322919475d45923e
+EBUILD libguestfs-1.36.15-r2.ebuild 4270 BLAKE2B 37aa027e7154348bb85cb6a3882ac436061461f8cc6b1512d758db660ddec847933fb74751d646de3e1652c84d1a59dcdc5df56c3ebce3210914ef08eb13ca3f SHA512 537a78fc168e8a63008c73e64b396321a493e63f7c021a792e501fcab4742f257753b2c0a397cbe34b09738ecd4eea0b9a4ac9164db434a150e6c08fe29b3adf
 EBUILD libguestfs-1.38.6-r1.ebuild 3982 BLAKE2B a3a620ad65c8f09f884c24c3d9cf59c552074bbd37603340bb9c58b423a0bb4e2a4ba0693be1999dca9a9d09bef699bc641d3b1cb50ce374cecd7b739ceaa9ea SHA512 461b83fc2e1abdbca3b1a6e43432889a31001ae3c118f35e202e9f137ac13c1d286fd4ff9e4fa2b4ac7a2461ccc6ff737c55e1a3755c88a95823227c49e5666e
 EBUILD libguestfs-1.38.6-r102.ebuild 4259 BLAKE2B a3d079eb6f7669ffecfbfaeee4dc82ed7e4bcf3bd7f98185fb89696f076f1d2ae45a9fd6bd61edcc0939d417ca7e57172ac4c469d18addeb44f4eee60043977c SHA512 30af5d7d291555455b7a56061521a66e6cdbd6d011f030e0cc72ff7c6eea409517c711892a75284061eec1afc9913809c1bf5b7826a55718f5d22d2ea2aab5e1
 MISC metadata.xml 775 BLAKE2B a07bce73924d205f7c34b2951453745eb9dc022e9fe05729fcb7a2f2a30bcc298172cc5839479e78421427e40ad61b7c47586f4113933bf99edd59edcd23c7e5 SHA512 38f7c789ecedcb40c34f64ba9231a5706506b1ac52acb35757b3f51f954ce768b8958525d4343520e0c1b6560fc4cb9ac4a898010598c149cc661e1f5f151964
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
index d7917faae2be..1c3065d4181c 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 		>=dev-lang/ocaml-4.02:=[ocamlopt]
 		dev-ml/findlib[ocamlopt]
 		|| (
-			<dev-ml/ocaml-gettext-0.4.2[ocamlopt]
+			<dev-ml/ocaml-gettext-0.4.2
 			dev-ml/ocaml-gettext-stub[ocamlopt]
 		)
 		>=dev-ml/ounit-2[ocamlopt]
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
index 9b008144a845..a1d8a602c2a3 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
 		>=dev-lang/ocaml-4.02:=[ocamlopt]
 		dev-ml/findlib[ocamlopt]
 		|| (
-			<dev-ml/ocaml-gettext-0.4.2[ocamlopt]
+			<dev-ml/ocaml-gettext-0.4.2
 			dev-ml/ocaml-gettext-stub[ocamlopt]
 		)
 		>=dev-ml/ounit-2[ocamlopt]
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 508ca55e46ec..fbdad0e1987f 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -13,8 +13,7 @@ AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7687e1425c1a297975f0e828cd2eafc11d11b589991acda87a489dd256ccf5a8947f91bb9431e515e979d8f29 SHA512 e213edb71d93d5167ddce7546220ecb7b52a7778586a4f476f65bd1e510c9cfc6d1876238a7b501d9cc3fd31cc2ae4b7fb9e753bc3f12cc17cd16dfce2a96ba3
 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
-EBUILD qemu-5.1.0-r2.ebuild 25362 BLAKE2B fb87a664b35972a7da2ad8bf73c0f67051cbd0bec154cf3f74d9e6f4339f833aded63323799982a5ae34e05daee981a3511112320572635beeb953838677e732 SHA512 f25ce8c1fe9ad7d6e098bfff7e94ce49b0cc2c00d25997bb33f22763c1ba5fb6ae4be9149187be9493c82d9329b620298a271bfc3bb5e154493fa4c006ee5545
-EBUILD qemu-5.1.0-r3.ebuild 25436 BLAKE2B 495f295152356199949de4d75fe33cce21eb76d109edba40d779c6c0e6d39f0de905763e0f6f0517d19251b9ca5c4f48cf193a413b6585fd948fec49e8091255 SHA512 0e2a6f158ee576782ffa88bf98b1623cf853aa22a010f9a709927d7a00af80d5f0e255593406f048200abb58b41aa5c968fd5aa80115d090b2f78475f6d4d569
-EBUILD qemu-5.2.0-r1.ebuild 25170 BLAKE2B 62fc04431120f5463f222ca588d02816e9dc27bb6cf5e89c7d885a3d309026a0271b9ce1d38f74dd6e6c8c33978f5e9f7ea3cf6ba6552cad871234f0673ae77f SHA512 a818c6742d322ff431113b58b447d3a66c54c26a0c78baa79553fb30f566d5c9ba8942fa44728b9cb7f67bd02d0fa472da8d72c50697ca2b694ade518bf21ed1
+EBUILD qemu-5.1.0-r3.ebuild 25434 BLAKE2B 085e2335088864d821a20e08cb70906767ccbc5f7c039d1a11b7484f5768113096095d5a802ae93dad7e852a09f7facb1de026edeab15622f2dbf2de43f5bdd3 SHA512 3a8a5d58e5c0ded0c1d520246ede1877055d4a13538f6f4b6d43cd05ff6444c9fa9d3199739ffb2d5a2dc1bbd64198e3bf7b55e69de8dcddf7ea73fb1d0b2e2f
+EBUILD qemu-5.2.0-r1.ebuild 25168 BLAKE2B 8759af283b8e5e0fcc9ae9997e741933e1b029af1bb8f45f06bd6378fea09fd30162d80a414c0a16dc8d7cca30bf4005bdeae213aefc962ae262dd351663d1b1 SHA512 3c4b410cf5fb77e1b562bb7643ea5cdc71197c603c16041dd663f691255b9e3d7c17f60c1fc0c690379a0ddeb1b6dff50728e760d73b95aa84e0e33ef7053f71
 EBUILD qemu-9999.ebuild 25075 BLAKE2B 5bfcd256a30718a644ef330226668fe536ef47e590f79d46f5aecaec3a06458bfb14239bda931f30e2230e5b48053621a8002aab768193a9c21c5df84577b261 SHA512 fda2bafceb94a545bdc2796f617c845b64d1d1b96014be3504dde8243e2c4b52beb85b2ff3f9ae98996756e7688b4378a67495f415c58a95415134b27b879963
 MISC metadata.xml 4458 BLAKE2B 521a9c7b7c3371ca4352decbaf2324ef22822a176bf22b4f26761dfc40535cb4a6d6438f39ae6803804fdac8891bd2ded0f972279eec9076b80803826946f954 SHA512 9ba9e2805b6fa423fad3da849f57fdc328e8d6276a0a3d15a8970fc117d8174a76a20be96cf9eaa2a92149de922aa0c9b807cd4f2412f335375088dc32a79b61
diff --git a/app-emulation/qemu/qemu-5.1.0-r2.ebuild b/app-emulation/qemu/qemu-5.1.0-r2.ebuild
deleted file mode 100644
index 03c6f9d091e0..000000000000
--- a/app-emulation/qemu/qemu-5.1.0-r2.ebuild
+++ /dev/null
@@ -1,859 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it sv tr zh_CN"
-
-FIRMWARE_ABI_VERSION="4.0.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1 \
-	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
-	EGIT_SUBMODULES=(
-		tests/fp/berkeley-{test,soft}float-3
-		ui/keycodemapdb
-	)
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-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
-	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
-	jack jemalloc +jpeg kernel_linux
-	kernel_FreeBSD lzo multipath
-	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-	+slirp
-	smartcard snappy spice ssh static static-user systemtap test usb
-	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-	xfs +xkb zstd"
-
-COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
-	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
-	sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
-	avr lm32 moxie rx tricore unicore32"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
-	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
-	tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
-	static-user? ( !plugins )
-	virtfs? ( caps xattr )
-	vte? ( gtk )
-	plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	dev-libs/libxml2[static-libs(+)]
-	xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? (
-		sys-fabric/libibumad:=[static-libs(+)]
-		sys-fabric/libibverbs:=[static-libs(+)]
-		sys-fabric/librdmacm:=[static-libs(+)]
-	)
-	iscsi? ( net-libs/libiscsi )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	multipath? ( sys-fs/multipath-tools )
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		sys-libs/ncurses:0=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl,gbm]
-	)
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[video]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	slirp? ( net-libs/libslirp[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
-	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-201905[binary]
-		~sys-firmware/ipxe-1.0.0_p20190728[binary,qemu]
-		~sys-firmware/seabios-1.12.0[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre8[binary]
-	)
-	!pin-upstream-blobs? (
-		sys-firmware/edk2-ovmf
-		sys-firmware/ipxe[qemu]
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC64_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.12.0[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-	)
-"
-
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	sys-apps/texinfo
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)
-"
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-	acct-group/kvm
-	selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
-	"${FILESDIR}"/${PN}-4.2.0-cflags.patch
-	"${FILESDIR}"/${PN}-5.1.0-pixman-for-vhost-user-gpu.patch
-	"${FILESDIR}"/${PN}-5.1.0-usb-oob-CVE-2020-14364.patch #743649
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/default-configs >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror " po/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	if use nls ; then
-		# Delete locales the user does not want. #577814
-		rm_loc() { rm po/$1.po || die; }
-		l10n_for_each_disabled_locale_do rm_loc
-	else
-		# Cheap hack to disable gettext .mo generation.
-		rm -f po/*.po
-	fi
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Use correct toolchain to fix cross-compiling
-	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB
-	export WINDRES=${CHOST}-windres
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Run after we've applied all patches.
-	handle_locales
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--bindir=/usr/bin
-		--libdir=/usr/$(get_libdir)
-		--datadir=/usr/share
-		--docdir=/usr/share/doc/${PF}/html
-		--mandir=/usr/share/man
-		--with-confsuffix=/qemu
-		--localstatedir=/var
-		--disable-bsd-user
-		--disable-containers # bug #732972
-		--disable-guest-agent
-		--disable-strip
-
-		# bug #746752: TCG interpreter has a few limitations:
-		# - it does not support FPU
-		# - it's generally slower on non-self-modifying code
-		# It's advantage is support for host architectures
-		# where native codegeneration is not implemented.
-		# Gentoo has qemu keyworded only on targets with
-		# native code generation available. Avoid the interpreter.
-		--disable-tcg-interpreter
-
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable doc docs)
-		$(use_enable plugins)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_notuser fdt)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser io-uring linux-io-uring)
-		$(conf_notuser jemalloc jemalloc)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser multipath mpath)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_notuser sdl-image)
-		$(conf_notuser seccomp)
-		$(conf_notuser slirp slirp system)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser vhost-user-fs)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_notuser virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
-		$(conf_notuser xkb xkbcommon)
-		$(conf_notuser zstd)
-	)
-
-	if [[ ${buildtype} == "user" ]] ; then
-		conf_opts+=( --disable-libxml2 )
-	else
-		conf_opts+=( --enable-libxml2 )
-	fi
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts=(
-			# Note: backend order matters here: #716202
-			# We iterate from higher-level to lower level.
-			$(usex pulseaudio pa "")
-			$(usev jack)
-			$(usev sdl)
-			$(usev alsa)
-			$(usev oss)
-		)
-		conf_opts+=(
-			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	# Plumb through equivalent of EXTRA_ECONF to allow experiments
-	# like bug #747928.
-	conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-
-	# FreeBSD's kernel does not support QEMU assigning/grabbing
-	# host USB devices yet
-	use kernel_FreeBSD && \
-		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	cd "${S}/tools-build"
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake check
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dodoc check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build"
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/qemu/qemu-5.1.0-r3.ebuild b/app-emulation/qemu/qemu-5.1.0-r3.ebuild
index 1e92a9837760..702d0b074840 100644
--- a/app-emulation/qemu/qemu-5.1.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-5.1.0-r3.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/qemu/qemu-5.2.0-r1.ebuild b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
index 18c936593131..538586090849 100644
--- a/app-emulation/qemu/qemu-5.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/vendor-reset/Manifest b/app-emulation/vendor-reset/Manifest
new file mode 100644
index 000000000000..1c9f429a1f86
--- /dev/null
+++ b/app-emulation/vendor-reset/Manifest
@@ -0,0 +1,5 @@
+AUX modload.conf 13 BLAKE2B 1e774873c1bf09ca1f3ec2c006b1938e3aa07187dd5a7f926369d6d1bc2c21bfe52f2cbb632f64174485896c8691ac4cbd10e988b7db7a2a9ada7fdccda1a22d SHA512 7a4bf9c95af41bf11e5a720f6258d62822f553c6f349dbe93cf23743b851d830340d268954252d6f058ea2fa823006a63afd45875e7b9108d5d2a6a1a316ff6d
+DIST vendor-reset-0.1.0.tar.gz 12718324 BLAKE2B 762ec8bc289b572ab8f8ecc3fa233e3c78c48c48a261c58ce1be9c10356a55957e0bd8fd01e3143443be74236bf9ed540b84d332788c67aa949599ccc5a564d3 SHA512 ed4dcb1a71fa8901732e729d37b501ac105cc2c93d0666e44c08e311d99a244027339d5709a9305ff992ca2acb2f337793cdb1f9369197911985cd20d6f3139f
+EBUILD vendor-reset-0.1.0.ebuild 938 BLAKE2B b813812d660f5d8a8e3bf338df26b19c11e7a2c8f107a96ed2711a165309a9476c04b74fb196a620e77907e6bed52bedb02a40cbfbf1e01dc0e17556316ba270 SHA512 b87a8e5c4ff7ec4a6fb0629d898b51e82f55bf748c3fc6bb4897c20add7d0e6024195404b9973d601a7c8d6b45425367e0ffe0d5084377f968f0941f5751e0d3
+EBUILD vendor-reset-9999.ebuild 938 BLAKE2B b813812d660f5d8a8e3bf338df26b19c11e7a2c8f107a96ed2711a165309a9476c04b74fb196a620e77907e6bed52bedb02a40cbfbf1e01dc0e17556316ba270 SHA512 b87a8e5c4ff7ec4a6fb0629d898b51e82f55bf748c3fc6bb4897c20add7d0e6024195404b9973d601a7c8d6b45425367e0ffe0d5084377f968f0941f5751e0d3
+MISC metadata.xml 326 BLAKE2B eb99500232f3d17e81b626f037ab585c48b49eab4d14616296af7b2c35507265e7aad497b28c25f5e89b4fdb56d9ab3242e51641f87b6580e85944af25a0bc9c SHA512 bcb6dbff6d69f20509d440a3c1b9aa2d4d9d0206fc2daca744acf29e9fceb8458a4d58b70ad77654bfcaf1094cbc20da5b43318059a3dee30913cacde1918a69
diff --git a/app-emulation/vendor-reset/files/modload.conf b/app-emulation/vendor-reset/files/modload.conf
new file mode 100644
index 000000000000..ff75088aa8fe
--- /dev/null
+++ b/app-emulation/vendor-reset/files/modload.conf
@@ -0,0 +1 @@
+vendor-reset
diff --git a/app-emulation/vendor-reset/metadata.xml b/app-emulation/vendor-reset/metadata.xml
new file mode 100644
index 000000000000..95a133672a10
--- /dev/null
+++ b/app-emulation/vendor-reset/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sarnex@gentoo.org</email>
+		<name>Nick Sarnie</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gnif/vendor-reset</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
new file mode 100644
index 000000000000..c772c4558764
--- /dev/null
+++ b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/gnif/vendor-reset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Linux kernel vendor specific hardware reset module"
+HOMEPAGE="https://github.com/gnif/vendor-reset"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER"
+	linux-mod_pkg_setup
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${ED}" \
+		INSTALL_MOD_PATH="${ED}"
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${ED}" \
+		INSTALL_MOD_PATH="${ED}" \
+		install
+
+	insinto /etc/modules-load.d/
+	newins "${FILESDIR}"/modload.conf vendor-reset.conf
+}
diff --git a/app-emulation/vendor-reset/vendor-reset-9999.ebuild b/app-emulation/vendor-reset/vendor-reset-9999.ebuild
new file mode 100644
index 000000000000..c772c4558764
--- /dev/null
+++ b/app-emulation/vendor-reset/vendor-reset-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/gnif/vendor-reset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Linux kernel vendor specific hardware reset module"
+HOMEPAGE="https://github.com/gnif/vendor-reset"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER"
+	linux-mod_pkg_setup
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${ED}" \
+		INSTALL_MOD_PATH="${ED}"
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${ED}" \
+		INSTALL_MOD_PATH="${ED}" \
+		install
+
+	insinto /etc/modules-load.d/
+	newins "${FILESDIR}"/modload.conf vendor-reset.conf
+}
-- 
cgit v1.2.3