gentoo resync : 15.01.2020

26 files changed, 192 insertions, 166 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 6b329e3900eb..cdf801a5ecfb 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 45887447b428..3b4811ba9802 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -12,12 +12,11 @@ AUX grub.default-3 2532 BLAKE2B f59b8e862b7069603a975327d51507aae4568bfc80d7aa23
 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
 DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
 DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
-DIST grub-2.04~rc1.tar.xz 6422420 BLAKE2B cf189fea32badba00051734d4e67954009bae016a6b8a366ce41a2ac8ddf8792e2b63262c0a80f1fa5771394ebc76b090f50eac1ccd9f81d594feb8cc15ab400 SHA512 c0bee6a7aced0408d7477fdb8b6fdd3ec48f80f0ecc4e7602d76f9a37081fe08e405faa030b4e4f181f45793641b13f398fe0bed121058ad8729f9a8908703d3
-DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775abbf49f4b64758045a9b5158e75afd01a8425b56e6f6d0ba288a733bf426df363c1ecc78daddec516c33d461bc3b SHA512 9d34a005dd10f212e43075beb71eb39b9cc3403ae1cddec7d79af91b3a3a1beb4a3696075cc94563c8402efe2ad05de552ace77a24da09f1c0b7f95e99b056a3
+DIST grub-2.05_alpha20200110.tar.xz 5452588 BLAKE2B ccf95644bc76f6be8e73a25e1b5f05e052ea5bc0c61896454c211fccaec6a714dbae10f7398aa1e9d7bf864efc68655708c102ba20cc1e40fecd3fa7d3d961f7 SHA512 b6e609edc4dcee5d9348d1d6d9ecfec5a759a284a1f82970b38f8aab0c8fa6b5dc69e532a1a264815208df5dae3bf409c2f73846893a8e3cb97187d0e0c7295c
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
 DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
-EBUILD grub-2.02-r4.ebuild 7966 BLAKE2B 55adf4ac6809011c7ffd425ab305557bed8f2b7e4fec29bdba9c104d2a553963da2400363376fa933b64ad2ff02b57ebacfa0fd06b7ef69814d3b2fdfd2bf063 SHA512 e440ba7a2a6157e11823dfe0049415b81bd19baffef36cce73d7cbe3576c635eba8c334118b6468f70a4636cd9a1bcc36790c8e4dc7ca51d7aba3d8481069fe0
-EBUILD grub-2.04-r1.ebuild 7647 BLAKE2B 527f093bd35e65a7ce971408f7ad2a4e6dc2cbb828f9b8cd3194e401ab4f7c19f20afdfa9a13180ee508f7632ece69502b4df8c5790012ce8d6fdd9c7813ddca SHA512 27ff52b62232af35ede419837a1a7d24e8485ac17b6034bf7a27d8395473fb451ba1a7967d69c4bdcbc4f7dc78833527ab68c3a57c0bfba6ace3a853f74fd8f3
-EBUILD grub-2.04_rc1.ebuild 7706 BLAKE2B 540493ecb71e14bedf42cc788606747fb5a9ba0e5898b7276d1a4bf348210ce8dbcaf99dde406987b22867cf9184411f878232f7fadf2f9d01473cd8f9e0d8c4 SHA512 964beed8ecd518078ef22aea3308eef5c69e2c0900b931a88dfa7389b6752ffb8b3f7b468a799f1a75f83cc605435f85907cbf7d4186fb74ff61f73fa2d73796
-EBUILD grub-9999.ebuild 7597 BLAKE2B db14887aa1777cdbf36db65d362dd863d4f768a7962daf0de467fd473196928aadfde8055596a53674f4e97c38cbf62b5bfd1d963f5551d8bd8a46cc0ab30d28 SHA512 2ba49dd61247f386298acf8f0c3372071f2b8be6b2a422666d3b94c7773d991c08d0280be73d2fbe76abd58f93c2331cd54b982624d78052c215a4d31db683a8
+EBUILD grub-2.02-r4.ebuild 7986 BLAKE2B 28a1db0e31b86b972bb0dae7b6fa18d7db3b4ee2be9e7ae6353699a8ec45e382b0bcd33d68cb481763421937779aabe7bb902106cce2cb8171d6c61d0f1f0494 SHA512 0fefc254e134b5ce01ca3e890b5df6076265ee16971226407c0cd977ec75b2356c0dab493ba5e4a2578747a3be7bf0920221f2c539bfebffc6eec5bf82eee00f
+EBUILD grub-2.04-r1.ebuild 7662 BLAKE2B a1217db77ca4314b19e92d67639fe262d1c37c19f0f7c3da1a37a3a6d545d865b84c7a5e3abcf6e170119610e035f2474ceeed98667bc88b39b4125099564058 SHA512 5959478a50f35553910179c5b7efe681f437a7603f9e8ad4e62ef318e2ec0c86dfc81d656de24577a8a143f721fd0da028f17df25201ea13bd0a039a0a9cbbf3
+EBUILD grub-2.05_alpha20200110.ebuild 7372 BLAKE2B cb93bb07869e0d3525fbffa0f205aa53c7ad7444353169e3c25c6182581ce496f0e9cb862da7577a4126b4a70e7f579f14aca59cb5d03e77193e978fcb7471d9 SHA512 e03e8b8e9da1f117fd5972cc715b945349e23917cdbea8a0f1fcf5a5e0523f8f3ad6e532614c299e855ba71bed4691857e8a370de3078048afaaab671f7a591a
+EBUILD grub-9999.ebuild 7623 BLAKE2B c902db0fd59ce8ef6330b89a33cfa104fecad90b7e922bac284656f2f39f1de0b4228e68cf2662d9c40da299b41fce3d8960e27b5f57b147ab02a6e6299ce658 SHA512 26e9ad7fbeb82e7203045eae27ab927c74f967c4201f2d75bc3950bc7f66f1b2611d4bdac9c442afaa9fc8e7b7e311173f25544689df1d325d21ae442f343a9a
 MISC metadata.xml 1149 BLAKE2B c0a364b1d8139f26f7dd09ba49dd68d591c7532e2eec25dae97caea49be8bfc92c8d5c69dcc77d89f58367fa04a73526cc55768f93222effc6c6e47a52b53500 SHA512 45d0425236957395e275bd340aeabfcd03451b037c616c54cf8babdc3bdee6aa3706fa7565f595ba4391773d331353b8920a627094c01289935a1a9aedc1f7bf
diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
index acd2c79e3794..c76287b57389 100644
--- a/sys-boot/grub/grub-2.02-r4.ebuild
+++ b/sys-boot/grub/grub-2.02-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,7 +7,7 @@ GRUB_AUTOGEN=1
 GRUB_AUTORECONF=1
 
 if [[ -n ${GRUB_AUTOGEN} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+	PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 	inherit python-any-r1
 fi
 
@@ -56,7 +56,7 @@ DESCRIPTION="GNU GRUB boot loader"
 HOMEPAGE="https://www.gnu.org/software/grub/"
 
 # Includes licenses for dejavu and unifont
-LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
 SLOT="2/${PVR}"
 IUSE="device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
 
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index e2119933d191..bdc25eef77bc 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999  ]]; then
 fi
 
 if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+	PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 	inherit python-any-r1
 fi
 
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
@@ -51,7 +51,7 @@ DESCRIPTION="GNU GRUB boot loader"
 HOMEPAGE="https://www.gnu.org/software/grub/"
 
 # Includes licenses for dejavu and unifont
-LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
 SLOT="2/${PVR}"
 IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"
 
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.05_alpha20200110.ebuild
index 545017ee85a8..488d6c8219e7 100644
--- a/sys-boot/grub/grub-2.04_rc1.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999  ]]; then
 fi
 
 if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+	PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 	inherit python-any-r1
 fi
 
@@ -21,15 +21,7 @@ fi
 inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
-		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
-		MY_P=${P/_/'~'}
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P}
-	else
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-		S=${WORKDIR}/${P%_*}
-	fi
+	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 else
 	inherit git-r3
@@ -42,7 +34,7 @@ PATCHES=(
 )
 
 DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.0.01
+UNIFONT=unifont-12.1.02
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
 	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
 
@@ -50,11 +42,11 @@ DESCRIPTION="GNU GRUB boot loader"
 HOMEPAGE="https://www.gnu.org/software/grub/"
 
 # Includes licenses for dejavu and unifont
-LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
 SLOT="2/${PVR}"
-IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
+IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"
 
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 xen-pvh )
 IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
 
 REQUIRED_USE="
@@ -92,7 +84,7 @@ BDEPEND="
 	)
 	truetype? ( virtual/pkgconfig )
 "
-COMMON_DEPEND="
+DEPEND="
 	app-arch/xz-utils
 	>=sys-libs/ncurses-5.2-r5:0=
 	sdl? ( media-libs/libsdl )
@@ -104,19 +96,9 @@ COMMON_DEPEND="
 	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
 	grub_platforms_xen? ( app-emulation/xen-tools:= )
 	grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+	grub_platforms_xen-pvh? ( app-emulation/xen-tools:= )
 "
-DEPEND="${COMMON_DEPEND}
-	static? (
-		app-arch/xz-utils[static-libs(+)]
-		truetype? (
-			app-arch/bzip2[static-libs(+)]
-			media-libs/freetype[static-libs(+)]
-			sys-libs/zlib[static-libs(+)]
-			virtual/pkgconfig
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	kernel_linux? (
 		grub_platforms_efi-32? ( sys-boot/efibootmgr )
 		grub_platforms_efi-64? ( sys-boot/efibootmgr )
@@ -125,11 +107,12 @@ RDEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )
 "
 
-RESTRICT="strip !test? ( test )"
+RESTRICT="!test? ( test )"
 
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
-QA_WX_LOAD="usr/lib/grub/*"
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
 QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
 
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
@@ -186,6 +169,7 @@ grub_configure() {
 
 	case ${MULTIBUILD_VARIANT} in
 		efi*) platform=efi ;;
+		xen-pvh) platform=xen_pvh ;;
 		xen*) platform=xen ;;
 		guessed) ;;
 		*) platform=${MULTIBUILD_VARIANT} ;;
@@ -245,8 +229,6 @@ src_configure() {
 	export HOST_LDFLAGS=${LDFLAGS}
 	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
 
-	use static && HOST_LDFLAGS+=" -static"
-
 	tc-ld-disable-gold #439082 #466536 #526348
 	export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
 	unset LDFLAGS
@@ -285,6 +267,9 @@ src_install() {
 
 	insinto /etc/default
 	newins "${FILESDIR}"/grub.default-3 grub
+
+	# https://bugs.gentoo.org/231935
+	dostrip -x /usr/lib/grub
 }
 
 pkg_postinst() {
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 6b165af82481..292e60b093fb 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999  ]]; then
 fi
 
 if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+	PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 	inherit python-any-r1
 fi
 
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
@@ -50,7 +50,7 @@ DESCRIPTION="GNU GRUB boot loader"
 HOMEPAGE="https://www.gnu.org/software/grub/"
 
 # Includes licenses for dejavu and unifont
-LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )"
 SLOT="2/${PVR}"
 IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs"
 
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 9a35a4242876..d455a7d59329 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -4,6 +4,6 @@ DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992
 DIST plymouth-0.9.4.tar.xz 1103496 BLAKE2B abad2cefb89e9d17b77113396d7203090544759b3dd7f73f67153d9f126db28e5366d36aa11e2335566bf4046bebd50d8d9dd47c75634446fb3a0314cd458925 SHA512 83eb2de7e6d0980e9f7fa4e0b0f20c46a8238051d84bc38dbbb5dfa438e41c1a39846dcd652374256d9f1fe79967b154a3576cd9c433ef816b6c962be2d31e93
 EBUILD plymouth-0.9.3-r1.ebuild 2585 BLAKE2B d67507b56f0c864ce51d649d3a2a577aeb6b7a7688814045aea01e329cefd1899cc37ba019ee5ebce4db3011855df7146c61767fd37a8e5c2bed661609d55855 SHA512 291db5b95322b27a4798347b6e86c674f87a88380b72052f93c3f1a0fd1f35e3bfacf36fce2d3f67be0d5b8731307e6a387f05275622d26fb4ff4f07ccfa6a7b
 EBUILD plymouth-0.9.3-r2.ebuild 2686 BLAKE2B 4991ce88676c102ff2bd5062a5d59184e9bb53b5db22dda2f22c5138627663a2f1c107af549de7abcc935be0d19e2b15a56234a15315f3deb1464c6a1ecda9f5 SHA512 8232ace285011d537cd876df0cd343deb42ba1924811ad808cdb39b1ef3d5e8caaac70c0b91859d909e3306ab3a5e6296b84b13413028e136c6eea8f13da4608
