gentoo resync : 28.11.2020

3 files changed, 58 insertions, 2 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 41460b994b86..82c6abec143c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -13,6 +13,8 @@ DIST gentoo-kernel-5.4.79-1.x86.xpak 52892771 BLAKE2B a23f364756559c2fe036c2589d
 DIST gentoo-kernel-5.4.80-1.amd64.xpak 60985455 BLAKE2B 51d73bb4bf2ff8a42a260afaf389d64108772248cbd2ff2893939843f802d0506725d69c3eceb13ba08f3940452ee32bbedc3a648ca88d4f9b4eac1ee8e42877 SHA512 8644e07391b3f7868a39ae20529c0e99b80ac9ddcbc6338d920d0dae5a8f6ee8a8b72f9343e8be4c984d5068bebd9689e63a3bb42a6b87f2663832fb62d18bc7
 DIST gentoo-kernel-5.4.80-1.arm64.xpak 56131608 BLAKE2B 87cc11db3cc2b1b2af78ad78677299b915e1f1acf1c5a1419e9c0aaabf3346652e98cca6ddb608e4c031226e251349a03ab182479a4f260f967fc4a50a4ef4fc SHA512 993a6bbd8ed723f5315766ea2803f485dcf61512b698c5752aed11555bcee93ff2b2cf7f55af54a2fba8e515df7914d8eacca2dd424020bb9052cea1727cf453
 DIST gentoo-kernel-5.4.80-1.x86.xpak 52825910 BLAKE2B ddcf84a5e99a25fc690c487c11c1c591139683747f6e9fd0a1b1c9ae87e70420d02bd2b6a7732d17862c47aea2e9bd184c945387ee9118b3681eefaedf7696d0 SHA512 de7d4fc64a42453a464296d7e11142476f49f994e6d0415f6612365c465eea98d20d0a1f56502f1ebb62a1d4a493a42cd26a174956c16721c85525a7afc0eb6b
+DIST gentoo-kernel-5.4.80-r1-1.amd64.xpak 61053571 BLAKE2B 24eebf676e1824b01aa6b75963ff8afe25e797afe90440016f4675e8385e1d6b1a04aa662d7c92217af97d56d79f9631a84c2a271b005b5ea7ad71bb8637d941 SHA512 ea99729ee68a44f6b5081e0d81dd7d5abbb50482eda8c4e435d6ee997572362de09d7c813da2ecf1aac4ed299feb73205bcff7d4d359793889690ce07cfb057f
+DIST gentoo-kernel-5.4.80-r1-1.x86.xpak 52880910 BLAKE2B f94a7bbdcdbd383e919f2542251d2552e50e34264ab495a43d75e28dab881162f2549b48383b32a3b2a813a192b7d9f602eaa8210085733ac123e2246e6a285b SHA512 3b5dd91103461306f4a4ea4554792d4cdabedba6165de119523b927abb2009adc7d554f23110ddeac1a1add69b2d1674b7b87b93b1e1b186a2594174808dd9d2
 DIST gentoo-kernel-5.9.10-1.amd64.xpak 62950591 BLAKE2B 032e27aaaf9f622ce16b3ee699752215fe7485052bebdafddf2155aed370b6316be07eb009da3e207a9b12f8c7865c70c7466451b205cc4b4f374c731a815fd5 SHA512 7f504e2f15319d60f464a4e45edee9503316a100eec8a6258e27ec7a00a4d2a5cbf9ead4e77ae5342ea05778572fc8ecda94c63b425b99b6ac3a5f183e377bbb
 DIST gentoo-kernel-5.9.10-1.arm64.xpak 60852046 BLAKE2B da0ee409eb47ae9bf570a08640bd060894974f5f09fb348b3d43c525f7d006f982a447ff9b17bc22969de929b05a316ee72668d40a20d8c3b8e2084588898416 SHA512 3ae82b223c97903a9c25abcad4a9f1f9e4ede68caf796833d9aa0c0cb23898c5b62e4023b8d3a00ff91cdd1f1ee8e82d51e9198454bf87ea16fed9c99147e202
 DIST gentoo-kernel-5.9.10-1.x86.xpak 56077741 BLAKE2B 40c1b066b5f91b5b53dd16d90be5d28e2699b900fcbc272e14417d69bef942a91058ebb5d74e0d8dd52263e6147bec1efafed75dc57f8f511f11def4657420e7 SHA512 7c778185d98c83fc0f5431111ef0c0623e54c76cde3e225b4d132bdc515319f6edd063fc2141b0d3d58cc4006ef4561088c5069fa047b04a6961cc53e23e7ef0
@@ -33,7 +35,8 @@ EBUILD gentoo-kernel-bin-5.4.78-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824ca
 EBUILD gentoo-kernel-bin-5.4.78.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
 EBUILD gentoo-kernel-bin-5.4.79-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824cab32ffb01f1895037ed75b091bc42039bf949b93fc6cd2991fa6fb3c6d44a0d5fc803cca62c2ab7a4d0ccc10405d7cb1bb67bd1f SHA512 692857c6e58157c5b82ec618f9f9df26774e665d87431a2965318cdf42e75b34d61653d9432251a0819690ad814aa554609935a0926c1272bcaa1e23be7d0e05
 EBUILD gentoo-kernel-bin-5.4.79.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
-EBUILD gentoo-kernel-bin-5.4.80-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824cab32ffb01f1895037ed75b091bc42039bf949b93fc6cd2991fa6fb3c6d44a0d5fc803cca62c2ab7a4d0ccc10405d7cb1bb67bd1f SHA512 692857c6e58157c5b82ec618f9f9df26774e665d87431a2965318cdf42e75b34d61653d9432251a0819690ad814aa554609935a0926c1272bcaa1e23be7d0e05
+EBUILD gentoo-kernel-bin-5.4.80-r1.ebuild 1371 BLAKE2B b11c2f146a3f72d590347cdb433c3c998ad4a79de5e4e547914275851382af44107f01f6ebea0ffda0a0651689db7d2b0126ba58ea64da8c7bc4cee7974893ce SHA512 5db1e935269ba1b5bad9cee1a6c42cfe155281e11887522d7a256fd326b8ce89037b61b0df4b6f0570bae6c05b97b817bfb5d4e3a5a8c00b4ebe9c87dafd7fc7
+EBUILD gentoo-kernel-bin-5.4.80-r2.ebuild 1254 BLAKE2B fc2f3af07ca853fed3f3841402d0a03acdd74901b2a0704443ac44d027ae514e98172b932fda6a7683a8a91c9602d4764775660aa127beef1926d599eab7640c SHA512 409cfc1a4fea4e6089201ca575c513e4ac0271a95617db48d32dba8656861854efa0d23659bf68dc4dcf53db40e3cb6322a4e2db8e37a1adcb61f9ba52d3ee18
 EBUILD gentoo-kernel-bin-5.4.80.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
 EBUILD gentoo-kernel-bin-5.9.10-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1095d105232a81fc1eabd98c7d870194cd9d92cc1b3e0405e904bedcf21865812d5db6d51d799b48eaa9a89797da4e5e4273c893 SHA512 1e809eaf4e474b6344beded4342c0ed8f07aa99f47035456fda32051301d16f2a6d2b09b998c14b75cdf9cdf067276c6d5e46ea90bc6a8120ff5d591e95d1c9b
 EBUILD gentoo-kernel-bin-5.9.10.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r1.ebuild
index 2378adc3f352..5ba1bd156ea4 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~arm64"
+KEYWORDS="arm64"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r2.ebuild
new file mode 100644
index 000000000000..4644aa1d2620
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-r1-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+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() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}