gentoo auto-resync : 13:04:2024 - 12:04:19

7 files changed, 9 insertions, 196 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a40dbf7c7742..c0b58377e512 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virt-firmware/Manifest b/app-emulation/virt-firmware/Manifest
index 3dcc8919fc5b..92c0380f2a7f 100644
--- a/app-emulation/virt-firmware/Manifest
+++ b/app-emulation/virt-firmware/Manifest
@@ -1,10 +1,4 @@
 AUX kernel-bootcfg-boot-successful 225 BLAKE2B 27c798393135049ca2d4d50f01e8c8a52773d137bcd695357e57038b28a8cfa3fa88602b01a28ab2c7521d53c7ec85edb1bd968ff544d8ec1eaf01f478b8d990 SHA512 101089f296cd04b84d6f5eade432d2de76688959a0dc24560ff4882fd99431142a4916ba8ede935bd7055d6e32d53dcd3cb9c7c6e556035f22942088e946411e
-AUX virt-firmware-24.2-dont-force-shim.patch 1694 BLAKE2B 2777ab44ebedfbe24187ec760709ddda1600cc4cbe7f1f492c901e9f46b8bfc75edbabc6bfd9fab93b18f6957100bee2abc4a8261941eab7ef0c111678f81f33 SHA512 ee0eb319957ff9748fd9c20f72e2fdc34cee3bceff603324acb5a2bce7405b3ecc5ec2cba854730a33d7294b281976e245f9c854be076feaca7ff44623a71e13
-AUX virt-firmware-24.2_p20240402-expand-shim-search.patch 795 BLAKE2B da2ba3e1b4e10cb29aea34c968933ca13ac03f31d577c9962f6423c0fd041c0d81fc2cb882c7d00fd8f4fd865c32fbe7e53c829133345f4b12f722081936f319 SHA512 2efd501ee097a6438cd710a68606777e7f1f06043499ed97112a15c2031caf81835807337130458d64df086572d1afa9e9750f41d88cfbae4f41b985a7a69360
-DIST virt-firmware-24.2.tar.gz 110844 BLAKE2B db7ad7663678a313bdd0e23de7e374547e5dbc1a04b37a65e366ae042410a3a6c21ccfef3747a2534cb76906868caaf1364ac1ecd1443c1c1053a5b7687da50b SHA512 8583420acb31fb32e4c195c0c1816b36248ec2e486ded0795e51180e2690b2bcdc10eb8707f4fc9fa36da5b24082737c5c3b2e3988f6c5455e08a5d2a0ff92e7
-DIST virt-firmware-24.2_p20240325.tar.gz 107037 BLAKE2B d7fe7c760b769124ccc4192e3133563cf287b8a0cbe281fb758b66ae27a4c9461b6a5bdd7b97ec3e1c8e2a051b8a05fa45ded19eeb3bbbd5ff787443fed96a0d SHA512 4ea5d21bc57bda5fbfae79d70aa7805e1d4ca53aa5aeb40b555d5c03ff0fbd9780a92b3aaf9bc5b7cb8169205487309bff7031ded409e26d8d39b1fe3d937510
-DIST virt-firmware-24.2_p20240402.tar.gz 106875 BLAKE2B cdc6bde95a7db347e896c3d33e7ad0715c5a6cbb9a80dbcfb87379bb0f7693c0b96544cb3a1394ce115cfe98321d79339b682f02250930b85ff4bef35d038251 SHA512 50899655fe76e7ed71d3a607030a2067ae97f15f0d3698a54ec388ac6e27e2c2f39b2b4cb5552dad17e184124d62f70d045bc8b5b1f6c5931d477a911be11637
-EBUILD virt-firmware-24.2-r1.ebuild 1030 BLAKE2B 2d8761f2044dd9a955383b6c029df69f304961e2bfb6256d72e780345c344d963e879527b68d5d238cd0fb1676bfd43f217e47432b5b3222ef903d28ac26e0c0 SHA512 d17324a840f805a3d94e15d163bf6dd66629523a441b8fe5e43793d37f374382135de806c4c87cc96adea4efc3b621ab2a552ce45fa619762274200163944d66
-EBUILD virt-firmware-24.2_p20240325.ebuild 1438 BLAKE2B fa72b727dd5a58dc6690d90076c702dfaa7266e554326b3552d4c8d1017e03a8e24a3ade05f533e3c5d8930ac7881f1ee3ae1f95c12fdc734d604f1fd8fd2b57 SHA512 5d6aa931cdbcab073ed9d178b3627e2260cff049da07aae410d5b912e48f7deab7090b3d9fceb02fa59ccf78bf80b952fd6cd1402933e8a2873cec81fced5ccc
-EBUILD virt-firmware-24.2_p20240402.ebuild 1451 BLAKE2B c77b5c3474528945e70267ed1d6c1dc9d8417b1846948067d4a20c0225770bab1df3e7f1c9a231778e9430b074a70dd645dbd0830991fda4464539e534f7408a SHA512 d67e0de65b5a6ec2e0963f2ca9a4b947a8fb17c511268c072e5ce88ed22d4afcbcf56777b7f0d61e166ebde2d7bbe7a00f6eb3645acff52ee435af0d20f87848
+DIST virt-firmware-24.4.tar.gz 111964 BLAKE2B 16005a6f911abf227988abaedd45237d44d403f367abd3c2d413f899a6c3e7db2a62edcd36b7408263f101a0f0a20bbea83bf51f7f798077311b478dfc6c9fc1 SHA512 3b13df25177fe5c20e460e2d82453e23ae96cb657f1228ff1c061db4c4197eba719a4d7f51a90fec60a4de2da9a0e9d3f056d53011bd4f61df7f40b706911a1d
+EBUILD virt-firmware-24.4.ebuild 1197 BLAKE2B 30bb2a1a196afd35d8d4bd716b1936529b9f05e20fd60b9d1d85e368088971e2243da144c4c6c5bd1ecd419438ca9488a182e026529fdd716b1b34e5d072b2c9 SHA512 58086985f77f451a1b8be3826e34b3efb7190ea8593cd6060733b3a943bbaa0accd0d4c4cc45e564e1e8143f8331ca4a040240d6ee0084c47a9bfaf8a21fb99e
 MISC metadata.xml 726 BLAKE2B 809ef093c67bf4c03ae99efa7112b92c3d6d24058ba8ae444045ae52adf9accf60e42a84966f8fd7ab793dfb3238660f4f422fbae2c36f6fd35bf0b02b42a1f1 SHA512 af58f69792dadd71c66022fb08f0f878c3f140114287000a16e96fd8b30bf410e595d373a5cd92b56bd28d5f9996ab5cdecac91ba1b743f2e807feeeaf6e9cbd
