gentoo auto-resync : 07:01:2024 - 18:53:56

6 files changed, 14 insertions, 14 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a48bf08c1c2e..47db5749d5a6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a5dcbe87cd4e..12d365131fdd 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,4 +1,4 @@
 AUX 39_memtest86+-r2 3530 BLAKE2B 6c302744000a48fbda7563b48bbac5bb5e580159d74ad595f5fabd21150bd785c1792c0acbafc779a601ab7b820a0e37576c0c0967ba2de739089d2b9cfc3366 SHA512 2e28b671d77ef19958b88c73f9de5560775c3b8cfb647bd7cc480801a64bcaf2a80f750d3fdaf81b1c02364f4aa2fcb8b3ccb8eef4008c9d0619676f0490a084
 DIST memtest86+-6.20.tar.gz 232436 BLAKE2B 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966 SHA512 b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0
-EBUILD memtest86+-6.20-r1.ebuild 2054 BLAKE2B 2fae96fc37a67020f86571f241942456dd901b2dbdeb4cfa7da3207fe33eb99ddd65b9d78781945623f00682efb475a5d9117cb5fa3852eb2a55b1cce1ec3332 SHA512 01c67d979f675690a65a5acffccae87328770540931250675802f97aac9051cf4da3740d3f6793846d288b22e91173a157dc94168d7a49b624e965b2c98c5ab6
-MISC metadata.xml 817 BLAKE2B 86125269ad6d6292102fb52af0ed6b4ac2a8f9a021d2a91d1efb8a37c7e9aaa386ff303140bff66ab02eb2c70b7d2266202667855fcf219ef279e2f10ed29b81 SHA512 e6bbf1204f7a150097aa1794da810076e8f84458a1648516a10a877dc529fe06bd58ab57ae7873b6c6b89d1932a43d193da42b41135e222d6758665fab2b28db
+EBUILD memtest86+-6.20-r1.ebuild 2064 BLAKE2B 5eb92ff50f967ade20a9cd917dd0b43bbadc778511c8266e08b7bedb96bb04b7e2741b2c1366c11bbbd59822ccb84ee61180e493d5824ccaaa88f468cb2d66c2 SHA512 b669668889abb7be7c0663a4a30d9969f38846b43a4f97f844758ce8faebc72073791318d92994d5c4f8d2e08824905f21f31a2899149f6f858c462eb81efb5f
+MISC metadata.xml 819 BLAKE2B b18a5bc257f2e01f9b2dc52229a858a709c3d386798636c888caf7f52c4036eccee02a8c96a58c1b1305f7fdff5e83855e4799f4675a4ba59c43cb2e287edad3 SHA512 6b582bc657ae7047843638fda770068f322ec15607b5c6618e924942eb321b7230a98d82852814e94d4735d4bbc4531ae7b32b6596d2830105a1ab0d1afbf4ca
diff --git a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
index 87d164cf9ec0..5ca6984446ce 100644
--- a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+IUSE="bios32 bios64 +boot uefi32 uefi64 iso32 iso64"
 
 ISODEPS="
 	dev-libs/libisoburn
@@ -29,7 +29,7 @@ BDEPEND="
 S=${WORKDIR}/memtest86plus-${MY_PV}
 
 pkg_setup() {
-	if use efi32 || use efi64; then
+	if use uefi32 || use uefi64; then
 		secureboot_pkg_setup
 	fi
 }
@@ -50,13 +50,13 @@ src_compile() {
 	export SIZE=$(tc-getPROG SIZE size)
 	pushd build32
 		use bios32 && emake memtest.bin
-		use efi32 && emake memtest.efi
+		use uefi32 && emake memtest.efi
 		use iso32 && emake iso
 	popd
 
 	pushd build64
 		use bios64 && emake memtest.bin
-		use efi64 && emake memtest.efi
+		use uefi64 && emake memtest.efi
 		use iso64 && emake iso
 	popd
 }
