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

4 files changed, 19 insertions, 20 deletions

diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index f1096aa61378..00ccba916eb7 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -4,6 +4,6 @@ DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa12
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19 SHA512 bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
 DIST xen-upstream-patches-4.16.6-pre-patchset-0.tar.bz2 41361 BLAKE2B cf3498d1679fd36265f7d0f95f193a90c50d10d6f8a1df8895131c6b006aa1ba1236588b2cbead0fc7cd95ca74ea9bd24986f169889c1032e6bc4a87a8438404 SHA512 8e3cc0ff8f739ff687e5dcceacd58254d37bff6705993698a1fbfac0ccb2e67b7733c73029ff985b1f91dbdf29e247e96a50c1f2166d0b24df863db6915768ae
 DIST xen-upstream-patches-4.17.3-pre-patchset-0.tar.bz2 65870 BLAKE2B 9019ed4131157df83053873ce1978dfdaa21304bfd69a059e8869e4cd31e01128dbccf2b6a8f54b4c724dfa8d455cad0e55de555971e80a6cd56f143f2d618d3 SHA512 094172bb1c822fa6159792d517bdfdf9777f297be5acee99746a6b310db2c509f98001a280d798d931d4fa17983e8165297ad96489327368c035f8284efd382d
-EBUILD xen-4.16.6_pre1.ebuild 4419 BLAKE2B 4083e3b71cefeff4fa54c39e98a2e3265d55a3e99a0bb9f46223b893c88543d3ee4da4f5ae7d15e4cf09cbcc7a011332de70e7e28b366706fea443f6bf0f81b4 SHA512 4d886679609de970fabdec5e8319819ae97c96a98883dfd9b57db63dcab9a45b23d2b4a5eb5ed13feb01d83ea5c4230c646e8d77a882afa60b5f0f2d2fb6e04d
-EBUILD xen-4.17.3_pre1.ebuild 4518 BLAKE2B ffbf933ee7f31fe3a55776cac90e23229116f0e3805aa612bdc38f1a1c86d42bc9c517602194f17c4b21abac337cb7a364970d0a103c48de8199e923c6b38c6e SHA512 84cf9215c54aa8610dcc8b3b994be1ff5bcdf60f8e9b19a20f2baebbb366df764597a672ff43f2dc1e1189623fa757c9b29aaf23a14fdcddf9bf8407c2bb4ef2
-MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
+EBUILD xen-4.16.6_pre1.ebuild 4426 BLAKE2B dc30d8d3334f5deaec796180f9ff22e8184aa7e352b16c2b6ee25ddd7269b2efbe0a494ed4eb7876cd15814d575e314415dbd5a8658b85b220ab65512d0a391a SHA512 823ec8c449d831d5249eff4f93f6480e5cd8517daffb3ebc8704941edcb6218f96f53ea976819bf8fd9787f1486cae4db5551ce2e546909a101d3ed3d6e93f4e
+EBUILD xen-4.17.3_pre1.ebuild 4525 BLAKE2B 318954026bce2e63867a5ebca2c27ab7c19d0e6888165bce5b6bfd324153219f4e576f80f07b30a51cb1120b530ad712cfaa5aaab258bd94a51b4102ec4910d1 SHA512 5353e8702d3c436785839a023db3e9b231f94b1ef754bf9fe52058b01d561b41e8852101e86c7999b19cafcfd8400f2c3b23229a16dbf847cc103bf604eac254
+MISC metadata.xml 775 BLAKE2B 35370f9f1a629b090ffaf3c984b54fdc195c7f60e5ca8ec12c51d31494ee238e4fc9d29e0aa724109a992a7d4ab0e1663a9764b31f7c7eb98fbbcab68d386809 SHA512 68e59dc5fc7d9478fcef4e346d0124e8fa7497a4fbfce4bc42ff323dc5cd73d5b26d6819639268fc8e555670168835a3dcfa9596eadd74975585183fcd366d18
diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml
index 68e9c297bc42..bad2422fe3f9 100644
--- a/app-emulation/xen/metadata.xml
+++ b/app-emulation/xen/metadata.xml
@@ -16,6 +16,6 @@
 	<use>
 		<flag name="boot-symlinks">Symlink xen.gz variants in /boot, disable on fat filesystems</flag>
 		<flag name="flask">Enable the Flask XSM module from NSA</flag>
