[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2016-03-27  6:26 Mike Frysinger
  0 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2016-03-27  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     f6bc3f007b3d7e3db74d23c3e2b339a2654c594e
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 06:22:05 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 06:22:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6bc3f00

sys-kernel/genkernel: version bump for System.map fixes #570822

 sys-kernel/genkernel/Manifest                      |   1 +
 .../files/genkernel-3.4.52.4-system-map.patch      |  38 +++++
 sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild  | 162 +++++++++++++++++++++
 sys-kernel/genkernel/genkernel-3.5.0.1.ebuild      | 161 ++++++++++++++++++++
 4 files changed, 362 insertions(+)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 2452938..0c53210 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -11,6 +11,7 @@ DIST genkernel-3.4.52.2.tar.xz 278792 SHA256 3bb893bcf6b3bcf11ded61127a4321df8d4
 DIST genkernel-3.4.52.3.tar.xz 282976 SHA256 7873c7ff94f3a36f2c71f4915e82b92afd16f1ecd29af290c5d3e8d300857bf5 SHA512 a68b0149b9a69f59ab3e8d772f35f12643b9500c0c684d4824ca1f3c669b0ea01989a55643cd5b413f35d6fff284cd5ede7183971e202b3788caeb399259191f WHIRLPOOL 6212b7df42755784ade2741150e7093c3dea440cc89897991985fb867d46a05b56931d1a7b083f141fd71ffe96237b1cd26d53ce4e35a155f28508a8e131c03f
 DIST genkernel-3.4.52.4.tar.xz 284064 SHA256 3a2fd217c4817f4b8a4a1bef7051c373f10fddd6983125b61050a134c4a78c2a SHA512 2dcdf2acb19c868ea7bfd5a0f9c7c3b179ac0f9f31b74306641dd8a1e8b076f5122e60a96c006e20f634e9e540d51723ef94bf91d8e28217dbb2159ff4d896dc WHIRLPOOL 92ec9850ec67e3b227dc8689a494fb31554872ad772fdfdb152fe2033fcaff9c34669b3a76806171bb3971e34e2ea63d118ab268220d18669b298574e976edda
 DIST genkernel-3.5.0.0.tar.xz 283880 SHA256 11d20c45d9dd0b75de1526805d11c578d8d4003e9e0761e4caa42f36021b568f SHA512 8c54981da2b98ae20f96a27e7a7583ea53e75b24d8e787a469e8ff4252c1f66feb7726657e48f5afc26f08d091aec81271670d02e048121e4c96018c91be38a7 WHIRLPOOL 4a7c36cee89d98bea05bd5fc626a744b7b519bc4a4dde6f6edb001ee9ba2a7fc33e7addf066a30d755d1088a1c6b6cdbe89fee4ae71f56bb960a3b0b2710256b
+DIST genkernel-3.5.0.1.tar.xz 284736 SHA256 333460df76260e494d353850687f0891e88382a1bcba71999a6879b257dadd1a SHA512 2ff6c38686e00c5e84312fbe33f3ac3579a5169a98f6bc29ee6c718864b6187fde8f21536767fdaaddfcc7a405c6ebff3c2b7f095ec137e74bc7c028e9a19447 WHIRLPOOL 4dbc053c6af4ef490b9575e942a525d21fedf3ab3b626355f131074d1d67bf393f05785497de50bc2b6a26f3dcc9518e021054603994c1bdb42323e3031976eb
 DIST gnupg-1.4.11.tar.bz2 3407075 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6 SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae WHIRLPOOL 6f914627e2f527f6616e1f99d2ae06942b734f839d03a45ffa45bf67516a81d58f89e6a85612cf8e5fd83be04ab0b6bc2da8f81114143dad7523e5fcea62366b
 DIST mdadm-3.1.5.tar.bz2 292709 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3 SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d WHIRLPOOL 003595a1338b3a95ccc176b07a31f26dd5fda9460f2c4d3513b9ca09cdab1c91dab05f8914f2354047fccff42c4dcfc6131a383c84467c2838ac7b1af2f9bef8
 DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 WHIRLPOOL 4b04c8481c6c5f094ca6f7761828006a84eda7a22a6b3a4d65e7b3e4b39e73ef839ec710b491e7ca731b047fa8c74a9c03a17e85519a62dfbeb95222cfbdd935

diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch
new file mode 100644
index 0000000..1a85c49
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch
@@ -0,0 +1,38 @@
+From 4fb8318037a8ea12f54b7c711d702b432113f233 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 27 Mar 2016 02:04:41 -0400
+Subject: [PATCH] adjust System.map die check for #570822
+
+Builds with newer genkernel have been failing in catalyst like so:
+* ERROR: Could not copy System.map from kerncache for the kernel package!
+
+The code that added it seems to have been meant to check the minkernpackage/
+subdir where the file was renamed instead of the current subdir.  Change the
+check to simplify verify the mv didn't fail instead of duplicating the file
+name entirely.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ gen_package.sh | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/gen_package.sh b/gen_package.sh
+index 9dd166b..b08ff03 100755
+--- a/gen_package.sh
++++ b/gen_package.sh
+@@ -45,11 +45,8 @@ gen_minkernpackage() {
+ 	if [ "${KERNCACHE}" != "" ]
+ 	then
+ 		/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV}
+-		mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}}
+-		if [ ! -f System.map-${KNAME}-${ARCH}-${KV} ]
+-		then
++		mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} ||
+ 			gen_die 'Could not copy System.map from kerncache for the kernel package!'
+-		fi
+ 	else
+ 		cp "${KERNEL_OUTPUTDIR}/System.map" "${TEMP}/minkernpackage/System.map-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!';
+ 	fi
+-- 
+2.7.4
+

diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
new file mode 100644
index 0000000..e73bf5f
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
+
+VERSION_BUSYBOX='1.20.2'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
+		https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-2 bash-completion-r1 eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+else
+	inherit bash-completion-r1 eutils
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="cryptsetup ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+	cryptsetup? ( sys-fs/cryptsetup )
+	app-arch/cpio
+	>=app-misc/pax-utils-0.2.1
+	!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+pkg_pretend() {
+	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.xz
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+	if use selinux ; then
+		sed -i 's/###//g' "${S}"/gen_compile.sh || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+
+	epatch "${FILESDIR}"/${P}-system-map.patch #570822
+	epatch_user
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	cd "${DISTDIR}"
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog 'https://www.gentoo.org/doc/en/genkernel.xml'
+	echo
+	ewarn "This package is known to not work with reiser4.  If you are running"
+	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
+	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
+	echo
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+}

