Merge updates from master

47 files changed, 255 insertions, 97 deletions

diff --git a/dev-lang/qu-prolog/qu-prolog-10.6.ebuild b/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
index d5a646d9dd52..391648077ffb 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug doc examples pedro qt5 readline threads"
 
 RDEPEND="
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 300bb83d487d..0272b102308e 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,2 +1 @@
-DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
diff --git a/dev-libs/volume_key/files/volume_key-0.3.12-find_python3.patch b/dev-libs/volume_key/files/volume_key-0.3.12-find_python3.patch
new file mode 100644
index 000000000000..3f7d6da69366
--- /dev/null
+++ b/dev-libs/volume_key/files/volume_key-0.3.12-find_python3.patch
@@ -0,0 +1,27 @@
+From d64fcc43ad740c91f4f1e1a6827663b2485f127a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 7 Jan 2021 13:23:28 +0100
+Subject: [PATCH] configure.ac: Don't look for old python3 versions
+
+Gentoo-bug: https://bugs.gentoo.org/764230
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4eda5eb..2dce575 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,7 +101,7 @@ if test "x$use_python3" = xno; then
+ else
+     AC_MSG_RESULT([testing])
+     # Try to find Python 3 interpreter:
+-    AC_PATH_PROGS([PYTHON3], [python3.6 python3.5 python3 python], [no])
++    AC_PATH_PROGS([PYTHON3], [python3], [no])
+     if test "x$PYTHON3" != xno; then
+         AC_MSG_CHECKING([whether $PYTHON3 version is >= 3.5])
+         python3_found=old
+-- 
+2.30.0
+
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
index a1a62fa87da7..1ff596ac27b9 100644
--- a/dev-libs/volume_key/volume_key-0.3.11.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit python-single-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
 HOMEPAGE="https://pagure.io/volume_key"
@@ -13,9 +13,10 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -27,19 +28,34 @@ RDEPEND="
 	sys-apps/util-linux
 	sys-fs/cryptsetup:=
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	test? ( dev-libs/nss[utils] )
-	"
+"
 
-#RESTRICT="test" # possible gpgme issue
+PATCHES=(
+	"${FILESDIR}/${P}-support_higher_LUKS_versions.patch"
+	"${FILESDIR}/${PN}-0.3.12-find_python3.patch" #764230
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	default
+	eautoreconf #764230
+}
+
+src_configure() {
+	# --without-python disables python2
+	econf --without-python --with-python3
+}
+
 src_install() {
 	default
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	python_optimize
 }
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index 6ab07e7c28ba..b8222027e555 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/eyeD3/eyeD3-0.9.5.ebuild b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
index 61bdbd2adb89..83b4dab7ede7 100644
--- a/dev-python/eyeD3/eyeD3-0.9.5.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/filetype/filetype-1.0.7.ebuild b/dev-python/filetype/filetype-1.0.7.ebuild
index 3d833335e8a6..8e7925d81d44 100644
--- a/dev-python/filetype/filetype-1.0.7.ebuild
+++ b/dev-python/filetype/filetype-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 PATCHES=( "${FILESDIR}/${P}-examples.patch" )
 
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index f79e41f622b7..ac58fe5b04b5 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,2 +1 @@
-DIST geventhttpclient-1.4.4.tar.gz 57620 BLAKE2B 20b60cfa7e8221b050bfd95a6e23c2f3eee87c0df1e93171719c7ba1804e88c918471cdd01cf4c6020fb6d44d0a1b911ee09dd44cc1e150b5d18d6052f2904cf SHA512 c6a8580707f3178a3a55eb638b9e3f36f82aecbd8a5ce044f0b8c167d88ad2bec584275bed6b720a5f7a546b0ffd113bec28dd2e1ff4290c60f0b5e13542b737
 DIST geventhttpclient-1.4.5.tar.gz 58183 BLAKE2B 48d44048e7040552824ed19ac49c6dda41536ffded56bae0d942c06f111a327a1d571872f35f388853b479ea1aaa6de518f86e7ee72e362360492530ade65131 SHA512 9ffe00c79b145dab104e1dce336e072060f315d9bee880daf64b5f1f52e661d810dab9a60286320a7d30cf0e794465f201c039cc31fe7ec325cdb3a8350c9f7d
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.4-r1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.4-r1.ebuild
deleted file mode 100644
index 5a2873ff93cb..000000000000
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
-HOMEPAGE="https://github.com/gwik/geventhttpclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Skip SNI tests which require dpkt
-	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local skipped_tests=(
-		# Require dpkt
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
-	)
-	# Append to sys.path to avoid ImportError
-	# https://bugs.gentoo.org/667758
-	# Skip tests which require internet access
-	pytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
-		-m "not online" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pylast/pylast-4.0.0.ebuild b/dev-python/pylast/pylast-4.0.0.ebuild
index 1e4b885f9d02..972dee5a006e 100644
--- a/dev-python/pylast/pylast-4.0.0.ebuild
+++ b/dev-python/pylast/pylast-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
index 5e4eec45be71..e5da49b23670 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
 
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
index 0be5c87c224a..7355ffa222c5 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
 
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index f5a5a4276369..e0444eacc61a 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: linux-mod.eclass
@@ -144,9 +144,16 @@ esac
 	0) die "EAPI=${EAPI} is not supported with MODULES_OPTIONAL_USE_IUSE_DEFAULT due to lack of IUSE defaults" ;;
 esac
 
