commit: fa0b11750c1993b03e87a4180789f5342660fb8e Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed Sep 25 13:56:27 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Oct 10 16:29:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0b1175
sys-firmware/edk2-ovmf: Rename to edk2 to support other platforms There is a lot of overlap in building firmware for other platforms from source, so it makes sense to have one source package. 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 | 6 +++--- app-emulation/qemu/qemu-7.2.12.ebuild | 6 +++--- app-emulation/qemu/qemu-7.2.13.ebuild | 6 +++--- app-emulation/qemu/qemu-7.2.14.ebuild | 6 +++--- app-emulation/qemu/qemu-8.0.5.ebuild | 6 +++--- app-emulation/qemu/qemu-8.1.5.ebuild | 6 +++--- app-emulation/qemu/qemu-8.2.3.ebuild | 6 +++--- app-emulation/qemu/qemu-8.2.5-r1.ebuild | 6 +++--- app-emulation/qemu/qemu-8.2.6-r1.ebuild | 6 +++--- app-emulation/qemu/qemu-8.2.7.ebuild | 6 +++--- app-emulation/qemu/qemu-9.0.1-r1.ebuild | 6 +++--- app-emulation/qemu/qemu-9.0.2-r1.ebuild | 6 +++--- app-emulation/qemu/qemu-9.0.2-r2.ebuild | 6 +++--- app-emulation/qemu/qemu-9.0.3.ebuild | 6 +++--- app-emulation/qemu/qemu-9.1.0.ebuild | 6 +++--- app-emulation/qemu/qemu-9999.ebuild | 6 +++--- profiles/updates/3Q-2024 | 1 + sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild | 2 +- sys-firmware/{edk2-ovmf => edk2}/Manifest | 0 .../{edk2-ovmf/edk2-ovmf-202202.ebuild => edk2/edk2-202202.ebuild} | 2 +- .../{edk2-ovmf/edk2-ovmf-202405.ebuild => edk2/edk2-202405.ebuild} | 0 .../files/edk2-202105-werror.patch} | 0 .../files/edk2-202202-binutils-2.41-textrels.patch} | 0 .../files/edk2-202202-lld-textrels.patch} | 0 sys-firmware/{edk2-ovmf => edk2}/metadata.xml | 0 x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild | 2 +- x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r2.ebuild | 4 ++-- x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild | 2 +- 30 files changed, 57 insertions(+), 56 deletions(-) diff --git a/app-admin/mkosi/mkosi-20.2-r1.ebuild b/app-admin/mkosi/mkosi-20.2-r1.ebuild index eeac67318dcb..e6e7f7e3148e 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-ovmf )" + || ( sys-firmware/edk2-ovmf-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 aca2c7b1052c..eda3f245e668 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-ovmf )" + || ( sys-firmware/edk2-ovmf-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 e928b05fcd7d..8b75982249d4 100644 --- a/app-emulation/qemu/qemu-7.2.11.ebuild +++ b/app-emulation/qemu/qemu-7.2.11.ebuild @@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -933,7 +933,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -960,7 +960,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-7.2.12.ebuild b/app-emulation/qemu/qemu-7.2.12.ebuild index f36330d37cf1..7ceb39abb807 100644 --- a/app-emulation/qemu/qemu-7.2.12.ebuild +++ b/app-emulation/qemu/qemu-7.2.12.ebuild @@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -933,7 +933,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -960,7 +960,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-7.2.13.ebuild b/app-emulation/qemu/qemu-7.2.13.ebuild index f36330d37cf1..7ceb39abb807 100644 --- a/app-emulation/qemu/qemu-7.2.13.ebuild +++ b/app-emulation/qemu/qemu-7.2.13.ebuild @@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -933,7 +933,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -960,7 +960,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-7.2.14.ebuild b/app-emulation/qemu/qemu-7.2.14.ebuild index f36330d37cf1..7ceb39abb807 100644 --- a/app-emulation/qemu/qemu-7.2.14.ebuild +++ b/app-emulation/qemu/qemu-7.2.14.ebuild @@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -933,7 +933,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -960,7 +960,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-8.0.5.ebuild b/app-emulation/qemu/qemu-8.0.5.ebuild index 9db811fb45c2..32eec81eee52 100644 --- a/app-emulation/qemu/qemu-8.0.5.ebuild +++ b/app-emulation/qemu/qemu-8.0.5.ebuild @@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -934,7 +934,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -961,7 +961,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild b/app-emulation/qemu/qemu-8.1.5.ebuild index 5aacea78586a..52ae1a305f07 100644 --- a/app-emulation/qemu/qemu-8.1.5.ebuild +++ b/app-emulation/qemu/qemu-8.1.5.ebuild @@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -934,7 +934,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -961,7 +961,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-8.2.3.ebuild b/app-emulation/qemu/qemu-8.2.3.ebuild index 570039efaff5..f409c4fc324b 100644 --- a/app-emulation/qemu/qemu-8.2.3.ebuild +++ b/app-emulation/qemu/qemu-8.2.3.ebuild @@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -954,7 +954,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -981,7 +981,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-8.2.5-r1.ebuild b/app-emulation/qemu/qemu-8.2.5-r1.ebuild index 97bf795e95b8..ee3153341228 100644 --- a/app-emulation/qemu/qemu-8.2.5-r1.ebuild +++ b/app-emulation/qemu/qemu-8.2.5-r1.ebuild @@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -954,7 +954,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -981,7 +981,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-8.2.6-r1.ebuild b/app-emulation/qemu/qemu-8.2.6-r1.ebuild index 97bf795e95b8..ee3153341228 100644 --- a/app-emulation/qemu/qemu-8.2.6-r1.ebuild +++ b/app-emulation/qemu/qemu-8.2.6-r1.ebuild @@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -954,7 +954,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -981,7 +981,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-8.2.7.ebuild b/app-emulation/qemu/qemu-8.2.7.ebuild index 97bf795e95b8..ee3153341228 100644 --- a/app-emulation/qemu/qemu-8.2.7.ebuild +++ b/app-emulation/qemu/qemu-8.2.7.ebuild @@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -954,7 +954,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -981,7 +981,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-9.0.1-r1.ebuild b/app-emulation/qemu/qemu-9.0.1-r1.ebuild index 2fe9ba5dd5f1..c67996bc3810 100644 --- a/app-emulation/qemu/qemu-9.0.1-r1.ebuild +++ b/app-emulation/qemu/qemu-9.0.1-r1.ebuild @@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -958,7 +958,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -985,7 +985,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-9.0.2-r1.ebuild b/app-emulation/qemu/qemu-9.0.2-r1.ebuild index 2fe9ba5dd5f1..c67996bc3810 100644 --- a/app-emulation/qemu/qemu-9.0.2-r1.ebuild +++ b/app-emulation/qemu/qemu-9.0.2-r1.ebuild @@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -958,7 +958,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -985,7 +985,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-9.0.2-r2.ebuild b/app-emulation/qemu/qemu-9.0.2-r2.ebuild index 2506c1cb610d..51b9fba6bbee 100644 --- a/app-emulation/qemu/qemu-9.0.2-r2.ebuild +++ b/app-emulation/qemu/qemu-9.0.2-r2.ebuild @@ -254,7 +254,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -961,7 +961,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -988,7 +988,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-9.0.3.ebuild b/app-emulation/qemu/qemu-9.0.3.ebuild index 2506c1cb610d..51b9fba6bbee 100644 --- a/app-emulation/qemu/qemu-9.0.3.ebuild +++ b/app-emulation/qemu/qemu-9.0.3.ebuild @@ -254,7 +254,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -961,7 +961,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -988,7 +988,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-9.1.0.ebuild b/app-emulation/qemu/qemu-9.1.0.ebuild index 506c06abbbe9..6f2ffb2e904e 100644 --- a/app-emulation/qemu/qemu-9.1.0.ebuild +++ b/app-emulation/qemu/qemu-9.1.0.ebuild @@ -253,7 +253,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -960,7 +960,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -987,7 +987,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 506c06abbbe9..6f2ffb2e904e 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -253,7 +253,7 @@ X86_FIRMWARE_DEPEND=" ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] @@ -960,7 +960,7 @@ pkg_postinst() { if has_version 'sys-firmware/edk2-ovmf-bin'; then ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -987,7 +987,7 @@ pkg_info() { if has_version 'sys-firmware/edk2-ovmf-bin'; then echo " $(best_version sys-firmware/edk2-ovmf-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/profiles/updates/3Q-2024 b/profiles/updates/3Q-2024 index ade5eb7db7ba..d01673fafdff 100644 --- a/profiles/updates/3Q-2024 +++ b/profiles/updates/3Q-2024 @@ -9,3 +9,4 @@ slotmove app-dicts/dikt 5 0 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 diff --git a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild index 2a1a7048cbce..35e80ff31395 100644 --- a/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild +++ b/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild @@ -19,7 +19,7 @@ LICENSE="BSD-2 MIT" SLOT="0" KEYWORDS="amd64 arm64 ~loong ~ppc ppc64 ~riscv x86" -RDEPEND="!sys-firmware/edk2-ovmf" +RDEPEND="!sys-firmware/edk2" DISABLE_AUTOFORMATTING=true DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86 diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2/Manifest similarity index 100% rename from sys-firmware/edk2-ovmf/Manifest rename to sys-firmware/edk2/Manifest diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild b/sys-firmware/edk2/edk2-202202.ebuild similarity index 99% rename from sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild rename to sys-firmware/edk2/edk2-202202.ebuild index 099fbf9cc3ac..2baca0ed771a 100644 --- a/sys-firmware/edk2-ovmf/edk2-ovmf-202202.ebuild +++ b/sys-firmware/edk2/edk2-202202.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild b/sys-firmware/edk2/edk2-202405.ebuild similarity index 100% rename from sys-firmware/edk2-ovmf/edk2-ovmf-202405.ebuild rename to sys-firmware/edk2/edk2-202405.ebuild diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch b/sys-firmware/edk2/files/edk2-202105-werror.patch similarity index 100% rename from sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch rename to sys-firmware/edk2/files/edk2-202105-werror.patch diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-202202-binutils-2.41-textrels.patch b/sys-firmware/edk2/files/edk2-202202-binutils-2.41-textrels.patch similarity index 100% rename from sys-firmware/edk2-ovmf/files/edk2-ovmf-202202-binutils-2.41-textrels.patch rename to sys-firmware/edk2/files/edk2-202202-binutils-2.41-textrels.patch diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-202202-lld-textrels.patch b/sys-firmware/edk2/files/edk2-202202-lld-textrels.patch similarity index 100% rename from sys-firmware/edk2-ovmf/files/edk2-ovmf-202202-lld-textrels.patch rename to sys-firmware/edk2/files/edk2-202202-lld-textrels.patch diff --git a/sys-firmware/edk2-ovmf/metadata.xml b/sys-firmware/edk2/metadata.xml similarity index 100% rename from sys-firmware/edk2-ovmf/metadata.xml rename to sys-firmware/edk2/metadata.xml 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 3ec8fd8085ea..50880009b048 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-ovmf sys-firmware/edk2-ovmf-bin ) + || ( sys-firmware/edk2 sys-firmware/edk2-ovmf-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 88196755c133..3ed9140132f6 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-ovmf sys-firmware/edk2-ovmf-bin ) + || ( sys-firmware/edk2 sys-firmware/edk2-ovmf-bin ) ) grub_platforms_efi-32? ( sys-boot/grub:2[grub_platforms_efi-32] - || ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin ) + || ( sys-firmware/edk2 sys-firmware/edk2-ovmf-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 da256c221fe2..77d9eec36e68 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-ovmf sys-firmware/edk2-ovmf-bin ) + || ( sys-firmware/edk2 sys-firmware/edk2-ovmf-bin ) ) !grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_pc]