gentoo resync : 17.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
commit: 463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree: 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /app-emulation
parent: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)
39 files changed, 84 insertions, 1179 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c587be72ec74..c06500fc6e8b 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index d1d2c1427440..4f0a6b1fdd64 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,11 +1,5 @@
-DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873
-DIST docker-19.03.14.tar.gz 18278132 BLAKE2B 5e32cb482fdc40531aa4ba79dd447093859f568b3d8b5c3ed584c78d5709fabf2a1e05e82af2686cd87462e1abd899bd3f0a746f97937b7d16950f5e94264dff SHA512 5e48185a7787d5637fc11f43f6af604d56a5fa4367fd5a558bb3a5ef3c0d767f1c7f83ecef369453696b68eed81e49520453f267fbe8c2b840b3f62d35f25c28
 DIST docker-19.03.15.tar.gz 18284803 BLAKE2B a1fac5d841934382d12c781353546b7c7a8167d0f2dc4150659a4aece210ea7361c59de25e3d450dae20fd536ea8dc33a18e55f9565ee4fdc818166810391fbf SHA512 ffd8e683a93a6ce69789603d24457aebe3379594692cb3dadc25bc8d407771a29d76087b0ca70856707f151622b1853f283a1071311c033ff90a1e44b0d9ffbc
-DIST docker-20.10.2.tar.gz 11045195 BLAKE2B 182ceabbabfa091eaae8ecf12a50dfbe296722072ee24cdde48c3ed2ad40f47d6f939830a00e1dbe7d5dfb1fa25ccda7efe25ce3e4f9a7bbf6ad85dac109168c SHA512 b514e98e3f71874fcf5374eeaaabc2c879691b48937dbc962be3577d834f571353d4f946aebfa69f1a62b1388c9220bfdff09b62bf62c134bd41f494e8506f56
 DIST docker-20.10.3.tar.gz 11063792 BLAKE2B 9309573dd83d0746bb492cf68e06d69e60550718f8f934a065b33d1538847a4effcf6310638daa9b535515bc43cc1b47636482c90d4499f2b46b74aa37882dd7 SHA512 8389980e0b47e34872301bbe703d7abfc7819946736bab0ef4fee983daa4f798c7c6373d823dc62a3995076e71ca6bc86dc793f736b68e8ec1040332193cfdb8
-EBUILD docker-19.03.13-r2.ebuild 9217 BLAKE2B c75a45738a89c1205a6515e3c9796cdffa63776cc54ba6f345579ecaae9642dbb8c8246af1b78b0cd14002a25a1bb8ff8238a4eca874bdfd30ea23bf1c5ff5c1 SHA512 65f016b40849652aea58353a6a3045c0aaac8793891db727ab597a97e885a27ba8380413b108ce090afa66474fa3502b74c8278722bcae454fc98b4a3c226bf4
-EBUILD docker-19.03.14.ebuild 9216 BLAKE2B 01bb9dde2f897bc65e4eabefc07be637118e19d512e4a0c46e8ba6d5aec6b5b2aba8f1e702eda11a4641f08acc3c91661348b89561b3d2f11e7e59bf6991ec3e SHA512 cf68f486054ed21d6a690f364e84db2e8b8efab22d8eb1a8de0e381d1011c221f0ab664be5e22973d82cc1a98fac29135cc3baa0171362b7152e80da1d5a186b
 EBUILD docker-19.03.15.ebuild 9217 BLAKE2B 8f0eeca1ce67fd8507ff2b8e5e21aaa3191325c3a27acc50d9749bcc235cc0e40d5fa3b47c4076e0a2b00699e1583a5dbe913a3661eb552816076f27f4b9c39c SHA512 a6a6e934368ab9a16635e5e4ef610ef8df087126e33ca59c90f253c5e8357ef761e60d58e275eca012176c65576d90f4213913137f84bb3d063278efe6173c6c
-EBUILD docker-20.10.2.ebuild 8102 BLAKE2B 5d5c0141716c1f08797d10b61bd0c80be27fdd7ccac70d7b02035e91afe105c6b3bf637cf86c35844f371637002559a977c4b819009329f7dbe68e0802385f45 SHA512 1b2b889559e70b5be6cee3a49149293ad30d0e2a67f01b0be27dcf75190a5f2cdf8fe489a81df0c0febd6f76b051ada8c73a3745f34ea2bf6a9fdbe4c02734b1
 EBUILD docker-20.10.3.ebuild 8102 BLAKE2B 1cda7fd700b096e0d21428f40e66331276e65269615eaa5f25f1a78fd1d8c9cb21419621479429dcd0bfa59119b69b1e6fdfa1d27b7b9ac37d9356a61050d6a1 SHA512 3755cc9759b8e544763869a6ff52d73060ddd04c149704c02de9e2ce23decec443ee95f162eaaf6a270a3191cdc604eaa5cccb86e30e6fe356b76690ea6be8a8
 MISC metadata.xml 1730 BLAKE2B 119ca97015c54afc8ea75d64e41d550afbcad5a3a6951f059d005e9a5086b467b26b348f6d29a7af4ff86016ecd8978fd20c9cacad41eb85a18756fc395d8a1b SHA512 c204ff1a267cbf386fa35d08b6a3ed91dae745d6bcadcad6e4cb085a510c53c37bda488ec077cfb9cbe57f2387e52a0fd00c153b7ef8d88225dd3c7d4b26f7e3
