6 files changed, 42 insertions, 2 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 79151d144100..89931fb38313 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/shim/Manifest b/sys-boot/shim/Manifest
new file mode 100644
index 000000000000..55efec597720
--- /dev/null
+++ b/sys-boot/shim/Manifest
@@ -0,0 +1,5 @@
+DIST shim-aa64-15-5.aarch64.rpm 397028 BLAKE2B 4e89dd2029238e9b455c469b2857610bfa0d686c43a6f93b7daa70625317c68552967e6761e2c4912b098880c2ccf04278736ca51b7c2e95bcfc700a716bf69d SHA512 1d27ec70bf8b18777bb38cec6769172bd56aa72e9f910e9fa21039dc1c133ebf789fe46fbfe079df6167c3982f6c47bdcad26d3175d6cf9494f89dc9a8a0c823
+DIST shim-ia32-15-5.x86_64.rpm 1026312 BLAKE2B 42f018888463b0da1edbb2ae7379e63b79cea84208ef7ce069c3753bad2f232cb156d73e16864da279c31e8f8f25daa01d6ccc16a6fd13daa286d88460232f9b SHA512 a5d297265480b6a77f05050ecb31b31d2275df0b2f9bfa5ef1a4851163501f295fb81c142aa9fd30826b9e001f876c3d864b3d7b2f89575e6839f3939bca4755
+DIST shim-x64-15-5.x86_64.rpm 669944 BLAKE2B 25d7fb6a4869212610158313f9b8d55f102d6d4e8fc562a43b4654e29fcdb6cef4ba4421d56afb1ad98b7df1c7fe121558a757f06db86cc391ea0ad3e2f9982e SHA512 4888e9422d71f4f8f05343e8dc161f8e48a31ba28469fe3671ce20283e5f7fced656f2d0583d76532dddecc49c2a8504a504b5da951a1e2c6302bf38fac5048e
+EBUILD shim-15.5.ebuild 842 BLAKE2B 78b9fd05d6db526a79fc1dbecfb1be165d067e1b40bad5c74bc3971ab89b044e82210fc7b8c331aeaeebc128b8b54f2f10e55c33803869b580cf104f59dea125 SHA512 dc90075eea258875c17bd507dd84d8fe5ccdb5230df37e5e9291dee8d5a34b337e3f441eeb9455075de38b0ae4602d9250d5c08c60c02aae5e6115fafe7f9033
+MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sys-boot/shim/metadata.xml b/sys-boot/shim/metadata.xml
new file mode 100644
index 000000000000..2b9b4266ca5b
--- /dev/null
+++ b/sys-boot/shim/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-boot/shim/shim-15.5.ebuild b/sys-boot/shim/shim-15.5.ebuild
new file mode 100644
index 000000000000..e946b3ad5dc2
--- /dev/null
+++ b/sys-boot/shim/shim-15.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm
+
+DESCRIPTION="Fedora's signed UEFI shim"
+HOMEPAGE="https://apps.fedoraproject.org/packages/shim/"
+MY_PV="${PV/./-}"
+SRC_URI="amd64? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-${MY_PV}.x86_64.rpm
+				https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm )
+		arm64? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/aarch64/shim-aa64-${MY_PV}.aarch64.rpm )
+		x86? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/boot/efi/EFI"
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins BOOT/BOOT*.EFI
+	doins fedora/mm*.efi
+}
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index 43ad802a488b..fc19c8940584 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -3,5 +3,5 @@ DIST unetbootin-657.tar.gz 16258176 BLAKE2B 7124e3a4cace41b1ca61ca468e37adc90ae7
 DIST unetbootin-661-qt5.patch.tar.xz 8060 BLAKE2B 58cb323166e344ecabf5d372e80ff0367a1344866a6e8dea4b2677a85ea6ae0b5591480a3bcbbfc3a51d391b07adf0d5f370ee77e4c7e1d6f2b727aedf274cf0 SHA512 c1226575484fa63c94ca4da875a26c7bd64bcb27d8e07ea5b67bb3f2546f31d1360d10c363cd7301476811e332c9524c96d6ba482c894b86a5b28ca8a1c8b385
 DIST unetbootin-661.tar.gz 16257579 BLAKE2B 2f92cf286c8010a80d4d4cc48a7ece55e159af9f3729277d97eb99ef2ebe8945023d03c51d6e97d7101d8547240e3c2152004222ec4c825ef4ab954c4018e7b0 SHA512 bbf74a4c4ca9b52f4da672eb54524b7fcb796c65ba80700dc3c6f2677bde37574f42a11c213cc4d4eee38783aed650beee1e2894f60185745e509a2e9571f70a
 EBUILD unetbootin-657.ebuild 1841 BLAKE2B 16d81eecfdff3af01e3825a8d6fa81074a541a9326de6437af784f7999319a640d0a4099f4f3bd8d17321724f75671daf171739be7def326e3f95044967955b9 SHA512 f7e972624c154460f6caaadd06ba1a3fdd28e9917008c63ee160edffd289ef082139f6f146336327e7bff3a2cbc2e903fc069dfc2f3c95d3898305f012de6b12
-EBUILD unetbootin-661.ebuild 2027 BLAKE2B 5f8516fe55c414f54d139a2a132f4042251d3191b0b0306b1b82ff4324960bba0a8e20cadfff9ab960eaa49b2d5951fc00a6cd736654a16e6860bf725038c59c SHA512 fc9e997c5c9bbd460a700aa0a166ce8274e4a5aeb8fa8c16df9167bed3af13b91e86c46bce2849a4d8e761099adff9999332c61b780d094be75e2eeb9c614dc6
+EBUILD unetbootin-661.ebuild 2025 BLAKE2B f6609a960da447974e485981fabb6f9151c8328184a3702a2b96e664fa42ccf028be3a5e942037465a3e0ef3858ea43686331cc1db54ddde6c3e8c59057bba4c SHA512 f74ee3ebf4e3e4145e60d16d1fca73f1a61a82274c86cd568f03acee99b94b366f2adb2e518e04229eea395ac95f21712c40b9ae5aa7764aa9ff1a03880756d3
 MISC metadata.xml 385 BLAKE2B 05836339f25bd812b23c8b93a6f05934a4bfa12d9fdd61f73140131c2d7609a5d1e257ed80c2cd983020720645e5444078cc71f2f51be9a2d435715e38ceea3f SHA512 9676e393ac2d18489433f0e658340a3eec0e01e0b35ca786540b07a6466f0b572f5d5bf115e6dc0b5c4898c00f630b9f5023f62f8e8f3a96c105bc74f918eb21
diff --git a/sys-boot/unetbootin/unetbootin-661.ebuild b/sys-boot/unetbootin/unetbootin-661.ebuild
index 7f9aafaf7b26..cd4059f53eb8 100644
--- a/sys-boot/unetbootin/unetbootin-661.ebuild
+++ b/sys-boot/unetbootin/unetbootin-661.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 UNBI_LINGUAS="
 	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it