sys-kernel/genkernel: bump to v4.2.5

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

4 files changed, 1 insertions, 78 deletions

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 7494f45e6b86..65c0470c18eb 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -21,7 +21,7 @@ DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST genkernel-4.0.10.tar.xz 460816 BLAKE2B d5922eede1192bb95ca235106a70118826c2c4c078f741e25954485f142d858bf612f35b94553fc409e4f6641b256a2940f83131c5b4bc7d6dbae85019bee7ff SHA512 29dc29b346b132cc6e7ea5298e49c93d01ba28531928cb7a6125864c7d03b74f70bc74043b220dfbbb6651ad67fcbc3d8ed8a2d0f40d271b83e9a8ab0325a2dd
 DIST genkernel-4.2.3.tar.xz 486688 BLAKE2B bd6546ef3c7205e14b8d7e563899fc13bd0c1f90e929c6a805f9e89758fb56fac5cc4ebf6f44d708cf199fc6e2a42704a9d4314bdcceb11e402afb9877608cc6 SHA512 a35b87931e080fe1b61032f8ea655b774c29d652086b7bf31f98aa829490edf8a9e9dbd41c5b8274b64db1946b162977d907f3665da1d99a62666f745f62b6f1
-DIST genkernel-4.2.4.tar.xz 472744 BLAKE2B 712edd219611ce2fa43ec5987ebeff0e21d96d2199fe9ab5d65bd957d20b15d8d9c8c61b8432e820afc70844888553b433c3acc59148fc1eb8aa2426027c5b65 SHA512 0c0638ad5b345cd9450fb28981939fdd9e31e55871c5fe73438ffb3067c50e6935b2bc0f8ce22af03153710e48063fd327ff64e9c34f59ee760917bde8c51578
+DIST genkernel-4.2.5.tar.xz 488188 BLAKE2B e960a46eb6053476bcf46ed0156d3b0c2712d69e339b644033272eb4d1d1f7325e03d4a1921e79282e29aa08134ee17060439983069718f0411a57e98c14ef2e SHA512 3d417507dc06a91e4d356d1a5476faab8d9ad3c18f72bc6d6244a14f46673cf4e349d9eaca377e79c72f713ff7818d8676b0b59553c748abf3cd8454a532f271
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
 DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
diff --git a/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch b/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch
deleted file mode 100644
index ab74620e0fa7..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e43878aa62e563fcefa7c1da5c44017816ac65b4 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 29 Sep 2021 20:15:56 +0200
-Subject: defaults/software.sh: dropbear needs libxcrypt
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- defaults/software.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/defaults/software.sh b/defaults/software.sh
-index 54836ad..9f64ab0 100644
---- a/defaults/software.sh
-+++ b/defaults/software.sh
-@@ -67,7 +67,7 @@ GKPKG_DMRAID_BINPKG="${GKPKG_DMRAID_BINPKG:-%%CACHE%%/dmraid-${GKPKG_DMRAID_PV}-
- 
- GKPKG_DROPBEAR_PN="dropbear"
- GKPKG_DROPBEAR_PV="${GKPKG_DROPBEAR_PV:-VERSION_DROPBEAR}"
--GKPKG_DROPBEAR_DEPS="zlib"
-+GKPKG_DROPBEAR_DEPS="zlib libxcrypt"
- GKPKG_DROPBEAR_SRCTAR="${GKPKG_DROPBEAR_SRCTAR:-${DISTDIR}/dropbear-${GKPKG_DROPBEAR_PV}.tar.bz2}"
- GKPKG_DROPBEAR_SRCDIR="${GKPKG_DROPBEAR_SRCDIR:-dropbear-${GKPKG_DROPBEAR_PV}}"
- GKPKG_DROPBEAR_BINPKG="${GKPKG_DROPBEAR_BINPKG:-%%CACHE%%/dropbear-${GKPKG_DROPBEAR_PV}-%%ARCH%%.tar.xz}"
--- 
-cgit v1.2.3-18-g5258
-
diff --git a/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch b/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch
deleted file mode 100644
index 09ac6422e16d..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c869ac450ae286908cfed582b0c51fe327555833 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 30 Sep 2021 23:12:52 +0200
-Subject: gen_initramfs.sh: append_modprobed(): Adopt changes from
- sys-apps/baselayout-2.8
-
-In >=sys-apps/baselayout-2.8, /etc/modprobe.d was moved to /lib/modprobe.d.
-
-This commit will try to copy /etc/modprobe.d and /lib/modprobe.d but will
-no longer fail if one directory is missing.
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- gen_initramfs.sh | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/gen_initramfs.sh b/gen_initramfs.sh
-index 8f11127..56d6a03 100755
---- a/gen_initramfs.sh
-+++ b/gen_initramfs.sh
-@@ -1832,10 +1832,19 @@ append_modprobed() {
- 	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
- 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
- 
--	mkdir -p "${TDIR}"/etc || gen_die "Failed to create '${TDIR}/etc'!"
-+	local modprobe_dir
-+	for modprobe_dir in /etc/modprobe.d /lib/modprobe.d
-+	do
-+		if [[ ! -e "${modprobe_dir}" ]]; then
-+			print_info 5 "'${modprobe_dir}' does not exist; Skipping ..."
-+			continue
-+		fi
-+
-+		mkdir -p "${TDIR}${modprobe_dir}" || gen_die "Failed to create '${TDIR}${modprobe_dir}'!"
- 
--	cp -rL "/etc/modprobe.d" "${TDIR}"/etc/ 2>/dev/null \
--		|| gen_die "Failed to copy '/etc/modprobe.d'!"
-+		cp -aL "${modprobe_dir}"/. "${TDIR}${modprobe_dir}" 2>/dev/null \
-+			|| gen_die "Failed to copy '${modprobe_dir}'!"
-+	done
- 
- 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
- 	log_future_cpio_content
--- 
-cgit v1.2.3-18-g5258
-
diff --git a/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild b/sys-kernel/genkernel/genkernel-4.2.5.ebuild
index dfef98dec331..a7c583a33ed9 100644
--- a/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.5.ebuild
@@ -125,11 +125,6 @@ if [[ ${PV} == 9999* ]]; then
 	DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-dropbear-depend.patch
-	"${FILESDIR}"/${P}-modprobe-d-fix.patch
-)
-
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
 		git-r3_src_unpack