diff --git a/app-emulation/docker/docker-19.03.13-r2.ebuild b/app-emulation/docker/docker-19.03.13-r2.ebuild
deleted file mode 100644
index b4de621c665c..000000000000
--- a/app-emulation/docker/docker-19.03.13-r2.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	DOCKER_GITCOMMIT=4484c46d9d
-	MY_PV=${PV/_/-}
-	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.13.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install
-# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^,
-# for appropriate brachch/version of course
-RDEPEND="
-	${DEPEND}
-	!sys-apps/systemd[-cgroup-hybrid(+)]
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	~app-emulation/containerd-1.3.7[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?]
-	~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?]
-	~app-emulation/docker-proxy-0.8.0_p20200617
-	container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-
-	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
-	~EXT4_FS_SECURITY
-	~EXT4_FS_POSIX_ACL
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is lt 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-			~IOSCHED_CFQ
-			~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	if kernel_is lt 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is lt 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp selinux; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	VERSION="$(cat ../../VERSION)" \
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	DISABLE_WARN_OUTSIDE_CONTAINER=1 emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		dynbinary
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use device-mapper; then
-		elog " Devicemapper storage driver has been deprecated"
-		elog " It will be removed in a future release"
-		elog
-	fi
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-}
diff --git a/app-emulation/docker/docker-19.03.14.ebuild b/app-emulation/docker/docker-19.03.14.ebuild
deleted file mode 100644
index 7524b7a23f46..000000000000
--- a/app-emulation/docker/docker-19.03.14.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	DOCKER_GITCOMMIT="5eb3275"
-	MY_PV=${PV/_/-}
-	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.13.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install
-# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^,
-# for appropriate brachch/version of course
-RDEPEND="
-	${DEPEND}
-	!sys-apps/systemd[-cgroup-hybrid(+)]
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	~app-emulation/containerd-1.3.9[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?]
-	~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?]
-	~app-emulation/docker-proxy-0.8.0_p20201105
-	container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-
-	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
-	~EXT4_FS_SECURITY
-	~EXT4_FS_POSIX_ACL
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is lt 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-			~IOSCHED_CFQ
-			~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	if kernel_is lt 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is lt 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp selinux; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	VERSION="$(cat ../../VERSION)" \
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	DISABLE_WARN_OUTSIDE_CONTAINER=1 emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		dynbinary
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use device-mapper; then
-		elog " Devicemapper storage driver has been deprecated"
-		elog " It will be removed in a future release"
-		elog
-	fi
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-}
diff --git a/app-emulation/docker/docker-20.10.2.ebuild b/app-emulation/docker/docker-20.10.2.ebuild
deleted file mode 100644
index 0330740f9dcc..000000000000
--- a/app-emulation/docker/docker-20.10.2.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN=github.com/docker/docker
-GIT_COMMIT=f0014860c1
-inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-MY_PV=${PV/_/-}
-SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-"
-
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
-# https://github.com/moby/moby/tree/master//hack/dockerfile/install
-# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^,
-# for appropriate branchch/version of course
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?]
-	~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?]
-	~app-emulation/docker-proxy-0.8.0_p20201215
-	cli? ( app-emulation/docker-cli )
-	container-init? ( >=sys-process/tini-0.19.0[static] )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.13.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-
-	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
-	~EXT4_FS_SECURITY
-	~EXT4_FS_POSIX_ACL
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is lt 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-			~IOSCHED_CFQ
-			~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	if kernel_is lt 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is lt 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-	newbin bundles/dynbinary-daemon/dockerd dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot:"
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "  systemctl enable docker.service"
-	else
-		elog "  rc-update add docker default"
-	fi
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog '  usermod -aG docker <youruser>'
-	elog
-
-	if use device-mapper; then
-		elog " Devicemapper storage driver has been deprecated"
-		elog " It will be removed in a future release"
-		elog
-	fi
-
-	if use overlay; then
-		elog " Overlay storage driver/USEflag has been deprecated"
-		elog " in favor of overlay2 (enabled unconditionally)"
-		elog
-	fi
-
-	if has_version sys-fs/zfs; then
-		elog " ZFS storage driver is available"
-		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
-		elog
-	fi
-
-	if use cli; then
-		ewarn "Starting with docker 20.10.2, docker has been split into"
-		ewarn "two packages upstream, so Gentoo has followed suit."
-		ewarn
-		ewarn "app-emulation/docker contains the daemon and"
-		ewarn "app-emulation/docker-cli contains the docker command."
-		ewarn
-		ewarn "docker currently installs docker-cli using the cli use flag."
-		ewarn
-		ewarn "This use flag is temporary, so you need to take the"
-		ewarn "following actions:"
-		ewarn
-		ewarn "First, disable the cli use flag for app-emulation/docker"
-		ewarn
-		ewarn "Then, if you need docker-cli and docker on the same machine,"
-		ewarn "run the following command:"
-		ewarn
-		ewarn "# emerge --noreplace docker-cli"
-		ewarn
-	fi
-}
diff --git a/app-emulation/dynamips/Manifest b/app-emulation/dynamips/Manifest
index ae69e0bdb360..ea9cbf205dfd 100644
--- a/app-emulation/dynamips/Manifest
+++ b/app-emulation/dynamips/Manifest
@@ -1,6 +1,4 @@
 AUX dynamips-0.2.18-docs.patch 533 BLAKE2B 765024fa4246c5efc576c91619d7c01c00b67cb6eddd3086b1670ea4f89e000dab6680e38cdbd384d9850477a682f42070d9a74c59ffea0a1a1f8d095703e625 SHA512 293059e7f4fc848362e5d6c881386bea9fcf616117d2723a216e510cbc23372f40a6d757f84bcdb429b5eb61f74e99d334e7507c2161c4d28ccb973c14aa7893
-DIST dynamips-0.2.18.tar.gz 833554 BLAKE2B 8152b436e8fc43061c5603a44ceae8feebdd4593649d2fb6a1814ca22cfce2f671f6f98df5f03ee6eeef10cf09fc444d406edd8d3b4a6037a89cf0e8301774ac SHA512 d66e32d72ecc9ebff5232377ac9aa5b966ceb08884cc7f8dc4a8cf3f56305e7cefd677624ba66278f6603a3b275c384bd0ff3905932461b1f8056106cd272a4c
 DIST dynamips-0.2.21.tar.gz 833863 BLAKE2B a3162de26839a4c99fd1f147fe0a12e04f4b225b6539aa1599550c40c6a9e21deed950b47f7afbbc1cfbe2f61a351a4185a18f56c4b63c191eccc7122e2c0115 SHA512 c7251963897b65ed5696f47f03be727cea79fe2245850c86fa6b4d8718afa10002b1e39bccefe1c7f2ba86fe6b8f52fe8663ee34f72ca3d9f846522b9b9b4d29
-EBUILD dynamips-0.2.18.ebuild 821 BLAKE2B 86ec42ec88cbbca52f6f50d9b703ad366452b730cf165714bcaf3a5a135c49872220e8fa6cc61b4d0ba0ce824fd0a100795a2f0493715e6080db1ec12ecce375 SHA512 a2a7ca16bb46b48ec1ef4e50bfabb0c6c420bb0baa43289dfeb83c11680f6a7f14be5957dcdedb8e48248192a8a054edeafb0a42135921d09168e9884b1248c0
-EBUILD dynamips-0.2.21.ebuild 835 BLAKE2B 523bbd9cf0edacd2993cfc30aefef3e86386545a9b6fad62ac038ec8ec0079be1144e4a4ba49c6599aaa5c6174a0f6a8f101327553eae93ea4287f109b3ce5a1 SHA512 9ebeac76aac14954daf3e01122aab5012ac81685c5b1d472df5bed6a3e35c0d9832128098ac531e3acdec9c5bc4be640d8c1bfd4366202f7ef12db807378d9aa
+EBUILD dynamips-0.2.21.ebuild 819 BLAKE2B b71e2538caca86cacd1cce8cf3ed532d80ee4b28a9c22304a99b77c4ee8545e7d44b1b391a202448244ad87744c88fad05ca5e8d0db18b592128c6b0192d6726 SHA512 cef4a689fa69464b4b6992e87db7dca8a596887eaa3cfb08d9af468c7dd82b99d889609e5a77f07573b1b7b178f3196a5bf29e9f2634cfb5c26f6b57d9559f0a
 MISC metadata.xml 295 BLAKE2B 8620855399c33f332681337e77731ab41e62ffbf7cc3b4393b6eed9a00878275ee595696b0f2732722c8f1fc95a54e9a4960882b6adf198134ee3982b6958a9c SHA512 ff501b29ad43a5fedf38374c038c4682f1bc43a2a0b5ab90f56ee0ffaf899ebd90409af29803cc8c7c35b7d1033196d621243129144710eaad02f8b25e436d6c
