gentoo resync : 25.11.2020

8 files changed, 7 insertions, 361 deletions

diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 20c4a13c2b97..bd701d891253 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -2,18 +2,10 @@ AUX chrpfix.patch 983 BLAKE2B 8b2ecfaf5af26639abb3ed24e3b0cf5fe46e95d17a23e329ed
 AUX e2fsprogs-1.42.13-sysmacros.h.patch 2166 BLAKE2B 48aa9607e048115124f9321aa574ff9c0fb8d094487a964a6b856325e2d378e40f5bf3dd019731f60167ee157c205c3f139bbaf1b14ec84056c79c8d03fb734e SHA512 ebb3731731fa19b0b2a085b9ad2217dfe7502b050ac027fbd4afd86c240630e09b8ad63d37c476ab58d5c1d1658ab651bd5459c450db2a0b4721e2c2b84c3182
 AUX new-ofpath 4319 BLAKE2B 04866ae6446993febf28fd49fd382e6092724640e74e5dc940777dac21ee3acb12722f1e2c90f793f89de5ce97c8ce743a853ad8968e5c86a2a17c5525e0c6f1 SHA512 8095d1e085a38d3c058e750acabaaf58464117f1af03fcc4604e86c58cd305e138b340420d3f1a5da5e3752dea59cc823599a6cc7a585195011f0030f1b80787
 AUX new-ofpath-devspec.patch 940 BLAKE2B d398bb81e62ce4caecc2431657c2429d8fdb76b56c82ea2975784662f8eef52dd5201e98d78343ed6b9a4a3ce29844e4060edf25b24c232d2e7b0afe4e05b616 SHA512 ff3dfa9bb8d79d48d083b618e39ad98b0e6dc26c13986d0187961fcd323c8979439c0b21dc37655e4749db75ba397597c52a9a66b05a41155257219eaa0e660c
-AUX sysfs-ofpath.patch 3432 BLAKE2B 307f737b869ca0de81e638a48b4a7e0d9d597b0dc86cc3680efa6e40561706a8829b0c3a13c7d0f6153345d75d9394a8975131ec1722b8f18f8eb261753efec7 SHA512 e99946565708581ac0c606b4490f129eb7fd3687ef30350c4fd5a184a296cf8803d9ea4429a8c00011e7a491040ac2369185bd56cc327437755ce533e4749e38
-AUX yaboot-1.3.16-memalign.patch 889 BLAKE2B df80c4bd0ed2291dd465822820874ea913693f22eb916a7707bdfbb6ea36fb5592d0f2bdd2c7643fff93f7be9d78431ac6f2f25ad31d110b7a31fe94cc118fae SHA512 d80c9c9d8592f33d39b900c86dbda3a13ec23f8d6b1a6d9612ba59b6c38218b9e41b9f3a3aa01bd39c8b91ae01d7ea4693ae93b0e7cf9c0912f7243e1364820c
 AUX yaboot-1.3.17-nopiessp-gcc4.patch 1229 BLAKE2B a1d8faa966e7e1daa609d4102e5e9a73a429db3d2a762620ed4251a00b52aec4ae939dfce13bed933de29ae1fc0d23774b5fe7206087a58951ad837a3e4420e4 SHA512 32e41b33a1e7109ec0a7ba9ca97ff0d45144d9499aa7657bc93a8007c6c6fa8206a6b406729cbb27407c84ef004b4cdb85e4664d9a4666cbde7700e7b3e82231
-AUX yaboot-nopiessp-gcc4.patch 1355 BLAKE2B 2728cceadba84f37953ed702d09b69a6b11d9320dc97490f145e30bb8845011f9e26d18d909ac2e330512f2651d26d7d0dfdbc85d3d5c45a28ea29d8bc4de16d SHA512 413b2353735d82a81e2831d1e51a995096eadfb3c17feb51b6b75035057557ed8c9adebd58fa1635fcaae36fd25c1783e491b85b4437dfb73e1569cf48a51359
 AUX yaboot-stubfuncs.patch 4610 BLAKE2B e2c8f77d4a0e12a74d9a52b0a410f671509ff1db205f09569108745eab31719218a0cd9d302d6d8471c50b54b458a5752417f5eff42017fa50476632b78b232c SHA512 1acb5a8a054ce469b7f0d7ee7960067a03fb1df0b43cafc7a1c4e9775b27ed7e982028185ebbc564116d51406b8ee7b12357cfab456ac00a26e9415e1da58fb8
 AUX yabootconfig-1.3.13.patch 1655 BLAKE2B bdd8f618bc30706b04adba1664a5414a233f9c32d793b364158a3f9b665872b9f2da3b5f9ac20e13b713280be2f6fb097055095a4d23f2953bff8630f116abdd SHA512 0efcae987f7cc9b93a86bbcbe1e74b3ee6228b0db3937adea1f6c8b2e48c58cab35db80209ae6e79ff3e9f992c374b65a7786adf46787c0bbe400270ae006e98
 DIST e2fsprogs-1.42.13.tar.gz 6511931 BLAKE2B 2f849e82ad366f86d9d166f1901a99a8ac0ddc94471a29fb0de9132ae2ba8f8dc0f4c143acf889afdaa1daf1c57e7bf545a2b4e15ebb8463667f2768a8bc2ebb SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0
-DIST yaboot-1.3.14.tar.gz 219089 BLAKE2B e9f71476502dd61e1e277980eab486b35675f809249e27d72627f6469c75c7ea43740898cc8dc58196bb70d08dce52ef334fcd035ac92c66a4f77236a0371049 SHA512 7542073159a15787e27fd8246fe4c84c48cec5cc6fe76be06f4591bb9ca459ad0c81f0085f08d944745a186da005a5ace0d3d0b2598711ca3309fad1c5a00e74
-DIST yaboot-1.3.16.tar.gz 220360 BLAKE2B e717b101f14b6178f9fdcd4cf45077c1b9c5db91504f8a000710c02d8b35f6094deb590710c09352fcd18385122a1824b99de5600b176c79da0937fa5b287b0b SHA512 9cd98335c8b32787567253e628549fe88af5ebe4b81fb6b99741fbbcc0ae3b44dc4fdad527ed27da00103bc0482d9a33d3f128f542884387f5aa754546624e14
 DIST yaboot-1.3.17.tar.gz 224325 BLAKE2B 41f96266f2342eebbfdc3c0eb64eeaf59e55a31d7388f86839cf9318d231ef808d3aa16fb3b3fdfe85a6fca743e191d064f0ed633723f135a7ca25483e460566 SHA512 da910c4c6ca2de817342bf4dbcefe2857606043e614782581a86bae206cf6cfe5597ad47aea15369feb60e02d8a4f9f4aa3b12863d715c757584c1f4d7ffb9de
