QA fixes as per bug #255837 thanks kevin.pyle

(Portage version: 2.2_rc20/cvs/Linux 2.6.26-gentoo-r4 x86_64)

5 files changed, 115 insertions, 10 deletions

diff --git a/dev-util/intel2gas/ChangeLog b/dev-util/intel2gas/ChangeLog
index d9770c8c3e53..bf6f51347169 100644
--- a/dev-util/intel2gas/ChangeLog
+++ b/dev-util/intel2gas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/intel2gas
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/intel2gas/ChangeLog,v 1.7 2007/02/09 03:12:30 flameeyes Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intel2gas/ChangeLog,v 1.8 2009/01/26 01:48:06 dragonheart Exp $
+
+  26 Jan 2009; Daniel Black <dragonheart@gentoo.org>
+  +files/intel2gas-1.3.3-constchar.patch, +files/intel2gas-1.3.3-cxx.patch,
+  +files/intel2gas-nostrip.patch, intel2gas-1.3.3-r2.ebuild:
+  QA fixes as per bug #255837 thanks kevin.pyle
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-constchar.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-constchar.patch
new file mode 100644
index 000000000000..f749f9255d7c
--- /dev/null
+++ b/dev-util/intel2gas/files/intel2gas-1.3.3-constchar.patch
@@ -0,0 +1,71 @@
+--- intel2gas-1.3.3/intel2gas.cc.orig	2009-01-26 12:21:11.000000000 +1100
++++ intel2gas-1.3.3/intel2gas.cc	2009-01-26 12:38:54.000000000 +1100
+@@ -57,10 +57,6 @@
+   int counter = 0;
+   char* prev = 0;
+   while (l) {
+-    if (int(l->name) > 0x10000000) {
+-      printf("Error %d, prev=%s\n", counter, prev);
+-      break;
+-    }
+     if (!strcasecmp(name,l->name))
+       return l;
+     counter++;
+@@ -255,7 +251,7 @@
+   return len;
+ }
+ 
+-static int str_parse(syntaxlist_t *s, char *parse, char *outline);
++static int str_parse(syntaxlist_t *s, const char *parse, char *outline);
+ 
+ static int parsematch(char *text, char *parse)
+ {
+@@ -394,10 +390,10 @@
+ }
+ 
+ 
+-static int str_parse(syntaxlist_t *sl, char *parse, char *outline)
++static int str_parse(syntaxlist_t *sl, const char *parse, char *outline)
+ {
+   *outline = '\0';
+-  parse = str_skipspace(parse);
++  parse = str_skipspace((char *)parse);
+   if (str_empty(parse))
+     return 0;
+     
+@@ -412,7 +408,7 @@
+       return 0;
+     }
+     strcpy(tempstr, s->parseline);
+-    int size = parsematch(parse, tempstr);
++    int size = parsematch((char *)parse, tempstr);
+     if (size) {
+       setTheseVars(s->assignments);
+       if (!str_empty(s->output))
+@@ -535,7 +531,7 @@
+   if (str_empty(var)) return;
+     
+   static struct {
+-    char *reg;
++    const char *reg;
+     int   mask;
+   } reglist[] = {
+     {"bp",0x40000},{"ebp",0xc0000},
+@@ -717,7 +713,7 @@
+ static int load_syntax_files(char modedir[])
+ {
+   // Override the compiled in path
+-  char *resource_path = getenv("I2G_DATA");
++  const char *resource_path = getenv("I2G_DATA");
+   if (resource_path == NULL)
+     resource_path = RESOURCE_PATH;
+     
+@@ -768,7 +764,7 @@
+ 
+ static bool is_a_define_line(char const *line)
+ {
+-  static char *keywords[] = {
++  static const char *keywords[] = {
+     "if","define","else","endif",NULL,
+   };
+   for (int i=0; keywords[i]; i++) {
diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-cxx.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-cxx.patch
new file mode 100644
index 000000000000..6197f299ef10
--- /dev/null
+++ b/dev-util/intel2gas/files/intel2gas-1.3.3-cxx.patch
@@ -0,0 +1,10 @@
+--- intel2gas-1.3.3/Makefile.in.orig	2009-01-26 12:15:41.000000000 +1100
++++ intel2gas-1.3.3/Makefile.in	2009-01-26 12:15:50.000000000 +1100
+@@ -1,7 +1,6 @@
+ # intel2gas 1.3.3 (c)1999 Mikko Tiihonen (mikko.tiihonen@hut.fi)
+ # Makefile by brn (c.nentwich@cs.ucl.ac.uk)
+ 
+-CXX = g++
+ 
+ # CXXFLAGS = -O6 -mpentium -malign-jumps=2 -malign-functions=2 -malign-loops=2 
+ # Just kidding :)
diff --git a/dev-util/intel2gas/files/intel2gas-nostrip.patch b/dev-util/intel2gas/files/intel2gas-nostrip.patch
new file mode 100644
index 000000000000..86f9f6844117
--- /dev/null
+++ b/dev-util/intel2gas/files/intel2gas-nostrip.patch
@@ -0,0 +1,12 @@
+diff -ru a/Makefile.in b/Makefile.in
+--- intel2gas-1.3.3/Makefile.in	2000-11-14 12:53:25.000000000 -0600
++++ intel2gas-1.3.3-r1/Makefile.in	2009-01-21 18:34:44.000000000 -0600
+@@ -45,7 +45,7 @@
+ 	  cp -a $$datadir/* $(data_prefix)/$$datadir; \
+ 	done
+ 	install -m 755 -d $(prefix)/bin
+-	install -s -m 755 intel2gas $(prefix)/bin
++	install -m 755 intel2gas $(prefix)/bin
+ 
+ uninstall:
+ 	for datadir in $(DATADIRS); do \
diff --git a/dev-util/intel2gas/intel2gas-1.3.3-r2.ebuild b/dev-util/intel2gas/intel2gas-1.3.3-r2.ebuild
index 6eb7b111f7ed..abfe56ae608a 100644
--- a/dev-util/intel2gas/intel2gas-1.3.3-r2.ebuild
+++ b/dev-util/intel2gas/intel2gas-1.3.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/intel2gas/intel2gas-1.3.3-r2.ebuild,v 1.1 2005/09/29 21:51:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intel2gas/intel2gas-1.3.3-r2.ebuild,v 1.2 2009/01/26 01:48:06 dragonheart Exp $
 
-inherit eutils
+inherit eutils autotools toolchain-funcs
 
 DESCRIPTION="Converts assembler source from Intel (NASM), to AT&T (gas)"
 HOMEPAGE="http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/"
@@ -11,18 +11,25 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-DEPEND="virtual/libc
-	sys-devel/gcc"
-RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-segfault.patch
+	epatch "${FILESDIR}"/${P}-segfault.patch
+	epatch "${FILESDIR}"/${PN}-nostrip.patch
+	epatch "${FILESDIR}"/${P}-cxx.patch
+	epatch "${FILESDIR}"/${P}-constchar.patch
+	eautomake
+}
+
+src_compile() {
+	tc-export CXX
+	econf
+	emake
 }
 
 src_install() {
 	emake \
-		prefix=${D}/usr \
+		prefix="${D}"/usr \
 		install || die
 	fperms ugo+r /usr/share/intel2gas/i2g/main.syntax
 	dodoc README DATAFILES BUGS