gentoo resync : 30.05.2020

17 files changed, 184 insertions, 209 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index ad7d85f8631f..f29a1a852510 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 6b751ebd8a3b..3a3c9bf48065 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -4,5 +4,5 @@ AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da
 AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799a69fd776bfaab194413c51969c65d1d81607c0a46699e84132b88bdd2a82f6f41a65ae6fbb061d9356 SHA512 3f99527724759f5c03a5f244b957bc6d50ca378f2b66cbcb19f73fa721d2fd76119ae90669e4cce045f5bc66a80d46b21e76e8c4895d23b22df23ec69262b0e0
 DIST elilo-3.16-all.tar.gz 485844 BLAKE2B 813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
 DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B 84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
-EBUILD elilo-3.16-r3.ebuild 2116 BLAKE2B 1bd70b5de2b47767160c9296d7b7dc728441860d392a5056f2b6aa183b644b196093f9b43baf0eca5145f5d0552fec672e65f6b113c6614fc01da2c886dc61d8 SHA512 3df96916f9651460544450d280a66c0d78f402f197af5b2b2c39d1364abd295a5f8566d8cd9c00eea2a9b3222415aec512039f2df1c1fcc1f16fbd6f752a6c5b
+EBUILD elilo-3.16-r3.ebuild 2147 BLAKE2B 75c075dedc5088c60c0d2866b0ca5ca9c217b55ccc07adaad42449e2de0f09203d263310f6c306462df8de0f347de0f45906f2add2d6ed76549fbf4965b7955c SHA512 620e673baa83e75f762c131f97051a00df4ca85e80139461eca0785eb64d0dbe14106ed20c6b0c66ed7b87ffa57dd85bbb21cd41d8d00187b92ec5304a510ce6
 MISC metadata.xml 337 BLAKE2B 7c9b3e56e9680252631db0691b3acfc2a2cbfee80c42af709979085124a35bb9d184e58de3ef4f88b2f3e6cc873b4ef2bd285ce3fc2645aaa9ae869c3b729d87 SHA512 13691bef927bf7f8a4a6d0640d38dabb53fdae1d8bd986c5fe73c1643e2bdbaaac50bfe864e2185a584fa6265a3197afc5273b60b70675481cef61706dde8d87