-IUSE="kernel_linux ${MODULES_OPTIONAL_USE:+${_modules_optional_use_iuse_default}}${MODULES_OPTIONAL_USE}"
+IUSE="kernel_linux dist-kernel
+	${MODULES_OPTIONAL_USE:+${_modules_optional_use_iuse_default}}${MODULES_OPTIONAL_USE}"
 SLOT="0"
-RDEPEND="${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (} kernel_linux? ( sys-apps/kmod[tools] ) ${MODULES_OPTIONAL_USE:+)}"
+RDEPEND="
+	${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (}
+		kernel_linux? (
+			sys-apps/kmod[tools]
+			dist-kernel? ( virtual/dist-kernel:= )
+		)
+	${MODULES_OPTIONAL_USE:+)}"
 DEPEND="${RDEPEND}
     ${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (}
 	sys-apps/sed
diff --git a/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild
index 3bb2842fbb99..4e11e85be9a4 100644
--- a/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild
@@ -7,6 +7,7 @@ ECM_HANDBOOK="forceoptional"
 KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Network-enabled task manager and system monitor"
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 2334ab319381..30c8a9b41147 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
@@ -6,6 +6,10 @@
 
 # SECTION: Unmask
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernels are supported here.
+-dist-kernel
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl works on amd64
 -mkl
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index b83b8507d91c..ba88ea41c2eb 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernel rebuilds are supported on stable yet.
+dist-kernel
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl is not stable, needs online registration to even run pkg_setup
 mkl
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 5af05ca0a697..600ca159c4e2 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -arm
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernels are supported here.
+-dist-kernel
+
 # Unmask arm arch specific flags
 -cpu_flags_arm_iwmmxt
 -cpu_flags_arm_iwmmxt2
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index d969a69e4d3a..0edb74fb7acf 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernel rebuilds are supported on stable yet.
+dist-kernel
+
 # Sam James <sam@gentoo.org> (2020-12-22)
 # Not yet stable
 lirc
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 238d22b897cb..3f63db907c71 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -arm64
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernels are supported here.
+-dist-kernel
+
 # Sam James <sam@gentoo.org> (2020-10-08)
 # PyPy3 works on arm64
 -python_targets_pypy3
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 4afbfad41647..8ba26c22d2c4 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernel rebuilds are supported on stable yet.
+dist-kernel
+
 # Sam James <sam@gentoo.org> (2020-12-23)
 # dev-lang/luajit is not yet stable
 lua_single_target_luajit
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index ba124ae0487a..887839c48153 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernels are not supported on all architectures.
+dist-kernel
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl is only supported on specific architectures
 mkl
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 784790b1ea86..c42fe27f4868 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -17,6 +17,7 @@
 # little-endian power8 ppc64 configs are provided
 -sys-kernel/gentoo-kernel
 -sys-kernel/vanilla-kernel
+-virtual/dist-kernel
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-25)
 # libva unmasked on little-endian profile
diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask
index abc4d0b9c1bb..e0ecc03fcafd 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernels are supported here.
+-dist-kernel
+
 # Georgy Yakovlev <gyakovlev@gentoo.org (2020-10-16)
 # dev-qt/qtwebengine works on ppc64le
 -webengine
diff --git a/profiles/arch/powerpc/ppc64/64le/use.stable.mask b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
index 1cda5eff1330..4efce43db197 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
@@ -1,6 +1,10 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernel rebuilds are supported on stable yet.
+dist-kernel
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-21)
 # works, but deps not stable yet
 vaapi
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index f36237c2c003..f78c971cc95f 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -16,6 +16,7 @@ dev-java/openjfx:11
 # however users can unmask and use savedconfig feature
 sys-kernel/gentoo-kernel
 sys-kernel/vanilla-kernel
