[gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-headers/

["WANG Xuerui" <xen0n@gentoo.org>]

commit:     bcf8685830a2c9bebfcf5388e31b59b672a40ade
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 12:50:12 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 09:38:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcf86858

sys-kernel/linux-headers: add 5.19, drop 5.19_rc3

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 sys-kernel/linux-headers/Manifest                  |  3 ++-
 ...s-5.19_rc3.ebuild => linux-headers-5.19.ebuild} | 28 +++++-----------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index d14b142c5e28..90074ec9b8ba 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -9,6 +9,7 @@ DIST gentoo-headers-5.16-0.tar.xz 1508 BLAKE2B 8a98768f3f33ca2fa5f61dbcea39388f7
 DIST gentoo-headers-5.17-0.tar.xz 1496 BLAKE2B 562923dd1fdb1fc8afc97196cf8ada2345170d91a4166722b474fc15484840bfcbb31d33b1a71d98fec7684f0c01660f3437dabca541dfbfe802591c81bea2f9 SHA512 27372682de83ba04aebcaa5d25aea8cfdf1ac51166b155c7bcd5e03ef2722f7cc2d4761d519c325267bfd79e69996d1a9647f0f24b4059d7771bc1f8e94a027e
 DIST gentoo-headers-5.18-0.tar.xz 1172 BLAKE2B 136ea2989239f776ec0873c87a9d53f7f579f8c7341a80543912161073c22e0af275141a7e935e7af03b8fd82be19f88538f8a4b2963e7dc31cc0a4b2324fe2e SHA512 f0df48f3926eda93da8cf637e377ce5c3b06a55744870224dd4968ff5fac9a68f79ce62e0c1635fcc02646b9ff94672678f241cbe6048161c4784a1ec48f402e
 DIST gentoo-headers-5.18-1.tar.xz 2064 BLAKE2B a988b180ed5d885b62f1913b3f43243f77be5dcca03c8df83748ceb71c79d5359785cc64811fea251aa055b9193bd436184f66b8e773abf028722424977ee6b8 SHA512 f7c9279115e836c1bc0f065fdae7d3a2260ec82eaa729f395c96bed2bf53f2ddc40325a2d116b39337e00d841fbc19d072f48475bab382c63fa89331b226aff6
+DIST gentoo-headers-5.19-0.tar.xz 1168 BLAKE2B b4b90f23ddcbf0820f930bd605fb4a3269b8e48bc5f9c221cd60a726868140b9d43d1cd7ab04af8faf72417def0a7c9924f6b456d4521cdbcb35c825ec319a74 SHA512 0a652de74772e2c2f4de5a7cf188d05efbc797487ca6a0835075588d53abf5b835e65f626bd69a2de9ebdfef1a152581b79d5084e8af03a07123c0a149a67b0e
 DIST gentoo-headers-5.4-2.tar.xz 11352 BLAKE2B 0ff989dbfff9070c291efe1a8b925462770e71d0c3faeb2e53581dcce02abe45969ec293a7293b6d843f483927b15f4accc1f24ee4966483164e8f72727cfad8 SHA512 b460e4d00bdd9ec2ecf229f3b2dde7c6468f775399ba6a49fa0533c0688628c7b27d83835c21eab07407fd98c220043cd1b20e37cc4decbd08a3f2fd9cf6c2be
 DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535
 DIST gentoo-headers-base-4.14.tar.xz 8017944 BLAKE2B e967a3f26fa002f62af72c165cf960e855f5d84dd105b3f136e5ae24f4cdfc9e5f8b217a83955b325ca4bd6bda0a9d4c4de02d8d79fd4aa72191bc63db96183a SHA512 2a4e83a9ee36ffa85b59ebac1e12f4f1c572825b767928a42c4748d924d04f0536bab4d9375ca68c11ad867c226f386c40c7c4d0158d1ab00c838eb5b2f9f21a
@@ -20,7 +21,7 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
+DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-headers-5.19_rc3-only-arch-and-headers.patch.xz 1330360 BLAKE2B cc6f521037aeb898b2e2470f9e8f06378aa67a1b17679a38fa195c0a599a415eab763f6534701411cb658c8af28e8e28a3ff916fd29e01419713232336ce78fd SHA512 50eba921f2aabbf27a78c966aa1a2920e7a1f6060cce70285d450e4f949890a90ca54114a95f43240d0daa87285561f11c1734aecb15e2d05bc575a3c3145cb6
 DIST linux-loongarch-next-on-5.17-20220423.tar.xz 177296 BLAKE2B 947fd8c2192fe454beb346ea700a09a711f629d87cc5ff5b5d882fa1d57bb5e918fea821f5eddd44152812502479f853527b8317176326f8926bd1a532666a86 SHA512 b18df78802c2718181da95fdd5f83761bec7fced16b0aec05d00dcbd9b5c25fc0f84fbdd7e3b3fa5a3f78aea66e268dde3d9272a3f921b595b16270623ae0b7e
 DIST linux-loongarch-next-on-5.18-20220523.tar.xz 160468 BLAKE2B ccb6df7fbee86fba7ae725362efeb03cdf4187cf877a7f21e470639c14509214ed31c06434207950b219d34ed41a9fd2be0b711faeb5c6c02198836f06ef7dce SHA512 d87b667947a1d41fbea6db80dc2896c2c7e297bac471b99820b10a4d1e8a680f3566a89bdb4e70c0bdfba335ce158f3e82f930eb2f6b64fd6ba736028bf709f2

diff --git a/sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild b/sys-kernel/linux-headers/linux-headers-5.19.ebuild
similarity index 56%
rename from sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild
rename to sys-kernel/linux-headers/linux-headers-5.19.ebuild
index 44c60013ad3e..b07a4d1844b9 100644
--- a/sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.19.ebuild
@@ -5,26 +5,17 @@ EAPI=7
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 loong m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
-# The v5.19 rc patches generated on kernel.org contain a suppressed binary file diff,
-# hence unusable. Here we only let kernel-2 handle the base 5.18 tarball; the
-# v5.19 rc patch is to be handled later.
-K_BASE_VER="5.18"
-CKV="${K_BASE_VER}"
 inherit kernel-2
 detect_version
 
-#PATCH_PV=${PV} # to ease testing new versions against not existing patches
-PATCH_PV="${K_BASE_VER}"
-PATCH_VER="1"
-PATCH_DEV="sam"
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="0"
+PATCH_DEV="xen0n"
 SRC_URI="${KERNEL_URI}
-	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
-	https://dev.gentoo.org/~xen0n/distfiles/sys-kernel/linux-headers/${P}-only-arch-and-headers.patch.xz"
-S="${WORKDIR}/linux-${K_BASE_VER}"
+	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
+S="${WORKDIR}/linux-${PV}"
 
-# this is an rc version, for testing on loong only
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS="~loong"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -40,13 +31,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# apply the gentoo-headers patches after the big v5.19 rc patch, for
-	# avoiding flooding the console because of the lirc change
-	PATCHES=(
-		"${WORKDIR}/${P}-only-arch-and-headers.patch"
-		"${PATCHES[@]}"
-	)
-
 	# TODO: May need forward porting to newer versions
 	use elibc_musl && PATCHES+=(
 		"${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch