gentoo resync : 22.12.2021

3 files changed, 2 insertions, 82 deletions

diff --git a/app-emulation/grub-xen-host/Manifest b/app-emulation/grub-xen-host/Manifest
index dfe92eda0d98..eff31b461954 100644
--- a/app-emulation/grub-xen-host/Manifest
+++ b/app-emulation/grub-xen-host/Manifest
@@ -1,3 +1,2 @@
-EBUILD grub-xen-host-1.0-r1.ebuild 2054 BLAKE2B e9e3dec0b91d9e60395bf772486e725ae18e32981a38279e3255dad19c0860f6323ca006243be22ca3dba07a797983ffe60b50ca01a22f96ca6302f5ab719507 SHA512 d8b5bbbfe0e95afa3c44b8e3b8f323e5bb2f49ec86b32c81d0e6021feef7c959dbcda83e8d43f7e79353bd6fc406b624c52215a745eb551ebf7c808cf05e3a2e
-EBUILD grub-xen-host-1.0.ebuild 1682 BLAKE2B 3d718f06ccef3a0fc4d3d39d64e8fb39af24f558793e4f7c96ec616585cf95371091737287bbc282476c1a649bd390e0a4eda0da168c8c40b5c9294e24eded8f SHA512 08e24d2b9b0c45af8cc757fe8c7dd29d5e69803b953897c2e552053f09358a8ae1a328402f148337ba738476c14e1c6db4fa4f37d68d04a4c65b7cdc208bb83c
+EBUILD grub-xen-host-1.0-r1.ebuild 2053 BLAKE2B 66ff6b1ae34ed96b96810b2a44e3824454a365845a0dbd4505536a1ea62f29968ee012e830d5f87081ffebda57aaf52e58e6ebcfe909667a83e5e5cce89cac3c SHA512 41a5055245f013876973cc175878cb2cf669c5d2f742f7d3fdfea4978ee1d52807dc174c061d85349a0190dfaf8cc4ad8b5a670d3ca1605442822f04ae824611
 MISC metadata.xml 516 BLAKE2B f9183f3e1f7b6de089e478a77b9ff6282cdffc9cad59ed045488025ea05a12997ac18506f089396e99320d98159d8c1631d5ee8a81debc0647b24b66f253e9d3 SHA512 495b6a380e366760ce97f8d865c2ae118ed6a7c189983d871c6517b08e1a86e8d6a47fb43b85c2f175a10a234e1895fbabc98c4806eb79aade14955841a90813
diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
index 288e12680781..e791afc7b611 100644
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pvh"
 
 DEPEND="sys-boot/grub:2=[grub_platforms_xen]
diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
deleted file mode 100644
index 9150a04e8c80..000000000000
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Grub2 built as a PV grub per the Xen PV Boot Protocol"
-HOMEPAGE="https://blog.xenproject.org/2015/01/07/using-grub-2-as-a-bootloader-for-xen-pv-guests/"
-SRC_URI=""
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="sys-boot/grub:2=[grub_platforms_xen]
-	app-emulation/xen-tools:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-RESTRICT="binchecks strip test"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
-		normal (memdisk)/grub.cfg
-	EOF
-
-	cat > "${S}/grub.cfg" <<- EOF || die
-		if search -s -f /boot/xen/pvboot-x86_64.elf ; then
-			echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
-			multiboot "/boot/xen/pvboot-x86_64.elf"
-			boot
-		fi
-
-		if search -s -f /xen/pvboot-x86_64.elf ; then
-			echo "Chainloading (${root})/xen/pvboot-x86_64.elf"
-			multiboot "/xen/pvboot-x86_64.elf"
-			boot
-		fi
-
-		if search -s -f /boot/grub/grub.cfg ; then
-			echo "Reading (${root})/boot/grub/grub.cfg"
-			configfile /boot/grub/grub.cfg
-		fi
-
-		if search -s -f /grub/grub.cfg ; then
-			echo "Reading (${root})/grub/grub.cfg"
-			configfile /grub/grub.cfg
-		fi
-	EOF
-
-	tar cf memdisk.tar grub.cfg || die "failed to tar"
-
-	local grub_mkimage=grub-mkimage
-	if type grub2-mkimage &> /dev/null; then
-		grub_mkimage=grub2-mkimage
-	fi
-
-	local args=(
-		"${grub_mkimage}"
-		-O x86_64-xen
-		-c grub-bootstrap.cfg
-		-m memdisk.tar
-		-o grub-x86_64-xen.bin
-		/usr/lib/grub/x86_64-xen/*.mod
-	)
-
-	echo "${args[@]}"
-	"${args[@]}" || die "failed to grub-mkimage"
-}
-
-src_install() {
-	exeinto /usr/libexec/xen/bin
-	doexe grub-x86_64-xen.bin
-}