gentoo resync : 25.08.2020

24 files changed, 363 insertions, 345 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index db6ec08dc830..cf8ea1ebc454 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
index 9305d2c1b817..c6502f42027a 100644
--- a/sys-boot/efibootmgr/Manifest
+++ b/sys-boot/efibootmgr/Manifest
@@ -3,5 +3,5 @@ DIST efibootmgr-15.tar.bz2 35476 BLAKE2B 19b7c9ce51f3b930b2d59fa4a594c7a8bf5f1c7
 DIST efibootmgr-16.tar.bz2 36603 BLAKE2B 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232 SHA512 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9
 EBUILD efibootmgr-14.ebuild 601 BLAKE2B 609e08888d571faa2a73414e05e200d9b9b5931b97493c149fa1343f463aeb17a0eed1312feabceb56e535000ad0b24c8cd2281c24454084d4006323449bf8c1 SHA512 e93d46d6d3e6a2fab2b1652af0a667003381c2d21f56aee3fddeadf79d9f76078531548ddeec9200f210a0d36b8659bbd41a3f20b5eccb32f26e1435162b8144
 EBUILD efibootmgr-15.ebuild 625 BLAKE2B 7c98f668fc581ab2a44a262ff289ef2c22fd47d951d3f2840a647a74db0e6808e5defdb8dc106a60cbfa30592a5b07ffdac2ee2fbb70ce3485123465bc797b95 SHA512 08e0ab714b313a627a8189640d8266a1e97bb4f9186352ef9644edb9c9ab42675b38528fca6d4c7184344d3ac488feee06d6baf81e5ec59bac9bd482eca4fdec
-EBUILD efibootmgr-16.ebuild 687 BLAKE2B 34b54bc225710ca6e0f4015ef88fae5486f01747b041ad2e690e045d16f0bf1783d26ffcec998482b6b86947d36b748122f9ad3ae82b4771d9bc1b710b182e31 SHA512 10119453c6942cabb742cd8990619bad95910862f8aacedaf024f72d57d2747a712a8e23797a8cc8189fe81cb1615b05e17b985d271bbe833360ce237f6002ed
+EBUILD efibootmgr-16.ebuild 686 BLAKE2B bfdbed885980cc66d809478e30ee12b70dc6f29dcdf23b1ee7b13781a2e50e1c5ef180c855f49e200d4baf32d8745a364c875054aeb247dc38ef4e5d7460bf08 SHA512 eee2b40b3d2958856c73c479b51c826a5040635282403a0d06e9fd53d873687fae633aa6eda8b23d69b609d255a2f6434d3060c760362a5f489a8dce6be9133a
 MISC metadata.xml 626 BLAKE2B d426af2d479b07fa3d8e482b5d1b84bd242f5da9399ab9cd2d2512d2192f815ccb099ca7c8d3ee91c8c87e1715c9649deaa565aa6ec025c26b518e778d84989e SHA512 d52646244bf9c0d10d8c5b986e110944905fc8f898c0330f65cd6c734e6d8cfabf72854cef362f411d3d63fed3f5e22207a7b94d1ea8076e566d8eff228bb33b
diff --git a/sys-boot/efibootmgr/efibootmgr-16.ebuild b/sys-boot/efibootmgr/efibootmgr-16.ebuild
index 70350fc76a42..35c97346021d 100644
--- a/sys-boot/efibootmgr/efibootmgr-16.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-16.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 x86"
 IUSE=""
 
 RDEPEND="sys-apps/pciutils
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 463f9473f5de..b9f490e4537c 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.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
 DIST grub-2.05_alpha20200310.tar.xz 6671372 BLAKE2B 2b9006fe486bb3195f34a3e5d34eaa923e1f295fbb7b815b0adf70ca3000531ff0c250c300f21103cf24144f9e51b96cefc860b7a46c6e31b96d4566db08b027 SHA512 7ddcb7524a4fa60754e3053aae4b033b17ffd740f220d3cbc1e25167ce823c42b1795b4767dabb8920027134769de8cacdafc9a6fe26b4d242590809e3db8725
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
-EBUILD grub-2.04-r1.ebuild 7462 BLAKE2B 3cac2d676797195b6137aded3714e118487f88df9b976e171a8861204f3987bfc442ae4183063530355fcc8e282a08527fb8066e1666d5e52b680b2061ca57b9 SHA512 0c106c54f3888431624065f81de688319d47f17f10776879a36e45db567310cfe5d6eb84f0007dd0b50ecc9c8fe2c5c79bebc1689394e99139d0e1cb91b2ff4b
+EBUILD grub-2.04-r1.ebuild 7461 BLAKE2B 17ab50383a681e20f0c1ebf5fdaf491897fb25559166d864c5a0260184f0b8c5297801adf735a6c71ab73ffd4710d9d17fb5ead8c09c536eed602849ab36c65b SHA512 c70b6d0deb4bcacf57ab75c19a63dcf58e9b7053e8ff484f74022a3d51de7168bdde4ec6d948095de0b4fa9c46df74869a2fc5ae497aacba32ae8c997ed4f870
 EBUILD grub-2.05_alpha20200310.ebuild 7178 BLAKE2B e555000e0b98b4c4ed65971a6a3c49a339744e670ed197d5493e4dd7fc2a52e98652fff6eab966846d9ab7acec06db8f2e0d4ec021a8bc089a11ada2bc7a41e9 SHA512 454acb11ba60e70963d6885a11be6f3efa63903f44aa544fc029a49330f98a3b2588d99e8d75592156f2d453ad405af2ba8381e34927c9c8d9f9178aab400f83
 EBUILD grub-9999.ebuild 7429 BLAKE2B 610d8eed56c69123119e099cf7062e0f7fdc27ade501e8da2615b2acaa7b52ee874516f1b88c7b24bd84a6562a4222d00c062064acaf2e6f2bb051ed3d5d679b SHA512 9cc7d47c48fcafe1df71b71bbdb190633088f1a69605fb51e804b2b923b1fc843e2858cfcee1d3d75906efaeaa1b45364443014f30db44fc6eaa033ddeea0b49
 MISC metadata.xml 1035 BLAKE2B 26f1d398985bf80ab12d21e474ba68e8d1cc17e9305e73a8d44d9c271be207751796b356406f92482c784a1bd4b0e07dce8022bce8271ed69eae7e5e696c3cc5 SHA512 24c775f600ff34b8b55d84841852bbc63bfb799fe1320ba55c5f06fd5199b53d8801eadc09f3afebfb86c533b79737831c3af04c0898cce5ef0ddebe4d12ba0b
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 5d09c7bf0cff..ef4bd3028b86 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -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"
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index d776acca54ef..17125fee6965 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,5 +1,6 @@
 AUX lilo-24.0-novga.patch 497 BLAKE2B 429d139b87d1dc581533c09ad6562d42323ac46663198836b0c8339cb99ce5e7442560a15abd089e995a55afdb2ea07c83e3583b7968ceb206acf6736e4574d5 SHA512 f09dbca336c6117592ec24e972c393941ae336f01a03449a455b9694e7e7c62fe24cd9fabab96380c91472fc701633a0ca41277180b73525e92cadbb71459d45
 AUX lilo-24.1-novga.patch 500 BLAKE2B a5ba2f06791812fd7dcafe0882218e6d3884db228f5866604f903972e6914cfdab8379e18eb18f399174581eb72775fda05f1a61df699d39f60564b9a2e337a6 SHA512 067a741086b6df6b5f728ffde3cac949dd9b59cdc11ac1b022f240b69c4a8ef883f5623cc610becd4648f02ad3a243a0d6a939aa8d8c63d9b0158426e6b6f300