-EBUILD plymouth-0.9.4-r1.ebuild 2737 BLAKE2B 4d19500584ce7cf9568829d3e58077632b79e3e3dacc610166626470f563ad5339ae55f83ca22ba01f6b4bc4dfea19a3a27e569648049c07630a9773d7549bf0 SHA512 6503f274400178498858564c20b53e5aafd762774f9c3f9cd96fc89c4b52f58923723aa3de492e2734789145e63cd5bbed2b891d80430bb6f1147e50ab18123b
-EBUILD plymouth-9999.ebuild 2691 BLAKE2B a09eb144e11469b0af81e094dad79fcf2a50522ab26d24286dbf2ee22e70c216b071437304d2eb3dbac8dea72e22621f7adc74769d918410357aa772bf65d32d SHA512 68812de9973b89cdc93ef7015a812c24250dc9a2524d63d043eab121bc86a1d25ee9c404230435508f531d6cdfdfdd19ca46c0dea2872b2306c4b61f3b08a768
+EBUILD plymouth-0.9.4-r1.ebuild 2772 BLAKE2B d390aaa44d5720b80737ae37c9261397b3e00c721c56dd8a0a7a34d8936fa6b8f6283391155eea7158e67f3ac6de74056e40767f65932bfa7b7c3bc920f06616 SHA512 4d51fb929b95f4622598788705421ba9485b5692b3e134338e718bca1a0bceadceaddc90187e7ad4b53bd443372a1a43773d3d4c07df0c8f2d8cf8a655e3b2f8
+EBUILD plymouth-9999.ebuild 2726 BLAKE2B e0c136d41da63a030b7b7ea035b7753f3f193f7bc6eb9a70fa7518b8950f565618fce58d49c3cf405a64981b6a8f881204597ed6cf2e9404c90da1278845b1b8 SHA512 1e3dee3116536e25a6207ac038c8358405de5b4d5d4708e58ad25fcdf7ac3332ae2de96b140e650196a02ed60a664ed1113d80f6623883b480577fe3f2013bbd
 MISC metadata.xml 1135 BLAKE2B c2fe402798b480f8fcb790884bff76881768eb90b0ae74ef529a3a7850665f6912642b1079598c60d2010af79a77b4372f1608a71e81f08e0fa9ded75c1c37a7 SHA512 51c1ffb9a1dd25f5c2085fd4a5fa43dc9af3b10470411e4c15e7653df32f09db6b2f64795bbf0760c60206e82e2db396d05f04bc5dd92bbe945647902787b673
diff --git a/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
index ca1a0bce4cbf..1ade24f98db6 100644
--- a/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug gdm +gtk +libkms +pango +split-usr static-libs"
+IUSE="debug gdm +gtk +libkms +pango +split-usr static-libs +udev"
 
 CDEPEND="
 	>=media-libs/libpng-1.2.16:=
@@ -41,7 +41,7 @@ DEPEND="${CDEPEND}
 "
 # Block due bug #383067
 RDEPEND="${CDEPEND}
-	virtual/udev
+	udev? ( virtual/udev )
 	!<sys-kernel/dracut-0.37-r3
 "
 
@@ -75,6 +75,7 @@ src_configure() {
 		$(use_enable libkms drm)
 		$(use_enable pango)
 		$(use_enable gdm gdm-transition)
+		$(use_with udev)
 	)
 	econf "${myconf[@]}"
 }
diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild
index f10bd9023672..f833e4ef1b55 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug gdm +gtk +libkms +pango static-libs"
+IUSE="debug gdm +gtk +libkms +pango static-libs +udev"
 
 CDEPEND="
 	>=media-libs/libpng-1.2.16:=
@@ -41,7 +41,7 @@ DEPEND="${CDEPEND}
 "
 # Block due bug #383067
 RDEPEND="${CDEPEND}
-	virtual/udev
+	udev? ( virtual/udev )
 	!<sys-kernel/dracut-0.37-r3
 "
 
@@ -75,6 +75,7 @@ src_configure() {
 		$(use_enable libkms drm)
 		$(use_enable pango)
 		$(use_enable gdm gdm-transition)
+		$(use_with udev)
 	)
 	econf "${myconf[@]}"
 }
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 65c9e9aee923..ed3fba7d669e 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -6,6 +6,6 @@ DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69
 DIST raspberrypi-firmware-1.20190925.tar.gz 185571086 BLAKE2B c3a9b2760fa853fbd1dd09bc4048c9e78594f88da5af608c3a761554d4046a4c869db8981c64140a24e82e0a61b8dc776bb8d895df60c6424e44780f78b18cb0 SHA512 4b7b29cc6c2a33d7a37987c492034d9afbb2220364c50cf265e0adf8e5f393c2275dcffaa77c89b3f43b2e98d199741b67590cb60ff8beae8ef677852f63b4a0
 EBUILD raspberrypi-firmware-1.20190215.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce
 EBUILD raspberrypi-firmware-1.20190709.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce
-EBUILD raspberrypi-firmware-1.20190925.ebuild 1904 BLAKE2B 25fc21ba99d16a787c7c70ff5f589defaa9596389dfbd490634cd594ca8c862cecdf8deeaf7f639e651d2d2d4a760c2f7d589a347b3ffb5c9d45da7b3b6c7424 SHA512 359ccd282af9f68b922030cf912ca065c325ef287c26f6048b6ff30e7bca0f1067ddfd5599b511d50eb25a2afc5dbfe0f9115801d254fb1f51219c9675ef5eeb
-EBUILD raspberrypi-firmware-9999.ebuild 1904 BLAKE2B 25fc21ba99d16a787c7c70ff5f589defaa9596389dfbd490634cd594ca8c862cecdf8deeaf7f639e651d2d2d4a760c2f7d589a347b3ffb5c9d45da7b3b6c7424 SHA512 359ccd282af9f68b922030cf912ca065c325ef287c26f6048b6ff30e7bca0f1067ddfd5599b511d50eb25a2afc5dbfe0f9115801d254fb1f51219c9675ef5eeb
+EBUILD raspberrypi-firmware-1.20190925.ebuild 1911 BLAKE2B 126451fbb0daa5f9d07381fb0e6259cfed1235c2b59773a44c03cbb84eb480a1092138b0e64b2e1e495d9b9ae43fd876ab2a0ef507f976dd36a8847276c28db6 SHA512 3e52692de708837448b18aef8a9df97b065bab94539c43f0c58fc786b8e4aede84a168d402d4dbd118661f433361a817b39cbbfe219caef3966a3d6fbb37e3b4
+EBUILD raspberrypi-firmware-9999.ebuild 1911 BLAKE2B 126451fbb0daa5f9d07381fb0e6259cfed1235c2b59773a44c03cbb84eb480a1092138b0e64b2e1e495d9b9ae43fd876ab2a0ef507f976dd36a8847276c28db6 SHA512 3e52692de708837448b18aef8a9df97b065bab94539c43f0c58fc786b8e4aede84a168d402d4dbd118661f433361a817b39cbbfe219caef3966a3d6fbb37e3b4
 MISC metadata.xml 336 BLAKE2B e941866d513604cc393b15c6fb93d6cd1c27dddabc86b149aa6e4dab729f7577288aa729e1681c76f8a5136ff11fec58eb3805ac8fc2a1453834c2d8275a208d SHA512 a1c2a9c4853e8b99b921dd4f87548efebdecac6ad42619e2fa85306205c6e2d4b98e4d91a921dc475507d171bd8503d47f119944ac8750af363137c5ca11e4ee
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild
index e1ebbe9b7e43..3b499cf2ad55 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild
@@ -22,7 +22,7 @@ if [[ "${PV}" == 9999 ]]; then
 	EGIT_CLONE_TYPE="shallow"
 else
 	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~arm"
+	KEYWORDS="-* ~arm ~arm64"
 	S="${WORKDIR}/firmware-${PV}"
 fi
 
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index e1ebbe9b7e43..3b499cf2ad55 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -22,7 +22,7 @@ if [[ "${PV}" == 9999 ]]; then
 	EGIT_CLONE_TYPE="shallow"
 else
 	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~arm"
+	KEYWORDS="-* ~arm ~arm64"
 	S="${WORKDIR}/firmware-${PV}"
 fi
 
diff --git a/sys-boot/raspberrypi-mkimage/Manifest b/sys-boot/raspberrypi-mkimage/Manifest
index 43fb287a25f7..66c06f5a9406 100644
--- a/sys-boot/raspberrypi-mkimage/Manifest
+++ b/sys-boot/raspberrypi-mkimage/Manifest
@@ -3,5 +3,5 @@ AUX raspberrypi-mkimage-0_p20120201-boot-uncompressed.txt 201 BLAKE2B aec1ca6637
 AUX raspberrypi-mkimage-0_p20120201-imagetool-uncompressed-python3.patch 224 BLAKE2B 6b758469b620406246ff19a911271e60d20c31b573a17b45193dbf5df68a623d80400c72f5ff75a25388ab72c1e9dff9e18a516ed3112b2f2c55f63031ff492d SHA512 338a39f6050b1f49640aa42b6100bdaea965d44f541d57ea5758efe83f0ba4749b135f20474a14d66ebd8c46a22d4db4ed87bdbd849b04421a067f5376dfa9dd
 AUX raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch 1294 BLAKE2B 2c64091cca326a285dababae93a3f5a7ff40b9684717c8c5c49514ba5b13c119da1f05b568b68bbe25d1cc606788c5a9fc515cd8278b26406f87b3b98b857c4c SHA512 71495224bbe3d5064eda438f2d5534422a5e94be8d0a47a4020feab62a67fdebe6a29ced6b97aea970e505edeebd43a8aa9642198979ad57293b6d6cf4221633
 AUX raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.py 822 BLAKE2B 10897863e4a6177c0a646c85ed4d835b6971b4ff1eeb296a7022b3c874020b2350c0ebf2a3c16f6ce1422ac442b95c9fa30e626bec0e616ba34253ea09a6175a SHA512 00a3e1936b44e7a3c73b3ca0fc9597016a31dce869da04101785c1e5fd0987747a828092335402820cba96caae1c9d463a9bba6a5ec1e4ccc89bb6a31f025c5c
-EBUILD raspberrypi-mkimage-0_p20120201.ebuild 1187 BLAKE2B ac16ac19113d9af2e6cac715a48671b58ff907fde43ea5973f6d06e55158e1940ce66c54f0790f47440c6b9acd1c7c2a19e559cbabdf3c436b7c440957816ae2 SHA512 e4232f08397d4f55f8f041598d0eb11e472a7cc3fa2801497ecbc3ad8ea05cd4d4eeeed31f96e1275f2483c409cf0f259aefad8938ec52c51bf976258fcb1299
+EBUILD raspberrypi-mkimage-0_p20120201.ebuild 1183 BLAKE2B 066d250f5fff58447f26258da57cf9fb813ac7b98a9d876eb1039c5244ae36a2423418fb222e77edf71aba5951af126ed3c42f942254010150316d10518e893a SHA512 9336e0bdee088df5f790ad33751bc28d8ae30f3d928a875dca6c77eba899920df95a5795ef015d9054b5a903d38fc4d7813e8b7aeb223979a66ee94626829f32
 MISC metadata.xml 249 BLAKE2B 4a52a1f36d321e29fdfc7b2b391378a0fc64e56cb593df93d3bc522d327e6c438a6312cdc21f04c72242c53760f4de8cd82255499bddc53f0761c4991a61eb7b SHA512 10102614b4f775e819bdadb9db011535be6e16de0c06fbcdeddf16a45b65f0aaac58d5ae2899e9e69a6460ddcae2c1673a578bb7b30d6035c7697d872cf95baa
