From ee93fbc2bb111cf895ae00cc1877c68f0eafaf2a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 21 Mar 2024 01:00:11 +0000
Subject: gentoo auto-resync : 21:03:2024 - 01:00:11

---
 sys-kernel/Manifest.gz                           | Bin 4567 -> 4570 bytes
 sys-kernel/installkernel/Manifest                |   4 +-
 sys-kernel/installkernel/installkernel-30.ebuild | 194 -----------------------
 sys-kernel/installkernel/installkernel-33.ebuild | 194 +++++++++++++++++++++++
 4 files changed, 196 insertions(+), 196 deletions(-)
 delete mode 100644 sys-kernel/installkernel/installkernel-30.ebuild
 create mode 100644 sys-kernel/installkernel/installkernel-33.ebuild

(limited to 'sys-kernel')

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index b77f221336e4..5add65c34bfd 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 851f104ddd28..1720c1495a2f 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,7 +1,7 @@
 DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
 DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
-DIST installkernel-30.tar.gz 20945 BLAKE2B 1363545c06f368c8efed4f0fb026a68fbe1d34019573ca9bdd3eaaa2b2c83232c0b23c41351f8bef287d47a3c07aa20ce8900d5b452213d30c412617d33ef114 SHA512 2e506c018c255f23a81ca5bfb7e82c2ebf6a949be67d7876ac63b29773b630543225d1fc4a07f074f43b7e866381c654eb9a85ff3d8e2ced5d2c05c9a6afd412
+DIST installkernel-33.tar.gz 20734 BLAKE2B a1ac65c1122341fcaeb4e05980873b8025a4878100a732164286f737aeb8e2ff7f1593143a5482f9a79ef6e5343e3da8e125677f12adf05ad9b63995bf3ca865 SHA512 c75fc9de36bb2fae21571edf6daebfd2e5f5479860d31697f2e623d023af48728a964f7c9b998f4c2359dc4ab9463bfc5374f686108e2247441b94b71aefeb69
 EBUILD installkernel-25.ebuild 4731 BLAKE2B 56cce11d6b06595043f7f6a30409ddf4e9c8126a1ee5ac2495f2021f93bc6bfe7db4ad14a163580173dad37008daf6f3179a6b086eb0e28946041a2bf005ba06 SHA512 f35ea8d7094d530f64013241e7c71273de9b1d7d7264d50b964ff1bd55191107bef43fd924189ab5654e500d0b6a0344e40f929ae3cfac47a5c79369eef2e4d9
 EBUILD installkernel-28.ebuild 4910 BLAKE2B bcd58c179e6497da6d3848028879957b3d02b59983b8fbe26bfb2ee86d51aa06e02e89d6e9b1875eff7ff13fa17f0a478661f10749e978c13b60dd5b55fb9d7e SHA512 c0291648ca9fc91ff166871e21285dbba0994aff42bb6b1632bea47cde2b1a8ae36c9c6189a3239e9651d4c688d3599ab1d49f566bf60acabf49fc780b23a2b6
-EBUILD installkernel-30.ebuild 5931 BLAKE2B bed970d0ed10a099d3df282988248bb2f5567c474150dc3a1079bad949e82909bb5b5b370954f5e08858eadbecdbdedb1defec13744fd61d0a14ac977b8127ef SHA512 f5d4b5a7e8429e944bc926dd32abbc4eaa1171dffe097c2103013328f47a9de503775f461678560b9729ddbb673b24acbadc3610436e2c793618757a1d3db7a6
+EBUILD installkernel-33.ebuild 5841 BLAKE2B 937eee705724f23d247f6fed4a2432e63a09eb607cb0c5f8b6abc2206dd5edb94349b0d979a3d1bc3618ede0a492a7047c92f4a641949c03ba24f4dbfac0a3c3 SHA512 c452a758850a673a45e13063bf23da87600ef94fa0cab2aa5b7c2f701294a68d624c4d894f6d002b52f32f30d542343fe9a05531c36f084460c59972d2eb1fc1
 MISC metadata.xml 1288 BLAKE2B a80d5022072c362c1787723b7222638f01993675f5c3bbc87962d998497dcd1673664ef4802cb8b3bce7ad81825521be1747c00f6ef5f5e1c9e2d976b09c8d85 SHA512 d51a5b1c5977049a9a499c2f7edcd95ea5e2b47c4fb49fa76d3df9839b2ad7652bbfff41fae823da3b86a52f2b9cb120759a15e5e9967e7b1148ea3bc92ed793
diff --git a/sys-kernel/installkernel/installkernel-30.ebuild b/sys-kernel/installkernel/installkernel-30.ebuild
deleted file mode 100644
index 9ba8f5cf4c74..000000000000
--- a/sys-kernel/installkernel/installkernel-30.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-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 efistub grub refind systemd systemd-boot uki ukify"
-REQUIRED_USE="
-	efistub? ( systemd )
-	systemd-boot? ( systemd )
-	ukify? ( uki )
-	?? ( efistub grub refind systemd-boot )
-"
-# efistub requires systemd's kernel-install because:
-# - We need support for removal to clean-up the created entry
-# - We need to know the location of the ESP
-# - kernel-bootcfg at some point calls bootctl (to find ESP)
-
-RDEPEND="
-	!<=sys-kernel/installkernel-systemd-3
-	dracut? (
-		>=sys-kernel/dracut-060_pre20240104-r4
-		uki? (
-			|| (
-				sys-apps/systemd[boot(-)]
-				sys-apps/systemd-utils[boot(-)]
-			)
-		)
-	)
-	efistub? (
-		>=app-emulation/virt-firmware-24.2_p20240315-r2
-		|| (
-			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
-
-pkg_setup() {
-	use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
-}
-
-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 efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.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 efistub; then
-		echo "layout=efistub" >> "${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
-
-	if use efistub && ! has_version "${CATEGORY}/${PN}[efistub]"; then
-		ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
-		ewarn "often differ between vendors and as a result EFI stub booting is not"
-		ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
-		ewarn "of booting the system is available before rebooting."
-	fi
-}
diff --git a/sys-kernel/installkernel/installkernel-33.ebuild b/sys-kernel/installkernel/installkernel-33.ebuild
new file mode 100644
index 000000000000..f6c3c526454e
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-33.ebuild
@@ -0,0 +1,194 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+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 efistub grub refind systemd systemd-boot uki ukify"
+REQUIRED_USE="
+	systemd-boot? ( systemd )
+	ukify? ( uki )
+	?? ( efistub grub refind systemd-boot )
+"
+# efistub requires systemd's kernel-install because:
+# - We need support for removal to clean-up the created entry
+# - We need to know the location of the ESP
+# - kernel-bootcfg at some point calls bootctl (to find ESP)
+
+RDEPEND="
+	!<=sys-kernel/installkernel-systemd-3
+	dracut? (
+		>=sys-kernel/dracut-060_pre20240104-r4
+		uki? (
+			|| (
+				sys-apps/systemd[boot(-)]
+				sys-apps/systemd-utils[boot(-)]
+			)
+		)
+	)
+	efistub? (
+		systemd? (
+			>=app-emulation/virt-firmware-24.2_p20240315-r2
+			|| (
+				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
+
+pkg_setup() {
+	use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup
+}
+
+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 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 efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.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 efistub; then
+		echo "layout=efistub" >> "${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
+
+	if use efistub; then
+		ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
+		ewarn "often differ between vendors and as a result EFI stub booting is not"
+		ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"
+		ewarn "of booting the system is available before rebooting."
+	fi
+}
-- 
cgit v1.2.3