gentoo auto-resync : 24:01:2024 - 16:45:44

5 files changed, 5 insertions, 245 deletions

diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index d994b0f968e3..fa80e4fcca73 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,9 +1,5 @@
 DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
-DIST installkernel-15.tar.gz 5485 BLAKE2B c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6 SHA512 352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0
-DIST installkernel-17.tar.gz 7109 BLAKE2B 1b9ac1528262a842d306b5061207316d088b78702a2045d5f49de08d9111ecf6306ac6c45262ae0eca3565aba4f20098b3678090510af808192cb310b53af216 SHA512 f80c3d9141e3c6a41e55204eff7df8d8e2c42e6cca0e86db6d0036da1d2a23b4b69add8cb3abb8577459f7b46211d65a5cf4d7f9349f4a3a85d4f6e0a1215f03
 DIST installkernel-18.tar.gz 7223 BLAKE2B b813cbab818674abde969378d66ccdf05ff296b32232c11c85f84292b6f7ab91f846d66cc2a34d8912fa731d70d6b8b87339eb75cbef9dd2672e58a1be310d40 SHA512 3afe20ee58cea986d2b8e8e2621d6b6c76a883b41105521f69822107b3fce11700839d0fefeea1ea1e8b2ad69df18ef4219e4db606bda2349e6eab0924625686
-EBUILD installkernel-12.ebuild 1444 BLAKE2B 7ef1f8e8205cf742b2304e8232f7f017245a21ab5ff6723b677e4dd810dfd46977632b0c0e3cb5ce66523206cec4cfd539829bbe467838e4b65f6fb51a56d2ec SHA512 a7d72bd6ebb3b42d3348253756caaf169d0dce9c92403c3ccec5486f470d60e5d681299bfa3d9f41c6bab2dca35d958adf9663562c3e30282a66e78dfd39f53e
-EBUILD installkernel-15-r1.ebuild 3207 BLAKE2B e3ffde53184ba1ebf0e59f3ac09d86da2365a405acbfc2388bc67f724a23cd997a2cd5ecedf0e832d7e3b4908ed2d57dc530a8e90c4df71638939336e77e4219 SHA512 fcc15f3a463887d9a9ce87a418477a16f313e6d9bd526157c708d3db922113ea43a63a57a98ccab09919c082b2440ad44cad1e4ffeb3cf1fceaa28f94984c074
-EBUILD installkernel-17.ebuild 3399 BLAKE2B 292b07398a0fd145beb35113d0b7d32e77c7906ded4d62dab96570e877c590e4fe85417acb88bcba8a97915c2723db42d645040eaa73a5f8156d1799f41daca4 SHA512 b26246a472eb24f25d96912b0cd559f33a909758a205fcb088938968e68366746390eb4e702852d6d0e731784e356710b371ba63db0a74838d86b3d9b6043f1e
-EBUILD installkernel-18.ebuild 3399 BLAKE2B 292b07398a0fd145beb35113d0b7d32e77c7906ded4d62dab96570e877c590e4fe85417acb88bcba8a97915c2723db42d645040eaa73a5f8156d1799f41daca4 SHA512 b26246a472eb24f25d96912b0cd559f33a909758a205fcb088938968e68366746390eb4e702852d6d0e731784e356710b371ba63db0a74838d86b3d9b6043f1e
+EBUILD installkernel-12.ebuild 1443 BLAKE2B bdcd9e2070e1cab6c0be6bd779d35044499493eb01537765cfad6be9ad31e7aa043664208f4257dee7ab3e5c58dc6e4be7e55a80f0eaf7a43a21cc54a69ebe14 SHA512 5cdf701b82ff2efd1b1308638aa58ad8695f0fa52af7f2e6be254163540483b2543fa954b47f680424fc38e5387a9e4385b0f2c0a596ae8276f9c9a72f8a518d
+EBUILD installkernel-18.ebuild 3392 BLAKE2B d8889c4962314f52c553914037c14a1d24dc71f6b56705ad8c32a414e9648cb8c4829eec2f24fafd996189e843c1fc1ed78de545b0492cb03510460aa317f3ee SHA512 80c9dcff00c3c7fe3d3cc87fa00a51bcca38a4c2edeabb18dbca920e4df04c00522b58052052464f55cfbc67cd7852577389fd64b4b642fb66eb203c931c1181
 MISC metadata.xml 962 BLAKE2B 1ba1170a97f339b8beaed27b0ace44bba35d5f00724492f5d10a5ff0974836af2c32a3763046f149f42626961a37655d5ebfae535302ba6d39527c99db028b7b SHA512 4f78a5e5698b7e86778c808777c429574580c44fddd6206d42785a1ae6ee217e0f69acfb7ac7489f3ee185c0158ea9eae1518bf2e186e2ccd4dce4f1abc4a56a