diff --git a/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild b/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
index 98b8003fea59..70b36a8bc67f 100644
--- a/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
+++ b/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/sys-boot/udk/Manifest b/sys-boot/udk/Manifest
index 496e197e4836..656ef712a595 100644
--- a/sys-boot/udk/Manifest
+++ b/sys-boot/udk/Manifest
@@ -5,7 +5,7 @@ AUX udk-workspace.template 1426 BLAKE2B b35a6e0e73c6724a29db2ad93ebceb35416d6d94
 DIST UDK2015.Complete.MyWorkSpace.zip 121736982 BLAKE2B b37bd9ead6ce2c665128199249483ecbcb0f410077d0ca61820bdccb7ae71f6dad870a3cf2dad79f997ad9114678fab3c15a17227ae33aa1ff66f9187aa3a568 SHA512 7856a8f29296f817e8fd09d8eaf7207f4e25a13faa10936d1ceb10cb6a900be265379722c0ade0ef93b1c640fef8693667d2567962e3288b20ae77f607f03d39
 DIST udk-2018-docs.zip 79352781 BLAKE2B 9d08579d4645121cabb7ac52850de6492f9990240da9236064352df0595867bfc6952c9858865a8ce1d81982ec0e2440dc19930a75595454257294462adc60d6 SHA512 6ba2d961f20267cafb94bd020e8fe71e1392f1f2cdbc5c9f0a43212253ddf137b3e12cc789299dfd1ea099bb1541703b995ae20d28f0275395f5f85ed0656954
 DIST udk-2018.tar.gz 38642782 BLAKE2B a10171659451d7d3df737066ec0471db1e5055bd52556d4d0654b244e827512db8d88e2b74b4dfe0189f768e0eab7a705aa32a720e047555995cf339ea50c62f SHA512 8fd9316f08a5c30f8684b2fde73906a943bb067ec91699f41796e27679af73dbc38efaa100a57d4b835656b402d9c08896abc5c10fd0d607a7e0173b3d7a60b2
-EBUILD udk-2015-r1.ebuild 6463 BLAKE2B 9d2d5d482c35424338626729380a231fc080e48a309c80c128b87b64fd7206cc594b1f7e2a20a1ca5a8015cd267916629b18454a5564c3ba5ca2636c5f21b04d SHA512 868d1c3fb22683772fea293d1dc4961438dde5f6df247b6895fc5709291283c1807fcd15f4d8c557a28ee3cb98e1501476c159574fed0bd2549e0e4ad88aae75
+EBUILD udk-2015-r1.ebuild 6459 BLAKE2B 156f86b1ae91125ca9c8609254539d971dd2f2ab495dad3611817460905192d6cb33e1261ea5555096e28a33aff480bb60bae4b882cb26ee92d45363db8b4ae2 SHA512 2bafe8e4c63cf02e2c3eeb245c45587d6b8ef2e4e419fdda92dc6bbea563250542024fc9367470c5fe37bb40a9ba088abc209311a9a95ccd8dd7d24d084df60f
 EBUILD udk-2018-r1.ebuild 4057 BLAKE2B 4827f3a1ead937529d78d729f70232bbcd85c43f9eae59010542c23e5baa3ef9757885ca175b094028f978e615acf76f33c60b59a605fafefe437e663597cd28 SHA512 a38b8c3c7594be5eddee9a300991648937cf5aadea74bedae84581596d38e4bc1990c8e58db6b676a2e35d8916a1674925d740d0320dbef24b6bc45a2aadb4a3
-EBUILD udk-2018.ebuild 6564 BLAKE2B 627ae99e97b02669348217286cc0345b3e0bfcc6ebab6f33d822742ff64cd704c0b87db82077d39eff3e3b978c8653665a167d7bfe5ec0d9474536c38e92f6ee SHA512 db785921a62a5cd0d4089114a3b1a9ad678c4ba6eadf099eaeed4888bae9cf1e77354458ca279ffbc15aaa9ce73490602fa18af4457dfd5594ddcd7960f6327f
+EBUILD udk-2018.ebuild 6560 BLAKE2B f13fac8ea6ab8fbd2ed9677f95f33f5668d4c54b52b13ba342019a45087a4b0193744dd0db93b89a45a9a5e075e847c37a3dcb41fd8fde72a2c529026679e254 SHA512 fc6442e1791aa3ab4b10a28923433d26092ed92fcce9b09aec08ab1ca6ceb16e40fca028def9a3b5424c0b7e93f8d831ac0dd7138ee158d33568f2d9659a2be1
 MISC metadata.xml 721 BLAKE2B 863e21fdb7ac310469efdddbbbff0f1b23aa8b6cb6cdb27d6bfa1b024e795ef3b86e72d9dd7b6bca8a5326755615710bc0a59a6f4e3b53149490402d10c24d42 SHA512 20ac00286729ab06e607513002f2bcfe75866108914015d11a3139f95073b393c62046832fd3295f4e849a5cc810b996f0ca8b589cc6639e726563110e1c60fe
diff --git a/sys-boot/udk/udk-2015-r1.ebuild b/sys-boot/udk/udk-2015-r1.ebuild
index fbb8ad18187d..ec568865288f 100644
--- a/sys-boot/udk/udk-2015-r1.ebuild
+++ b/sys-boot/udk/udk-2015-r1.ebuild
@@ -162,7 +162,7 @@ src_install() {
 }
 
 ##