-EBUILD yaboot-1.3.14-r2.ebuild 1090 BLAKE2B c0cec53d18160ba535a5efc3f55f552e5b5f266794201d961f03bc1eadeb25b4d6f667e13c49b9a1b8973c03dc8381190c2b2966ad542fae761c4bcd2bce654d SHA512 e400c540823a82924328d46385fcc5aac8b72aa29e7a0f85daf8d9ba7a87461300cc95acb9c01547c0209b4274e28447772e84aa94df18d53108da303eb9b4e3
-EBUILD yaboot-1.3.16.ebuild 1258 BLAKE2B 5c89562628f998bbe0bc5f4850ea6d802b3d28d1018af02d96f8b1d1d6a551e0ee2f7dfc68a9236e251715feae6ea557928981a8d97f5c70ee90e06175e01fac SHA512 447724cc4ad94e30c9cfa1520f599edce8363b127d244ac98c9680089af9a598f330fc33f954adafd764527e5b4bbfb85fcdcdf9ae192c941ab2b039d907a770
-EBUILD yaboot-1.3.17-r2.ebuild 1422 BLAKE2B e396ceaff0619050e0d7516a9fedd9071968f8506dcccf17c71e6572c00fc15da4ee9cab223a21c43ec473a056d773f53835b5d43026fffc85293b83ba8009e9 SHA512 06714ef51cb0a8597a8fd548a53c0c50390e9e6b89eec2bcc307cbb3d2fe88c1c6af98e07cee325d6b84e30aa6a53c5fd4c4d9a4588c7ce9814ee018d1c09c58
-EBUILD yaboot-1.3.17-r3.ebuild 2949 BLAKE2B 4176f85831e53f9b70328a12b671a196f73251f25fedd59b31e402bb6d88544af65d3139039f9cc33faf5b84b35e8f940f7fb0d4fa036dddfee37c4ddff20a93 SHA512 bce038921c863b3df3c74667182c286506eacea2ff83f8a40cce9ca055ba140c40d06af72febd798ed2468ca503465db49e0d17b6f37781c8e39bd165bfd7594
+EBUILD yaboot-1.3.17-r4.ebuild 2953 BLAKE2B ea47761fe654cf8f54f0f46124e2df3c334b9e40e9dcb463de95ea393792bc44a62ad4a87035c48a9522721efd240afa42a3d01c88ef8c9d7caab6e4119b5776 SHA512 a685ab2cf4286c8641564af9b73d4e4dd430082c5124cbed694edbcc59e7a42c9a6b763ddefa86b1d5f8bb2402586f896e11c6246f0b1ce7aae7a622c8d914d4
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-boot/yaboot/files/sysfs-ofpath.patch b/sys-boot/yaboot/files/sysfs-ofpath.patch
deleted file mode 100644
index 7ebc0bfac86f..000000000000
--- a/sys-boot/yaboot/files/sysfs-ofpath.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- ybin/ofpath	2008-08-03 04:00:35.000000000 -0400
-+++ ybin/ofpath	2009-01-09 13:46:12.000000000 -0500
-@@ -337,15 +337,18 @@
- 
- ide_ofpath()
- {
--    if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-+    if [ ! -L "/proc/ide/$DEVNODE" ] && [ ! -e "/sys/block/$DEVNODE" ] ; then
- 	echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured"
- 	return 1
-     fi
- 
--    local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
--    if [ -z "$IDEBUS" ] ; then
--	echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
--	return 1
-+    if [ -L "/proc/ide/$DEVNODE" ] ; then
-+    	    local USE_OLD_PROC=1
-+	    local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
-+	    if [ -z "$IDEBUS" ] ; then
-+		echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
-+		return 1
-+   	 fi
-     fi
- 
-     case "$(uname -r)" in
-@@ -363,7 +366,8 @@
- 		echo 1>&2 "$PRG: Unable to determine sysfs mountpoint"
- 		return 1
- 	    fi
--	    local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec"
-+	    local OF1275IDE=$(cd -P "${SYS}/block/${DEVNODE}/device" && pwd)
-+	    OF1275IDE="${OF1275IDE}/../../devspec"
- 	    ;;
- 	*)
- 	    local OF1275IDE="/proc/ide/$IDEBUS/devspec"
-@@ -402,34 +406,41 @@
- 	    return 1
- 	fi
- 
--	if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
--	    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
--	    return 1
--	fi
--
--	case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
--	    ide|ata)
--		local MASTER="/disk@0"
--		local SLAVE="/disk@1"
--		;;
--	    pci-ide|pci-ata)
--		local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
--		local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
--		;;
--	    scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal.
--		local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
--		local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
--		;;
--	    spi)
--		local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
--		local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
--		;;
--	    *)
--		echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
--		return 1
--		;;
--	esac
-+	
-+	if [ "${USE_OLD_PROC}" = "1" ] ; then
-+		if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
-+		    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
-+		    return 1
-+		fi
- 
-+		case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
-+		    ide|ata)
-+			local MASTER="/disk@0"
-+			local SLAVE="/disk@1"
-+			;;
-+		    pci-ide|pci-ata)
-+			local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
-+			local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
-+			;;
-+		    scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal.
-+			local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
-+			local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
-+			;;
-+		    spi)
-+			local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
-+			local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
-+			;;
-+		    *)
-+			echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
-+			return 1
-+			;;
-+		esac
-+	else
-+	    ### I don't know what other disks would look like... FIXME
-+	    local MASTER="/disk@0"
-+	    local SLAVE="/disk@1"
-+	fi
-+	
- 	case "$DEVNODE" in
- 	    hda|hdc|hde|hdg|hdi|hdk|hdm|hdo)
- 		echo "${DEVSPEC}${MASTER}:$PARTITION"
diff --git a/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch b/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch
deleted file mode 100644
index 0fe4e250f292..000000000000
--- a/sys-boot/yaboot/files/yaboot-1.3.16-memalign.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -uNr yaboot/lib/malloc.c yaboot-1.3.16//lib/malloc.c
---- yaboot/lib/malloc.c	2010-07-09 03:18:17.000000000 +0100
-+++ yaboot-1.3.16//lib/malloc.c	2011-01-23 16:57:13.000000000 +0000
-@@ -42,6 +42,37 @@
- 	last_alloc = 0;
- }
- 
-+static char *align_ptr_to(char *ptr, unsigned long align)
-+{
-+	return (char *)((((unsigned long)ptr) + (align - 1UL)) &
-+			~(align - 1UL));
-+}
-+
-+int posix_memalign(void **memptr, unsigned long alignment, unsigned long size)
-+{
-+	char *caddr;
-+
-+	if (alignment & (alignment - 1UL))
-+		return -1;
-+
-+	if (alignment & (sizeof(void *) - 1UL))
-+		return -1;
-+
-+	if (size == 0)
-+	{
-+		*memptr = (void *)0;
-+		return 0;
-+	}
-+
-+	caddr = align_ptr_to(malloc_ptr, alignment);
-+	malloc_ptr = (caddr + size);
-+	last_alloc = caddr;
-+	malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
-+
-+	*memptr = caddr;
-+	return 0;
-+}
-+
- void *malloc (unsigned int size)
- {
-     char *caddr;
diff --git a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch b/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
deleted file mode 100644
index ed1755b72b33..000000000000
--- a/sys-boot/yaboot/files/yaboot-nopiessp-gcc4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-disable ssp usage in yaboot itself
-
-unfortunately, since we link against external libs that themselves were built
-with ssp turned on, we have to provide stubs to keep the linking from failing
-
---- yaboot-1.3.13/Config.gentoo
-+++ yaboot-1.3.13/Config.gentoo
-@@ -0,0 +1,6 @@
-+check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
-+	then echo "$(1)"; else echo "$(2)"; fi)
-+
-+CFLAGS     += $(call check_gcc, -fno-stack-protector)
-+CFLAGS     += $(call check_gcc, --nopie)
-+
---- yaboot-1.3.13/Makefile
-+++ yaboot-1.3.13/Makefile
-@@ -1,6 +1,7 @@
- ## Setup
- 
- include Config
-+include Config.gentoo
- 
- VERSION = 1.3.13
- # Debug mode (spam/verbose)
-@@ -79,7 +80,7 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/
- OBJS = second/crt0.o second/yaboot.o second/cache.o second/prom.o second/file.o \
- 	second/partition.o second/fs.o second/cfg.o second/setjmp.o second/cmdline.o \
- 	second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \
--	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
-+	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o lib/ssp.o
- 
- ifeq ($(USE_MD5_PASSWORDS),y)
- OBJS += second/md5.o
---- yaboot-1.3.14/lib/ssp.c
-+++ yaboot-1.3.14/lib/ssp.c
-@@ -0,0 +1,2 @@
-+void __stack_chk_fail(void) {}
-+void __stack_chk_fail_local(void) {}
diff --git a/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
deleted file mode 100644
index dae3363bec71..000000000000
--- a/sys-boot/yaboot/yaboot-1.3.14-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-HOMEPAGE="http://yaboot.ozlabs.org"
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils
-	sys-fs/e2fsprogs[static-libs]"
-RDEPEND="!sys-boot/yaboot-static
-	!ibm? (
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils
-		sys-fs/mac-fdisk
-	)"
-
-src_prepare() {
-	# No need to hardcode this path -- the compiler already knows to use it.
-	sed -i \
-		-e 's:-I/usr/include::' \
-		Makefile || die
-
-	# dual boot patch
-	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
-	epatch "${FILESDIR}/chrpfix.patch"
-	epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch"
-	epatch "${FILESDIR}/sysfs-ofpath.patch"
-}
-
-src_compile() {
-	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	sed -i -e 's/\/local//' etc/yaboot.conf
-	emake ROOT="${D}" PREFIX=/usr MANDIR=share/man install
-}
diff --git a/sys-boot/yaboot/yaboot-1.3.16.ebuild b/sys-boot/yaboot/yaboot-1.3.16.ebuild
deleted file mode 100644
index d7c35c1ef85b..000000000000
--- a/sys-boot/yaboot/yaboot-1.3.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-HOMEPAGE="http://yaboot.ozlabs.org"
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils
-	sys-fs/e2fsprogs[static-libs]"
-RDEPEND="!sys-boot/yaboot-static
-	!ibm? (
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils
-		sys-fs/mac-fdisk
-	)"
-
-src_unpack() {
-	default
-	cd "${S}"
-	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
-}
-
-src_prepare() {
-	# No need to hardcode this path -- the compiler already knows to use it.
-	sed -i \
-		-e 's:-I/usr/include::' \
-		Makefile || die
-
-	# dual boot patch
-	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
-	epatch "${FILESDIR}/chrpfix.patch"
-	epatch "${FILESDIR}/yaboot-nopiessp-gcc4.patch"
-
-	# e2fsprogs memalign patch
-	epatch "${FILESDIR}/${P}-memalign.patch"
-}
-
-src_compile() {
-	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	sed -i -e 's/\/local//' etc/yaboot.conf || die
-	emake ROOT="${D}" PREFIX=/usr MANDIR=share/man install
-	mv "${ED}"/etc/yaboot.conf{,.sample} || die
-}
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
deleted file mode 100644
index 388d67bca957..000000000000
--- a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="PPC Bootloader"
-HOMEPAGE="http://yaboot.ozlabs.org"
-SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc -ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils
-	sys-fs/e2fsprogs[static-libs]"
-RDEPEND="!sys-boot/yaboot-static
-	!ibm? (
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils
-		sys-fs/mac-fdisk
-	)"
-
-src_unpack() {
-	default
-	cd "${S}"
-	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
-}
-
-src_prepare() {
-	# No need to hardcode this path -- the compiler already knows to use it.
-	# Error only on real errors, for prom printing format compile failure.
-	sed -i \
-		-e 's:-I/usr/include::' \
-		-e 's:-Werror:-Wno-error:g' \
-		Makefile || die
-
-	# dual boot patch
-	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
-	epatch "${FILESDIR}/chrpfix.patch"
-	epatch "${FILESDIR}/${P}-nopiessp-gcc4.patch"
-	epatch "${FILESDIR}/${PN}-stubfuncs.patch"
-
-	# Fix the devspec path on newer kernels
-	epatch "${FILESDIR}/new-ofpath-devspec.patch"
-}
-
-src_compile() {
-	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	sed -i -e 's/\/local//' etc/yaboot.conf || die
-	emake ROOT="${D}" PREFIX=/usr MANDIR=share/man install
-	mv "${ED}"/etc/yaboot.conf{,.sample} || die
-}
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
index 832df154e076..91ba5ea6797e 100644
--- a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.17-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,13 +20,13 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~ppc -ppc64"
+KEYWORDS="-* ppc -ppc64"
 IUSE="ibm"
 
-DEPEND="
-	sys-apps/powerpc-utils
-"
-RDEPEND="!sys-boot/yaboot-static
+DEPEND=""
+RDEPEND="
+	!sys-boot/yaboot-static
+	sys-apps/ibm-powerpc-utils
 	!ibm? (
 		sys-fs/hfsutils
 		sys-fs/hfsplusutils