gentoo auto-resync : 08:06:2024 - 00:08:11

3 files changed, 2 insertions, 170 deletions

diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 4dc6d7417a22..2a049227b52a 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,7 +1,5 @@
-DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
 DIST installkernel-38.tar.gz 20987 BLAKE2B 64937dad646b4736555bd9cdeb575d37fb40764a97ba0429136172b268429d05c4df8317862fb8004538f0a3e6bba953123a30cd89fe67812a6624ff2d57b5c6 SHA512 2f6576bc04be7dd22a3c47460caa7b2da526ad7239cd99766756a03e74299d7d980a3cab2951713d7313af32fa58d1cb95d121617b091cfe9eac18d77c347c39
 DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa
-EBUILD installkernel-28.ebuild 4902 BLAKE2B b2c7826d18637206cca65638290fdc43aa3ca1b6753005e8acbd6fe99a8c635730b07ab75b6e22cce2829720b2627b96bdbda72a1654ab0c3c3a335f60ee06eb SHA512 5adc536c0baadbcc2e8e17adfaffbd68a94219acf4989b8561b1433c1954fc0ab35457be9194390be9da71fd10ebd68595ff04c92ed30ffee8f9c79f8940ed6d
-EBUILD installkernel-38.ebuild 5637 BLAKE2B cf4ab530b6f57ab0fadf0d85ab4ddd349e6f3c9aa00bef165677da0d6c4b3460ccf34dcc557d5713444966dfe2bcda26e7bc4f4a05e77f56404b0eb8c90a7e0a SHA512 9fbff26240bd8e6fcca3c9456c786e8ab4f3fee697ba23ea91720d46f27b3807da370ed9aa1b7b855e18436ec6059b6411a8672c6f2afaddefc6123504503d88
+EBUILD installkernel-38.ebuild 5629 BLAKE2B cd8b29af60d66d0cc1013974281f5c70feb08ab0425c0d4356090c5ba3183a66d7789a05278560a54b7a297ce4a16f76f24c145acd986e494168d8f29b7adf87 SHA512 95a2cc4b5f45717f7e8912cba7a2693f30dfae972ea60f7a81a346c30a77e01eb7212e4bb3d8616ae2e0b84a8b18597e7d87407f920d1568350022e9d17b2af9
 EBUILD installkernel-39.ebuild 5637 BLAKE2B cf4ab530b6f57ab0fadf0d85ab4ddd349e6f3c9aa00bef165677da0d6c4b3460ccf34dcc557d5713444966dfe2bcda26e7bc4f4a05e77f56404b0eb8c90a7e0a SHA512 9fbff26240bd8e6fcca3c9456c786e8ab4f3fee697ba23ea91720d46f27b3807da370ed9aa1b7b855e18436ec6059b6411a8672c6f2afaddefc6123504503d88
 MISC metadata.xml 1288 BLAKE2B a80d5022072c362c1787723b7222638f01993675f5c3bbc87962d998497dcd1673664ef4802cb8b3bce7ad81825521be1747c00f6ef5f5e1c9e2d976b09c8d85 SHA512 d51a5b1c5977049a9a499c2f7edcd95ea5e2b47c4fb49fa76d3df9839b2ad7652bbfff41fae823da3b86a52f2b9cb120759a15e5e9967e7b1148ea3bc92ed793
