gentoo resync : 03.11.2019

17 files changed, 53 insertions, 368 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index fdcb60db1190..c11bb6b30686 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/colo/Manifest b/sys-boot/colo/Manifest
index 03f64db42e51..8a3ebc92736d 100644
--- a/sys-boot/colo/Manifest
+++ b/sys-boot/colo/Manifest
@@ -1,6 +1,7 @@
+AUX colo-stage2_src_heap-fix.patch 715 BLAKE2B 4ee7b5d308fbe6d05741916e5c86af837abf17e8514c3686da47794109ec3e73d9247429a6488c0b7b11070d8ac5cf2b40ef8320c4a6e36704bacbd942df5e4c SHA512 eb7d440dc68bbf06ebb27a3d37439e7e141db4649a7b18f3acc1ea7b0ab7478dad7c3088eb8f8418cee2d35acb2e87f32b3dd39f3c77995ada5fdbb63c25ae49
 AUX default.colo 840 BLAKE2B a97a6a0d121edccf49842c0b14f3b4d48e0e12d92c7a40e3a78ad09d4bfa7f4f9664f12e68d81226d4413e20ddfa9f471a628a509d3adb492c56d785252df26c SHA512 fdf82c9a6adaa5711d8d2c0efc6dc051158ed815f6b870b516eec497d8ce17608fd01dc795e35aaa22cc33c97bc9458803976f5265a196adbb5a89457e88e2b0
 AUX menu.colo 1517 BLAKE2B 04d4ea5118ebe89229607a9beb8f6713a40f945df1d3ae0de867eed4cbf1df7be9ad30ddcc0a24a2489de1719424ea77d24a0c66ed42f6ce9da97b9bf175bd60 SHA512 a7357e176f45d5d352ea450349986ae5493900d60b363f688371348b727859d7be9b2a732e5210beba5216bfa8b8e6c861f2433573a009aabb71569eefcc5eaa
 AUX simple.colo 539 BLAKE2B fa8a255ffeac0ad14c0fc392fe65e89c9e627c022d0adbd9e1b1add70cc0535b9837f45d59ea1b43ae6919637a36c5364d38e75d4b5be7102e5dbf2c1727565d SHA512 38b3481adbad50c344f87cfd9a5346a78158cfd298194f715b40ad582d5fad9ad6e16f773004a8732e673bc8b3791dde39da10ac85c72a8e236837ca82a91d1a
 DIST colo-1.22.tar.gz 257968 BLAKE2B f7c8f97b3fed2d2071b89f84e3e78e814914999a3038c854d92e651e4c3a1aa1889e3486f2de94c561475befe4e4a4606e4873c4174ff0b24dcc290f494f5acb SHA512 c983f36991a6275d4864cbd12e00f4e73d3b722746b3d3c8442afc8fe00d5432772c93007999858afb0993e1a4917f94bc9803f017ace3e65535cad7e8fb9b1e
-EBUILD colo-1.22.ebuild 3686 BLAKE2B 4855eb63e2142bd72d551432e8eb432d014ea1420de0d86727394a3140f684d255c5e81ab8a318b3ba738d482ef86d3b22cb58c665c725f5ac678b64f7883c68 SHA512 fe3a086342425a04afbc4517e28833968d0fc69a4852c16510a10b41b0ce22d9c823a0facb8d17c2e05232d1029ae8c5dc10147657f62837dac4d570a5f3f4cb
+EBUILD colo-1.22.ebuild 3732 BLAKE2B 85ba505a299c539e4f2f60d9e408b8e9fd7146ac1b6dbea53093ec0980ec0beb08f5893ef497c4eef3031ae64509bb1e54a10908af3949cd90b0c0b49123e12c SHA512 97f659697aa18344fd66a8a03b5fa0d26efa9c03d15f60db44fec2d81e4cdf0d7621d554b7f1ff24c0e3b404f5766a5e31c00d7327467ba20d175b57436aeaa8
 MISC metadata.xml 359 BLAKE2B df83dfc360f7f6ee89e81f5af531ecd3fb650ff69ef92e7829ed23b7ff3c304d263acea308d96d179a5274409a35801a082ceec3ad11e8dec06481e36a8f646f SHA512 5471afe51705e3499f4820e3a9e6af18166075fec78eee0f60866ce844b06f73148663630f9aedbb4f300f26608d8135385135a142533553939ed2924e97826f
diff --git a/sys-boot/colo/colo-1.22.ebuild b/sys-boot/colo/colo-1.22.ebuild
index 36d8c6e08464..d18a3506ac89 100644
--- a/sys-boot/colo/colo-1.22.ebuild
+++ b/sys-boot/colo/colo-1.22.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
+EAPI=6
 inherit eutils toolchain-funcs
 
 DESCRIPTION="CObalt LOader - Modern bootloader for Cobalt MIPS machines"
@@ -16,8 +15,9 @@ DEPEND=""
 RDEPEND=""
 RESTRICT="strip"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	epatch "${FILESDIR}"/colo-stage2_src_heap-fix.patch
+	default
 }
 
 src_compile() {
diff --git a/sys-boot/colo/files/colo-stage2_src_heap-fix.patch b/sys-boot/colo/files/colo-stage2_src_heap-fix.patch
new file mode 100644
index 000000000000..6cd4e3a2a226
--- /dev/null
+++ b/sys-boot/colo/files/colo-stage2_src_heap-fix.patch
@@ -0,0 +1,24 @@
+diff -Naurp colo-1.22.orig/stage2/src/heap.c colo-1.22/stage2/src/heap.c
+--- colo-1.22.orig/stage2/src/heap.c	2006-01-22 10:26:56.000000000 -0500
++++ colo-1.22/stage2/src/heap.c	2019-10-20 23:20:17.167266445 -0400
+@@ -25,16 +25,16 @@ static size_t next_size;
+ void heap_reset(void)
+ {
+ 	extern char __text;
+-	void *restrict;
++	void *restrict2;
+ 
+ 	assert(!((unsigned long) &__text & 15));
+ 
+ 	free_lo = KSEG0(0);
+ 	free_hi = KSEG0(&__text) - (32 << 10);			// XXX
+ 
+-	restrict = KSEG0(ram_restrict) - (16 << 10);	// XXX
+-	if(free_hi > restrict)
+-		free_hi = restrict;
++	restrict2 = KSEG0(ram_restrict) - (16 << 10);	// XXX
++	if(free_hi > restrict2)
++		free_hi = restrict2;
+ 
+ 	image_size = 0;
+ 	image_size_mark = 0;
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 4de5ecca8e06..dd98f454291e 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -17,7 +17,7 @@ DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775
 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 7961 BLAKE2B 9484b4fe31527dd587d0c754e21030d7f6e6d1d712502081045e0b9c0c33df2b99540a568f0df785239636c3a1e0acfbece0212f15ac84ae6780e9ca8b31a278 SHA512 4354a12788262ec4f3daba4932b3306a5a9eac1f8f1b7209f91d65abb591bad71680d166e3b3ea81aff95561500bdb02c1a742291f7efe9b63958fc8ff6111fc
-EBUILD grub-2.04-r1.ebuild 7547 BLAKE2B 7236633e180b7956d7722c251b36c497e7de66d2c59fde2f56581c13dcff5a68c75caa2119711ae9febecfa1e474d3bdfb6a3ce34efe7a00bf23ebc707bf5acf SHA512 25cd0ab315360707b63223d25073ea24c2bde94ccd99bba606563ec14cc7efbfe2fbd6265fff64b763a5cd2b34c507a4e607c2ae910e62c06c3aa4f9b079b539
+EBUILD grub-2.04-r1.ebuild 7641 BLAKE2B d69184f0498a86e68c33ee410c56d86fce2bc562f9d482dcae4077505c3a80c3d358fc31d29e47eafa87b63b97397414caddad21b7bc619b921173f6df16ca36 SHA512 fd1c9313279f7ede58e42c8f99d28da141aaa7c811d106b1022903ed957054466aca5efbc3f036ea5dc74cb23ee1f4447a2eea655f94f849b88ba6f99bda3572
 EBUILD grub-2.04_rc1.ebuild 7700 BLAKE2B f599f7d2f7c428ce6f36434a11506b3c34655d2a90ff654b65b5cd595a063ec9ebfcac96434347803721e03219780bb4986289014f08f48364f376528c4a6cb9 SHA512 6626e04c7c95227448c91145e3dc42bfd9c3c587094b8ff923824aa4a456833842be1c29df8bddb1d76d962ccdff323c6ea2fe0419b8999e73a07097a63ca158
-EBUILD grub-9999.ebuild 7503 BLAKE2B d6ff3d9ab69d7085fd206d202d1dcabf4d4a97d887384a52128bbe66fae127270833b1c82e8b208ae364e19c847735d5198e464e5930d4c175be920970444fc1 SHA512 9fb7068fe9e83e71aa3adf69233bdf23fa3a7eacb779db47f5358d8b43ae93d2f5f5eb31663e97dc16d23e6f754fc62880b3a5b31a02f384c75fdf26c7c079ff
+EBUILD grub-9999.ebuild 7597 BLAKE2B db14887aa1777cdbf36db65d362dd863d4f768a7962daf0de467fd473196928aadfde8055596a53674f4e97c38cbf62b5bfd1d963f5551d8bd8a46cc0ab30d28 SHA512 2ba49dd61247f386298acf8f0c3372071f2b8be6b2a422666d3b94c7773d991c08d0280be73d2fbe76abd58f93c2331cd54b982624d78052c215a4d31db683a8
 MISC metadata.xml 1149 BLAKE2B c0a364b1d8139f26f7dd09ba49dd68d591c7532e2eec25dae97caea49be8bfc92c8d5c69dcc77d89f58367fa04a73526cc55768f93222effc6c6e47a52b53500 SHA512 45d0425236957395e275bd340aeabfcd03451b037c616c54cf8babdc3bdee6aa3706fa7565f595ba4391773d331353b8920a627094c01289935a1a9aedc1f7bf
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 81bd769728c9..7135f70c7f98 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -55,7 +55,7 @@ LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
 SLOT="2/${PVR}"
 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="
@@ -105,6 +105,7 @@ 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:= )
 "
 RDEPEND="${DEPEND}
 	kernel_linux? (
@@ -177,6 +178,7 @@ grub_configure() {
 
 	case ${MULTIBUILD_VARIANT} in
 		efi*) platform=efi ;;
+		xen-pvh) platform=xen_pvh ;;
 		xen*) platform=xen ;;
 		guessed) ;;
 		*) platform=${MULTIBUILD_VARIANT} ;;
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 07f21fac6705..6b165af82481 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -54,7 +54,7 @@ LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
 SLOT="2/${PVR}"
 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="