diff --git a/sys-kernel/installkernel/installkernel-12.ebuild b/sys-kernel/installkernel/installkernel-12.ebuild
index 042e7cbdf2d6..cd4bb88b1d78 100644
--- a/sys-kernel/installkernel/installkernel-12.ebuild
+++ b/sys-kernel/installkernel/installkernel-12.ebuild
@@ -12,7 +12,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"
-IUSE="+dracut grub uki ukify"
+IUSE="dracut grub uki ukify"
 
 RDEPEND="
 	>=sys-apps/debianutils-4.9-r1
diff --git a/sys-kernel/installkernel/installkernel-15-r1.ebuild b/sys-kernel/installkernel/installkernel-15-r1.ebuild
deleted file mode 100644
index 44838afc89c4..000000000000
--- a/sys-kernel/installkernel/installkernel-15-r1.ebuild
+++ /dev/null
@@ -1,122 +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"
-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 systemd uki ukify"
-
-RDEPEND="
-	!<=sys-kernel/installkernel-systemd-3
-	>=sys-apps/debianutils-4.9-r1
-	dracut? ( >=sys-kernel/dracut-059-r4 )
-	grub? ( sys-boot/grub )
-	systemd? (
-		|| (
-			sys-apps/systemd[kernel-install(-)]
-			sys-apps/systemd-utils[kernel-install(-)]
-		)
-	)
-	ukify? (
-		|| (
-			sys-apps/systemd[ukify(-)]
-			sys-apps/systemd-utils[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
-
-	if use dracut; then
-		exeinto /etc/kernel/preinst.d
-		doexe hooks/50-dracut.install
-	fi
-
-	if use grub; then
-		exeinto /etc/kernel/postinst.d
-		doexe hooks/91-grub-mkconfig.install
-	fi
-
-	if use uki; then
-		exeinto /etc/kernel/postinst.d
-		doexe hooks/90-uki-copy.install
-	fi
-
-	if use ukify; then
-		exeinto /etc/kernel/preinst.d
-		doexe hooks/60-ukify.install
-	fi
-
-	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
-	else
-		echo "layout=bls" >> "${T}/install.conf" || die
-	fi
-
-	if use dracut; then
-		echo "initrd_generator=dracut" >> "${T}/install.conf" || die
-		if ! use ukify; then
-			echo "uki_generator=dracut" >> "${T}/install.conf" || die
-		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"
-
-	exeinto /usr/lib/kernel/install.d
-	doexe hooks/systemd/*.install
-
-	into /
-	dosbin installkernel
-	doman installkernel.8
-}
-
-pkg_postinst() {
-	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"
-}
diff --git a/sys-kernel/installkernel/installkernel-17.ebuild b/sys-kernel/installkernel/installkernel-17.ebuild
deleted file mode 100644
index 0f0f4cb9259d..000000000000
--- a/sys-kernel/installkernel/installkernel-17.ebuild
+++ /dev/null
@@ -1,114 +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"
-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 module-rebuild systemd uki ukify"
-
-RDEPEND="
-	!<=sys-kernel/installkernel-systemd-3
-	>=sys-apps/debianutils-4.9-r1
-	dracut? ( >=sys-kernel/dracut-060_pre20240104 )
-	grub? ( sys-boot/grub )
-	systemd? (
-		|| (
-			sys-apps/systemd[kernel-install(-)]
-			sys-apps/systemd-utils[kernel-install(-)]
-		)
-	)
-	ukify? (
-		|| (
-			sys-apps/systemd[ukify(-)]
-			sys-apps/systemd-utils[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 /etc/kernel/preinst.d
-	use module-rebuild && doexe hooks/30-emerge-kernel-module-rebuild.install
-	use dracut && doexe hooks/50-dracut.install
-	use ukify && doexe hooks/60-ukify.install
-
-	exeinto /etc/kernel/postinst.d
-	use uki && doexe hooks/90-uki-copy.install
-	use grub && doexe hooks/91-grub-mkconfig.install
-
-	exeinto /usr/lib/kernel/install.d
-	doexe hooks/systemd/00-00machineid-directory.install
-	doexe hooks/systemd/10-copy-prebuilt.install
-	use module-rebuild && doexe hooks/systemd/30-emerge-kernel-module-rebuild.install
-	use grub && doexe hooks/systemd/91-grub-mkconfig.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
-	else
-		echo "layout=bls" >> "${T}/install.conf" || die
-	fi
-
-	if use dracut; then
-		echo "initrd_generator=dracut" >> "${T}/install.conf" || die
-		if ! use ukify; then
-			echo "uki_generator=dracut" >> "${T}/install.conf" || die
-		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
-}
-
-pkg_postinst() {
-	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"
-}
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index 0f0f4cb9259d..211c4e124e5a 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -11,8 +11,8 @@ 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 module-rebuild systemd uki ukify"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+IUSE="dracut grub module-rebuild systemd uki ukify"
 
 RDEPEND="
 	!<=sys-kernel/installkernel-systemd-3