diff --git a/app-emulation/dynamips/dynamips-0.2.18.ebuild b/app-emulation/dynamips/dynamips-0.2.18.ebuild
deleted file mode 100644
index 1b58ec9cfdad..000000000000
--- a/app-emulation/dynamips/dynamips-0.2.18.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Cisco 7200/3600 Simulator"
-HOMEPAGE="https://github.com/GNS3/dynamips"
-SRC_URI="https://github.com/GNS3/dynamips/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ipv6"
-
-RDEPEND="dev-libs/elfutils
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-DOCS=( ChangeLog README.md RELEASE-NOTES )
-
-PATCHES=( "${FILESDIR}/${P}-docs.patch" )
-
-src_prepare() {
-	# comment out DYNAMIPS_FLAGS to respect CFLAGS
-	sed -e "s:^set ( DYNAMIPS_FLAGS:#&:" -i cmake/dependencies.cmake || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DANY_COMPILER=1
-		-DENABLE_IPV6="$(usex ipv6)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-emulation/dynamips/dynamips-0.2.21.ebuild b/app-emulation/dynamips/dynamips-0.2.21.ebuild
index 21b04e6456e7..ad971daa108b 100644
--- a/app-emulation/dynamips/dynamips-0.2.21.ebuild
+++ b/app-emulation/dynamips/dynamips-0.2.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Cisco 7200/3600 Simulator"
 HOMEPAGE="https://github.com/GNS3/dynamips"
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ipv6"
 
 BDEPEND="app-arch/unzip"
-RDEPEND="dev-libs/elfutils
+RDEPEND="
+	dev-libs/elfutils
 	net-libs/libpcap"
 DEPEND="${RDEPEND}"
 
@@ -28,7 +29,7 @@ src_prepare() {
 	# comment out DYNAMIPS_FLAGS to respect CFLAGS
 	sed -e "s:^set ( DYNAMIPS_FLAGS:#&:" -i cmake/dependencies.cmake || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -36,5 +37,5 @@ src_configure() {
 		-DANY_COMPILER=1
 		-DENABLE_IPV6="$(usex ipv6)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 52197978553c..06765b3edcbf 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -8,6 +8,6 @@ DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068
 DIST free42-nologo-2.5.25.tgz 7423321 BLAKE2B 23d69045df8e7a96669a14e5760da4e1f8578b050ff6ddb19b000c8254b04883449c38e78c5af93a9341485363ae52ce41e6398b9954a6eac61aae6276e20488 SHA512 cedc05ad60cf56b4634e0b1525ef75fac8ad16ce14ae80752fda12a6373cc2cf42d4b696e99c121b1dc42087e477ca2d948f173c9128acc91d5bc266259b2836
 EBUILD free42-2.0.20.ebuild 947 BLAKE2B 24fb1ce5c86a3dca83f459cb992aa238c3f25848be5ff00b505956d8118ecf0c0574b9647df02821f20ab47c0f8505f2c89dff9951b9b7307b114e5351cea715 SHA512 cce77ea9b6e4e5367f147091eb70cbf4e980885343510d424cba9fa8265ab0087cdaacd3f49673979fc4256219201bd9fda281a992d7bd7ea898111ae3b160d5
 EBUILD free42-2.5.22.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f
-EBUILD free42-2.5.24.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304
+EBUILD free42-2.5.24.ebuild 989 BLAKE2B 884e2a8cb8ab99530d78cefc1006b42d11511e8110177310c195eb0c1b2148afcb76b2291511a64d9f095119583b35f7c45ada0bfa1d0cd48c9024affec7f98a SHA512 39a37ad4e66c1514a2f30c9931a08cc832d73d3dfcbf1b550273a1f1be39290d7ef50b67b771e92fa3ecea177f5f575c3373b46574749dc7327680734017cbc0
 EBUILD free42-2.5.25.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304
 MISC metadata.xml 345 BLAKE2B 2693f9fd6f59806e57f9691b8b77ec0979e3ee819866bc1d9e3b3f311995a0b1fb7ae00a23b50f603064e1d35215fdd8fa6eb715fc83cd613eb828fd87f78eb2 SHA512 afbf038baa3610520f7d9b63b54acc98552b16241bf3f7efebe4048b572bf65098c74896647eed4611c29444f7d16914233744f08069468eededf34ba7a5d758
diff --git a/app-emulation/free42/free42-2.5.24.ebuild b/app-emulation/free42/free42-2.5.24.ebuild
index d25a89b2d1c4..a12cb0bc7ff7 100644
--- a/app-emulation/free42/free42-2.5.24.ebuild
+++ b/app-emulation/free42/free42-2.5.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+alsa"
 
 DEPEND="dev-libs/atk
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index 11b3154f3c7b..52bad1a12bdf 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,6 +1,7 @@
 AUX 0.3-nine-dll-path.patch 414 BLAKE2B a1747c90521f2fec6ba70ea77c2b7a2adafd705e04a46ea14fe983859f00c0aa33ec73dc24a03805579b84b57a2528857994943bb999e2f38c6f652404fd661e SHA512 423a7ebd8284c475d226109e0af9d867753b75ff1d1a9100d948c91e71dbc76bd8d8973e4ecf3fdb8fab5555da6339484459c623f028f7091e9d010395f24970
 AUX 0.7-cross-files.patch 924 BLAKE2B f272fe2034d2b17db3ac19e93a5f121970dcc3a0a76bb9ceb0f38bf63632f379f83c86dff70677ece94965658c029d0761ad55133fe58fb576305fdcaee2f3b5 SHA512 94ad1b8806be083c1fae89f3601c2881f696538266c8c4159c4dfb3507737fd03c6cbac08d07bfd8a4d965011b28298e14dbdc5c51fba9ba6ba952d74171012c
+AUX 0.7-no-libwine.patch 1098 BLAKE2B dc71eade0bfaf6f491dda64ddf42ca7e9b37ff57d6112983e3821af8decee01206b01e0e4031434b346507a8dec5f12171d5eea686e19a952d5186261259e931 SHA512 2fedc4ff71790319a80215348e62fdd97388331095e7ba52023715d1c6fe83fed1a6eef2a872244b73a25efcf017e62a78ccf2497a2798637d53855c9dca9578
 DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B 85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e SHA512 9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c
-EBUILD gallium-nine-standalone-0.7.ebuild 2872 BLAKE2B 26287c4c3284ac76bc75052682796b9dde89e8d5628c1f28fe76eb4a31d02c1771cc33d92dbbd35c0316d36824fef79cb1ab5140349e6420d666f24caddcbfca SHA512 b6697499f1c807f378bbf16d8cfbfd576729e7aca85332cd9af448f547a898dab965ff5b21ae5e8db4a5a75d0f9013e1fd295ac342ee81ea83998afd0d855233
+EBUILD gallium-nine-standalone-0.7.ebuild 2908 BLAKE2B 8a9f5e0a7605353041e66ca7998b6442cfdc50b0e5675bc4cb16c2c088b8c4084f73d7b7a45a7c9cdcb313d1be39d0220f1ad030eda801d2d37a92ceb1f77d2f SHA512 6083741b41a506456d0f3b46bac1114afead4be2cc99615ac52acd1c0e79ca2dbfe8ebe110e5b9ab577f575edc3da3c6b73e36892f1f870976cb8c61be2f2fea
 EBUILD gallium-nine-standalone-9999.ebuild 2872 BLAKE2B 26287c4c3284ac76bc75052682796b9dde89e8d5628c1f28fe76eb4a31d02c1771cc33d92dbbd35c0316d36824fef79cb1ab5140349e6420d666f24caddcbfca SHA512 b6697499f1c807f378bbf16d8cfbfd576729e7aca85332cd9af448f547a898dab965ff5b21ae5e8db4a5a75d0f9013e1fd295ac342ee81ea83998afd0d855233
 MISC metadata.xml 774 BLAKE2B 8b793ed6e079a800628ed7e59786bc82dd191c05367ef5e1600f903f3ebfd32c9ab0034a1dba1701ec104348cf1b9a8b437b63300e607a65ee92b1887be4800f SHA512 9453d7d767ba7f788291c6980a86388a0f952b893a474aa17e249c4f3b9b77b864108230fdc8f8b94e74eb45443f608a8d9ecde10cbc121234c9b91f59e7b752
diff --git a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch b/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch
new file mode 100644
index 000000000000..abcf7ad4ea3b
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch
@@ -0,0 +1,34 @@
+From bddb53abdd1a77b1c019457f7eea4a6404a5e492 Mon Sep 17 00:00:00 2001
+From: Andre Heider <a.heider@gmail.com>
+Date: Sun, 17 Jan 2021 11:42:57 +0100
+Subject: [PATCH] meson: stop checking for libwine
+
+From the WINE 6.0 release notes:
+The libwine library is no longer used, but it's still provided to
+support running Winelib modules built against older versions. It is
+deprecated however, and will be removed in a future Wine release.
+
+libwine wasn't used anymore anyway, this just ensures that this tree can
+be built against future WINE versions.
+---
+ meson.build | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 0969777..47ee51a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -35,12 +35,10 @@ code = '''#ifndef __WINE__
+ #error 1
+ #endif'''
+ 
+-if not cc.compiles(code, name: 'winelib check')
++if not cc.compiles(code, name: 'winegcc check')
+   error('A WINE cross compiler is required')
+ endif
+ 
+-dep_wine = cc.find_library('wine')
+-
+ if not cc.has_header_symbol('windows.h', 'wine_get_unix_file_name')
+   error('WINE headers not found')
+ endif
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
index 3e96326a2fc8..ea3ad385cab5 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,6 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/0.7-no-libwine.patch
 	"${FILESDIR}"/0.7-cross-files.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index a483fcf1dbcf..8e5bd2efc070 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,10 +1,10 @@
 AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4
-AUX lxd-4.0.0.initd 1097 BLAKE2B 8cd967f37edc7c87a5d225dc77a39e6696596fb9d53829289b75b3f136572aaaaede5ad78360c0ca2055bcf23627fd75102616ff9da604785bdcbdcb57ae81ff SHA512 5a40f0e7a6fe5e8b301f8fc22344fed64fe8b8894a175600e938f147f49ccf4fa71c75fdfe25ba936c65435fcabdc5f7a606993093e5ffdb7dbc4e0b9f03621d
+AUX lxd-4.0.0.initd 806 BLAKE2B bd28a871c8984eb27043e78cbb06ab64e8e071e9baa06a53015b4c7d28ff74b9ad54093acda51d66ed8e07921eb8c1ead8a5f6075404334e54c0d0096f19aa31 SHA512 c9a30685272ce2828d3c739a5718a388ffc70b0c613faa7d18c91b44e311f33abe2d51153c2ae6dd12d3cf921830952937214289e5b4d700d8f57e74ac2fc206
 AUX lxd-4.0.0.service 519 BLAKE2B 5314820c25e52449aad8db6584739cbe0f2654111e4b42c3eef0df995373487c789390dee99420dfd1aa5768ba66ba72999e8f2d8a3b0be6e621185f185b5b85 SHA512 c68c4106e189bd32538f5f2963c43afc30418dd9afeca56e5590f354725eb0126ee0aac02082cc42d69b851f392a4977a4f95cf2886044ad563c9a36facea222
 AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661
 AUX lxd-4.0.0_apparmor.service 567 BLAKE2B e5951c31f90b842f5b625060326d9611ed67fb50360b11791cbd1ab1953fdfe5eb726e22b7091bb8e45c294b772e6b00e9ca65833512eb5b570627fa3234812e SHA512 364764d007f4800138c712fce70fe28b096b6e35dc6d2e4f8aa9aff4b335ecec7dfc9600a1a16cd38e69a96534b7462daf5f6e946a2ee81bce17977b8d5911db
 AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718
 DIST lxd-4.0.4.tar.gz 14166577 BLAKE2B 5a04efa1bf70d416b328f5f85379a7c697667978a2b7571c05f8d834ccea51c65ce3df447787ccad5c0a9cc524bc396eb5c90b26b92d6252fc07a5be0157e0ea SHA512 800768b923de920e04d676d9c87beedd2ddd164661799c429616f6fa00b36f23ae1d9cff56f2ed16172585b9b3c058ee955eb3e5f8d98c84109c4405c5aae23f
 DIST lxd-4.0.4.tar.gz.asc 833 BLAKE2B bac0b63fc7fe61290bd399ef09eaf0bae12ac962b1188c49fa94c9132b002c278dcdb271d35a1784848591a315a8e88eab823c1c653ef814d454a0af607e461b SHA512 7fc9b9b27305d7637efeaf4024a8a26e2f891599fe50fa22e2f9defa6d451a015d74d068f63a9547fce312ed5fb5da82b99be9dc13601f807695cf1b675baf15
-EBUILD lxd-4.0.4-r5.ebuild 3819 BLAKE2B be531ecbfbab005179ffede6038eb6798297c324c0870064a37e94d473bb6b6e94e42abfe1e623d78f39fc1c0c62923901c8444d2842cbedeca1e08b8f242b17 SHA512 13110a84d788c5834f8cc1deb32d3c8e296d080167923be035198dcc36e026f97b3bcad33f30787cdec68a09e03dbacd03de14902955b2e58c10fbfae8bd2370
+EBUILD lxd-4.0.4-r6.ebuild 3819 BLAKE2B be531ecbfbab005179ffede6038eb6798297c324c0870064a37e94d473bb6b6e94e42abfe1e623d78f39fc1c0c62923901c8444d2842cbedeca1e08b8f242b17 SHA512 13110a84d788c5834f8cc1deb32d3c8e296d080167923be035198dcc36e026f97b3bcad33f30787cdec68a09e03dbacd03de14902955b2e58c10fbfae8bd2370
 MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0
diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
index 03ec12e44f56..266e84fcef64 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -1,12 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 DAEMON=/usr/sbin/lxd
 PIDFILE=/run/lxd.pid
-TIMEOUT=10
-
-extra_commands="stopall"
 
 depend() {
 	need net
@@ -32,23 +29,11 @@ start() {
 
 stop() {
 	if [[ ${RC_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then
-		stopall
+		"${DAEMON}" shutdown
+		rm -f ${PIDFILE}
 	else
 		ebegin "Stopping lxd service (but not containers)."
 		start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
 		eend ${?}
 	fi
 }
-
-stopall() {
-	ebegin "Stopping lxd service and containers."
-	lxc stop --all --timeout $TIMEOUT >/dev/null 2>&1
-	if [[ ${?} -ne 0 ]]; then
-		lxc stop --all --force || eerror "Could not stop all containers."
-	fi
-	if "${DAEMON}" shutdown; then
-		rm -f ${PIDFILE}
-		eend 0
-	fi
-	eend ${?}
-}
diff --git a/app-emulation/lxd/lxd-4.0.4-r5.ebuild b/app-emulation/lxd/lxd-4.0.4-r6.ebuild
index 6419fd084033..6419fd084033 100644
--- a/app-emulation/lxd/lxd-4.0.4-r5.ebuild
+++ b/app-emulation/lxd/lxd-4.0.4-r6.ebuild
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 43eabf9c8782..2b21e4ccc05e 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,9 +1,6 @@
-AUX protontricks-1.4.1_no-setuptools-scm.patch 1291 BLAKE2B 8d97cc8ab7d7dcdba72a3245d7bbd6965d0e0da1f22e290babe6a967057c0ddd6ba85920799f3fa85de4e395f29ea6362472380d3888f2a59bd7c1c167151337 SHA512 730180ce050a81ad42680bb884e3b86b4cc7c2d0efadc07f3a0708f55ab0158b8257e3528ce748d4be830d728e9a238c6d5deef15bc2c926b13ce1c7a1f9a4f2
 AUX protontricks-1.4.3_no-setuptools-scm.patch 1174 BLAKE2B 16ad14073457431d388e295d5004874a8b7bc74aa5762c3f4a950c35ad485d9dc60312acaa511541ff4f2d2e826c31e5c74d1f51d80721bb5ffaa23903714283 SHA512 99349a830eba3e248db3f67f5cd842764700fff51788db1fc649ba9dbef3f356c6ec4a66e4608a74eb67b919d53700b5c501e55a98f78e67e9c63e6f851aa18d
 DIST protontricks-1.4.1.tar.gz 31838 BLAKE2B b8c94a1b96fa7df14eaf1cc6d11cb96e43ae4e8c7bd232687a50cae9c79cf2d0e7864b1af0e1dc4cc20086952e1fcefeb16cb71a9c3a977f6feafad1b17d6857 SHA512 7635c9830afa3c64617514cd86edc7d7f9f33e6e81a1da995ec8bee70adc1cf8b5d9de92036c372134e408d735615b267b46a9afc9246f14ff161cb2ee1fc8f9
-DIST protontricks-1.4.2.gh.tar.gz 41381 BLAKE2B 9030c5cc0781303834af3b478e78f9ba43f01c68c5e203df20a9db80492dd5e641134b796158011a15e65f6907f27a67c542323ea8f9e10c49dca3f5c663458a SHA512 8b60233723130e5f7cd1a7ce7b9563ba1cc8595352b6d942d9ce66a6906f18d86cf97e2b49cbdb8e276fad6cd038eaf1de8a704a8b900b29de5dfb7327b045d0
 DIST protontricks-1.4.3.tar.gz 43573 BLAKE2B 3a3050ba6e940182d81d98498a5558433ceaa4282f5a23fb93b3cfc299699381493eb2912c5f03bb6a8092be5c50b94bf7181208cda3d4c0f4c90c0f438f7f1b SHA512 7ca8c7c273d92f7c4526caaa8c9db6988c642913c33c6b6188d285d5cfbe30924533a9f024135865cdc1a25bd867ac00bd915b0a61417d17fe0e5ee451417e64
 EBUILD protontricks-1.4.1.ebuild 1413 BLAKE2B 95ebee3c6b4b1b68b72b5ba0eb3daf7b49baae9eb3c7c2f1f8de0781f17dfbb9b190c4c4751cf98520401e93529fe5b43734a76515138592cdc77f922e50bc8c SHA512 2c0d1a4b403313e4a14158319cf90ce4056d03685e082169452fb4424e1eca025305112c647a5b118ba2168ca035b9b0a53221e3a1a0411176c8c1d569e24ed3
-EBUILD protontricks-1.4.2.ebuild 1461 BLAKE2B cce88fafe13f450f4864f2e62c441a6541c79ab4bfa012bf93cf9783c083f98647ae99c2f8b6f137a0521f7e8a623944c96b0f6bf0dc2e5e359b1a028b949747 SHA512 2900360b5bd6af9dcd2cd8bb5ca9677be14c0087aa98149a604deff24c876692b7762943442ed5af1a3621245c846f251de93cf9db6c75149624b9ac241dcb80
 EBUILD protontricks-1.4.3.ebuild 1443 BLAKE2B 8e618ffbeb08d2eacd054c034a7b56f4c737fca62bd9957cb8b25d052f3c1cc384e95923990f49a5aca2a7dbadf246cc393f4fc006af7a0d4d888f3eb303d58a SHA512 3c985a558ac8d63bf32a3d5754f78e207029e19a2d99fc7c5c09ebe272116338ec492d40e84df721f906a2a3798aeef4bae7ccdab794b4ddb6856e1276449728
 MISC metadata.xml 784 BLAKE2B 37e795944e32ef3f17022efa4ad352e3ee2d1819f3e7ee4ccf02f2366156c999290b4b309c924f54dfde4a5ffc017628c36ead987da2101d2eb38c1eaa767e3e SHA512 6bccb95acbe4cf3b64b4734f98dc4495bd20df294efa0b628f08f4c2ee6bb6c5d103bd323ac29dddb02d2a7ff4ac88ccccdce8a8c01b856aef051eaae6cdb0ae
diff --git a/app-emulation/protontricks/files/protontricks-1.4.1_no-setuptools-scm.patch b/app-emulation/protontricks/files/protontricks-1.4.1_no-setuptools-scm.patch
deleted file mode 100644
index fac3ed813d4e..000000000000
--- a/app-emulation/protontricks/files/protontricks-1.4.1_no-setuptools-scm.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Since version 1.4.1 upstream has used setuptools-scm to determine the
-current version number. Unfortunately the package in question does not
-support GitHub release archives, using GitHub VCS snapshots would require
-retrieving and updating commit hashes corresponding to release tags, and
-PyPI tarballs do not contain tests. setuptools_scm_git_archive does not
-help because it requires extra files to be included in the repository,
-which upstream has not done.
-
-Seeing as we already know the version number, bypass setuptools_scm
-altogether and create the version file ourselves. For obvious reasons the
-latter cannot be done with a patch alone - have to call sed in src_prepare.
-
---- a/setup.py
-+++ b/setup.py
-@@ -16,9 +16,6 @@
- 
- setup(
-     name="protontricks",
--    use_scm_version={
--        "write_to": "src/protontricks/_version.py"
--    },
-     description=DESCRIPTION,
-     long_description=LONG_DESCRIPTION,
-     author=AUTHOR,
-@@ -28,7 +25,6 @@
-     packages=["protontricks"],
-     package_data={"": ["LICENSE"]},
-     package_dir={"protontricks": "src/protontricks"},
--    setup_requires=["setuptools_scm"],
-     install_requires=["vdf>=2.4"],
-     entry_points={
-         "console_scripts": [
---- /dev/null
-+++ b/src/protontricks/_version.py
-@@ -0,0 +1 @@
-+version = '@VERSION@'
diff --git a/app-emulation/protontricks/protontricks-1.4.2.ebuild b/app-emulation/protontricks/protontricks-1.4.2.ebuild
deleted file mode 100644
index a3f334a0f48d..000000000000
--- a/app-emulation/protontricks/protontricks-1.4.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
-HOMEPAGE="https://github.com/Matoking/protontricks"
-# Will remove the .gh bit come next version bump
-SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gui"
-
-RDEPEND="app-emulation/winetricks
-	$(python_gen_cond_dep '
-		dev-python/vdf[${PYTHON_USEDEP}]
-	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.1_no-setuptools-scm.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i -e "s/@VERSION@/${PV}/" "${S}"/src/${PN}/_version.py || die
-}
-
-pkg_postinst() {
-	elog
-
-	if ! use gui; then
-		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
-		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
-		ewarn
-	fi
-
-	elog "Protontricks can only find games for which a Proton prefix already exists."
-	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
-	elog
-}
diff --git a/app-emulation/softgun/Manifest b/app-emulation/softgun/Manifest
index 3bb10e4e19f6..faf51b7569d6 100644
--- a/app-emulation/softgun/Manifest
+++ b/app-emulation/softgun/Manifest
@@ -1,4 +1,4 @@
 AUX softgun-0.22-make.patch 2157 BLAKE2B aa09e9a16fb39e9f85b369db98e2d89ea342a02e141ff35c0b6a42a61f35e89928b9a00498157ca2080b94a61bf8b53ab80209132135a84855a89679b86e6a35 SHA512 0ae2fcb89b279799f28fef49b60eaef7d7f4ed145bb24cf7f4543574077672918aa8fbdd85ba6ae4a2af49629de8bebd3f4cbf98d7ed7b5aef3f14e37ec18b50
 DIST softgun-0.22.tgz 1239881 BLAKE2B 34bbb67ee0f359fd75e19ec455ccb674e613a25b7a68fa638b7b9c4c2021fbbebe1aee5a4e4184e2e5a92d4ae81fe95acd68f7c68ae3700b2284e64f5b785a30 SHA512 5c13840874b09aab6c0921d705c0ea94da87cc1a80d2fcbc9f329ade25f33bb2c8eba2fe284b4c3b41e70b8f258a45fc83caa296880bfa3e7870994de587e591
-EBUILD softgun-0.22.ebuild 577 BLAKE2B ed7ce18e40b302139b06169a9b1e06b0421fb77b6e0b2dd8f41bf0670ee658ee15a44fdf067b1f60253131eedf9904bdef7701aedc18e31c52f57630931d3a80 SHA512 f12b6f70834a97381ad08ba2bf2345f666bd9005712d4ea1c8fdce62e973e81b95b1a6cdd2c15ba93de05a4c433f5700edbfdc930046bcac26d513be3f588424
+EBUILD softgun-0.22.ebuild 621 BLAKE2B c9c8e865ecbd8da13b8705ff3599e3a302dbd1aaf26789d2627cc5282e46a611d17146daeca1e86616996d65c34fd6a725ab32d7673051ea3f46de02d5f4566f SHA512 23cd814a1c2ce0bf31605e1dd5d467f7fe59945ffcfe20f27f82d24f732fde1a3f58b26d3fa7ef7cd01aab0267301a38c92f924ae02eccd1724e5e9f89cb9c9d
 MISC metadata.xml 336 BLAKE2B 541655644eea5e65982c57a718a91d92e7f432a555f12d4dfeaab3438d3dc52464c01ad09901bddf712754e3707eee5923297f274fac645ef2ecc4467f48add2 SHA512 cb971bed5c426cf0e7ebdd24de23364f35c060a23fc2f92c86f8697cdfdf5e5950644ce0a4d6237655fa9ff23c911c1825b63bb5c0ee9950bf928ab407d080ab
diff --git a/app-emulation/softgun/softgun-0.22.ebuild b/app-emulation/softgun/softgun-0.22.ebuild
index 15758fcf1687..adba0132e20a 100644
--- a/app-emulation/softgun/softgun-0.22.ebuild
+++ b/app-emulation/softgun/softgun-0.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="ARM software emulator"
 HOMEPAGE="http://softgun.sourceforge.net/"
@@ -12,13 +12,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="media-libs/alsa-lib"
-RDEPEND=""
+RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.22-make.patch
+PATCHES=( "${FILESDIR}"/${PN}-0.22-make.patch )
+
+src_configure() {
+	append-cflags -fcommon
+	default
 }
 
 src_compile() {
diff --git a/app-emulation/spice-protocol/Manifest b/app-emulation/spice-protocol/Manifest
index fc9e05f809e8..eb1b94543840 100644
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@@ -1,4 +1,4 @@
 DIST spice-protocol-0.14.1.tar.bz2 73444 BLAKE2B 12050c38ee3d24814b57a340a88423352edae6412b5a20e27d59b7235e753f51aaf757f7e9e6ce702d0b0c0afeadfde7f3937725ae4715ae4dc4da20ee7fd663 SHA512 88b0e652564a1f826ee6d3c165ab05c40d13f366567db3840805f03d433d13d7f722225219c26759770d2cde33221fe6d97528521d0eb14bc069cd7ce9af8482
 EBUILD spice-protocol-0.14.1.ebuild 389 BLAKE2B 499cabe06ee6ea7c989ffd1a03c7ff57442f0317527ebad33637fe3688fd3e857406b8283cf1876719c2828f3386fe3b777fb668fb3f5f4b8df21a499c640926 SHA512 3a7acc22a6e8ca837fd7c279a77190e06d5af7b6f0eaccd183cac591b79745c0c63aa5e3ff24bfeeb1887c382ed966c3d28aa644476a8d8b944e0890f184dc2c
-EBUILD spice-protocol-9999.ebuild 566 BLAKE2B 19bfd31a646d468f0b77ccc704156ca2e723acb6c3974d6bd036bf9fe25afd4152c6c4a4defd7165cdf4c5f8fcf597e09fde7caa2f047bf141029e7ea13f186d SHA512 dea4bf3539e88112fd65b23cf192ecdf9695723aee89986460d357010ca816cff64f4ee7d6541e3aa0dda9176c16ace57d979691e533028d0940b432f5acc20d
+EBUILD spice-protocol-9999.ebuild 553 BLAKE2B d08a20664a23a34bd2ea047a6165d53fd14222de4617d832a4a599f519acbb8215868fe1e19ae11f2f4fe56965b8183f3b5a4ed715ee39203fc888061ab9c932 SHA512 dba54afe71f0552a24f6beb53c7d87dfe5ffd8d885f048de3f5eff81ec31fd899d1ff67b976c43e631d599798ef3a935ba4b760fa0aa5ad6b67e358bd3fdc230
 MISC metadata.xml 271 BLAKE2B 0ac34325897226d2062f0b77cc069fcacd6026432b276adcdc2e7c9ef532cc1900855dd821d0b6314ac77488fd0695f916e821fc11148f3b9f2753bc97afbe2f SHA512 0cd444be2e9b4a1530671dc4fc88a2177541dceb453dca10a1778938d8f114caaa55a01551b662c29e0e775aa9e9df9389b4a5d5ab4fba643da447ac2e7aca32
diff --git a/app-emulation/spice-protocol/spice-protocol-9999.ebuild b/app-emulation/spice-protocol/spice-protocol-9999.ebuild
index a2dc0bc3006d..d2d8fbb6a858 100644
--- a/app-emulation/spice-protocol/spice-protocol-9999.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,6 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-protocol.git"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 33db9db6e950..fb36bda297fa 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -9,10 +9,10 @@ DIST wine-staging-5.22.tar.gz 10342905 BLAKE2B 9f59a0d8c06f29b52fec71cc09915c8a7
 DIST wine-staging-6.0.tar.gz 9863425 BLAKE2B b51e0c3dc426c637de4ee89ee7d519847edcb04b1fb160f5f196e5560ce570ced682165ac74958433de79e104765d4811f004d323f357b753cf56108b9a631bb SHA512 33845e398e9c3d4bacbd9cd369983e72517fd648747433eabd933b446f9d86f1d61660959ff4e05cb661cf4038550b3df3384f588f3f5504b1f8056196ca3c38
 DIST wine-staging-6.1.tar.gz 9855125 BLAKE2B e5bd41294b7f17cd283d4ab90cce4f362740c2b3de2a867ef50c44639f5472392b3c11e199a66da63018f18df2f2a99579b50f27d6dd0163bd989efe1e7983e2 SHA512 50bf3f07cf8008731cee131852cbce43c5ec44219e8e96fb70a0fc82954b0a2a9d25ee8b25b7c62b47abd131591ca8fe0461214287601465edccda80be6d598f
 DIST wine-staging-6.2.tar.gz 9820682 BLAKE2B 3de0c0ecbdabc1ffb965e6d5ebf5689fbeaf24ee33aaa2ff078db39d1542aa935b6d4d940fef570f1c60260748f4ef52b9789625b840f73e70ed3482995d505d SHA512 558c46250babaacda92885c35c438797baff7b8eb45cb3cdf7f7572c35e6412e621182061a3a4e31444cc7580f99a61de6bd433bf2bb2b8139cdd718afd9cd2e
-EBUILD wine-staging-5.21.ebuild 20436 BLAKE2B 40da6c7a1e6d008ad55f53ec09b82f7c9830a7c00dca754c2a4d9afd6bf14f0a67cdbd22a1174aeef79d685b08f11628e8131ab7007351ba555c9742270062a1 SHA512 c658843b8dcc234c49c3071a24fa60f9884ef3a939612e203d3433077dd154f8f09429db3467e50d6f1c014f421b228a25cffb06843a758ee6f1a5f1cb4073c8
-EBUILD wine-staging-5.22-r2.ebuild 21689 BLAKE2B 212be2581df2c851d2cc06eac3de72d506d7d142703e2cd29fb116ea32431a9ab60f2950c30f7afad9f97ccd4d91674fed55c54360402933e71d97444833e1c9 SHA512 d7dac0725c2502f9627962bf6ab9a550b5a2ea9ef5a2daabfa2536bb220671860a379229cccbad45aa075a18d449ed6af1cacf295e214a16bee473c6af2f4a74
-EBUILD wine-staging-6.0.ebuild 22040 BLAKE2B 55372befe8fc1036ca8f5e2932130b9c25787727abb2a55f2692ea378fbae8e37031fb6a073b9dc2dbb39a88afacc23d05e76329488a63f9d9d324afb092dfa4 SHA512 40897f4c0c7aafe2e398739c557a0440f83b50484d9cb38c5906a94234c4659dd9d688b8768dd20999761c59a5c989e81776a3b6da191644f44d0308f0e7d043
-EBUILD wine-staging-6.1.ebuild 22040 BLAKE2B 55372befe8fc1036ca8f5e2932130b9c25787727abb2a55f2692ea378fbae8e37031fb6a073b9dc2dbb39a88afacc23d05e76329488a63f9d9d324afb092dfa4 SHA512 40897f4c0c7aafe2e398739c557a0440f83b50484d9cb38c5906a94234c4659dd9d688b8768dd20999761c59a5c989e81776a3b6da191644f44d0308f0e7d043
-EBUILD wine-staging-6.2.ebuild 22040 BLAKE2B fdc028150b9949d82c64910ff6ede3f16b23477f5a0769359fe274373d6ca97be354293a2171dcf329b29f4aa04a5f4c5680867714fb3750f45e86f72affd94f SHA512 9de89cd3f7ddbb2a036a5c4ddcdb9f81baebc40a88a23f5aba3e2f24b10899c24f7eeb9aa30a32cb5a92272549142e2caeddf587f5653ad9620e8fd6e6d42f25
-EBUILD wine-staging-9999.ebuild 22040 BLAKE2B fdc028150b9949d82c64910ff6ede3f16b23477f5a0769359fe274373d6ca97be354293a2171dcf329b29f4aa04a5f4c5680867714fb3750f45e86f72affd94f SHA512 9de89cd3f7ddbb2a036a5c4ddcdb9f81baebc40a88a23f5aba3e2f24b10899c24f7eeb9aa30a32cb5a92272549142e2caeddf587f5653ad9620e8fd6e6d42f25
+EBUILD wine-staging-5.21.ebuild 20422 BLAKE2B 1ddadcf68dbdb438385434de97f050e8f1343e8102d1e0fe0c683f2fefa528a0bfef2ae6bf75e80d05c6f7ce8db008eed0d370d247a7945f9854ee9fecacf772 SHA512 a984e66e22d4b6fc47a65ad27c2dd03c7c4bff07e56bdafa76885a26269a1156df5aef2aa72444be5cac9de0d50b748ea9d224d5393c0171d054484f3670be12
+EBUILD wine-staging-5.22-r2.ebuild 21675 BLAKE2B 4b4b2bb67cd92f14e0e57a6557bd3df47994d133a5dae42e47a9b6159a2b2dd0fc7db3fdf955ae0d2d7e09008f1d437a8ce60050d37731f866df8cbaef00e3d9 SHA512 0611a82a8941b1df344a1f917d956b2fbaf371971c14ad8e4480484557b2429b5fdd76deef27f1d42ab64327dfc637232a3899872272db9104232c8028a7cde1
+EBUILD wine-staging-6.0.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
+EBUILD wine-staging-6.1.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
+EBUILD wine-staging-6.2.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
+EBUILD wine-staging-9999.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/wine-staging-5.21.ebuild b/app-emulation/wine-staging/wine-staging-5.21.ebuild
index 9c6e2a76fa30..3cb0fdf62f14 100644
--- a/app-emulation/wine-staging/wine-staging-5.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
diff --git a/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild b/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
index 00e7c18d4b69..4a5a4b35d8d5 100644
--- a/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
diff --git a/app-emulation/wine-staging/wine-staging-6.0.ebuild b/app-emulation/wine-staging/wine-staging-6.0.ebuild
index 28716e74fdc2..954abe1eca77 100644
--- a/app-emulation/wine-staging/wine-staging-6.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.0.ebuild
@@ -16,7 +16,6 @@ if [[ ${MY_PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
diff --git a/app-emulation/wine-staging/wine-staging-6.1.ebuild b/app-emulation/wine-staging/wine-staging-6.1.ebuild
index 28716e74fdc2..954abe1eca77 100644
--- a/app-emulation/wine-staging/wine-staging-6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.1.ebuild
@@ -16,7 +16,6 @@ if [[ ${MY_PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
diff --git a/app-emulation/wine-staging/wine-staging-6.2.ebuild b/app-emulation/wine-staging/wine-staging-6.2.ebuild
index 9bb1565d0057..0d4d6cdf1e7b 100644
--- a/app-emulation/wine-staging/wine-staging-6.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.2.ebuild
@@ -16,7 +16,6 @@ if [[ ${MY_PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 9bb1565d0057..0d4d6cdf1e7b 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -16,7 +16,6 @@ if [[ ${MY_PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index f9eda5481bae..8b11eb9c692e 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -7,12 +7,12 @@ DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
 DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0
 DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4
-EBUILD wine-vanilla-5.0.2.ebuild 17552 BLAKE2B 45440982bf2bfd3f6a2788af10b3a1712f4a4d82a0d4d0d139e9b9eb8f6c4af2b4a516e23a17ace87a6c6cf0e4cf9f3d1a0738b380203a77798b3fae437f1ed9 SHA512 2a92a7f78ac86289439a6bc507ec48a6f6a44a1d666f8a2b0705c4bb6fbd6b5d1f667347db96ea98ead1b5473b1cb7b0cb396446c84182165145842648795d5a
-EBUILD wine-vanilla-5.0.3-r1.ebuild 17635 BLAKE2B 05faf2469f3c1645e6839d5be2f710b3cf544ad513bfd3699f5afd7390c64d31233e499d68d372908e5f43118c67d7396fce9978b35545086208de51b942a6ba SHA512 1ef21017980fd5ae253fcb9b2521c639f8069fe5dc3cd08a42b091da22948739f02b04cd8e68eafa809afef19616bb1ecffbfa6fb86000087ee9a61d7a1917c8
-EBUILD wine-vanilla-5.21.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4
-EBUILD wine-vanilla-5.22-r2.ebuild 18854 BLAKE2B c45f3e3f4431910be09d1951dee0e35726dcbe5506896c0c66be037e1dca123f81d9306d635efa94f0e8c1b93011b0f04b9ad3880e955126cc9de3481fbd9ee8 SHA512 a68c0937ba3bbfcfb171c8ad997a630531a5b68c5f08d5936c6fd5a7e63a94a80c4030b9bb186a7667c51bd7e488fd498ad1225ea499ed49e87dc6fe909a79da
-EBUILD wine-vanilla-6.0.ebuild 18924 BLAKE2B af143b0cf047f4d6b49675bdd3849e7597263553d67ac2210f339930343b4dbfc54b1002279f1c92782ff5d560c0d49a4dafac3fd77887a4cee1b6d0120d011f SHA512 aa4eb01b8b856e6563c5e7bd302762388c90ccd7f7d97ddcf6f5f4d79616345708ad641efb01377fc7514a5363be64a73fa75b7925dea14147fe7737f84b555f
-EBUILD wine-vanilla-6.1.ebuild 18924 BLAKE2B b54545cd05170a0191625b4c507c7fafa22eab2234bba204fbe4c23f878e76ace1e7d7eb339c97176caac264a3c3241ac477c7adcfe02b456de003f5afe38273 SHA512 43cb06f5f72f9a18a628007b0c357ed58dc2bc663feb613f2d5f1400cf876d82d31f0ffe6a9cc7226aa3f89cf97761fab7812e0f0b27113827f09cf0dea94527
-EBUILD wine-vanilla-6.2.ebuild 18924 BLAKE2B 9ea7ac06e415635987999388a87f16ab3805a6d4f1ab1e7b05009db8f328f3d19a19b57e859ab751220ee60dfc9f2625a495e37fac0e7aab04b7e43015a830c4 SHA512 2fb10b28c4b126f7101c4e993021a6485162292912e0058bb4815a558b950a7f1609eb5c7bea2aa8bc98ea597b9d08df625e89220c92d6ab7890fb9e836b6f53
-EBUILD wine-vanilla-9999.ebuild 18924 BLAKE2B 9ea7ac06e415635987999388a87f16ab3805a6d4f1ab1e7b05009db8f328f3d19a19b57e859ab751220ee60dfc9f2625a495e37fac0e7aab04b7e43015a830c4 SHA512 2fb10b28c4b126f7101c4e993021a6485162292912e0058bb4815a558b950a7f1609eb5c7bea2aa8bc98ea597b9d08df625e89220c92d6ab7890fb9e836b6f53
+EBUILD wine-vanilla-5.0.2.ebuild 17538 BLAKE2B c7112948be20ca6f68de5053bd0cc1171eb7ebf06807ec97c1aa392c4cc756d18782805a9f501307da418298eeb8f129830e85e507613233a478bd3c452b047f SHA512 16bc462660abe1eb8dca1d5c90fb02d71ed8e98a121d4290e501f7807c72eaae6a1b2eb65867b90c79d827ac9eb9b2502b6ca4e597155eda6b74509b00a3ac55
+EBUILD wine-vanilla-5.0.3-r1.ebuild 17621 BLAKE2B ab9f9766ef5f30b3fcae5d92a4cc7237deb015fed6cec868e0360fa676f85c5f96579bbb81afd793efa21fe0c65403e747a3b08fd00b69699985298acba08853 SHA512 833096373edf13aada27e0a574097dfb2ced4589bc8f1fa5e7d93ddfdf827c9b1920ce351e66e60c435cbf831879b90b05f3da8ea7670773f364ecf39b48927f
+EBUILD wine-vanilla-5.21.ebuild 17587 BLAKE2B 3b3d801dbe8387323a06cfaf1b7b0a6f83f1d25a7cece53325e687839ad522a8db5bab1e8a87958789f7cafdf7ffad6d195f2269a117f0d8ddec5465db0b01a1 SHA512 cd749ac932ae78b8022250c830d728bb53b07e677b88e801de7c5addd97e59c86e2a7c49fcc0c3fc7860c6a12d4105bcfbe455352028db15dec8ee9a2ef8c4ec
+EBUILD wine-vanilla-5.22-r2.ebuild 18840 BLAKE2B 5bb28cfd96d41160ed20b6b0449e82a511efd7174a580056346c116a0eae4bdf1a2c8dd4405d9331070cbb6fe710ed0c6f9925df076fc69719469bba2648571f SHA512 f0b323beef8380ff7ae8f7206d1bc279b1e2ef718bf05f41f87932e4a8a57c81d928ad45c679bc7d1615cc262375b2a2babab5d39a694fd07c5f9ce33a12acba
+EBUILD wine-vanilla-6.0.ebuild 18910 BLAKE2B dc81a5e0026053e6935a5f7dc3d279a1eabede60219cfc663d7c94945f1cc72b537121918b2875b7d007cc3f8e09758e79d4909ca54a985dac9140216c46f32f SHA512 7fc60d0f87c78c6cb34ef5cc000b614d55497f61c056a1da1da699b026282f064e26a7879b00cf3c7bfcc5b9fa41206ea2b764de8a12636cc05895c1037dee1a
+EBUILD wine-vanilla-6.1.ebuild 18910 BLAKE2B 7f8a28cfdf2b0ffbc5196ae3aa7c6b9ead6f9a9cc05e1786723149e0c6d943fcd8080362c8c3c32e9f6a06af114e749a5b460515c82d875140e4b54c24355d03 SHA512 20837bb56938d1cb5fb828b540971621f21044e495e4e2461015cdcaa5c1b14efac011741a4403f3a6e3cb99ee6402c7003ea137acfad070b18911c6a8390285
+EBUILD wine-vanilla-6.2.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
+EBUILD wine-vanilla-9999.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
index c13d5834460c..2efdd7b61d9b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
index 5f25770ac604..625841699e98 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild
index 226b93efb90f..7182d108ab2e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
index 97ea9019cb11..d96df570367b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
index 8234054004a2..ab66fc3ad9a5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
@@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild
index c5ffac5326bb..6acf7ba85bfe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild
@@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild
index 045e3bfde6b8..5aefd6ebbfac 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild
@@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 045e3bfde6b8..5aefd6ebbfac 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -16,7 +16,6 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
-	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
commit	463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree	9aa75eefc5154eaf0e3c33658b830fc54dc68052 /app-emulation
parent	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)