diff --git a/app-emulation/virt-firmware/files/virt-firmware-24.2-dont-force-shim.patch b/app-emulation/virt-firmware/files/virt-firmware-24.2-dont-force-shim.patch
deleted file mode 100644
index bb45026391eb..000000000000
--- a/app-emulation/virt-firmware/files/virt-firmware-24.2-dont-force-shim.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://gitlab.com/kraxel/virt-firmware/-/merge_requests/11
-diff --git a/virt/firmware/bootcfg/linuxcfg.py b/virt/firmware/bootcfg/linuxcfg.py
-index 5682b15..121af73 100644
---- a/virt/firmware/bootcfg/linuxcfg.py
-+++ b/virt/firmware/bootcfg/linuxcfg.py
-@@ -188,9 +188,10 @@ class LinuxOsInfo(OsRelease):
- 
-     def shim_path(self):
-         esp    = self.esp_path()
--        subdir = self.esp_distro_dir()
-+        distro_dir = self.esp_distro_dir()
-         arch   = self.efi_arch()
--        shim   = f'{esp}/EFI/{subdir}/shim{arch}.efi'
--        if os.path.exists(shim):
--            return shim
-+        for subdir in distro_dir, 'shim', 'Linux':
-+            shim = f'{esp}/EFI/{subdir}/shim{arch}.efi'
-+            if os.path.exists(shim):
-+                return shim
-         return None
-diff --git a/virt/firmware/bootcfg/main.py b/virt/firmware/bootcfg/main.py
-index 04888d5..291903b 100644
---- a/virt/firmware/bootcfg/main.py
-+++ b/virt/firmware/bootcfg/main.py
-@@ -34,8 +34,7 @@ def update_next_or_order(cfg, options, nr):
- 
- def add_uki(cfg, options):
-     if not options.shim and cfg.secureboot:
--        logging.error('shim binary not specified')
--        sys.exit(1)
-+        logging.warning('shim binary not specified')
-     if not options.title:
-         logging.error('entry title not specified')
-         sys.exit(1)
-@@ -112,8 +111,8 @@ def boot_success(cfg, options):
- 
- def update_boot_csv(cfg, options):
-     if not options.shim:
--        logging.error('shim binary not specified')
--        sys.exit(1)
-+        logging.warning('shim binary not specified')
-+        sys.exit(0)
-     efishim  = linuxcfg.LinuxEfiFile(options.shim)
-     shimpath = efishim.dev_path_file()
- 
diff --git a/app-emulation/virt-firmware/files/virt-firmware-24.2_p20240402-expand-shim-search.patch b/app-emulation/virt-firmware/files/virt-firmware-24.2_p20240402-expand-shim-search.patch
deleted file mode 100644
index 9af50fb4b310..000000000000
--- a/app-emulation/virt-firmware/files/virt-firmware-24.2_p20240402-expand-shim-search.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.com/kraxel/virt-firmware/-/merge_requests/11
-diff --git a/virt/firmware/bootcfg/linuxcfg.py b/virt/firmware/bootcfg/linuxcfg.py
-index 5682b15..121af73 100644
---- a/virt/firmware/bootcfg/linuxcfg.py
-+++ b/virt/firmware/bootcfg/linuxcfg.py
-@@ -188,9 +188,10 @@ class LinuxOsInfo(OsRelease):
- 
-     def shim_path(self):
-         esp    = self.esp_path()
--        subdir = self.esp_distro_dir()
-+        distro_dir = self.esp_distro_dir()
-         arch   = self.efi_arch()
--        shim   = f'{esp}/EFI/{subdir}/shim{arch}.efi'
--        if os.path.exists(shim):
--            return shim
-+        for subdir in distro_dir, 'shim', 'Linux':
-+            shim = f'{esp}/EFI/{subdir}/shim{arch}.efi'
-+            if os.path.exists(shim):
-+                return shim
-         return None
diff --git a/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild b/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild
deleted file mode 100644
index 60c7279c9636..000000000000
--- a/app-emulation/virt-firmware/virt-firmware-24.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1 optfeature pypi systemd
-
-DESCRIPTION="Tools for ovmf/armvirt firmware volumes"
-HOMEPAGE="
-	https://gitlab.com/kraxel/virt-firmware
-	https://pypi.org/project/virt-firmware/
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pefile[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest tests
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/*.1
-
-	doinitd "${FILESDIR}/kernel-bootcfg-boot-successful"
-	systemd_dounit systemd/kernel-bootcfg-boot-successful.service
-
-	exeinto /usr/lib/kernel/install.d
-	doexe systemd/99-uki-uefi-setup.install
-}
-
-pkg_postinst() {
-	optfeature "managing UEFI entries on Unified Kernel Image installation and removal" \
-		"sys-boot/shim sys-kernel/installkernel[systemd,uki]"
-}
diff --git a/app-emulation/virt-firmware/virt-firmware-24.2_p20240402.ebuild b/app-emulation/virt-firmware/virt-firmware-24.2_p20240402.ebuild
deleted file mode 100644
index aa8ad953dd10..000000000000
--- a/app-emulation/virt-firmware/virt-firmware-24.2_p20240402.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd optfeature
-
-COMMIT="07a1e03c356766eda0188d033bad38b8d27d55ef"
-
-DESCRIPTION="Tools for ovmf/armvirt firmware volumes"
-HOMEPAGE="
-	https://gitlab.com/kraxel/virt-firmware
-	https://pypi.org/project/virt-firmware/
-"
-SRC_URI="https://gitlab.com/kraxel/virt-firmware/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pefile[${PYTHON_USEDEP}]
-	|| (
-		sys-apps/systemd[boot(-)]
-		sys-apps/systemd-utils[boot(-)]
-	)
-" # We need bootctl from systemd(-utils)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-24.2_p20240402-expand-shim-search.patch"
-)
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest tests
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/*.1
-
-	doinitd "${FILESDIR}/kernel-bootcfg-boot-successful"
-	systemd_dounit systemd/kernel-bootcfg-boot-successful.service
-
-	# Use our own provided by sys-kernel/installkernel[efistub] instead
-	#exeinto /usr/lib/kernel/install.d
-	#doexe systemd/99-uki-uefi-setup.install
-}
-
-pkg_postinst() {
-	optfeature "automatically updating UEFI configuration on each kernel installation or removal" \
-		"sys-kernel/installkernel[systemd,efistub]"
-}
diff --git a/app-emulation/virt-firmware/virt-firmware-24.2_p20240325.ebuild b/app-emulation/virt-firmware/virt-firmware-24.4.ebuild
index 03838f0933b4..36b536044e18 100644
--- a/app-emulation/virt-firmware/virt-firmware-24.2_p20240325.ebuild
+++ b/app-emulation/virt-firmware/virt-firmware-24.4.ebuild
@@ -5,35 +5,27 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1 systemd optfeature
-
-COMMIT="58080ddb4868ca5bab571f518bb8fcc605b51cf5"
+inherit distutils-r1 optfeature pypi systemd
 
 DESCRIPTION="Tools for ovmf/armvirt firmware volumes"
 HOMEPAGE="
 	https://gitlab.com/kraxel/virt-firmware
 	https://pypi.org/project/virt-firmware/
 "
-SRC_URI="https://gitlab.com/kraxel/virt-firmware/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
+# Currently requires files in /boot and read/write to efivars
+RESTRICT="test"
+
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pefile[${PYTHON_USEDEP}]
-	|| (
-		sys-apps/systemd[boot(-)]
-		sys-apps/systemd-utils[boot(-)]
-	)
-" # We need bootctl from systemd(-utils)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-24.2-dont-force-shim.patch"
-)
+"
 
 distutils_enable_tests unittest
 
@@ -49,7 +41,7 @@ python_install_all() {
 	doinitd "${FILESDIR}/kernel-bootcfg-boot-successful"
 	systemd_dounit systemd/kernel-bootcfg-boot-successful.service
 
-	# Use our own provided by sys-kernel/installkernel[efistub] instead
+	# Use our own provided by sys-kernel/installkernel[efistub,systemd]
 	#exeinto /usr/lib/kernel/install.d
 	#doexe systemd/99-uki-uefi-setup.install
 }