@@ -64,8 +64,8 @@ src_compile() {
 install_memtest_images() {
 	use bios32 && newins build32/memtest.bin memtest32.bios
 	use bios64 && newins build64/memtest.bin memtest64.bios
-	use efi32 && newins build32/memtest.efi memtest.efi32
-	use efi64 && newins build64/memtest.efi memtest.efi64
+	use uefi32 && newins build32/memtest.efi memtest.efi32
+	use uefi64 && newins build64/memtest.efi memtest.efi64
 }
 
 src_install() {
@@ -82,7 +82,7 @@ src_install() {
 	use iso32 && newins build32/memtest.iso memtest32.iso
 	use iso64 && newins build64/memtest.iso memtest64.iso
 
-	if use efi32 || use efi64; then
+	if use uefi32 || use uefi64; then
 		secureboot_auto_sign --in-place
 	fi
 }
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 43e3311c9323..f79f06ed9067 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -9,8 +9,8 @@
 	<flag name="bios32">Compile a BIOS-bootable 32bit memtest image</flag>
 	<flag name="bios64">Compile a BIOS-bootable 64bit memtest image</flag>
 	<flag name="boot">Install to /boot in addition to /usr/share/memtest86+/</flag>
-	<flag name="efi32">Compile a EFI32-bootable 32bit memtest image</flag>
-	<flag name="efi64">Compile a UEFI-bootable 64bit memtest image</flag>
+	<flag name="uefi32">Compile a EFI32-bootable 32bit memtest image</flag>
+	<flag name="uefi64">Compile a UEFI-bootable 64bit memtest image</flag>
 	<flag name="iso32">Compile a 32bit ISO image</flag>
 	<flag name="iso64">Compile a 64bit ISO image</flag>
 </use>
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index d9b54c485d96..f7b9281907fe 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -2,5 +2,5 @@ AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee9
 DIST moreutils-0.67.tar.gz 93627 BLAKE2B 4b8788411f1300ccffa10a52a327ee676b2a241531dafc2106495977ffd29a5b32c91c0afb6425b5797bfea04fa98a3cfd69e034cffc2fb255f5e8505d3b3474 SHA512 3a395fa80c1c1d769ec078cbf9455952201a364d8264796c6443a397ed7fa4f08250ecd140f047cf2e9533d6fc5310b3a579a7c083a5bc4cb4672d39c35dab75
 DIST moreutils-0.68.tar.gz 93732 BLAKE2B f6bac790a294f6a05624ca33906a41e60a0dcc5c25ef31f62dc501ecf39913299f6ecd64130ed4da1896342ae4bfc286b02217f68c76d0e915cd2d8f684237b1 SHA512 8d2ee4ab1e2409a4adde018c558884ff6c642c7426b1d07d5d15bf89ba42ea5aec279c01d7d80815a825adc527ceddf0de8db9c05b0392fccc8e76bcae032558
 EBUILD moreutils-0.67-r1.ebuild 1755 BLAKE2B f3a7a184194b4f0c6a85511bd8995dfc2bd4a7f7a2ed3a412d6802425af0edf92c06ecf272549a94fb1f927e0db72e29ab0d0425b93a02405e2f8a25e8f1e3eb SHA512 b02efd0423a8544c020d977ebde73bfc1b149c94d08d432616fb4ce74a9c66662c2debbc0dcfee2c0085124ef69fcf429c37463d3dece9e1c94c391ccc3e3b79
-EBUILD moreutils-0.68.ebuild 1756 BLAKE2B a5ee543024e26b92b5297847a6a1d399db58766442bb3b77254bb6df83e42bc705a506f8a554beb845b530c14a597ecebd941e15680f87e42c2c3f7a2dd1e1ec SHA512 ecbd4d5454e6df2e710b8760c9579e775cd5c7c1c98f182eca6a618936c91d2591b4fda9b159393678ec74bd2ec9fcf0a2f5c3a27aa6e3c660e0e9a2085e4707
+EBUILD moreutils-0.68.ebuild 1754 BLAKE2B 90f754fd9861524e7415d6cf800087017e24e4391db203191b97fa2f0ec3ff18cd89607ae8e259ce72a5eac5f6b7602efed1a3e33675f7583a1b5a8f617eef42 SHA512 9c5953942474468e86e8469c6fcc5e5ab731d310be0ad688a5585d11691967bd33b4e81f84dcb071145fbf4d72b4772ec244bca40ddccd8a2229f850d775f992
 MISC metadata.xml 314 BLAKE2B 41e19552cdd8289a03ab33f6fd514028d689236160501e2c84644e1075e957f6faeba6eacf163fcd624e995bd6ff7016e663e65cc753e7de3621aa46922a0766 SHA512 36a70c222b6de13c1245d0a95d097389e84ee7b7f55a08c62ca5c7c44bb51808f63faa10e81fdec7eff7bb680be32ed31bb2fd5362c5f35ba8fb92bb60a7ffe3
diff --git a/sys-apps/moreutils/moreutils-0.68.ebuild b/sys-apps/moreutils/moreutils-0.68.ebuild
index 82787409247f..2903a50a150d 100644
--- a/sys-apps/moreutils/moreutils-0.68.ebuild
+++ b/sys-apps/moreutils/moreutils-0.68.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
 IUSE="+doc +perl"
 
 RDEPEND="