commit:     511492f511c932c2e54ff2883d1919613c986be4
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 17:52:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 04:29:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511492f5

app-emulation/xen-tools: depend on either seabios or seabios-bin

Closes: https://bugs.gentoo.org/885855
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28675
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{xen-tools-4.15.4.ebuild => xen-tools-4.15.4-r1.ebuild}        | 7 ++++++-
 ...en-tools-4.15.4_pre1.ebuild => xen-tools-4.15.4_pre1-r1.ebuild} | 7 ++++++-
 ...en-tools-4.15.4_pre2.ebuild => xen-tools-4.15.4_pre2-r1.ebuild} | 7 ++++++-
 ...xen-tools-4.16.3_pre1.ebuild => xen-tools-4.16.3_pre-r1.ebuild} | 7 ++++++-
 ...xen-tools-4.16.3_pre.ebuild => xen-tools-4.16.3_pre1-r1.ebuild} | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app-emulation/xen-tools/xen-tools-4.15.4.ebuild 
b/app-emulation/xen-tools/xen-tools-4.15.4-r1.ebuild
similarity index 99%
rename from app-emulation/xen-tools/xen-tools-4.15.4.ebuild
rename to app-emulation/xen-tools/xen-tools-4.15.4-r1.ebuild
index 2e0320c285c5..e0602f589a17 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.4-r1.ebuild
@@ -129,7 +129,12 @@ DEPEND="${COMMON_DEPEND}
                )
        !amd64? ( >=sys-apps/dtc-1.4.0 )
        amd64? ( sys-power/iasl
-               system-seabios? ( sys-firmware/seabios )
+               system-seabios? (
+                       || (
+                               sys-firmware/seabios
+                               sys-firmware/seabios-bin
+                       )
+               )
                system-ipxe? ( sys-firmware/ipxe[qemu] )
                rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
        arm64? ( sys-power/iasl

diff --git a/app-emulation/xen-tools/xen-tools-4.15.4_pre1.ebuild 
b/app-emulation/xen-tools/xen-tools-4.15.4_pre1-r1.ebuild
similarity index 99%
rename from app-emulation/xen-tools/xen-tools-4.15.4_pre1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.15.4_pre1-r1.ebuild
index f80af4173dba..15a12c8d3fd2 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.4_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.4_pre1-r1.ebuild
@@ -125,7 +125,12 @@ DEPEND="${COMMON_DEPEND}
                )
        !amd64? ( >=sys-apps/dtc-1.4.0 )
        amd64? ( sys-power/iasl
-               system-seabios? ( sys-firmware/seabios )
+               system-seabios? (
+                       || (
+                               sys-firmware/seabios
+                               sys-firmware/seabios-bin
+                       )
+               )
                system-ipxe? ( sys-firmware/ipxe[qemu] )
                rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
        arm64? ( sys-power/iasl

diff --git a/app-emulation/xen-tools/xen-tools-4.15.4_pre2.ebuild 
b/app-emulation/xen-tools/xen-tools-4.15.4_pre2-r1.ebuild
similarity index 99%
rename from app-emulation/xen-tools/xen-tools-4.15.4_pre2.ebuild
rename to app-emulation/xen-tools/xen-tools-4.15.4_pre2-r1.ebuild
index 967bfbbe9a94..745618a4d830 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.4_pre2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.4_pre2-r1.ebuild
@@ -125,7 +125,12 @@ DEPEND="${COMMON_DEPEND}
                )
        !amd64? ( >=sys-apps/dtc-1.4.0 )
        amd64? ( sys-power/iasl
-               system-seabios? ( sys-firmware/seabios )
+               system-seabios? (
+                       || (
+                               sys-firmware/seabios
+                               sys-firmware/seabios-bin
+                       )
+               )
                system-ipxe? ( sys-firmware/ipxe[qemu] )
                rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
        arm64? ( sys-power/iasl

diff --git a/app-emulation/xen-tools/xen-tools-4.16.3_pre1.ebuild 
b/app-emulation/xen-tools/xen-tools-4.16.3_pre-r1.ebuild
similarity index 99%
rename from app-emulation/xen-tools/xen-tools-4.16.3_pre1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.16.3_pre-r1.ebuild
index dbd4537cca0f..24c5331e9873 100644
--- a/app-emulation/xen-tools/xen-tools-4.16.3_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.16.3_pre-r1.ebuild
@@ -128,7 +128,12 @@ DEPEND="${COMMON_DEPEND}
                )
        !amd64? ( >=sys-apps/dtc-1.4.0 )
        amd64? ( sys-power/iasl
-               system-seabios? ( sys-firmware/seabios )
+               system-seabios? (
+                       || (
+                               sys-firmware/seabios
+                               sys-firmware/seabios-bin
+                       )
+               )
                system-ipxe? ( sys-firmware/ipxe[qemu] )
                rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
        arm64? ( sys-power/iasl

diff --git a/app-emulation/xen-tools/xen-tools-4.16.3_pre.ebuild 
b/app-emulation/xen-tools/xen-tools-4.16.3_pre1-r1.ebuild
similarity index 99%
rename from app-emulation/xen-tools/xen-tools-4.16.3_pre.ebuild
rename to app-emulation/xen-tools/xen-tools-4.16.3_pre1-r1.ebuild
index dbd4537cca0f..24c5331e9873 100644
--- a/app-emulation/xen-tools/xen-tools-4.16.3_pre.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.16.3_pre1-r1.ebuild
@@ -128,7 +128,12 @@ DEPEND="${COMMON_DEPEND}
                )
        !amd64? ( >=sys-apps/dtc-1.4.0 )
        amd64? ( sys-power/iasl
-               system-seabios? ( sys-firmware/seabios )
+               system-seabios? (
+                       || (
+                               sys-firmware/seabios
+                               sys-firmware/seabios-bin
+                       )
+               )
                system-ipxe? ( sys-firmware/ipxe[qemu] )
                rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
        arm64? ( sys-power/iasl

Reply via email to