Drop old 0.43. Bump 0.50 to EAPI=4 and clean up.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

6 files changed, 20 insertions, 132 deletions

diff --git a/sys-boot/arcload/ChangeLog b/sys-boot/arcload/ChangeLog
index 195248483b07..ab2f7d9fee02 100644
--- a/sys-boot/arcload/ChangeLog
+++ b/sys-boot/arcload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/arcload
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/ChangeLog,v 1.13 2011/04/10 14:13:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/ChangeLog,v 1.14 2011/08/23 00:36:13 mattst88 Exp $
+
+  23 Aug 2011; Matt Turner <mattst88@gentoo.org> -arcload-0.43-r1.ebuild,
+  -files/arcload-0.43-tweaks1.patch, arcload-0.50-r1.ebuild, metadata.xml:
+  Drop old 0.43. Bump 0.50 to EAPI=4 and clean up.
 
   10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> arcload-0.43-r1.ebuild,
   arcload-0.50-r1.ebuild:
diff --git a/sys-boot/arcload/Manifest b/sys-boot/arcload/Manifest
index 0bc45c707b50..de17913e21ee 100644
--- a/sys-boot/arcload/Manifest
+++ b/sys-boot/arcload/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX arcload-0.43-tweaks1.patch 615 RMD160 d4088d6772162776d9d3fd3874c31205ac02a147 SHA1 f893d7197c2fc8e9255cf51e7e789dc4cb3dbc4e SHA256 fa3a79492d83429085a9cae98bb75a2093a188424fb626bd651c1e5014cf14e9
 AUX arcload-0.50-makefile-targets.patch 928 RMD160 32bf3d05a62197e3390974926bb8d61f8b8a8405 SHA1 52761bb480a0940080c7e48a3eabba965d649447 SHA256 6f1b14403ee85e1f5397b8b4e1d873cbc67624ae3c0f09ae840788988784d846
 AUX arcload-0.50-shut-gcc4x-up.patch 9385 RMD160 54afe747c639e2c3e307d9af5cc4f7a6a2673bb3 SHA1 6167486331ba43c7edf7baacf709211d2dc52fc5 SHA256 7fd5e671b5181f19bd5615d715f43c71ee95ed216fc989a93d276b08052f2335
-DIST arcload-0.43.tar.bz2 22419 RMD160 6d70c4aa670d659db9613982765a47fe287bd3f9 SHA1 bdc580e900a7d57cc3087be0bfbb3b82c06015ca SHA256 9ba041871a2945a12351bbdb9db6946d423d11f02cc2e710a084d6c5062cc6e5
 DIST arcload-0.5.tar.bz2 47690 RMD160 38cbc843c6375e0954e408947ac3e58eb598e301 SHA1 ea1ff3971a2db2aa46f6448cfafbbe8a2a0c30dd SHA256 69cc45f7d27b30256875ccda115b6f74dd3bd894033f0f81b6f87ea1d8f7a0ac
