gentoo resync : 17.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-17 01:16:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-17 01:16:38 +0000
commit: 53cba99042fa967e2a93da9f8db806fe2d035543 (patch)
tree: 9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /app-emulation
parent: 71deace00d1a2b091313fe137ab7092418c6f87c (diff)
73 files changed, 843 insertions, 156 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index b99e890765f7..8b2098a27f31 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 46d54fd89ce0..c5c3b06bb017 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -4,13 +4,17 @@ AUX 18.4-fix-update_package_sources-function.patch 880 BLAKE2B f8a50714d5763f43c
 AUX 18.5-fix-invalid-string-format.patch 1680 BLAKE2B 55e0fe95b7ab61bfa8a9106f92e28da8df39d47e3fc35adbbff0a1c977cbbc0d996de400693cfcbf1011f8f9e0ed61fd444f225f6b0f9dd2cd4e0c48484cea31 SHA512 b9a6646419dd3c0fa34a1ba97cec29870369af97ea72791973348443d6ceeee80fd5e27ed4d7f2beb1fc7c27c699f2e22a787ad062bada5284bc55981cb08f29
 AUX cloud-init-18.4-fix-packages-module.patch 704 BLAKE2B e5deb163e7d97365befb63bf6978900d250356a3b29972b5c8ec6dd19c202d03cf0a07bbf1e8b437c3ec80b810f5c1af456bd589adfde290636b3fc10028ad36 SHA512 ea28c8d5c9a4ebd0d65dea8dd09e5c9c9973fc3456ff8a4e35b3eb4eb856e5c4809b922ef5d958682fb7429ba23eafd80e0fdee629967b7f838d4127db5e1ac7
 AUX cloud-init-18.4-gentoo-support-upstream-templates.patch 3366 BLAKE2B 88add00b9754fb9b9301545ec35bbcf3c747fa6a3a5b10e79879c022a59cbb8d3b1102615b48ad19e5d2c9e477c31159bea4d9435bd4371fe6b4ab864225cf59 SHA512 c840338d19ef74caec4d1d867a3e674b80b34fd995d2961efa41650de36653f1c027e3e7c841a2231db6ad1b3dfe478fb3e7511bf2ba8a9cba9e43e160a0412b
+AUX cloud-init-19.4-gentoo-support-upstream-templates.patch 3445 BLAKE2B e7a7e9d3d36d78ab00f2d495f9a3fad795b142c755c797c4cfaf93263c98392b6a03f14bfd38fe4f3a332b108d3c5624051c267e60d0bad1c3469457a0f2f937 SHA512 b88f71c2131e15ead8638f0e094930c76eb1da213443402b4ac15fd735a307393952d4970f6584a2d0199cf58f535956ffa8226a0ce0b51a309299f4424b2f5d
+AUX cloud-init-19.4_CVE-2020-8631.patch 821 BLAKE2B 1c684ab25b44ab35d027d342647070c2558f4740d2117316790ef244a3fac0cd47d205f4af9968c7b6438602172a4f383d211ac58726431e7d1eeeb4bafb4600 SHA512 057158b90890bd14c8252da2c53f04f818f1e7ac7146f39fcbd90fa9cc6ab4914881804bfdf552bc8af589f6f297a8c96584131f648165d9dbbe42a3ce6f3617
 AUX cloud.cfg 1815 BLAKE2B df997117fc3e15303171942c2127eb1ae8c333a04c3d8ba7aa6e55b6f0641872e90bc643cb4ac576876c50af09136777507b739b4cc50b5b4094272b5e8bcdb0 SHA512 ff9a978befebdc177000ce50252a89d2b9adf4e2ab92c7c87300c54cebe5ff160fd6619dd56f0432a6ec8a819a4f948aa3e99c06e37dc6650ed41fdce16daeb3
 AUX hosts.gentoo.tmpl 920 BLAKE2B 9195167754ff1f09c37c0220a2dbf7c0c098daf8e71edabe944a96cbf66d2b029fbb36fef9efe6ffa7410bb8ee33f71f04a4dc1f7c62811fdd87e5216eb6589a SHA512 39e6bcdf40bd842a1d2e4ccd1c993b432016f7b3c4d5455b71896a16ee87a5d698e214919172f0a7e2f647156f5efe0964fed999dd193e4f16c944efdcc0f9c5
 DIST cloud-init-17.2.tar.gz 810821 BLAKE2B df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5 SHA512 ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
 DIST cloud-init-18.4.tar.gz 965112 BLAKE2B 2879aafedea877e4e406a5e837d100ba65e40c62660621f606e7a189af7b1ec8d98ba2c02ae5d253a0b4587502d3a636dec5c2772c968a9037b47e62a05656b4 SHA512 730aca6406f652f55afc2dd50c49eb6708584e0a96715606bcba05cb7f40e47c256faff1f9748f04674a8f941ec9435801c9ed2ac79adec8a6ef167d6b195103
 DIST cloud-init-18.5.tar.gz 990381 BLAKE2B 0dbbd5b2402d3a7742c46f8a37b0ea31f40ac16bdbfe49dca0056ab8f90c47dbf26e6d3f40f34275caf5102d0b9b8be4e2c28bfc2276e85a5aad11af20b08979 SHA512 f89ee636922e33b5b2dcb5230763404fbeee148e28b8f61bf5b2f1f07000f960f9d38545dfb7bcbe9afb8253f77d66c94b39e9a159715b44a440a7cbe1fe1aeb
+DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df SHA512 e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3
 EBUILD cloud-init-17.2.ebuild 1929 BLAKE2B ad1db953bd7f3979863ada2abdfd30f771d5b70681dc0bdcba5efaf29ae0b1990a2bd390e33a16ac0b972e62619076b78d1d25511ce3a77dc58ce8204b931cb0 SHA512 75e2fa44eb2f902e2bca28937467070bf35d6d601eb4e9c852506dd368c276567cf145849ab60725859f31accfd48e3a8ab41868d13592c4ce5f60b517b5a940
 EBUILD cloud-init-18.4-r1.ebuild 2501 BLAKE2B c2b8019cb77f0f33f64947c41e8dd794ea3f690075bde34d35ad3ca5d27435cfecb2a19ee625b0047b31a7e3d2a5af005321de1fbbf9387e3044cdfec593b887 SHA512 3ee348a6243eea01a03770b6671653eed415bdd9d14858ed5fd5d4c1895863ba85af3d717021d24b5cb5323b557857fe8e79707f846ad5e621a83848139c6bb2
 EBUILD cloud-init-18.5.ebuild 2578 BLAKE2B 83811a6394b46734d157a49293e585cb347e1dcf0c895dba9925658867c28329b6037944f2ea2e836a6bef95d66fd220d5f4c867e6cbb091d7d9f4f82edf8822 SHA512 a6ef91f9ba05591f1a333366ddd388115383371f9da914ef41f7e847ab529c86fdf8f8063cffb32df5ceb40b05e70f03f614813d32a08649b142846a541a1ddb
+EBUILD cloud-init-19.4.ebuild 2554 BLAKE2B efc353823eae06695fa1893d7169a0b40b9c7f581a0e42f00134b259fd6bf469a1851e786e79d79d8e778eca842d53cda0fd36c933b87e0d01fb82275120618a SHA512 0cfdc6e8923d17ea442d8507259e745db1cd20e8050355bc429c6f6dd14683673e5062c246284f230717ae98e859c28cdb4db0c6ddffc0d84fd6f63b1f960cea
 EBUILD cloud-init-9999.ebuild 2568 BLAKE2B 22b8c5ddce48902329a5e5a9eb82cc57d6abfc87120d6d319f102f9a26915a262100db940a8749b091ff5dc7139bb471865bcbeecfad1dc43ee56045d949dae5 SHA512 5faa9348d693f0f662192021fbdecfa75814fd64aa3d4f0d78f9bb42ecff1a93908381be0ba4026ea3d8a5b857cb00b1ef914c1b234b97f9c5f0e128fccf2c03
