2 files changed, 106 insertions, 0 deletions
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 433b10afa951..7629d52f85ca 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -35,6 +35,8 @@ DIST linux-5.4.83.tar.sign 989 BLAKE2B 0c1c9737b51eb02747146498475436682fec4d0e9
 DIST linux-5.4.83.tar.xz 109638356 BLAKE2B 0287ca87cc09702a3ce9c83494a3f49712aab4f805cab560fdee29cecb18f9ef132c9f8352793705b371f0faf60fd24f357448a8323ba1c1a2d0ab832b5bac8d SHA512 0b40ffb66fc5b3f35a0c187ffeea0df3dd90644490298fe78ad1fef210f1c72e4b0c33aafc6b1d0959c915a6a0d3ec57ae8a36f8b28486965a8ef158674b1ec3
 DIST linux-5.4.84.tar.sign 989 BLAKE2B 81b7f2ffd2504754c2e79acabb3eef38f764d840408cc736fed3e23f418cc1063ed3d118f68a9f18af6003d64b82067d45eab160242c31ad56f11f284dbbaf20 SHA512 dc26a666c3dba858d0b32ac35b3a6bceb2300a4b33c870b64ec8450b152ced6378ae73e24dea49965ae25b80b5f49ea4fae33761ca7da19bd18e504e3a7ab472
 DIST linux-5.4.84.tar.xz 109631524 BLAKE2B b6cfb1c9b6b635cc3229c8780fa35ab48a6cde757f45b49ae5879cf41b5331cd8ff0913157c4d6efbe072ee4317732db36f74ea6a1333f118076a10b96ba74c8 SHA512 ac077a52ea7e1de51858938e66df61677e5049ef66ded82ed613528bec982a2891756f9474f3f82e8c5ac0dd4e90f691d4c04abffd092fe28bdb1fa7c0957dba
+DIST linux-5.4.85.tar.sign 989 BLAKE2B 90ecac8f32d7c22af508b3233768065cc4626b6702d745fcc29f7063402dd5132c6c25e986c6465a4e4d0ddf27013d08736b2b51d2cce975aa919c745865d466 SHA512 a02d4ad9987c40436cda720e781f8bd0a41341564fe907e6618b8ed5149e9d2fa026f2b99cbee24d3d5862452ef140f3eba8f63f316900392726ac14d552ee29
+DIST linux-5.4.85.tar.xz 109636476 BLAKE2B adc66aa3a2a901ed4d7450cc46efe4cef48536e03d19519b9f3f7015930489a9499b60ab8b66624bb54cf5c25aee0d3c39023c979615c0adf3edb5c89f5d595b SHA512 a1b188952ba81d9c4a19442035f9595292b443632fc17b1d976d2de11626287bdb75db1f50858c6224cff8665e3501619799c199c19b32283e7b6ea5683fd1a5
 DIST linux-5.9.10.tar.sign 989 BLAKE2B 28777305ef639cdeb41d76bd5db9212994a2a8d505b394b822f798937af43b946a4098477d1dce132a9caafc4b1009d7f3edac4a79b9eb45d66ff4bdfab69680 SHA512 a68c71883e0972e3cee877156b3dfdd5bc2ac6fee18d9da48c8355d2f19a8c2cf5bca2237f1806bdf0759c330f882331a581fbbf49fa2410f2a42e3cadfa5012
 DIST linux-5.9.10.tar.xz 115545932 BLAKE2B 423d0e2fea39d54c9bbda532dce95f67c2736646b88515e72a3cea97842a25f4b2b4ef0aa2896d623bbc89eb6e8ca14f5b447030f190677601048816ae4a76e1 SHA512 f3f5195508affa84ccac30621c852b0dec42a227e2a3677a31b6fafcffdcf34964bf43cc96b08698faf319a1eead54f26638d7c70c20df31592e1c00ff00ae06
 DIST linux-5.9.11.tar.sign 989 BLAKE2B d8c810fdbf587f70d7665960ed0df082417cde3d9b55b336147b672c2879c80630885162c57adcd437e14d9fc41112fd3f0cd20459822500b7a13c29b4da5e39 SHA512 4046df5a6318a9fd22ce13ca806028a8a97402224c6f8a032d222179d1dd24f80892fe60f51b63c6815370769a3eb7d64985bfa3b076cb61fc082c2de00dba3a
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.85.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.85.ebuild
new file mode 100644
index 000000000000..7f4ea0861252
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.85.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2020 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 )"
+
+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[@]}"
+}