+AUX lilo-24.2-add-nvme-support.patch 2779 BLAKE2B 0344624148e31dd9cd99e08f33e777e3a30f2bfc8321fe163a43329ae8c78e96fdb9a6a062648f06705919f89fd754a69a8cf6a2254d95bf7c5c6c78b9a3948e SHA512 14263591673f7486438416cb394f361593bd94da35fac643ae7938a241634aed41582532dcc7c3854c314c5bc68614d61c8099e12affe27c77a8a9a7473352bd
 AUX lilo.conf 1613 BLAKE2B 746e05ed4a38f553d8534087d3889e3c136531752aa39f5de9404e58dcd520925f369a4300e9d16ba779b9cef0ae0ecfdde9221f064f42e6a5c812ee7effbbaf SHA512 be59f5b97cbf8eda744e8a7a281526b3262c80af7d3c61e5476697e1569e6e419c4055a8e7deaa4f65688769d941466043af81e159367bf893a88b77eb3732d5
 DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936
 DIST lilo-24.0.tar.gz 768631 BLAKE2B 09f6520e16a90eab5f44af440f1e2c2d05abb56e954dbb0237700d8e99f017bab279fa8a5c535114ec58be7416123ea51e91311255ed3036199f3565eec5a3f7 SHA512 4158a0f7ab085da063938df2bc77356f9536aa78208a902561f9e61ec478fb17f204f68407f6809638aea9d2e0c88ffc701548291c1635ab40f5b18a7be6bae7
@@ -7,5 +8,5 @@ DIST lilo-24.1.tar.gz 773223 BLAKE2B ceaeaf6696b7b15d95cc6c90c6de63ad731f4d0f6d9
 DIST lilo-24.2.tar.gz 777400 BLAKE2B 71c74235d5df10eed65b67dc1ce2af21163651c752d799da419077025304abf9352535a70f3fb60d086609d8a1c25bf394e29453c338ab022cb2be3cb21af75f SHA512 4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54
 EBUILD lilo-24.0-r1.ebuild 3921 BLAKE2B 56587aa63fe2a54d3db921fd752da3763ef1d82fbf83929059a1bc0fae713f47175c9ba08a5397dad82bc7f4dd26e3a9f3fb013ae37a3a6212fda7f254116427 SHA512 a62668152070bc9a3cf8057766ec1c5f258beca54cd8a689f12f51958e803664970864049fa36fb1faef65e57400fd826500217635bdf541277c62013f91e66c
 EBUILD lilo-24.1.ebuild 4074 BLAKE2B 9b07d907188b47766df49dbac63d80ebff53ac28d551a03fd5b3e398fbcb47a45620f8fa2cb4001e04ca9469b808db7958cb1374b61cc0435931749993e92430 SHA512 04f1506462d1b697dcd4ede9a97e5278d1f96016d6dbc0b49f6eca140bee3758214e4eb5fcf9591ef7e37a9e5376d8a205660295a2ab3c922ce2495f425fbecb
-EBUILD lilo-24.2.ebuild 4080 BLAKE2B cbbac2b63a8574762ed9345c254da1e6d205da2ac54bcf846864ac607cb7a128dedc5036b734ed728ecf5a865b45ef9574c4d4e39b159af84d74671d84d87340 SHA512 0d6f17e3d961f0153cb12fce51395f2a6ff735d584e16d02a688fb3a7e204839e3fc1736ae8ea6c484cbbfe81f7cd082b722e07a0574ea7907d5d145047a74eb
+EBUILD lilo-24.2.ebuild 4144 BLAKE2B 67e67f4cd33f533d41d3f96b4fd24c8cf4adb257ac26207b11ae2927f752d1f1705d65885f47366ff69fa6f8b137bb8f91ecf6a2559b372634d938830a8cfc46 SHA512 5c5694bb6cabca07dce75f753e607398ac4dbed9ed966f36a3ee68eb6accee8ec236896a6cb1174ada8cd701ad495a76ca7bb51094c972b052939a16aa401b4f
 MISC metadata.xml 582 BLAKE2B 3eff61a72e8828178013f444fafad385ca14c91d9a9a989646b5b1a9a1485598b537c2bf7f49b6d7301e45f7266e1dc866c0c3fffe74843a0d44ce94fa982825 SHA512 e9c7e5bcd88fab10e756ab7e22a949d1eaa9552cfad60891ca3f47d92fb3487ec74baee67539fabf9db2c15b225ab40050ff5e3ef1d7f858723bf8ae1b80fa04