-MISC metadata.xml 583 BLAKE2B 24a5563ff0106a6992b0adb539bc12f34f4ceee97213a71c6b8c15701ff627dc914917dc32510b728a59e8014571ec9d86313b0016710308e317da4b28adbf1e SHA512 1424ff88b0a75fe1037471c4187f3a557f1d180acf7879b52696730b9e789e6bcb2e2d870b68ae0b6d4eab05fa0d11388f2fd9b6a64eb0bfbd54403a88b1f68b
+MISC metadata.xml 769 BLAKE2B 4a6e831e4cd77a81826f3d8a1f16603ece81cb75261a0dfb0b4ff2cea47a4458abf3f7fb5d61672a3bbe38d538b8ba827fd50a7c9c12ef69a69107216e923c29 SHA512 760c8e7a756438fc511eb6959b0ce50cf58e0df6e553e3634a233c2bd95ad0a04310be96ee6ce392eb97e12d2d8760399ab135c4c9eb97b0dd9cd62aeecd1859
diff --git a/app-emulation/cloud-init/cloud-init-19.4.ebuild b/app-emulation/cloud-init/cloud-init-19.4.ebuild
new file mode 100644
index 000000000000..67e494f94a86
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-19.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	net-analyzer/macchanger
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+PATCHES=(
+	# Fix Gentoo support
+	# https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
+	"${FILESDIR}/${PN}-18.4-fix-packages-module.patch"
+	"${FILESDIR}/${P}-gentoo-support-upstream-templates.patch"
+	"${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch
+	"${FILESDIR}"/18.4-fix-update_package_sources-function.patch
+	"${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
+	"${FILESDIR}/${P}_CVE-2020-8631.patch"
+)
+
+src_prepare() {
+	# Fix location of documentation installation
+	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Do not use Makefile target as it does not setup environment correclty
+	esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+}
+
+python_install() {
+	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
+}
+
+python_install_all() {
+	keepdir /etc/cloud
+
+	distutils-r1_python_install_all
+
+	# installs as non-executable
+	chmod +x "${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/cloud-init/files/cloud-init-19.4-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-19.4-gentoo-support-upstream-templates.patch
new file mode 100644
index 000000000000..210c29437361
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-19.4-gentoo-support-upstream-templates.patch
@@ -0,0 +1,93 @@
+From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 24 Oct 2018 10:52:46 +0200
+Subject: [PATCH 2/5] Add support for gentoo in cloud.cfg and templates
+
+---
+ config/cloud.cfg.tmpl       |  8 ++++++--
+ templates/hosts.gentoo.tmpl | 24 ++++++++++++++++++++++++
+ tools/render-cloudcfg       |  2 +-
+ 3 files changed, 31 insertions(+), 3 deletions(-)
+ create mode 100644 templates/hosts.gentoo.tmpl
+
+diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
+index 1fef133a..3f5a41a2 100644
+--- a/config/cloud.cfg.tmpl
++++ b/config/cloud.cfg.tmpl
+@@ -134,7 +134,7 @@ cloud_final_modules:
+ # (not accessible to handlers/transforms)
+ system_info:
+    # This will affect which distro class gets used
+-{% if variant in ["arch", "centos", "debian", "fedora", "freebsd", "rhel", "suse", "ubuntu"] %}
++{% if variant in ["arch", "centos", "debian", "fedora", "freebsd", "gentoo", "rhel", "suse", "ubuntu"] %}
+    distro: {{ variant }}
+ {% else %}
+    # Unknown/fallback distro.
+@@ -172,7 +172,7 @@ system_info:
+          primary: http://ports.ubuntu.com/ubuntu-ports
+          security: http://ports.ubuntu.com/ubuntu-ports
+    ssh_svcname: ssh
+-{% elif variant in ["arch", "centos", "fedora", "rhel", "suse"] %}
++{% elif variant in ["arch", "centos", "fedora", "gentoo", "rhel", "suse"] %}
+    # Default user name + that default users groups (if added/used)
+    default_user:
+      name: {{ variant }}
+@@ -180,6 +180,10 @@ system_info:
+ {% endif %}
+ {% if variant == "suse" %}
+      groups: [cdrom, users]
++{% elif variant == "gentoo" %}
++     groups: [users, wheel]
++     primary_group: users
++     no_user_group: true
+ {% elif variant == "arch" %}
+      groups: [wheel, users]
+ {% else %}
+diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl
+new file mode 100644
+index 00000000..cd045fa6
+--- /dev/null
++++ b/templates/hosts.gentoo.tmpl
+@@ -0,0 +1,24 @@
++## template:jinja
++{#
++This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
++if enabled in cloud-config.  Specifically, in order to enable it
++you need to add the following to config:
++  manage_etc_hosts: True
++-#}
++# Your system has configured 'manage_etc_hosts' as True.
++# As a result, if you wish for changes to this file to persist
++# then you will need to either
++# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl
++# b.) change or remove the value of 'manage_etc_hosts' in
++#     /etc/cloud/cloud.cfg or cloud-config from user-data
++# 
++# The following lines are desirable for IPv4 capable hosts
++127.0.0.1 {{fqdn}} {{hostname}}
++127.0.0.1 localhost.localdomain localhost
++127.0.0.1 localhost4.localdomain4 localhost4
++
++# The following lines are desirable for IPv6 capable hosts
++::1 {{fqdn}} {{hostname}}
++::1 localhost.localdomain localhost
++::1 localhost6.localdomain6 localhost6
++
+diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
+index 8b7cb875..d109044e 100755
+--- a/tools/render-cloudcfg
++++ b/tools/render-cloudcfg
+@@ -4,7 +4,7 @@ import argparse
+ import os
+ import sys
+ 
+-VARIANTS = ["arch", "centos", "debian", "fedora", "freebsd", "rhel", "suse",
+-            "ubuntu", "unknown"]
++VARIANTS = ["arch", "centos", "debian", "fedora", "freebsd", "gentoo", "rhel",
++            "suse", "ubuntu", "unknown"]
+ 
+ if "avoid-pep8-E402-import-not-top-of-file":
+     _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+-- 
+2.19.1
+
diff --git a/app-emulation/cloud-init/files/cloud-init-19.4_CVE-2020-8631.patch b/app-emulation/cloud-init/files/cloud-init-19.4_CVE-2020-8631.patch
new file mode 100644
index 000000000000..625473c68f1d
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-19.4_CVE-2020-8631.patch
@@ -0,0 +1,25 @@
+From 42788bf24a1a0a5421a2d00a7f59b59e38ba1a14 Mon Sep 17 00:00:00 2001
+From: Ryan Harper <ryan.harper@canonical.com>
+Date: Fri, 24 Jan 2020 21:33:12 +0200
+Subject: [PATCH] cc_set_password: increase random pwlength from 9 to 20 (#189)
+
+Increasing the bits of security from 52 to 115.
+
+LP: #1860795
+---
+ cloudinit/config/cc_set_passwords.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
+index e3b39d8be..4943d5453 100755
+--- a/cloudinit/config/cc_set_passwords.py
++++ b/cloudinit/config/cc_set_passwords.py
+@@ -236,7 +236,7 @@ def handle(_name, cfg, cloud, log, args):
+         raise errors[-1]
+ 
+ 
+-def rand_user_password(pwlen=9):
++def rand_user_password(pwlen=20):
+     return util.rand_str(pwlen, select_from=PW_SET)
+ 
+ 
diff --git a/app-emulation/cloud-init/metadata.xml b/app-emulation/cloud-init/metadata.xml
index ac6c94ad0679..997452569a62 100644
--- a/app-emulation/cloud-init/metadata.xml
+++ b/app-emulation/cloud-init/metadata.xml
@@ -10,7 +10,7 @@
     <name>Gilles Dartiguelongue</name>
   </maintainer>
   <longdescription lang="en">
-    Package provides configuration and customization of cloud instance.
+    Cloud-init is the industry standard multi-distribution method for cross-platform cloud instance initialization. It is supported across all major public cloud providers, provisioning systems for private cloud infrastructure, and bare-metal installations.
   </longdescription>
   <upstream>
     <remote-id type="launchpad">cloud-init</remote-id>
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index b96de59bac28..4e93757ba14c 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -6,11 +6,11 @@ DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 6cf98e370547d3ca5158f546e72e3ff5fdc
 DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83faf752b9794da26021033bb6af492c48ed1665fc76ddfe5b858f04d45e9b77505f331e3c3da556af2d75e3cca3bb12 SHA512 cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1
 DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513 SHA512 4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
 DIST containerd-1.3.2.tar.gz 5704320 BLAKE2B 32ea22ff445cc66f4c8db8abdbaaa7fa0c8c620b294bda54f2319045af1925398057ba1a5cb5c265cfc73bcff5b49943013b517ecb3bd05f4504920c4a8d6f29 SHA512 768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c
-EBUILD containerd-1.2.10.ebuild 1436 BLAKE2B 2ee522bab38cd81a9ac23bd8f7a2021abde9ba2dfa972a57c35f67700b44b2f946a312cee5512ae62bae4cc43aebdc469e366d4280c287018db88074b0c24553 SHA512 07fde13f2d1809fc7f5bcc57e39c425bc4f61d18f7cef4acca7ebec45c9c758742a27ec8343235fc23a887092aa782bb3662528faffdf23a93aac255f413c096
-EBUILD containerd-1.2.12.ebuild 1435 BLAKE2B 13a3717ffa8cc95ba8af26428925949d44223040b497ec30da9105d2c144b57ac8344ce265ef1bf07ce527b09fea10302cf1fdd9d88901fa2880bc5be6d3d648 SHA512 a81597467ad007308d96f36446dc838e4afcd37148c81ec40c955958d8a863d260a899474c3e373486c05254f7b7dbf8b94fca01f854279209af89fda2c64d08
-EBUILD containerd-1.2.6.ebuild 1436 BLAKE2B 15ec996c1e39e5907c80e161d64f0854e99bfd33d7ec0f91d53afcca3964fef23c52b89db1b42c99d976b0aca513c759038e2fa913b085f19c5ccad69e1c3e34 SHA512 1e43851c799501c712b5be468bb3469c89177e856dd4bea40c2b130cbcd3b2fb5acc1722285f1839562e837d7cd0243b0138fa418eda293843d4626e34b390a3
-EBUILD containerd-1.2.7.ebuild 1437 BLAKE2B 5483fceb26472d3b98e88d9d507b11b2ebb8cef7a8b254cfe106384cdb79975b3bd9804f63876e2b3f5b08d0ab96beeb50210ff850046bc98f13ee6781a38376 SHA512 e676267b0e4ca108735f16c1d3bee9d1edb3a4287a0b0e1ffd4a11005055162f76b11a0dad1e4d22ba57b48b2bbc7e862005d58c4861011c5d8f6047bddca47c
-EBUILD containerd-1.3.0.ebuild 1437 BLAKE2B 1d1303203e48395437fc53cc232571093de834e0b5b9dc7fa02c7864372adaa7340906cfac7c1c56e645a8d4d18a39d5a7e32e9f547c8a3905fee4fc019a681a SHA512 6689ab82a9b3d73764d7149e094781670148815e2b255ffbaa31887a3a0153ebe4930c49c2bcf73befb02410aea2ad023f33e26c4ab6a605e8097a84de76c36a
-EBUILD containerd-1.3.1.ebuild 1404 BLAKE2B 0d7036ff3f180cb2054d95263ec88d08e2628fe5a421d9967d4313966c858692e2c1a7c41122c9b2efea7b055af232c2e8fc2725fb8691944a0be2fa0fc9f6db SHA512 ec6c3514980b5037bcabe94202285ae90730baeeef0e6f8a6d120590647283be3ac5cfeddc7be4b948f962aa7f30fe030d18578faa62a554b591111898322b98
-EBUILD containerd-1.3.2.ebuild 1408 BLAKE2B 6b6c70d5a2846716f98d60af8f6b4691c075c84ce59fcb674599c66b2d83e048656f6f0c012ee687f0b57496f39f095d3728993e77ca2c4d23db0d1a256fbaab SHA512 d2a7d53e844af2d02ba4c90a596abe66d736668b5fa52264becba657f6ee72b9b0bae46a938fc538fd7c01fd718be35af28cff1edc4a463a46d331009f5fb752
+EBUILD containerd-1.2.10.ebuild 1435 BLAKE2B 4b55020f19d1349c90c2faa063c59f161a9ce1c7f9a02aef795de49f8b6ec3229964c2726547b3ad803ea84c7d2ab12c6b7f7b8afd53181a6e2f06e3e4df41ae SHA512 138989a2beb954c4e2d1be54fab432f3e38838cbd18c6341b297afae0c896f7fc9f4d234d96c70af3faee5b9d53bc095a0637c1e8b44b682c6359078bc8b69b4
+EBUILD containerd-1.2.12.ebuild 1434 BLAKE2B b1f6f907d6502dc829780b2e6150dc0e523ea9138840e31e0c88862aa0d07f489966a78d081c208e51e57ee5383ecf5b02cae19f2dda542ab8a6616ea0aaddd6 SHA512 2c9d32a48c78e7dbbf7837dcef9ffaff7d2e5c8fec67da47aff3985a6f898134317e7a13e4f370eb681013238eb085ed7c49d35ba240729cc605731bb5bfa301
+EBUILD containerd-1.2.6.ebuild 1435 BLAKE2B b2c719a4d015325bf79b071e7211e99509e7ac9ac43ddc5fca82c8b5b7eeb42d856b0b759189c770361d92c8e4cd28f180da7d7358d4e6dc8f4bccb67708ee15 SHA512 b9d2c5434e56b4f6e215ee4a8fe2e94b355e066caa62e6bb41b7f63010e2332d1219fb45d0af77276110f436093946c95276da5c79fc95699c338b41682952dc
+EBUILD containerd-1.2.7.ebuild 1436 BLAKE2B fadea431a169fd01c58bad3ec746ba521d8a4dac09031d62f1b4b0fd1f1821a815d725a71818294b756bc87b5c2afed6226ce4807e0074cf640a94c2b56af16b SHA512 5587fa22daa78de8661fa04dbc780458ffb42c4219e7ef9f0411c6922364d25726b64f72928f4d543ce9506a7eac21f98a77d680b1daba35a72b9b5996b33721
+EBUILD containerd-1.3.0.ebuild 1436 BLAKE2B 221c0f5bf08fcaa1c1956859fc59b8b69830e0e26a221842894d385faadf243f76b575c6a4920b621c679c4c8d025f7ecc679a49d1a70dff738298c281335237 SHA512 133d213aa8115df74f5282843d0a0dc0832f0ca4f320ab4ffa541e3f85f0eb6ba89f66421498a857986fac8b368265445c9d01595def2a613d85c7abadf85dcf
+EBUILD containerd-1.3.1.ebuild 1403 BLAKE2B 27f63eea492f0b4069edbd19692ef501cb79d227ac02623684c408fc33da1d974ca2f2dbd78cdc1c6af9269f146b77c37ff427aea47c5b578eafc3c8d0f81550 SHA512 829b2b8943714ffe79759acf7b40d279e24047a9e77858910f7f820a89331fba8b91a8968cf4a4469a7395c1bec990d27702d583a15d074bd765104942505bca
+EBUILD containerd-1.3.2.ebuild 1407 BLAKE2B 82b111b3749b2f67729854cb50367139a7ac0ca25bc552713f875c5a7d9f7daad9c80c4e6071c01d7e3145d41bd608d08b28b6fd32b1508a2ec8b2324ad3c8fb SHA512 85cb4c29b6d2a77b0c278882ceac51315e34f103491bb7f5c209667572917facfb4debfc4b822728d8316a9ec0f771c3f6cb75d4b5c1b4c1e35ef6ff69837d99
 MISC metadata.xml 986 BLAKE2B ea61cc405375a3a31cb6dcc51c8fcb5771d5da886b03c1718d9fa8933e13834ee5da915edf8b02557800f1a6919d95ff41930a5535ab8ecd371dd61dccbb214a SHA512 1aec368575f40d5ff0cb1d9fd2a13bed6cf15af319873cb5401f69946c5e65603a13d67e51013fbd3b25c3d4aa4747d1ccb621745fdea8a658eff2931b57e5ab
diff --git a/app-emulation/containerd/containerd-1.2.10.ebuild b/app-emulation/containerd/containerd-1.2.10.ebuild
index 53b84c161278..5a1d397114b4 100644
--- a/app-emulation/containerd/containerd-1.2.10.ebuild
+++ b/app-emulation/containerd/containerd-1.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
 	seccomp? ( sys-libs/libseccomp )"
diff --git a/app-emulation/containerd/containerd-1.2.12.ebuild b/app-emulation/containerd/containerd-1.2.12.ebuild
index d2c5c94985c2..5e5bc5aef5e8 100644
--- a/app-emulation/containerd/containerd-1.2.12.ebuild
+++ b/app-emulation/containerd/containerd-1.2.12.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
 	seccomp? ( sys-libs/libseccomp )"
diff --git a/app-emulation/containerd/containerd-1.2.6.ebuild b/app-emulation/containerd/containerd-1.2.6.ebuild
index dcc5a7670301..48bf1f799cf1 100644
--- a/app-emulation/containerd/containerd-1.2.6.ebuild
+++ b/app-emulation/containerd/containerd-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
 	seccomp? ( sys-libs/libseccomp )"
diff --git a/app-emulation/containerd/containerd-1.2.7.ebuild b/app-emulation/containerd/containerd-1.2.7.ebuild
index c021436695f6..1cba833a7419 100644
--- a/app-emulation/containerd/containerd-1.2.7.ebuild
+++ b/app-emulation/containerd/containerd-1.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
 	seccomp? ( sys-libs/libseccomp )"
diff --git a/app-emulation/containerd/containerd-1.3.0.ebuild b/app-emulation/containerd/containerd-1.3.0.ebuild
index 0c5e0f6bd86c..0c41a6c57dd0 100644
--- a/app-emulation/containerd/containerd-1.3.0.ebuild
+++ b/app-emulation/containerd/containerd-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
 	seccomp? ( sys-libs/libseccomp )"
diff --git a/app-emulation/containerd/containerd-1.3.1.ebuild b/app-emulation/containerd/containerd-1.3.1.ebuild
index 17258ef6de6a..97f5996a48aa 100644
--- a/app-emulation/containerd/containerd-1.3.1.ebuild
+++ b/app-emulation/containerd/containerd-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ HOMEPAGE="https://containerd.io/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
 	seccomp? ( sys-libs/libseccomp )"
diff --git a/app-emulation/containerd/containerd-1.3.2.ebuild b/app-emulation/containerd/containerd-1.3.2.ebuild
index f6200c865cc4..b280fe999e58 100644
--- a/app-emulation/containerd/containerd-1.3.2.ebuild
+++ b/app-emulation/containerd/containerd-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
+IUSE="apparmor btrfs +cri hardened +seccomp"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )
 	seccomp? ( sys-libs/libseccomp )"
diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 9dab3d0e53dc..fa0fb011212d 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -4,8 +4,12 @@ DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0f
 DIST cri-o-1.13.9.tar.gz 6685519 BLAKE2B 5d9e68c7a0ae532e2406e5e47562693cddbc34a8b3ddcab0a7a34509dff8383d1fc255cba634efb186193e5784cc6a7638387ca29e68288af7621b8b25f1a71a SHA512 1541368955c62c697dbd6b850cdf6762a13a7a308f699e3a50dbfe29fbf991f4f47cfcce75bc41745e0c27acb29457ec86d3312ef13341a5d94526865e60eb3e
 DIST cri-o-1.15.1.tar.gz 11811389 BLAKE2B 2f6e223e2d3964f480e9739ee4808101ae2ca8c0a16eb589d2e3501d370c60694843309b602a4a4b8e16ed97094f97c81ff4f23b542a9536b38f9fe9a97bcd97 SHA512 2b9122692d84e8a6832d7172782c41d354185809cd3fa999951485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07
 DIST cri-o-1.15.2.tar.gz 11861335 BLAKE2B 159bdf322540c3d49f44b1fc1106d1717706f7817e4621743078dfbb5d9088318d7dda5da54ff94ed43ea58204413d496ffda424ea94ed6fd0c6e090bbba37f0 SHA512 d30a27d98537cd73bf341267922b94434958bf5e5d3a26de3af2b7899fd9d860be12a194531f81fb704abed79eac1c5139271fab1e52b994b939dafab00f1cfd
+DIST cri-o-1.16.3.tar.gz 12274620 BLAKE2B e297996184e765a89cc68adbb531eb249ad74804b05d233b4730fe56cb530e2d6d7f44ecf6939730a055acff43b0bdec13fd40583fcf003740e6dacc9770d868 SHA512 cf3d8748696e14a9fe7bb1f4e4ed5532a84367e1de42da89e1c85c33f249525a42000c74445b1f6859099a43d4076c4078efe5990a7e663795121d54d1ee1354
+DIST cri-o-1.17.0.tar.gz 10528650 BLAKE2B ba1240e602be576eb74bd9dd0c7b5d0ae3c78172902c74725ce3b85b90c739a79cf260b9ab441bc632eba85951ff1968a946824dd20849bb9ccae268b76e3fec SHA512 08b1ede35d44dd72f7a20ef02e3d27198d349d05b3fd41fc319bfba44dafdaf1843c1a6b04cd4d07ad80b5d2022376a8173b7459658a3c22011970561a1af308
 EBUILD cri-o-1.10.6.ebuild 2889 BLAKE2B 1dfaa54c22db81ef2dd51604465b4f0e030a0fb13249d4a31483648b6ce09b694ba1032310e58afca7e38230a2d0ee024e0ce0f57bb465f26dbafc36512cf36d SHA512 80d938b1c63f2499eb7acc992bbbd668a70f596f82c492360acaf2148cf0ad26959623aed55648b19179dc3db407d42952572726a056ee335a366086790bd5fc
 EBUILD cri-o-1.13.9.ebuild 3114 BLAKE2B 15fe25488ff4309d6fa4f1fe43e26380353d0f65fcce4a5cfb423af3d86cf6888da05f337ff799ad42256f9c40603f2a20dc4d2e3741bef64279a475c2ebe337 SHA512 6d8697a6e56795854582df64ae26eb116232e7e79e1217e154d02fcb0270bf2dcea111192270dab27ad8aa41ff11494a82a021cf5b0201251d0844562ad55a42
 EBUILD cri-o-1.15.1.ebuild 2914 BLAKE2B a7a7305cc116f348bbcbe68751f89aef1f75c28c960f0dd1c9503e21fa9a6edf3bd77edd69e9704c1f27116cc37d1254a26bdac6c404f5d15725cdf62be270fb SHA512 054721cef63a25757926bbc84ce8d04f3e452ac630ae61e96859bb636174c35fc29d8367b7d2a141883bbd5d912df74d334f4edb3b83a823d54e4df514653556
 EBUILD cri-o-1.15.2.ebuild 2914 BLAKE2B a7a7305cc116f348bbcbe68751f89aef1f75c28c960f0dd1c9503e21fa9a6edf3bd77edd69e9704c1f27116cc37d1254a26bdac6c404f5d15725cdf62be270fb SHA512 054721cef63a25757926bbc84ce8d04f3e452ac630ae61e96859bb636174c35fc29d8367b7d2a141883bbd5d912df74d334f4edb3b83a823d54e4df514653556
+EBUILD cri-o-1.16.3.ebuild 2576 BLAKE2B 95a9088bebd4a5f1848f5367152fc924116a9b8e1925c6757a825b64285abb23076521012dadf3490928cd1c716f68bed1a1f8fb4d4954b256a52afdb656acaa SHA512 e522a1135dcf8d119d06a85b938bd0eef9196ccbf6f24b0f8d05ca8b39797b9e6d94643f320e8383d8a2b286b0c02d6ccd3348959ae9576f400e903cb5f30f1b
+EBUILD cri-o-1.17.0.ebuild 2547 BLAKE2B e80f2c540d5b5ada86a0ff5c90b28023bc4072b1228750a5d4bfd9bd36b35e1f829227f4f4992932e04a29133785930ac70b65370b00ab0b9164ee9e3beab5c9 SHA512 ee1ce8ddf14893e4a760164ed6119e9b7b0abcf1d3271cccb9b1a7ee3234220333881356859e5710e3236a2e7b82887e4100af470e1893037c6076aa8f9dcfae
 MISC metadata.xml 995 BLAKE2B 81f504df91c54970e7bc65cc4085db45f8f95f354b578cd7ddbae6c34036201335af3c3e07efb39583314c53bdb7cde341568e7d912fa926978b5f146e9e8d25 SHA512 00809a79f64c171d9df3eda85b079bf7c36e46afe8c31c0a0cddb3999d23b09ac2282cd17e4e876a132fed55e5311990a4a4461265d409e976b23ad8ee13e759
diff --git a/app-emulation/cri-o/cri-o-1.16.3.ebuild b/app-emulation/cri-o/cri-o-1.16.3.ebuild
new file mode 100644
index 000000000000..f0c8df12dba2
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.16.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT=dd73a465144f71031728f0de8439ddda08c98119
+
+inherit go-module
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="https://cri-o.io/"
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-emulation/conmon
+	app-emulation/runc
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	net-firewall/conntrack-tools
+	net-firewall/iptables
+	net-misc/cni-plugins
+	net-misc/socat
+	sys-apps/iproute2
+	sys-libs/libseccomp:=
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	selinux? ( sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="
+	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!<app-emulation/libpod-1.3.2-r1"
+
+src_prepare() {
+	default
+
+	sed -e '/^GIT_.*/d' \
+		-e '/	git diff --exit-code/d' \
+		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
+		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+		-i Makefile || die
+
+	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
+
+	sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
+		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
+		-i Makefile.inc || die
+
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-i contrib/systemd/* || die
+}
+
+src_compile() {
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+		hack/btrfs_installed_tag.sh || die; }
+
+	[[ -f hack/libdm_installed.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+		hack/libdm_installed.sh || die; }
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		hack/selinux_tag.sh || die; }
+
+	mkdir -p bin || die
+	GOBIN="${S}/bin" \
+		emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
+
+	keepdir /etc/crio
+	mv "${ED}/etc/crio/crio.conf"{,.example} || die
+
+	newinitd "${FILESDIR}/crio.initd" crio
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+	# Suppress crio log error messages triggered if these don't exist.
+	keepdir /etc/containers/oci/hooks.d
+	keepdir /usr/share/containers/oci/hooks.d
+
+	# Suppress crio "Missing CNI default network" log message.
+	keepdir /etc/cni/net.d
+	insinto /etc/cni/net.d
+	doins contrib/cni/99-loopback.conf
+}
diff --git a/app-emulation/cri-o/cri-o-1.17.0.ebuild b/app-emulation/cri-o/cri-o-1.17.0.ebuild
new file mode 100644
index 000000000000..e5cd2811c967
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.17.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT=6d0ffae63b9b7d8f07e7f9cf50736a67fb31faf3
+
+inherit go-module
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="https://cri-o.io/"
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-emulation/conmon
+	app-emulation/runc
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	net-firewall/conntrack-tools
+	net-firewall/iptables
+	net-misc/cni-plugins
+	net-misc/socat
+	sys-apps/iproute2
+	sys-libs/libseccomp:=
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	selinux? ( sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="
+	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!<app-emulation/libpod-1.3.2-r1"
+
+src_prepare() {
+	default
+
+	sed -e '/^GIT_.*/d' \
+		-e '/	git diff --exit-code/d' \
+		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
+		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
+		-e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
+		-i Makefile || die
+
+	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
+
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-i contrib/systemd/* || die
+}
+
+src_compile() {
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+		hack/btrfs_installed_tag.sh || die; }
+
+	[[ -f hack/libdm_installed.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+		hack/libdm_installed.sh || die; }
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		hack/selinux_tag.sh || die; }
+
+	mkdir -p bin || die
+	GOBIN="${S}/bin" \
+		emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
+
+	keepdir /etc/crio
+	mv "${ED}/etc/crio/crio.conf"{,.example} || die
+
+	newinitd "${FILESDIR}/crio.initd" crio
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+	# Suppress crio log error messages triggered if these don't exist.
+	keepdir /etc/containers/oci/hooks.d
+	keepdir /usr/share/containers/oci/hooks.d
+
+	# Suppress crio "Missing CNI default network" log message.
+	keepdir /etc/cni/net.d
+	insinto /etc/cni/net.d
+	doins contrib/cni/99-loopback.conf
+}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 478ff878506c..0c170dd99c98 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,4 @@
-DIST diskimage-builder-2.32.0.tar.gz 435328 BLAKE2B 78f306430819d94045e3b8c424cdf7a0fee9a306a317e44cd363d53bbbcd1af1f06731b83b63e490bb8ad3903630daf84a544878b87d6c7f377786778229f276 SHA512 357b56aba979cabd7a857d6646412893361c05a83e4260d1ef468de1d6fb0fbc2582ab8bf37428c56a52fafcf708b86be470f2c885008b10368bc92a2b679a09
 DIST diskimage-builder-2.33.0.tar.gz 434041 BLAKE2B 16d14c68e7a54b785426516ecced4adb53b4e84f36d36846732ef7c4823644375373249ceacd1371e39262ebc9050f2f86184718dc3fb17b44eaa20f561410c0 SHA512 125bdcc0a2d4249918485115c49482746e4f86cb7883d3689afd4288a0d18ca97bcb669b811034ccb159879520172ca37bd9f9d7ba4ea509f788be0f3cf2259b
-EBUILD diskimage-builder-2.32.0.ebuild 1130 BLAKE2B 7525abba5802a5475bf5f79ee39956ac265d3bda5ebdeb9468c50811c8ba564c1c8391c67616d208f00a3620c39b1f3cb8cc55e34789472c437307e4663aa02f SHA512 8a15f329598ba70129071e4efc5e62b257fc56dde57a9c238cedcfe002d997385bae6cf0c8a380ae19ed8b58a17c113046cf419786626aeb515fd3020f3a2e60
-EBUILD diskimage-builder-2.33.0.ebuild 1131 BLAKE2B d077e0bcc6df338cfbab02a90bf1cada112848619de1a660afb0e79d282d1698e6ab39acb47dffb5b8582ac2cd465b63b60febbff791d84f3cdb2c015f194cf5 SHA512 ab2e56b8e7068487ac60422a81b0ba60a59b8bb30e20108a82d1bb809d3ed6987ae0226632e91a7eb3b30d92145792858f0d6b7cd4eaf8fa15caf6d863bfeb0b
+EBUILD diskimage-builder-2.33.0.ebuild 1130 BLAKE2B 7525abba5802a5475bf5f79ee39956ac265d3bda5ebdeb9468c50811c8ba564c1c8391c67616d208f00a3620c39b1f3cb8cc55e34789472c437307e4663aa02f SHA512 8a15f329598ba70129071e4efc5e62b257fc56dde57a9c238cedcfe002d997385bae6cf0c8a380ae19ed8b58a17c113046cf419786626aeb515fd3020f3a2e60
 EBUILD diskimage-builder-9999.ebuild 1131 BLAKE2B d077e0bcc6df338cfbab02a90bf1cada112848619de1a660afb0e79d282d1698e6ab39acb47dffb5b8582ac2cd465b63b60febbff791d84f3cdb2c015f194cf5 SHA512 ab2e56b8e7068487ac60422a81b0ba60a59b8bb30e20108a82d1bb809d3ed6987ae0226632e91a7eb3b30d92145792858f0d6b7cd4eaf8fa15caf6d863bfeb0b
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild
deleted file mode 100644
index f77968e00ef2..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild
+++ /dev/null
@@ -1,39 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	sys-fs/dosfstools
-	sys-apps/gptfdisk
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.33.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.33.0.ebuild
index 092a05de7652..f77968e00ef2 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.33.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.33.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index ca25a99a01b4..5c91cac773b6 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -2,6 +2,6 @@ AUX docker-compose-1.24.0-setup-py.patch 1767 BLAKE2B 14ad1ab45fc11006a6054e4b57
 AUX docker-compose-1.25.2-setup-py.patch 2209 BLAKE2B 24cb97379440c94c4f18d999806dc0ffb23a5ec09915ff1e421a0135189955cbe6e67bb8f535071bfa1dfd2d7153af3e9c5e634e4de0699a8e740f6c407f233a SHA512 e9987469d46f10bfa97a6b6a65e089a6f8c86451154668e7db0ba1cd564acaad798d1aa189b458166517f19e604aee2e309941df9296be1d5e8e730252f273d8
 DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c SHA512 318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa993dddd3bc2e5f23cbb76856276a874e84793b878a3e86
 DIST docker-compose-1.25.4.tar.gz 306513 BLAKE2B 86c779d794deca7ede0adc80041b17a96b21798d2807065e2c9ea804a95fcaf24a8b92fbcad6c7ce4d1b9d1fb3c9ad348b630e3f10bfd032202995a4c34ab019 SHA512 860153fb603d7efcc76535c9997446a2e6fe18f61769d4f05f51b531902a66072be11e3cff012ba80240b0a7802a032495a2a55e053a9784df92b82e5351b72e
-EBUILD docker-compose-1.24.0.ebuild 1902 BLAKE2B 68ecc72e651426ab76f371ba2aee53fca6060b3a280a9ceb2eaf13b4c9e3cfeb56a233a0edf015807e5da76e45e11d0420c0b0768de1a734abfae3751b0781a3 SHA512 ea97e100e02faf6ed22072a8834e4b57548da6cfef80682aeea9b5a6f84b0298eb0c422aed375c0416d4155f529857531516dbeb747fd9d176db379f10cfb47b
+EBUILD docker-compose-1.24.0.ebuild 1902 BLAKE2B 3f4d49a9ff38468adade2ada013a61790100871bd0181ccbdaae2c9e2590d40b6fe5b7beb68356c2199fc355a5e7cf08c5b734eb2c12bf5058dde3a2e8241cfb SHA512 cb21d46608d489d9f07926994253a97c25810e13359529be878598f90a36a9289ed30132faf79dc7f3a4312910f9aee3ce358342306b80b411137a2746dd062a
 EBUILD docker-compose-1.25.4.ebuild 1931 BLAKE2B 473aff7052bc17bece0fff0efe2eb7dea36b6e5f553726c32c8f2a5958f1a680f095cace3975fe461526ceda8f503e72beb85c3f91b3b0483c2f967c0c8cf508 SHA512 1357b4d702198ec54dd7eb4cffbe6071b23ba9cdaf076d85f0049c27210e9d985c0cde5f29550fa77f2d3af89f0422fad79bec47e1f26710373b541539c4da8e
 MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc
diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
index 3e0bfb04269c..96eaada3ce3f 100644
--- a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index fbf9dd0c18d6..527e455770dd 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,5 @@
 DIST docker-19.03.5.tar.gz 16966994 BLAKE2B 7326ba17c0eef7bcebb5df1484992a30f696d2f238d149dbaf964004b725badfc1e9c85ed3ba76ac95b566cda9cb7018fe4fa7d282af1d1e36f4765e1445f25b SHA512 1afe41e740ae0e32a8210aac3c4b24ddb1ae00ff19e8ec435de2e61cfc25494d38129fd619bacf964e3e7a96e12dd44a0c57f6e2c36aa7c3bb67a3df0c237648
+DIST docker-19.03.6.tar.gz 16991717 BLAKE2B 335f3c7f6f2e0a682d2423b89543f8cccd01b26b183795b31915eabea2efbf8dd1155e9cc2897b89a8d461f8992f20a5a2c058d0642210b7a4775535681c635b SHA512 ece435de92e50d2a6204ac46cc9116fca9a1cb2ea400351d2fec723ad68ca2f5082695fdbca194ad0b87029e6ce266c8b4c10ac3b33842097e9be66fb4930797
 EBUILD docker-19.03.5.ebuild 8401 BLAKE2B 093d1202a45acbf4bc0f997612e4c6d5d447de6e51f2feb1d0bd6154f79bb61891fb813f44a99a59244b98e7b6d2e8c62184b276d81bb1fca34c4ecc42425cf1 SHA512 5d499dac32424d717479689242748bec3283654a9c12b4a84e76cae59da5767700ec2f5fc781a7da040dcfb19af163fe7c25ed21e013447f522cbfa7b7912009
-MISC metadata.xml 1476 BLAKE2B 08a8d9e0c4b4358c3322d2ec94e518bf366e8928c285d55268966e17f8ff96c517240c70fc3e6012e5480a36e573dee51f30fa5a60f5da0bcd9fcf266841987d SHA512 c32a9008ea8a9abcd2a679b21f9d93ee11854e623b89e94d4840d60d9f9e755fe0a57d40361c2c21fa5961fedfced10ba7bd8ee33c4f98b82842a127a8e8b405
+EBUILD docker-19.03.6.ebuild 8402 BLAKE2B e3aa5e654e075ac6b6344df6f79a29a2d261703e7937ba71022db252b402747c710a6a44a8e14e89e339c47ca20ce77305a3d31c655ed87d8188efbe6cb4f782 SHA512 6e83ee52be9abcddcdbb7c751f4a573dd3392aefb0b4ef968f3ef376b5a244da0db88d6960d5aa0b572baa553c9e74eb996de48cb7b8f945946dd55e8281b1f9
+MISC metadata.xml 1588 BLAKE2B 489192d757f3c347bc2fce5efa8009aea6691a59da6380810ab48e489d705b646e13ccc9a2430c3ca671e86570c2f8442c67bd76e6a5fbe0955fa41420cf7d53 SHA512 b31bceb715bae4dacd76fcbdae610ee27e2bcf2c9fd5bf822320fdda440c6fa0574d4860f7c5f6a8e241bf75c323c99110657eaeea655e5c40eda8d8ff395f6c
diff --git a/app-emulation/docker/docker-19.03.6.ebuild b/app-emulation/docker/docker-19.03.6.ebuild
new file mode 100644
index 000000000000..311e791f2016
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.6.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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=369ce74a
+	MY_PV=${PV/_/-}
+	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	[ "$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://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+COMMON_DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+
+	>=dev-lang/go-1.12
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.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
+RDEPEND="
+	${COMMON_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.2.12
+	~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20191011
+	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_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 ~MEMCG_SWAP_ENABLED
+
+	~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
+"
+
+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 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-sources are used instead of aufs4/aufs3"
+	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
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	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; 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
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		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*/*
+
+	dobashcomp contrib/completion/bash/*
+	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, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
+}
diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml
index 5f1f8d5ead4e..3d0b5c84e482 100644
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@@ -16,6 +16,10 @@
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<use>
 		<flag name="aufs">
 			Enables dependencies for the "aufs" graph driver, including
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 8948aeff3056..72fd6c00292e 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -2,8 +2,8 @@ AUX faudio.pc 245 BLAKE2B 8231bb42f6d90dd814eabd12d4d582d74ea0f154d6913fa710814d
 DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6
 DIST FAudio-19.09.tar.gz 901659 BLAKE2B 8bb99c67b6da2660e71c7a8a70f83130738a07e7f4ddd2001fb857c81a593935506a8c1fe6d24bfd064537ea4a5a603973c32d839228d7b3f45c9c300ba15147 SHA512 127f975c68e2b449fa7cadae0723925f35ca7a2841ea3fd85037febe964331de4b2e3031ab09c292ee5f40d90902dcf78c75cc3fe7fbe4d6f37a822b4d9eb966
 DIST FAudio-20.02.tar.gz 908051 BLAKE2B 7f9323e7528949680b39469b3549adbef9acafe6f293c643676117648fd6871639fa8c7a47fdc0e1232c0533c0af9e89953415a0935fa4ad7b831aa8a8243f30 SHA512 69995fa1fb9ea41182e47f8143252db517adf4e9dc4a0556c9032af5c867259cc7edc81196b10ef043e6118a2e3687b34368f3ac8ffe9294398c5143b9928476
-EBUILD faudio-19.06.ebuild 2404 BLAKE2B daa675da55fbd28eec56780e6a7ff7a535b35a43b2f08ed8507178d6b23c316f8c4c31741cf0b0b87b8f5b65dc8a665c67b2095208e3b96e095a93f9cde2393c SHA512 5aa4b4cfef73d4f5e1c3308dd8773d39338f28b121f46fc47fa0bea55261f6a8aabd723fe6fe1946beacdde6321b4d0de973684909ebc94fd30b0450eb1298d8
-EBUILD faudio-19.09.ebuild 2404 BLAKE2B daa675da55fbd28eec56780e6a7ff7a535b35a43b2f08ed8507178d6b23c316f8c4c31741cf0b0b87b8f5b65dc8a665c67b2095208e3b96e095a93f9cde2393c SHA512 5aa4b4cfef73d4f5e1c3308dd8773d39338f28b121f46fc47fa0bea55261f6a8aabd723fe6fe1946beacdde6321b4d0de973684909ebc94fd30b0450eb1298d8
+EBUILD faudio-19.06.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101f027a76a6b086b0841eb8155c69bfd1f3ee2ee32fa02950ce5e2a1138ffe007fc1d7c7709dc4e51b8610b916 SHA512 0f70626817ed31c8b226d7bfdb04f1beb9a51c104c3fa2ef8fa3fb115eed43c518d7f6e21c98cac534a3d3f2b4471fd32b32583347547176afa4b20283c5dbca
+EBUILD faudio-19.09.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101f027a76a6b086b0841eb8155c69bfd1f3ee2ee32fa02950ce5e2a1138ffe007fc1d7c7709dc4e51b8610b916 SHA512 0f70626817ed31c8b226d7bfdb04f1beb9a51c104c3fa2ef8fa3fb115eed43c518d7f6e21c98cac534a3d3f2b4471fd32b32583347547176afa4b20283c5dbca
 EBUILD faudio-20.02.ebuild 2508 BLAKE2B 5eeaec2d55bdfb58f1e272b8d25561e55127c757e800c41eb39c1be65a00735838d09a66123ca56789c5462fbda0d1779a75716820f4b69836ef79844877c4a7 SHA512 a3e2698446f1402c2d58391801aa3e28bf0b569fa587b7a70e6c6391e8e2d5d355587b01d52f6fbfe326d4445d11e1222b22e9cc26ac365824402ca9a5aebbf3
-EBUILD faudio-9999.ebuild 2404 BLAKE2B daa675da55fbd28eec56780e6a7ff7a535b35a43b2f08ed8507178d6b23c316f8c4c31741cf0b0b87b8f5b65dc8a665c67b2095208e3b96e095a93f9cde2393c SHA512 5aa4b4cfef73d4f5e1c3308dd8773d39338f28b121f46fc47fa0bea55261f6a8aabd723fe6fe1946beacdde6321b4d0de973684909ebc94fd30b0450eb1298d8
+EBUILD faudio-9999.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101f027a76a6b086b0841eb8155c69bfd1f3ee2ee32fa02950ce5e2a1138ffe007fc1d7c7709dc4e51b8610b916 SHA512 0f70626817ed31c8b226d7bfdb04f1beb9a51c104c3fa2ef8fa3fb115eed43c518d7f6e21c98cac534a3d3f2b4471fd32b32583347547176afa4b20283c5dbca
 MISC metadata.xml 1485 BLAKE2B 2be9f299ab02a56e964c19978b78e201ff03e06bc870f8b7703ab6f7ff2f4ec8ce567433ecf3deb6736b96d1bc411ab147fc84c68a28b4c3f2afcd159e813a8b SHA512 b9df5b457ef4139f8be77d92c2f6992452ed1d69dd654743742e1421f4893997a190be6746ac850aae54510ddea398834e3de937a198e3aea54731b10668f178
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index bc47b4154131..93b1440ba5b1 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # shellcheck disable=SC2034
diff --git a/app-emulation/faudio/faudio-19.09.ebuild b/app-emulation/faudio/faudio-19.09.ebuild
index bc47b4154131..93b1440ba5b1 100644
--- a/app-emulation/faudio/faudio-19.09.ebuild
+++ b/app-emulation/faudio/faudio-19.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # shellcheck disable=SC2034
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index bc47b4154131..93b1440ba5b1 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # shellcheck disable=SC2034
diff --git a/app-emulation/hercules/Manifest b/app-emulation/hercules/Manifest
index f8cc828df102..ab8de7ba4826 100644
--- a/app-emulation/hercules/Manifest
+++ b/app-emulation/hercules/Manifest
@@ -1,6 +1,6 @@
 AUX hercules-3.09-aliasing.patch 1721 BLAKE2B 556ef555ee61a470737bbb5214dec314d57aef3e5dd4312484fa47aba05ef3ae389b1db42899a25cb7f90c025e697f2d9f3e855085a50bbf849ca250373106dc SHA512 6f623193d126e6dcf21f6d93bff1a3b949236e2a10c71ca3c4fbdc2ad816894b673551b4dad65205f8b70a75f5c280ed0aa02d4ce0969592a31705e14e42d6e7
 DIST hercules-3.10.tar.gz 2608321 BLAKE2B df6dd9c93531ee3d68efbfad5b0152ef984e1804e211861e86ea5f7b271081abbd29664d4e97d0e887af10315549bdd7e890ec741baa7b69336f1f08be63c6cf SHA512 de8b3e2e90fdb745dea9c8ce4dbe506de2aba3bf08b3e937605798e6a8020576a949d6ea3496b7c42bd23d617fc96648d2d8ec05a66e8ed174ce46a3bc31c5d1
 DIST hercules-3.12.tar.gz 2569617 BLAKE2B e6b6dc2406bc198e25ddcbdc5dbf141e52cd15ddd690711fdd4ed69ca5baaddd582c437e28aa7793ac667c03f7617adb3bdf3a00cc7c3a28e3f28984f665eb9a SHA512 81d6e151c1c8534753f2db532a0a7bd36fb3806c1ffbab5d6e4a9af3eecea46b95105c37574910714dcfc0fe9b74a72140d573099c24fd44021159ce697414ef
-EBUILD hercules-3.10.ebuild 1305 BLAKE2B 032386a6bf98a1fcbf9661fb641e4da4ce4457ac713fa8b32d994e2a36c7b001e9715576d34450868ccfe95a43e853392df205853ca6e68ce03145ca728cf9de SHA512 6f46407a97f3d9397b9e730dbf84dd354e3aa2a021d9ee00833ae5f5575d6caebd78871d18d3757d10ff6d742f8803c3209d1ca6a253c20d2be76e8625b65244
+EBUILD hercules-3.10.ebuild 1302 BLAKE2B f2e0c09ae8e4201aeabcf1672670e5afdcd0c15c381f8f5ecee78f2badb374506cd9c9cbfeb28e4e530943e3c8844e47e2181fe837bd7d1a4d4ca8648f543521 SHA512 1c13039323733edf679bf7ac576377a90ee0970da171eb0c53044d072f46ffacdd2323e9e8c9e76ca9cab0c6aba0e4a2a4af9f070d3365439e55137737738861
 EBUILD hercules-3.12.ebuild 1310 BLAKE2B 5c300f1edec6212e11378a1de38040bead9e6a25027e4091ccb322c134eefbd843eda1d54324d057a02b86c77abbbf45f454b22917b0482a8318ef9d62799be2 SHA512 58c6e557e0a1a2961af9b0941aa5c1486abaea72179900e22dc680bbad9969ab2d26487bd41e943e2dbc8fc23229de410a81f37aa2eb347fdd32550720458978
 MISC metadata.xml 580 BLAKE2B 7b8d677b252db63214074827db7e3ba8bf2a93362c62793321d436268f8bc4c79a2c9a2fcfe92b17c2107ad61afa6bd2340441fb04a3ba786c7c01c449d7c1fa SHA512 ac91e21edfcaefcf36af5c15336d3371f503c43e727a92df3eb14a11279e0a66719a8879725c34d10ac17e80b83f940ac5a90fffe38448918d0a665408416794
diff --git a/app-emulation/hercules/hercules-3.10.ebuild b/app-emulation/hercules/hercules-3.10.ebuild
index a275ba782b0b..c28944bdf921 100644
--- a/app-emulation/hercules/hercules-3.10.ebuild
+++ b/app-emulation/hercules/hercules-3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
diff --git a/app-emulation/libcacard/Manifest b/app-emulation/libcacard/Manifest
index cc275f74b93c..8c185db171c7 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 990 BLAKE2B be18d16f322a8051c72a84a597310d0371906a9f7df9c059755fbc7dcfecb8f38bc2675e8a1c35e11ce2cddc2d998a310fcae8b11b60c957bfb2ebce56368994 SHA512 c10fd9af0a7ebcfe4066bbe5b0059439f72d837c440d9eca87fb32bc6c04b96e667c0e2909ee65dae8e41d57b61365a4bed00ea48af4df142e9fa4c63e92d15f
+EBUILD libcacard-2.6.0.ebuild 990 BLAKE2B e5ebd7c0531902194c7a0589a2770d9e6693c1dbc000a95712285f5afe01de5d878f0ec03c62a3ec07a2dd40096b694c1e41f78e7b740834e496db2a93b86dba SHA512 62211d75bbabf2602358763a1d251501bf1a2e2ccbf648f3cb77e45746853dc4be7c5cec0cbbe0c731fdfe0cd8a2e6a802cecd5cfb1d2d77a93f19047a01836d
 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 d5c26651ce60..4038a8eb6f45 100644
--- a/app-emulation/libcacard/libcacard-2.6.0.ebuild
+++ b/app-emulation/libcacard/libcacard-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/app-emulation/playonlinux/Manifest b/app-emulation/playonlinux/Manifest
index 8e9824388fca..776a2f498291 100644
--- a/app-emulation/playonlinux/Manifest
+++ b/app-emulation/playonlinux/Manifest
@@ -5,6 +5,6 @@ AUX playonlinux-pkg.1 643 BLAKE2B 80c5381aad102d81eebaa81d3ed83ed0fb16aa29b7f4a2
 AUX playonlinux.1 886 BLAKE2B 903f21600540798a765ae209832c4f111380340f4c6305ca333b29e6508579e13b3df8c3d44bc56284cdce290b319d40294eaee7476630190c9b7fd24ece2e76 SHA512 44ba1a04a7e8dbf3d85d81bbcf92917b6fe7bd68478bbcfecfe0c30619b834cc6c973fc6dd7d637d7debc7ede2a206248feaca1a017834ba95f076fd16679c2d
 DIST PlayOnLinux_4.2.12.tar.gz 3204230 BLAKE2B 80ef0e5763448da4a37263c64d408e8263771694666a7c704b5900dfe0e52cc18405c34d609d8c49a0d05a383fca2d035e956e3bbe9a9a0c92a4e43b319ed7ba SHA512 f4ededc8fe0117c66fd5672e136e19b9b48a41acdd3e1b1b3dd7fae2c354e77795f0a4f8286b09b7d1813363aee50fa0811c04c3194aaf745963a2e6115b3909
 DIST PlayOnLinux_4.3.4.tar.gz 3101890 BLAKE2B d724cbd90a0f1bbc94c6365fcf6511d39ea0e8e9de32f42716111324f69091874ab19d3fa88a6bd9f77ed6308bc03ca708406fdc24faa60bf662e6a4f5d15d86 SHA512 7f2089d37379adee01424777e9c3b7ec16dd56ba2f4b834b4f0447832c050b2df3218a7361e8e735d5cc359aec6a000fea88e11632c9434232e4f749bb21c173
-EBUILD playonlinux-4.2.12.ebuild 2836 BLAKE2B 8149f52d8d711776adf59df9bcfc3f6b97c5c42d88113d99281cc0a02b0f4e8d2beb423ac354ca117958b4f4aa7faaf2a224e9c9e74ccafe636392ea6abeca3b SHA512 d324dd4a5517367d50320b098cf64355fcea026c6dc6e359f2d56c20c43677122c342f2994217506ab496e185b56990a327663f0c732ba4fb9fb38078fb95700
+EBUILD playonlinux-4.2.12.ebuild 2843 BLAKE2B 0713223aaa6866fa773f077b4f4d756ef6944a0ab565cb6b927efe40e1d6e5aa3b37115c9e21ce68eaa427aaaf0673bccecc519ea71cee3e49a9da2101c9e428 SHA512 aa275e0f80618f515f18067ef953592a6ac51086efb09bf4ad681e579abdeedf84db21630c414bce1ff83758f3b0a5c6185dd68b3ce1b0ab6bdd9764aeae378f
 EBUILD playonlinux-4.3.4-r1.ebuild 2759 BLAKE2B 11ad80f54bf368ff8b30319998b94f7840ec807c66c02642c0cc51ba6c6e0c4427ba56e1418c8b89ae1d4798b6ffa721e19fd22b78b840f3bbacda96fa0c5ca1 SHA512 d893b3f4dcedc86d71d0ecf3159641d4278043d75eb0148e2b77940f243114aadffb4c1d0615a86087f647a3519dd23142a0a41ca3fb9d67e44b9c7d4a1ddf18
 MISC metadata.xml 433 BLAKE2B 6ba322414d75d581231afedbb791ce71aff799da09be4e08aab6f4e7e2e88d19b6e8701e36599bd1760e7076558c733edfe19f603f7f9541d0197cf4f1d59e4a SHA512 1e1dbfa93723297b63288436eaa1ce87183de71847c0ce61767381f668f6ad0bf69119570f7c7e395866f15e176f7412378c09386f8ddb271f7b2ec39da2d295
diff --git a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
index fcb7847aa4e8..a7b49cb2190b 100644
--- a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 
-inherit gnome2-utils python-single-r1
+inherit eutils gnome2-utils python-single-r1
 
 MY_PN="PlayOnLinux"
 
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index fbcc0c05b47e..7388ea0e3103 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -6,6 +6,6 @@ AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a
 AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
-EBUILD qemu-guest-agent-3.1.0.ebuild 1701 BLAKE2B 77ae7dbe1ac967db685260110c6a63d475ede00642cfdbf62e64207370c51d4aa8258063365d2b68593722ef8994b5ae2cc62d441b2b7e002fd0c3c065552ed4 SHA512 51070dbb65c2270f6c054d344e311156c710d502ddbb56622e6b386ed52ac9eae2857348504f61e774fd8d100cd8771394524dfd0a659630a6bebf8037ea6397
-EBUILD qemu-guest-agent-4.0.0.ebuild 1701 BLAKE2B 77ae7dbe1ac967db685260110c6a63d475ede00642cfdbf62e64207370c51d4aa8258063365d2b68593722ef8994b5ae2cc62d441b2b7e002fd0c3c065552ed4 SHA512 51070dbb65c2270f6c054d344e311156c710d502ddbb56622e6b386ed52ac9eae2857348504f61e774fd8d100cd8771394524dfd0a659630a6bebf8037ea6397
+EBUILD qemu-guest-agent-3.1.0.ebuild 1717 BLAKE2B 873d1d238f306636907e39ebd90e9029ceb74cb2219b8ba7fb844da28abafa72e9d8e2065690c5ac6a1890fdf8414600f354295dadbd37af07b29e3dba048d62 SHA512 bee6c955a0eb63de22cd54fa6c15bbe4002f462453933cd53e70853be2c8106ff60e5217733f79c6bc6e786e04b6a24e64f8514877323f59b0f02a59299bd44f
+EBUILD qemu-guest-agent-4.0.0.ebuild 1717 BLAKE2B 873d1d238f306636907e39ebd90e9029ceb74cb2219b8ba7fb844da28abafa72e9d8e2065690c5ac6a1890fdf8414600f354295dadbd37af07b29e3dba048d62 SHA512 bee6c955a0eb63de22cd54fa6c15bbe4002f462453933cd53e70853be2c8106ff60e5217733f79c6bc6e786e04b6a24e64f8514877323f59b0f02a59299bd44f
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
index a60e60f9d00e..9f59a9fcd2f8 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_6 )
 
-inherit eutils systemd udev python-any-r1
+inherit eutils systemd toolchain-funcs udev python-any-r1
 
 MY_PN="qemu"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
index a60e60f9d00e..9f59a9fcd2f8 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_6 )
 
-inherit eutils systemd udev python-any-r1
+inherit eutils systemd toolchain-funcs udev python-any-r1
 
 MY_PN="qemu"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 1df3baa4f374..48b36941f178 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -16,8 +16,8 @@ AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
 DIST qemu-4.1.0.tar.xz 54001708 BLAKE2B fc89d0c967fb31a73cbdca556e79c05c44b241382a83f02150a8e39b00cb7de7fb6f248e82e1364e314680481bfb3843e74804534c0ba91a5bb2ff1b8d771130 SHA512 82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2
 DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
-EBUILD qemu-4.0.0-r50.ebuild 24060 BLAKE2B 262941105b0a6a0a64e58eb0e12cca4ee400a2d5a0f7ed2a1d0dc0c85ee3632fd4be3db947f243e3ae0360a334dfe71613c8612b14006260793a4e4ef62daf0f SHA512 87653c43f31b7ce092b67cb4f24dc9367e53280011fb87dcc82a00dc09884cc24ca4c7f251a59d2ea0163a76202e06ebb69a3f1052536420dac11d083837097f
-EBUILD qemu-4.1.0-r1.ebuild 24157 BLAKE2B 8ecf6d6b5a230de2b79f7464bf46b6cd27352f949156be3056e28bf02a508c8ef21603354e9f080491bce143ee73297eb631d0f33571a2b7a0819804f0590d5f SHA512 9fa83117ee2f5d7ba3d64d8e8b63afdf41c10f50ad2cb20031024a14741cb66226945230d36af218048023cb8fbbb845b3472812bf25bba4073f935ec1f900d7
-EBUILD qemu-4.2.0-r1.ebuild 24262 BLAKE2B f2e8128f876c71cc7c15eb032f8b383bdc49cc0e0ad816806b0cda43958415b349b8156c84b9018b7a50e22182374b97088b0fb1d722bfffa1cc2691265a0cb0 SHA512 f2aaee829c36c8ec4e06b94a56c795d18944deb449f020aa1b6ea7f8154f1c76c9859a3bee090631f5aafcd48532e9585c612989da12d922e25b7116bf2d4c30
-EBUILD qemu-9999.ebuild 24149 BLAKE2B 476fe07ecc810c84f29d94efa7c7a2413347ef46c0987e3f0938f84da6ba46dd2970cb2cf8fb4bd6e53761053e1402cc11ea9e6387434608ba2b2222917e1834 SHA512 2d4de00304473b10ff37c06e81189c6d385876404a45b47733f46f12d8f08b4e7c29664540d7a5d0bec0a107dc7bea1177028889ada31b45049007f57b7873ab
+EBUILD qemu-4.0.0-r50.ebuild 24056 BLAKE2B 15d192f669da897961f72c5b85bf40b5ff31b8c16b4d3587975ce1983d1eea12a7df6d5b3e67cb0a9314ecdc7da1811685aa0b34b7152dc672dd596cefdf7bad SHA512 c207a12b34ed49fe45fd302a63e215e4a53ba0460ece5091599105515e271afbac899f583354508a834af5441f23ea9895a689a07763e52b207f2e33b0d64d8d
+EBUILD qemu-4.1.0-r1.ebuild 24153 BLAKE2B ae646e441d371ad015ee49512ec0e98db8a642acaa1c48470ad7c1aff3d05c336611fa4bff2ee950f1b81ad003081b08a1cc54ae22132708e5aaa6bdf9ba113e SHA512 c2d51daa7c9bb85cdf69423e07b20b87e2b3e0dab2e8e9f9d50879c8bf4d3854ab55feceff94d4396c103a6463aa0397d8f22d02e6231e869f0426be7223a62b
+EBUILD qemu-4.2.0-r1.ebuild 24258 BLAKE2B 9da37e26f8274cb0b23d95b9e33101be988c32660e3274db6e9f28f4aa6f91a826da6e0c3a9c23e176a7de5f57059d2803e0fd1b33f6233ac2e0c98c369a6a5c SHA512 3575d0504b844c02d2f0d94b34b5110d1544fb39dbb7efe080c73895d853f0de00fc53d1fac2935a7697c235c1bc07cd4f381fbcdec9f13ed7235f1ed746a201
+EBUILD qemu-9999.ebuild 24145 BLAKE2B c1eed739156c86260a07a432b9bcf54a63af03112925bad8f2e07569e51149ca574395b66b447c2089518ee3fea276abf93bdeea5a860e91c0a4f2603b9eff7e SHA512 6910a13aebe7a173e6b6b80c583b5c60afa8f2ce763114502870e6a1b4adab541505d4ab82a51e9b5bc7522a82e09d9bf46d05977aeeed1bff2a30343544eff3
 MISC metadata.xml 4319 BLAKE2B aea03446434b66be757704de0bac113c91fc7c66343103777091ee7038531990017b24e4fe48209cd168b8383df92e9421ec78c88b74e40bd8769f505b2892fa SHA512 bf80056f3dde8b3708859f7d0f7f12e83933ef81d00ba02a437de424b2d98a030aaceb886ccd44992357200d5eb9d0b704e36c7f51b4a6aa044ef04df4f1d76d
diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
index 6227a2fa81c1..dcf9d7b80d41 100644
--- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
diff --git a/app-emulation/qemu/qemu-4.1.0-r1.ebuild b/app-emulation/qemu/qemu-4.1.0-r1.ebuild
index c0af6bf79692..6af035142218 100644
--- a/app-emulation/qemu/qemu-4.1.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-4.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
diff --git a/app-emulation/qemu/qemu-4.2.0-r1.ebuild b/app-emulation/qemu/qemu-4.2.0-r1.ebuild
index dd8315e66905..6409aa5842f4 100644
--- a/app-emulation/qemu/qemu-4.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-4.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index f872a6e7422e..c95a9a085a46 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 52fa06206d73..bbeacae7616a 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,7 +1,7 @@
 DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7
 DIST runc-1.0.0_rc8.tar.gz 1665924 BLAKE2B 542cbdefaaa1ef89d2abf8e31ca8116f26cddbfc3fb94dc8c7e94c51750b179ed557bee857ec80ede7280856c66c01c7961a26dc7e6202276baca46c691a3903 SHA512 f213b6a7fa96597d2ba1068f77752bccc0a1d62e0aac02ec8d2a2552dc3c1140fd4e52b2daeb0ac8fc09c48abe4521834450baae01ad4165308813eee7654a2b
 DIST runc-1.0.0_rc9.tar.gz 1885161 BLAKE2B 638f00b857f43204cdc2b4e65927d6280e48b075d8363570e9da166ec35febaa749c733478d5c190c0119e0d95418e3295adcc129b68afbc5fec20ca3d9e9b59 SHA512 56c46fbe4d637a83d67e0aabf2549ba687d8b1e357fdecfffca343c8b166edf4158830aa0a4419edd6994c589b874bb8504eb3969ed3430cda6e233940d34194
-EBUILD runc-1.0.0_rc10.ebuild 1531 BLAKE2B ce41c356f31fa8f0e4247dc1a8e3cf991f5d7a9a321a3ca151a6a8c711ce7b5b967a8be420ce3d294a92163710baf2556cef1ddd270f0c573001e78bf11807da SHA512 61389d46aa058aa6ef54dbc2850465e0e44a52bc6039870065ce5a15793af9e91f93f8886f0258e63c70d93c1549aecfcfd34dbf42b0f9f86006dce61f72ee58
+EBUILD runc-1.0.0_rc10.ebuild 1531 BLAKE2B 32ab0b4ef8a8d3e2106c3deca7f864c19346df7de0c766463cf6f3734ce15aabfab71acc70ce79f76949f00d59b504e0cace7ce2f1c16eb75f66a958bfcb953d SHA512 d0542749ebe44cf7bd7161341fc84055b3197bcf53acf4cea1b7765a2f7528d91d6f4b629c2e68f747c354d65224627a4b87c1f45d895813ca63976279d4f3cc
 EBUILD runc-1.0.0_rc8.ebuild 1487 BLAKE2B 5a3ad59b6d6f8582f8f86d3f5887294bbacc9db973e0f3b0090a085dacb07b993a68a5f6da40824c99312534d033da03ec3e1e7230bf1d459f9025bbfd691d6d SHA512 41e23944c8bce42d7043d0fd4a6ea01096431c73d5636bd1f0b6a68452cb70aea7aa69d91588be7091d103a227375ca1dec3f4e10e96d8108f4591494cb6f816
 EBUILD runc-1.0.0_rc9.ebuild 1487 BLAKE2B 99a37b4281c595242104484419ff679963e590bb841f08ae84386e0fde31ae8e97c0ff95b879d8e8b0616e0b8a3ebb9ef9b4fb1dbaf2e93a09fc22cf411fa533 SHA512 af7591ad892b998ff8154b2d8329958fd82aed8897d673efb8e5ba131206e0ab9afb2e5ade0b51776fb8e0c2f6f110272f7718905d0ef2f63a54e4ab8d11deaa
 MISC metadata.xml 764 BLAKE2B a3132f8c72aaaac64caf15319068c94a3a849092ddf4d8ed83ef2b964ce714a12fc8f7c35ec85072fab02dbe5b650c23ba185372d7eb835d5a4bb30e1a88c784 SHA512 980f2d052132f8a72f218d6f0538fafac32e2af3b72e2aa4db0d3bd6ea120ec426ca16e5eeac721682a24200c5ea6f4d91f574926849d549fcff478872ff038b
diff --git a/app-emulation/runc/runc-1.0.0_rc10.ebuild b/app-emulation/runc/runc-1.0.0_rc10.ebuild
index a9c3e510c9e1..2338fa34630c 100644
--- a/app-emulation/runc/runc-1.0.0_rc10.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index ea05197614c7..298578c94e12 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -11,11 +11,11 @@ DIST vbox-kernel-module-src-6.0.14.tar.xz 669396 BLAKE2B e2dc77f33176af16be0fcad
 DIST vbox-kernel-module-src-6.0.16.tar.xz 669392 BLAKE2B 19e718097ee4da75c8dc3b565735f0a378d94547911ec89af52d8dccb36d67391a2f6700575c374552cd4fc4eb8a7e3d6618a800380e473429bd3759e0d1f9c0 SHA512 8979da4cba07c9095778864af0fd29c0acf10d71ea587819954a349e8c193a03b2268bf80dca9004803d8cf2a40974994fcd1f2c6e2ac657b5032f6c04977793
 DIST vbox-kernel-module-src-6.1.0.tar.xz 664268 BLAKE2B 9007242bdfcc407283d183132867bef8cfcf75960e7032f1541be39e33c15de68ae1f49c0022422d776fe0397c1411c62866990efb55fe29f9dce27bf7b95b71 SHA512 a5b9f740589ca09b4115275e01d0da7d68535a927550a57007b75726c715422724593f4debc2a123fb8de43a27e49b372aba3832f17dda3ecfd8813d440a0cff
 DIST vbox-kernel-module-src-6.1.2.tar.xz 664844 BLAKE2B 4fbdbac98558309c4dd1a25e44f061e2c7386c418f40b0da364914d58cf69048d9c3b1693fb75ce590c63280e79a124433ce7ff4f8f08e327ab67c5d55a163cf SHA512 f26e38a35b0cbf3ca51d98299ea2018641a35c17df5b1bc8a50352738afaafcc95efc9e61efc7d7406e203f3e514125b8afd8ed4406c190f82fe83934a042158
-EBUILD virtualbox-modules-5.2.32.ebuild 1187 BLAKE2B 87f131dcdde7d6acf35a48183ed2423c20366d1c57bfde56b9c6b265006b049d6d5cf2f058867150f30cddfda308512907702208c15d4ae5a868c6e8d6468091 SHA512 80d1deb4b4142e7a4b718a460829ed99e5a4c24e50d65266263a872d247de519972bb13623881382ca8e12a4387e94f327fb9491728dff65ce8449244df0199f
-EBUILD virtualbox-modules-5.2.34.ebuild 1189 BLAKE2B 5edbc0952960db33bfa7f3d22266fac6785b6d01591e625e88818845667051e2a090ee34e7265dca082434d2da85dd84930bc71fab7e878f12dececa6320f0db SHA512 5701d91ab3bee88cfa0422f9d22c073f92faad72bbb8beb0ecee96ce78cdd51ef3b59c072c924b3ce267e31cbc4bcefc89376fe273de9dc35d508f3fbd6d59be
-EBUILD virtualbox-modules-5.2.36.ebuild 1456 BLAKE2B c669afb1fbb69fdb15f3b928c8a1714376fc3994c095efee0e6eee9a13251769eae16259117f101cabef4d8faa6cd3c7a8656b70bde9d56b57e126c8d13e317a SHA512 953d735cb0fc9bc1bfbbc6139ccca1c25fd60b929b6defd2d7aed73003a20b476994f748aa3ead1dcfc1f0128ecec0ad3e8ce0556cf6fbfe620d0dc784371ad9
-EBUILD virtualbox-modules-6.0.14.ebuild 1299 BLAKE2B b5bc508eb0ff4f33c4b99217ae9b9b7d48e6506bd7440e790bd57d501a99878c5be6493cbae5c4095fa58213daf803150f8399b9e91f87b4f0ef5e4dbefe9967 SHA512 8c64966ce7f4e93783be079a1205cb7ddef010b0ec67eb92d12d7a700c1181d975b08105a4056718255ada775a762115403eac77c3ba96b857397977269cd9be
-EBUILD virtualbox-modules-6.0.16.ebuild 1468 BLAKE2B 4ae5867928772b4463b8ec7dc42451dc10853881a3c1706232a21d2a4cf58f3a7fd0c08d6882c9c032aeaf8e9ca69fa5b38dc6e559e3b5557e1cd232659baf7b SHA512 d54f8790a103877306b8ea4c2214346fa6cd599dde01c8e775c478b03210005f37a9b009faf374ccb12888115e718c1790cebf9086506cf580ef04f3e05ec4f7
-EBUILD virtualbox-modules-6.1.0.ebuild 1367 BLAKE2B 0a4cbd903953270f18cfedcce0f96ede2a11d8bc5eb60af1554489a1c1c05ebf22dabf98cf36f4567ec561d3856c660eeeeb7569757b29bd677fd7ea0fba5672 SHA512 caf19757da92022adebf00b7e9e05f404d4085e5885042ee589bb6b662d68b06228d4cdd2341fd3d83dd1529b5fa3bdf7556126793b867022e77cdfe4648be99
-EBUILD virtualbox-modules-6.1.2.ebuild 1429 BLAKE2B ef6d94ca60d2be43b507b20d829014b3e3d1df3edafd829c6ffa44bf3e0785242a3b91d6a1540f7bccb5e5818595dbfc8e716eec8f6a215d8c090657ed42c3c2 SHA512 3ba714a4a3937710b9bd47ea474922336acc6861dd73520bb154b6cce41dcf7a7672d8e65ecac986483ac7460d210f5b7d2cb1bca808c9fb879f3e4a9992226c
+EBUILD virtualbox-modules-5.2.32.ebuild 1203 BLAKE2B 564094a44633e5193d26e88bc866b0354a3dbec67d08c6b09869c8863487fe30f939f9039a6f23fb9061e200ea428c728fa689e6db643c1710716d565bac42ed SHA512 f3ab32231d5c050d39bae1af958de61e4964b2146aed215d6eae95b96a3a2428b8411b2f9f7bf9f0e81259120f2229b81498cb8b4d9e7d18d511bfb223d4f16c
+EBUILD virtualbox-modules-5.2.34.ebuild 1205 BLAKE2B 347dfeb77f55c891218d876ac752fe0406b05f637cdc9de4d1ba73e47978742288e4d93bd4b57917cbf536c7a4448dbcd12fa30d9519d3832bcbafc18e902f0b SHA512 1f8f1404a522f2be006532c219a0c7ee65196bc32a00798631e1876c14446a79ce18ea4d4c93a8e96be4389fcc4e5f0ed50b61fbd54d1748192939cdb299250d
+EBUILD virtualbox-modules-5.2.36.ebuild 1472 BLAKE2B 76c697e33543678cae5e7c1840d5e2307378c453924a2c42d68e2adb4570b2531d31659e6166a975d2b987e80e61299d6480aa214601400704f56e45a3542775 SHA512 7880a11d683190338a388e488cfcb6a56ebb352e07f6433709f1254d0dbc113ac23abcfb1e87ead4eaaf35b27c85d45d122e56179b7d2781a38c47548ba1854b
+EBUILD virtualbox-modules-6.0.14.ebuild 1315 BLAKE2B 9171db15b195eb06cab18745bf1f1f591db74ef4f68c2f5487ddfe78a933a649ee8a6ca4a2d766481ca24dc2d73f8ec994b4733761d4970cedc59a44359f4af5 SHA512 21b6c8193920a77470e362790f4077931262bab8a63827ba66f27f7b3108c17b6f46b266823b385680697fd57d23615c09a5a6b22ca5f8658b95a08f6d1cb10e
+EBUILD virtualbox-modules-6.0.16.ebuild 1484 BLAKE2B d477ab2b18bb21a0d24bfac1cc2e81e0ca3dae9b9b1ce4442d14b3a8aab2c98e638118d51b43e24d972c1e72afb9836dbdf570ddbca1827ce949afc4eaff527e SHA512 b45be21e1f33dca217c4d4b38d742a4c937c75aeb75596c790122ceea0212e2f054444e77e63ee97e318e4f02f3f19403d071447b84333669334e298a2ddf624
+EBUILD virtualbox-modules-6.1.0.ebuild 1383 BLAKE2B 49ec09e740e17cf56540b68de9566518411562e638eb9bbe44f76edfc08743c270e14fb34249d14fba6407701cca29e16d23af20af6e51003db45f3d34437fb1 SHA512 dc43c637e81df020878240a9122ced15c5b53276df1379e1d87c6c6b0c365098a1058e05c3bcd02950a6dc5bbb8063b626a20a761365db07d3c48987398e2e7e
+EBUILD virtualbox-modules-6.1.2.ebuild 1445 BLAKE2B 81a87a298473d95592e4e462eb6c6c3bac473c432b1c35afa2e3780ccfb7895f6c1459d423496565605143cc69bf447f62f176d336fbdcb91002b8421e53db33 SHA512 eab1130033e8ce3cc8900d23260c97d963ebd6b5fe3a10bcad6320e454307350ed17e13d14085edb425d8226240c1648a5cd1b5a63887c3988a085ae9ee4ebe5
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild
index c0ab27d0eef5..a5f5de5da3b1 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: the tarball here is just the kernel modules split out of the binary
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod user
+inherit linux-mod toolchain-funcs user
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.34.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.34.ebuild
index c4b01a1b3f96..db660e592340 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.34.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: the tarball here is just the kernel modules split out of the binary
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod user
+inherit linux-mod toolchain-funcs user
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.36.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.36.ebuild
index 0f3180482f1f..b19665b4c8cb 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.36.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.36.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod user
+inherit linux-mod toolchain-funcs user
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild
index e98eef5b938f..fc87286d6f93 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: the tarball here is just the kernel modules split out of the binary
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod user
+inherit linux-mod toolchain-funcs user
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild
index 732a710260d6..273b3fee8640 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod user
+inherit linux-mod toolchain-funcs user
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.0.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.0.ebuild
index 4671dc2ac654..d725a300fd15 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.0.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: the tarball here is just the kernel modules split out of the binary
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod user
+inherit linux-mod toolchain-funcs user
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.2.ebuild
index 1ebd52459dd1..79fd2c9e0fc5 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.2.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.2.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod user
+inherit linux-mod toolchain-funcs user
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 6317e0c7fd7b..dd88c38991e8 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -10,10 +10,10 @@ DIST wine-staging-4.20.tar.gz 9899451 BLAKE2B a90a71f8f68874822c7326eb13cd26e66d
 DIST wine-staging-4.21.tar.gz 9904765 BLAKE2B 43f15cd96c7f5ca9cf5aad120c73a3aa534dce33797a4a4e707bea668cfc93e077ad112055dc428263775a30c6447620eed8650a9828ac487bf36c6490a7b73d SHA512 0c6c32f86d252f827ebb8d5df2b046c4f0a49aa7c0ca47939b33844786e561d5f676db1e199ec3cd9969757985f66b865099061f5e77234c3aabd4fd29d3a063
 DIST wine-staging-5.0.tar.gz 9942644 BLAKE2B e5d040ae903c6e982c961db1c7c30cfbf7245f00cd0df7c10ceb182c5227f5a555f1a41b24eca982a12b4981edee937cfa5079e6c6fec378d475fca3057cbb7c SHA512 36849fc2c848db9949982619c4544b56468012a1f086cc92eb3e2027377c58c3c24daf508149e0e34a70e6b283edfd80833dc2f346c75f0be69f1fb2c5999cd6
 DIST wine-staging-5.1.tar.gz 9924758 BLAKE2B 44a5710c126a1ea0a21dbac21826d2513191d79cb96f4a22adc5e6823d28b214d81af8f536914d4434402b5e2b70f89a25e2049cf12cbbde3f31ae2bc3bafab5 SHA512 ebb9bf0a0a3c7f108fff8b32ca79124d1da410fbfb320ad3298f3d92fabeb9ca81de6a4fefac344948a70c49771ffa3f0dc30de2ee6d6f61d158ed87a206a14e
-EBUILD wine-staging-4.19.ebuild 20185 BLAKE2B 026f4177a87d74d44099f8fbb4b12bb00ae84ba09fe27c8c371af4cb74f57b009ff50fc110e4834c2cc1039cccd652feca8607bae87f2fa4c5c4784a642e5907 SHA512 38cbf199cf69ad6eea696944676e6ebac5a8c4deaaa4c2b5f5cfb2c850ca4e3b7fb2a22c1bfba5493edee8b0c0bd8277345b115e9bcefa960b51dea616736b70
-EBUILD wine-staging-4.20.ebuild 20185 BLAKE2B 10e08743d08d98fb2ee5b4aa5afe3eada3c9ad45851cc84108f89a770024206ce1f0da2aac0609089004322cdbe33a94d5707e11be7a5246bd1009b8aeea088f SHA512 2604573ff2f999397d6810e18cb0e224fec38f0124f10025979e090ec0c817b942c71e60b958eabeb312f97db09d18dc2ce66a478ee1cdf9f309fab87117bdfc
-EBUILD wine-staging-4.21.ebuild 20185 BLAKE2B 10e08743d08d98fb2ee5b4aa5afe3eada3c9ad45851cc84108f89a770024206ce1f0da2aac0609089004322cdbe33a94d5707e11be7a5246bd1009b8aeea088f SHA512 2604573ff2f999397d6810e18cb0e224fec38f0124f10025979e090ec0c817b942c71e60b958eabeb312f97db09d18dc2ce66a478ee1cdf9f309fab87117bdfc
-EBUILD wine-staging-5.0.ebuild 20187 BLAKE2B 8ad70f51acbf6a0569db22a2c54e9a9ef91da4e1a635b198e8cdd3fba08b6d9903c8b9bcfdc046a2a0a663ddc93060ed25b5bc1fb21db03aedfaec5f784d5964 SHA512 f9435ab005625ae5a25e6e461d52b14e3776842c7171803033c38e77eb480d20b8c3d59460925c03c4067ee990c4e0f50437c2f427f5f708684145c14067443e
-EBUILD wine-staging-5.1.ebuild 20187 BLAKE2B a68cb0a0ac75f0f0427f06cbec7e7378070d26e274bdd2d0b9c1421e373396511db627ea39ef63ab33c6909e193b820967743e96698500bacf3f6e7d2cb4cf79 SHA512 85ad40e65852e30346326824f6b644c567d558453afd1ff1ad6a6cc3bd41b844419977e8a532cc9e2e70f0211aeaa47cac965f4afce3427464e74dddd117913e
-EBUILD wine-staging-9999.ebuild 20187 BLAKE2B a68cb0a0ac75f0f0427f06cbec7e7378070d26e274bdd2d0b9c1421e373396511db627ea39ef63ab33c6909e193b820967743e96698500bacf3f6e7d2cb4cf79 SHA512 85ad40e65852e30346326824f6b644c567d558453afd1ff1ad6a6cc3bd41b844419977e8a532cc9e2e70f0211aeaa47cac965f4afce3427464e74dddd117913e
+EBUILD wine-staging-4.19.ebuild 20193 BLAKE2B 028952f3d21da0165519568dd03411e3182a006b6bd31071d6685cc8e6e1d82f7aa83c5a39e341e0e28adc8437b5689edade377be4c549cb3064fb8b634831ff SHA512 7da84829d68291bb7b28eedfe7aea1cf44287ba1ed63bfb66f5f65632b49f1a5be5761959e19631f1237aae0a56d681115913b225779cc1dd60017cc90c3197a
+EBUILD wine-staging-4.20.ebuild 20193 BLAKE2B 2346171e0c1682cbdfbb0ac3cd37180444caa105ea89aadb11de0fb00e60bb2869a26d89aab1c78ec0501a4740cc95058fb967598a1e8c4c7485347a1d864f4e SHA512 a6022fc5ad30738e7d4714c3612508757adf0dd58d5de0631dd96ca85be8390d317df8a1102d67cef15ffec104aff475634a909d04f5eecf97659f90148f6680
+EBUILD wine-staging-4.21.ebuild 20193 BLAKE2B 2346171e0c1682cbdfbb0ac3cd37180444caa105ea89aadb11de0fb00e60bb2869a26d89aab1c78ec0501a4740cc95058fb967598a1e8c4c7485347a1d864f4e SHA512 a6022fc5ad30738e7d4714c3612508757adf0dd58d5de0631dd96ca85be8390d317df8a1102d67cef15ffec104aff475634a909d04f5eecf97659f90148f6680
+EBUILD wine-staging-5.0.ebuild 20195 BLAKE2B dacc7fab1b76484066226092bb7e138c63182c8764d4262ad6b9ccbd94fbadb36c38991260b6ff686e5e8bba4f98c98a2be0216bd94f6667b9f16f526ea757c8 SHA512 c8fd23d292a4ddad9b8b24236eb8de66e8051d1ba646b5c4ff9c3cc58ea9179ab486388c7afa4b4e3fe5893471598c8f609bf056e26b743477e7c9f0caa074df
+EBUILD wine-staging-5.1.ebuild 20195 BLAKE2B 8955d3c3a6f2bcb5145a938c8e52302210688601dbe4c6802d42867ee36177e0420951e480e6cfd5c7390cae64355f1e577d6e4656c85cc6fedb5dc9ea19d7fd SHA512 d492235b3fa2fa8247b10e82c1d17b6765a0b90c5c35aa53619e087f1b2502e8d2822afcc9744800dba001e3ce0a072119c068cdec10ad23acb9218ab26c3511
+EBUILD wine-staging-9999.ebuild 20195 BLAKE2B 8955d3c3a6f2bcb5145a938c8e52302210688601dbe4c6802d42867ee36177e0420951e480e6cfd5c7390cae64355f1e577d6e4656c85cc6fedb5dc9ea19d7fd SHA512 d492235b3fa2fa8247b10e82c1d17b6765a0b90c5c35aa53619e087f1b2502e8d2822afcc9744800dba001e3ce0a072119c068cdec10ad23acb9218ab26c3511
 MISC metadata.xml 3627 BLAKE2B 42dd4bb0f3127c1f7403c62e9999900915d86692e571ad4ecde63362d7327ecdaa5ee3d68206b54ad7bd858ccac9049f5c172fc9faf2cadc6af5209598883bd9 SHA512 02fab3eae9d3eb21fc80c0d4950902aacebf0306b99447906760053247e2b0e5bc407b7ec52a2df46de0d3a96d3f6e543a9e94c7878bda115a13fde1d98955f6
diff --git a/app-emulation/wine-staging/wine-staging-4.19.ebuild b/app-emulation/wine-staging/wine-staging-4.19.ebuild
index 4376738049f0..f9bb56131a89 100644
--- a/app-emulation/wine-staging/wine-staging-4.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-4.20.ebuild b/app-emulation/wine-staging/wine-staging-4.20.ebuild
index 018e0d7d63fe..4332ff005a6a 100644
--- a/app-emulation/wine-staging/wine-staging-4.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-4.21.ebuild b/app-emulation/wine-staging/wine-staging-4.21.ebuild
index 018e0d7d63fe..4332ff005a6a 100644
--- a/app-emulation/wine-staging/wine-staging-4.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-5.0.ebuild b/app-emulation/wine-staging/wine-staging-5.0.ebuild
index 6d25f47f6ab0..d34f7cf13bf0 100644
--- a/app-emulation/wine-staging/wine-staging-5.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-5.1.ebuild b/app-emulation/wine-staging/wine-staging-5.1.ebuild
index 1de280d8335c..1ca4f55540c5 100644
--- a/app-emulation/wine-staging/wine-staging-5.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 1de280d8335c..1ca4f55540c5 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index b1b7e0aac601..3f4687191ce0 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -10,14 +10,14 @@ DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d96
 DIST wine-4.21.tar.xz 22395844 BLAKE2B 1b9c1fd8f4a1ff0527b4d4a02b1dfffa4f6887f2f261b7d4b5afa12e65a8ea18f544c91397cfc71039db7736d33cd0219aaab82cc4564ecd0cb9c74a2e39d6e5 SHA512 f962e47577db2de4e74022b8d51e81e30a004f98b37d8eee5889334271f013123e3ff53e5ac1416c2dd93ec90bee8a2d300b3842c20124df99ef067ac5c72f53
 DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83
 DIST wine-5.1.tar.xz 22500180 BLAKE2B bf77f24e4be2402afd083c28624e41761d63c1248c314870e0c5a6879fb1393992fe9d99bcafcea0a91599500d745a3ad199e31e857590707f026f1cf740ad31 SHA512 b842b533884f15a8fb71373258671d74aee997d9ed9ee0fb36f945cd2006b494f6cc6c91a8ca47e0ea5b0b39b108f2c4f155918823a7ddf3cd44b4e26ede9171
-EBUILD wine-vanilla-4.0.1.ebuild 17333 BLAKE2B de24979de56828f96c53353f02cc44940e7f524eb76bdf9a832d08e21d04eb8e7f3f5a174f20f04e3dcba24a53414822987805ea046066da05824a04a6aab486 SHA512 f5fde5c2ab86543c9e0dfbec9d1e0234c5b0a0e66cf71201a94c7b7be82062c7b2551d6ab4719f7e371d49d22bdaf2fe02b190d145c79923f3024d28b87e0f97
-EBUILD wine-vanilla-4.0.2.ebuild 17333 BLAKE2B de24979de56828f96c53353f02cc44940e7f524eb76bdf9a832d08e21d04eb8e7f3f5a174f20f04e3dcba24a53414822987805ea046066da05824a04a6aab486 SHA512 f5fde5c2ab86543c9e0dfbec9d1e0234c5b0a0e66cf71201a94c7b7be82062c7b2551d6ab4719f7e371d49d22bdaf2fe02b190d145c79923f3024d28b87e0f97
-EBUILD wine-vanilla-4.0.3.ebuild 17335 BLAKE2B 6c313ee907ba258f737b19a9e2c1ab3bf04555649c558d569d7372170704ce2134b6a9d009cfb0e8040ebaf7d50a68c5e8a44fd109557a0e0d77c8293fa0f8ff SHA512 e8b8fae470d371aae55cd69677dadf14da758443f4be3ca19a9782ae8ec51696a1c7e113be38ffeef3270160d155c383daf6482e283def2ccebb5df0cfd3a803
-EBUILD wine-vanilla-4.0.ebuild 17330 BLAKE2B 1dbe6a5dc59af64bfebf087f84efdcad0a1ad56b3f29e567926d4f036ed36ba53bed1ad5072363cde853b18e1ecc848a2804e716b35e85f0ea04faf7e7306d82 SHA512 5535dd99e33a4895d8e6cc9a42c4fe47ccc69e44ff7270e0ebd89701cee1262a1270d2a781f0ac35ef708d9e1c194c02e43c98b1fec7895bd6f83d4b88c02353
-EBUILD wine-vanilla-4.19.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
-EBUILD wine-vanilla-4.20.ebuild 17552 BLAKE2B 49ff2aabb9bb739ab4e407283c567800913cab97e65fac9219c429dca7112e670643f471f92945f0962b1f78c2e50f75dad68ed883070280cb122700ec8b0493 SHA512 13d9f9e437b2bbda1ae93519b3b8421834f3d9eeb4849b4af065ffe391d30ca138eec5c442d199d506b1eb719519746a3e75b71963eb20377925ed5661fb2c1d
-EBUILD wine-vanilla-4.21.ebuild 17552 BLAKE2B 49ff2aabb9bb739ab4e407283c567800913cab97e65fac9219c429dca7112e670643f471f92945f0962b1f78c2e50f75dad68ed883070280cb122700ec8b0493 SHA512 13d9f9e437b2bbda1ae93519b3b8421834f3d9eeb4849b4af065ffe391d30ca138eec5c442d199d506b1eb719519746a3e75b71963eb20377925ed5661fb2c1d
-EBUILD wine-vanilla-5.0.ebuild 17554 BLAKE2B 4fb5c237a16645195516f980e6a0bb96a9a263423b7489b8f425326a65ab5b06a75fc705862940220bc762dbaba5816eb340ef9f8427f08a2a6678fdb05b9429 SHA512 33011fd9ba031978b4351f8ff5b8eeffa692062df4a511fb105231e493742d55c0430a256551cc08cc8caf9c546de38eb0a4e1fe1ee98db0a391233b231a5d1c
-EBUILD wine-vanilla-5.1.ebuild 17554 BLAKE2B 179a429261514a73ae4fe6bf8b34fab85209e4366b6c97f25ad9450698612e041ae938454876d5f6731543d0e0492144f2b98fb0fbefeb0ac71ddb8ea3eb289c SHA512 200d007480309c951f6d3dc973065e296c43c7e1fd4dd82d1deff9c2307d897e9a87536178aa4b75cb3b2ca021fa2262386ee33a9404136ff818387c5f497d22
-EBUILD wine-vanilla-9999.ebuild 17554 BLAKE2B 179a429261514a73ae4fe6bf8b34fab85209e4366b6c97f25ad9450698612e041ae938454876d5f6731543d0e0492144f2b98fb0fbefeb0ac71ddb8ea3eb289c SHA512 200d007480309c951f6d3dc973065e296c43c7e1fd4dd82d1deff9c2307d897e9a87536178aa4b75cb3b2ca021fa2262386ee33a9404136ff818387c5f497d22
+EBUILD wine-vanilla-4.0.1.ebuild 17341 BLAKE2B 1f2f32e3700cc344020182b55da4ee029dfebebadeb1d05d61d5cb4181feedd39d339cae2b7eabb0f91746dcc7e34c8cde1c4ae021c46f5d28cd64a6b3e673b1 SHA512 c03b8305a06c53d0bd073177cca5b342bcfea84a4b5c2d84ff74bfd957e61cd68582710cbc67f937723e2d16603866ebdda2fb36102d44544713edce9fb7440e
+EBUILD wine-vanilla-4.0.2.ebuild 17341 BLAKE2B 1f2f32e3700cc344020182b55da4ee029dfebebadeb1d05d61d5cb4181feedd39d339cae2b7eabb0f91746dcc7e34c8cde1c4ae021c46f5d28cd64a6b3e673b1 SHA512 c03b8305a06c53d0bd073177cca5b342bcfea84a4b5c2d84ff74bfd957e61cd68582710cbc67f937723e2d16603866ebdda2fb36102d44544713edce9fb7440e
+EBUILD wine-vanilla-4.0.3.ebuild 17343 BLAKE2B d9ba4bcfe18d936a7a55430a0825121bed49c5035686f99a1027e50826a9773b420febf2bfb43ee9ee56f50903c467cdd1d9f98dd7c22156298e02d210095caa SHA512 ae938f578a38a9a59d86039ecf0ed6b6e486e83da67c544996aed6fc1dd8b79b1e1ab23c4ffc550fa8475c5eb0c6370ba7e704cbf8c40cf9548a64b8206e0a4a
+EBUILD wine-vanilla-4.0.ebuild 17338 BLAKE2B 6ff4249d71a476f9091d8283a73d1ac59c6f5bce763df7ebdc914f53d08904e2f08267a552dc41484c31ef225035719a4b7a61fbc61a6b117869a8f32653a921 SHA512 871a995ecec28ff0eb8c043754d8fede16cc0c8dedb3e78296fff4956034fa19ba1c68c3d9bec1a82c41d7ea606952ae1773168f9560cce6f2425a97a51d3426
+EBUILD wine-vanilla-4.19.ebuild 17560 BLAKE2B c5e622bc679e860be31abcd4801333ecc21d809d619de2a03a57aa0e2a92b40934ce622b4c93ffbdde24432f4b96d258be4d21d883b350c3b273a46f4b244032 SHA512 940e9886c8f5589ff22f4d8377263458e3f3feb01174f12bd6fdf0a10a64cf9d5ab057088c0fedede9676e960f34a9655b066fdec8197b0f4d214fb1b4bb18bd
+EBUILD wine-vanilla-4.20.ebuild 17560 BLAKE2B ab29a23c532e9cd86a08bac6b2e5b4041317e95025ee3bd951a933caad16da4d2cd0d3787e6d7ab8b6aefe19d84c59dcf0d34ddb404ecc61272da5003dd74821 SHA512 80e07333ca0e80e6af6d68294896ffa21c0fdc5da6da16167235c9ab32a5756402f85e8532bb3c5b5635e2d1d11e9fda44cbe46450af505e1dbc0040afa0796a
+EBUILD wine-vanilla-4.21.ebuild 17560 BLAKE2B ab29a23c532e9cd86a08bac6b2e5b4041317e95025ee3bd951a933caad16da4d2cd0d3787e6d7ab8b6aefe19d84c59dcf0d34ddb404ecc61272da5003dd74821 SHA512 80e07333ca0e80e6af6d68294896ffa21c0fdc5da6da16167235c9ab32a5756402f85e8532bb3c5b5635e2d1d11e9fda44cbe46450af505e1dbc0040afa0796a
+EBUILD wine-vanilla-5.0.ebuild 17562 BLAKE2B 2e2787a3a414e206a464be85f56253ebf52064c3778449ef9556d63b06022aa2a5720d346a3f8c2698ed515d0c17355d20edfdfce85dc0c4f724322f3c156d87 SHA512 3fd536986fd019b83e2632ae7b1eaca0a39c839a0bef23fa0a229b3b957dacbe4de5e5ecbfab7f4b2c565e9a215d4e663ef9ec9e683f99b0b4d28d7a69d4edb4
+EBUILD wine-vanilla-5.1.ebuild 17562 BLAKE2B dd2351a990fcdd1e1e0a10df103a8b0bc65b38a732939d8e2baf519150b55ff6ae9524eeddfa8c6e84ff43f526c6dbb45fbe371c2445aaac8a673a79385ce636 SHA512 47922bdb6e1a926d7143ef33e4376d7017ec6e84070fc33b67842a245d730a11d2f92d1df320b35a0ee65667198e69ee17f59e554cb01e77f41eb1c0d1e4b973
+EBUILD wine-vanilla-9999.ebuild 17562 BLAKE2B dd2351a990fcdd1e1e0a10df103a8b0bc65b38a732939d8e2baf519150b55ff6ae9524eeddfa8c6e84ff43f526c6dbb45fbe371c2445aaac8a673a79385ce636 SHA512 47922bdb6e1a926d7143ef33e4376d7017ec6e84070fc33b67842a245d730a11d2f92d1df320b35a0ee65667198e69ee17f59e554cb01e77f41eb1c0d1e4b973
 MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
index fde52036375d..40099e36b324 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
index fde52036375d..40099e36b324 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
index 78f6dd16ff0e..57ac9d517e4c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
index 70e34aebbe37..dd594852087f 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
index d502188edebb..438bc6d053ab 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
index ecb350c90718..6478ce872398 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
index ecb350c90718..6478ce872398 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
index 2c8da9a04c68..18bdbc0c756b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
index ab4b0c11da26..f43c8882d2fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index ab4b0c11da26..f43c8882d2fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-emulation/x48/Manifest b/app-emulation/x48/Manifest
index 5bdd36c3adc1..ce3b4d7bee67 100644
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@@ -1,3 +1,3 @@
 DIST x48-0.6.4.tar.bz2 227991 BLAKE2B 8db2962860eeb161a8efc9d46730c71d95d0331157e3e2481a978385ad54b04b7a4eb601c68e7df966194b23e0cd04bed4e80511d22695bb7ccdd3959d8fd8d7 SHA512 60fdba1171a02e4a5f9bcefb29fff9398fdbda50553c3d3b952fab0b4ebf87b219d4615139ca3673b1c61ff6d6559aab3e93218334aa6cdb442d4861347138ce
-EBUILD x48-0.6.4-r2.ebuild 1676 BLAKE2B 14fe4767d819965151849f08db00e1bc60434ff869a27ca77f874d6d1149be1c1c44ba95abbb738d31d9ff3fc8e1012d9fd8e6ba899d8a1994a52d0a1cbc7250 SHA512 c96f5f1a7a5d8e53c85d850ebbc0017bb85d50e4152216fdf8842ecbc26156a7dbb7ea8d12b71971fe52d24bd25f859bffcc55ab93382b25c73ecd11ee4e5ed9
+EBUILD x48-0.6.4-r2.ebuild 1676 BLAKE2B 46821cd4366528a328e036922a5b1a5bfb3596a815b659b89aa8dc2746f08495ab9e387f0dce8a9281d5b64ff16051f7e7c90c034296683e4c0b4af5fea2b1a2 SHA512 a9c7c21741b50b7d81915dc305f4fb72d87e5d117af1a57c0abd04ed51c580bee0e52e3631d0906bf2aaa6beea8ebacc37f36839008e8dd75af1812d0d1e270e
 MISC metadata.xml 723 BLAKE2B 98911516312cc5d5617bbf9d6e33915608b30639c2354024cc74407888a699cf7464261fc7d40afad3fd6632ae39da74b5f90ede1bd51e491d0193c759d8ed07 SHA512 0de7f42012bc6624f1eca6d08c3807185f5fcd7b44a34fd701cd7af2ede5b0ab21f41b41fc7b784b3fe641b3b12b58ae412a2969679fbfcc1edbfd99b6e39685
diff --git a/app-emulation/x48/x48-0.6.4-r2.ebuild b/app-emulation/x48/x48-0.6.4-r2.ebuild
index 8fe14fec7d6c..dab6ac6de4a2 100644
--- a/app-emulation/x48/x48-0.6.4-r2.ebuild
+++ b/app-emulation/x48/x48-0.6.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-17 01:16:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-17 01:16:38 +0000
commit	53cba99042fa967e2a93da9f8db806fe2d035543 (patch)
tree	9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /app-emulation
parent	71deace00d1a2b091313fe137ab7092418c6f87c (diff)