gentoo resync : 08.01.2021

5 files changed, 220 insertions, 4 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 48e2073eb137..2d32405c9a73 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -12,6 +12,8 @@ DIST linux-5.10.3.tar.sign 989 BLAKE2B 24cb9883b4006c91e4fce03e5a35db072b95622a9
 DIST linux-5.10.3.tar.xz 116591740 BLAKE2B 0a8603991e9de4b50c2a0c9b7f96d2d169a41567f81bfc8bfd3d41edd45a948d2a672236c9651d701f16f0cb619c39996c9cc883647bacb2cefb33100e072d98 SHA512 3b1fb09f5ffd53e36eaceda6aa97c976d7fd2ffda4e13ce05ecf625c32bbdc0643eee7bc4e43230482dcd328a57669d6d6c7551fa4592d5f3c1a8924bb5a012b
 DIST linux-5.10.4.tar.sign 989 BLAKE2B d29e97723b686c4ef8fcb4b087908cba5ff73b42c08a78d8e042c18e3b44edf926b05385b90d586cc00a6b8913854e4e06c362c9e63ad4fd2563f072c3faf179 SHA512 c4c93f6ed2052180669760516427378aa361dd32f06e94a8735b298bb1abb7f7101efc15b6203a0f1a0e71a7ffbf949ccd21d00a32b3f02cc0b1ea3eefdf6a68
 DIST linux-5.10.4.tar.xz 116612908 BLAKE2B 57f6d719451aacfd298452703ae02e6188885500e8cdf18fffa6b9967b0934a23cd378ab4c49b76ccb2f7a9012d6aa7ff1349d488cb31e40924be2f27b244cec SHA512 aab782786cc06b5f1872bbb88c4f55a73d222f8ecf1ab8f5b7d96de2160b11b4407e02a44b206d2c00e395ba0662aa5a038b8e10d185621a0b33c576b523b490
+DIST linux-5.10.5.tar.sign 989 BLAKE2B 376175dc06bdef26ba4d6ad1503d983cd2b49e4b49a5d575fda0f492ff7ad57a05b8485bea452804f13263f0e6d50e63021d7d67fc0cc18429b6b09942965bc7 SHA512 f917e71683247f8c04045c41ea50dc6b49aa17434d12d82c698b1153e9c625c7e6cf7aadd0d9a7f83bf743d26bd879228c8fdc101bc46838a6f075e7e646021c
+DIST linux-5.10.5.tar.xz 116604852 BLAKE2B 25b71eb091ea6526a7ebfef5bc201b76d612e5138b6b3caa708f90e76196c30d1865c223e2084a118a3883a9620d47c9576b1ab7db2c8d9c0f204dda7c640eab SHA512 f3462c8ee26c34a8ee344fa146f6f3aeceab03ef1cff83f3b831251f52aa70823d67085030a37b7fea21b305e20bcd7616d16557a7b5bd757b8f84d9805413da
 DIST linux-5.4.80.tar.sign 989 BLAKE2B 7d0fa889c353c83eeb38d4868de3736baf6dd668db2b6660472b85dd6f9fffa83350954da80bd8e6441b54aa15324d68734ca863b0b1980b92a7b3a58073037e SHA512 54b7a124065020a69702fbc4ec82359c728ba32e8cafb7ba083d12974914c8309cc6b33b85769d87f91cbb2583b7c0a20d019d1b3808f32f07dda0ec795e8906
 DIST linux-5.4.80.tar.xz 109626784 BLAKE2B b395b0326162ca6d9b9a59966e641eb1df63dbd402c8287b276c915478819132e201ae68fcbab2fbae353591ff4f38951a643b6a2e1283a551ab8464c21a2abc SHA512 ba400e61ce4e55a8bf391b45df15bb71f43f42de1f2cf2c19468f503b102ec1269589908fa186bfff946baf031ae1531f30ab420605a078439508898e5fdfb37
 DIST linux-5.4.83.tar.sign 989 BLAKE2B 0c1c9737b51eb02747146498475436682fec4d0e97c6e90e840682878eff34aeffa6970eac0ce117ce18bb8ca2e15fc1a9b0bfb83e021b710fa10dd713437c32 SHA512 be2564571dc109611e802d5dfe1d69339d375bb01259d46888c18ef03979401d9943721131c10609a8a07f14cfe0b990e558e15c7d89a2eccc71e86d620cf4c0
@@ -20,10 +22,14 @@ DIST linux-5.4.85.tar.sign 989 BLAKE2B 90ecac8f32d7c22af508b3233768065cc4626b670
 DIST linux-5.4.85.tar.xz 109636476 BLAKE2B adc66aa3a2a901ed4d7450cc46efe4cef48536e03d19519b9f3f7015930489a9499b60ab8b66624bb54cf5c25aee0d3c39023c979615c0adf3edb5c89f5d595b SHA512 a1b188952ba81d9c4a19442035f9595292b443632fc17b1d976d2de11626287bdb75db1f50858c6224cff8665e3501619799c199c19b32283e7b6ea5683fd1a5
 DIST linux-5.4.86.tar.sign 989 BLAKE2B 03cd85aecb55488abcd7c09ce0f2d4a83e99267fe9ee1e36aaf66e4ea947275e373ac1f3e95f11049da58f760cc38ec240ee777aadc825f75aabce3645f00022 SHA512 b65b4a2ea90c2e907b247254dd73529e4098158ed29d9b31dba9c1d4a0e14f2e9b36c9e4870e764e0bc7bd0c884c40e9f420fbf43aedd75f21794cfca04b705e
 DIST linux-5.4.86.tar.xz 109648392 BLAKE2B 6c46810bce8902794849dfbab686b9c63ceea726d0a58351901d67c50370ed75d325095c0f426706c664f81a315621adae2f7080752e40e5a29b67ea67626005 SHA512 3cb6d81434ed7c340f67530f1bc9cadff81a916ecccc421833e3c70de0c72d1b3790c0ccae228a0ead591b2ccf1abf7fec0299565590e7f08889b509af141952