diff --git a/sys-kernel/genkernel/genkernel-3.5.0.1.ebuild b/sys-kernel/genkernel/genkernel-3.5.0.1.ebuild
new file mode 100644
index 0000000..3245f6a
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.5.0.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
+
+VERSION_BUSYBOX='1.20.2'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
+		https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-2 bash-completion-r1 eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+else
+	inherit bash-completion-r1 eutils
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		${COMMON_URI}"
+	#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="cryptsetup ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+	cryptsetup? ( sys-fs/cryptsetup )
+	app-arch/cpio
+	>=app-misc/pax-utils-0.2.1
+	!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+pkg_pretend() {
+	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.xz
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+	if use selinux ; then
+		sed -i 's/###//g' "${S}"/gen_compile.sh || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+
+	epatch_user
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	cd "${DISTDIR}"
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog 'https://www.gentoo.org/doc/en/genkernel.xml'
+	echo
+	ewarn "This package is known to not work with reiser4.  If you are running"
+	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
+	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
+	echo
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2019-07-14 18:57 Thomas Deutschmann
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Deutschmann @ 2019-07-14 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     e9c8d7682c15d9ca298a3c86f00726f4ada4bab3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 16:07:29 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 18:57:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c8d768

sys-kernel/genkernel: update ebuild for genkernel v4

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-kernel/genkernel/Manifest               |  24 +++-
 sys-kernel/genkernel/files/genkernel-4.bash |  74 ++++++++++
 sys-kernel/genkernel/genkernel-9999.ebuild  | 213 ++++++++++++++++++----------
 3 files changed, 231 insertions(+), 80 deletions(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 4922687f906..8bb75f3cf1e 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,11 +1,16 @@
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
-DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa12657ec81a794c84ad161988afdb8693ac247877a2645d693a0740c74c8b991047ed2ba4adc9ec75f1c261a9 SHA512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7
+DIST LVM2.2.02.185.tgz 2386328 BLAKE2B d2e31de3eedd7518ea2d239cb9b36b38e351d7fc070097a1fc4e7934e3636195da3247fba57d684bb0b31b7f3dbdfe29161bd121b2962b2c35c8c9d7914b4506 SHA512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf
 DIST LVM2.2.02.88.tgz 1029151 BLAKE2B e3ce91b6c43155a66b79cf25da3973abb19decde3acc37d28daf80d14b1bd574f7d31fbcee4b397f0a146b2e221599079e521d0ac21932ff58b7c9d4fdf93501 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b
+DIST btrfs-progs-v5.1.1.tar.xz 2041940 BLAKE2B ca032cf17e78e5892788b677b5a0fead7cf1108fd464facb48e713b259c8c75f8b7714377f75e7b9e595c7c8fa5927fa37d11f43f51e4d898698f9fc5d26a808 SHA512 0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd
 DIST busybox-1.20.2.tar.bz2 2186738 BLAKE2B 3efa01ee81a9f3af0ccbcf28b1a24e817a28012d27a27c714b3f13fe4a73200af66fb93dcd9adc65de3e3abb26757939ff3d3ba620af08101c27c5f3550e7501 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd
 DIST busybox-1.26.0.tar.bz2 2143958 BLAKE2B 3a4a227a4308d9d5e00c00fc5e90ee9a1d6345574bdb571cd8b4adab63dcdad3ff7edf30154bb8f8f31a3a658c85641af0f7875d4d533d56bb7c79f28980ebe6 SHA512 9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
-DIST busybox-1.30.1.tar.bz2 7793781 BLAKE2B 429f6bd48cb6ede81f956d450cf05b799dce9dbd61593b6dd787f353c2de3734d576ddfec644fa5ab6c61895400c32e3cb28c939b06eaa33eef105c8f8f13d8f SHA512 c18b3d06356d4708b4b0e89d23500d2fe494da9f6aac09c0c19a2e5145ba2bfe8261088eae6562c900996b50c5a9c20459f908069267898c8f86fe3b0b7bd80b
+DIST busybox-1.31.0.tar.bz2 2427873 BLAKE2B 7fff2ac2c39232f9dbd8ea4af55539e9eb7ab2ddabf2f53534f57cabe00a6096643415275dcfa2730f970994282776f9ce661e99e681989449473182ffe820e1 SHA512 cd58f0b2b6e3bb1b771fcf3d15f420518fb9b10086a45cfb1d7f136ac035be89eec28f9350e42b3fc38454d8bef9190eae0376497487c73785e8fde44c793730
+DIST cryptsetup-2.1.0.tar.xz 10662576 BLAKE2B c79b24c986d5925aed31eddf8f271c3d0f12c89b3f99f953cfa39fe0d9dca2ab3dd2f6ea22141aca0148d6d533d197378b011561075ca26a14ca2e90500a1689 SHA512 f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
+DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f
+DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
+DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42
 DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST genkernel-3.4.52.3.tar.xz 282976 BLAKE2B 69eb6a964c5c20ee32ea6143b576a85090dfb50c011c641ae8415fba1cb99e7f239f4ba7fdc450b7c0eb93a248610c47e751f3993b8fff6e51b9602c37145af9 SHA512 a68b0149b9a69f59ab3e8d772f35f12643b9500c0c684d4824ca1f3c669b0ea01989a55643cd5b413f35d6fff284cd5ede7183971e202b3788caeb399259191f
@@ -22,12 +27,23 @@ DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96
 DIST gnupg-1.4.11.tar.bz2 3407075 BLAKE2B 85d35d2e4da65d54add1010ea0486b943b328785e28c4efcaa2b65daafd53410a355d1df79ae45c5f7767d2eb7ff1f0b9637f417e65b084d2c760a281abd317a SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
-DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
+DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
+DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
+DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
+DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
+DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 DIST mdadm-3.1.5.tar.bz2 292709 BLAKE2B a21fb41c6fd9f332e358339537cffd520788140976bf37fece072ee15eb512b1455e3a927abca0a4315e59659d3d114e407bb98a0ca8e6e559e1d1b83be4abbf SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d
 DIST mdadm-4.0.tar.xz 430780 BLAKE2B f08a67452398c864d73c78e2a7258d89c5c81b83dd136d4cd7e31e46b22d75ff67ecf553dc22f55dca418409daded51a399728dfdbd36039e828cad3233774e6 SHA512 12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
+DIST multipath-tools-0.8.0.tar.gz 447076 BLAKE2B 10a93a2654decd2377414188013d2141e34288fe119fa7c54047d95b825ef9ae64b20de1067d3f37a904b58be587997842f7a62088701fe1c1e6a078283b56e4 SHA512 8b6081109e535d0e392233bcedda930bc6d4b529ebe23bc45b276026311bc997e3cf8b39c1a86e4962c464faa69512202c0f6fb3d1f06c6445f8141853ad1bc4
 DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
-DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
+DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
+DIST strace-5.2.tar.xz 1515544 BLAKE2B 919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0 SHA512 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35
 DIST unionfs-fuse-0.24.tar.bz2 30381 BLAKE2B c3886d7b0cbd4ac62712d7d94bf9544481200e4354539b29770a88974ea3298b0f594cecfc6f7accff3595004ad1453075b947a2633b5300a3684fedba4995e5 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
+DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98e28a413ef26a3dc8fa6f400ba74aa14aabdef5e28d4fed5fb01cee33b0bd5de9fb0682523aaa50c6053fd3471711a02e7 SHA512 47413b4a593d19185ee3d455e5744042c060cb50008dac25e9135c5cd2250ef5129a419258b18c665c8c794ad3b09234fdd70a106c72d8fc64631172b13d0e22
+DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
+DIST xfsprogs-5.0.0.tar.xz 1218476 BLAKE2B ef6eaab43531f696f739972c362e31c3304baaecb3485b45c16441a8bf7f1da7f47cd74a21660ba2c2bb45858a2b13b7af41c94671135f6a32a36eb745c024a0 SHA512 cebe3d2ea80676a99cc7f9cc014894398fbe3bdaf237829e9c7aa0404558c1ab16f2055acb5afd8234b2bc8475117bcef3c7500c553adb12bbaf3262bd077d18
+DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
+DIST zstd-1.4.0.tar.gz 1898741 BLAKE2B 1b92a055712bb47c3d56c51f3ddddeaba00f9b746f7e47a2fa1a0afdf9798ff90f0ec734880a5d03644d47deb0e55f75c2cd3cbdab1a146dba5f49d4efeb2ae0 SHA512 8614934e25eb1e82b554c483bc9d2d055f51344697295e83b22a8d726321b12068cfa7f7d2a9fe28a2de7c9edda59733826277efc7046e13674d6f7f02af5671

diff --git a/sys-kernel/genkernel/files/genkernel-4.bash b/sys-kernel/genkernel/files/genkernel-4.bash
new file mode 100644
index 00000000000..631fc8b30e4
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.bash
@@ -0,0 +1,74 @@
+# genkernel (8) completion
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# Written by Aron Griffis <agriffis@gentoo.org>
+
+_genkernel()
+{
+    declare cur prev genkernel_help actions params
+    COMPREPLY=()
+    cur=${COMP_WORDS[COMP_CWORD]}
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    # extract initial list of params/actions from genkernel --help
+    genkernel_help=$(command genkernel --help)
+    actions=( $(<<<"$genkernel_help" sed -n \
+	'/^Available Actions:/,/^$/s/^[[:space:]]\+\([^[:space:]]\+\).*/\1/p') )
+    params=( $(<<<"$genkernel_help" egrep -oe '--[^[:space:]]{2,}') )
+
+    # attempt to complete the current parameter based on the list
+    COMPREPLY=($(compgen -W "${params[*]/=*/=} ${actions[*]}" -- "$cur"))
+
+    # if we don't have a rhs to complete
+    if [[ ${#COMPREPLY[@]} -gt 1 ]]; then
+	return
+    elif [[ ${#COMPREPLY[@]} -eq 0 && $cur != --*=* ]]; then
+	return
+    elif [[ ${#COMPREPLY[@]} -eq 1 && $COMPREPLY != --*= ]]; then
+	# using nospace completion, add an explicit space
+	COMPREPLY="${COMPREPLY} "
+	return
+    fi
+
+    # we have a unique lhs and need to complete the rhs
+    declare args lhs rhs
+    if [[ ${#COMPREPLY[@]} -eq 1 ]]; then
+	lhs=$COMPREPLY
+    else
+	lhs=${cur%%=*}=
+	rhs=${cur#*=}
+    fi
+
+    # genkernel's help gives clues as to what belongs on the rhs.
+    # extract the clue for the current parameter
+    args=" ${params[*]} "
+    args="${args##* $lhs}"
+    args="${args%% *}"
+
+    # generate a list of completions for the argument; this replaces args with
+    # an array of results
+    args=( $(case $args in
+	('<0-5>') compgen -W "$(echo {1..5})" -- "$rhs" ;;
+	('<outfile>'|'<file>') compgen -A file -o plusdirs -- "$rhs" ;;
+	('<archive>') compgen -G '*.tar.xz' -G '*.tbz2' -G '*.tar.bz2' -o plusdirs -- "$rhs" ;;
+	('<dir>'|'<path>') compgen -A directory -S / -- "$rhs" ;;
+
+	(*) compgen -o bashdefault -- "$rhs" ;; # punt
+    esac) )
+
+    # we're using nospace completion to prevent spaces after paths that aren't
+    # "done" yet.  So do some hacking to the args to add spaces after
+    # non-directories.
+    declare slash=/
+    args=( "${args[@]/%/ }" )			# add space to all
+    args=( "${args[@]/%$slash /$slash}" )	# remove space from dirs
+
+    # recreate COMPREPLY
+    if [[ $cur == "$lhs"* ]]; then
+	COMPREPLY=( "${args[@]}" )
+    elif [[ ${#args[@]} -gt 0 ]]; then
+	COMPREPLY=( "${args[@]/#/$lhs}" )
+    fi
+}
+
+complete -o nospace -F _genkernel genkernel

diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 767e288dba9..c1e47a03889 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -4,40 +4,73 @@
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
 
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch estack
-
-VERSION_BUSYBOX='1.30.1' # warning, be sure to bump patches
-VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
-VERSION_LIBAIO='0.3.110' # warning, be sure to bump patches
-VERSION_MDADM='4.1' # warning, be sure to bump patches
-VERSION_FUSE='2.9.9' # warning, be sure to bump patches
-VERSION_ISCSI='2.0.875' # warning, be sure to bump patches
-VERSION_ISCSI_ISNS='0.99' # warning, be sure to bump patches
-VERSION_LVM='2.02.183' # warning, be sure to bump patches
-VERSION_UNIONFS_FUSE='2.0'
-VERSION_GPG='1.4.23'
+EAPI="7"
+
+inherit bash-completion-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BTRFS_PROGS="5.1.1"
+VERSION_BUSYBOX="1.31.0"
+VERSION_CRYPTSETUP="2.1.0"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2019.78"
+VERSION_EUDEV="3.2.8"
+VERSION_E2FSPROGS="1.45.2"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_ISCSI="2.0.875"
+VERSION_JSON_C="0.13.1"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.8.4"
+VERSION_LIBGPGERROR="1.36"
+VERSION_LVM="2.02.185"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_MULTIPATH_TOOLS="0.8.0"
+VERSION_POPT="1.16"
+VERSION_STRACE="5.2"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_USERSPACE_RCU="0.10.2"
+VERSION_UTIL_LINUX="2.34"
+VERSION_XFSPROGS="5.0.0"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.4.0"
 
 RH_HOME="ftp://sourceware.org/pub"
 DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
 BB_HOME="https://busybox.net/downloads"
 
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-		https://github.com/open-iscsi/open-isns/archive/v${VERSION_ISCSI_ISNS}.tar.gz -> open-isns-${VERSION_ISCSI_ISNS}.tar.gz
-		https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-		mirror://debian/pool/main/liba/libaio/libaio_${VERSION_LIBAIO}.orig.tar.gz -> libaio-${VERSION_LIBAIO}.tar.gz
-		https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
+COMMON_URI="
+	mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://kernel/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${VERSION_MULTIPATH_TOOLS};sf=tgz -> multipath-tools-${VERSION_MULTIPATH_TOOLS}.tar.gz
+	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
+	mirror://kernel/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 	inherit git-r3
 	S="${WORKDIR}/${P}"
@@ -54,15 +87,13 @@ HOMEPAGE="https://www.gentoo.org"
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
+IUSE="ibm +firmware"
 
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
+DEPEND=""
 RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
 	app-arch/cpio
 	>=app-misc/pax-utils-1.2.2
-	sys-apps/util-linux[static-libs(+)]
+	sys-apps/sandbox
 	firmware? ( sys-kernel/linux-firmware )
 	!<sys-apps/openrc-0.9.9"
 # pax-utils is used for lddtree
@@ -71,17 +102,9 @@ if [[ ${PV} == 9999* ]]; then
 	DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
 src_prepare() {
+	default
+
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"
 		GK_V="$(git describe --tags | sed 's:^v::')-git"
@@ -91,30 +114,41 @@ src_prepare() {
 		git log > "${S}"/ChangeLog || die
 		popd >/dev/null || die
 	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
 
 	# Update software.sh
 	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI_ISNS:$VERSION_ISCSI_ISNS:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LIBAIO:$VERSION_LIBAIO:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
 		"${S}"/defaults/software.sh \
 		|| die "Could not adjust versions"
-
-	epatch_user
 }
 
 src_compile() {
-	if [[ ${PV} == 9999* ]]; then
+	if [[ ${PV} == 9999* ]] ; then
 		emake
 	fi
 }
@@ -133,31 +167,58 @@ src_install() {
 	else
 		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
 	fi
+
 	insinto /usr/share/genkernel
 	doins -r "${S}"/*
 
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	fperms +x /usr/share/genkernel/gen_worker.sh
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
 	insinto /etc
 	doins "${FILESDIR}"/initramfs.mounts
 
-	cd "${DISTDIR}"
+	pushd "${DISTDIR}" &>/dev/null || die
 	insinto /usr/share/genkernel/distfiles
 	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
 }
 
 pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT%/}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd "${gk_config}" 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+	fi
 }


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2019-12-14 20:34 Thomas Deutschmann
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Deutschmann @ 2019-12-14 20:34 UTC (permalink / raw
  To: gentoo-commits

commit:     f2a3aabf54ae5421b64fc726dd45a92dd382d7d9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 20:33:44 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 20:33:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a3aabf

sys-kernel/genkernel: bump to v4.0.1

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-kernel/genkernel/Manifest                      |  8 ++--
 ...ernel-4.0.0-improve-selinux-compatibility.patch | 54 ----------------------
 ...rnel-4.0.0-r1.ebuild => genkernel-4.0.1.ebuild} | 10 ++--
 sys-kernel/genkernel/genkernel-9999.ebuild         |  8 ++--
 4 files changed, 12 insertions(+), 68 deletions(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index f54958ef5e6..5de06f224db 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,8 +1,8 @@
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
 DIST LVM2.2.02.186.tgz 2389759 BLAKE2B e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae SHA512 06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03
 DIST LVM2.2.02.88.tgz 1029151 BLAKE2B e3ce91b6c43155a66b79cf25da3973abb19decde3acc37d28daf80d14b1bd574f7d31fbcee4b397f0a146b2e221599079e521d0ac21932ff58b7c9d4fdf93501 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b
-DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
-DIST btrfs-progs-v5.3.1.tar.xz 2077644 BLAKE2B f2943fd2215cfc65095e361824deb862c1934bb734c0f3073d8d0a7cb40c606e9e8054e36ae467f6d67f3ed58120493b9515f6a1d0d1062f864dd44521d1bab1 SHA512 7e7ac18a1ced5a8e5db7c0651ac438a48242fb4ca045b944527ed07ac91e87397dbab62b99d67d782501a632f4178db605e81912dfa48ac831d07177f96876fa
+DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
+DIST btrfs-progs-v5.4.tar.xz 2103432 BLAKE2B 8ed1321c61d73b66bd27b37a255056e601302dacdcf2dd3122d1b7c41e537ebd1aa5df51100e61458084ec15efd6a1aa478d13f424d45d33d7454d886214a994 SHA512 cc445b9e2b7c5a0adeaa0c467de797f240e4ee9b58c6ac51b9dad51bc0ba0c580fd265efebc04fa46dc23e5b3c4d6baf3ad0b8e2e82728cf34ef51973f028a90
 DIST busybox-1.20.2.tar.bz2 2186738 BLAKE2B 3efa01ee81a9f3af0ccbcf28b1a24e817a28012d27a27c714b3f13fe4a73200af66fb93dcd9adc65de3e3abb26757939ff3d3ba620af08101c27c5f3550e7501 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd
 DIST busybox-1.26.0.tar.bz2 2143958 BLAKE2B 3a4a227a4308d9d5e00c00fc5e90ee9a1d6345574bdb571cd8b4adab63dcdad3ff7edf30154bb8f8f31a3a658c85641af0f7875d4d533d56bb7c79f28980ebe6 SHA512 9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
@@ -25,7 +25,7 @@ DIST genkernel-3.5.2.4.tar.xz 318152 BLAKE2B 101bd8011b73699a3d8410fcb93adca2417
 DIST genkernel-3.5.2.5.tar.xz 318652 BLAKE2B 9b0e1b07f61b54edc1d263cc679b36d7e9062fd1e7cf11fc9442cf60b217274bc73425150ca963b6a91cd504d7817a852fa5bf4ad7634ff8d1ec3b43748ded41 SHA512 096aa77f4a52afefcef81ff6c7eb281e539af304854572389e38bbdd735ca723c7a5f2f7163fa9f387e3a2a78a2ba117260f1c8396ed4e51e12a91ad0fb0ff90
 DIST genkernel-3.5.3.2.tar.xz 320644 BLAKE2B 14eaf05aab02287c3dbb98f1a596e73bcbea39ceb2c8e44c5bdbb77b656958cee666f4353a2401bad531c2a7a98ee11b2531b251c19edc86db517cf3cc2869ec SHA512 1bee8ebdb8c2c30e90e0a1c573ad09b0eb79da54f0829859305eb50ffab95e69aa219ce82d4969140dea3d8788d66d3490fc03d38e190b533666e9278c7f96a6
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
-DIST genkernel-4.0.0.tar.xz 412900 BLAKE2B d7faab73557ead538f70b9295b93e56d83ced6b216fb469ad6d4161f34732710953f1f646a112f8e8992ff3d595905f375a3dc40f4098e53b8617f7e029a8a03 SHA512 a73ba07c11c54a1babda839398b6d87712a1e28bcb97aac74472b07d3adb765697270f3cc4442aea85148888e114696328df33a06fdfa9b6cbd5e62798a0ff25
+DIST genkernel-4.0.1.tar.xz 414356 BLAKE2B 25404e29227b6df06aceffe4fff840eba8c0a50e18e2cd2017a3ce9b0e25785c341e2cfef353d056e0f43a3980f72435930e99f20dc7ceb1bca882f481741d82 SHA512 783dde79ae220f08bb1b45e4ba95958eac6477abaa6e7244a64cfd4d3c9e1b6d145161da8235354e81724cded3bc63608a65285bc268ac35831c29c44fc382d4
 DIST gnupg-1.4.11.tar.bz2 3407075 BLAKE2B 85d35d2e4da65d54add1010ea0486b943b328785e28c4efcaa2b65daafd53410a355d1df79ae45c5f7767d2eb7ff1f0b9637f417e65b084d2c760a281abd317a SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
@@ -41,7 +41,7 @@ DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd5178328859
 DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
-DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a
+DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
 DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
 DIST unionfs-fuse-0.24.tar.bz2 30381 BLAKE2B c3886d7b0cbd4ac62712d7d94bf9544481200e4354539b29770a88974ea3298b0f594cecfc6f7accff3595004ad1453075b947a2633b5300a3684fedba4995e5 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758

diff --git a/sys-kernel/genkernel/files/genkernel-4.0.0-improve-selinux-compatibility.patch b/sys-kernel/genkernel/files/genkernel-4.0.0-improve-selinux-compatibility.patch
deleted file mode 100644
index a61ba8a0eef..00000000000
--- a/sys-kernel/genkernel/files/genkernel-4.0.0-improve-selinux-compatibility.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a611a39cabab9836b51d1fc4326c3747cbdcd29a Mon Sep 17 00:00:00 2001
-From: Mark Wright <gienah@gentoo.org>
-Date: Fri, 6 Dec 2019 16:23:51 +0100
-Subject: Improve SELinux compatibility
-
-Closes: https://bugs.gentoo.org/697074
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- gen_funcs.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/gen_funcs.sh b/gen_funcs.sh
-index 107f02b..f5dd0cd 100755
---- a/gen_funcs.sh
-+++ b/gen_funcs.sh
-@@ -728,7 +728,7 @@ dropbear_create_key() {
- 
- 	if isTrue "${SANDBOX}"
- 	then
--		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}'" )
-+		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
- 	fi
- 
- 	# set up worker signal handler
-@@ -805,7 +805,7 @@ dropbear_generate_key_info_file() {
- 
- 	if isTrue "${SANDBOX}"
- 	then
--		envvars+=( SANDBOX_WRITE="${LOGFILE}:${TEMP}" )
-+		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
- 	fi
- 
- 	# set up worker signal handler
-@@ -1397,7 +1397,7 @@ gkbuild() {
- 
- 	if isTrue "${SANDBOX}"
- 	then
--		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}'" )
-+		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
- 	fi
- 
- 	# set up gkbuild signal handler
-@@ -1452,7 +1452,7 @@ unpack() {
- 
- 	if isTrue "${SANDBOX}"
- 	then
--		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}'" )
-+		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
- 	fi
- 
- 	# set up unpack signal handler
--- 
-cgit v1.2.1
-

diff --git a/sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild b/sys-kernel/genkernel/genkernel-4.0.1.ebuild
similarity index 98%
rename from sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild
rename to sys-kernel/genkernel/genkernel-4.0.1.ebuild
index 9a9acff5358..5a6506e5832 100644
--- a/sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.0.1.ebuild
@@ -6,12 +6,12 @@
 
 EAPI="7"
 
-inherit bash-completion-r1 mount-boot
+inherit bash-completion-r1
 
 # Whenever you bump a GKPKG, check if you have to move
 # or add new patches!
-VERSION_BOOST="1.71.0"
-VERSION_BTRFS_PROGS="5.3.1"
+VERSION_BOOST="1.72.0"
+VERSION_BTRFS_PROGS="5.4"
 VERSION_BUSYBOX="1.31.1"
 VERSION_CRYPTSETUP="2.2.2"
 VERSION_DMRAID="1.0.0.rc16-3"
@@ -30,7 +30,7 @@ VERSION_LVM="2.02.186"
 VERSION_LZO="2.10"
 VERSION_MDADM="4.1"
 VERSION_POPT="1.16"
-VERSION_STRACE="5.3"
+VERSION_STRACE="5.4"
 VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
 VERSION_UNIONFS_FUSE="2.0"
 VERSION_UTIL_LINUX="2.34"
@@ -109,8 +109,6 @@ if [[ ${PV} == 9999* ]]; then
 	DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
-PATCHES=( "${FILESDIR}"/${P}-improve-selinux-compatibility.patch )
-
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
 		git-r3_src_unpack

diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 051e149a13d..5a6506e5832 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -6,12 +6,12 @@
 
 EAPI="7"
 
-inherit bash-completion-r1 mount-boot
+inherit bash-completion-r1
 
 # Whenever you bump a GKPKG, check if you have to move
 # or add new patches!
-VERSION_BOOST="1.71.0"
-VERSION_BTRFS_PROGS="5.3.1"
+VERSION_BOOST="1.72.0"
+VERSION_BTRFS_PROGS="5.4"
 VERSION_BUSYBOX="1.31.1"
 VERSION_CRYPTSETUP="2.2.2"
 VERSION_DMRAID="1.0.0.rc16-3"
@@ -30,7 +30,7 @@ VERSION_LVM="2.02.186"
 VERSION_LZO="2.10"
 VERSION_MDADM="4.1"
 VERSION_POPT="1.16"
-VERSION_STRACE="5.3"
+VERSION_STRACE="5.4"
 VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
 VERSION_UNIONFS_FUSE="2.0"
 VERSION_UTIL_LINUX="2.34"


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2020-03-26 23:03 Thomas Deutschmann
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Deutschmann @ 2020-03-26 23:03 UTC (permalink / raw
  To: gentoo-commits

commit:     46b5e16e66c2cc6eebabeacf7819b739c74ec7d3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 23:03:19 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 23:03:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b5e16e

sys-kernel/genkernel: drop old

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-kernel/genkernel/Manifest                      |  15 --
 .../files/genkernel-3.4.52.4-crc32c.patch          | 130 -----------------
 .../files/genkernel-3.4.52.4-grub-mkconfig.patch   |  17 ---
 .../files/genkernel-3.4.52.4-system-map.patch      |  38 -----
 sys-kernel/genkernel/genkernel-3.4.52.3.ebuild     | 154 --------------------
 sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild  | 155 --------------------
 sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild  | 156 --------------------
 sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild  | 157 --------------------
 sys-kernel/genkernel/genkernel-3.5.1.1.ebuild      | 158 --------------------
 sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild   | 159 ---------------------
 sys-kernel/genkernel/genkernel-3.5.2.1.ebuild      | 159 ---------------------
 sys-kernel/genkernel/genkernel-3.5.2.2.ebuild      | 159 ---------------------
 sys-kernel/genkernel/genkernel-3.5.2.3.ebuild      | 159 ---------------------
 sys-kernel/genkernel/genkernel-3.5.2.4.ebuild      | 159 ---------------------
 sys-kernel/genkernel/genkernel-3.5.2.5.ebuild      | 159 ---------------------
 sys-kernel/genkernel/genkernel-3.5.3.2.ebuild      | 159 ---------------------
 16 files changed, 2093 deletions(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index c9bb390f9c2..c079bc430a0 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,10 +1,7 @@
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
 DIST LVM2.2.02.186.tgz 2389759 BLAKE2B e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae SHA512 06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03
-DIST LVM2.2.02.88.tgz 1029151 BLAKE2B e3ce91b6c43155a66b79cf25da3973abb19decde3acc37d28daf80d14b1bd574f7d31fbcee4b397f0a146b2e221599079e521d0ac21932ff58b7c9d4fdf93501 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
 DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f
-DIST busybox-1.20.2.tar.bz2 2186738 BLAKE2B 3efa01ee81a9f3af0ccbcf28b1a24e817a28012d27a27c714b3f13fe4a73200af66fb93dcd9adc65de3e3abb26757939ff3d3ba620af08101c27c5f3550e7501 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd
-DIST busybox-1.26.0.tar.bz2 2143958 BLAKE2B 3a4a227a4308d9d5e00c00fc5e90ee9a1d6345574bdb571cd8b4adab63dcdad3ff7edf30154bb8f8f31a3a658c85641af0f7875d4d533d56bb7c79f28980ebe6 SHA512 9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
@@ -15,19 +12,8 @@ DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9
 DIST expat-2.2.9.tar.xz 422460 BLAKE2B ea0e0bd005bbfd355e819e2b157859878a20ad9a6807cc5a10a6656f062e2443adb483adb0452d751b3d460834e3f613b8ecf7cdaf743be1b15815d005d01fa6 SHA512 e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0
 DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
-DIST genkernel-3.4.52.3.tar.xz 282976 BLAKE2B 69eb6a964c5c20ee32ea6143b576a85090dfb50c011c641ae8415fba1cb99e7f239f4ba7fdc450b7c0eb93a248610c47e751f3993b8fff6e51b9602c37145af9 SHA512 a68b0149b9a69f59ab3e8d772f35f12643b9500c0c684d4824ca1f3c669b0ea01989a55643cd5b413f35d6fff284cd5ede7183971e202b3788caeb399259191f
-DIST genkernel-3.4.52.4.tar.xz 284064 BLAKE2B bc9c37f4bc7ab6c5eb8b4a0fe964843cf2554806d2dedd22feb2c9eae4935d9c432c8608916dece5b48cdd5dbf30aaa04fac6e279392f63c6854c2fbef956b1a SHA512 2dcdf2acb19c868ea7bfd5a0f9c7c3b179ac0f9f31b74306641dd8a1e8b076f5122e60a96c006e20f634e9e540d51723ef94bf91d8e28217dbb2159ff4d896dc
-DIST genkernel-3.5.1.1.tar.xz 292864 BLAKE2B 43bc7838e53ac3bbd3b36fb999e36c3a62da6aa5e4d62606aca9988aff135cc3ab0777fb7e60e2da9de807d059b3393cb686aad06f0bec22d6710f5978d05f27 SHA512 ff564e00bed2c7c211a0c7e73425169a6d354366737b8a561751557980f866dcd071baee5de3b089221cf6cb3ffd61d26ddd7d2f6f7e18d0c0df19ad94da1678
-DIST genkernel-3.5.2.0.tar.xz 291956 BLAKE2B 4719cca00084a513984c9e569650c58948a8aef58f69ab1bf0cb3c7c80b6b9095e82421fbc3fc9e726c8e449f2cca701b383386aff451fdbfa1752b6b4b81cc8 SHA512 3ac1c06dcde4008b5bad4441347e278717b7bc8560c300567f4d2ecf0603249845dacc19aa29483a0801eac073c8150d6d11b4b4edb80fc7cd5cf44745f75045
-DIST genkernel-3.5.2.1.tar.xz 293680 BLAKE2B 22531495514c1ff0e3354ba4d04687aa672dda1889ac04f5924c7c843c4db24a73a113b138300f40d47cdfc4b3b45654fdc284e8b88f55071b1395d0293aab55 SHA512 94dd1e4b09578b1563db5152af1f651022196b05492ef69cd7330fb05eb3c950d71b6b5c5e228c8316ced5130cb7cd9d4a24ce31c5ada093e173c9f67f309789
-DIST genkernel-3.5.2.2.tar.xz 316632 BLAKE2B 31c0b8cb50049c227ddc2c631d70b8a90df7ec79aee1e397c1a96594e5730145d093ff9dd5bc2e9e433e09f1bdccf76d01f6d637c5b071f10183670aee6773c7 SHA512 c98f836d92b2a940fc76e9c9b8799c19a55f6ac818fe74280321a954361e5d0886095d0b95ef429791161fb67afd3d7fdff518cc99c58bdc120456f7321c8edf
-DIST genkernel-3.5.2.3.tar.xz 317280 BLAKE2B 0dcc85dc67fde24bff7d6e86fef5967ae81a45b301e6306fb6d147b7dd5bb72127f364165daefc22e6a340ca31caeaacd94f3618d0d8230ca44e8106e87f3cfd SHA512 78e4464b19d825221527a2c60eecd4a1a625dc66c2d0cc33d69883ad0687e37f974c755301710f582bd4264dc328871d1327314eb098e09c7e6e393b1978f100
-DIST genkernel-3.5.2.4.tar.xz 318152 BLAKE2B 101bd8011b73699a3d8410fcb93adca2417254f05dc4657e583b17a449ba68aa08a3969c93cf558faab751efdcffc1dc8181003a0be0a2c3c8edcd03f09fe943 SHA512 2490ad2c6bacda87c848f8e216318e41f76cc25459c1960d0a10c5ad5768736a527cb954ed2c41ad1f52f53a37ca8c049a56793e97a3cb598b3cc4e436156a74
-DIST genkernel-3.5.2.5.tar.xz 318652 BLAKE2B 9b0e1b07f61b54edc1d263cc679b36d7e9062fd1e7cf11fc9442cf60b217274bc73425150ca963b6a91cd504d7817a852fa5bf4ad7634ff8d1ec3b43748ded41 SHA512 096aa77f4a52afefcef81ff6c7eb281e539af304854572389e38bbdd735ca723c7a5f2f7163fa9f387e3a2a78a2ba117260f1c8396ed4e51e12a91ad0fb0ff90
-DIST genkernel-3.5.3.2.tar.xz 320644 BLAKE2B 14eaf05aab02287c3dbb98f1a596e73bcbea39ceb2c8e44c5bdbb77b656958cee666f4353a2401bad531c2a7a98ee11b2531b251c19edc86db517cf3cc2869ec SHA512 1bee8ebdb8c2c30e90e0a1c573ad09b0eb79da54f0829859305eb50ffab95e69aa219ce82d4969140dea3d8788d66d3490fc03d38e190b533666e9278c7f96a6
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
 DIST genkernel-4.0.5.tar.xz 446876 BLAKE2B b3091e849d6c1a98736f0932446c36a0b52454d4fcc965e3a8fd9a591191d1cd276fd2d5f482cdb39a72915192e6364436dd7e2cca92e9b4e0a1d820a045de99 SHA512 4a78b77b8990b34d4e91ea2fbefde18b148e66a9569041339dc325bb5432a657da5b305713ff3cb1e858495dff8e0ddfe034e6743a204aa50f022d42af77777c
-DIST gnupg-1.4.11.tar.bz2 3407075 BLAKE2B 85d35d2e4da65d54add1010ea0486b943b328785e28c4efcaa2b65daafd53410a355d1df79ae45c5f7767d2eb7ff1f0b9637f417e65b084d2c760a281abd317a SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
@@ -36,7 +22,6 @@ DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3
 DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
 DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
-DIST mdadm-3.1.5.tar.bz2 292709 BLAKE2B a21fb41c6fd9f332e358339537cffd520788140976bf37fece072ee15eb512b1455e3a927abca0a4315e59659d3d114e407bb98a0ca8e6e559e1d1b83be4abbf SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d
 DIST mdadm-4.0.tar.xz 430780 BLAKE2B f08a67452398c864d73c78e2a7258d89c5c81b83dd136d4cd7e31e46b22d75ff67ecf553dc22f55dca418409daded51a399728dfdbd36039e828cad3233774e6 SHA512 12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
 DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0

diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch
deleted file mode 100644
index 48dada2f980..00000000000
--- a/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-modules_load: add crc32c
-
-commit 7308d72c3280da22cd94337b0eb248cdc53cb842 upstream.
-
-Bug: https://bugs.gentoo.org/655110
-
---- a/arch/alpha/modules_load
-+++ b/arch/alpha/modules_load
-@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/arm/modules_load
-+++ b/arch/arm/modules_load
-@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/ia64/modules_load
-+++ b/arch/ia64/modules_load
-@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- 
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
-+
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/mips/modules_load
-+++ b/arch/mips/modules_load
-@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/parisc/modules_load
-+++ b/arch/parisc/modules_load
-@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/parisc64/modules_load
-+++ b/arch/parisc64/modules_load
-@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- 
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
-+
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/ppc/modules_load
-+++ b/arch/ppc/modules_load
-@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/ppc64/modules_load
-+++ b/arch/ppc64/modules_load
-@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- 
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
-+
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/s390/modules_load
-+++ b/arch/s390/modules_load
-@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/sparc/modules_load
-+++ b/arch/sparc/modules_load
-@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/sparc64/modules_load
-+++ b/arch/sparc64/modules_load
-@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- 
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
-+
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/um/modules_load
-+++ b/arch/um/modules_load
-@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- # Filesystems
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
-+# Crypto
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
---- a/arch/x86/modules_load
-+++ b/arch/x86/modules_load
-@@ -29,4 +29,4 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
- # Crypto
--MODULES_CRYPTO="sha256_generic cbc aes_generic aes_586 aesni-intel xts"
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic aes_586 aesni-intel xts"
---- a/arch/x86_64/modules_load
-+++ b/arch/x86_64/modules_load
-@@ -28,4 +28,4 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
- # Crypto
--MODULES_CRYPTO="sha256_generic cbc aes_generic aes-x86_64 aesni-intel xts"
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic aes-x86_64 aesni-intel xts"
---- a/defaults/modules_load
-+++ b/defaults/modules_load
-@@ -28,4 +28,4 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd xhci-hcd x
- MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
- 
- # Crypto
--MODULES_CRYPTO="sha256_generic cbc aes_generic xts"
-+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"

diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch
deleted file mode 100644
index 9e55301228a..00000000000
--- a/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/gen_bootloader.sh b/gen_bootloader.sh
-index 4bbd303..fdca749 100755
---- a/gen_bootloader.sh
-+++ b/gen_bootloader.sh
-@@ -49,8 +49,10 @@ set_bootloader_grub2() {
- 	fi
- 
- 	print_info 1 "You can customize Grub2 parameters in /etc/default/grub."
--	print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..."
--	grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || gen_die "grub2-mkconfig failed"
-+	print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..."
-+	grub-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
-+		grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
-+		gen_die "grub-mkconfig failed"
- 	[ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}"
- }
- 

diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch
deleted file mode 100644
index 1a85c498599..00000000000
--- a/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4fb8318037a8ea12f54b7c711d702b432113f233 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 27 Mar 2016 02:04:41 -0400
-Subject: [PATCH] adjust System.map die check for #570822
-
-Builds with newer genkernel have been failing in catalyst like so:
-* ERROR: Could not copy System.map from kerncache for the kernel package!
-
-The code that added it seems to have been meant to check the minkernpackage/
-subdir where the file was renamed instead of the current subdir.  Change the
-check to simplify verify the mv didn't fail instead of duplicating the file
-name entirely.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- gen_package.sh | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/gen_package.sh b/gen_package.sh
-index 9dd166b..b08ff03 100755
---- a/gen_package.sh
-+++ b/gen_package.sh
-@@ -45,11 +45,8 @@ gen_minkernpackage() {
- 	if [ "${KERNCACHE}" != "" ]
- 	then
- 		/bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV}
--		mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}}
--		if [ ! -f System.map-${KNAME}-${ARCH}-${KV} ]
--		then
-+		mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} ||
- 			gen_die 'Could not copy System.map from kerncache for the kernel package!'
--		fi
- 	else
- 		cp "${KERNEL_OUTPUTDIR}/System.map" "${TEMP}/minkernpackage/System.map-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!';
- 	fi
--- 
-2.7.4
-

diff --git a/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
deleted file mode 100644
index fb17bd379f7..00000000000
--- a/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.20.2'
-VERSION_DMRAID='1.0.0.rc16-3'
-VERSION_MDADM='3.1.5'
-VERSION_FUSE='2.8.6'
-VERSION_ISCSI='2.0-872'
-VERSION_LVM='2.02.88'
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.11'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-0.2.1
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
deleted file mode 100644
index d8c5716d5af..00000000000
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.20.2'
-VERSION_DMRAID='1.0.0.rc16-3'
-VERSION_MDADM='3.1.5'
-VERSION_FUSE='2.8.6'
-VERSION_ISCSI='2.0-872'
-VERSION_LVM='2.02.88'
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.11'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-0.2.1
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch "${FILESDIR}"/${P}-system-map.patch #570822
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
deleted file mode 100644
index 562eb0ee605..00000000000
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.20.2'
-VERSION_DMRAID='1.0.0.rc16-3'
-VERSION_MDADM='3.1.5'
-VERSION_FUSE='2.8.6'
-VERSION_ISCSI='2.0-872'
-VERSION_LVM='2.02.88'
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.11'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-0.2.1
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch "${FILESDIR}"/${P}-system-map.patch #570822
-	epatch "${FILESDIR}"/${P}-grub-mkconfig.patch #591200
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild
deleted file mode 100644
index 64945f43989..00000000000
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.20.2'
-VERSION_DMRAID='1.0.0.rc16-3'
-VERSION_MDADM='3.1.5'
-VERSION_FUSE='2.8.6'
-VERSION_ISCSI='2.0-872'
-VERSION_LVM='2.02.88'
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.11'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-0.2.1
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch "${FILESDIR}"/${P}-system-map.patch #570822
-	epatch "${FILESDIR}"/${P}-grub-mkconfig.patch #591200
-	epatch "${FILESDIR}"/${P}-crc32c.patch #655110
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild b/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
deleted file mode 100644
index a9ef7d8fc11..00000000000
--- a/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.26.0'
-VERSION_DMRAID='1.0.0.rc16-3'
-VERSION_MDADM='3.1.5'
-VERSION_FUSE='2.8.6'
-VERSION_ISCSI='2.0-872'
-VERSION_LVM='2.02.88'
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.11'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	firmware? ( sys-kernel/linux-firmware )
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
deleted file mode 100644
index 8badb9dc013..00000000000
--- a/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
-VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
-VERSION_MDADM='4.0' # warning, be sure to bump patches
-VERSION_FUSE='2.8.6' # warning, be sure to bump patches
-VERSION_ISCSI='2.0-872' # warning, be sure to bump patches
-VERSION_LVM='2.02.173' # warning, be sure to bump patches
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.22'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	sys-apps/util-linux[static-libs(+)]
-	firmware? ( sys-kernel/linux-firmware )
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
deleted file mode 100644
index 8badb9dc013..00000000000
--- a/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
-VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
-VERSION_MDADM='4.0' # warning, be sure to bump patches
-VERSION_FUSE='2.8.6' # warning, be sure to bump patches
-VERSION_ISCSI='2.0-872' # warning, be sure to bump patches
-VERSION_LVM='2.02.173' # warning, be sure to bump patches
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.22'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	sys-apps/util-linux[static-libs(+)]
-	firmware? ( sys-kernel/linux-firmware )
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
deleted file mode 100644
index 8badb9dc013..00000000000
--- a/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
-VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
-VERSION_MDADM='4.0' # warning, be sure to bump patches
-VERSION_FUSE='2.8.6' # warning, be sure to bump patches
-VERSION_ISCSI='2.0-872' # warning, be sure to bump patches
-VERSION_LVM='2.02.173' # warning, be sure to bump patches
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.22'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	sys-apps/util-linux[static-libs(+)]
-	firmware? ( sys-kernel/linux-firmware )
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
deleted file mode 100644
index 8badb9dc013..00000000000
--- a/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
-VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
-VERSION_MDADM='4.0' # warning, be sure to bump patches
-VERSION_FUSE='2.8.6' # warning, be sure to bump patches
-VERSION_ISCSI='2.0-872' # warning, be sure to bump patches
-VERSION_LVM='2.02.173' # warning, be sure to bump patches
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.22'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	sys-apps/util-linux[static-libs(+)]
-	firmware? ( sys-kernel/linux-firmware )
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
deleted file mode 100644
index 8badb9dc013..00000000000
--- a/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
-VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
-VERSION_MDADM='4.0' # warning, be sure to bump patches
-VERSION_FUSE='2.8.6' # warning, be sure to bump patches
-VERSION_ISCSI='2.0-872' # warning, be sure to bump patches
-VERSION_LVM='2.02.173' # warning, be sure to bump patches
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.22'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	sys-apps/util-linux[static-libs(+)]
-	firmware? ( sys-kernel/linux-firmware )
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
deleted file mode 100644
index 8badb9dc013..00000000000
--- a/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
-VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
-VERSION_MDADM='4.0' # warning, be sure to bump patches
-VERSION_FUSE='2.8.6' # warning, be sure to bump patches
-VERSION_ISCSI='2.0-872' # warning, be sure to bump patches
-VERSION_LVM='2.02.173' # warning, be sure to bump patches
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.22'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	sys-apps/util-linux[static-libs(+)]
-	firmware? ( sys-kernel/linux-firmware )
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}

diff --git a/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild b/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
deleted file mode 100644
index 2d560709b60..00000000000
--- a/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch
-
-VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
-VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
-VERSION_MDADM='4.0' # warning, be sure to bump patches
-VERSION_FUSE='2.8.6' # warning, be sure to bump patches
-VERSION_ISCSI='2.0-872' # warning, be sure to bump patches
-VERSION_LVM='2.02.173' # warning, be sure to bump patches
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.22'
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://gentoo/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gentoo/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${PN}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	sys-apps/util-linux[static-libs(+)]
-	firmware? ( sys-kernel/linux-firmware )
-	!<sys-apps/openrc-0.9.9"
-# pax-utils is used for lddtree
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-
-	epatch_user
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	cd "${DISTDIR}"
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2020-08-31 17:47 Thomas Deutschmann
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Deutschmann @ 2020-08-31 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     17def7073e7778d5375d2d6fc556ae88b88f50d1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 17:47:14 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 17:47:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17def707

sys-kernel/genkernel: drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-kernel/genkernel/Manifest                      |   2 -
 .../files/genkernel-4.1.0-post-release-fixes.patch |  39 ---
 sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild     | 302 ---------------------
 3 files changed, 343 deletions(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 99b6a9d4ee1..4b5bd174c41 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -18,11 +18,9 @@ DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
 DIST genkernel-4.0.10.tar.xz 460816 BLAKE2B d5922eede1192bb95ca235106a70118826c2c4c078f741e25954485f142d858bf612f35b94553fc409e4f6641b256a2940f83131c5b4bc7d6dbae85019bee7ff SHA512 29dc29b346b132cc6e7ea5298e49c93d01ba28531928cb7a6125864c7d03b74f70bc74043b220dfbbb6651ad67fcbc3d8ed8a2d0f40d271b83e9a8ab0325a2dd
-DIST genkernel-4.1.0.tar.xz 463696 BLAKE2B 74ca0207cdb54e4627d269dd83afa34045c283a2f8fd8fad6c25d566c35d8d2411e4f73e50317e8427717333024d1a4f86485caa58f5275f63273b6c52943873 SHA512 50bf7c051ac2113c14861c6ab30f8db880d9e934cedeb848f14f030286e5445b9f1b4ba1a270c281d8caacb893651325c9df0ce26a782249ca60f9f67e106807
 DIST genkernel-4.1.2.tar.xz 465288 BLAKE2B 89e26a861854d0cde808331db4bf3055495e9ec4be16952c495e481a5f9684601603ba22e5edda8f882fcddd68d1e406756cdc519936b90e33fe640107c8e529 SHA512 4b10f25ed8d97ffe075372aac22e0aff7be72405f02d9d8faddcc70063d04719dc93f9836d4f8375afca9b6870fcb15bda6ed796e5b2d2ef208ba3203d229a3e
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
-DIST hwids-20200306.tar.gz 3512152 BLAKE2B 6a6ee48598e72f97a90bff8f45aacb699218570ede5b60ed119ebae78de6cd4b92e02f96cf57c83710da699be9a7dcdfdef8d404539e04b664298874b35e54ce SHA512 eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250
 DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c

diff --git a/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch b/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch
deleted file mode 100644
index ef121d9ccc6..00000000000
--- a/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/gen_determineargs.sh
-+++ b/gen_determineargs.sh
-@@ -1170,6 +1170,14 @@ determine_real_args() {
- 		fi
- 	fi
- 
-+	if isTrue "${INTEGRATED_INITRAMFS}"
-+	then
-+		if  ! isTrue "${BUILD_KERNEL}" || ! isTrue "${BUILD_RAMDISK}"
-+		then
-+			gen_die "Invalid action specified: --integrated-initramfs option requires action \"all\", i.e. building of kernel and initramfs at the same time!"
-+		fi
-+	fi
-+
- 	if ! isTrue "${CMD_INSTALL}"
- 	then
- 		if [ -n "${KERNEL_MODULES_PREFIX}" ]
---- a/gen_funcs.sh
-+++ b/gen_funcs.sh
-@@ -2033,7 +2033,7 @@ kconfig_set_opt() {
- 	else
- 		print_info 3 "$(get_indent ${indentlevel}) - Setting option '${optname}' to '${optval}' in '${kconfig}'..."
- 		sed -i "${kconfig}" \
--			-e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
-+			-e "s|^#\? \?${optname}[ =].*|${optname}=${optval}|g" \
- 			|| gen_die "Failed to set '${optname}=${optval}' in '${kconfig}'"
- 
- 		[ ! -f "${KCONFIG_MODIFIED_MARKER}" ] && touch "${KCONFIG_MODIFIED_MARKER}"
---- a/gkbuilds/bcache-tools.gkbuild
-+++ b/gkbuilds/bcache-tools.gkbuild
-@@ -6,7 +6,7 @@ src_configure() {
- }
- 
- src_compile() {
--	PKG_CONFIG="$(tc-getPKG_CONFIG) -static" \
-+	PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \
- 	gkmake V=1
- }
- 

diff --git a/sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild b/sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild
deleted file mode 100644
index c5db490b8eb..00000000000
--- a/sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.73.0"
-VERSION_BTRFS_PROGS="5.7"
-VERSION_BUSYBOX="1.32.0"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.3.3"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.80"
-VERSION_EUDEV="3.2.9"
-VERSION_EXPAT="2.2.9"
-VERSION_E2FSPROGS="1.45.6"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20200306"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="27"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.8.6"
-VERSION_LIBGPGERROR="1.38"
-VERSION_LVM="2.02.187"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.8"
-VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.36"
-VERSION_XFSPROGS="5.7.0"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.5"
-
-COMMON_URI="
-	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
-	https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	dev-util/gperf
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=( "${FILESDIR}"/${P}-post-release-fixes.patch )
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	if [[ ${n_root_args} > 1 ]] ; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "If you are appending non-persistent device names to kernel command-line,"
-		ewarn "next reboot could fail in case running system and initramfs do not agree"
-		ewarn "on detected root device name!"
-	fi
-
-	if [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for any UDEV-enabled service."
-		fi
-	fi
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2020-09-02 13:59 Thomas Deutschmann
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Deutschmann @ 2020-09-02 13:59 UTC (permalink / raw
  To: gentoo-commits

commit:     449a46321dd855a52f7ce17cd486e43ff7ba6872
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 13:57:41 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 13:58:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=449a4632

sys-kernel/genkernel: fix {ROOT,SWAP}_KEYDEV usage

Rev bump containing some post release fixes including a patch
which will try to determine filesystem used for {ROOT,SWAP}_KEYDEV
to trigger module autoloading in case used filesystem wasn't built
into kernel.

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../files/genkernel-4.1.2-post-release-fixes.patch | 190 +++++++++++++++++++++
 ...rnel-4.1.2.ebuild => genkernel-4.1.2-r1.ebuild} |   2 +
 2 files changed, 192 insertions(+)

diff --git a/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch b/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch
new file mode 100644
index 00000000000..1faa26d8b3e
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch
@@ -0,0 +1,190 @@
+--- a/defaults/initrd.defaults
++++ b/defaults/initrd.defaults
+@@ -101,9 +101,11 @@ GK_UDEV_TIMEOUT=120
+ GK_USERINTERACTION_DISABLED_STATEFILE='/tmp/user-interaction.disabled'
+ 
+ CRYPT_ENV_FILE='/etc/CRYPT_ENV.conf'
+-CRYPT_KEYFILE_ROOT='/tmp/root.key'
+-CRYPT_KEYFILE_SWAP='/tmp/swap.key'
++CRYPT_ROOT_KEYDEV_FSTYPE='auto'
++CRYPT_ROOT_KEYFILE='/tmp/root.key'
+ CRYPT_ROOT_OPENED_LOCKFILE='/tmp/ROOT.opened'
++CRYPT_SWAP_KEYDEV_FSTYPE='auto'
++CRYPT_SWAP_KEYFILE='/tmp/swap.key'
+ CRYPT_SWAP_OPENED_LOCKFILE='/tmp/SWAP.opened'
+ 
+ ZFS_ENC_ENV_FILE='/etc/ZFS_ENC_ENV.conf'
+--- a/defaults/initrd.scripts
++++ b/defaults/initrd.scripts
+@@ -1780,7 +1780,7 @@ openLUKS() {
+ 		exit 1
+ 	fi
+ 
+-	case $1 in
++	case ${1} in
+ 		root)
+ 			local TYPE=ROOT
+ 			;;
+@@ -1789,8 +1789,12 @@ openLUKS() {
+ 			;;
+ 	esac
+ 
+-	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$1" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"'
+-	eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
++	local LUKS_NAME="${1}"
++	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"'
++	eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"'
++	eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
++	eval local LUKS_KEYDEV_FSTYPE='"${CRYPT_'${TYPE}'_KEYDEV_FSTYPE}"'
++	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
+ 	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
+ 	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
+ 	local mntkey="/mnt/key/" crypt_filter_ret=
+@@ -1886,7 +1890,10 @@ openLUKS() {
+ 						# At this point a device was recognized, now let's see if the key is there
+ 						[ ! -d "${mntkey}" ] && mkdir -p "${mntkey}" >/dev/null 2>&1
+ 
+-						if ! run mount -n -o ro ${REAL_LUKS_KEYDEV} ${mntkey} >/dev/null 2>&1
++						# determine fs -- 'auto' will not trigger module loading!
++						LUKS_KEYDEV_FSTYPE=$(determine_fs "${REAL_LUKS_KEYDEV}" "${LUKS_KEYDEV_FSTYPE}")
++
++						if ! run mount -n -t ${LUKS_KEYDEV_FSTYPE} -o ro ${REAL_LUKS_KEYDEV} ${mntkey} >/dev/null 2>&1
+ 						then
+ 							KEYDEV_ERROR=1
+ 							bad_msg "Mounting of device ${REAL_LUKS_KEYDEV} failed." ${CRYPT_SILENT}
+--- a/defaults/linuxrc
++++ b/defaults/linuxrc
+@@ -2,7 +2,7 @@
+ 
+ # shellcheck source=initrd.defaults
+ . /etc/initrd.defaults
+-# shellche2ck source=initrd.scripts
++# shellcheck source=initrd.scripts
+ . /etc/initrd.scripts
+ 
+ # shellcheck source=/dev/null
+@@ -257,6 +257,9 @@ do
+ 		root_keydev=*)
+ 			CRYPT_ROOT_KEYDEV=${x#*=}
+ 		;;
++		root_keydev_fstype=*)
++			CRYPT_ROOT_KEYDEV_FSTYPE=${x#*=}
++		;;
+ 		root_trim=*)
+ 			CRYPT_ROOT_TRIM=${x#*=}
+ 		;;
+@@ -266,6 +269,9 @@ do
+ 		swap_keydev=*)
+ 			CRYPT_SWAP_KEYDEV=${x#*=}
+ 		;;
++		swap_keydev_fstype=*)
++			CRYPT_SWAP_KEYDEV_FSTYPE=${x#*=}
++		;;
+ 		real_resume=*|resume=*)
+ 			REAL_RESUME=${x#*=}
+ 		;;
+--- a/defaults/login-remote.sh
++++ b/defaults/login-remote.sh
+@@ -24,10 +24,10 @@ fi
+ receivefile() {
+ 	case ${1} in
+ 		root)
+-			file=${CRYPT_KEYFILE_ROOT}
++			file=${CRYPT_ROOT_KEYFILE}
+ 			;;
+ 		swap)
+-			file=${CRYPT_KEYFILE_SWAP}
++			file=${CRYPT_SWAP_KEYFILE}
+ 			;;
+ 		'')
+ 			bad_msg "No keyfile specified." "${CRYPT_SILENT}"
+--- a/defaults/unlock-luks.sh
++++ b/defaults/unlock-luks.sh
+@@ -43,8 +43,11 @@ main() {
+ 		exit 1
+ 	fi
+ 
+-	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="${NAME}" LUKS_KEY='"${CRYPT_KEYFILE_'${TYPE}'}"'
+-	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
++	local LUKS_NAME="${NAME}"
++	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"'
++	eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"'
++	eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
++	eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
+ 
+ 	while true
+ 	do
+--- a/doc/genkernel.8.txt
++++ b/doc/genkernel.8.txt
+@@ -646,6 +646,9 @@ recognized by the kernel itself.
+     root_key.   If unset while using root_key, it will automatically
+     look for the device in every boot.
+ 
++*root_keydev_fstype*=<...>::
++    Used filesystem for *root_keydev*. See *rootfstype* for more details.
++
+ *root_trim*=(yes|no)::
+     Enables TRIM support for a LUKS-based root device.  Only useful
+     with SSD setups.  Have a look at 'https://en.wikipedia.org/wiki/TRIM'
+@@ -657,6 +660,9 @@ recognized by the kernel itself.
+ *swap_keydev*=<...>::
+     Same as root_keydev for swap.
+ 
++*swap_keydev_fstype*=<...>::
++    Used filesystem for *swap_keydev*. See *rootfstype* for more details.
++
+ *crypt_silent*::
+     Set this to silent all the output related to the cryptographic
+     software,  and in case your encrypted device isn't open with the
+@@ -790,7 +796,8 @@ when not set. This will allow remote user to provide answer through
+ *rootfstype*=<...>::
+     Specify the file system type to mount the real root filesystem as.
+     This can be useful when support for ext2/ext3/ext4 are
+-    in competition.  Default is "auto".
++    in competition or used filesystem was not built into kernel.
++    Default is "auto".
+ 
+ *docache*::
+ *nocache*::
+--- a/gen_determineargs.sh
++++ b/gen_determineargs.sh
+@@ -415,7 +415,6 @@ determine_real_args() {
+ 	set_config_with_override BOOL   GENZIMAGE                             CMD_GENZIMAGE                             "no"
+ 	set_config_with_override BOOL   KEYMAP                                CMD_KEYMAP                                "yes"
+ 	set_config_with_override BOOL   DOKEYMAPAUTO                          CMD_DOKEYMAPAUTO                          "no"
+-	set_config_with_override STRING BUSYBOX_CONFIG                        CMD_BUSYBOX_CONFIG
+ 	set_config_with_override STRING STRIP_TYPE                            CMD_STRIP_TYPE                            "modules"
+ 	set_config_with_override BOOL   INSTALL                               CMD_INSTALL                               "yes"
+ 	set_config_with_override BOOL   CLEANUP                               CMD_CLEANUP                               "yes"
+--- a/gen_funcs.sh
++++ b/gen_funcs.sh
+@@ -1853,7 +1853,7 @@ check_disk_space_requirements() {
+ 			gen_die "--check-free-disk-space-bootdir value '${CHECK_FREE_DISK_SPACE_BOOTDIR}' is not a valid number!"
+ 		fi
+ 
+-		available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
++		available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
+ 		if [ -n "${available_free_disk_space}" ]
+ 		then
+ 			print_info 2 '' 1 0
+@@ -1890,7 +1890,7 @@ check_disk_space_requirements() {
+ 			gen_die "--check-free-disk-space-kerneloutputdir value '${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR}' is not a valid number!"
+ 		fi
+ 
+-		available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
++		available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }')
+ 		if [ -n "${available_free_disk_space}" ]
+ 		then
+ 			print_info 2 '' 1 0
+--- a/genkernel.conf
++++ b/genkernel.conf
+@@ -378,7 +378,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
+ # Compress generated initramfs
+ #COMPRESS_INITRD="yes"
+ 
+-# Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest
++# Types of compression: best, xz, lzma, bzip2, gzip, lzop, lz4, zstd, fastest
+ # "best" selects the best available compression method
+ # "fastest" selects the fastest available compression method
+ #COMPRESS_INITRD_TYPE="best"
+ 

diff --git a/sys-kernel/genkernel/genkernel-4.1.2.ebuild b/sys-kernel/genkernel/genkernel-4.1.2-r1.ebuild
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.1.2.ebuild
rename to sys-kernel/genkernel/genkernel-4.1.2-r1.ebuild
index c48043e7994..a35eee96e20 100644
--- a/sys-kernel/genkernel/genkernel-4.1.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.1.2-r1.ebuild
@@ -120,6 +120,8 @@ if [[ ${PV} == 9999* ]]; then
 	DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+PATCHES=( "${FILESDIR}"/${P}-post-release-fixes.patch )
+
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
 		git-r3_src_unpack


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2021-10-27 17:00 Thomas Deutschmann
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Deutschmann @ 2021-10-27 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     2aa9da7414db8ccd0ad032dd02307f88785d5c3f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 16:58:29 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 16:59:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa9da74

sys-kernel/genkernel: bump to v4.2.5

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

 sys-kernel/genkernel/Manifest                      |  2 +-
 .../genkernel-4.2.4-fix-dropbear-depend.patch      | 26 ------------
 .../files/genkernel-4.2.4-modprobe-d-fix.patch     | 46 ----------------------
 ...rnel-4.2.4-r2.ebuild => genkernel-4.2.5.ebuild} |  5 ---
 4 files changed, 1 insertion(+), 78 deletions(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 7494f45e6b8..65c0470c18e 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 ab74620e0fa..00000000000
--- 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 09ac6422e16..00000000000
--- 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
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild
rename to sys-kernel/genkernel/genkernel-4.2.5.ebuild
index dfef98dec33..a7c583a33ed 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


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2022-05-17 20:16 Andreas K. Hüttel
  0 siblings, 0 replies; 14+ messages in thread
From: Andreas K. Hüttel @ 2022-05-17 20:16 UTC (permalink / raw
  To: gentoo-commits

commit:     32835a1e91593000cc89140c51e1833a80dae760
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 20:15:46 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue May 17 20:16:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32835a1e

sys-kernel/genkernel: Revbump only for ia64, so we get an iso again

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 .../files/genkernel-4.2.6-devicemanager.patch      |  72 +++++
 sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild     | 319 +++++++++++++++++++++
 2 files changed, 391 insertions(+)

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-devicemanager.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-devicemanager.patch
new file mode 100644
index 000000000000..f1c5787ed657
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-devicemanager.patch
@@ -0,0 +1,72 @@
+From 110cffbf0a10a6dabe902eecb9c139663ad737af Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 15 May 2022 12:37:51 -0400
+Subject: [PATCH] gen_initramfs.sh: append devicemanager only for specific
+ modules
+
+dmraid
+luks
+lvm
+multipath
+
+Bug: https://bugs.gentoo.org/749957
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ gen_funcs.sh     |  9 +++++++++
+ gen_initramfs.sh | 11 +++++++----
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/gen_funcs.sh b/gen_funcs.sh
+index 500caf2..db396e3 100755
+--- a/gen_funcs.sh
++++ b/gen_funcs.sh
+@@ -22,6 +22,15 @@ isTrue() {
+ 	return 1
+ }
+ 
++anyTrue() {
++	local x
++	for x
++	do
++		isTrue "${x}" && return 0
++	done
++	return 1
++}
++
+ set_color_vars() {
+ 	if ! isTrue "${NOCOLOR}"
+ 	then
+diff --git a/gen_initramfs.sh b/gen_initramfs.sh
+index 4ec296e..0b74f4c 100755
+--- a/gen_initramfs.sh
++++ b/gen_initramfs.sh
+@@ -2007,11 +2007,14 @@ append_auxiliary() {
+ }
+ 
+ append_data() {
+-	local name=$1 var=$2
++	[ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
++
++	local name=$1
+ 	local func="append_${name}"
+ 
+-	[ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
+-	if [ $# -eq 1 ] || isTrue "${var}"
++	shift
++
++	if [ $# -eq 0 ] || anyTrue "$@"
+ 	then
+ 		print_info 1 "$(get_indent 1)>> Appending ${name} cpio data ..."
+ 		${func} || gen_die "${func}() failed!"
+@@ -2037,7 +2040,7 @@ create_initramfs() {
+ 	append_data 'base_layout'
+ 	append_data 'util-linux'
+ 	append_data 'eudev'
+-	append_data 'devicemanager'
++	append_data 'devicemanager' "${DMRAID}" "${LVM}" "${LUKS}" "${MULTIPATH}"
+ 	append_data 'auxiliary' "${BUSYBOX}"
+ 	append_data 'busybox' "${BUSYBOX}"
+ 	append_data 'b2sum' "${B2SUM}"
+-- 
+2.35.1
+

diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild
new file mode 100644
index 000000000000..1c4c56cc5a82
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 python-single-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BCACHE_TOOLS="1.0.8_p20141204"
+VERSION_BOOST="1.76.0"
+VERSION_BTRFS_PROGS="5.15"
+VERSION_BUSYBOX="1.34.1"
+VERSION_COREUTILS="8.32"
+VERSION_CRYPTSETUP="2.4.1"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2020.81"
+VERSION_EUDEV="3.2.10"
+VERSION_EXPAT="2.4.1"
+VERSION_E2FSPROGS="1.46.4"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_HWIDS="20210613"
+VERSION_ISCSI="2.0.878"
+VERSION_JSON_C="0.13.1"
+VERSION_KMOD="29"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.9.4"
+VERSION_LIBGPGERROR="1.43"
+VERSION_LIBXCRYPT="4.4.26"
+VERSION_LVM="2.02.188"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_POPT="1.18"
+VERSION_STRACE="5.14"
+VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_UTIL_LINUX="2.37.2"
+VERSION_XFSPROGS="5.13.0"
+VERSION_XZ="5.2.5"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.5.0"
+
+COMMON_URI="
+	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
+	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
+	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~ia64"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ibm +firmware"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	dev-util/gperf
+	sys-apps/sandbox
+	sys-devel/autoconf
+	sys-devel/autoconf-archive
+	sys-devel/automake
+	sys-devel/libtool
+	virtual/pkgconfig
+	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
+	firmware? ( sys-kernel/linux-firmware )"
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-devicemanager.patch
+	"${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch
+	"${FILESDIR}"/${P}-fuse-glibc-2.34.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
+		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_XZ:${VERSION_XZ}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]] ; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	fperms +x /usr/share/genkernel/gen_worker.sh
+	fperms +x /usr/share/genkernel/path_expander.py
+
+	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	if [[ ${n_root_args} -gt 1 ]] ; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "If you are appending non-persistent device names to kernel command-line,"
+		ewarn "next reboot could fail in case running system and initramfs do not agree"
+		ewarn "on detected root device name!"
+	fi
+
+	if [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to be causing problems for any UDEV-enabled service."
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2022-07-04  4:50 Robin H. Johnson
  0 siblings, 0 replies; 14+ messages in thread
From: Robin H. Johnson @ 2022-07-04  4:50 UTC (permalink / raw
  To: gentoo-commits

commit:     8d950bb026385484a5aba5726ce0a93ec5c24339
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 04:50:36 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 04:50:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d950bb0

sys-kernel/genkernel: update for newer boost

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Closes: https://bugs.gentoo.org/854480

 sys-kernel/genkernel/Manifest                      |  1 +
 .../files/genkernel-4.2.6-boost-optim.patch        | 23 ++++++++++++++++++++++
 ...ernel-9999.ebuild => genkernel-4.2.6-r4.ebuild} | 13 ++++++++----
 sys-kernel/genkernel/genkernel-9999.ebuild         |  5 ++++-
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 3a4f34d67577..788ef1989104 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -3,6 +3,7 @@ DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671a
 DIST bcache-tools-1.0.8_p20141204.tar.gz 22158 BLAKE2B dd36102c5668cab3072ea635a5a30128df6cd75b75e7f8bba17ad0a830746ff2f75a46b56d4211aeb4657453d3bbeb98b8b794c53ff724b3fbf0874068d70dc9 SHA512 53d6e764d6d42c4367b0bd98199cae3c18054d5707a7880af3a422f9db332b44941015eaed7e1cd170b3546307ed54a2f99558a68d98c76b7bb6234d29206b54
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
+DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
 DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90
 DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch
new file mode 100644
index 000000000000..356202ddc095
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch
@@ -0,0 +1,23 @@
+commit 8b7422293dcf9cc62518dcbc49239b6e637b6b74
+Author: Robin H. Johnson <robbat2@gentoo.org>
+Date:   Sun Jul 3 21:46:21 2022 -0700
+
+    gkbuilds/boost-build.gkbuild: upstream boost flags changed
+    
+    Upstream boost changed the flags to use 'off' instead of 'none'.
+    
+    Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+    Closes: https://bugs.gentoo.org/854480
+
+diff --git gkbuilds/boost-build.gkbuild gkbuilds/boost-build.gkbuild
+index 03d1f88..0e06ba7 100644
+--- gkbuilds/boost-build.gkbuild
++++ gkbuilds/boost-build.gkbuild
+@@ -53,6 +53,6 @@ src_install() {
+ 	find "${D}/usr/share/boost-build" -iname "*.py" -delete \
+ 		|| die "Failed to remove python files"
+ 
+-	echo 'variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ;' > "${D}/usr/share/boost-build/site-config.jam" \
++	echo 'variant gentoorelease : release : <optimization>off <debug-symbols>off <runtime-link>shared ;' > "${D}/usr/share/boost-build/site-config.jam" \
+ 		|| die "Failed to create '${D}/usr/share/boost-build/site-config.jam'!"
+ }

diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild
similarity index 97%
copy from sys-kernel/genkernel/genkernel-9999.ebuild
copy to sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild
index b9c6dd2c0ebd..6ad1250b75b1 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -13,7 +13,7 @@ inherit bash-completion-r1 python-single-r1
 # Whenever you bump a GKPKG, check if you have to move
 # or add new patches!
 VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.76.0"
+VERSION_BOOST="1.79.0"
 VERSION_BTRFS_PROGS="5.15"
 VERSION_BUSYBOX="1.34.1"
 VERSION_COREUTILS="8.32"
@@ -45,7 +45,6 @@ VERSION_XFSPROGS="5.13.0"
 VERSION_XZ="5.2.5"
 VERSION_ZLIB="1.2.11"
 VERSION_ZSTD="1.5.0"
-VERSION_KEYUTILS="1.6.3"
 
 COMMON_URI="
 	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
@@ -81,7 +80,6 @@ COMMON_URI="
 	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
 	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
 	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-	https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz
 "
 
 if [[ ${PV} == 9999* ]] ; then
@@ -128,6 +126,13 @@ if [[ ${PV} == 9999* ]]; then
 	DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${P}-devicemanager.patch
+	"${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch
+	"${FILESDIR}"/${P}-fuse-glibc-2.34.patch
+	"${FILESDIR}"/${P}-gcc-12-boost-1.79.patch
+)
+
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
 		git-r3_src_unpack

diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index b9c6dd2c0ebd..db61d4ca5c50 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -13,7 +13,7 @@ inherit bash-completion-r1 python-single-r1
 # Whenever you bump a GKPKG, check if you have to move
 # or add new patches!
 VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.76.0"
+VERSION_BOOST="1.79.0"
 VERSION_BTRFS_PROGS="5.15"
 VERSION_BUSYBOX="1.34.1"
 VERSION_COREUTILS="8.32"
@@ -128,6 +128,9 @@ if [[ ${PV} == 9999* ]]; then
 	DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+PATCHES=(
+)
+
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
 		git-r3_src_unpack


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2022-08-02  0:22 Sam James
  0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-08-02  0:22 UTC (permalink / raw
  To: gentoo-commits

commit:     0693a3b58cd9a217b11f6a3f09fd635f88e661c5
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Jul 10 22:22:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 00:21:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0693a3b5

sys-kernel/genkernel: Fix utils build with slibtool

Bug: https://bugs.gentoo.org/836012
Upstream-PR: https://github.com/gentoo/genkernel/pull/33
Closes: https://github.com/gentoo/gentoo/pull/26333
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../genkernel/files/genkernel-4.2.6-slibtool.patch | 106 +++++++
 sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild     | 327 +++++++++++++++++++++
 2 files changed, 433 insertions(+)

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch
new file mode 100644
index 000000000000..0f0bd2619ae2
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch
@@ -0,0 +1,106 @@
+Bug: https://bugs.gentoo.org/836012
+Upstream-PR: https://github.com/gentoo/genkernel/pull/33
+
+From 1bb3cc10d51026ad500bc9cec883f1f2f0c445ec Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 15 May 2022 15:49:21 -0700
+Subject: [PATCH 1/3] gen_funcs: Add an install_exe function
+
+This helps when the build uses slibtool where the compiled binary output
+path differs from GNU libtool.
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ gen_funcs.sh | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/gen_funcs.sh b/gen_funcs.sh
+index 500caf2d..a4dc0e44 100755
+--- a/gen_funcs.sh
++++ b/gen_funcs.sh
+@@ -1974,6 +1974,29 @@ check_distfiles() {
+ 	fi
+ }
+ 
++# @FUNCTION: install_exe
++# @USAGE: <file> <destination>
++# @DESCRIPTION:
++# Finds an executable binary file and installs it in cases where there may be
++# similarly named shell wrapper scripts. This happens when GNU libtool creates
++# an executable named 'foo' while slibtool creates '.libs/foo' and 'foo' is a
++# shell script that should not be installed.
++install_exe() {
++	local file="${1##*/}"
++	local dest="${2}"
++
++	local dir
++	[[ "${1%/*}" == "${file}" ]] || dir="${1%/*}/"
++
++	[[ -f "${dir}${file}" ]] || gen_die "File '${dir}${file}' does not exist!"
++
++	# Ensure only the binaries are installed and not a similarly named wrapper script
++	find "${S}/${dir}" -type f -name "${file}" -print0 |
++		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
++		xargs -I '{}' cp -a '{}' "${dest}" ||
++		gen_die "Failed to copy '${S}/${dir}${file}' to '${dest}'!"
++}
++
+ # @FUNCTION: expand_file
+ # @USAGE: <file>
+ # @DESCRIPTION:
+
+From cfc9ff455e2473e4322bd18c5fa21370d9c0702e Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 24 Mar 2022 11:43:40 -0700
+Subject: [PATCH 2/3] gkbuild/util-linux: Install the correct binaries with
+ slibtool
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ gkbuilds/util-linux.gkbuild | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild
+index 40ea1fbb..5addbb1d 100644
+--- a/gkbuilds/util-linux.gkbuild
++++ b/gkbuilds/util-linux.gkbuild
+@@ -47,11 +47,8 @@ src_install() {
+ 
+ 	mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!"
+ 
+-	cp -a blkid.static "${D}"/sbin/blkid \
+-		|| die "Failed to copy '${S}/blkid.static' to '${D}/sbin/blkid'!"
+-
+-	cp -a switch_root "${D}"/sbin/switch_root \
+-		|| die "Failed to copy '${S}/switch_root' to '${D}/sbin/switch_root'!"
++	install_exe 'blkid.static' "${D}"/sbin/blkid
++	install_exe 'switch_root' "${D}"/sbin/switch_root
+ 
+ 	local sbin
+ 	for sbin in \
+
+From 2d2e91f288679e272f731917feb58f3768ea586d Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 24 Mar 2022 13:17:07 -0700
+Subject: [PATCH 3/3] gkbuild/cryptsetup: Install the correct binaries with
+ slibtool
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ gkbuilds/cryptsetup.gkbuild | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
+index 007874d1..816df609 100644
+--- a/gkbuilds/cryptsetup.gkbuild
++++ b/gkbuilds/cryptsetup.gkbuild
+@@ -34,8 +34,7 @@ src_install() {
+ 		"${D}"/sbin/* \
+ 		"${D}"/usr/share/
+ 
+-	cp -a cryptsetup.static "${D}"/sbin/cryptsetup \
+-		|| die "Failed to copy '${S}/cryptsetup.static' to '${D}/sbin/cryptsetup'!"
++	install_exe 'cryptsetup.static' "${D}"/sbin/cryptsetup
+ 
+ 	"${STRIP}" --strip-all "${D}"/sbin/cryptsetup \
+ 		|| die "Failed to strip '${D}/sbin/cryptsetup'!"

diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild
new file mode 100644
index 000000000000..ac31e20d2652
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 python-single-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BCACHE_TOOLS="1.0.8_p20141204"
+VERSION_BOOST="1.79.0"
+VERSION_BTRFS_PROGS="5.15"
+VERSION_BUSYBOX="1.34.1"
+VERSION_COREUTILS="8.32"
+VERSION_CRYPTSETUP="2.4.1"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2020.81"
+VERSION_EUDEV="3.2.10"
+VERSION_EXPAT="2.4.1"
+VERSION_E2FSPROGS="1.46.4"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_HWIDS="20210613"
+VERSION_ISCSI="2.0.878"
+VERSION_JSON_C="0.13.1"
+VERSION_KMOD="29"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.9.4"
+VERSION_LIBGPGERROR="1.43"
+VERSION_LIBXCRYPT="4.4.26"
+VERSION_LVM="2.02.188"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_POPT="1.18"
+VERSION_STRACE="5.14"
+VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_UTIL_LINUX="2.37.2"
+VERSION_XFSPROGS="5.13.0"
+VERSION_XZ="5.2.5"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.5.0"
+
+COMMON_URI="
+	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
+	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
+	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
+		${COMMON_URI}"
+	SRC_URI+=" https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> ${P}-s390x.patch"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ibm +firmware"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	dev-util/gperf
+	sys-apps/sandbox
+	sys-devel/autoconf
+	sys-devel/autoconf-archive
+	sys-devel/automake
+	sys-devel/bc
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
+	firmware? ( sys-kernel/linux-firmware )"
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-devicemanager.patch
+	"${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch
+	"${FILESDIR}"/${P}-fuse-glibc-2.34.patch
+	"${FILESDIR}"/${P}-gcc-12-boost-1.79.patch
+	"${FILESDIR}"/${P}-chroot-path.patch
+	"${FILESDIR}"/${P}-slibtool.patch # 836012
+	"${DISTDIR}"/${P}-s390x.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
+		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_XZ:${VERSION_XZ}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]] ; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	fperms +x /usr/share/genkernel/gen_worker.sh
+	fperms +x /usr/share/genkernel/path_expander.py
+
+	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	if [[ ${n_root_args} -gt 1 ]] ; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "If you are appending non-persistent device names to kernel command-line,"
+		ewarn "next reboot could fail in case running system and initramfs do not agree"
+		ewarn "on detected root device name!"
+	fi
+
+	if [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to be causing problems for any UDEV-enabled service."
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2023-05-25 13:16 Ben Kohler
  0 siblings, 0 replies; 14+ messages in thread
From: Ben Kohler @ 2023-05-25 13:16 UTC (permalink / raw
  To: gentoo-commits

commit:     7dfe1687db21ee02e2ceab43f01f07572e5fc47a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 16:38:21 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu May 25 13:16:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dfe1687

sys-kernel/genkernel: backport qlist no-color fix

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../files/genkernel-4.3.2-no-color-on-qlist.patch  |  38 +++
 sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild     | 323 +++++++++++++++++++++
 2 files changed, 361 insertions(+)

diff --git a/sys-kernel/genkernel/files/genkernel-4.3.2-no-color-on-qlist.patch b/sys-kernel/genkernel/files/genkernel-4.3.2-no-color-on-qlist.patch
new file mode 100644
index 000000000000..d87574a87c08
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.3.2-no-color-on-qlist.patch
@@ -0,0 +1,38 @@
+From 75d666895ff428ca18863674bcf7e5ebf176505b Mon Sep 17 00:00:00 2001
+From: Ben Kohler <bkohler@gentoo.org>
+Date: Wed, 24 May 2023 11:24:32 -0500
+Subject: [PATCH] gen_initramfs.sh: force no-color on qlist calls
+
+In some cases, qlist's pipe detection may not work, and this is fatal to
+our build. Let's just force -C on all qlist calls.
+
+Signed-off-by: Ben Kohler <bkohler@gentoo.org>
+---
+ gen_initramfs.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gen_initramfs.sh b/gen_initramfs.sh
+index 227badd..986b3b4 100755
+--- a/gen_initramfs.sh
++++ b/gen_initramfs.sh
+@@ -801,7 +801,7 @@ append_multipath() {
+ 
+ 	local udevdir=$(get_udevdir)
+ 	local udevdir_initramfs="/usr/lib/udev"
+-	local udev_files=( $(qlist -e sys-fs/multipath-tools:0 \
++	local udev_files=( $(qlist -eC sys-fs/multipath-tools:0 \
+ 		| grep -E -- "^${udevdir}")
+ 	)
+ 
+@@ -1131,7 +1131,7 @@ append_zfs() {
+ 
+ 	local udevdir=$(get_udevdir)
+ 	local udevdir_initramfs="/usr/lib/udev"
+-	local udev_files=( $(qlist -e sys-fs/zfs:0 \
++	local udev_files=( $(qlist -eC sys-fs/zfs:0 \
+ 		| grep -E -- "^${udevdir}")
+ 	)
+ 
+-- 
+2.40.1
+

diff --git a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
new file mode 100644
index 000000000000..fe9735ec1ab7
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 python-single-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BCACHE_TOOLS="1.0.8_p20141204"
+VERSION_BOOST="1.79.0"
+VERSION_BTRFS_PROGS="5.15"
+VERSION_BUSYBOX="1.34.1"
+VERSION_COREUTILS="8.32"
+VERSION_CRYPTSETUP="2.4.1"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2020.81"
+VERSION_EUDEV="3.2.10"
+VERSION_EXPAT="2.4.1"
+VERSION_E2FSPROGS="1.46.4"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_HWIDS="20210613"
+VERSION_ISCSI="2.0.878"
+VERSION_JSON_C="0.13.1"
+VERSION_KMOD="29"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.9.4"
+VERSION_LIBGPGERROR="1.43"
+VERSION_LIBXCRYPT="4.4.26"
+VERSION_LVM="2.02.188"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_POPT="1.18"
+VERSION_STRACE="5.14"
+VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_UTIL_LINUX="2.37.2"
+VERSION_XFSPROGS="5.13.0"
+VERSION_XZ="5.2.5"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.5.0"
+VERSION_KEYUTILS="1.6.3"
+
+COMMON_URI="
+	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
+	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
+	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+	https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ibm +firmware"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	app-portage/portage-utils
+	dev-util/gperf
+	sys-apps/sandbox
+	sys-devel/autoconf
+	sys-devel/autoconf-archive
+	sys-devel/automake
+	sys-devel/bc
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
+	firmware? ( sys-kernel/linux-firmware )"
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-color-on-qlist.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
+		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_XZ:${VERSION_XZ}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]] ; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	fperms +x /usr/share/genkernel/gen_worker.sh
+	fperms +x /usr/share/genkernel/path_expander.py
+
+	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	if [[ ${n_root_args} -gt 1 ]] ; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "If you are appending non-persistent device names to kernel command-line,"
+		ewarn "next reboot could fail in case running system and initramfs do not agree"
+		ewarn "on detected root device name!"
+	fi
+
+	if [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to be causing problems for any UDEV-enabled service."
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2023-05-29  2:50 Matt Turner
  0 siblings, 0 replies; 14+ messages in thread
From: Matt Turner @ 2023-05-29  2:50 UTC (permalink / raw
  To: gentoo-commits

commit:     05d14f401c01619a6c67b1da40861cecbe480ce7
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 02:46:23 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 29 02:50:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d14f40

sys-kernel/genkernel: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-kernel/genkernel/Manifest                      |  20 --
 .../files/genkernel-4.2.6-chroot-path.patch        |  49 ---
 .../files/genkernel-4.2.6-devicemanager.patch      |  72 -----
 .../genkernel-4.2.6-fix-btrfs-progs-deps.patch     |  24 --
 .../files/genkernel-4.2.6-fuse-glibc-2.34.patch    |  77 -----
 .../files/genkernel-4.2.6-gcc-12-boost-1.79.patch  |  28 --
 .../genkernel/files/genkernel-4.2.6-slibtool.patch | 106 -------
 sys-kernel/genkernel/genkernel-4.0.10.ebuild       | 267 -----------------
 sys-kernel/genkernel/genkernel-4.2.6-r6.ebuild     | 326 --------------------
 sys-kernel/genkernel/genkernel-4.2.6-r8.ebuild     | 328 ---------------------
 sys-kernel/genkernel/genkernel-4.3.1-r1.ebuild     | 322 --------------------
 sys-kernel/genkernel/genkernel-4.3.2.ebuild        | 322 --------------------
 12 files changed, 1941 deletions(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index d37c97e46a64..8da31f1756e1 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,40 +1,25 @@
-DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
 DIST bcache-tools-1.0.8_p20141204.tar.gz 22158 BLAKE2B dd36102c5668cab3072ea635a5a30128df6cd75b75e7f8bba17ad0a830746ff2f75a46b56d4211aeb4657453d3bbeb98b8b794c53ff724b3fbf0874068d70dc9 SHA512 53d6e764d6d42c4367b0bd98199cae3c18054d5707a7880af3a422f9db332b44941015eaed7e1cd170b3546307ed54a2f99558a68d98c76b7bb6234d29206b54
-DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90
-DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6
-DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
 DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
-DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
 DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada SHA512 17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
-DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3
 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
-DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
 DIST eudev-3.2.10.tar.gz 1961960 BLAKE2B 3708c78fad3abad6aa4b2beaaa325e25e118621aa2e6cb351732f6d8349dc17da9be852cab79045c7a513e927c2d1266c6443814fd264943765d98fb5b404e75 SHA512 d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d
-DIST expat-2.2.9.tar.xz 422460 BLAKE2B ea0e0bd005bbfd355e819e2b157859878a20ad9a6807cc5a10a6656f062e2443adb483adb0452d751b3d460834e3f613b8ecf7cdaf743be1b15815d005d01fa6 SHA512 e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0
 DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191
 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.6-s390x.patch 39633 BLAKE2B a48aae069b41e2520fce9ac60a79f567225bcb798bfa02ccc5c279427381d3f0e59bb0d8231b7e9760c22a1bccf17ae826d0f01973e32f9a4f0ab60165c8fbdd SHA512 d1db9f2c36cf9c0d7f042ec682c2b61817eda0d21c35515dc313ad8901c7c4239a28937c4b411f796ab38278caaa1fa3a7c7e7d6dd9c8ba3f4f37fbba5988105
-DIST genkernel-4.2.6.tar.xz 488892 BLAKE2B 4dc54c878e25165799ac40e45f28843c057348006a9e1a8dc2dec499e0ef78705104ae6893e15f76fc88cc054137d781cae1c4ec395fba669f6c93ec6fa8d6d9 SHA512 5981be08aac31c1cac22efd66e9cb39e6362cc7cac90dc26dd2089f95f287908dcbfb58a7da0bde6205bf42c57c606b96ed2e190b6d0fed1cfade9bae76b11fb
-DIST genkernel-4.3.1.tar.xz 478784 BLAKE2B 34ba4631c486e08610bc67eddf2b6738e1e4b8f2879d477d686985190390f4c5b948dd9e73f4a18afca484b550a74b1e6b9f21d7ab886a8f1e289a9cb91ebaba SHA512 49f58a2262ff214c7361b3141a684bdfb60c446d30232dfd6fed84b5953d2825095fba9188e270dcd1f00e7fcd884d1ca642473d56dd6f17daf440478639598d
 DIST genkernel-4.3.2.tar.xz 480168 BLAKE2B bde9abb37c0da8b4638618d17ea79eeffe1b8c1192ed11ace6e93541106ecb54d34644016488a1825077a966fa9a48ea655299dd6cd7b037db1292232fd66f5c SHA512 61e48badb5822833e570b800336b41d0ff36275961d956755b65971d98ca4c2feb0fbd88d27bc7caeb6e60ac8748036e7ffcdad8e37d09fee08cfc6174f43b15
 DIST genkernel-4.3.3.tar.xz 478772 BLAKE2B 60061335cf965df4add578cc59f0b548eddb4efab3ae96ddfcfaa116f85ffdf97ae5d667456f7da9257664945ce6748f987b8ae687c077b71ad1023ade23374d SHA512 2f543fda8451bf283ab835fdfbf3649fe561af9aa1356fe92e74b0ac248223f8f09c83ffa4d9f54bf74428b0c194f9decd21715a97e7a906e6e56576a4eab163
 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
 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9
-DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
 DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
-DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
-DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
 DIST libgpg-error-1.43.tar.bz2 999006 BLAKE2B 22c5491ebd43b8010cdd4e82a58443fb8d19d51de9a033d0bb44634a82f033916d5d9fcfe47eb47e64a513521b01ff088838a8979f488cde74e5944c28dec0aa SHA512 36769a62d0b4b219a6d58195bed692e34d3b0313f628b1036055ca34b69332edbe6bcdace9855a60d06e7be5998dc13bf1305d0b2bb211a4d8f701e85040961c
 DIST libxcrypt-4.4.26.tar.gz 525004 BLAKE2B 8198dc4f9e15f0ea51753eefa65332625a5a7e79bc59bdad4b3f3da3cd676b70562565bb8069c578d579c58c0df834a659227f1fe969c5dfa6247c7c1a67609a SHA512 fd58e397c59fd8f227a0006ed1039ef1d89e033f792f186a8c352fddc0741616fabe9784eb081aecac4db945741dd730f6cef36e6354f252fd934ce0866fdb2a
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
@@ -42,15 +27,10 @@ DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd5178328859
 DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
 DIST strace-5.14.tar.xz 2067020 BLAKE2B 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f SHA512 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
-DIST strace-5.7.tar.xz 1805044 BLAKE2B 487a1481357642be21c83cf387710bc75f17bd0af87ff07f914faa99120a619f33d2caba034d50dbdbc03aa3f758dae86d04fc6c25b3f6254ac3f0578a19884a SHA512 aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1
-DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
-DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
 DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d
 DIST xfsprogs-5.13.0.tar.xz 1301112 BLAKE2B 49e2b8535ef778362e68d45b1fb6f01be354dbee48d346c018e75ca1a5bc8761f47e65199bb62ffc4962faf8e185f3579e34e0562fab346d9839810727110665 SHA512 8e21bc43fb5cd49dccd6415b86f9e146d29c265a5d908f6898673290d6a2ac4a00bd25440fd7fab5ba080237d4bd54f56855ae64cdb32e59edae100b96155ca8
-DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
-DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-chroot-path.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-chroot-path.patch
deleted file mode 100644
index 150506c454c8..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.6-chroot-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=33394fef9f712ca0854eca248fe85863771ca04a
-
-From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
-Date: Mon, 16 May 2022 21:31:34 +0200
-Subject: linuxrc: do not rely on chroot evaluating PATH
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When trying to install a new kernel on catbus.sparc.dev.gentoo.org, the
-newly built initrd consistently claimed that it could not find init, and
-dropped to the rescue shell.
-
-However, init was there just fine in /newroot (as before).
-
-I dug out the command that is actually run inside linuxrc,
-
-        elif ! chroot "${CHROOT}" test -x /${init#/} 1>/dev/null 2>&1
-
-and tried to run that manually, which led to a rather strange error message
-
-rescueshell / # chroot /newroot test -x /lib/systemd/systemd
-chroot: can't execute 'test': File name too long
-
-Some more research led me to the busybox manpage (where here chroot comes
-from):
-https://busybox.net/downloads/BusyBox.html#chroot
-
-chroot
-    chroot NEWROOT [PROG [ARGS]]
-    Run PROG with root directory set to NEWROOT
-
-Note, the third argument is *not* a command (as with usual chroot, see the
-manpage from coreutils chroot) but a program!
-
-Bug: https://bugs.gentoo.org/842027
-Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---- a/defaults/linuxrc
-+++ b/defaults/linuxrc
-@@ -1376,7 +1376,7 @@ do
- 	if  ! mountpoint "${CHROOT}" 1>/dev/null 2>&1
- 	then
- 		bad_msg "${CHROOT} is not a mountpoint; Was root device (${REAL_ROOT}) not mounted?"
--	elif ! chroot "${CHROOT}" test -x /${init#/} 1>/dev/null 2>&1
-+	elif ! chroot "${CHROOT}" /usr/bin/test -x /${init#/} 1>/dev/null 2>&1
- 	then
- 		mounted_root_device=$(mountpoint -n /newroot 2>/dev/null | awk '{ print $1 }')
- 		bad_msg "init (${init}) not found in mounted root device (${mounted_root_device})!"
-cgit v1.2.3-18-g5258

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-devicemanager.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-devicemanager.patch
deleted file mode 100644
index f1c5787ed657..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.6-devicemanager.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 110cffbf0a10a6dabe902eecb9c139663ad737af Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 15 May 2022 12:37:51 -0400
-Subject: [PATCH] gen_initramfs.sh: append devicemanager only for specific
- modules
-
-dmraid
-luks
-lvm
-multipath
-
-Bug: https://bugs.gentoo.org/749957
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- gen_funcs.sh     |  9 +++++++++
- gen_initramfs.sh | 11 +++++++----
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/gen_funcs.sh b/gen_funcs.sh
-index 500caf2..db396e3 100755
---- a/gen_funcs.sh
-+++ b/gen_funcs.sh
-@@ -22,6 +22,15 @@ isTrue() {
- 	return 1
- }
- 
-+anyTrue() {
-+	local x
-+	for x
-+	do
-+		isTrue "${x}" && return 0
-+	done
-+	return 1
-+}
-+
- set_color_vars() {
- 	if ! isTrue "${NOCOLOR}"
- 	then
-diff --git a/gen_initramfs.sh b/gen_initramfs.sh
-index 4ec296e..0b74f4c 100755
---- a/gen_initramfs.sh
-+++ b/gen_initramfs.sh
-@@ -2007,11 +2007,14 @@ append_auxiliary() {
- }
- 
- append_data() {
--	local name=$1 var=$2
-+	[ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
-+
-+	local name=$1
- 	local func="append_${name}"
- 
--	[ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
--	if [ $# -eq 1 ] || isTrue "${var}"
-+	shift
-+
-+	if [ $# -eq 0 ] || anyTrue "$@"
- 	then
- 		print_info 1 "$(get_indent 1)>> Appending ${name} cpio data ..."
- 		${func} || gen_die "${func}() failed!"
-@@ -2037,7 +2040,7 @@ create_initramfs() {
- 	append_data 'base_layout'
- 	append_data 'util-linux'
- 	append_data 'eudev'
--	append_data 'devicemanager'
-+	append_data 'devicemanager' "${DMRAID}" "${LVM}" "${LUKS}" "${MULTIPATH}"
- 	append_data 'auxiliary' "${BUSYBOX}"
- 	append_data 'busybox' "${BUSYBOX}"
- 	append_data 'b2sum' "${B2SUM}"
--- 
-2.35.1
-

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-fix-btrfs-progs-deps.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-fix-btrfs-progs-deps.patch
deleted file mode 100644
index f9306d851d33..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.6-fix-btrfs-progs-deps.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 779376e0a1e3c55a8bdc40c5e55ce9bb50ee8eae
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Tue Nov 16 18:33:12 2021 +0100
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Tue Nov 16 18:33:12 2021 +0100
-
-    btrfs-progs-5.15+ needs libudev
-    
-    Fixes: d3ee3d06 ("Bump btrfs-progs to v5.15")
-    Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-
-diff --git a/defaults/software.sh b/defaults/software.sh
-index 9f64ab0..ec2bacb 100644
---- a/defaults/software.sh
-+++ b/defaults/software.sh
-@@ -32,7 +32,7 @@ GKPKG_BOOST_BUILD_BINPKG="${GKPKG_BOOST_BUILD_BINPKG:-%%CACHE%%/boost-build-${GK
- 
- GKPKG_BTRFS_PROGS_PN="btrfs-progs"
- GKPKG_BTRFS_PROGS_PV="${GKPKG_BTRFS_PROGS_PV:-VERSION_BTRFS_PROGS}"
--GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo"
-+GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo eudev"
- GKPKG_BTRFS_PROGS_SRCTAR="${GKPKG_BTRFS_PROGS_SRCTAR:-${DISTDIR}/btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}.tar.xz}"
- GKPKG_BTRFS_PROGS_SRCDIR="${GKPKG_BTRFS_PROGS_SRCDIR:-btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}}"
- GKPKG_BTRFS_PROGS_BINPKG="${GKPKG_BTRFS_PROGS_BINPKG:-%%CACHE%%/btrfs-progs-${GKPKG_BTRFS_PROGS_PV}-%%ARCH%%.tar.xz}"

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-fuse-glibc-2.34.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-fuse-glibc-2.34.patch
deleted file mode 100644
index 731f127a6712..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.6-fuse-glibc-2.34.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 1b1da7527b0307cb70118caf5dfe2da778671588
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Fri Dec 10 01:56:20 2021 +0100
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Fri Dec 10 01:56:20 2021 +0100
-
-    fuse: Add patch to allow building against glibc-2.34
-    
-    Bug: https://bugs.gentoo.org/828445
-    Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-
-diff --git a/patches/fuse/2.9.9/fuse-2.9.9-glibc-2.34.patch b/patches/fuse/2.9.9/fuse-2.9.9-glibc-2.34.patch
-new file mode 100644
-index 0000000..eb7737c
---- /dev/null
-+++ b/patches/fuse/2.9.9/fuse-2.9.9-glibc-2.34.patch
-@@ -0,0 +1,60 @@
-+From 5a43d0f724c56f8836f3f92411e0de1b5f82db32 Mon Sep 17 00:00:00 2001
-+From: Sam James <sam@gentoo.org>
-+Date: Sat, 24 Jul 2021 22:02:45 +0100
-+Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix
-+ glibc-2.34+)
-+
-+closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since
-+it's available in glibc 2.34+, we want to detect it and only define our
-+fallback if the libc doesn't provide it.
-+
-+Bug: https://bugs.gentoo.org/803923
-+Signed-off-by: Sam James <sam@gentoo.org>
-+---
-+ configure.ac           | 1 +
-+ util/ulockmgr_server.c | 6 ++++++
-+ 2 files changed, 7 insertions(+)
-+
-+diff --git a/configure.ac b/configure.ac
-+index 9946a0efa..a2d481aa9 100644
-+--- a/configure.ac
-++++ b/configure.ac
-+@@ -55,6 +55,7 @@ fi
-+ 
-+ AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
-+ AC_CHECK_FUNCS([posix_fallocate])
-++AC_CHECK_FUNCS([closefrom])
-+ AC_CHECK_MEMBERS([struct stat.st_atim])
-+ AC_CHECK_MEMBERS([struct stat.st_atimespec])
-+ 
-+diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
-+index 273c7d923..a04dac5c6 100644
-+--- a/util/ulockmgr_server.c
-++++ b/util/ulockmgr_server.c
-+@@ -22,6 +22,10 @@
-+ #include <sys/socket.h>
-+ #include <sys/wait.h>
-+ 
-++#ifdef HAVE_CONFIG_H
-++	#include "config.h"
-++#endif
-++
-+ struct message {
-+ 	unsigned intr : 1;
-+ 	unsigned nofd : 1;
-+@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp,
-+ 	return res;
-+ }
-+ 
-++#if !defined(HAVE_CLOSEFROM)
-+ static int closefrom(int minfd)
-+ {
-+ 	DIR *dir = opendir("/proc/self/fd");
-+@@ -141,6 +146,7 @@ static int closefrom(int minfd)
-+ 	}
-+ 	return 0;
-+ }
-++#endif
-+ 
-+ static void send_reply(int cfd, struct message *msg)
-+ {

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-gcc-12-boost-1.79.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-gcc-12-boost-1.79.patch
deleted file mode 100644
index f65a272b953f..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.6-gcc-12-boost-1.79.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8b7422293dcf9cc62518dcbc49239b6e637b6b74 Mon Sep 17 00:00:00 2001
-From: "Robin H. Johnson" <robbat2@gentoo.org>
-Date: Sun, 3 Jul 2022 21:46:21 -0700
-Subject: [PATCH] gkbuilds/boost-build.gkbuild: upstream boost flags changed
-
-Upstream boost changed the flags to use 'off' instead of 'none'.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Closes: https://bugs.gentoo.org/854480
----
- gkbuilds/boost-build.gkbuild | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gkbuilds/boost-build.gkbuild b/gkbuilds/boost-build.gkbuild
-index 03d1f88..0e06ba7 100644
---- a/gkbuilds/boost-build.gkbuild
-+++ b/gkbuilds/boost-build.gkbuild
-@@ -53,6 +53,6 @@ src_install() {
- 	find "${D}/usr/share/boost-build" -iname "*.py" -delete \
- 		|| die "Failed to remove python files"
- 
--	echo 'variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ;' > "${D}/usr/share/boost-build/site-config.jam" \
-+	echo 'variant gentoorelease : release : <optimization>off <debug-symbols>off <runtime-link>shared ;' > "${D}/usr/share/boost-build/site-config.jam" \
- 		|| die "Failed to create '${D}/usr/share/boost-build/site-config.jam'!"
- }
--- 
-2.35.1
-

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch
deleted file mode 100644
index 0f0bd2619ae2..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Bug: https://bugs.gentoo.org/836012
-Upstream-PR: https://github.com/gentoo/genkernel/pull/33
-
-From 1bb3cc10d51026ad500bc9cec883f1f2f0c445ec Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Sun, 15 May 2022 15:49:21 -0700
-Subject: [PATCH 1/3] gen_funcs: Add an install_exe function
-
-This helps when the build uses slibtool where the compiled binary output
-path differs from GNU libtool.
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- gen_funcs.sh | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/gen_funcs.sh b/gen_funcs.sh
-index 500caf2d..a4dc0e44 100755
---- a/gen_funcs.sh
-+++ b/gen_funcs.sh
-@@ -1974,6 +1974,29 @@ check_distfiles() {
- 	fi
- }
- 
-+# @FUNCTION: install_exe
-+# @USAGE: <file> <destination>
-+# @DESCRIPTION:
-+# Finds an executable binary file and installs it in cases where there may be
-+# similarly named shell wrapper scripts. This happens when GNU libtool creates
-+# an executable named 'foo' while slibtool creates '.libs/foo' and 'foo' is a
-+# shell script that should not be installed.
-+install_exe() {
-+	local file="${1##*/}"
-+	local dest="${2}"
-+
-+	local dir
-+	[[ "${1%/*}" == "${file}" ]] || dir="${1%/*}/"
-+
-+	[[ -f "${dir}${file}" ]] || gen_die "File '${dir}${file}' does not exist!"
-+
-+	# Ensure only the binaries are installed and not a similarly named wrapper script
-+	find "${S}/${dir}" -type f -name "${file}" -print0 |
-+		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
-+		xargs -I '{}' cp -a '{}' "${dest}" ||
-+		gen_die "Failed to copy '${S}/${dir}${file}' to '${dest}'!"
-+}
-+
- # @FUNCTION: expand_file
- # @USAGE: <file>
- # @DESCRIPTION:
-
-From cfc9ff455e2473e4322bd18c5fa21370d9c0702e Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Thu, 24 Mar 2022 11:43:40 -0700
-Subject: [PATCH 2/3] gkbuild/util-linux: Install the correct binaries with
- slibtool
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- gkbuilds/util-linux.gkbuild | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild
-index 40ea1fbb..5addbb1d 100644
---- a/gkbuilds/util-linux.gkbuild
-+++ b/gkbuilds/util-linux.gkbuild
-@@ -47,11 +47,8 @@ src_install() {
- 
- 	mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!"
- 
--	cp -a blkid.static "${D}"/sbin/blkid \
--		|| die "Failed to copy '${S}/blkid.static' to '${D}/sbin/blkid'!"
--
--	cp -a switch_root "${D}"/sbin/switch_root \
--		|| die "Failed to copy '${S}/switch_root' to '${D}/sbin/switch_root'!"
-+	install_exe 'blkid.static' "${D}"/sbin/blkid
-+	install_exe 'switch_root' "${D}"/sbin/switch_root
- 
- 	local sbin
- 	for sbin in \
-
-From 2d2e91f288679e272f731917feb58f3768ea586d Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Thu, 24 Mar 2022 13:17:07 -0700
-Subject: [PATCH 3/3] gkbuild/cryptsetup: Install the correct binaries with
- slibtool
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- gkbuilds/cryptsetup.gkbuild | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
-index 007874d1..816df609 100644
---- a/gkbuilds/cryptsetup.gkbuild
-+++ b/gkbuilds/cryptsetup.gkbuild
-@@ -34,8 +34,7 @@ src_install() {
- 		"${D}"/sbin/* \
- 		"${D}"/usr/share/
- 
--	cp -a cryptsetup.static "${D}"/sbin/cryptsetup \
--		|| die "Failed to copy '${S}/cryptsetup.static' to '${D}/sbin/cryptsetup'!"
-+	install_exe 'cryptsetup.static' "${D}"/sbin/cryptsetup
- 
- 	"${STRIP}" --strip-all "${D}"/sbin/cryptsetup \
- 		|| die "Failed to strip '${D}/sbin/cryptsetup'!"

diff --git a/sys-kernel/genkernel/genkernel-4.0.10.ebuild b/sys-kernel/genkernel/genkernel-4.0.10.ebuild
deleted file mode 100644
index b26333b38c37..000000000000
--- a/sys-kernel/genkernel/genkernel-4.0.10.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BOOST="1.73.0"
-VERSION_BTRFS_PROGS="5.6.1"
-VERSION_BUSYBOX="1.31.1"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.3.3"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.80"
-VERSION_EXPAT="2.2.9"
-VERSION_E2FSPROGS="1.45.6"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="27"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.8.6"
-VERSION_LIBGPGERROR="1.38"
-VERSION_LVM="2.02.187"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.7"
-VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.35.2"
-VERSION_XFSPROGS="5.6.0"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.5"
-
-COMMON_URI="
-	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-}

diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r6.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r6.ebuild
deleted file mode 100644
index 72d8601079a3..000000000000
--- a/sys-kernel/genkernel/genkernel-4.2.6-r6.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 python-single-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.79.0"
-VERSION_BTRFS_PROGS="5.15"
-VERSION_BUSYBOX="1.34.1"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.4.1"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.81"
-VERSION_EUDEV="3.2.10"
-VERSION_EXPAT="2.4.1"
-VERSION_E2FSPROGS="1.46.4"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20210613"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="29"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.9.4"
-VERSION_LIBGPGERROR="1.43"
-VERSION_LIBXCRYPT="4.4.26"
-VERSION_LVM="2.02.188"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.14"
-VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.37.2"
-VERSION_XFSPROGS="5.13.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.5.0"
-
-COMMON_URI="
-	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
-	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	SRC_URI+=" https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> ${P}-s390x.patch"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	dev-util/gperf
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/bc
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${P}-devicemanager.patch
-	"${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch
-	"${FILESDIR}"/${P}-fuse-glibc-2.34.patch
-	"${FILESDIR}"/${P}-gcc-12-boost-1.79.patch
-	"${FILESDIR}"/${P}-chroot-path.patch
-	"${DISTDIR}"/${P}-s390x.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_XZ:${VERSION_XZ}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-	fperms +x /usr/share/genkernel/path_expander.py
-
-	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	if [[ ${n_root_args} -gt 1 ]] ; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "If you are appending non-persistent device names to kernel command-line,"
-		ewarn "next reboot could fail in case running system and initramfs do not agree"
-		ewarn "on detected root device name!"
-	fi
-
-	if [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for any UDEV-enabled service."
-		fi
-	fi
-}

diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r8.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r8.ebuild
deleted file mode 100644
index 5db275f8f67f..000000000000
--- a/sys-kernel/genkernel/genkernel-4.2.6-r8.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 python-single-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.79.0"
-VERSION_BTRFS_PROGS="5.15"
-VERSION_BUSYBOX="1.34.1"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.4.1"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.81"
-VERSION_EUDEV="3.2.10"
-VERSION_EXPAT="2.4.1"
-VERSION_E2FSPROGS="1.46.4"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20210613"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="29"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.9.4"
-VERSION_LIBGPGERROR="1.43"
-VERSION_LIBXCRYPT="4.4.26"
-VERSION_LVM="2.02.188"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.14"
-VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.37.2"
-VERSION_XFSPROGS="5.13.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.5.0"
-
-COMMON_URI="
-	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
-	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
-		${COMMON_URI}"
-	SRC_URI+=" https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> ${P}-s390x.patch"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	app-portage/portage-utils
-	dev-util/gperf
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/bc
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${P}-devicemanager.patch
-	"${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch
-	"${FILESDIR}"/${P}-fuse-glibc-2.34.patch
-	"${FILESDIR}"/${P}-gcc-12-boost-1.79.patch
-	"${FILESDIR}"/${P}-chroot-path.patch
-	"${FILESDIR}"/${P}-slibtool.patch # 836012
-	"${DISTDIR}"/${P}-s390x.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_XZ:${VERSION_XZ}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-	fperms +x /usr/share/genkernel/path_expander.py
-
-	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	if [[ ${n_root_args} -gt 1 ]] ; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "If you are appending non-persistent device names to kernel command-line,"
-		ewarn "next reboot could fail in case running system and initramfs do not agree"
-		ewarn "on detected root device name!"
-	fi
-
-	if [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for any UDEV-enabled service."
-		fi
-	fi
-}

diff --git a/sys-kernel/genkernel/genkernel-4.3.1-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.1-r1.ebuild
deleted file mode 100644
index cf7b9cc5f70a..000000000000
--- a/sys-kernel/genkernel/genkernel-4.3.1-r1.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 python-single-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.79.0"
-VERSION_BTRFS_PROGS="5.15"
-VERSION_BUSYBOX="1.34.1"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.4.1"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.81"
-VERSION_EUDEV="3.2.10"
-VERSION_EXPAT="2.4.1"
-VERSION_E2FSPROGS="1.46.4"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20210613"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="29"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.9.4"
-VERSION_LIBGPGERROR="1.43"
-VERSION_LIBXCRYPT="4.4.26"
-VERSION_LVM="2.02.188"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.14"
-VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.37.2"
-VERSION_XFSPROGS="5.13.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.5.0"
-VERSION_KEYUTILS="1.6.3"
-
-COMMON_URI="
-	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
-	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-	https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	app-portage/portage-utils
-	dev-util/gperf
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/bc
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=(
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_XZ:${VERSION_XZ}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-	fperms +x /usr/share/genkernel/path_expander.py
-
-	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	if [[ ${n_root_args} -gt 1 ]] ; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "If you are appending non-persistent device names to kernel command-line,"
-		ewarn "next reboot could fail in case running system and initramfs do not agree"
-		ewarn "on detected root device name!"
-	fi
-
-	if [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for any UDEV-enabled service."
-		fi
-	fi
-}

diff --git a/sys-kernel/genkernel/genkernel-4.3.2.ebuild b/sys-kernel/genkernel/genkernel-4.3.2.ebuild
deleted file mode 100644
index 93c159ba3575..000000000000
--- a/sys-kernel/genkernel/genkernel-4.3.2.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit bash-completion-r1 python-single-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.79.0"
-VERSION_BTRFS_PROGS="5.15"
-VERSION_BUSYBOX="1.34.1"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.4.1"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.81"
-VERSION_EUDEV="3.2.10"
-VERSION_EXPAT="2.4.1"
-VERSION_E2FSPROGS="1.46.4"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20210613"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="29"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.9.4"
-VERSION_LIBGPGERROR="1.43"
-VERSION_LIBXCRYPT="4.4.26"
-VERSION_LVM="2.02.188"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.14"
-VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.37.2"
-VERSION_XFSPROGS="5.13.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.5.0"
-VERSION_KEYUTILS="1.6.3"
-
-COMMON_URI="
-	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
-	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
-	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
-	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-	https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	app-portage/portage-utils
-	dev-util/gperf
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/bc
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
-	firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=(
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_XZ:${VERSION_XZ}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-	fperms +x /usr/share/genkernel/path_expander.py
-
-	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	if [[ ${n_root_args} -gt 1 ]] ; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "If you are appending non-persistent device names to kernel command-line,"
-		ewarn "next reboot could fail in case running system and initramfs do not agree"
-		ewarn "on detected root device name!"
-	fi
-
-	if [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for any UDEV-enabled service."
-		fi
-	fi
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2024-05-01 15:55 Ben Kohler
  0 siblings, 0 replies; 14+ messages in thread
From: Ben Kohler @ 2024-05-01 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     c573e66ca123d2367a05ba2c69dd832b97a76f95
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 15:48:59 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May  1 15:54:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c573e66c

sys-kernel/genkernel: add fix for mdadm on musl

Closes: https://bugs.gentoo.org/928279
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../files/genkernel-4.3.12-mdadm-musl-fix.patch    |  14 ++
 sys-kernel/genkernel/genkernel-4.3.12-r1.ebuild    | 276 +++++++++++++++++++++
 2 files changed, 290 insertions(+)

diff --git a/sys-kernel/genkernel/files/genkernel-4.3.12-mdadm-musl-fix.patch b/sys-kernel/genkernel/files/genkernel-4.3.12-mdadm-musl-fix.patch
new file mode 100644
index 000000000000..5deed8f195b4
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.3.12-mdadm-musl-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/gkbuilds/mdadm.gkbuild b/gkbuilds/mdadm.gkbuild
+index b43f753..e8060e5 100644
+--- a/gkbuilds/mdadm.gkbuild
++++ b/gkbuilds/mdadm.gkbuild
+@@ -16,6 +16,9 @@ src_prepare() {
+ }
+ 
+ src_compile() {
++	# bug 907082
++	use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
++
+ 	gkmake V=1 mdadm mdmon
+ }
+ 

diff --git a/sys-kernel/genkernel/genkernel-4.3.12-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.12-r1.ebuild
new file mode 100644
index 000000000000..d1ee3dace381
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.3.12-r1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 python-single-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BCACHE_TOOLS="1.0.8_p20141204"
+VERSION_BOOST="1.79.0"
+VERSION_BTRFS_PROGS="6.3.2"
+VERSION_BUSYBOX="1.36.1"
+VERSION_COREUTILS="9.3"
+VERSION_CRYPTSETUP="2.6.1"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2022.83"
+VERSION_EUDEV="3.2.10"
+VERSION_EXPAT="2.5.0"
+VERSION_E2FSPROGS="1.46.4"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_HWIDS="20210613"
+VERSION_ISCSI="2.1.8"
+VERSION_JSON_C="0.13.1"
+VERSION_KMOD="30"
+VERSION_LIBAIO="0.3.113"
+VERSION_LIBGCRYPT="1.9.4"
+VERSION_LIBGPGERROR="1.43"
+VERSION_LIBXCRYPT="4.4.36"
+VERSION_LVM="2.02.188"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_POPT="1.18"
+VERSION_STRACE="6.4"
+VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_USERSPACE_RCU="0.14.0"
+VERSION_UTIL_LINUX="2.38.1"
+VERSION_XFSPROGS="6.3.0"
+VERSION_XZ="5.4.3"
+VERSION_ZLIB="1.2.13"
+VERSION_ZSTD="1.5.5"
+VERSION_KEYUTILS="1.6.3"
+
+COMMON_URI="
+	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
+	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
+	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://github.com/besser82/libxcrypt/releases/download/v${VERSION_LIBXCRYPT}/libxcrypt-${VERSION_LIBXCRYPT}.tar.xz
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
+	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+	https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="https://dev.gentoo.org/~bkohler/dist/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ibm +firmware"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND="
+	app-text/asciidoc
+"
+RDEPEND="${PYTHON_DEPS}
+	app-alternatives/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	app-portage/portage-utils
+	dev-util/gperf
+	sys-apps/sandbox
+	dev-build/autoconf
+	dev-build/autoconf-archive
+	dev-build/automake
+	app-alternatives/bc
+	app-alternatives/yacc
+	app-alternatives/lex
+	dev-build/libtool
+	virtual/pkgconfig
+	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
+	firmware? ( sys-kernel/linux-firmware )
+"
+
+PATCHES=(
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Export all the versions that may be used by genkernel build.
+	for v in $(set |awk -F= '/^VERSION_/{print $1}') ; do
+	export ${v}
+	done
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	use elibc_musl && eapply "${FILESDIR}"/genkernel-4.3.12-mdadm-musl-fix.patch
+}
+
+src_compile() {
+	emake PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc AUTHORS ChangeLog README TODO
+
+	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	if [[ ${n_root_args} -gt 1 ]] ; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "If you are appending non-persistent device names to kernel command-line,"
+		ewarn "next reboot could fail in case running system and initramfs do not agree"
+		ewarn "on detected root device name!"
+	fi
+
+	if [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to be causing problems for any UDEV-enabled service."
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/
@ 2024-05-22 15:20 Ben Kohler
  0 siblings, 0 replies; 14+ messages in thread
From: Ben Kohler @ 2024-05-22 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     63fb9e80f5d9b3d3bd9e07f239a1f9f355f1c053
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 15:00:54 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May 22 15:20:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63fb9e80

sys-kernel/genkernel: add 4.3.15

This version contains new bundled package versions plus some misc
genkernel code fixes.  Some of the bundled package versions will fix
known bugs.

Closes: https://bugs.gentoo.org/932397
Closes: https://bugs.gentoo.org/931324
Closes: https://bugs.gentoo.org/928573
Closes: https://bugs.gentoo.org/922663

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-kernel/genkernel/Manifest                      |   1 +
 ...el-4.3.15-fix-srcdir-for-new-bcache-tools.patch |  26 ++
 .../files/genkernel-4.3.15-mdadm-musl-fix.patch    |  14 +
 sys-kernel/genkernel/genkernel-4.3.15.ebuild       | 282 +++++++++++++++++++++
 4 files changed, 323 insertions(+)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index b3313ccbdeb5..c6a60e76f27e 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -20,6 +20,7 @@ DIST genkernel-4.3.10.tar.xz 484664 BLAKE2B ec1c44e633927c2c2fa12e22f428f6667ff5
 DIST genkernel-4.3.11.tar.xz 462644 BLAKE2B beb36fc021ecbc44ae206fdcbac2f10c3ecbd1531a327656f62a944b1519da760527408c4f49ae9eb798444c9bb38da50c93d55198e3d8b573fe3d4c6770b388 SHA512 1ca3ed6414ae92e993c06a0a97ecb372e129c9aed691a1b13240c7a0d05e6ea81637fbb6ac248b8d7cf6ff9bde84213f2eef0f3d50ff0648d5e31b5a41327a87
 DIST genkernel-4.3.12.tar.xz 463308 BLAKE2B 81bcc841110db63940f6bdbaf15016a877ee3099398dd983a8562e602eb0adbb03eebc8d6da7dd25da3549ff28d9cbbed00d569a00c63452ceaa9cdaf914ec5e SHA512 6b77aeede76c2e51f34d2ec0407215b27b32e268d8dac26ab4889be1891d1787d48cf804c1fe8c3cef5407442754078fec0af18ef7850c02d9306656715fca82
 DIST genkernel-4.3.14.tar.xz 469672 BLAKE2B 8ccc7b4b1ccda0771b4e701610e7be32980b6ee8348013ebc670a596a566463b848c4089b596ba1d0e7412abc0f854e05178b9a71227d947ad5a4baf2d3a65d6 SHA512 80cd67e62dc135baa6d3a947cdacef9261ce83003c94946708d924a5b0ee31f3bb5ccd54af48b7a8f4ca1cb525c5753e4aca56bc23844fb46a0a80d66a03acee
+DIST genkernel-4.3.15.tar.xz 470256 BLAKE2B 12ab3308e8ae8a4cf55d27c0b346ced820320a544e64ba4cb5ba49bb03f6a16dc0c3c0323aa0cc13cc1f296132be55059cb66e30df3d72d31eb22ee35d9d05f3 SHA512 ae7a9cb2e0b54f9878f6079f217754c395f2a15e2d19f74c4e53207bc60b1f3328ae563beaa7d67a6274f394f84802eb598b069a6833bd1f4f790a5bb646f30b
 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.3.15-fix-srcdir-for-new-bcache-tools.patch b/sys-kernel/genkernel/files/genkernel-4.3.15-fix-srcdir-for-new-bcache-tools.patch
new file mode 100644
index 000000000000..ba6eee2387dd
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.3.15-fix-srcdir-for-new-bcache-tools.patch
@@ -0,0 +1,26 @@
+From f973903cea8d161893b29b4fb4114561a6aa5674 Mon Sep 17 00:00:00 2001
+From: Ben Kohler <bkohler@gentoo.org>
+Date: Wed, 22 May 2024 10:14:32 -0500
+Subject: [PATCH] defaults/software.sh: fix srcdir for new bcache-tools
+
+Signed-off-by: Ben Kohler <bkohler@gentoo.org>
+---
+ defaults/software.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/defaults/software.sh b/defaults/software.sh
+index 01c504b..42004f3 100644
+--- a/defaults/software.sh
++++ b/defaults/software.sh
+@@ -13,7 +13,7 @@ GKPKG_BCACHE_TOOLS_PN="bcache-tools"
+ GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
+ GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
+ GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}"
+-GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-399021549984ad27bf4a13ae85e458833fe003d7}"
++GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-a5e3753516bd39c431def86c8dfec8a9cea1ddd4}"
+ GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}"
+ 
+ GKPKG_BOOST_PN="boost"
+-- 
+2.45.1
+

diff --git a/sys-kernel/genkernel/files/genkernel-4.3.15-mdadm-musl-fix.patch b/sys-kernel/genkernel/files/genkernel-4.3.15-mdadm-musl-fix.patch
new file mode 100644
index 000000000000..7c5cb3f9ce94
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.3.15-mdadm-musl-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/gkbuilds/mdadm.gkbuild b/gkbuilds/mdadm.gkbuild
+index b43f753..e8060e5 100644
+--- a/gkbuilds/mdadm.gkbuild
++++ b/gkbuilds/mdadm.gkbuild
+@@ -16,6 +16,9 @@ src_prepare() {
+ }
+ 
+ src_compile() {
++	# bug 907082
++	append-cppflags -D_LARGEFILE64_SOURCE
++
+ 	gkmake V=1 mdadm mdmon
+ }
+ 

diff --git a/sys-kernel/genkernel/genkernel-4.3.15.ebuild b/sys-kernel/genkernel/genkernel-4.3.15.ebuild
new file mode 100644
index 000000000000..7492c67ec423
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.3.15.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 python-single-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BCACHE_TOOLS="1.1_p20230217"
+# boost-1.84.0 needs dev-build/b2 packaged
+VERSION_BOOST="1.79.0"
+VERSION_BTRFS_PROGS="6.7.1"
+VERSION_BUSYBOX="1.36.1"
+VERSION_COREUTILS="9.4"
+VERSION_CRYPTSETUP="2.6.1"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2022.83"
+VERSION_EUDEV="3.2.10"
+VERSION_EXPAT="2.5.0"
+VERSION_E2FSPROGS="1.47.0"
+VERSION_FUSE="2.9.9"
+# gnupg-2.x needs several new deps packaged
+VERSION_GPG="1.4.23"
+VERSION_HWIDS="20210613"
+# open-iscsi-2.1.9 static build not working yet
+VERSION_ISCSI="2.1.8"
+# json-c-0.17 needs gkbuild ported to meson
+VERSION_JSON_C="0.13.1"
+VERSION_KMOD="31"
+VERSION_LIBAIO="0.3.113"
+VERSION_LIBGCRYPT="1.10.3"
+VERSION_LIBGPGERROR="1.47"
+VERSION_LIBXCRYPT="4.4.36"
+VERSION_LVM="2.03.22"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.2"
+VERSION_POPT="1.19"
+VERSION_STRACE="6.7"
+VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
+# unionfs-fuse-3.4 needs fuse:3
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_USERSPACE_RCU="0.14.0"
+VERSION_UTIL_LINUX="2.39.3"
+VERSION_XFSPROGS="6.4.0"
+VERSION_XZ="5.4.2"
+VERSION_ZLIB="1.3.1"
+VERSION_ZSTD="1.5.5"
+VERSION_KEYUTILS="1.6.3"
+
+COMMON_URI="
+	https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/a5e3753516bd39c431def86c8dfec8a9cea1ddd4.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
+	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
+	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://github.com/besser82/libxcrypt/releases/download/v${VERSION_LIBXCRYPT}/libxcrypt-${VERSION_LIBXCRYPT}.tar.xz
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
+	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+	https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="https://dev.gentoo.org/~bkohler/dist/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ibm +firmware"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND="
+	app-text/asciidoc
+"
+RDEPEND="${PYTHON_DEPS}
+	app-alternatives/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	app-portage/portage-utils
+	dev-util/gperf
+	sys-apps/sandbox
+	dev-build/autoconf
+	dev-build/autoconf-archive
+	dev-build/automake
+	app-alternatives/bc
+	app-alternatives/yacc
+	app-alternatives/lex
+	dev-build/libtool
+	virtual/pkgconfig
+	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
+	firmware? ( sys-kernel/linux-firmware )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-srcdir-for-new-bcache-tools.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Export all the versions that may be used by genkernel build.
+	for v in $(set |awk -F= '/^VERSION_/{print $1}') ; do
+	export ${v}
+	done
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	use elibc_musl && eapply "${FILESDIR}"/genkernel-4.3.15-mdadm-musl-fix.patch
+}
+
+src_compile() {
+	emake PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc AUTHORS ChangeLog README TODO
+
+	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	if [[ ${n_root_args} -gt 1 ]] ; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "If you are appending non-persistent device names to kernel command-line,"
+		ewarn "next reboot could fail in case running system and initramfs do not agree"
+		ewarn "on detected root device name!"
+	fi
+
+	if [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to be causing problems for any UDEV-enabled service."
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2024-05-22 15:20 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-14 20:34 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/, sys-kernel/genkernel/files/ Thomas Deutschmann
  -- strict thread matches above, loose matches on Subject: below --
2024-05-22 15:20 Ben Kohler
2024-05-01 15:55 Ben Kohler
2023-05-29  2:50 Matt Turner
2023-05-25 13:16 Ben Kohler
2022-08-02  0:22 Sam James
2022-07-04  4:50 Robin H. Johnson
2022-05-17 20:16 Andreas K. Hüttel
2021-10-27 17:00 Thomas Deutschmann
2020-09-02 13:59 Thomas Deutschmann
2020-08-31 17:47 Thomas Deutschmann
2020-03-26 23:03 Thomas Deutschmann
2019-07-14 18:57 Thomas Deutschmann
2016-03-27  6:26 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox