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

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 84 insertions, 2 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/Manifest b/dev-embedded/avarice/Manifest
index e541e512b07e..b81baab1e672 100644
--- a/dev-embedded/avarice/Manifest
+++ b/dev-embedded/avarice/Manifest
@@ -1,6 +1,9 @@
+AUX avarice-2.10-gcc44.patch 1302 RMD160 19cebe40927fa51226f56872e493b4048612c14a SHA1 04f1af3c807e64d5e2283967b92589b38b45df0c SHA256 012783acca12ed191eff9135963cec42ae5a299d6960d5e6e0238a525b5d9a9a
+DIST avarice-2.10.tar.bz2 172136 RMD160 f093126485a99ad05f038b9c2a7018e57f2c01b8 SHA1 fbac00e37f90185f24a17023eccc111493792cb1 SHA256 5f32157ed2aaa8b44549fff9e2e520f8cda804072d5fbc1d9e9ce376c1ba4352
 DIST avarice-2.6.tar.bz2 151100 RMD160 c99175e848cc816a5a22e15eaf881a0c58d95547 SHA1 d559d0096de798b3078e501e5770767ce635ac00 SHA256 c916cc130755c38cebf2d09b84fce6530e78c8bf28acab87afedbc77ac464a5a
 DIST avarice-2.9.tar.bz2 171433 RMD160 8acdc5040ef08b52028a8d6554526e2be37682ef SHA1 67fcbfd7ec9a26ebfbe386c380e1a21322573726 SHA256 c101f8458d2acd46e259b18632919bdfa541bedc08165b06d8d002d55e5221fa
+EBUILD avarice-2.10.ebuild 646 RMD160 99679d01a1f1cf7d116edb9f2dcaaecfb4d16f25 SHA1 f3046dbe15303c2ba6f968765d57869d1bdb8362 SHA256 459ec315128d37c2c581e196f70b270d6bcc0a7056cf82081bbf838a8ffd62a9
 EBUILD avarice-2.6.ebuild 638 RMD160 8a5fd0b83988ee44146f2a6c72a39563d50221fc SHA1 218df0d0ab352670a58c4e69333716b103c5c27a SHA256 a19f26a7e34977c0dec47372b93344e235c9d00db8a7dcb220c2195728577671
 EBUILD avarice-2.9.ebuild 638 RMD160 a6e9827791faf7a991c5881d5afac5ddf292e5ce SHA1 a47eb31011f42001b2f1c6149f1f0ae855fcc53d SHA256 a135f90b2b33f0cccc313ffc2c34754405ad1bfd8d521c9509f56aae120f92de
-MISC ChangeLog 734 RMD160 9edf972729123738d58b9b06a4e114ad5d821ea4 SHA1 9c17461571ea30bde2fd67e49fe5af9793e555cb SHA256 d0f5718ad60f8eedcb20c21d8c9b5a2b2e3917b9b624e7d9461b9992ff493591
+MISC ChangeLog 949 RMD160 0f8a2ba10acbd7ea960a5465bff706d19a567b0b SHA1 e03c2244f614a34e592f6bd14a5b16649c5ec38b SHA256 0de2d5328035b62fbfb7b69d3e8f1ccdd7fbd7b9618c315c2898ff3e38fba084
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
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",