+DIST linux-5.4.87.tar.sign 989 BLAKE2B e3cc133ad3edc6d9cc8e0f5aa8d1405c5fd7d37d3b34bac28404d9a75a6fa0d4d8d06c4914fa6606f5d80a0ef742a02422a45cb727fb9d9824a37ad002459337 SHA512 4c2a83b8aba30199b11e5ee1f7546aa0572b7121867d23ae8635868bec8ba86ea0473908fdf08246a589e353e4088c9065d28c6210a29be8e0dab9888b02e430
+DIST linux-5.4.87.tar.xz 109641324 BLAKE2B 0618c30298460d1d2de3062542782e8c3bf842fb36a0341391eb0e3bd9217b8478bef7474b9bb7dd4f6eaf360d215905b558326e9fabf887fb6a335a3c1ca4ab SHA512 6041678c79ec3568462a329b8ba0c1bd7f59bda594a621d597917a84838a394804da547b3b772416fbebcd59f5274761a40a52d22abb9820ea190d37bcb30b40
 EBUILD vanilla-kernel-5.10.3.ebuild 2778 BLAKE2B f047e1cffa32a41c20fb5cb8bfa67870c1bd8bac20cf706713748c669327f9591eaf77dd904bf5b0a8ea3515f3edb4d0cef12dfd015ebe32285533e7953ef96e SHA512 febf1c606719b510686363825c5de71456189450731566019c9f4a56c27c3a8abda17b607dcad648281034fd21dce5236b4863ba85740fdd6a876afe5d16b10e
-EBUILD vanilla-kernel-5.10.4.ebuild 2778 BLAKE2B f047e1cffa32a41c20fb5cb8bfa67870c1bd8bac20cf706713748c669327f9591eaf77dd904bf5b0a8ea3515f3edb4d0cef12dfd015ebe32285533e7953ef96e SHA512 febf1c606719b510686363825c5de71456189450731566019c9f4a56c27c3a8abda17b607dcad648281034fd21dce5236b4863ba85740fdd6a876afe5d16b10e
+EBUILD vanilla-kernel-5.10.4.ebuild 2823 BLAKE2B e423762ad9db59e020c8833bacca256851c5a05a55c7c07665e96992836028d5b8512b923df6764b7721e496a59af6428b992c3a52542433497d8e57e413d2af SHA512 bbcdabd99f5c625240f89491372db4fc3558162cde014415d3e8d1ad9dde02ca5253ffb6db590f4acee90972ce35ea9fa45c65f7f037f6d96ed566d5904486d7
+EBUILD vanilla-kernel-5.10.5.ebuild 2823 BLAKE2B e423762ad9db59e020c8833bacca256851c5a05a55c7c07665e96992836028d5b8512b923df6764b7721e496a59af6428b992c3a52542433497d8e57e413d2af SHA512 bbcdabd99f5c625240f89491372db4fc3558162cde014415d3e8d1ad9dde02ca5253ffb6db590f4acee90972ce35ea9fa45c65f7f037f6d96ed566d5904486d7
 EBUILD vanilla-kernel-5.4.80.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
 EBUILD vanilla-kernel-5.4.83.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
 EBUILD vanilla-kernel-5.4.85.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
-EBUILD vanilla-kernel-5.4.86.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
+EBUILD vanilla-kernel-5.4.86.ebuild 2985 BLAKE2B c07851698e315ea69f64063462d3e01dfed1803594222e9da442df35dbed0d8a7a0ef15203e96efd63e34ca414e97729a97640c975022ac7adacf67a25eaff62 SHA512 48dd7de6e21f88f786972549db1bf2f73af5240a124d1bc26892da610e550bbab18ff42d281d9e96b4dd62964fb2ed5a46b52166a06dc6c6f1d56b27ec8673f8
+EBUILD vanilla-kernel-5.4.87.ebuild 2985 BLAKE2B c07851698e315ea69f64063462d3e01dfed1803594222e9da442df35dbed0d8a7a0ef15203e96efd63e34ca414e97729a97640c975022ac7adacf67a25eaff62 SHA512 48dd7de6e21f88f786972549db1bf2f73af5240a124d1bc26892da610e550bbab18ff42d281d9e96b4dd62964fb2ed5a46b52166a06dc6c6f1d56b27ec8673f8
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
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
new file mode 100644
index 000000000000..e7583aa0f3ea
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.2
+CONFIG_HASH=b40ee468dab9a27cca8b91fef64d1d43ce0ed1b2
+GENTOO_CONFIG_VER=5.9.8-r1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+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
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
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
new file mode 100644
index 000000000000..70f1e31be56d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.87.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.77-r1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+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
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}