Version bump. Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277315.

(Portage version: 2.2_rc36/cvs/Linux x86_64)

3 files changed, 80 insertions, 1 deletions

diff --git a/dev-embedded/avarice/ChangeLog b/dev-embedded/avarice/ChangeLog
index 85d2d2042a73..a4b9bc3edf0e 100644
--- a/dev-embedded/avarice/ChangeLog
+++ b/dev-embedded/avarice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/avarice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avarice/ChangeLog,v 1.4 2009/03/16 10:56:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avarice/ChangeLog,v 1.5 2009/08/07 08:53:45 ssuominen Exp $
+
+*avarice-2.10 (07 Aug 2009)
+
+  07 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> +avarice-2.10.ebuild,
+  +files/avarice-2.10-gcc44.patch:
+  Version bump. Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277315.
 
 *avarice-2.9 (16 Mar 2009)
 
diff --git a/dev-embedded/avarice/avarice-2.10.ebuild b/dev-embedded/avarice/avarice-2.10.ebuild
new file mode 100644
index 000000000000..86cdae09b96c
--- /dev/null
+++ b/dev-embedded/avarice/avarice-2.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avarice/avarice-2.10.ebuild,v 1.1 2009/08/07 08:53:45 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Interface for GDB to Atmel AVR JTAGICE in circuit emulator"
+HOMEPAGE="http://avarice.sourceforge.net/"
+SRC_URI="mirror://sourceforge/avarice/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog doc/*.txt
+}
diff --git a/dev-embedded/avarice/files/avarice-2.10-gcc44.patch b/dev-embedded/avarice/files/avarice-2.10-gcc44.patch
new file mode 100644
index 000000000000..25dbd0d107db
--- /dev/null
+++ b/dev-embedded/avarice/files/avarice-2.10-gcc44.patch
@@ -0,0 +1,49 @@
+diff -ur avarice-2.10.orig/src/jtag2usb.cc avarice-2.10/src/jtag2usb.cc
+--- avarice-2.10.orig/src/jtag2usb.cc	2007-02-18 00:41:46.000000000 +0200
++++ avarice-2.10/src/jtag2usb.cc	2009-08-07 11:53:46.000000000 +0300
+@@ -18,7 +18,7 @@
+  * This file implements the libusb-based USB connection to a JTAG ICE
+  * mkII.
+  *
+- * $Id: avarice-2.10-gcc44.patch,v 1.1 2009/08/07 08:53:45 ssuominen Exp $
++ * $Id: avarice-2.10-gcc44.patch,v 1.1 2009/08/07 08:53:45 ssuominen Exp $
+  */
+ 
+ 
+@@ -70,7 +70,7 @@
+   struct usb_bus *bus;
+   struct usb_device *dev;
+   usb_dev_handle *udev;
+-  char *serno, *cp2;
++  char *devnamecopy, *serno, *cp2;
+   u_int16_t pid;
+   size_t x;
+ 
+@@ -85,6 +85,9 @@
+       break;
+     }
+ 
++  devnamecopy = new char[x = strlen(jtagDeviceName) + 1];
++  memcpy(devnamecopy, jtagDeviceName, x);
++
+   /*
+    * The syntax for usb devices is defined as:
+    *
+@@ -95,7 +98,7 @@
+    * right-to-left, so only the least significant nibbles need to be
+    * specified.
+    */
+-  if ((serno = strchr(jtagDeviceName, ':')) != NULL)
++  if ((serno = strchr(devnamecopy, ':')) != NULL)
+     {
+       /* first, drop all colons there if any */
+       cp2 = ++serno;
+@@ -159,6 +162,8 @@
+ 	    }
+ 	}
+     }
++
++  delete devnamecopy;
+   if (!found)
+   {
+     printf("did not find any%s USB device \"%s\"\n",