@@ -104,6 +104,7 @@ 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:= )
 "
 RDEPEND="${DEPEND}
 	kernel_linux? (
@@ -176,6 +177,7 @@ grub_configure() {
 
 	case ${MULTIBUILD_VARIANT} in
 		efi*) platform=efi ;;
+		xen-pvh) platform=xen_pvh ;;
 		xen*) platform=xen ;;
 		guessed) ;;
 		*) platform=${MULTIBUILD_VARIANT} ;;
diff --git a/sys-boot/nettrom/Manifest b/sys-boot/nettrom/Manifest
index a917ba7b6f58..6965c17f96b0 100644
--- a/sys-boot/nettrom/Manifest
+++ b/sys-boot/nettrom/Manifest
@@ -1,3 +1,3 @@
 DIST nettrom-2.3.3.tar.gz 801683 BLAKE2B 86c28e901b6cec2a708f4d52f304b4996e3f98d9faeef511f65965e3881a08f56dc7c39a6bb8056e09c08e377f8d318949fa8324b1ea75a464eb71f4ef4169c9 SHA512 7b8b85d7a0cda8c5860663e19ce75223d667eeb1997b28eaa2ce67d3c14e609cf98706d54f86b0e91e3dac0570d0ffee7f1737f21bac774a1150e58d783bc925
-EBUILD nettrom-2.3.3.ebuild 467 BLAKE2B eee7c1acd6217608d796982e27f305dadd677aa2096e7f6d908d24d4e1a1d79870757a4d20df84db09fe5c7fac1016a48e13cc63c1a2bf8ba164a70d6ffc73ee SHA512 cd030394099a7873243b9df10dfb990026b4ba138b2c41d19d9b29533990c5ff636ad20352144bee8eeb588bffbf6cf3719201e3938353905773ee6ba88cc10f
+EBUILD nettrom-2.3.3.ebuild 552 BLAKE2B 46d6d824afbe526700019fc7aeb5cf7a17b4e48aa370e8440b2dc891702dd1eb73186a4337f8a4729927f9a159ee3ae3cd524f7e404656a99e5cbacb48f60aeb SHA512 6a10efbd142cbbeac631adb4cad9fdb922b6ce3a399961205e9598adf4ac092aab3aad8e7d3d9ae8d48228542821d41fae0d009274974c2c7d238568d4e58118
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/sys-boot/nettrom/nettrom-2.3.3.ebuild b/sys-boot/nettrom/nettrom-2.3.3.ebuild
index 15a432011ba8..a0311ddca387 100644
--- a/sys-boot/nettrom/nettrom-2.3.3.ebuild
+++ b/sys-boot/nettrom/nettrom-2.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="NetWinder ARM bootloader and utilities"
 HOMEPAGE="http://www.netwinder.org/"
@@ -10,14 +10,20 @@ SRC_URI="http://wh0rd.org/gentoo/${P}.tar.gz"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* arm"
-IUSE=""
 RESTRICT="mirror bindist"
 
 S=${WORKDIR}
 
