commit: 32958cecf72d3efd9c1c47a239faaba1f17ed26e
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 16:29:45 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 16:29:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32958cec
sys-firmware/edk2-ovmf-bin: Rename to edk2-bin to support other platforms
The source package now supports other platforms so follow suit.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
app-admin/mkosi/mkosi-20.2-r1.ebuild | 2 +-
app-admin/mkosi/mkosi-24.3.ebuild | 2 +-
app-emulation/qemu/qemu-7.2.11.ebuild | 12 ++++++------
app-emulation/qemu/qemu-7.2.12.ebuild | 12 ++++++------
app-emulation/qemu/qemu-7.2.13.ebuild | 12 ++++++------
app-emulation/qemu/qemu-7.2.14.ebuild | 12 ++++++------
app-emulation/qemu/qemu-8.0.5.ebuild | 12 ++++++------
app-emulation/qemu/qemu-8.1.5.ebuild | 12 ++++++------
app-emulation/qemu/qemu-8.2.3.ebuild | 12 ++++++------
app-emulation/qemu/qemu-8.2.5-r1.ebuild | 12 ++++++------
app-emulation/qemu/qemu-8.2.6-r1.ebuild | 12 ++++++------
app-emulation/qemu/qemu-8.2.7.ebuild | 12 ++++++------
app-emulation/qemu/qemu-9.0.1-r1.ebuild | 12 ++++++------
app-emulation/qemu/qemu-9.0.2-r1.ebuild | 12 ++++++------
app-emulation/qemu/qemu-9.0.2-r2.ebuild | 12 ++++++------
app-emulation/qemu/qemu-9.0.3.ebuild | 12 ++++++------
app-emulation/qemu/qemu-9.1.0.ebuild | 12 ++++++------
app-emulation/qemu/qemu-9999.ebuild | 12 ++++++------
profiles/updates/3Q-2024 | 1 +
sys-firmware/{edk2-ovmf-bin => edk2-bin}/Manifest | 0
.../edk2-bin-202202.ebuild} | 0
sys-firmware/{edk2-ovmf-bin => edk2-bin}/metadata.xml | 0
sys-firmware/edk2/edk2-202202.ebuild | 2 +-
sys-firmware/edk2/edk2-202405.ebuild | 2 +-
sys-firmware/edk2/edk2-202408.ebuild | 2 +-
.../grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild | 2 +-
.../grub2-theme-preview/grub2-theme-preview-2.8.0-r2.ebuild | 4 ++--
.../grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild | 2 +-
28 files changed, 106 insertions(+), 105 deletions(-)
diff --git a/app-admin/mkosi/mkosi-20.2-r1.ebuild
b/app-admin/mkosi/mkosi-20.2-r1.ebuild
index e6e7f7e3148e..ca716a278696 100644
--- a/app-admin/mkosi/mkosi-20.2-r1.ebuild
+++ b/app-admin/mkosi/mkosi-20.2-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
app-emulation/qemu
sys-apps/bubblewrap
sys-apps/systemd
- || ( sys-firmware/edk2-ovmf-bin sys-firmware/edk2 )"
+ || ( sys-firmware/edk2-bin sys-firmware/edk2 )"
BDEPEND="virtual/pandoc"
distutils_enable_tests pytest
diff --git a/app-admin/mkosi/mkosi-24.3.ebuild
b/app-admin/mkosi/mkosi-24.3.ebuild
index eda3f245e668..b09f56a8d363 100644
--- a/app-admin/mkosi/mkosi-24.3.ebuild
+++ b/app-admin/mkosi/mkosi-24.3.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
app-emulation/qemu
sys-apps/bubblewrap
sys-apps/systemd
- || ( sys-firmware/edk2-ovmf-bin sys-firmware/edk2 )"
+ || ( sys-firmware/edk2-bin sys-firmware/edk2 )"
BDEPEND="virtual/pandoc"
distutils_enable_tests pytest
diff --git a/app-emulation/qemu/qemu-7.2.11.ebuild
b/app-emulation/qemu/qemu-7.2.11.ebuild
index 8b75982249d4..85edbe009719 100644
--- a/app-emulation/qemu/qemu-7.2.11.ebuild
+++ b/app-emulation/qemu/qemu-7.2.11.ebuild
@@ -240,7 +240,7 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -248,7 +248,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -930,8 +930,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -957,8 +957,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-7.2.12.ebuild
b/app-emulation/qemu/qemu-7.2.12.ebuild
index 7ceb39abb807..416e1d5ce549 100644
--- a/app-emulation/qemu/qemu-7.2.12.ebuild
+++ b/app-emulation/qemu/qemu-7.2.12.ebuild
@@ -240,7 +240,7 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -248,7 +248,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -930,8 +930,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -957,8 +957,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-7.2.13.ebuild
b/app-emulation/qemu/qemu-7.2.13.ebuild
index 7ceb39abb807..416e1d5ce549 100644
--- a/app-emulation/qemu/qemu-7.2.13.ebuild
+++ b/app-emulation/qemu/qemu-7.2.13.ebuild
@@ -240,7 +240,7 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -248,7 +248,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -930,8 +930,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -957,8 +957,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-7.2.14.ebuild
b/app-emulation/qemu/qemu-7.2.14.ebuild
index 7ceb39abb807..416e1d5ce549 100644
--- a/app-emulation/qemu/qemu-7.2.14.ebuild
+++ b/app-emulation/qemu/qemu-7.2.14.ebuild
@@ -240,7 +240,7 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -248,7 +248,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -930,8 +930,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -957,8 +957,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-8.0.5.ebuild
b/app-emulation/qemu/qemu-8.0.5.ebuild
index 32eec81eee52..ad54e2275a3d 100644
--- a/app-emulation/qemu/qemu-8.0.5.ebuild
+++ b/app-emulation/qemu/qemu-8.0.5.ebuild
@@ -240,7 +240,7 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -248,7 +248,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -931,8 +931,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -958,8 +958,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild
b/app-emulation/qemu/qemu-8.1.5.ebuild
index 52ae1a305f07..8ab472d7d422 100644
--- a/app-emulation/qemu/qemu-8.1.5.ebuild
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -240,7 +240,7 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -248,7 +248,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -931,8 +931,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -958,8 +958,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-8.2.3.ebuild
b/app-emulation/qemu/qemu-8.2.3.ebuild
index f409c4fc324b..fc8ef10ae81f 100644
--- a/app-emulation/qemu/qemu-8.2.3.ebuild
+++ b/app-emulation/qemu/qemu-8.2.3.ebuild
@@ -245,7 +245,7 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -253,7 +253,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -951,8 +951,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -978,8 +978,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-8.2.5-r1.ebuild
b/app-emulation/qemu/qemu-8.2.5-r1.ebuild
index ee3153341228..542c81a40465 100644
--- a/app-emulation/qemu/qemu-8.2.5-r1.ebuild
+++ b/app-emulation/qemu/qemu-8.2.5-r1.ebuild
@@ -245,7 +245,7 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -253,7 +253,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -951,8 +951,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -978,8 +978,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-8.2.6-r1.ebuild
b/app-emulation/qemu/qemu-8.2.6-r1.ebuild
index ee3153341228..542c81a40465 100644
--- a/app-emulation/qemu/qemu-8.2.6-r1.ebuild
+++ b/app-emulation/qemu/qemu-8.2.6-r1.ebuild
@@ -245,7 +245,7 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -253,7 +253,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -951,8 +951,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -978,8 +978,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-8.2.7.ebuild
b/app-emulation/qemu/qemu-8.2.7.ebuild
index ee3153341228..542c81a40465 100644
--- a/app-emulation/qemu/qemu-8.2.7.ebuild
+++ b/app-emulation/qemu/qemu-8.2.7.ebuild
@@ -245,7 +245,7 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -253,7 +253,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -951,8 +951,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -978,8 +978,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-9.0.1-r1.ebuild
b/app-emulation/qemu/qemu-9.0.1-r1.ebuild
index c67996bc3810..2a6e393f87d9 100644
--- a/app-emulation/qemu/qemu-9.0.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-9.0.1-r1.ebuild
@@ -245,7 +245,7 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -253,7 +253,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -955,8 +955,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -982,8 +982,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-9.0.2-r1.ebuild
b/app-emulation/qemu/qemu-9.0.2-r1.ebuild
index c67996bc3810..2a6e393f87d9 100644
--- a/app-emulation/qemu/qemu-9.0.2-r1.ebuild
+++ b/app-emulation/qemu/qemu-9.0.2-r1.ebuild
@@ -245,7 +245,7 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -253,7 +253,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -955,8 +955,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -982,8 +982,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-9.0.2-r2.ebuild
b/app-emulation/qemu/qemu-9.0.2-r2.ebuild
index 51b9fba6bbee..2a81130d99cc 100644
--- a/app-emulation/qemu/qemu-9.0.2-r2.ebuild
+++ b/app-emulation/qemu/qemu-9.0.2-r2.ebuild
@@ -247,7 +247,7 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -255,7 +255,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -958,8 +958,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -985,8 +985,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-9.0.3.ebuild
b/app-emulation/qemu/qemu-9.0.3.ebuild
index 51b9fba6bbee..2a81130d99cc 100644
--- a/app-emulation/qemu/qemu-9.0.3.ebuild
+++ b/app-emulation/qemu/qemu-9.0.3.ebuild
@@ -247,7 +247,7 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -255,7 +255,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -958,8 +958,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -985,8 +985,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-9.1.0.ebuild
b/app-emulation/qemu/qemu-9.1.0.ebuild
index 6f2ffb2e904e..e1255ec74319 100644
--- a/app-emulation/qemu/qemu-9.1.0.ebuild
+++ b/app-emulation/qemu/qemu-9.1.0.ebuild
@@ -246,7 +246,7 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -254,7 +254,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -957,8 +957,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -984,8 +984,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/app-emulation/qemu/qemu-9999.ebuild
b/app-emulation/qemu/qemu-9999.ebuild
index 6f2ffb2e904e..e1255ec74319 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -246,7 +246,7 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
@@ -254,7 +254,7 @@ X86_FIRMWARE_DEPEND="
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
- >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+ >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@@ -957,8 +957,8 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware
blobs:"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2)"
fi
@@ -984,8 +984,8 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
- if has_version 'sys-firmware/edk2-ovmf-bin'; then
- echo " $(best_version sys-firmware/edk2-ovmf-bin)"
+ if has_version 'sys-firmware/edk2-bin'; then
+ echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2)"
fi
diff --git a/profiles/updates/3Q-2024 b/profiles/updates/3Q-2024
index d01673fafdff..ab3583a22ec6 100644
--- a/profiles/updates/3Q-2024
+++ b/profiles/updates/3Q-2024
@@ -10,3 +10,4 @@ slotmove app-cdr/kcdemu 5 0
move sys-apps/azure-nvme-utils sys-apps/azure-vm-utils
move dev-python/sphinx-aiohttp-theme dev-python/aiohttp-theme
move sys-firmware/edk2-ovmf sys-firmware/edk2
+move sys-firmware/edk2-ovmf-bin sys-firmware/edk2-bin
diff --git a/sys-firmware/edk2-ovmf-bin/Manifest
b/sys-firmware/edk2-bin/Manifest
similarity index 100%
rename from sys-firmware/edk2-ovmf-bin/Manifest
rename to sys-firmware/edk2-bin/Manifest
diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
b/sys-firmware/edk2-bin/edk2-bin-202202.ebuild
similarity index 100%
rename from sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild
rename to sys-firmware/edk2-bin/edk2-bin-202202.ebuild
diff --git a/sys-firmware/edk2-ovmf-bin/metadata.xml
b/sys-firmware/edk2-bin/metadata.xml
similarity index 100%
rename from sys-firmware/edk2-ovmf-bin/metadata.xml
rename to sys-firmware/edk2-bin/metadata.xml
diff --git a/sys-firmware/edk2/edk2-202202.ebuild
b/sys-firmware/edk2/edk2-202202.ebuild
index 539834c04ff2..f6c7251611e8 100644
--- a/sys-firmware/edk2/edk2-202202.ebuild
+++ b/sys-firmware/edk2/edk2-202202.ebuild
@@ -33,7 +33,7 @@ BDEPEND="app-emulation/qemu
sys-apps/which
>=sys-power/iasl-20160729
${PYTHON_DEPS}"
-RDEPEND="!sys-firmware/edk2-ovmf-bin"
+RDEPEND="!sys-firmware/edk2-bin"
PATCHES=(
"${FILESDIR}/${PN}-202105-werror.patch"
diff --git a/sys-firmware/edk2/edk2-202405.ebuild
b/sys-firmware/edk2/edk2-202405.ebuild
index 045d8e67c200..d7056b51f5f7 100644
--- a/sys-firmware/edk2/edk2-202405.ebuild
+++ b/sys-firmware/edk2/edk2-202405.ebuild
@@ -36,7 +36,7 @@ BDEPEND="app-emulation/qemu
sys-apps/which
>=sys-power/iasl-20160729
${PYTHON_DEPS}"
-RDEPEND="!sys-firmware/edk2-ovmf-bin"
+RDEPEND="!sys-firmware/edk2-bin"
PATCHES=(
"${FILESDIR}/${PN}-202408-werror.patch"
diff --git a/sys-firmware/edk2/edk2-202408.ebuild
b/sys-firmware/edk2/edk2-202408.ebuild
index c1209c456866..1dbbdba77d98 100644
--- a/sys-firmware/edk2/edk2-202408.ebuild
+++ b/sys-firmware/edk2/edk2-202408.ebuild
@@ -60,7 +60,7 @@ BDEPEND="
"
RDEPEND="
- !sys-firmware/edk2-ovmf-bin
+ !sys-firmware/edk2-bin
"
PATCHES=(
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild
b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild
index 50880009b048..4af7e9df4faf 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="app-emulation/qemu
sys-fs/mtools
grub_platforms_efi-64? (
sys-boot/grub:2[grub_platforms_efi-64]
- || ( sys-firmware/edk2 sys-firmware/edk2-ovmf-bin )
+ || ( sys-firmware/edk2 sys-firmware/edk2-bin )
)
!grub_platforms_efi-64? (
sys-boot/grub:2[grub_platforms_pc]
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r2.ebuild
b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r2.ebuild
index 3ed9140132f6..6521f7e6bfbc 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r2.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r2.ebuild
@@ -22,11 +22,11 @@ RDEPEND="app-emulation/qemu
sys-fs/mtools
grub_platforms_efi-64? (
sys-boot/grub:2[grub_platforms_efi-64]
- || ( sys-firmware/edk2 sys-firmware/edk2-ovmf-bin )
+ || ( sys-firmware/edk2 sys-firmware/edk2-bin )
)
grub_platforms_efi-32? (
sys-boot/grub:2[grub_platforms_efi-32]
- || ( sys-firmware/edk2 sys-firmware/edk2-ovmf-bin )
+ || ( sys-firmware/edk2 sys-firmware/edk2-bin )
)
!grub_platforms_efi-32? (
!grub_platforms_efi-64? (
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild
b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild
index 77d9eec36e68..32a64cd43390 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="app-emulation/qemu
sys-fs/mtools
grub_platforms_efi-64? (
sys-boot/grub:2[grub_platforms_efi-64]
- || ( sys-firmware/edk2 sys-firmware/edk2-ovmf-bin )
+ || ( sys-firmware/edk2 sys-firmware/edk2-bin )
)
!grub_platforms_efi-64? (
sys-boot/grub:2[grub_platforms_pc]
