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

["Sam James" <sam@gentoo.org>]

commit:     6395a4b2a21e33d1862d114f3c145f63e9f4df4b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 16:56:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 16:57:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6395a4b2

sys-kernel/vanilla-kernel: drop 5.16.9, 5.16.10

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/vanilla-kernel/Manifest                 |   4 -
 .../vanilla-kernel/vanilla-kernel-5.16.10.ebuild   | 130 ---------------------
 .../vanilla-kernel/vanilla-kernel-5.16.9.ebuild    | 130 ---------------------
 3 files changed, 264 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 40b3c0ac7e71..ab95502ba993 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,16 +28,12 @@ DIST linux-5.15.27.tar.sign 991 BLAKE2B e36cb77225620f6e0ffa3ba3acd5ad39d2958b98
 DIST linux-5.15.27.tar.xz 126226860 BLAKE2B cfc5b3dd49757ade287a08c3dbfb0e2f45da72d7e40db1e391482b7b51c4bed12f2e0c056d0e7c1859d89327e0b8d45123fb092aee861088c427a63a63bf533f SHA512 a127de657b06a09cb8a4fb723856fb2823a88f3f25ac2ef746e50d8ab1668cd4cae26c920cdc4c5315c9af043e84549d25ebe91764de9de3052d8b31419ab194
 DIST linux-5.15.28.tar.sign 991 BLAKE2B c60c724259691eeeaf395a37ff82e43d139132acfa460e2a21fc730730171cdde66d2238cf1bf3d6e3e29e444c1f1c6b3d763da5638d84809fec412a9290e73c SHA512 3bd5a048fac7519fe1fce0f06af78436d52743686038712b265028dcf18ce5145ad5dc613520575b7fcbea24d782159b5554e629828d6161f91325050563cac5
 DIST linux-5.15.28.tar.xz 126243852 BLAKE2B 36acb1567d8af38ce7f2644104fcf0d63ff1a8994f2f885b3277e489966f93d79f05b4a98eadc1393bd76995b16b961e5d38c5df9add4d2395ea9d10cf41d58e SHA512 b92803ee520298ee0328bcbf96d536a72e68086e83e822b3136bf75a576a7610fba25f8878b2a419ad847a43c61b135bbe006d2fa5bc12c3e4a14d4e254e6ba9
-DIST linux-5.16.10.tar.sign 991 BLAKE2B 3e0ec61aca3515abadac15ea954279c1d96bfc3307efd2a8f0122f5affb5da83842bfd2d2ef2d303ece944ab454777aefafe916335f1383bc00a14712ece2eab SHA512 5b95c891dfa3d7c48c5940d2ca4d773c573e8f06301ef9be591c3221a9e34cf5c70c1220174dc80a6ffb761964769726d7f550bedb6f3f9eba94a43fd776243a
-DIST linux-5.16.10.tar.xz 127563168 BLAKE2B 6394d715c765e27aafa3ef7ba34fb17522eb14c5e004b8ab54eb31b55bcb782205d516cdef5f7204739890642289cd1f2ef8ac430a7ee63698ccf3b3d7b0b118 SHA512 2d1527623f96181c4797a8f73cb769e70321e673835113fbddd1374ca891d41b924220b8fdbaa46e2af7fc49a175e56524291b1816f4f6680128155c110f703e
 DIST linux-5.16.11.tar.sign 991 BLAKE2B a08fef5aefd7762197c3c7c809c53d84fd7560dba6b023609f9b3510e16ae450fb170c99c3737f6accc21f56db1f915a1c6511bfa424abc29dfbd999e6074baa SHA512 19044cc74d5bb6961fe96d272af9413a873332c0a7467bbc86673f9cc0f26f512520af649d95d5aa986f1194f61d0e68a54df92e929d1642382fd1f4e49bcbd2
 DIST linux-5.16.11.tar.xz 127555284 BLAKE2B 165fc78193959c0876158b3448fe33361a9b30ead17f216b92f94a11aad7a6a0e38a852a69239d954ad71978c14b79f8aca19903ce9d540c9776c855308beb50 SHA512 d877304a868cf29bb32d059544806314c2cd975be6132eee645d1dd54ed6e1281c4ea4a18ce30c9b59a8d2b5cd9a0bcf9933a36d4754201fb04e06dee2717e7a
 DIST linux-5.16.13.tar.sign 991 BLAKE2B 4553a9d234ba1336d90be0337b57b863858097590c15c99bb2f3f12447cd47ee337438772c61b3e54666097fbc6ebb1eb7b888ef269b666cbc9a8a84a1c0f340 SHA512 85423a4f6ac6ef71130f833d440a022fe08b512828a759517935658602da96a71378a538960e608b2c35c0e34985d3575d76580c80dd5eea12386ad996f3e77a
 DIST linux-5.16.13.tar.xz 127576900 BLAKE2B 6631cd1c19819a4cb2ba747eb62590f0f7739ef8c00302a78cffc0af907fbad135f3cf2934fbf403940c3331b015f8dd9bdf0362315feab7a3ff45076ed04515 SHA512 427140bb0da00e375299944da4dea992773e707c7c416e426e40397ee6f339a745a5b98dee0d9b36096dde6e9a18e5f45b462857782c6cc5aa3e5690b6019c79
 DIST linux-5.16.14.tar.sign 991 BLAKE2B 86c4ea68d91d9faf8efed5922a33d783e7c292b4e00d63cb97da3ec0a056786f9eeec698e5c7021f96474c1ec85d9552379733bd8f88fd7de572ee1118e55b20 SHA512 63298e9ea02247ca59e5eada0dfd2e549893d71092664321eea0b62a296e2a066b42d00a3da41a221d9ec672590c578456d12271e0bb964621c793406b0b8721
 DIST linux-5.16.14.tar.xz 127571576 BLAKE2B 151fa2d87c04de862913c360fb8bdb4d2cf4cbc7ca9777b97ee3f03005e8d5ef72b307fa5787ae53157291773158bca6b499cb1e71f6dc5098f424e15ff6c948 SHA512 3daf1b5a01cbab632492e18a8e71aaf2085545f4944ce587bc7c27e86a0a739d0cbffe7890ce9c5bc863b3c5083281bca6ed4df8d3c69d60c6dcc210cd86993e