-		<flag name="efi">Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag>
+		<flag name="uefi">Adds UEFI boot support, requires LDFLAG -melf_x86_64 for amd64</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/xen/xen-4.16.6_pre1.ebuild b/app-emulation/xen/xen-4.16.6_pre1.ebuild
index cde7b44a75ed..c16c9bcc93b3 100644
--- a/app-emulation/xen/xen-4.16.6_pre1.ebuild
+++ b/app-emulation/xen/xen-4.16.6_pre1.ebuild
@@ -47,12 +47,12 @@ S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+boot-symlinks debug efi flask"
+IUSE="+boot-symlinks debug uefi flask"
 REQUIRED_USE="arm? ( debug )"
 
 DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )
+	uefi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!uefi? ( >=sys-devel/binutils-2.22 )
 	flask? ( sys-apps/checkpolicy )"
 RDEPEND=""
 PDEPEND="~app-emulation/xen-tools-${PV}"
@@ -90,7 +90,7 @@ src_prepare() {
 	fi
 
 	# Symlinks do not work on fat32 volumes # 829765
-	if ! use boot-symlinks || use efi; then
+	if ! use boot-symlinks || use uefi; then
 		eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch
 	fi
 
@@ -100,7 +100,7 @@ src_prepare() {
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
 
-	if use efi; then
+	if use uefi; then
 		export EFI_VENDOR="gentoo"
 		export EFI_MOUNTPOINT="/boot"
 	fi
@@ -163,12 +163,12 @@ src_compile() {
 
 src_install() {
 	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
+	if use uefi; then
 		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
 	fi
 
 	xen_make DESTDIR="${D}" -C xen install
 
 	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+	use uefi || rm -rf "${D}/usr/$(get_libdir)/efi"
 }
diff --git a/app-emulation/xen/xen-4.17.3_pre1.ebuild b/app-emulation/xen/xen-4.17.3_pre1.ebuild
index 9d75fa2cbfe3..2d80429a137e 100644
--- a/app-emulation/xen/xen-4.17.3_pre1.ebuild
+++ b/app-emulation/xen/xen-4.17.3_pre1.ebuild
@@ -47,12 +47,12 @@ S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+boot-symlinks debug efi flask"
+IUSE="+boot-symlinks debug uefi flask"
 REQUIRED_USE="arm? ( debug )"
 
 DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )
+	uefi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!uefi? ( >=sys-devel/binutils-2.22 )
 	flask? ( sys-apps/checkpolicy )"
 RDEPEND=""
 PDEPEND="~app-emulation/xen-tools-${PV}"
@@ -78,7 +78,7 @@ pkg_setup() {
 			die "Unsupported architecture!"
 		fi
 	fi
-	use efi && secureboot_pkg_setup
+	use uefi && secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -91,7 +91,7 @@ src_prepare() {
 	fi
 
 	# Symlinks do not work on fat32 volumes # 829765
-	if ! use boot-symlinks || use efi; then
+	if ! use boot-symlinks || use uefi; then
 		eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch
 	fi
 
@@ -101,7 +101,7 @@ src_prepare() {
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
 
-	if use efi; then
+	if use uefi; then
 		export EFI_VENDOR="gentoo"
 		export EFI_MOUNTPOINT="/boot"
 	fi
@@ -164,17 +164,16 @@ src_compile() {
 
 src_install() {
 	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
+	if use uefi; then
 		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
 	fi
 
 	xen_make DESTDIR="${D}" -C xen install
 
-	if use efi; then
+	if use uefi; then
 		secureboot_auto_sign --in-place
 	else
 		# make install likes to throw in some extra EFI bits if it built
 		rm -rf "${D}/usr/$(get_libdir)/efi"
 	fi
-
 }