diff --git a/sys-kernel/installkernel/installkernel-28.ebuild b/sys-kernel/installkernel/installkernel-28.ebuild
deleted file mode 100644
index 3e1edca83f72..000000000000
--- a/sys-kernel/installkernel/installkernel-28.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo fork of installkernel script from debianutils"
-HOMEPAGE="
-	https://github.com/projg2/installkernel-gentoo
-	https://wiki.gentoo.org/wiki/Installkernel
-"
-SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-gentoo-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="dracut grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
-	systemd-boot? ( systemd )
-	ukify? ( uki )
-	?? ( grub refind systemd-boot )
-"
-
-RDEPEND="
-	!<=sys-kernel/installkernel-systemd-3
-	dracut? (
-		>=sys-kernel/dracut-060_pre20240104-r1
-		uki? (
-			|| (
-				sys-apps/systemd[boot(-)]
-				sys-apps/systemd-utils[boot(-)]
-			)
-		)
-	)
-	grub? ( sys-boot/grub )
-	refind? ( sys-boot/refind )
-	systemd? (
-		|| (
-			sys-apps/systemd[kernel-install(-)]
-			sys-apps/systemd-utils[kernel-install(-)]
-		)
-	)
-	systemd-boot? (
-		|| (
-			sys-apps/systemd[boot(-)]
-			sys-apps/systemd-utils[boot(-)]
-		)
-	)
-	ukify? (
-		|| (
-			sys-apps/systemd[boot(-),ukify(-)]
-			sys-apps/systemd-utils[boot(-),ukify(-)]
-		)
-	)
-	!=sys-apps/systemd-255.2-r1
-	!=sys-apps/systemd-255.2-r0
-	!~sys-apps/systemd-255.1
-	!~sys-apps/systemd-255.0
-	!=sys-apps/systemd-254.8-r0
-	!=sys-apps/systemd-254.7-r0
-	!~sys-apps/systemd-254.6
-	!<=sys-apps/systemd-254.5-r1
-" # Block against systemd that still installs dummy install.conf
-
-src_install() {
-	keepdir /etc/kernel/postinst.d
-	keepdir /etc/kernel/preinst.d
-
-	exeinto /usr/lib/kernel/preinst.d
-	use dracut && doexe hooks/50-dracut.install
-	use ukify && doexe hooks/60-ukify.install
-
-	exeinto /usr/lib/kernel/postinst.d
-	use uki && doexe hooks/90-uki-copy.install
-	use grub && doexe hooks/91-grub-mkconfig.install
-	use refind && doexe hooks/95-refind-copy-icon.install
-
-	exeinto /usr/lib/kernel/install.d
-	doexe hooks/systemd/00-00machineid-directory.install
-	doexe hooks/systemd/10-copy-prebuilt.install
-	doexe hooks/systemd/90-compat.install
-	use grub && doexe hooks/systemd/91-grub-mkconfig.install
-	use refind && doexe hooks/systemd/95-refind-copy-icon.install
-
-	if use systemd; then
-		sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
-			die "enabling systemd's kernel-install failed"
-	fi
-
-	# set some default config using the flags we have anyway
-	touch "${T}/install.conf" || die
-	echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
-	if use uki; then
-		echo "layout=uki" >> "${T}/install.conf" || die
-	elif use grub; then
-		echo "layout=grub" >> "${T}/install.conf" || die
-	elif use systemd-boot; then
-		echo "layout=bls" >> "${T}/install.conf" || die
-	else
-		echo "layout=compat" >> "${T}/install.conf" || die
-	fi
-
-	if use dracut; then
-		echo "initrd_generator=dracut" >> "${T}/install.conf" || die
-		if ! use ukify; then
-			if use uki; then
-				echo "uki_generator=dracut" >> "${T}/install.conf" || die
-			else
-				echo "uki_generator=none" >> "${T}/install.conf" || die
-			fi
-		fi
-	else
-		echo "initrd_generator=none" >> "${T}/install.conf" || die
-	fi
-
-	if use ukify; then
-		echo "uki_generator=ukify" >> "${T}/install.conf" || die
-	else
-		if ! use dracut; then
-			echo "uki_generator=none" >> "${T}/install.conf" || die
-		fi
-	fi
-
-	insinto /usr/lib/kernel
-	doins "${T}/install.conf"
-
-	into /
-	dosbin installkernel
-	doman installkernel.8
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	# show only when upgrading to 14+
-	if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
-		elog "Version 14 and up of ${PN} effectively merges"
-		elog "${PN}-gentoo and ${PN}-systemd."
-		elog "Switching between the traditional installkernel and systemd's"
-		elog "kernel-install is controlled with the systemd USE flag or the"
-		elog "SYSTEMD_KERNEL_INSTALL environment variable."
-		elog
-		elog "See the installkernel wiki page[1] for more details."
-		elog
-		elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
-		elog
-	fi
-
-	# show only on first install of version 20+
-	if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
-		if has_version "sys-boot/grub" && ! use grub; then
-			elog "sys-boot/grub is installed but the grub USE flag is not enabled."
-			elog "Users may want to enable this flag to automatically update the"
-			elog "bootloader configuration on each kernel install."
-		fi
-		if ( has_version "sys-apps/systemd[boot]" ||
-			has_version "sys-apps/systemd-utils[boot]" ) &&
-			! use systemd-boot; then
-				elog "systemd-boot is installed but the systemd-boot USE flag"
-				elog "is not enabled. Users should enable this flag to install kernels"
-				elog "in a layout that systemd-boot understands and to automatically"
-				elog "update systemd-boot's configuration on each kernel install."
-		fi
-	fi
-}
diff --git a/sys-kernel/installkernel/installkernel-38.ebuild b/sys-kernel/installkernel/installkernel-38.ebuild
index 293828ee0c57..60f6910aa12c 100644
--- a/sys-kernel/installkernel/installkernel-38.ebuild
+++ b/sys-kernel/installkernel/installkernel-38.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
 REQUIRED_USE="
 	systemd-boot? ( systemd )