From d4a792bd461450ebf8b043db1fb728d8aaecbcea Mon Sep 17 00:00:00 2001
From: Paymon MARANDI <darwinskernel@gmail.com>
Date: Wed, 21 Feb 2024 11:10:16 -0500
Subject: app-admin/mkosi: accept sys-firmware/edk2-ovmf-bin

this should allow either edk2-ovmf or edk2-ovmf-bin to be used

Closes: https://bugs.gentoo.org/924943
Signed-off-by: Paymon MARANDI <darwinskernel@gmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
---
 app-admin/mkosi/mkosi-20.2-r1.ebuild | 41 ++++++++++++++++++++++++++++++++++++
 app-admin/mkosi/mkosi-20.2.ebuild    | 41 ------------------------------------
 2 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 app-admin/mkosi/mkosi-20.2-r1.ebuild
 delete mode 100644 app-admin/mkosi/mkosi-20.2.ebuild

(limited to 'app-admin/mkosi')

diff --git a/app-admin/mkosi/mkosi-20.2-r1.ebuild b/app-admin/mkosi/mkosi-20.2-r1.ebuild
new file mode 100644
index 000000000000..46941851a5a3
--- /dev/null
+++ b/app-admin/mkosi/mkosi-20.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Build Bespoke OS Images"
+HOMEPAGE="https://github.com/systemd/mkosi"
+SRC_URI="https://github.com/systemd/mkosi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+RDEPEND="
+	app-emulation/qemu
+	sys-apps/bubblewrap
+	>=sys-apps/systemd-254
+	|| ( sys-firmware/edk2-ovmf-bin sys-firmware/edk2-ovmf )"
+BDEPEND="virtual/pandoc"
+
+distutils_enable_tests pytest
+
+src_compile() {
+	distutils-r1_src_compile
+
+	./tools/make-man-page.sh || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman mkosi/resources/mkosi.1
+}
+
+pkg_postinst() {
+	optfeature "For debian support: " dev-util/debootstrap
+}
diff --git a/app-admin/mkosi/mkosi-20.2.ebuild b/app-admin/mkosi/mkosi-20.2.ebuild
deleted file mode 100644
index c94df46a17c5..000000000000
--- a/app-admin/mkosi/mkosi-20.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Build Bespoke OS Images"
-HOMEPAGE="https://github.com/systemd/mkosi"
-SRC_URI="https://github.com/systemd/mkosi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-RDEPEND="
-	app-emulation/qemu
-	sys-apps/bubblewrap
-	>=sys-apps/systemd-254
-	sys-firmware/edk2-ovmf"
-BDEPEND="virtual/pandoc"
-
-distutils_enable_tests pytest
-
-src_compile() {
-	distutils-r1_src_compile
-
-	./tools/make-man-page.sh || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman mkosi/resources/mkosi.1
-}
-
-pkg_postinst() {
-	optfeature "For debian support: " dev-util/debootstrap
-}
-- 
cgit v1.2.3-65-gdbad