[gentoo-commits] repo/gentoo:master commit in: app-misc/livecd-tools/

["Ben Kohler" <bkohler@gentoo.org>]

commit:     b01e14ada4fc51a754ee17a918b046ff0a4d63b6
Author:     Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Wed Jul 31 21:44:47 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 18:42:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01e14ad

app-misc/livecd-tools: update livebuild

Match livebuild to 2.11

Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37827
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 app-misc/livecd-tools/livecd-tools-9999.ebuild | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app-misc/livecd-tools/livecd-tools-9999.ebuild b/app-misc/livecd-tools/livecd-tools-9999.ebuild
index d9caac398248..b088e11e6125 100644
--- a/app-misc/livecd-tools/livecd-tools-9999.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-9999.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-info
 
+KEYMAP_VER=v1.0.0
+
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/proj/livecd-tools.git"
 	inherit git-r3
@@ -15,18 +17,14 @@ fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
 HOMEPAGE="https://gitweb.gentoo.org/proj/livecd-tools.git/"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 
 RDEPEND="
 	dev-util/dialog
 	media-sound/alsa-utils
 	net-dialup/mingetty
-	|| (
-		sys-apps/openrc
-		sys-apps/openrc-navi
-	)
+	sys-apps/openrc
 	sys-apps/pciutils
 "
 
@@ -45,4 +43,12 @@ src_install() {
 	dosbin net-setup
 	into /
 	dosbin livecd-functions.sh
+	# Add the keymap hook for dracut
+	insinto /usr/lib/dracut/modules.d
+	doins -r dracut/90dokeymap
+	insinto /lib
+	doins -r lib/keymaps
+	# Copying Genkernel's hack to create /mnt/gentoo until a cleaner
+	# solution is created.
+	keepdir /mnt/gentoo
 }