Added a patch to fix a compile error caused by the compiler defining sparc=1, see Bug #133303. Patch by solar.

(Portage version: 2.0.54)

3 files changed, 91 insertions, 3 deletions

diff --git a/app-portage/portage-utils/ChangeLog b/app-portage/portage-utils/ChangeLog
index 70d7933b630e..268b462a3f62 100644
--- a/app-portage/portage-utils/ChangeLog
+++ b/app-portage/portage-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-portage/portage-utils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.45 2006/05/14 01:43:30 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.46 2006/05/14 18:55:05 tcort Exp $
+
+  14 May 2006; Thomas Cort <tcort@gentoo.org>
+  +files/portage-utils-0.1.17-enum.patch, portage-utils-0.1.17.ebuild:
+  Added a patch to fix a compile error caused by the compiler defining
+  sparc=1, see Bug #133303. Patch by solar.
 
 *portage-utils-0.1.17 (13 May 2006)
 
diff --git a/app-portage/portage-utils/files/portage-utils-0.1.17-enum.patch b/app-portage/portage-utils/files/portage-utils-0.1.17-enum.patch
new file mode 100644
index 000000000000..73483de879d6
--- /dev/null
+++ b/app-portage/portage-utils/files/portage-utils-0.1.17-enum.patch
@@ -0,0 +1,77 @@
+Index: qimlate.c
+===================================================================
+RCS file: /var/cvsroot/gentoo-projects/portage-utils/qimlate.c,v
+retrieving revision 1.4
+diff -u -b -B -w -p -r1.4 qimlate.c
+--- qimlate.c	14 May 2006 00:17:14 -0000	1.4
++++ qimlate.c	14 May 2006 17:06:58 -0000
+@@ -28,10 +28,10 @@ static const char qimlate_rcsid[] = "$Id
+ #define qimlate_usage(ret) usage(ret, QIMLATE_FLAGS, qimlate_long_opts, qimlate_opts_help, lookup_applet_idx("qimlate"))
+ 
+ #define NUM_ARCHES (16)
+-enum { unknown = 0, alpha, amd64, arm, hppa, ia64, m68k, mips, ppc, ppc64, ppc_macos, s390, sh, sparc, x86, x86_fbsd };
++enum { q_unknown = 0, q_alpha, q_amd64, q_arm, q_hppa, q_ia64, q_m68k, q_mips, q_ppc, q_ppc64, q_ppc_macos, q_s390, q_sh, q_sparc, q_x86, q_x86_fbsd };
+ enum { none = 0, testing, stable };
+ 
+-char  arches[NUM_ARCHES][10] = {"unknown", "alpha", "amd64", "arm", "hppa", "ia64", "m68k", "mips", "ppc", "ppc64", "ppc-macos", "s390", "sh", "sparc", "x86", "x86-fbsd" };
++const char  arches[NUM_ARCHES][10] = {"unknown", "alpha", "amd64", "arm", "hppa", "ia64", "m68k", "mips", "ppc", "ppc64", "ppc-macos", "s390", "sh", "sparc", "x86", "x86-fbsd" };
+ char  status[3]              = {'-','~','+'};
+ 
+ char *current_package;
+@@ -52,34 +52,34 @@ int decode_arch(char *arch) {
+ 
+ 	switch (strlen(arch)) {
+ 		case 3:
+-			if      (!strcmp(arch,"x86")) return x86;
+-			else if (!strcmp(arch,"ppc")) return ppc;
+-			else if (!strcmp(arch,"arm")) return arm;
+-			else return unknown;
++			if      (!strcmp(arch,"x86")) return q_x86;
++			else if (!strcmp(arch,"ppc")) return q_ppc;
++			else if (!strcmp(arch,"arm")) return q_arm;
++			else return q_unknown;
+ 		case 4:
+-			if      (!strcmp(arch,"mips")) return mips;
+-			else if (!strcmp(arch,"hppa")) return hppa;
+-			else if (!strcmp(arch,"ia64")) return ia64;
+-			else if (!strcmp(arch,"s390")) return s390;
+-			else if (!strcmp(arch,"m68k")) return m68k;
+-			else return unknown;
++			if      (!strcmp(arch,"mips")) return q_mips;
++			else if (!strcmp(arch,"hppa")) return q_hppa;
++			else if (!strcmp(arch,"ia64")) return q_ia64;
++			else if (!strcmp(arch,"s390")) return q_s390;
++			else if (!strcmp(arch,"m68k")) return q_m68k;
++			else return q_unknown;
+ 		case 5:
+-			if      (!strcmp(arch,"amd64")) return amd64;
+-			else if (!strcmp(arch,"ppc64")) return ppc64;
+-			else if (!strcmp(arch,"sparc")) return sparc;
+-			else if (!strcmp(arch,"alpha")) return alpha;
+-			else return unknown;
++			if      (!strcmp(arch,"amd64")) return q_amd64;
++			else if (!strcmp(arch,"ppc64")) return q_ppc64;
++			else if (!strcmp(arch,"sparc")) return q_sparc;
++			else if (!strcmp(arch,"alpha")) return q_alpha;
++			else return q_unknown;
+ 		case 8:
+-			if (!strcmp(arch,"x86-fbsd")) return x86_fbsd;
+-			else return unknown;
++			if (!strcmp(arch,"x86-fbsd")) return q_x86_fbsd;
++			else return q_unknown;
+ 		case 9:
+-			if (!strcmp(arch,"ppc-macos")) return ppc_macos;
+-			else return unknown;
++			if (!strcmp(arch,"ppc-macos")) return q_ppc_macos;
++			else return q_unknown;
+ 		case 2:
+-			if (!strcmp(arch,"sh")) return sh;
+-			else return unknown;
++			if (!strcmp(arch,"sh")) return q_sh;
++			else return q_unknown;
+ 		default:
+-			return unknown;
++			return q_unknown;
+ 
+ 	}
+ }
diff --git a/app-portage/portage-utils/portage-utils-0.1.17.ebuild b/app-portage/portage-utils/portage-utils-0.1.17.ebuild
index 0a1d08b95f99..d5e7d8804f4d 100644
--- a/app-portage/portage-utils/portage-utils-0.1.17.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.1.17.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.1.17.ebuild,v 1.1 2006/05/14 01:43:31 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.1.17.ebuild,v 1.2 2006/05/14 18:55:05 tcort Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="small and fast portage helper tools written in C"
 HOMEPAGE="http://www.gentoo.org/"
@@ -15,6 +15,12 @@ IUSE=""
 
 DEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-enum.patch
+}
+
 src_install() {
 	dobin q || die "dobin failed"
 	doman man/*.[0-9]