-# Parameters :
+# Parameters:
 # 1 - Path where to search for source files.
 # 2 - Path where source files must be copied.
 copySourceFiles() {
@@ -175,7 +175,7 @@ copySourceFiles() {
 }
 
 ##
-# Parameters :
+# Parameters:
 # 1 - Path of the file to create.
 # 2 - Name of the module.
 # 3 - Path of the generated Makefile.
diff --git a/sys-boot/udk/udk-2018.ebuild b/sys-boot/udk/udk-2018.ebuild
index d89fdb55e27f..66b0fc8e9e9c 100644
--- a/sys-boot/udk/udk-2018.ebuild
+++ b/sys-boot/udk/udk-2018.ebuild
@@ -171,7 +171,7 @@ src_install() {
 }
 
 ##
-# Parameters :
+# Parameters:
 # 1 - Path where to search for source files.
 # 2 - Path where source files must be copied.
 copySourceFiles() {
@@ -184,7 +184,7 @@ copySourceFiles() {
 }
 
 ##
-# Parameters :
+# Parameters:
 # 1 - Path of the file to create.
 # 2 - Name of the module.
 # 3 - Path of the generated Makefile.
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index 585554343c88..eaa356b5578a 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -4,7 +4,7 @@ DIST unetbootin-661-qt5.patch.tar.xz 8060 BLAKE2B 58cb323166e344ecabf5d372e80ff0
 DIST unetbootin-661.tar.gz 16257579 BLAKE2B 2f92cf286c8010a80d4d4cc48a7ece55e159af9f3729277d97eb99ef2ebe8945023d03c51d6e97d7101d8547240e3c2152004222ec4c825ef4ab954c4018e7b0 SHA512 bbf74a4c4ca9b52f4da672eb54524b7fcb796c65ba80700dc3c6f2677bde37574f42a11c213cc4d4eee38783aed650beee1e2894f60185745e509a2e9571f70a
 DIST unetbootin-675-qt5.patch.xz 7636 BLAKE2B f8c475491e6cf0557a192380726376c1dadba2e52478139d42023e867de86c5c1727719fa123fb412dbb20fca5763a3192889618e75ef6d8bba2d20eb1cf9403 SHA512 da636a3f6cd6a45d6786d92e94741d74f6c5de7d74570af45eac08718a822cdef5baac6c62d7ed68a788e9518e050f3a48a46f8f374c07e0b4c0d90c3613185d
 DIST unetbootin-675.tar.gz 23221792 BLAKE2B fb3a6fce9d2a47b83e2e4c1a579d20594a637215b7c6456d6b0a59a592da660b13bdbea52aa5a4f902e410e9d0e2d447d085f040d321029a96b7ff957a59d11e SHA512 7cb5da4a876125ff010fc6a5aab2b5bb6eeec0f1ac6f2dd86efa2c3eaebaedff8c2167f9dc77053936955703cd2a98dd11a84b8de930dcfc1c2b0f6aeaf7ee61
-EBUILD unetbootin-661-r1.ebuild 2156 BLAKE2B f137242cd77cbe6d0befedbf8760bc02b3f6682b5ecaae2ecbbdce8f9cc4a92711cd01fe58c182f4c8dbf1d64ecab211722b43bfade2c1d186296d20fb6a2fa8 SHA512 43c1e45b25e042df1c48d7cf504021c21e16342550cf4ba83ff1de5c0c0466828b5d53deecf8eca4ba4ea22437b7fe057d98b9dcc3efab736cac7aa95c33338d
-EBUILD unetbootin-661.ebuild 2089 BLAKE2B c1ecb3674dd00cb7359f33313c6886c24c38f0e84849cc6d04584f9a3b0e7a8954901f25bf7cb39148e9826cd77133a294610ba8b3d9f2a92eed7ff77c215040 SHA512 7c4c6c7d44bf0bd0c94b42c46d7c0660aabda97c8716f8035babc682b40acf001c5cebe47de8b9dbddde83fdf94fe5f86cf5479a3138ac75ab809f6ba11d610b
-EBUILD unetbootin-675.ebuild 2121 BLAKE2B 9d8de6dcf515e5f144337b8efbb555892bca7cad46a7036132e1777105a51ae7fc96a48fd11f090578a92eb4ae978531acb2ce62d6e29970cc10b510ff99bc91 SHA512 bcc1243f414b2ba8346427080291f5f5e73adb72e1558f750f99580396e2f5d352471ca4375b478b0435634e128dbd43d919deb08e6c30134ed9f5b0d01d8055
+EBUILD unetbootin-661-r1.ebuild 2185 BLAKE2B 048013a97881b0fb844d7808ddd6b5f0385a2fa08fc8fe01a492fac349505b937d05ce3c9e0820b68a29c1316c7bb4e70404083ece737e617d6e301172e2f34e SHA512 520d6905c904b24c5500a07dd1b8d17db44992938c457d63d92128ffd5688aa31deb5d0042c3d50a295268e0a797785f87d7e977a61803ae0e5d3ca970994bd5
+EBUILD unetbootin-661.ebuild 2118 BLAKE2B 92dda9a09b66945b618411acc7b83fc92129a3672ec55dea2b672c6c52f5e20a07c27ed29076c7f10c7cf997cf24cfad46ff8b117a635e55428cb358846efdcd SHA512 e03914dd5bfe2178c998ddb33cf3fca01316f97ebc2be5c5500309b3f2b1d20d6126ea5d9a429d873d74c3ee6eaab2767077779f28deab9eaafd1e9d7e822e35
+EBUILD unetbootin-675.ebuild 2150 BLAKE2B 7f9e2d479ab22b5ac45d84537a15c332a1ae417ac1532d1b64096a33c025f5c2bcd22d444efb07018b2b4fc28a72618f69d83ee057c18108dc60992a6cda56a3 SHA512 ba30611d07e310cb8640ac7923c35962c9619fdceeb89b74e7e603d63a2d2385521a522b68c7a72e737fbc9b841d312eda99ce830fc0ff990c943dd6c40a801b
 MISC metadata.xml 385 BLAKE2B 05836339f25bd812b23c8b93a6f05934a4bfa12d9fdd61f73140131c2d7609a5d1e257ed80c2cd983020720645e5444078cc71f2f51be9a2d435715e38ceea3f SHA512 9676e393ac2d18489433f0e658340a3eec0e01e0b35ca786540b07a6466f0b572f5d5bf115e6dc0b5c4898c00f630b9f5023f62f8e8f3a96c105bc74f918eb21
diff --git a/sys-boot/unetbootin/unetbootin-661-r1.ebuild b/sys-boot/unetbootin/unetbootin-661-r1.ebuild
index 5363afc4eeca..87fb185874e9 100644
--- a/sys-boot/unetbootin/unetbootin-661-r1.ebuild
+++ b/sys-boot/unetbootin/unetbootin-661-r1.ebuild
@@ -8,7 +8,7 @@ inherit desktop flag-o-matic qmake-utils
 
 DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
 HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
 
 SLOT="0"
diff --git a/sys-boot/unetbootin/unetbootin-661.ebuild b/sys-boot/unetbootin/unetbootin-661.ebuild
index 43b50f59cc77..b7c6d4eb4c21 100644
--- a/sys-boot/unetbootin/unetbootin-661.ebuild
+++ b/sys-boot/unetbootin/unetbootin-661.ebuild
@@ -8,7 +8,7 @@ inherit desktop qmake-utils
 
 DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
 HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
 
 SLOT="0"
diff --git a/sys-boot/unetbootin/unetbootin-675.ebuild b/sys-boot/unetbootin/unetbootin-675.ebuild
index cfc39c26a046..dab61c00204f 100644
--- a/sys-boot/unetbootin/unetbootin-675.ebuild
+++ b/sys-boot/unetbootin/unetbootin-675.ebuild
@@ -7,7 +7,7 @@ inherit desktop flag-o-matic qmake-utils
 DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
 HOMEPAGE="https://github.com/unetbootin/unetbootin"
 SRC_URI="
-	${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/unetbootin/unetbootin/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~jer/${P}-qt5.patch.xz
 "
 
diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest
index 636c4fbc4950..3af229588091 100644
--- a/sys-boot/vboot-utils/Manifest
+++ b/sys-boot/vboot-utils/Manifest
@@ -1,6 +1,7 @@
 AUX vboot-utils-72_p20181229-libressl.patch 426 BLAKE2B a67628074549b60e899f20a2589b64ab7dfe90f6476f44c2bb028f0f90b847173eb3e6ea975858a627a257bdaf2121865a7c83cd4d253cbc1d6ad412f0b8e84d SHA512 a78eaa53cc784845a99686025f20f7b10f5d285f4b145fa0e2371b4d242d489a21e91253e7a3b5cee12565c8412224556240acc555b0c9500d5a46b7b1356bb3
-DIST vboot-utils-59_p20170413.tar.xz 18431260 BLAKE2B 73853f92c5855a1fbcad55c696414317f46a06a69901529dd6da19be2abe4ca0337cf20dddc4f84f1d2a99357bb2f01df115b7d16c45f9af62dcd1b833580d46 SHA512 f92b9aed7a52ac7bab49b624725d4963564a22a03741619ad4ef1bc0a1fdee5123c68f3dad5bef9fb033f94f2a9ae99478c16386758fe4667a361bc91dda8048
+AUX vboot-utils-80-musl-fts.patch 428 BLAKE2B b36b902b045906324e0553f6acba4a760d11289d1d68b38bcfd6c4c6531493f0c778fb2539cb5f19604f8705ceee3dcc2b30caab87f2114ee485345d9b0d7d79 SHA512 59a11a87d9cd4596df749c8dfd188f90818c09a432805cfbb47d02cd13228561af345a336bfd502d205a94ca432cff539ba1ea684542e86f13d6dfdea3db0d41
 DIST vboot-utils-72_p20181229.tar.xz 18489004 BLAKE2B 444eb0bc2c571ad79d26d473da724016d6d041207beaae161f6c1155768ff9d0b1c8b7b070b828083cc1396266cc77175a75e8067ce22613c75b4d77780dda75 SHA512 41df034dc5498bcbec0d49a472331ceb2fbc2eb3b4173d5c56e920d65ae485382b3d811e5f2c13cf45a1b05a5d6a24197924fa1c76ada9c3aac14fa3c4c363fe
-EBUILD vboot-utils-59_p20170413.ebuild 1961 BLAKE2B d519504ba8c955b164395dc95b2a0bc275548c97adcefe6c90ef81bd3ebe1ec8554f4fc42d2197227ee140d5c14a3b1f7097034cbdd42f065e756758b881a253 SHA512 90bab2830cab6eb87ccb8e85f1953c6b48c75accfc8c13a46a54fefeba2cd070497fab821b0103a0e4310c42e90bd546d3bb737dbff50a4b225f05d4dccc923e
+DIST vboot-utils-80_p20200108.tar.xz 18448212 BLAKE2B f7e375133fb6dc90def1e22c42c7511a3b649c34d067a447f44fb99c1ec37a73d034837c2212e5d6ad368a4f4b011c8cb9eb479e81db4a52b1160cda99382a77 SHA512 077d137d8fe89f35b6f7ec6408b2e9fc7a28765b0987646c1964e6e0c039e359711ab79958c45ee555a0fe810997217225d072a7f1011b1c73c4aefb4e57fcc1
 EBUILD vboot-utils-72_p20181229-r1.ebuild 2594 BLAKE2B f586492f5f860ddb24715616d788268f7576fd24a4b24e4b13c34cb0e88f28e1c3d1e83c6b2769b7db9b7abfc6e9260155366b44420e4d8acdebf65949e865f0 SHA512 146556fae5811a92a995e58b059f4f0afefd84e979e19d5b0869aac9cfe717966fa984eb19ef1398c149b9861bb6fd1d06f755b04a34b1d211c7fbbd5db8fe6e
-MISC metadata.xml 488 BLAKE2B b3c656e8e93662a5fd2cfb7559ca150c9df50831789447fe1e4aa58b99b205daa70b5bcfc98e1e78e44cf0ef89ef9a6efc8563d31c2d3823aa7c07d1ec4cf3fb SHA512 b9c53eec1a6b1db1274f2baf51915691e36678eb1cc8e6b7cc1596b4912410b86e96175cd6cd614acc044a3b2fbf8ef350ba69daf6741802e926fc3ec2c73914
+EBUILD vboot-utils-80_p20200108.ebuild 2800 BLAKE2B 24e32895f0a84865643a062fd873f535b27ca7ea89d55f7c4cbc3b09730f0eba3127ceddffa89830e0deb638505cfc7c28e59529af8b3ae71be0986b57ffe0d1 SHA512 59ddc28a5c5ba959dcc2a7a0207efadedcadb1ff01db596a67705b66abc0998fe4922a1b94ebebcd178aafc2ba88437ce8a50ed9c810f41bb8a4c3b44c7388e5
+MISC metadata.xml 552 BLAKE2B 972282f45e6ca80d35ee7a4dae2a146140011b712af1ef60cdb35688edb95a44cdf330a5073b0963331955465e5c57be65e43973bd437db94935985a630c3a30 SHA512 d53e7b64d40848c539e95d7a888018ddea177eeeae3d3a3da95ecd6a33c79630215a49159c6b4095475a84ed475c01a7f8d759ad392ee154468ac8deb9cddb54
diff --git a/sys-boot/vboot-utils/files/vboot-utils-80-musl-fts.patch b/sys-boot/vboot-utils/files/vboot-utils-80-musl-fts.patch
new file mode 100644
index 000000000000..bd291f9138e1
--- /dev/null
+++ b/sys-boot/vboot-utils/files/vboot-utils-80-musl-fts.patch
@@ -0,0 +1,17 @@
+--- a/Makefile
++++ b/Makefile
+@@ -231,4 +231,7 @@
+ ifndef HAVE_MUSL
+   CFLAGS += -DHAVE_EXECINFO_H
++# Musl doesn't have fts.h so enable linking to the standalone lib.
++else
++  MUSL_LIBS := -lfts
+ endif
+ 
+@@ -1043,5 +1046,5 @@
+ 
+ # FUTIL_LIBS is shared by FUTIL_BIN and TEST_FUTIL_BINS.
+-FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS}
++FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS} ${MUSL_LIBS}
+ 
+ ${FUTIL_BIN}: LDLIBS += ${FUTIL_LIBS}
diff --git a/sys-boot/vboot-utils/metadata.xml b/sys-boot/vboot-utils/metadata.xml
index 7cf6be5c254f..c4bb35a0e1b7 100644
--- a/sys-boot/vboot-utils/metadata.xml
+++ b/sys-boot/vboot-utils/metadata.xml
@@ -9,4 +9,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
-	</pkgmetadata>
+	<use>
+		<flag name="libzip">Use dev-libs/libzip.</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild b/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
deleted file mode 100644
index 12b8ef351c9f..000000000000
--- a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-# This is the latest commit in the latest branch.
-GIT_SHA1="748af73c67abf473d45bbacd708ce79bfc264ff5"
-
-DESCRIPTION="Chrome OS verified boot tools"
-HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot"
-# Can't use gitiles directly until b/19710536 is fixed.
-#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="libressl minimal static"
-
-LIB_DEPEND="
-	!libressl? ( <dev-libs/openssl-1.1:0=[static-libs(+)] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	sys-apps/util-linux:=[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!minimal? (
-		app-arch/xz-utils:=
-		dev-libs/libyaml:=
-	)"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	app-crypt/trousers"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
-		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
-		Makefile || die
-}
-
-_emake() {
-	local arch=$(tc-arch)
-	emake \
-		V=1 \
-		QEMU_ARCH= \
-		ARCH=${arch} \
-		HOST_ARCH=${arch} \
-		LIBDIR="$(get_libdir)" \
-		DEBUG_FLAGS= \
-		WERROR= \
-		MINIMAL=$(usev minimal) \
-		STATIC=$(usev static) \
-		$(usex elibc_musl HAVE_MUSL=1 "") \
-		"$@"
-}
-
-src_compile() {
-	tc-export CC AR CXX PKG_CONFIG
-	_emake TEST_BINS= all
-}
-
-src_test() {
-	_emake runtests
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-
-	insinto /usr/share/vboot/devkeys
-	doins tests/devkeys/*
-
-	insinto /usr/include/vboot
-	doins host/include/* \
-		firmware/include/gpt.h \
-		firmware/include/tlcl.h \
-		firmware/include/tss_constants.h
-
-	dolib.a build/libvboot_host.a
-
-	dodoc README
-}
diff --git a/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild
new file mode 100644
index 000000000000..41a810546177
--- /dev/null
+++ b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+# Can't use gitiles directly until b/19710536 is fixed.
+# This is the name of the latest release branch.
+#RELEASE="release-R80-12739.B"
+# This is the latest commit in the release-R80-12739.B branch.
+#GIT_SHA1="236bd46bfb59f0262dcb1771a108ebb5e90df578"
+
+DESCRIPTION="Chrome OS verified boot tools"
+HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot"
+# Can't use gitiles directly until b/19710536 is fixed.
+#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/refs/heads/${RELEASE}.tar.gz -> ${P}.tar.gz"
+#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="libressl +libzip minimal static"
+
+LIB_DEPEND="
+	dev-libs/libyaml:=[static-libs(+)]
+	app-arch/xz-utils:=[static-libs(+)]"
+LIB_DEPEND_MINIMAL="
+	elibc_musl? ( sys-libs/fts-standalone:=[static-libs(+)] )
+	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	libzip? ( dev-libs/libzip:=[static-libs(+)] )
+	sys-apps/util-linux:=[static-libs(+)]"
+RDEPEND="!static? (
+		${LIB_DEPEND_MINIMAL//\[static-libs(+)]}
+		!minimal? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	)"
+DEPEND="${RDEPEND}
+	static? (
+		${LIB_DEPEND_MINIMAL}
+		!minimal? ( ${LIB_DEPEND} )
+	)
+	app-crypt/trousers"
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}
+
+PATCHES=(
+	# Bug #687820
+	"${FILESDIR}"/${PN}-80-musl-fts.patch
+)
+
+src_prepare() {
+	default
+
+	# Bug #687008
+	if ! use libzip; then
+		sed -e 's|^\(LIBZIP_VERSION :=\).*|\1|' -i Makefile || die
+	fi
+
+	sed -i \
+		-e 's:${DESTDIR}/\(bin\|include\|${LIBDIR}\|share\):${DESTDIR}/usr/\1:g' \
+		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
+		-e 's:${TEST_INSTALL_DIR}/bin:${TEST_INSTALL_DIR}/usr/bin:' \
+		Makefile || die
+	sed -e 's:^BIN_DIR=${BUILD_DIR}/install_for_test/bin:BIN_DIR=${BUILD_DIR}/install_for_test/usr/bin:' \
+		-i tests/common.sh || die
+}
+
+_emake() {
+	local arch=$(tc-arch)
+	emake \
+		V=1 \
+		QEMU_ARCH= \
+		ARCH=${arch} \
+		HOST_ARCH=${arch} \
+		LIBDIR="$(get_libdir)" \
+		DEBUG_FLAGS= \
+		WERROR= \
+		MINIMAL=$(usev minimal) \
+		STATIC=$(usev static) \
+		$(usex elibc_musl HAVE_MUSL=1 "") \
+		"$@"
+}
+
+src_compile() {
+	tc-export CC AR CXX PKG_CONFIG
+	_emake FUZZ_TEST_BINS= TEST_BINS= all
+}
+
+src_test() {
+	_emake runtests
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install install_dev
+
+	insinto /usr/share/vboot/devkeys
+	doins tests/devkeys/*
+
+	dodoc README
+}