gentoo resync : 25.11.2020

3 files changed, 20 insertions, 122 deletions

diff --git a/sys-boot/arcload/Manifest b/sys-boot/arcload/Manifest
index 6c7512b7e84c..fb6f317f363a 100644
--- a/sys-boot/arcload/Manifest
+++ b/sys-boot/arcload/Manifest
@@ -1,6 +1,5 @@
 AUX arcload.8 2068 BLAKE2B 3a0f5cb2ad182a37f07ac42fbb0b5ae8d9fd830f68dfe1a27eef5f7f1a4e6d9a00703dfedbde3979bf2a90dfb73085e16bad7c7b4778533772717dbca972f1eb SHA512 1b62e8116174d6909e947d88ef1a0ad0214b988c48f579eb9310984ad4e73b7c686e644be2b09dbab7dc2053fc36b1d80d272765c168dd8a662a6420e5ffcd75
 DIST arcload-0.5.tar.bz2 47690 BLAKE2B c58318f2f1eb71c4ad36c50e2f7e1f3fc2bf12a459336cf2aa27984700f10d135eea97e2e853b37de3e1c8d80b267d3232a3c24439473844acc9bce78b9e1e7f SHA512 b4f7186a6e75baa0cde06451a8011769f200d4cc353495dbfeb9c9ffe3ac09b8bbba357e83441e1fe2344c651068fafda7881864d8bf09f221ddae8170cc7b2e
 DIST arcload-0.50-patches-v1.tar.xz 10320 BLAKE2B 854d82ae850f31ae8585b3c37416380457526de236ce70cc5f7280ecde46e1d8b33bb3f57cf551e7862a17618d71b60073d3df65a7aa97bf6bac07bef639ded9 SHA512 7687b08bc70a96f8db9a620976b466ff4bb70c8ed77b0c241d060feb8dcab6019d753ac3b182a74139331c9d33f27e090897a0c7c41c1663e16575fef6e21bdf
-EBUILD arcload-0.50-r1.ebuild 2777 BLAKE2B 8649b6d0c910427d513cc304d2f05108fa1a8601b8ba7352de666d2d073603c59d73345d23ba883ce933d23547e67ce400f1de837f6a15c1b4146f7e820933ed SHA512 4bdd158dfcbdabfbbc89a94b520ace0599b25d69b96ec5026ee2d21876d385cbbeb3d9b31e56d06a4629acb0c6635d7ca1e7532a185ef482ed8d3aeb848bc05a
-EBUILD arcload-0.50-r3.ebuild 4300 BLAKE2B 719121b6943828c13c4456788fe8e2a9bbc88d7a4f334945c9b6a4724e2adc66d1765ba86209b265c3e50feaa4ec2e5f34df0f25372f79cdc343ceb73313b922 SHA512 e7df8a5eeac49354e73c513aba5a1797df65b9f6f385a14d962f80d367c86f11ffa833eb079c0e8e089b00117b9f1836be8a78196b1bf012c71af2665be42651
+EBUILD arcload-0.50-r3.ebuild 3734 BLAKE2B bebf078bd8e0d624a57cfaddd9dad9fb5e4e39c24056a445630b182638ba8d8217777b199886ebd4be2a3e1800a29d7cdd57c48c76d10afb32801c7505486432 SHA512 9d06a163c51fb4473c7a95b8e9fe9540df9037dd26be453250dd6e834e609706a556765a8b671ddf7686e8b86c1db0efb138e9d74b9a5efa7d22e33ffbcb73d9
 MISC metadata.xml 248 BLAKE2B 2b62c181def237d553cd416c54ba8d59cb958da9c3fd8a46eee570d65f87a7a07afa520142d0a0f5f14a9d2f5da23d9207a907149663697517b1f6ab631a0677 SHA512 f79212ef45535225d23961b9b5293e8c161da77801a04a4c1dcf13430c8a524e732603d51c0b39f5109b4408a54c1f19626c3e52e5922b39e35f17bf0e5e7432
