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

7 files changed, 8 insertions, 173 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index adea91d7556d..d30a5355f684 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut-crypt-ssh/Manifest b/sys-kernel/dracut-crypt-ssh/Manifest
index 5999ae504292..cb8b1f7fba3e 100644
--- a/sys-kernel/dracut-crypt-ssh/Manifest
+++ b/sys-kernel/dracut-crypt-ssh/Manifest
@@ -2,5 +2,5 @@ AUX dracut-crypt-ssh-1.0.7-makefile.patch 693 BLAKE2B 538e8917b662824badaa08cf3a
 DIST dracut-crypt-ssh-1.0.7.tar.gz 19561 BLAKE2B b778d03d792c5ebe0466de7474a6cc821445fe0cd3b216f395d3ea28a17cb4ed3aa6da4b7d6dee86e4481e2ac98d677e3410cd6581c4d8c01ab0ec9564504bf3 SHA512 2958a59c3ff615e89b7631224e248e7e931dd91c566e792b10dffe09b8bd2dfcf2c55eef4e974988f19320e0d732d3dfb14b61713445e1ff3a4a9868dfc4e966
 DIST dracut-crypt-ssh-1.0.8.tar.gz 20931 BLAKE2B 2700bd7781c617b3bd44665971e9fd16727c31b0be76dfa7c121a2e77c250d830907a27e6ea43f6fc9684df0ee54a75093c62d449e5c04a16eb78d2fc572f238 SHA512 37f1f1a0029587ce19f56f5c108a6353230ccbc299b82d260c64dd73984db05ac1bf00ab59125905de95c69dfbf5e8923393f150594c1bdaeb0f70d1bff5c072
 EBUILD dracut-crypt-ssh-1.0.7.ebuild 860 BLAKE2B ebd2864603adc187950c05b4b04822ffcf8e932117d133e944b9955bde0543d4aa0d04fdc8e8803c84a1cad7d9e19c558e79b0ac9cc19816cc5ea703c8bda39c SHA512 14435d01fcab87872160a6c00151b03c069223da1b888718d7ca0de12165e08918af5b2cf627791502d2c59d9a7fa3af8b8d3841477f8bb98eb0c924d502d139
-EBUILD dracut-crypt-ssh-1.0.8.ebuild 813 BLAKE2B b095ba044c6ec39c5cce4edb9071828403d0aa29fcdee47ab06d0baf90752b204e0ada742f3292c788cf56ef145ab4341c90aae65070560cd92c4806c3e549b6 SHA512 04713a813998b363a5143af2df970e76d24a9156aa79283d531c729991dad573504816603720962a15cc6dcf60724360fbaf0c5012357f85f9226d1b5e16d9e9
-MISC metadata.xml 443 BLAKE2B 52a20ed815721e7b01cdfae83831f741049c5137a9957fd7e1324065742e21ca9e0a2564c95df16590ecf346af9bebc2f8195f10e5cadaa161bf25475cd708e9 SHA512 3f82f6b1c7dc0d167bfbaf0ef779c6f63923e90ceaa729c1188ffc043ea5d9392ecc900cec6322ed7d227cdd05f69fb22d32b1999314b9735db70686e43d7353
+EBUILD dracut-crypt-ssh-1.0.8.ebuild 820 BLAKE2B df48a3ba17af90aa665b35c3c9aec7d6658d89596e5c309337ddef739dbf18d457eedb56e14e8b6616197929e87ad8cc42194e032dce0c3dc41099a6fc9fd662 SHA512 57ec29b85cc962c89ae1803c57046d8f08d9886fde1afbf633eff6bbf8ec6d1df831155b83e915e27bc11a05ea13006a74012964087e102ceb77d6db047e0430
+MISC metadata.xml 541 BLAKE2B fbb4dc703e53b619c029a38760d8e203e6ccfef67aa12819f58498f656e5e8e537420e3aa7c3e51b739d87719e1c1bb0797e276bd6b71747353ba033fdabb85e SHA512 285600ed28814d562adab4354c7026c4f7774dd7b98e08880182523b12650df9fb3faf135281effd6b7ea2a254c8a129d130b3f4cfa186e4f9052a3162577ab8
diff --git a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.8.ebuild b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.8.ebuild
index 3c3850f2a8f9..7f512ca48345 100644
--- a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.8.ebuild
+++ b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh/archive/v${PV}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="sys-kernel/dracut"
 RDEPEND="${DEPEND}
diff --git a/sys-kernel/dracut-crypt-ssh/metadata.xml b/sys-kernel/dracut-crypt-ssh/metadata.xml
index b2a02709da9f..f8b2ddc657ea 100644
--- a/sys-kernel/dracut-crypt-ssh/metadata.xml
+++ b/sys-kernel/dracut-crypt-ssh/metadata.xml
@@ -8,4 +8,7 @@
 	<longdescription lang="en">
 	crypt-ssh is a dracut module which allows remote unlocking of block devices encrypted with LUKS via ssh, during the initramfs stage of the boot.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">dracut-crypt-ssh/dracut-crypt-ssh</remote-id>
+	</upstream>
 </pkgmetadata>
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 )