-EBUILD arcload-0.43-r1.ebuild 2532 RMD160 faf3907e6f97644b580631e94b9566ad34b78af2 SHA1 7d13b45f188301d8d6f3c78b886cff49e2643987 SHA256 fb0a6cfb2b9d3b07877113f8784d43d58c9104cd4117dfe5652ca054fbd4c058
-EBUILD arcload-0.50-r1.ebuild 3227 RMD160 d873c7583a9915b235088591e404ecfe39576677 SHA1 bbbd019fc897fd7506662b81579e22f92a5e0d6f SHA256 60677d88d051b4d82903534260b378d547844c6de3a1f4f64126cdb75c39b7e0
-MISC ChangeLog 2781 RMD160 11d931355fc2c9696894306d8bc00a946785aca9 SHA1 8a08a1e35bbb38892d6e2e5674f50b69bc8995c7 SHA256 f6e8d8f3e2aebf404555fb9cfa2ef80d3da6d796433897e78f499848d9d5b0be
-MISC metadata.xml 366 RMD160 2c8bf63ab6ff84d6c29d8292a2db92707256811e SHA1 8faa6b966f813cffd55ad67231cc91daae372788 SHA256 55ae163fcb166b30a903a043aea6f2a27cb3782004bf5034363ee552a04e0661
+EBUILD arcload-0.50-r1.ebuild 2901 RMD160 d140256af461d96e671d06795b1935116d63ed76 SHA1 5746ffcf96b148dbdafbf32d7019c126eb29d8e3 SHA256 c52402c6493ea53bc6f1e246cdfb04c77387a6d32ce51d9f80fbc098f193882d
+MISC ChangeLog 2987 RMD160 0935eafd65904119655eda46121ec7a83fcf1aab SHA1 bbc15f6bdc963dcd430189c9fc07637fdaa2ca5a SHA256 d30e4ff557ce736f9f6d01c3442000e6dc3fa8a9ddb26f5115942a31d76051bf
+MISC metadata.xml 278 RMD160 975b6d7b42a75e39aa92bac924095dd23c121906 SHA1 d25ff31d18a774ea85163b28f7ad201535871f6a SHA256 8b9d1872cbd786725fe219abeb254e89529a7a7839bb207d6a005c73ba9ea12d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2hu2MACgkQOeoy/oIi7uwmRgCdFhx3LXoifZPej7rNrh9B7gR0
-Y5oAoNqTz8Or9BiHI2/3L0Pji2RnXAOK
-=aAfw
+iEYEARECAAYFAk5S9gAACgkQTVUdg23rv53FpACdHFqyLZh9DVrHRu0HbhzFcoET
+cU8An1ZEFb6dkGnEF61fdSbbO0Pd2rrb
+=DVC7
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/arcload/arcload-0.43-r1.ebuild b/sys-boot/arcload/arcload-0.43-r1.ebuild
deleted file mode 100644
index 45f630194908..000000000000
--- a/sys-boot/arcload/arcload-0.43-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/arcload-0.43-r1.ebuild,v 1.7 2011/04/10 14:13:49 ulm Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="ARCLoad - SGI Multi-bootloader.  Able to bootload many different SGI Systems."
-HOMEPAGE="http://www.linux-mips.org/wiki/index.php/ARCLoad"
-SRC_URI="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-* ~mips"
-IUSE=""
-DEPEND="sys-boot/dvhtool"
-RDEPEND=""
-RESTRICT="strip"
-
-pkg_setup() {
-	# See if we're on a cobalt system
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		eerror "This package is only intended for SGI systems.  It will not work on any"
-		eerror "other types of MIPS-based systems or any other architectures"
-		echo -e ""
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Adds in detection support for the R14000, and
-	# tweaks detectbaud() in loader/detect.c to return
-	# a default of 9600bps when the function fails
-	epatch "${FILESDIR}"/${P}-tweaks1.patch
-}
-
-src_compile() {
-	echo -e ""
-	einfo ">>> Building 32-bit version (sashARCS) for IP22/IP32 ..."
-	cd "${S}"
-	make MODE=M32 clean || die
-	make CC=$(tc-getCC) LD=$(tc-getLD) MODE=M32 || die
-	cp "${S}"/arcload.ecoff "${WORKDIR}"/sashARCS
-
-	echo -e ""
-	einfo ">>> Building 64-bit version (sash64) for IP27/IP28/IP30 ..."
-	make MODE=M64 clean || die
-	make CC=$(tc-getCC) LD=$(tc-getLD) MODE=M64 || die
-	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' (make sure it is copied 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-r1.ebuild b/sys-boot/arcload/arcload-0.50-r1.ebuild
index 9fd022355de0..08126b84ee1f 100644
--- a/sys-boot/arcload/arcload-0.50-r1.ebuild
+++ b/sys-boot/arcload/arcload-0.50-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/arcload-0.50-r1.ebuild,v 1.3 2011/04/10 14:13:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/arcload-0.50-r1.ebuild,v 1.4 2011/08/23 00:36:13 mattst88 Exp $
+
+EAPI=4
 
 inherit eutils toolchain-funcs versionator
 
@@ -20,20 +22,7 @@ RESTRICT="strip"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-pkg_setup() {
-	# See if we're on a cobalt system
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		eerror "This package is only intended for SGI systems.  It will not work on any"
-		eerror "other types of MIPS-based systems or any other architectures"
-		echo -e ""
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+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
@@ -50,21 +39,21 @@ src_compile() {
 	# on the offchance that we're cross-compiling.
 	echo -e ""
 	einfo ">>> Building the 'wreckoff' utility with $(tc-getBUILD_CC) ..."
-	make CC=$(tc-getBUILD_CC) tools_clean tools || die
+	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}"
-	make MODE=M32 bootloader_clean || die
-	make CC=$(tc-getCC) LD=$(tc-getLD) MODE=M32 bootloader || die
+	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 ..."
-	make MODE=M64 bootloader_clean || die
-	make CC=$(tc-getCC) LD=$(tc-getLD) MODE=M64 bootloader || die
+	emake MODE=M64 bootloader_clean
+	emake CC=$(tc-getCC) LD=$(tc-getLD) MODE=M64 bootloader
 	cp "${S}"/arcload "${WORKDIR}"/sash64
 }
 
diff --git a/sys-boot/arcload/files/arcload-0.43-tweaks1.patch b/sys-boot/arcload/files/arcload-0.43-tweaks1.patch
deleted file mode 100644
index 143cbb151312..000000000000
--- a/sys-boot/arcload/files/arcload-0.43-tweaks1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naurp arcload-0.43.orig/loader/detect.c arcload-0.43/loader/detect.c
---- arcload-0.43.orig/loader/detect.c	2005-09-05 13:32:44 -0400
-+++ arcload-0.43/loader/detect.c	2005-10-14 00:36:46 -0400
-@@ -30,6 +30,7 @@ static struct {
- 	{0x0004, "r4000"},
- 	{0x0009, "r10000"},
- 	{0x000e, "r12000"},
-+	{0x000f, "r14000"},
- 	{0x0020, "r4600"},
- 	{0x0021, "r4700"},
- 	{0x0023, "r5000"},
-@@ -194,7 +195,7 @@ static char *detectbaud(void)
- 	if(var && var[0]=='d') {
- 		var=ArcGetEnvironmentVariable("dbaud");
- 		if(!var)
--			return NULL;
-+			return "baud=9600";
- 		sprintf(baudrate,"baud=%s",var);
- 		return baudrate;
- 	}
diff --git a/sys-boot/arcload/metadata.xml b/sys-boot/arcload/metadata.xml
index d8fbe78088c7..776ed4fa58a6 100644
--- a/sys-boot/arcload/metadata.xml
+++ b/sys-boot/arcload/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>mips</herd>
-	<maintainer>
-		<email>mips@gentoo.org</email>
-		<name>Mips Team</name>
-	</maintainer>
-
 	<longdescription>
 		ARCLoad - SGI Multi-bootloader.  Able to bootload many different SGI Systems.
 	</longdescription>