diff --git a/sys-boot/arcload/arcload-0.50-r1.ebuild b/sys-boot/arcload/arcload-0.50-r1.ebuild
deleted file mode 100644
index 4a25aaf3d135..000000000000
--- a/sys-boot/arcload/arcload-0.50-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator
-
-# Hack until upstream renames from 0.5 to 0.50
-MY_PV="${PV/50/5}"
-
-DESCRIPTION="ARCLoad - SGI Multi-bootloader.  Able to bootload many different SGI Systems"
-HOMEPAGE="https://www.linux-mips.org/wiki/ARCLoad"
-SRC_URI="https://www.linux-mips.org/pub/linux/mips/people/skylark/arcload-${MY_PV}.tar.bz2"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* ~mips"
-IUSE=""
-DEPEND="sys-boot/dvhtool"
-RDEPEND=""
-RESTRICT="strip"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	# For gcc-4.x, quiet down some of the warnings
-	$(version_is_at_least "4.0" "$(gcc-version)") && \
-		epatch "${FILESDIR}"/${P}-shut-gcc4x-up.patch
-
-	# Redefine the targets in the primary Makefile to give us
-	# finer control over building the tools.  This is for properly
-	# cross-compiling arcload
-	epatch "${FILESDIR}"/${P}-makefile-targets.patch
-}
-
-src_compile() {
-	# Build the wreckoff tool first.  It converts a 32bit MIPS ELF
-	# into a relocatable ECOFF image.  We call for BUILD_CC
-	# on the offchance that we're cross-compiling.
-	echo -e ""
-	einfo ">>> Building the 'wreckoff' utility with $(tc-getBUILD_CC) ..."
-	emake CC=$(tc-getBUILD_CC) tools_clean tools
-
-	# 32bit copy (sashARCS for IP22/IP32)
-	echo -e ""
-	einfo ">>> Building 32-bit version (sashARCS) for IP22/IP32 ..."
-	cd "${S}"
-	emake MODE=M32 bootloader_clean
-	emake CC=$(tc-getCC) LD=$(tc-getLD) MODE=M32 bootloader
-	cp "${S}"/arcload.ecoff "${WORKDIR}"/sashARCS
-
-	# 64bit copy (sash64 for IP27/IP28/IP30)
-	echo -e ""
-	einfo ">>> Building 64-bit version (sash64) for IP27/IP28/IP30 ..."
-	emake MODE=M64 bootloader_clean
-	emake CC=$(tc-getCC) LD=$(tc-getLD) MODE=M64 bootloader
-	cp "${S}"/arcload "${WORKDIR}"/sash64
-}
-
-src_install() {
-	dodir /usr/lib/arcload
-	cp "${WORKDIR}"/sashARCS "${D}"/usr/lib/arcload
-	cp "${WORKDIR}"/sash64 "${D}"/usr/lib/arcload
-	cp "${S}"/arc.cf-bootcd "${D}"/usr/lib/arcload/arc-bootcd.cf
-	cp "${S}"/arc.cf-octane "${D}"/usr/lib/arcload/arc-octane.cf
-}
-
-pkg_postinst() {
-	echo -e ""
-	einfo "ARCLoad binaries copied to: /usr/lib/arcload"
-	echo -e ""
-	einfo "Use of ARCLoad is relatively easy:"
-	einfo "\t1) Determine which version you need"
-	einfo "\t\tA) sashARCS for IP22/IP32"
-	einfo "\t\tB) sash64 for IP27/IP28/IP30"
-	einfo "\t2) Copy that to the volume header using 'dvhtool'"
-	einfo "\t3) Edit /usr/lib/arcload/arc-*.cf to fit your specific system"
-	einfo "\t   (See ${HOMEPAGE} for"
-	einfo "\t    an explanation of the format of the config file)"
-	einfo "\t4) Copy the config file to the volume header with 'dvhtool' as 'arc.cf'"
-	einfo "\t5) Copy any kernels to the volume header that you want to be bootable"
-	einfo "\t6) Reboot, and enjoy!"
-	echo -e ""
-}
diff --git a/sys-boot/arcload/arcload-0.50-r3.ebuild b/sys-boot/arcload/arcload-0.50-r3.ebuild
index b35a574efcf1..33e6d147541b 100644
--- a/sys-boot/arcload/arcload-0.50-r3.ebuild
+++ b/sys-boot/arcload/arcload-0.50-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs versionator
+inherit toolchain-funcs
 
 # Hack until upstream renames from 0.5 to 0.50
 MY_PV="${PV/50/5}"