+QA_PREBUILT="
+	/sbin/flashwrite
+	/usr/sbin/logowrite
+	/usr/sbin/logoread"
+QA_PRESTRIPPED="${QA_PREBUILT}"
+
 src_install() {
-	cp -r "${S}"/* "${D}"/ || die "install failed"
-	cd "${D}"/usr
-	mkdir share
-	mv man share
+	doman usr/man/man8/flashwrite.8
+	rm -r usr/man || die
+
+	insinto /
+	doins -r .
 }
diff --git a/sys-boot/systemrescuecd-x86-grub/Manifest b/sys-boot/systemrescuecd-x86-grub/Manifest
deleted file mode 100644
index 18ba13ebaf1f..000000000000
--- a/sys-boot/systemrescuecd-x86-grub/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX systemrescuecd.default 845 BLAKE2B 85c0685cc80caa52874ebe61476beea84f06a83d5410db2b05f61dc30adc4a18a26790120a135988d6ff613672eff5e4ece89b20fc7185144317d8be325a5853 SHA512 81aebf9999cfe82696fc72f520fc88355fc8d3077a1c76858175f3367d33119db96c6cb639935b01d32ab1f1d0aaa1c41b7ea3b12e1c732e474de519cb50b2d6
-AUX systemrescuecd.default-2 1179 BLAKE2B 72d44c21da40190a6d199dd115dcc7eae89d991ca0ba0f088c8bd722ac25ad202cd8e47525fd7c47cda905b132d2803df821c5b7dc036eb338b0271ac815e782 SHA512 da7c5347a5c588184d6877f3625d8d3247a6706afd13451fb125294beb82a2249be6e6380f9c5fa6e677d7b2c672a4162275411296db34a263ed985b8f149fa8
-AUX systemrescuecd.grub 1910 BLAKE2B 46a3bf8c61e47e1f6eb3223ae44a2ac2e668603cb3ab1ab1fef7ee8626b365b8ac4a5f03f37b871f4b45952c33f7c940c1d20a317b759a1a90950a77eb54e21d SHA512 955a0fb35a034e60f005cbff27fc95e77622a0481d8111b3ee9981dbf0df4a6aa01f0e65307f98acee754dfe050b5e2cf2529b74a6f22f16e4f9164de359a915
-AUX systemrescuecd.grub-2 4562 BLAKE2B ab3122022c8cdb12839b8001e50ab118743f35a37f5a6a6f4e8c863ecc54fb0198938f3acebfed73b944dc0d99a8d978412013615999dd23af99c31d0960e563 SHA512 50869b8ffb58085fac7450a9c730d36c517711a47e9a2d16c6092bd43e5eb791b06663a22b1d0e13edb9aef65fa37f0901477e444d8749a902ebd107ea87dd2a
-EBUILD systemrescuecd-x86-grub-0.1-r1.ebuild 751 BLAKE2B e6d0ec0b5efc360a33a1ae9a89d4636d6d180a62deee0473ac45095f21cf9df9071c11b43dcb3e8efd895c0ea358d857438e25da04abb0fede9c774bd13ed43f SHA512 bd7e7b3aba56c64d3d624f6b1f1108452f79836a3fdcee6b782272647025108218b71fc6c980c1482613cb23234107b2674bc73d57272e200ac4b161d7091911
-EBUILD systemrescuecd-x86-grub-0.2.ebuild 754 BLAKE2B bcf0631c14f71fd8394247c760efe600533adc96dd35419682eb5c2a00dc58d2127b739e5e719fd99cc18cb5f3b87444295e67738106f45ca1f72bc908b95622 SHA512 04d222cbd7ff19d5f79bcda4fcbeea67dcff113aa4f8bd349d57039f57fd541dc4508fd0abd52fa3f4dc53b2905a43c889122a428df33ef31702955fa9e79000
-MISC metadata.xml 610 BLAKE2B 2551878a7515db26498bab29653547aeef039e47292780ad7725606a618ca71384195e5b1e70e65e17085bae3651ee2602aef1e1479f47495f7efb783ac73816 SHA512 84101ca441d24894df8063a2d82ecf7f516bb6c3255d6b147b1448e27874f2ff634c5822f925a6648010fa83c6e75d60159237a44b99cd5a031e19174a17295d
diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default
deleted file mode 100644
index d9b2d0b8db7d..000000000000
--- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default
+++ /dev/null
@@ -1,21 +0,0 @@
-# Here you can set custom bootoptions for the SystemRescueCD
-#
-# You can add for example in a space separated list:
-#  setkmap=xx: which defines the keymap to load (example: setkmap=de)
-#  dostartx: load the X.Org graphical environment and launch Xfce
-#  docache: causes the iso file to be fully loaded into memory
-#           this requires 400MB of memory to cache everything
-#  doload=xxx: loads needed kernel modules (example: doload=3c59x,e1000)
-#  noload=xxx: prevents loading kernel modules
-#  nomodeset: do not load the Kernel-Mode-Setting video driver
-#
-# Example:
-#  SRCD_BOOTOPTIONS="setkmap=de docache dostartx"
-#
-# For all available bootoptions see:
-#  http://www.sysresccd.org/Sysresccd-manual-en_Booting_the_CD-ROM
-#
-# Note:
-#  After changing this, you must update your grub configuration file, to take effect
-
-SRCD_BOOTOPTIONS=""
diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default-2 b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default-2
deleted file mode 100644
index 941622bfc3ba..000000000000
--- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default-2
+++ /dev/null
@@ -1,33 +0,0 @@
-# Here you can set custom bootoptions for the SystemRescueCD
-#
-# For SystemRescueCD version 6.x:
-#
-# You can add in a space separated list:
-#  setkmap=xx: set keyboard layout for terminal
-#  copytoram: load the ISO fully in memory
-#             requires 2GB of memory to cache the system
-#
-# For SystemRescueCD version 5.x:
-#
-# You can add for example in a space separated list:
-#  setkmap=xx: which defines the keymap to load (example: setkmap=de)
-#  dostartx: load the X.Org graphical environment and launch Xfce
-#  docache: causes the iso file to be fully loaded into memory
-#           this requires 400MB of memory to cache everything
-#  doload=xxx: loads needed kernel modules (example: doload=3c59x,e1000)
-#  noload=xxx: prevents loading kernel modules
-#  nomodeset: do not load the Kernel-Mode-Setting video driver
-#
-# Example:
-#  SRCD_BOOTOPTIONS="setkmap=de docache dostartx"
-#
-# For all available bootoptions see:
-#  http://www.sysresccd.org/Sysresccd-manual-en_Booting_the_CD-ROM
-#
-# Note:
-#  After changing this, you must update your grub configuration file, to take effect
-
-SRCD_BOOTOPTIONS=""
-
-# Copy ISO to /boot if there is enough space
-#COPY_SRCD_TO_BOOT="yes"
diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
deleted file mode 100644
index 269b1eb76adb..000000000000
--- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-. /usr/share/grub/grub-mkconfig_lib
-
-if [ -r /etc/default/systemrescuecd ] ; then
-  . /etc/default/systemrescuecd
-fi
-
-# srcd = path of newest link to iso of systemrescuecd, created by the ebuild
-#        of systemrescuecd-x86
-srcd="/usr/share/systemrescuecd/systemrescuecd-x86-newest.iso"
-
-longname="SystemRescueCD"
-bootops=")"
-
-if [ ! -z "${SRCD_BOOTOPTIONS}" ]; then
-	bootops=" with bootoptions)"
-fi
-
-if [ -f "${srcd}" ]; then
-
-	device=$(${grub_probe} --target=device "${srcd}")
-	path=$(make_system_path_relative_to_its_root "${srcd}")
-	grub_string=$(prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab)
-
-	gettext_printf "Found %s on %s\n" "${longname}" "${device}" >&2
-	onstr=$(gettext_printf "(on %s)" "${device}")
-
-	cat << EOF
-submenu "${longname}" --class submenu {
-	menuentry "${longname} (32bit standard${bootops}" --class rescue {
-${grub_string}
-		set isofile=${path}
-		loopback loop \${isofile}
-		linux (loop)/isolinux/rescue32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
-		initrd (loop)/isolinux/initram.igz
-	}
-	menuentry "${longname} (64bit standard${bootops}" --class rescue {
-${grub_string}
-		set isofile=${path}
-		loopback loop \${isofile}
-		linux (loop)/isolinux/rescue64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
-		initrd (loop)/isolinux/initram.igz
-	}
-	menuentry "${longname} (32bit alternative${bootops}" --class rescue {
-${grub_string}
-		set isofile=${path}
-		loopback loop \${isofile}
-		linux (loop)/isolinux/altker32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
-		initrd (loop)/isolinux/initram.igz
-	}
-	menuentry "${longname} (64bit alternative${bootops}" --class rescue {
-${grub_string}
-		set isofile=${path}
-		loopback loop \${isofile}
-		linux (loop)/isolinux/altker64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
-		initrd (loop)/isolinux/initram.igz
-	}
-}
-EOF
-
-fi
diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub-2 b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub-2
deleted file mode 100644
index 332a7c37fce0..000000000000
--- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub-2
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-. /usr/share/grub/grub-mkconfig_lib
-
-if [ -r /etc/default/systemrescuecd ] ; then
-	. /etc/default/systemrescuecd
-fi
-
-COPY_SRCD_TO_BOOT=${COPY_SRCD_TO_BOOT:-no}
-
-bootdir="/boot"
-installdir="/usr/share/systemrescuecd"
-
-isorex='^(/.*/)?systemrescuecd-.*[.]iso$'
-
-# Path of the link to the newest ISO, created by ebuild
-srcd="${installdir}/systemrescuecd-x86-newest.iso"
-
-# Extract ISO version
-isovsed() {
-	sed -E 's|^.*systemrescuecd(-x86)?-||;s|.iso$||'
-}
-
-# Find ISOs in a given directory
-isofind() {
-	find "${1}" -maxdepth 1 -type f -regextype egrep -regex ${isorex}
-}
-
-# Copy ISO to boot partition
-copy_srcd_iso() {
-	if [ ! -f "${bootdir}/"$(basename "${1}") ]; then
-		if [ $(df -k --output=avail "${bootdir}" | tail -1) -gt $(du -k "${1}" | cut -f 1) ]; then
-			cp "${1}" "${bootdir}/"
-		else
-			# Before complaining, check if the installed ISO is actually newer
-			if $(printf '%s\n' $(isofind "${bootdir}" | isovsed | sort -V) $(echo "${1}" | isovsed) | sort -VC); then
-				gettext_printf "Error: Not enough free disk space on ${bootdir}!\n" >&2
-				gettext_printf "Error: Failed to copy the new iso!\n" >&2
-			fi
-		fi
-	fi
-}
-
-write_srcd() {
-	cat <<EOF
-	menuentry "${longname} [${1}] (Copy to RAM${bootops}" --class rescue {
-${grub_string}
-		set gfxpayload=keep
-		set isofile=${path}
-		loopback loop \${isofile}
-		linux (loop)/sysresccd/boot/x86_64/vmlinuz archisobasedir=sysresccd img_loop=\${isofile} img_dev=${diskuuid} copytoram ${SRCD_BOOTOPTIONS}
-		initrd (loop)/sysresccd/boot/intel_ucode.img (loop)/sysresccd/boot/amd_ucode.img (loop)/sysresccd/boot/x86_64/sysresccd.img
-	}
-	menuentry "${longname} [${1}] (Copy to RAM with persistence${bootops}" --class rescue {
-${grub_string}
-		set gfxpayload=keep
-		set isofile=${path}
-		loopback loop \${isofile}
-		linux (loop)/sysresccd/boot/x86_64/vmlinuz archisobasedir=sysresccd img_loop=\${isofile} img_dev=${diskuuid} cow_device=${diskuuid} cow_directory=/persistent_sysresccd-${1}/x86_64 copytoram ${SRCD_BOOTOPTIONS}
-		initrd (loop)/sysresccd/boot/intel_ucode.img (loop)/sysresccd/boot/amd_ucode.img (loop)/sysresccd/boot/x86_64/sysresccd.img
-	}
-	menuentry "${longname} [${1}] (Minimal${bootops}" --class rescue {
-${grub_string}
-		set gfxpayload=keep
-		set isofile=${path}
-		loopback loop \${isofile}
-		linux (loop)/sysresccd/boot/x86_64/vmlinuz archisobasedir=sysresccd img_loop=\${isofile} img_dev=${diskuuid} ${SRCD_BOOTOPTIONS}
-		initrd (loop)/sysresccd/boot/intel_ucode.img (loop)/sysresccd/boot/amd_ucode.img (loop)/sysresccd/boot/x86_64/sysresccd.img
-	}
-EOF
-}
-
-write_srcd_5() {
-	cat <<EOF
-	menuentry "${longname} [${1}] (64bit${bootops}" --class rescue {
-${grub_string}
-		set isofile=${path}
-		loopback loop \${isofile}
-		linux (loop)/isolinux/rescue64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
-		initrd (loop)/isolinux/initram.igz
-	}
-	menuentry "${longname} [${1}] (32bit${bootops}" --class rescue {
-${grub_string}
-		set isofile=${path}
-		loopback loop \${isofile}
-		linux (loop)/isolinux/rescue32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
-		initrd (loop)/isolinux/initram.igz
-	}
-EOF
-}
-
-# Get v5 ISOs
-# Use: isogrep5 [-v]
-#   -v invert match
-isogrep5() {
-	ls -rv "${isopref}"/systemrescuecd-*.iso | grep ${1} -e '-x86-5'
-}
-
-write_srcd_submenu() {
-	# Start submenu
-	echo "submenu \"${longname}\" --class submenu {"
-
-	# Make sure to reverse-sort by version
-	for iso in $(isogrep5 -v; isogrep5); do
-		path=$(make_system_path_relative_to_its_root "${iso}")
-		gettext_printf "  image: ${iso}\n" >&2
-		if $(printf '%s\n' "6.0.0" $(echo ${iso} | isovsed) | sort -VC); then
-			write_srcd $(echo ${iso} | isovsed)
-		else
-			write_srcd_5 $(echo ${iso} | isovsed)
-		fi
-	done
-
-	# End submenu
-	echo "}"
-}
-
-bootops=")"
-
-if [ ! -z "${SRCD_BOOTOPTIONS}" ]; then
-	bootops=" with bootoptions)"
-fi
-
-if [ "${COPY_SRCD_TO_BOOT}" = yes ]; then
-	srcd=$(realpath "${srcd}")
-	copy_srcd_iso "${srcd}"
-fi
-
-# Build menu entries
-for isopref in "${bootdir}" "${installdir}"; do
-	# Make sure there are any ISOs
-	ls "${isopref}" | grep -E -q -e "${isorex}" || continue
-
-	diskuuid=/dev/disk/by-uuid/$(${grub_probe} --target=fs_uuid "${isopref}")
-	device=$(${grub_probe} --target=device "${isopref}")
-	label=$(${grub_probe} --target=fs_label "${isopref}")
-	[ "${label}" = "(null)" ] && label=${device}
-	grub_string=$(prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab)
-	longname="SystemRescueCD on ${label}"
-
-	gettext_printf "Found %s on %s\n" "${longname}" "${device}" >&2
-
-	write_srcd_submenu
-done
diff --git a/sys-boot/systemrescuecd-x86-grub/metadata.xml b/sys-boot/systemrescuecd-x86-grub/metadata.xml
deleted file mode 100644
index 2e146c34fc2e..000000000000
--- a/sys-boot/systemrescuecd-x86-grub/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoobugs@milaw.biz</email>
-		<name>Michael Lange</name>
-		<description>Accepts only mails from Gentoo's Bugzilla</description>
-	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<longdescription>
-		This package adds menu entries in GRUB for the SystemRescueCD. You can
-		add custom bootoptions for SystemRescueCD in a special config file.
-	</longdescription>
-</pkgmetadata>
diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild
deleted file mode 100644
index 80a820419133..000000000000
--- a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86"
-HOMEPAGE="http://www.sysresccd.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT=0
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-
-RDEPEND="app-admin/systemrescuecd-x86
-	sys-boot/grub"
-
-src_install() {
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/systemrescuecd.grub 39_systemrescuecd
-
-	insinto /etc/default
-	newins "${FILESDIR}"/systemrescuecd.default systemrescuecd
-}
-
-pkg_postinst() {
-	elog "To add the menu entries for systemrescuecd to grub, you should now run"
-	elog "	grub-mkconfig -o /boot/grub/grub.cfg"
-	elog "You can set custom bootoptions in /etc/default/systemrescuecd"
-}
diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.2.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.2.ebuild
deleted file mode 100644
index 76daeb7ece15..000000000000
--- a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86"
-HOMEPAGE="http://www.sysresccd.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT=0
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"
-
-RDEPEND="app-admin/systemrescuecd-x86
-	sys-boot/grub"
-
-src_install() {
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/systemrescuecd.grub-2 39_systemrescuecd
-
-	insinto /etc/default
-	newins "${FILESDIR}"/systemrescuecd.default-2 systemrescuecd
-}
-
-pkg_postinst() {
-	elog "To add the menu entries for systemrescuecd to grub, you should now run"
-	elog "	grub-mkconfig -o /boot/grub/grub.cfg"
-	elog "You can set custom bootoptions in /etc/default/systemrescuecd"
-}