gentoo resync : 03.07.2021

6 files changed, 40 insertions, 10 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 0bffd7e12a03..8ef53109bd66 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index c8762a176379..b864acdb4ed2 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -6,7 +6,7 @@ DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aea
 DIST grub-2.06.tar.xz 6581924 BLAKE2B 2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417 SHA512 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
 DIST grub-2.06~rc1.tar.xz 6543784 BLAKE2B 2cd322db808e09533aa91db3e03147896f3f8a2fb6bcc932161aace2f1bab9fd1ceb8b56eddf2e531413932c1ef407cdaf5aae49c0b26e7c6c308dbf7916685d SHA512 093890b0af71b0d346afb415dec106681fd9e3f2f5bda14093c060b861d55ee1b50c8fb24afd072d24968ebebedde290f8220b0374cbd2b2e4508dfb00924122
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
-EBUILD grub-2.06.ebuild 7368 BLAKE2B c1141f6d92ae6d72258e3e736cd36c04057b78125d8c78a20b6cc302f6409ba9ac31f6ef889883a81b6062f76d74e64ad1056cc2374845321dc79849c2ca1414 SHA512 a770511ee292233da2499ccc41ca5c6ec5be454ec1fbf76e8d3c7db2cfe7f576fb659d5ec652a1d06b8b6a4b1dff9f645c24694cbb30dd4b4395fe90d7710008
+EBUILD grub-2.06.ebuild 7363 BLAKE2B 1bcd50484899b41f112c8ce6f63ef2c63415693b95e771b5c8f52ad99506ff354045c99b5102366cc9e0bde55705de108833f05833bd5ac03cb901f0ecefd0ef SHA512 a710243bc0e1308e89f01d6e20186c072fda51cd44b9033460069e19247b416fb42eb57df7c6317d8195b8d7d2c37178bb6b0698e5ea48215cf8bb817cadc481
 EBUILD grub-2.06_rc1.ebuild 7363 BLAKE2B 05ad610342f66df2bbe11b95fac11a166cf69bf6bad369b0db969d8373eeb33e21a65059cfb60d282ff92d1a0453a06a7a56ddcd7e9e36a3fc66b052883474ce SHA512 3bf9b3f77426d3bf5c20205a57c14dfe8d8779f3df9ffeaf496e8a4b0608f3194ba63c258a4ae47dab6d9e2997a5efba843d8890f9032e0e75566a4d53b50718
 EBUILD grub-9999.ebuild 7368 BLAKE2B c1141f6d92ae6d72258e3e736cd36c04057b78125d8c78a20b6cc302f6409ba9ac31f6ef889883a81b6062f76d74e64ad1056cc2374845321dc79849c2ca1414 SHA512 a770511ee292233da2499ccc41ca5c6ec5be454ec1fbf76e8d3c7db2cfe7f576fb659d5ec652a1d06b8b6a4b1dff9f645c24694cbb30dd4b4395fe90d7710008
 MISC metadata.xml 985 BLAKE2B 36f108b5d3441f8576609c77ab3547c60ac2c508b55472bd0ec0e3af8d0fa018d305d7267c0e2e84c8526affced9ed5ce51738b9fcf05b31ac36c1b4d5c2702a SHA512 bd28dd88d4eb76a32cfa757eb5bf7641d033f670280ab7230b72a66b1bd8fd65c777473b1d7f81257004a215fe5a858a79a6a912e0ceaecd586867e9a76f6b4e