@@ -13,9 +13,11 @@ DESCRIPTION="ARCLoad - SGI Multi-bootloader.  Able to bootload many different SG
 HOMEPAGE="https://www.linux-mips.org/wiki/ARCLoad"
 SRC_URI="https://www.linux-mips.org/pub/linux/mips/people/skylark/${PN}-${MY_PV}.tar.bz2
 	 mirror://gentoo/${P}-patches-v${PATCHREV}.tar.xz"
+
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="-* ~mips"
+
 IUSE="abi_mips_o32"
 DEPEND="sys-boot/dvhtool
 	abi_mips_o32? ( sys-devel/kgcc64 )"
@@ -25,41 +27,21 @@ RESTRICT="strip"
 S="${WORKDIR}/${PN}-${MY_PV}"
 PATCHDIR="${WORKDIR}/${P}-patches"
 
+PATCHES=(
+	"${PATCHDIR}/${P}-shut-gcc4x-up.patch"		# For gcc-4.x, quiet down some of the warnings
+	"${PATCHDIR}/${P}-makefile-targets.patch"	# Tweak Makefile to allow for cross-compiling
+#	"${PATCHDIR}/${P}_deb-elf64-on-m32.patch"	# Load ELF64 images on 32-bit systems - XXX: #543978
+	"${PATCHDIR}/${P}_deb-cmdline-config.patch"	# Pass arcload label name on PROM cmdline
+	"${PATCHDIR}/${P}_deb-config-in-etc.patch"	# Look for arc.cf in /etc and fallback to /
+	"${PATCHDIR}/${P}-local-elf_h.patch"		# Use std sysheaders bits to make compiler happy
+	"${PATCHDIR}/${P}-wreckoff-abiflags-fix.patch"	# Patch wreckoff.c to handle the .MIPS.abiflags section
+	"${PATCHDIR}/${P}-disable-ssp.patch"		# Disable SSP for ELF->ECOFF, as wreckoff can't handle
+	"${PATCHDIR}/${P}-silence-warnings.patch"	# Silence various warnings due to the code being old
+)
+
 src_prepare() {
-	# For gcc-4.x, quiet down some of the warnings
-	epatch "${PATCHDIR}"/${P}-shut-gcc4x-up.patch
-
-	# Redefine the targets in the primary Makefile to give us
-	# finer control over building the tools.  This is for properly
-	# cross-compiling arcload
-	epatch "${PATCHDIR}"/${P}-makefile-targets.patch
-
-	# Patches borrowed from Debian:
-	# - Load ELF64 images on 32-bit systems - XXX: #543978
-	# - Pass an arcload label name directly on the PROM cmdline.
-	# - Look for arc.cf in /etc and fallback to /.
-#	epatch "${PATCHDIR}"/${P}_deb-elf64-on-m32.patch
-	epatch "${PATCHDIR}"/${P}_deb-cmdline-config.patch
-	epatch "${PATCHDIR}"/${P}_deb-config-in-etc.patch
-
-	# Building arcload on different MIPS ABIs can be difficult,
-	# so we include specific bits from standard system headers
-	# to make the compiler happy.  These should rarely, if ever,
-	# change...
-	epatch "${PATCHDIR}"/${P}-local-elf_h.patch
-
-	# Patch wreckoff.c to handle the new .MIPS.abiflags section.
-	epatch "${PATCHDIR}"/${P}-wreckoff-abiflags-fix.patch
-
-	# In order to convert from ELF to ECOFF, we need to disable
-	# SSP, as that adds additional program headers that I don't
-	# know how to handle in wreckoff.c.
-	epatch "${PATCHDIR}"/${P}-disable-ssp.patch
-
-	# The code is old and has a lot of issues.  But it's just a
-	# simple bootloader, so silence the various warnings until
-	# it can be re-written.
-	epatch "${PATCHDIR}"/${P}-silence-warnings.patch
+	default
+	eapply_user
 }
 
 src_compile() {