diff --git a/sys-boot/lilo/files/lilo-24.2-add-nvme-support.patch b/sys-boot/lilo/files/lilo-24.2-add-nvme-support.patch
new file mode 100644
index 000000000000..b4d54ec9bc95
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-24.2-add-nvme-support.patch
@@ -0,0 +1,70 @@
+diff -Naurp lilo-24.2.orig/src/common.h lilo-24.2/src/common.h
+--- lilo-24.2.orig/src/common.h	2015-11-21 18:50:23.000000000 -0500
++++ lilo-24.2/src/common.h	2020-07-30 23:20:05.611122665 -0400
+@@ -386,7 +386,7 @@ extern char *config_file;
+ extern FILE *errstd;
+ extern FILE *pp_fd;
+ extern char *identify;	/* in identify.c */
+-extern int dm_major_list[16];
++extern int dm_major_list[32];
+ extern int dm_major_nr;
+ 
+ #define crc(a,b) (~crc32((a),(b),CRC_POLY1))
+diff -Naurp lilo-24.2.orig/src/geometry.c lilo-24.2/src/geometry.c
+--- lilo-24.2.orig/src/geometry.c	2015-11-21 18:50:18.000000000 -0500
++++ lilo-24.2/src/geometry.c	2020-07-30 23:20:05.611122665 -0400
+@@ -84,8 +84,9 @@ DM_TABLE *dmtab = NULL;
+ int dm_version_nr = 0;
+ #endif
+ 
+-int dm_major_list[16];
++int dm_major_list[32]; /* increased from 16 to allow for nvme disks  */
+ int dm_major_nr;
++int nvme_pr = 0; /* set to none zero after geo_init if nvme disk present */
+ 
+ #ifdef LCF_LVM
+ struct lv_bmap {
+@@ -200,6 +201,9 @@ void geo_init(char *name)
+ 
+     while(fgets(line, (sizeof line)-1, file)) {
+ 	if (sscanf(line, "%d %31s\n", &major, major_name) != 2) continue;
++	if (strcmp(major_name, "nvme") !=0) {  /* set if nvme drive is present */
++		nvme_pr=-1;
++	}
+ 	if (strcmp(major_name, "device-mapper") != 0) continue;
+ 	dm_major_list[dm_major_nr] = major;
+ 	if (verbose >= 3) {
+@@ -708,6 +712,22 @@ void geo_query_dev(GEOMETRY *geo,int dev
+ 	    geo->start = hdprm.start;
+ 	    break;
+ 	case MAJOR_SATA1:
++	    /* check for nvme device and assume boot/this device is nvme if present */
++	    if (nvme_pr != 0) {
++	    geo->device = 0x80 + last_dev(MAJOR_IDE,64) + (MINOR(device) >> 4);
++	    if (!get_all) break;
++	    if (ioctl(fd,HDIO_GETGEO,&hdprm) < 0)
++		die("geo_query_dev HDIO_GETGEO (dev 0x%04x): %s",device,
++		  strerror(errno));
++	    if (all && !hdprm.sectors)
++		die("HDIO_REQ not supported for your NVME controller. Please "
++		  "use a DISK section");
++	    geo->heads = hdprm.heads;
++	    geo->cylinders = hdprm.cylinders;
++	    geo->sectors = hdprm.sectors;
++	    geo->start = hdprm.start;
++	    break;
++    	}
+ 	case MAJOR_SATA2:
+ 		printf("WARNING: SATA partition in the high region (>15):\n");
+ 		printf("LILO needs the kernel in one of the first 15 SATA partitions. If \n");
+diff -Naurp lilo-24.2.orig/src/lilo.h lilo-24.2/src/lilo.h
+--- lilo-24.2.orig/src/lilo.h	2015-11-21 18:50:20.000000000 -0500
++++ lilo-24.2/src/lilo.h	2020-07-30 23:20:05.611122665 -0400
+@@ -245,6 +245,7 @@
+ 
+ /* high partitions (>15) on SATA hard disks */
+ #define MAJOR_SATA1    259    /* high SATA disk partitions (Block Extended Major) */
++                              /* also used by kernel for nvme disks */
+ #define MAJOR_SATA2    260    /* high SATA disk partitions (Block Extended Major) (obsolete) */
+ 
+ 
diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild
index c84d6257d959..73f9ea6efbb4 100644
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -25,10 +25,14 @@ DEPEND=">=sys-devel/bin86-0.15.5"
 RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
 
 src_prepare() {
+	default
+
 	# this patch is needed when booting PXE and the device you're using
 	# emulates vga console via serial console.
 	# IE..  B.B.o.o.o.o.t.t.i.i.n.n.g.g....l.l.i.i.n.n.u.u.x.x and stair stepping.
-	use pxeserial && epatch "${FILESDIR}/${PN}-24.1-novga.patch"
+	use pxeserial && eapply "${FILESDIR}/${PN}-24.1-novga.patch"
+
+	eapply "${FILESDIR}/${PN}-24.2-add-nvme-support.patch"
 
 	# Do not strip and have parallel make
 	# FIXME: images/Makefile does weird stuff
diff --git a/sys-boot/makebootfat/Manifest b/sys-boot/makebootfat/Manifest
index de344d92bb31..2ce0b2989559 100644
--- a/sys-boot/makebootfat/Manifest
+++ b/sys-boot/makebootfat/Manifest
@@ -1,3 +1,3 @@
 DIST makebootfat-1.4.tar.gz 146722 BLAKE2B 00ad12565951691df2e7af90ae1777c6c6e2253efc61350046cc3ece3342054267f8bdf7ec2303ee203f7af757e7bbda7843104480fb4529eeed2a33456b7f22 SHA512 638356c951670187960d0050d963116391d4b494bc9b082b3d4673188450e47f22fda5733aa09b15cfbb1640807676f5f8743dd094b9931f150b445eb8d335dd
 EBUILD makebootfat-1.4.ebuild 536 BLAKE2B cdd0a16625a64b5a2d8213e0783bc7a2e63b3827e5d48758793274fa9afbffb27f2598dab3b1d4b83bde8e5ac80be46164c0c97d713888addc4bf1ede23dd93d SHA512 e3c409ca46c7febd2c482a185bea18d20a76978cc9e229852856fdb472f3777fcfd75d027252cb6742ace98bf65255221f81ddfe21290090a2756342289dedd2
-MISC metadata.xml 296 BLAKE2B f3d58cc444c8e92f74b67e0c1041639bdebb1dde6ed34665eeee96ddd2428e6d7631b974c9643b514f914d55fb4464bf1dba9117697fc2df9d4863168fc3ba74 SHA512 da7799c8fc7fa55a87627c32493dedaedef72d7d3e3fa2bc4eb7eff936c07774653b90c9a47602efabb7d8f9956ce0baed6bc2bb6879058b9326599fa58fbd11
+MISC metadata.xml 248 BLAKE2B 69fbfe54de525ccd3b40dfca6ea21665ceca95da46d14570696015da9213e5ae7bb10c504364b9965dc5de31c2fffdb34b86442d1a6bb0d58888a37b28a38f2c SHA512 a69ac7d50cbde9aab3181a45cef4007afc6b87f013c5d66bca8f6dbcdf271276faf9ad28bfa076da052c20685b8aa94ebe06983abe4eb04542e1c2611fc107f0
diff --git a/sys-boot/makebootfat/metadata.xml b/sys-boot/makebootfat/metadata.xml
index 49d6fc17b308..c42a18a4e740 100644
--- a/sys-boot/makebootfat/metadata.xml
+++ b/sys-boot/makebootfat/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jlec@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">advancemame</remote-id>
 	</upstream>
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index c9d5c60834ca..98024b3b158b 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -2,8 +2,10 @@ AUX 0.9.3-glibc-sysmacros.patch 1170 BLAKE2B cf3b927b3a53c419bcee9fc652346fc8e58
 DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c
 DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992872813a9f937211930f653207d77c1a331cb093156af5ec9502a04cf1f9e4123c42e07931eaf270fefedcc03700 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed
 DIST plymouth-0.9.4.tar.xz 1103496 BLAKE2B abad2cefb89e9d17b77113396d7203090544759b3dd7f73f67153d9f126db28e5366d36aa11e2335566bf4046bebd50d8d9dd47c75634446fb3a0314cd458925 SHA512 83eb2de7e6d0980e9f7fa4e0b0f20c46a8238051d84bc38dbbb5dfa438e41c1a39846dcd652374256d9f1fe79967b154a3576cd9c433ef816b6c962be2d31e93
+DIST plymouth-0.9.5.tar.xz 1186200 BLAKE2B 8fd073703773fcf7f3e26454c860f094fb4b3d712c56c9df6716ef11815a79f7d5b078ab6c6567b76421026d84a086f95865bf9f3e4ae6363cb1ffc2caa68537 SHA512 686220e8d5b1a8be298156786d979d0e3fb9e010b930d0e8082a2bb152cf07c1bf493d820c243838a1771ee859dc0b4723bd9f10ee434a94a096ce9236c36ce9
 EBUILD plymouth-0.9.3-r1.ebuild 2584 BLAKE2B 3cb69af929b16a148d9b96e3554419362469ec4626040568f7cb9be53276969bcf6977d0befd5898c42281e058c975dd193779a22c37f9b28e73aaff13524a80 SHA512 d60fb9c37007bd94a209b9e06ce34447807ea7602da19922005628ce362ec9cafe11974ac68cdeab443fc13cd2f0436fdb444f4ba14882727771b95c66cf1c5e
 EBUILD plymouth-0.9.3-r2.ebuild 2686 BLAKE2B 4991ce88676c102ff2bd5062a5d59184e9bb53b5db22dda2f22c5138627663a2f1c107af549de7abcc935be0d19e2b15a56234a15315f3deb1464c6a1ecda9f5 SHA512 8232ace285011d537cd876df0cd343deb42ba1924811ad808cdb39b1ef3d5e8caaac70c0b91859d909e3306ab3a5e6296b84b13413028e136c6eea8f13da4608
 EBUILD plymouth-0.9.4-r1.ebuild 2772 BLAKE2B d390aaa44d5720b80737ae37c9261397b3e00c721c56dd8a0a7a34d8936fa6b8f6283391155eea7158e67f3ac6de74056e40767f65932bfa7b7c3bc920f06616 SHA512 4d51fb929b95f4622598788705421ba9485b5692b3e134338e718bca1a0bceadceaddc90187e7ad4b53bd443372a1a43773d3d4c07df0c8f2d8cf8a655e3b2f8
-EBUILD plymouth-9999.ebuild 2726 BLAKE2B e0c136d41da63a030b7b7ea035b7753f3f193f7bc6eb9a70fa7518b8950f565618fce58d49c3cf405a64981b6a8f881204597ed6cf2e9404c90da1278845b1b8 SHA512 1e3dee3116536e25a6207ac038c8358405de5b4d5d4708e58ad25fcdf7ac3332ae2de96b140e650196a02ed60a664ed1113d80f6623883b480577fe3f2013bbd
+EBUILD plymouth-0.9.5-r1.ebuild 2837 BLAKE2B a6607170248b7b42f24c3f82778bb898f13e116cd1ed9896f9abefb10151253d2afbe63fe95103891df2d30630ffedec70188c393919d25f7b2b9b0d78c3c52f SHA512 d115f41219826100e19bb720ff16f26a181424c2049a60ce3d5107d490696cf77d2369f6cc63690564693a46cb61f03242ab65bb8b20138b28506530c0fc0e4d
+EBUILD plymouth-9999.ebuild 2842 BLAKE2B 5532186751dcab43af99688bda02adeb52b830823aa5cfc4120f86f0e7af0cab0407a78533a6ead3cd4b10e5be623de8a8d03eebd6734028743f3262b3edcf6f SHA512 c64d05ed58031b10558feaed13c201e298ff48bf88c8e594dddd6c4f47dc89278631a55ab4976ec8dd4926f7ad10193cdf77d4868c173125251fedd536061f15
 MISC metadata.xml 1135 BLAKE2B c2fe402798b480f8fcb790884bff76881768eb90b0ae74ef529a3a7850665f6912642b1079598c60d2010af79a77b4372f1608a71e81f08e0fa9ded75c1c37a7 SHA512 51c1ffb9a1dd25f5c2085fd4a5fa43dc9af3b10470411e4c15e7653df32f09db6b2f64795bbf0760c60206e82e2db396d05f04bc5dd92bbe945647902787b673
diff --git a/sys-boot/plymouth/plymouth-0.9.5-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..ad4cf8fc65e5
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/plymouth/plymouth"
+else
+	SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+fi
+
+inherit autotools readme.gentoo-r1 systemd toolchain-funcs
+
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +gtk +libkms +pango +split-usr static-libs +udev"
+
+CDEPEND="
+	>=media-libs/libpng-1.2.16:=
+	gtk? (
+		dev-libs/glib:2
+		>=x11-libs/gtk+-3.14:3
+		x11-libs/cairo
+	)
+	libkms? ( x11-libs/libdrm[libkms] )
+	pango? ( >=x11-libs/pango-1.21 )
+"
+DEPEND="${CDEPEND}
+	elibc_musl? ( sys-libs/rpmatch-standalone )
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+# Block due bug #383067
+RDEPEND="${CDEPEND}
+	udev? ( virtual/udev )
+	!<sys-kernel/dracut-0.37-r3
+"
+
+DOC_CONTENTS="
+	Follow the following instructions to set up Plymouth:\n
+	https://wiki.gentoo.org/wiki/Plymouth#Configuration
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.9.3-glibc-sysmacros.patch
+)
+
+src_prepare() {
+	use elibc_musl && append-ldflags -lrpmatch
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--with-system-root-install=no
+		--localstatedir=/var
+		--without-rhgb-compat-link
+		--enable-documentation
+		--enable-systemd-integration
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable !static-libs shared)
+		$(use_enable static-libs static)
+		$(use_enable debug tracing)
+		$(use_enable gtk gtk)
+		$(use_enable libkms drm)
+		$(use_enable pango)
+		$(use_with udev)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/plymouth
+	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
+
+	if use split-usr ; then
+		# Install compatibility symlinks as some rdeps hardcode the paths
+		dosym ../usr/bin/plymouth /bin/plymouth
+		dosym ../usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
+		dosym ../usr/sbin/plymouthd /sbin/plymouthd
+	fi
+
+	readme.gentoo_create_doc
+
+	# looks like make install create /var/run/plymouth
+	# this is not needed for systemd, same should hold for openrc
+	# so remove
+	rm -rf "${D}"/var/run
+
+	# fix broken symlink
+	dosym ../../bizcom.png /usr/share/plymouth/themes/spinfinity/header-image.png
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
+		ewarn "If you want initramfs builder with plymouth support, please emerge"
+		ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]."
+	fi
+}
diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild
index f833e4ef1b55..3c47d67a881e 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-9999.ebuild
@@ -8,10 +8,10 @@ SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/plymouth/plymouth"
 else
 	SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit autotools readme.gentoo-r1 systemd toolchain-funcs
@@ -21,7 +21,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug gdm +gtk +libkms +pango static-libs +udev"
+IUSE="debug +gtk +libkms +pango +split-usr static-libs +udev"
 
 CDEPEND="
 	>=media-libs/libpng-1.2.16:=
@@ -74,7 +74,6 @@ src_configure() {
 		$(use_enable gtk gtk)
 		$(use_enable libkms drm)
 		$(use_enable pango)
-		$(use_enable gdm gdm-transition)
 		$(use_with udev)
 	)
 	econf "${myconf[@]}"
@@ -86,10 +85,12 @@ src_install() {
 	insinto /usr/share/plymouth
 	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
 
-	# Install compatibility symlinks as some rdeps hardcode the paths
-	dosym ../usr/bin/plymouth /bin/plymouth
-	dosym ..../usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
-	dosym ../usr/sbin/plymouthd /sbin/plymouthd
+	if use split-usr ; then
+		# Install compatibility symlinks as some rdeps hardcode the paths
+		dosym ../usr/bin/plymouth /bin/plymouth
+		dosym ../usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
+		dosym ../usr/sbin/plymouthd /sbin/plymouthd
+	fi
 
 	readme.gentoo_create_doc
 
@@ -97,6 +98,9 @@ src_install() {
 	# this is not needed for systemd, same should hold for openrc
 	# so remove
 	rm -rf "${D}"/var/run
+
+	# fix broken symlink
+	dosym ../../bizcom.png /usr/share/plymouth/themes/spinfinity/header-image.png
 }
 
 pkg_postinst() {
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index ed3fba7d669e..76758d3de417 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -8,4 +8,4 @@ EBUILD raspberrypi-firmware-1.20190215.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896
 EBUILD raspberrypi-firmware-1.20190709.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce
 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
+MISC metadata.xml 324 BLAKE2B 89413ad14dfe3013cc5fe46bdfb743b947f1385e39dd2504b55d4a6c671fc4a006a721f8e810636275c5d5b4f26a259dd57ea0d1dc46a0db7c8c2e6bfb792efa SHA512 d50c8ad607a73dea23813309dcefb33ea5120771a5db38780ca946350a4de2c93d3a61ef7482479f1065de9de0158597683032d0fbdfa18286e0b4f0bffcce2d
diff --git a/sys-boot/raspberrypi-firmware/metadata.xml b/sys-boot/raspberrypi-firmware/metadata.xml
index faba5c3daf1e..729e6b371508 100644
--- a/sys-boot/raspberrypi-firmware/metadata.xml
+++ b/sys-boot/raspberrypi-firmware/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">raspberrypi/firmware</remote-id>
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 5a27edd35a11..375213d9846d 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -2,5 +2,6 @@ AUX makefile.patch 856 BLAKE2B d4de5c95330577bf2a25b8c50aa3193c3b57ce740abe12bc3
 DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 7219eeffffb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db SHA512 529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1
 DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3 SHA512 3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729
 EBUILD refind-0.11.4.ebuild 4746 BLAKE2B 9870720301e1697a91d1380832e1b0205de95e8aa1ad56de1022f17dd1b88e8c9d064f4344abc7b518d0dd0a5c662dfe4ea21cfca6f6cf4e941f6d5fee21ce85 SHA512 137a9af7e7727b2bbc40649ce7d2223f5db62e2b5c8817cb7982ca1dd0e67aa98edb250565cef65bd6bebcf79885b1d66d8a6931e6536f9561dc621b3b4c8f59
+EBUILD refind-0.12.0-r1.ebuild 3643 BLAKE2B 570720144d6ca0432ea5ae74d63dd86a5e88c7c2b39f84329f673ddf82b611333dae41c97cbf1339d3bd21db9afea3e1817ce9d7848d516db24b561da2681d1e SHA512 8ac04cfda4a7b000d059546ed6fa20432c86b0a168c5783eb4ad30b3b1994d91a35cc59550edc38922916e794de31bfde0546938de2408820f9633731dd8a785
 EBUILD refind-0.12.0.ebuild 4732 BLAKE2B 501398cee52099f0a727f30866c6d890a848b8bb5f83df9db637b3b90ce40deb141b803fefaca176cb1bb731cfd00b8eeaf5bbc8a2f24c0e7e1b14244e894393 SHA512 d9339513227603715ea47ad4521722b10411c2b0243003410cf018093c222be4cf347b82c1b4a963429eb05485a444e37852f6dc52647d7277174d6be08ed8cb
 MISC metadata.xml 3821 BLAKE2B dd2985fd4728180562a6c11969c27e1d1af70e80e3c68aa4fe7ce7665b752c6aa4adb6fce27487dd97563821b13f2e97e746b6b6e0c346a212380b9c1b231de4 SHA512 e0a5ebc2757e7584afb0628b5f451458974f8ffc1c94774b0ba0eda67ba582fabe08cf8d17fce2df934bba5bded40605f665da0a236d08a53f19b422afae9336
diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild b/sys-boot/refind/refind-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..b595a111e7e0
--- /dev/null
+++ b/sys-boot/refind/refind-0.12.0-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="The UEFI Boot Manager by Rod Smith"
+HOMEPAGE="https://www.rodsbooks.com/refind/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
+IUSE="${FS_USE} custom-cflags doc"
+
+DEPEND=">=sys-boot/gnu-efi-3.0.2"
+
+DOCS=(README.txt)
+PATCHES=("${FILESDIR}/makefile.patch")
+
+pkg_pretend() {
+	if use custom-cflags; then
+		ewarn
+		ewarn "You have enabled building with USE=custom-cflags. Be aware that"
+		ewarn "using this can result in EFI binaries that fail to run and may"
+		ewarn "fail to build at all. This is strongly advised against by upstream."
+		ewarn
+		ewarn "See https://bugs.gentoo.org/598587#c3 for more information"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use x86; then
+		export EFIARCH=ia32
+		export BUILDARCH=ia32
+	elif use amd64; then
+		export EFIARCH=x64
+		export BUILDARCH=x86_64
+	fi
+}
+
+src_prepare() {
+	default
+
+	# bug 598647 - PIE not supported
+	sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
+}
+
+src_compile() {
+	# Update fs targets depending on uses
+	local fs fs_names=()
+	for fs in ${FS_USE}; do
+		fs=${fs#+}
+		if use "${fs}"; then
+			fs_names+=(${fs})
+		fi
+	done
+	fs_names=("${fs_names[@]/%/_gnuefi}")
+
+	# Prepare flags
+	local make_flags=(
+		ARCH="${BUILDARCH}"
+		CC="$(tc-getCC)"
+		AS="$(tc-getAS)"
+		LD="$(tc-getLD)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		GNUEFILIB="/usr/$(get_libdir)"
+		EFILIB="/usr/$(get_libdir)"
+		EFICRT0="/usr/$(get_libdir)"
+		EDK2BASE="${UDK_WORKSPACE}"
+		EDK2_DRIVER_BASENAMES="${fs_names[@]}"
+		FILESYSTEMS="${fs_names[@]}"
+		FILESYSTEMS_GNUEFI="${fs_names[@]}"
+	)
+	if use custom-cflags; then
+		make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
+	fi
+
+	emake "${make_flags[@]}" all_gnuefi
+}
+
+src_install() {
+	exeinto "/usr/lib/${PN}"
+	doexe refind-install
+	dosym "../lib/${PN}/refind-install" "/usr/sbin/refind-install"
+
+	if use doc; then
+		doman "docs/man/"*
+		DOCS+=(NEWS.txt docs/refind docs/Styles)
+	fi
+	einstalldocs
+
+	insinto "/usr/lib/${PN}/refind"
+	doins "refind/refind_${EFIARCH}.efi"
+	doins "refind.conf-sample"
+	doins -r images icons fonts banners
+
+	if [[ -d "drivers_${EFIARCH}" ]]; then
+		doins -r "drivers_${EFIARCH}"
+	fi
+
+	insinto "/usr/lib/${PN}/refind/tools_${EFIARCH}"
+	doins "gptsync/gptsync_${EFIARCH}.efi"
+
+	insinto "/etc/refind.d"
+	doins -r "keys"
+
+	dosbin "mkrlconf"
+	dosbin "mvrefind"
+	dosbin "refind-mkdefault"
+}
+
+pkg_postinst() {
+	elog "rEFInd has been built and installed into ${EROOT}/usr/lib/${PN}"
+	elog "You will need to use the command 'refind-install' to install"
+	elog "the binaries into your EFI System Partition"
+	elog ""
+	elog "refind-install requires additional packages to be fully functional:"
+	elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
+	elog " sys-boot/efibootmgr for writing to NVRAM"
+	elog " sys-apps/gptfdisk for ESP management"
+	elog ""
+	elog "refind-mkdefault requires >=dev-lang/python-3"
+	elog ""
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A sample configuration can be found at"
+		elog "${EROOT}/usr/lib/${PN}/refind/refind.conf-sample"
+	else
+		if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then
+			ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted"
+			ewarn "to manage ESP"
+			ewarn ""
+		fi
+		ewarn "Note that this installation will not update any EFI binaries"
+		ewarn "on your EFI System Partition - this needs to be done manually"
+	fi
+}
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 4c83fdecb7ac..bb49b83155cd 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,13 +1,7 @@
-AUX syslinux-4.05-nopie.patch 519 BLAKE2B 9ffea4b38c2f6de65883b256d83b270a4f3e3642827e4de9b711d396a1f3d386f9d894802cf22fcc7c64e8f3528ebfcb252e5db47f4bea586fcb4e110eb581ef SHA512 75160574c024bd841cd5e098d81f89c8532153cfd98beb17ca1549e0bdd7106d6494e8436e56560d3e501318fd8109b5f5765d244dcdfcbfc5306d35f9cbb4a8
 AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e8a7f98cb6907f4f2c0902f4cc7342b6053368ddf17331eac888714e795299c155a4078668a3ed0e35d435a8cb241d3 SHA512 8659e82e5a5402633c807c8a8f99b25fd6e3066fd0838a7e984452e2ebeccc0331481c93101f00a698e573cadcd98966ea216e4f2d9873e6893af817998e2549
 AUX syslinux-6.04_pre1-fcommon.patch 2111 BLAKE2B 6b0d047cc729e7e9c9658ccd6ecd1166eb1ff2be569132f94b0d2bdc71eb9412a05bf23aa287626949a6ea376b2a8d02877d72182d4ea50d54e445df9c38ac81 SHA512 50c58bc44c77a5a68910cd40370f4259afd1392fe8e1b5c6ac25f7e610d994ebc8d17434eb8d3f832a14f098e16b5b597c723f98ce8c12a89118f5b8d2c65529
 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a
-DIST syslinux-5.10.tar.xz 5315660 BLAKE2B 19d6861bb6220fe57e12d8d6118d37b197c3c771e4d2e7a51ce7db39219e3c837e6d1543d7a3927820f3a34da34ce849f9badbaf9cd83cb5ee24fd5ed7b705f2 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5
-DIST syslinux-6.03.tar.xz 6855224 BLAKE2B 9caccf8bed4e3c3e87393c9dc8f3b3d267c14469bbf8135a648ea41d8a43a4aedbf2b007c6b9a6853de8866152f5bc33e5ea85fca1db86c5f2fac88d97189b0f SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
-EBUILD syslinux-5.10.ebuild 2230 BLAKE2B 995ee83ea6a912f0af1ca97e4a960e569c385118e9f234f4f6421d7ab7f409e49c3c4b5fb6bafd6264bfe39c1318f49b142bba809a0dba378ebcef395c2a0809 SHA512 7d61dd6de70b5cd11754b81777bfcdb63c116ad5c772aa9e907bcf6bfe8d918afae8797dae362c888d4d16845fbe1d2077ac7c374f8bbe1f7c5069d2d570c0bb
-EBUILD syslinux-6.03.ebuild 3421 BLAKE2B 253a2b38846a07d3bdda05536c2d570e393b9182352e4e936f3213346fb8b0ee5573e5df2bb67bbc692dc5c52569ad3a667a19c14eb58ca7ec1e79ee46e67298 SHA512 041fa544ef45df4732597993c19448728ae6272a87306ff40cdb72e2dc3de5a7b54feb88f27a2660a2aa6932cb47682b42996bab618586bfdf608a959a1d1330
-EBUILD syslinux-6.04_pre1-r1.ebuild 3157 BLAKE2B ab29ee00207cfe57bc11e7ed28a953f9a3fb1c8d38de1c0590b744d9b72b8faf4b1fcaab0a3f5b8e88cc23410ec02533b47da4d74a70a6df78c2a48e75fc959d SHA512 3a3bee229af67282a2967dbbc64238bc3c747d31e091843b0f67a878a5145aebeb3dbf99c7600496112d2af6c1fa2b8180f037b2facc6be0dedf65296e89000b
 EBUILD syslinux-6.04_pre1-r2.ebuild 3217 BLAKE2B 15b770ce608e6644033d014970a92f693502cd6d9567fa719b05f47ae7deb7e245f69059c5217639b7eae807ab904d69f9a0c6dc9412b9f8c3ec535f966c638b SHA512 330fc00b75f935146c0b34756c22dbab07dfbe8eaf5a85c2df98a9611141baf8d4bf6ef0fa6084c21568cd2ece750fc94afd56e2d00e0388a0150049aa3e540a
 EBUILD syslinux-6.04_pre1.ebuild 3489 BLAKE2B 78481eb4d56f6670a9e3dd6fb8a1b4abfc8cdf67ab3d549c16e88f6cc8a908c4ace33d04e857ea40b7990a1e06d9fa04573077a876634fa77d3f00bd35b3fa12 SHA512 3d628c258a6671c4977d98e575d05d88101451f2d962433eec373777921773658460fba7e7f992d1857ae5a28f64faa02b6bed8bdd5bac8a65311b8e009aaffe
 MISC metadata.xml 411 BLAKE2B d3b00622fd68d6ae1b4ba7aa30c33c790b2fbdc688637d3c573cb4496f3952a62f8ae20384badda70b9cbd4ed036e0884becd212d63ec015decc511f1ee7970e SHA512 e8256115d61eeef51be14bea35df6765b356471d145ad8e43e75e6301a4557d526af5fd99b8957fb02ecd9c4a7a0bd0d3db4790abef935887bff8a102709c518
diff --git a/sys-boot/syslinux/files/syslinux-4.05-nopie.patch b/sys-boot/syslinux/files/syslinux-4.05-nopie.patch
deleted file mode 100644
index b50b6b476895..000000000000
--- a/sys-boot/syslinux/files/syslinux-4.05-nopie.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/mk/com32.mk b/mk/com32.mk
---- a/mk/com32.mk	2011-12-09 19:28:17.000000000 +0100
-+++ b/mk/com32.mk	2011-12-18 18:22:11.032342645 +0100
-@@ -24,6 +24,8 @@
- GCCOPT += $(call gcc_ok,-freg-struct-return,)
- GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os
- GCCOPT += $(call gcc_ok,-fPIE,-fPIC)
-+GCCOPT += $(call gcc_ok,-nopie,)
-+GCCOPT += $(call gcc_ok,-fno-pie,)
- GCCOPT += $(call gcc_ok,-fno-exceptions,)
- GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,)
- GCCOPT += $(call gcc_ok,-fno-strict-aliasing,)
diff --git a/sys-boot/syslinux/syslinux-5.10.ebuild b/sys-boot/syslinux/syslinux-5.10.ebuild
deleted file mode 100644
index bc99bbf6c4e2..000000000000
--- a/sys-boot/syslinux/syslinux-5.10.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="https://www.syslinux.org/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
-		dev-perl/Crypt-PasswdMD5
-		dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# These are executables which come precompiled and are run by the boot loader
-QA_PREBUILT="usr/share/${PN}/*.c32"
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_prepare() {
-	# Fix building on hardened
-	epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
-
-	rm -f gethostip #bug 137081
-
-	# Don't prestrip or override user LDFLAGS, bug #305783
-	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
-		sample/Makefile utils/Makefile"
-	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
-	if use custom-cflags; then
-		sed -i ${SYSLINUX_MAKEFILES} \
-			-e 's|-g -Os||g' \
-			-e 's|-Os||g' \
-			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
-			|| die "sed custom-cflags failed"
-	else
-		QA_FLAGS_IGNORED="
-			/sbin/extlinux
-			/usr/bin/memdiskfind
-			/usr/bin/gethostip
-			/usr/bin/isohybrid
-			/usr/bin/syslinux
-			"
-	fi
-
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" installer
-}
-
-src_install() {
-	emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install
-	dodoc README NEWS doc/*.txt
-}
-
-pkg_postinst() {
-	# print warning for users upgrading from the previous stable version
-	if has 4.07 ${REPLACING_VERSIONS}; then
-		ewarn "syslinux now uses dynamically linked ELF executables. Before you reboot,"
-		ewarn "ensure that needed dependencies are fulfilled. For example, run from your"
-		ewarn "syslinux directory:"
-		ewarn
-		ewarn "LD_LIBRARY_PATH=\".\" ldd menu.c32"
-	fi
-}
diff --git a/sys-boot/syslinux/syslinux-6.03.ebuild b/sys-boot/syslinux/syslinux-6.03.ebuild
deleted file mode 100644
index c82f18d21b88..000000000000
--- a/sys-boot/syslinux/syslinux-6.03.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="https://www.syslinux.org/"
-# Final releases in 6.xx/$PV.tar.* (literal "xx")
-# Testing releases in Testing/$PV/$PV.tar.*
-SRC_URI_DIR=${PV:0:1}.xx
-SRC_URI_TESTING=Testing/${PV:0:4}
-[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
-		dev-perl/Crypt-PasswdMD5
-		dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	>=sys-boot/gnu-efi-3.0u
-	virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# These are executables which come precompiled and are run by the boot loader
-QA_PREBUILT="usr/share/${PN}/*.c32"
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_prepare() {
-	rm -f gethostip #bug 137081
-
-	epatch "${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
-
-	# Don't prestrip or override user LDFLAGS, bug #305783
-	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
-		sample/Makefile utils/Makefile"
-	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
-	if use custom-cflags; then
-		sed -i ${SYSLINUX_MAKEFILES} \
-			-e 's|-g -Os||g' \
-			-e 's|-Os||g' \
-			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
-			|| die "sed custom-cflags failed"
-	else
-		QA_FLAGS_IGNORED="
-			/sbin/extlinux
-			/usr/bin/memdiskfind
-			/usr/bin/gethostip
-			/usr/bin/isohybrid
-			/usr/bin/syslinux
-			"
-	fi
-	case ${ARCH} in
-		amd64)	loaderarch="efi64" ;;
-		x86)	loaderarch="efi32" ;;
-		*)	ewarn "Unsupported architecture, building installers only." ;;
-	esac
-
-	# building with ld.gold causes problems, bug #563364
-	if tc-ld-is-gold; then
-		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
-		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
-			tc-ld-disable-gold
-			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
-		else
-			ewarn "Continuing anyway as requested."
-		fi
-	fi
-}
-
-src_compile() {
-	# build system abuses the LDFLAGS variable to pass arguments to ld
-	unset LDFLAGS
-	if [[ ! -z ${loaderarch} ]]; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch}
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} installer
-}
-
-src_install() {
-	# parallel install fails sometimes
-	einfo "loaderarch=${loaderarch}"
-	emake -j1 LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
-	dodoc README NEWS doc/*.txt
-}
-
-pkg_postinst() {
-	# print warning for users upgrading from the previous stable version
-	if has 4.07 ${REPLACING_VERSIONS}; then
-		ewarn "syslinux now uses dynamically linked ELF executables. Before you reboot,"
-		ewarn "ensure that needed dependencies are fulfilled. For example, run from your"
-		ewarn "syslinux directory:"
-		ewarn
-		ewarn "LD_LIBRARY_PATH=\".\" ldd menu.c32"
-	fi
-}
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r1.ebuild
deleted file mode 100644
index 194db71f6e57..000000000000
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="https://www.syslinux.org/"
-# Final releases in 6.xx/$PV.tar.* (literal "xx")
-# Testing releases in Testing/$PV/$PV.tar.*
-SRC_URI_DIR=${PV:0:1}.xx
-SRC_URI_TESTING=Testing/${PV:0:4}
-[[ ${PV/_alpha} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_beta} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_pre} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-[[ ${PV/_rc} != $PV ]] && SRC_URI_DIR=$SRC_URI_TESTING
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
-	dev-perl/Crypt-PasswdMD5
-	dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	>=sys-boot/gnu-efi-3.0u
-	virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# These are executables which come precompiled and are run by the boot loader
-QA_PREBUILT="usr/share/${PN}/*.c32"
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.03-sysmacros.patch #579928
-	"${FILESDIR}"/${P}-singleloadsegment.patch #662678
-	"${FILESDIR}"/${P}-fcommon.patch #705730
-)
-
-src_prepare() {
-	default
-
-	rm -f gethostip #bug 137081
-
-	# Don't prestrip or override user LDFLAGS, bug #305783
-	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
-		sample/Makefile utils/Makefile"
-	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
-	if use custom-cflags; then
-		sed -i ${SYSLINUX_MAKEFILES} \
-			-e 's|-g -Os||g' \
-			-e 's|-Os||g' \
-			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
-			|| die "sed custom-cflags failed"
-	else
-		QA_FLAGS_IGNORED="
-			/sbin/extlinux
-			/usr/bin/memdiskfind
-			/usr/bin/gethostip
-			/usr/bin/isohybrid
-			/usr/bin/syslinux
-			"
-	fi
-	case ${ARCH} in
-		amd64)	loaderarch="efi64" ;;
-		x86)	loaderarch="efi32" ;;
-		*)	ewarn "Unsupported architecture, building installers only." ;;
-	esac
-
-	# building with ld.gold causes problems, bug #563364
-	if tc-ld-is-gold; then
-		ewarn "Building syslinux with the gold linker may cause problems, see bug #563364"
-		if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
-			tc-ld-disable-gold
-			ewarn "set I_KNOW_WHAT_I_AM_DOING=1 to override this."
-		else
-			ewarn "Continuing anyway as requested."
-		fi
-	fi
-}
-
-src_compile() {
-	# build system abuses the LDFLAGS variable to pass arguments to ld
-	unset LDFLAGS
-	if [[ ! -z ${loaderarch} ]]; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch}
-	fi
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" ${loaderarch} installer
-}
-
-src_install() {
-	# parallel install fails sometimes
-	einfo "loaderarch=${loaderarch}"
-	emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
-	dodoc README NEWS doc/*.txt
-}
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index b6e9a0e9ad42..12b23bcfb779 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -2,5 +2,5 @@ AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1e
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
 EBUILD systemd-boot-243.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d
-EBUILD systemd-boot-245.ebuild 2352 BLAKE2B 293a1c6c9a5998eefc5bbef238b1a527113c277598c1e40613c06803a8b0a99b58f7eee0813d9cab219e05a064737aa9fae88a73a29298dc2489c1f099e8d5a6 SHA512 0b18b7845d755ada8142956cc23651099dac2aaf92ec105794d4f84d16bcdfb957fc944b889f1926f2b89157fab21f2e1ed3b329d8232238615ec58d2f372e35
+EBUILD systemd-boot-245.ebuild 2406 BLAKE2B e4bca67a372469170bbb31db40228a504f931f225017144431e53f62de074d6dcaf341760f3f1309e9dea5d4009054293693426c96f654c78c345e2d7a8ed96a SHA512 29aa167db71261b1cc6fe948562206f0c1842aa88bb77dba0c782a00165fd29f4dfcf8b3d63192f5e4a1be7a027c593d2440124725263767e0114f3ce620c542
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/systemd-boot-245.ebuild b/sys-boot/systemd-boot/systemd-boot-245.ebuild
index df34ee3df7f0..376d996987d7 100644
--- a/sys-boot/systemd-boot/systemd-boot-245.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-245.ebuild
@@ -43,6 +43,9 @@ PATCHES=(
 )
 
 src_configure() {
+	# https://bugs.gentoo.org/725794
+	tc-export OBJCOPY
+
 	local emesonargs=(
 		-Dblkid=true
 		-Defi=true