-DIST linux-5.16.9.tar.sign 989 BLAKE2B 7e81a5ca6c68e347316bb96d75576d6034c849019da15bf9a64d44a01898d4f5306fb792c94bd290906e4dd20918fed78bdb74e8b56eb69e998cee1f51d39f67 SHA512 4db28620856d7f25f42f4c527eb1b15b28d265ddeb443d7b7c13efd5173dd038365cd6a336a4acbbc1570106e540b5ded7c4a17ced6d39f088121751e9dcae7a
-DIST linux-5.16.9.tar.xz 127566148 BLAKE2B ce4544512021eebfb8d7c87e176ae1e4ba741021c60484369af5280c51c64df48553ab2d7b53de2c3e358ea9bfbb8545a1dc7ef694628668bfcab329c59fb0fc SHA512 9f6f1c3b665b277c0432e86fb99fda2579685f680b245793f58d75d962f588a5142ff79325efa3ac233e946f076245cf8bb9f94f35f7a99932dc7f51e7f69d4e
 DIST linux-5.4.181.tar.sign 991 BLAKE2B 4ec0715478495d20c64caa05552dab3b7625147f31b0c5457c9e30d97efa309b541adf4b638bdb65b98f5324eb0486607a995b8ecd4f6fb68ac2cb433c62a685 SHA512 7a79fc9e600a5bafa7212087e81e902c3be8cd9926082224fe770ffb7f861663120c5099201e512db8d485523a79d8273e3f52f31302820247d47141cec255da
 DIST linux-5.4.181.tar.xz 112896524 BLAKE2B b450b38597c4a94c18ce5a347cc184bac0e5846f30b797c5cf06bb5186411a870ff573f7aec97c5612de10d695d5bf5fb63953e091905cab9fcc3c162b5154e3 SHA512 10fba413fe8da1b569d1366bf99d18ad3b5765abedb81931f4d00b40daacb8797e122bb2fbc1a739f1d9999e01e0b920faa58be41e2010a625c1d58f1b54e288
 DIST linux-5.4.183.tar.sign 991 BLAKE2B a56523b58f38558061c255d50caa0add22328467829751151af6525ca624515e7cfddf50073b8ae9c5d58c6776ee51aa658fca28e3b9788c58795d762ccab77a SHA512 9f47cfe7333857f9c8b37fbd67be682f86153a83e6d6b7923788c4ca2fd15f26d133359c9d1af99f8e12ed9914f5e483a8b5e698a83049fe572fa4a0d50e23b0

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.10.ebuild
deleted file mode 100644
index 04638599b94c..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.10.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.16.8
-CONFIG_HASH=f38101bdd0124e3ae7c3116b66f7fd1cd76e5601
-GENTOO_CONFIG_VER=5.15.5
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/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
-
-	local biendian=false
-
-	# 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
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.9.ebuild
deleted file mode 100644
index 04638599b94c..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.9.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.16.8
-CONFIG_HASH=f38101bdd0124e3ae7c3116b66f7fd1cd76e5601
-GENTOO_CONFIG_VER=5.15.5
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/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
-
-	local biendian=false
-
-	# 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
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}