Version bump with patch.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 80 insertions, 1 deletions

diff --git a/dev-embedded/avrdude/ChangeLog b/dev-embedded/avrdude/ChangeLog
index 67492f616110..2a8089269a8a 100644
--- a/dev-embedded/avrdude/ChangeLog
+++ b/dev-embedded/avrdude/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-embedded/avrdude
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.43 2010/11/17 22:59:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.44 2010/11/17 23:13:29 xmw Exp $
+
+*avrdude-5.10 (17 Nov 2010)
+
+  17 Nov 2010; Michael Weber <xmw@gentoo.org> +avrdude-5.10.ebuild,
+  +files/avrdude-5.10-jtagmkII-debugWire.patch:
+  Version bump with patch. Thanks to Joe Sapp <nixphoeni@gentoo.org> for the
+  report on bug #304361 and Timon Van Overveldt <timonvo@gmail.com> for his
+  patch.
 
 *avrdude-5.8-r1 (17 Nov 2010)
 
diff --git a/dev-embedded/avrdude/avrdude-5.10.ebuild b/dev-embedded/avrdude/avrdude-5.10.ebuild
new file mode 100644
index 000000000000..1762551d29e6
--- /dev/null
+++ b/dev-embedded/avrdude/avrdude-5.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.10.ebuild,v 1.1 2010/11/17 23:13:29 xmw Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="AVR Downloader/UploaDEr"
+HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
+SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
+SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
+	doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
+		   ${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc"
+
+RDEPEND="virtual/libusb"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# let the build system re-generate these, bug #120194
+	rm -f lexer.c config_gram.c config_gram.h
+
+	epatch "${FILESDIR}/${P}-jtagmkII-debugWire.patch"
+}
+
+src_compile() {
+	# The automake target for these files does not use tempfiles or create these
+	# atomically, confusing a parallel build. So we force them first.
+	emake lexer.c config_gram.c config_gram.h || die "emake of lexer failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog* NEWS README || die "dodoc failed"
+
+	if use doc ; then
+		newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf || \
+			die "newdoc	failed"
+		dohtml -r "${WORKDIR}/avrdude-html/" || die "dohtml failed"
+	fi
+}
diff --git a/dev-embedded/avrdude/files/avrdude-5.10-jtagmkII-debugWire.patch b/dev-embedded/avrdude/files/avrdude-5.10-jtagmkII-debugWire.patch
new file mode 100644
index 000000000000..d4d22bc83b05
--- /dev/null
+++ b/dev-embedded/avrdude/files/avrdude-5.10-jtagmkII-debugWire.patch
@@ -0,0 +1,22 @@
+Suggested by Timon Van Overveldt <timonvo@gmail.com> 
+on https://savannah.nongnu.org/bugs/index.php?30268
+
+--- avrdude-5.10/jtagmkII.c
++++ avrdude-5.10/jtagmkII.c
+@@ -1270,10 +1270,12 @@
+       return -1;
+   }
+ 
+-  if (jtagmkII_setparm(pgm, PAR_DAISY_CHAIN_INFO, PDATA(pgm)->jtagchain) < 0) {
+-    fprintf(stderr, "%s: jtagmkII_initialize(): Failed to setup JTAG chain\n",
+-            progname);
+-    return -1;
++  if(strcmp(ifname, "debugWire") != 0) {
++    if (jtagmkII_setparm(pgm, PAR_DAISY_CHAIN_INFO, PDATA(pgm)->jtagchain) < 0) {
++      fprintf(stderr, "%s: jtagmkII_initialize(): Failed to setup JTAG chain\n",
++              progname);
++      return -1;
++    }
+   }
+ 
+   /*