+virtual/dist-kernel
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-21)
 # buggy on big-endian
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 4b6386ca8b2b..8a86d7306ed6 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -x86
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernels are supported here.
+-dist-kernel
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl works on x86
 -mkl
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 0e1538cf8877..3b3d1cfe3b17 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-07)
+# Prebuilt kernel rebuilds are supported on stable yet.
+dist-kernel
+
 # Sam James <sam@gentoo.org> (2020-11-10)
 # media-gfx/openvdb is not stable on x86
 # ... and has failing tests right now anyway
diff --git a/profiles/use.desc b/profiles/use.desc
index e51db5982020..6ede79cb7845 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Keep them sorted
@@ -62,6 +62,7 @@ dbus - Enable dbus support for anything that needs it (gpsd, gnomemeeting, etc)
 debug - Enable extra debug codepaths, like asserts and extra output. If you want to get meaningful backtraces see https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Backtraces
 dedicated - Add support for dedicated game servers (some packages do not provide clients and servers at the same time)
 dga - Add DGA (Direct Graphic Access) support for X
+dist-kernel - Enable subslot rebuilds on Distribution Kernel upgrades
 djvu - Support DjVu, a PDF-like document format esp. suited for scanned documents
 doc - Add extra documentation (API, Javadoc, etc). It is recommended to enable per package instead of globally
 dri - Enable direct rendering: used for accelerated 3D and some 2D, like DMA
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4-r1.ebuild
index 1b430cf56222..8ff91a4ba931 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,8 @@ RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 QA_PREBUILT='*'
 
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4.ebuild
index 68ca59b57351..89b5eb86defb 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,8 @@ RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 QA_PREBUILT='*'
 
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.5.ebuild
index e1451b5eabd6..89b5eb86defb 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.5.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.5.ebuild
@@ -26,6 +26,8 @@ RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 QA_PREBUILT='*'
 
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86-r1.ebuild
index 2378adc3f352..cced2ee66bff 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,8 @@ RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 QA_PREBUILT='*'
 
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86.ebuild
index d6e61fa69369..6021b37ab4b4 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,8 @@ RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 QA_PREBUILT='*'
 
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.87.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.87.ebuild
index d03c16da9cb9..6021b37ab4b4 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.87.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.87.ebuild
@@ -26,6 +26,8 @@ RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel:${SLOT}
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 QA_PREBUILT='*'
 
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild
index 5ec7b92ee625..4ce45ac9ba10 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,8 @@ RDEPEND="
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
 BDEPEND="
 	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 src_prepare() {
 	local PATCHES=(
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.5.ebuild
index 66323fcda082..4ce45ac9ba10 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.5.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.5.ebuild
@@ -47,6 +47,8 @@ RDEPEND="
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
 BDEPEND="
 	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 src_prepare() {
 	local PATCHES=(
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
index 0c806189a34d..8b2996c9a517 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,6 +46,8 @@ RDEPEND="
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
 BDEPEND="
 	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 pkg_pretend() {
 	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.87.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.87.ebuild
index 9b7446abdea3..8b2996c9a517 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.87.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.87.ebuild
@@ -46,6 +46,8 @@ RDEPEND="
 	!sys-kernel/vanilla-kernel-bin:${SLOT}"
 BDEPEND="
 	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 pkg_pretend() {
 	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild
index cc953811ce28..e7583aa0f3ea 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,6 +48,8 @@ RDEPEND="
 BDEPEND="
 	debug? ( dev-util/dwarves )
 	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
 
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.5.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.5.ebuild
index 1d4db38cb8a8..e7583aa0f3ea 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.5.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.5.ebuild
@@ -48,6 +48,8 @@ RDEPEND="
 BDEPEND="
 	debug? ( dev-util/dwarves )
 	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
 
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild
index 7f4ea0861252..70f1e31be56d 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,6 +46,8 @@ RDEPEND="
 BDEPEND="
 	debug? ( dev-util/dwarves )
 	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
 
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.87.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.87.ebuild
index ce8b37632c4e..70f1e31be56d 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.87.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.87.ebuild
@@ -46,6 +46,8 @@ RDEPEND="
 BDEPEND="
 	debug? ( dev-util/dwarves )
 	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
 
diff --git a/virtual/dist-kernel/dist-kernel-5.10.4.ebuild b/virtual/dist-kernel/dist-kernel-5.10.4.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.5.ebuild b/virtual/dist-kernel/dist-kernel-5.10.5.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.86.ebuild b/virtual/dist-kernel/dist-kernel-5.4.86.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.86.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.87.ebuild b/virtual/dist-kernel/dist-kernel-5.4.87.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.87.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/metadata.xml b/virtual/dist-kernel/metadata.xml
new file mode 100644
index 000000000000..20e07cdc2be9
--- /dev/null
+++ b/virtual/dist-kernel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>dist-kernel@gentoo.org</email>
+		<name>Distribution Kernel Project</name>
+	</maintainer>
+</pkgmetadata>