diff --git a/sys-boot/grub/grub-2.06.ebuild b/sys-boot/grub/grub-2.06.ebuild
index 8046d169817d..83281d884a3a 100644
--- a/sys-boot/grub/grub-2.06.ebuild
+++ b/sys-boot/grub/grub-2.06.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
diff --git a/sys-boot/mokutil/Manifest b/sys-boot/mokutil/Manifest
index f2914bb726f1..f244c1258828 100644
--- a/sys-boot/mokutil/Manifest
+++ b/sys-boot/mokutil/Manifest
@@ -1,3 +1,5 @@
-DIST mokutil-0.4.0.tar.gz 32590 BLAKE2B 867574b05a7a7c842869f75bd3b6a0cd0af083862ffc912b25b12fe6283946968ac6872b25a727d37185fb821871d5a2f958afddbb7e2bfefde854c6f434ab8f SHA512 ee64627089efe341bff466249a126dcdcc4a53878b17f651b17423650c3aea76d52dcae01ed689ba5bd317125dd9a669816563aa676d46d8ac36863f38f9ea16
-EBUILD mokutil-0.4.0.ebuild 590 BLAKE2B 95518e0a246fc8c61bb9c1a8f2dff2840f34cee1b6bf3b17b45cd83a245650c0410095a6697c1498c93d9a1e15a76fc7f2fce3fb8eeeae8f9d68da9c50eb18b7 SHA512 9f588eea643aee867d3f6553655716d9e61778a5beb205afbedd131bcc3f6eff8d0fe7b8a7cbbec644c319d29c5270324e1791e0b07c1698434b3ff3ec8d8b1d
+DIST mokutil-0.3.0_p20170405.tar.gz 32590 BLAKE2B 867574b05a7a7c842869f75bd3b6a0cd0af083862ffc912b25b12fe6283946968ac6872b25a727d37185fb821871d5a2f958afddbb7e2bfefde854c6f434ab8f SHA512 ee64627089efe341bff466249a126dcdcc4a53878b17f651b17423650c3aea76d52dcae01ed689ba5bd317125dd9a669816563aa676d46d8ac36863f38f9ea16
+DIST mokutil-0.5.0.tar.gz 37181 BLAKE2B 6bd74e4ef2777afcd80cfe1d56dba7c861b9cb7bb957db19529dc36df7d6172c1d43870b80fbacd5f2bf20dbe9c8174be0d4cb5ce3638ce83a99795ae7627c4b SHA512 600c142fcc44e33efd307341b814018ef956668790b56d42a523140e81098746d14ae096fc6c93985b3c26bb414b8b6862f59312f2c4bd9d657a11e4becc6ea7
+EBUILD mokutil-0.3.0_p20170405.ebuild 686 BLAKE2B 2500e342c120ff2e5072104a5ff1fab0932f25618062138425a5c4cf51c0d72069e93096cc64bf01c6721f212cdd82241377aa7cd391c4e033fd79ce064e85a0 SHA512 e6a972fc0b83e46f2ffc84b065133b8e8870596ac98422afbf5bd892925d9d0c513fdef85ac3e63a8aec1dfa4591612f235796af24d1755d51d88462e444f35b
+EBUILD mokutil-0.5.0-r1.ebuild 560 BLAKE2B 95644c634226181843c3eb6e4d988e16f3f43a2187a2d7cb318d4f21ada38c5d6a44c254ecc380ad3d040316dd83a549030e34255a33e4130a90da6b6a203a0a SHA512 02668a462d47eef98cc517ec7952d0463194688b7f9bf7ee7512c5635838b17d6fa0cbc43a2765d8f49f749699b6bc2911937d142274523854a4b93a3cdbd440
 MISC metadata.xml 323 BLAKE2B fb75bd2e6eee9344e32cff8aa3c9cc46cfdf5bab288c940760436b49d92b83cc9db685c3de73b3ace360c4561f1be86d9d9b6c8ccfd60f5c4bd3ce5aebff734a SHA512 359106c578f89585a6985585d398b0c583220ae29b73c77c877b1df5e6b568afe6972beb6ba985c74049e31cbc1678faf457553b41c1e8c55b128c63c2a5cacb
diff --git a/sys-boot/mokutil/mokutil-0.4.0.ebuild b/sys-boot/mokutil/mokutil-0.3.0_p20170405.ebuild
index e7350f82c725..c83be9c0cdf4 100644
--- a/sys-boot/mokutil/mokutil-0.4.0.ebuild
+++ b/sys-boot/mokutil/mokutil-0.3.0_p20170405.ebuild
@@ -1,24 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
+# This corresponds to a commit between 0.3.0 and 0.4.0!
+GIT_HASH="e19adc575c1f9d8f08b7fbc594a0887ace63f83f"
 DESCRIPTION="The utility to manipulate machines owner keys which managed in shim"
 HOMEPAGE="https://github.com/lcp/mokutil"
-GIT_HASH="e19adc575c1f9d8f08b7fbc594a0887ace63f83f"
 SRC_URI="https://github.com/lcp/mokutil/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GIT_HASH}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="dev-libs/openssl:=
-	sys-libs/efivar:="
+	sys-libs/efivar:=
+	virtual/libcrypt:="
 RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${GIT_HASH}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/sys-boot/mokutil/mokutil-0.5.0-r1.ebuild b/sys-boot/mokutil/mokutil-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..560c290cb156
--- /dev/null
+++ b/sys-boot/mokutil/mokutil-0.5.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="The utility to manipulate machines owner keys which managed in shim"
+HOMEPAGE="https://github.com/lcp/mokutil"
+SRC_URI="https://github.com/lcp/mokutil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/openssl:=
+	sys-apps/keyutils:=
+	sys-libs/efivar:=
+	virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}