gentoo resync : 25.11.2020

6 files changed, 12 insertions, 201 deletions

diff --git a/sys-boot/yaboot-static/Manifest b/sys-boot/yaboot-static/Manifest
index 05da4ea90179..4e1ab72b2a63 100644
--- a/sys-boot/yaboot-static/Manifest
+++ b/sys-boot/yaboot-static/Manifest
@@ -1,9 +1,4 @@
-AUX new-ofpath-devspec.patch 906 BLAKE2B 8bb4fc02a42393db4cb93cf7811acdc9d8919c5d12c9a2a6ab1e725aeab4541d07790c6c44b9977f63ffd99d81e9e6bf1ab4b0a6c23b984226c267faef17304d SHA512 e609c8bf8efc9a131f9706e2c6d9978b4b2759e25d11705dfde06f01954054c0217620db156cd3547284ffbcae5bb19e1adff5dc9c590ada05d716ff2286d203
-AUX sysfs-ofpath.patch 3440 BLAKE2B 958ec56d48fe1e337a2619c791ae72e0e56f3ba5c35b4a74ce015c7ca28884f521381986fc30b78ebe62316256bb6a30dd6968c6eaae0cd04fb27fe1bc39e2a5 SHA512 a4c9f89fb09e116f5f4bd0dfacd8b1d2e5f88733892f3f5041466380d499a2ade6fa0d96a0e7870c94ad1ef94cd7f4c609f6b6886a93e5e1b125c30f86a6a660
-DIST yaboot-static-1.3.14.tbz2 154587 BLAKE2B 258641b2c12bd7877976d7b22b23a15443327f34c7a07bb60675e040e4b9ba1a9deff56d64c391761d2fafbf830fec7172164e0786beb0cd2971179444d3dcd8 SHA512 e175fd3b31c8e26dd7177ab3c995015ebeb34f2877e1e64eabb3cbb21d0cb0e41e9c60c423e07ebb48f43ccd60ff1ff95a2001d0af220531be1bd25e04cf9bdc
-DIST yaboot-static-1.3.16.tbz2 159798 BLAKE2B 8ca04f7c2a43444898c3b057860ccc295c6aa2739fed5aff430563cdfa7395885176a0b8cd8f0e2e00effbd42bcc1f76c6502cf367594c83ffa71f8682dca120 SHA512 9aaf4432764631db923638d11d87868e9774ea6bec875110af1cd21a818c59781b7beebac4848a6a32aa592816fded214f5c6b159ecbd1654a0c6051c42dd580
+AUX new-ofpath-devspec.patch 910 BLAKE2B ad172839b4612e312fde07b51f3bc06b1c49c30c566f98c8a7bf63cd78ac369386e9f5b02f485be0848b65aad7972f641abb0b25655933e5d6a0dfa34c7c91a0 SHA512 468a8f3618ecadd9a2c4c2c64192df43ffb794cdc9575d6260668844f7048b863ab9680997ae77ff2812cc3130d7d9544fdc25229efbf940d4754789b61592c9
 DIST yaboot-static-1.3.17.tbz2 162142 BLAKE2B ddaa1e01c08b926a0fb295e350ba8a80a0b2c5d0cc7a8346d05e7e6c7441b9748f781a82382afcaad770ed04ebd4e3032bd16e605b8ad984b13ab9564500890a SHA512 23caf8d7308aba7402f13fc558e2182f63317fa7cf502899503247d2d2b8741b8327b447a50edce775eed0ea02fed5b675f4b40c8bafd956cbd25662c9f2ad72