diff --git a/sys-boot/elilo/elilo-3.16-r3.ebuild b/sys-boot/elilo/elilo-3.16-r3.ebuild
index de13af20f9a2..e9dc2ce50c70 100644
--- a/sys-boot/elilo/elilo-3.16-r3.ebuild
+++ b/sys-boot/elilo/elilo-3.16-r3.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=6
@@ -66,6 +66,7 @@ src_compile() {
 		AS="$(tc-getAS)" \
 		CC="$(tc-getCC)" \
 		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
 		HOSTARCH=${iarch} \
 		ARCH=${iarch} \
 		EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index 4227da4b8fc0..7c7d4e13b7ee 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -1,7 +1,10 @@
 AUX 99palo 19 BLAKE2B 6c0aef7b3b54456a283f112c2046ae8d4d99633c8a7ac943d1a8f826275d6521ed1d4ca2c3fa166a50cb4fbdbf06c9f948907b967012d8d886a123752ffc7c71 SHA512 1ca106eff8f34386b5fa6bd9f0bfb656567040a2d3bc18de8f6913c3b533369f7c267932904556517f599674226feec8a09df6965bc8f844cb7ca873f5f5d174
 AUX palo-2.00-toolchain.patch 532 BLAKE2B ef8df5bd7874ac88aa27b2864ee0baeb57e470e65bf39f9d33f19f42961f928f6a6e3ec69665750a0d1d90c66a4ab8479beb0d653a9e6a930d03b2bfadb8d65b SHA512 1c92b555f1456623e8657b33067693e4e13bbbbbebd55b13f2f6c86615133a39789cf323601993ffbcfac6c7f9e322ea4a1422f5663083d0b07f7efcdab34ab4
+AUX palo-2.12-gcc10.patch 403 BLAKE2B f1201ecf345ed5751200d2cf52778fe1bc6c7d7bec995b97dc8dee65b4ea00a547b788390ead7dccee8c3fbd172ba578b33fd3fd223c8dc389b0b5bd0ef517d9 SHA512 2df2080b4ca9514a036cbf1c5fb85f42fe5cd34efe4c0b8b9217c58a1e94bf276b9994d32e0527c499ecf87e2ef279cc97c3a9ef813fb51d1649752a48792b87
 AUX palo.conf 260 BLAKE2B 1e81466dcecedc4ca1894863491f4c91e88becc9a5c5815e69028eeadc98ca61e99951fb754a8261a6cdb763aaa22201ae77f65fd4de07bbbd3f3c801322e277 SHA512 4147e480362161cd61ad9af8fb7048b87f9126c213661ab26f77ba98fe7f1acd03791b154667137e4a265e3c31e54e703d32daa86ff0805f47bc7c1b8b03cfe6
 DIST palo-2.12.tar.gz 124911 BLAKE2B 79fa572e118e77114dcb3b888abc65163bd56cb44cf69cd25bcaa33a7c6151b8254bf00c459ad17ca1d948f9b440378133f048e2add123a757908c108b802703 SHA512 6ea20490b84bf18a1d1e8037de453f5f480cba8403b267d4d63fceceffb39e18545c6d20c8dd7b07044ff5567eedd2c58b2a626971b53d1d35c5b3a4e8fefbf0
-EBUILD palo-2.12.ebuild 859 BLAKE2B 44ac9f154f4af661a6746fb892f9fc2870fe997534a9a9ecb382a4b4acf5cb9ade541f137f2da6e576d1243b7453bf85e988769eaea85cdabc38d5fcd0949f1c SHA512 17ed21c31aea4b5849d201c7fc587d027a8f64a725de72ba6eedaaa65a190b7c1ad3b0c093504bfb09b4ab46a03084f28e4ecd22b43828f68fffd017515ddc5e
+DIST palo-2.13.tar.gz 125108 BLAKE2B 9c73e66be7950ae6e7fd0a5dcb9cf460dfcb469580a25c121eb7ffc41aaf4a0b67d7f77ddf7a12479718c6ffc64a3a9327ab8c92cc73e79cffad07d61c6fd120 SHA512 6ecde0720fcf672cd7baf71bb04e16f2a1412d958ec35c4e2c9a7a3b372dab1a12ce6e47198ac8500aca750cbbb7190c3476ea626007c3418eb6c23f06011d37
+EBUILD palo-2.12-r1.ebuild 897 BLAKE2B 9fa46a0b23e97fc8963a26b1120583be20f6445a808dbb276098b2fe2b2b09c762aa14c6a8ac78a41519e5a5b1aaf285ece53e9d1ccdf25b445db337474c133f SHA512 3a61404d790e67c85f4ca795c341eb773484ae215619b5c0dac150df06154be36d43a5a463eb5e0bb393ad29b6a75de8417054d5ce8c81acc22aa36e0176efe5
+EBUILD palo-2.13.ebuild 860 BLAKE2B 7a17faa365a38220b990929b64fd9a98cd4cb2d36f04cf5b0020d01592c91a59035d1524fdb8a28f75b2fee14365071eae05606b3fc04f222869c08f17bc0ef7 SHA512 c874798a19104e75d58118f80c3829382dd5e7e7dbe88ad030d6507f29b168575b93856345393ad266cc86df099776ad6fc3505433073f7a56a5484f7bbc7fe1
 EBUILD palo-9999.ebuild 947 BLAKE2B 16b35ad0d3a63090cafe43747ccdefb093dade8a9c645bd7d8b1da7c3e9a211694983cc98692926ec08db7abd1cc1f851f87d58445b82baeddbd4458ae91bfc5 SHA512 640752c59c52830fe9b7ec464cc07fbcd7642eeb21aeb923f93d16df241ff0aa9ffc5d6de5719ca0c21ef263dc927036bfc728cd72832fe5900ba99a0350c88c
 MISC metadata.xml 318 BLAKE2B 0d17e33c45886d0c0e03044b5b2513d44c1bb4a28d758a8575929536e866419328c68971ba3f324a5677ff68bf37b38a22645e4b02810a118b5f18026d0476c4 SHA512 7ff12a5eb42ac39840f8c9eb78b24aeecd9cbfe780d11eccd75fd6f02b11f4abafd514bc32f47f727047b069e446e9252914dcaf5c33d6f1054981a3c175fdef
diff --git a/sys-boot/palo/files/palo-2.12-gcc10.patch b/sys-boot/palo/files/palo-2.12-gcc10.patch
new file mode 100644
index 000000000000..7832fbeac942
--- /dev/null
+++ b/sys-boot/palo/files/palo-2.12-gcc10.patch
@@ -0,0 +1,11 @@
+--- a/ipl/Makefile
++++ b/ipl/Makefile
+@@ -39,7 +39,7 @@ endif
+ VPATH=../lib:.
+ 
+ AFLAGS	= -I../lib
+-CFLAGS	= -DIPL_LOADER -I. -I../lib -I../include -O2 -mdisable-fpregs -Wall -fno-delete-null-pointer-checks
++CFLAGS	= -DIPL_LOADER -I. -I../lib -I../include -O2 -mdisable-fpregs -Wall -fno-delete-null-pointer-checks -fno-builtin
+ LDFLAGS  = -N --section-start .init=0x60000 -e '$$START$$'
+ 
+ all:	iplelf
diff --git a/sys-boot/palo/palo-2.12-r1.ebuild b/sys-boot/palo/palo-2.12-r1.ebuild
new file mode 100644
index 000000000000..8e24e8531b2e
--- /dev/null
+++ b/sys-boot/palo/palo-2.12-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="PALO : PArisc Linux Loader"
+HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* hppa"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.00-toolchain.patch
+	"${FILESDIR}"/${PN}-2.12-gcc10.patch
+)
+
+src_compile() {
+	local target
+	for target in '-C palo' '-C ipl' 'iplboot'; do
+		emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
+	done
+}
+
+src_install() {
+	into /
+	dosbin palo/palo
+
+	insinto /usr/share/palo
+	doins iplboot
+
+	insinto /etc
+	doins "${FILESDIR}"/palo.conf
+
+	insinto /etc/kernel/postinst.d
+	insopts -m 0744
+	doins "${FILESDIR}"/99palo
+
+	doman palo.8
+
+	dodoc TODO debian/changelog README.html
+}
diff --git a/sys-boot/palo/palo-2.12.ebuild b/sys-boot/palo/palo-2.13.ebuild
index 2ca5818b800f..17741656154b 100644
--- a/sys-boot/palo/palo-2.12.ebuild
+++ b/sys-boot/palo/palo-2.13.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
@@ -10,7 +10,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapsh
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* hppa"
+KEYWORDS="-* ~hppa"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.00-toolchain.patch
diff --git a/sys-boot/raspberrypi-mkimage/Manifest b/sys-boot/raspberrypi-mkimage/Manifest
deleted file mode 100644
index 7cdc404c89fa..000000000000
--- a/sys-boot/raspberrypi-mkimage/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX raspberrypi-mkimage-0_p20120201-args-uncompressed.txt 157 BLAKE2B e391372f9872df41203cfcbceb65518852cd6023151fb87acc9f26ac9d428be211376eec01ab919e927df1aa5d987292c3e1f2df8ccf82c34b36062c1719b926 SHA512 f9f3ad4640ae4973b97924f08ded2a6fad4f8fea576715053d860a15e2ba3dfc39c5082eee95ef0f7fa4ccb36e9a39d9d2f2e90ab7d0550a0a51d6b31cf6030d
-AUX raspberrypi-mkimage-0_p20120201-boot-uncompressed.txt 201 BLAKE2B aec1ca663709a2816a2ce45bbe5a18103e84b4df0b3cc498b77d2ae64ba3fedd99dcd435dba02955fb1e7769bbc9af2386dddff6e24db6910a966e1253b5b178 SHA512 cc0ce918e1533222be481aade51fd7ec2ba6b41a23470517efb1260d790ff958c8f4c6232e632faf8be4664a264d12034c4f01a67ef29d9124cafd4f58d94ebd
-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 1177 BLAKE2B 8fd5e93eb0f883d4f667001328ecdb90d08a47813907f5e85a6a0cbc35356adcd288b9eed2176482f76360f485dba86a08162e1552f83a4323f3a9f73fdc4fa3 SHA512 0447155122c30ee4e58851bc7db51612b2483602d5d2688aa036651f1aacfa215a1895e1bfe157fb120681f1ae3c1e12d84c5be6e87251f1cb635ea8d7d511b9
-MISC metadata.xml 249 BLAKE2B 4a52a1f36d321e29fdfc7b2b391378a0fc64e56cb593df93d3bc522d327e6c438a6312cdc21f04c72242c53760f4de8cd82255499bddc53f0761c4991a61eb7b SHA512 10102614b4f775e819bdadb9db011535be6e16de0c06fbcdeddf16a45b65f0aaac58d5ae2899e9e69a6460ddcae2c1673a578bb7b30d6035c7697d872cf95baa
diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-args-uncompressed.txt b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-args-uncompressed.txt
deleted file mode 100644
index 09398b47eee8..000000000000
--- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-args-uncompressed.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-; kernel args (place at 0x00000100)
-0x00000005
-0x54410001
-0x00000001
-0x00001000
-0x00000000
-0x00000004
-0x54410002
-0x08000000
-0x00000000
-0x00000000
-0x00000000
diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-boot-uncompressed.txt b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-boot-uncompressed.txt
deleted file mode 100644
index 1cf5888278af..000000000000
--- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-boot-uncompressed.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-; bootloader (place at 0x00000000)
-0xea000006
-0xe1a00000
-0xe1a00000
-0xe1a00000
-0xe1a00000
-0xe1a00000
-0xe1a00000
-0xe1a00000
-
-0xe3a00000
-0xe3a01042
-0xe3811c0c
-0xe59f2000
-0xe59ff000
-0x00000100
-0x00008000
diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed-python3.patch b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed-python3.patch
deleted file mode 100644
index 28b8a6f3170f..000000000000
--- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed-python3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/imagetool-uncompressed.py
-+++ b/imagetool-uncompressed.py
-@@ -46,7 +47,7 @@
- f = open(args.bootimage, "wb")
- 
- for m in mem:
--   f.write(chr(m))
-+   f.write(chr(m).encode('latin1'))
- 
- f.write(kernel_image)
- f.close()
diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch
deleted file mode 100644
index adba8bbcdbbf..000000000000
--- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/imagetool-uncompressed.py
-+++ b/imagetool-uncompressed.py
-@@ -3,15 +3,23 @@
- import os
- import re
- import sys
-+import argparse
- 
--try:
--   kernel_image = sys.argv[1]
--except:
--   kernel_image = ""
--
--if kernel_image == "":
--  print("usage : imagetool-uncompressed.py <kernel image>");
--  sys.exit(0)
-+parser = argparse.ArgumentParser(description='Prepare kernel files for Raspberry Pi bootloader')
-+parser.add_argument('--force', '-f', action='store_true', default=False,
-+  help='overwrite target file')
-+parser.add_argument('kernel',
-+  help='kernel file from /usr/src/linux*/arch/arm/boot/Image')
-+parser.add_argument('bootimage',
-+  help='file to be placed in /boot/kernel.img')
-+args = parser.parse_args()
-+if os.path.exists(args.bootimage) and not args.force:
-+  print('Target file exists, use --force to override')
-+  sys.exit(1)
-+
-+f = open(args.kernel, 'rb')
-+kernel_image = f.read()
-+f.close()
-    
- re_line = re.compile(r"0x(?P<value>[0-9a-f]{8})")
- 
-@@ -35,11 +43,10 @@
- load_to_mem("boot-uncompressed.txt", 0x00000000)
- load_to_mem("args-uncompressed.txt", 0x00000100)
- 
--f = open("first32k.bin", "wb")
-+f = open(args.bootimage, "wb")
- 
- for m in mem:
-    f.write(chr(m))
- 
-+f.write(kernel_image)
- f.close()
--
--os.system("cat first32k.bin " + kernel_image + " > kernel.img")
diff --git a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.py b/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.py
deleted file mode 100644
index 46ff4fc8ea6b..000000000000
--- a/sys-boot/raspberrypi-mkimage/files/raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python2
-
-import os
-import re
-import sys
-
-try:
-   kernel_image = sys.argv[1]
-except:
-   kernel_image = ""
-
-if kernel_image == "":
-  print("usage : imagetool-uncompressed.py <kernel image>");
-  sys.exit(0)
-   
-re_line = re.compile(r"0x(?P<value>[0-9a-f]{8})")
-
-mem = [0 for i in range(32768)]
-
-def load_to_mem(name, addr):
-   f = open(name)
-
-   for l in f.readlines():
-      m = re_line.match(l)
-
-      if m:
-         value = int(m.group("value"), 16)
-
-         for i in range(4):
-            mem[addr] = int(value >> i * 8 & 0xff)
-            addr += 1
-
-   f.close()
-
-load_to_mem("boot-uncompressed.txt", 0x00000000)
-load_to_mem("args-uncompressed.txt", 0x00000100)
-
-f = open("first32k.bin", "wb")
-
-for m in mem:
-   f.write(chr(m))
-
-f.close()
-
-os.system("cat first32k.bin " + kernel_image + " > kernel.img")
diff --git a/sys-boot/raspberrypi-mkimage/metadata.xml b/sys-boot/raspberrypi-mkimage/metadata.xml
deleted file mode 100644
index 03d6b306d326..000000000000
--- a/sys-boot/raspberrypi-mkimage/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">raspberrypi/tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild b/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
deleted file mode 100644
index ed0353e2b3c3..000000000000
--- a/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="Raspberry Pi kernel mangling tool mkimage/imagetool-uncompressed.py"
-HOMEPAGE="https://github.com/raspberrypi/tools/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-imagetool-uncompressed.patch )
-
-src_unpack() {
-	mkdir "${S}" || die
-	cp {"${FILESDIR}"/${P}-,"${S}"/}imagetool-uncompressed.py || die
-}
-
-python_prepare_all() {
-	sed -e '/^load_to_mem("/s:(":("'${EPREFIX}'/usr/share/'${PN}'/:' \
-		-e '1s:python2:python:' \
-		-i imagetool-uncompressed.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	if python_is_python3; then
-		eapply "${FILESDIR}"/${P}-imagetool-uncompressed-python3.patch
-	fi
-}
-
-python_compile() { :; }
-
-python_install() {
-	python_doscript imagetool-uncompressed.py
-}
-
-python_install_all() {
-	insinto /usr/share/${PN}
-	newins {"${FILESDIR}"/${P}-,}args-uncompressed.txt
-	newins {"${FILESDIR}"/${P}-,}boot-uncompressed.txt
-
-	distutils-r1_python_install_all
-}
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 162be9b57138..4c83fdecb7ac 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -8,5 +8,6 @@ DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e8506
 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/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
new file mode 100644
index 000000000000..415672bbf778
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -0,0 +1,119 @@
+# 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
+
+	tc-export AR CC LD OBJCOPY RANLIB
+}
+
+_emake() {
+	emake \
+		AR="${AR}" \
+		CC="${CC}" \
+		LD="${LD}" \
+		OBJCOPY="${OBJCOPY}" \
+		RANLIB="${RANLIB}" \
+		"$@"
+}
+
+src_compile() {
+	# build system abuses the LDFLAGS variable to pass arguments to ld
+	unset LDFLAGS
+	if [[ ! -z ${loaderarch} ]]; then
+		_emake ${loaderarch}
+	fi
+	_emake ${loaderarch} installer
+}
+
+src_install() {
+	# parallel install fails sometimes
+	einfo "loaderarch=${loaderarch}"
+	_emake -j1 INSTALLROOT="${D}" MANDIR=/usr/share/man bios ${loaderarch} install
+	dodoc README NEWS doc/*.txt
+}