-EBUILD yaboot-static-1.3.14-r1.ebuild 889 BLAKE2B 8853377e1f2ad4dfca18c538285d506b751df4ac366fa873a40bb31b8831c61b5678d111f181a878da8b4c1ed9217714f158f1f48e601cc8b8671d36e0068535 SHA512 0b25fbc7e6393c8133c8fe8237d4111648684644924ce50e42a2df333c11c6761f44ee47adca77a426c1c12ae17f686cad3abc10a8f6647d37bf1035f414bfd7
-EBUILD yaboot-static-1.3.16-r1.ebuild 735 BLAKE2B 34acf91b58f497eefaf6e2ef6d27adb45b3e53da8f11f9590974bcce22f3694573a275047e453adf166b7bc3c3b85123f67395cf0c1eb14d054bcd0d5d76b10b SHA512 711bdede68f4f04aef740089f0cdc648075129edd048f75195b96cb214a846f4e00347920f35f5132e2b9af4e64924ad2575b6bec61c7d145fa608fbbd879aa3
-EBUILD yaboot-static-1.3.17-r1.ebuild 801 BLAKE2B be3a689c48eca1faf3d84162b8c9c49c463335991779798bcdc82153e4e60711edeffb3523127ae4b33017dd1835031ab1aae45e175b1e52dd6a2e76fc5553ca SHA512 836ccaba5e466fe89f791167d03a7f9744c3c7a2d5986ee0798f754715a2b21c3dc45f2ba332929882a7a0371f39dd8a7d5f4ef3caae52e8d880dda244d18b7e
+EBUILD yaboot-static-1.3.17-r2.ebuild 797 BLAKE2B 53342aaa52f4bd7b8e2e935f35507aab5113faa61c5da04952c59f71c4382aea71ef46ff1db9cc4fa001bf86f044e363c0a7df841fd68ed4792cdcaae5ae0c93 SHA512 e6590d3d43faf1835fd381f7b4dd67d744b2c11e2fd743261259aaa628535828a8e92f51617a27245ec8aebb55b4f8b85886c9f2cf08386d8ccfb0e68a8bc24c
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-boot/yaboot-static/files/new-ofpath-devspec.patch b/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
index f225e8e1bb4b..822173904ad3 100644
--- a/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
+++ b/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
@@ -1,7 +1,7 @@
 Fix the devspec path on newer kernels
 
---- usr/sbin/ofpath
-+++ usr/sbin/ofpath
+--- a/usr/sbin/ofpath
++++ b/usr/sbin/ofpath
 @@ -85,11 +85,20 @@
  [ "$DEBUG" = 1 ] && echo "Devpath is: $DEVPATH"
  
diff --git a/sys-boot/yaboot-static/files/sysfs-ofpath.patch b/sys-boot/yaboot-static/files/sysfs-ofpath.patch
deleted file mode 100644
index 7a3659100495..000000000000
--- a/sys-boot/yaboot-static/files/sysfs-ofpath.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- usr/sbin/ofpath	2008-08-03 04:00:35.000000000 -0400
-+++ usr/sbin/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-static/yaboot-static-1.3.14-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild
deleted file mode 100644
index 72f3850f3c17..000000000000
--- a/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe.
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-HOMEPAGE="http://yaboot.ozlabs.org/"
-SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils"
-RDEPEND="!sys-boot/yaboot
-	!ibm? (
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils
-		sys-fs/mac-fdisk
-	)"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="
-	/usr/lib/yaboot/yaboot
-	/usr/lib/yaboot/yaboot.chrp
-	/usr/lib/yaboot/addnote
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/sysfs-ofpath.patch
-}
-
-src_install() {
-	# don't blow away the user's old conf file
-	mv "${WORKDIR}"/etc/yaboot.conf{,.sample} || die
-	cp -pPR "${WORKDIR}"/* "${D}" || die
-}
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild
deleted file mode 100644
index 4ed2be3006cb..000000000000
--- a/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe.
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-HOMEPAGE="http://yaboot.ozlabs.org/"
-SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc ppc64"
-IUSE="ibm"
-
-DEPEND="sys-apps/powerpc-utils"
-RDEPEND="!sys-boot/yaboot
-	!ibm? (
-		sys-fs/hfsutils
-		sys-fs/hfsplusutils
-		sys-fs/mac-fdisk
-	)"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="
-	/usr/lib/yaboot/yaboot
-	/usr/lib/yaboot/yaboot.chrp
-	/usr/lib/yaboot/addnote
-"
-
-src_install() {
-	cp -pPR "${WORKDIR}"/* "${D}" || die
-}
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
index 531874033bde..cf88b3abb22c 100644
--- a/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.17-r2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe.
 
-EAPI="5"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
 HOMEPAGE="http://yaboot.ozlabs.org/"
@@ -16,8 +14,10 @@ SLOT="0"
 KEYWORDS="-* ppc ppc64"
 IUSE="ibm"
 
-DEPEND="sys-apps/powerpc-utils"
-RDEPEND="!sys-boot/yaboot
+DEPEND=""
+RDEPEND="
+	!sys-boot/yaboot
+	sys-apps/ibm-powerpc-utils
 	!ibm? (
 		sys-fs/hfsutils
 		sys-fs/hfsplusutils
@@ -33,7 +33,8 @@ QA_PRESTRIPPED="
 "
 
 src_prepare() {
-	epatch "${FILESDIR}/new-ofpath-devspec.patch"
+	default
+	eapply "${FILESDIR}/new-ofpath-devspec.patch"
 }
 
 src_install() {