Version bump with patch.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 86 insertions, 2 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/Manifest b/dev-embedded/avrdude/Manifest
index f4693419d81b..6aa447788cae 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -1,14 +1,19 @@
+AUX avrdude-5.10-jtagmkII-debugWire.patch 684 RMD160 3f240926fe81dfcced0ef9729b63b48834e4bc96 SHA1 6a645a801729a3d2620ff6804d9d9e2e255f9068 SHA256 41ec2f15817917925e07da715672331426c36142de8f8ff8a3e2680f39c3f65d
 AUX avrdude-5.8-dragon-segfault.patch 543 RMD160 14bedadae5a52214d41565874d8bd394f9e73a8d SHA1 06d0bbf34371bc1077cbea54dabe431098b22dfa SHA256 66c2a29f55eb1b897b4e48c3b3c6b0511502dda07322c8b4006d9d56f5618e19
+DIST avrdude-5.10.tar.gz 525750 RMD160 38ce9407a33bf4a4c656651071b44a92fdbdd639 SHA1 c09167ea64c3f60b594d0e4da71af7edea0d6f83 SHA256 81501b63d5b8699874d00c9eca42837b85695bc0820ba9843b17f573ce38be5e
 DIST avrdude-5.4.tar.gz 429687 RMD160 26af286bc4d4b9704eabdc371daf97b438b25a26 SHA1 45642d4e74cfb4a6edc6d0d769d8d9b2e7a846ed SHA256 bee4148c51ec95999d803cb9f68f12ac2e9128b06f07afe307d38966c0833b30
 DIST avrdude-5.5.tar.gz 453614 RMD160 29d7a3f86172e156c744747856c4c581dd78e62d SHA1 a97a5f520e6c1504d39cd77ebd72a367ac0f5e95 SHA256 4081053eab5475c7dc782ae6322fecb76582951319af432da110e3839e7b4b51
 DIST avrdude-5.8.tar.gz 488771 RMD160 c8eb0675f84477d6b58f0e8dc0438e16ac0714db SHA1 77198df91a7176bbdab19ef4a4caf0bdc5862c94 SHA256 ff9a5b13c45ebf95cc4b77a0790463a0ebefbe1c76d89ff8cfa9520461f9d046
+DIST avrdude-doc-5.10.pdf 231216 RMD160 f8152450d385d521007c29341766eed4eef8d6c6 SHA1 0c288ccdc2730dabacc1c494a9e38ea698183a48 SHA256 49ed5cb00a001844cf6eccf9444ad8fa268bdbef8f11760e8d0c015b5cd93b70
+DIST avrdude-doc-5.10.tar.gz 33742 RMD160 feb3795e0d3ac9eadce1ff27c36b34aac9250595 SHA1 c2089f2b84bb2f40dd8b1364bb89e667c894fd9b SHA256 dfd443ad5376676881d0cd73582aab6a83c2658cf3c300fb217b4a3d06424df5
 DIST avrdude-doc-5.5.pdf 199919 RMD160 425226e8629e4e5c20987bc389f087d669e6f8a4 SHA1 b6a5a41dc6a6cdbc590db0e5e40ba3d0cb35a46d SHA256 851c462b9f560be63238befb0dbf4bdb2b0f11b9d272c2e0d7f06e63e37cd27a
 DIST avrdude-doc-5.5.tar.gz 26256 RMD160 6c5b298eaffceb78f3eb6d68ff9a70d37e6bc096 SHA1 a06a06852cdcf1ebe67efcd2584953f1bbe8d62b SHA256 26d7883172eb8c55604a7561270aa2ac7ec4760d8dfbb44087eaede35688ac5c
 DIST avrdude-doc-5.8.pdf 214889 RMD160 25447cf70e2ad4743ceffc195832044cc65f0c6a SHA1 7db074bb392a81adc24e9c60372532b16e94224c SHA256 da08527e1c3ed3baab772dfb3dd2a075af9916c5471c4584dec1fd5642aed355
 DIST avrdude-doc-5.8.tar.gz 30219 RMD160 6f8199af786d1e4d0f2ed8ee6ed18e4153592b61 SHA1 c1cd604ddb34ac252bc42741cd63638902a6bd01 SHA256 5246f55cdb1c0e056fe6f8fdc0c6004bcd4430178d3fabec886a656881a7bdb3
+EBUILD avrdude-5.10.ebuild 1391 RMD160 ddb74536a6af3c924bd74f44f34c81522b2a0541 SHA1 81b53c2e0415ac5de7d8b84dca998b625dad11ff SHA256 bf83d7d4ef6af0208ebeb6c9217b02ceba1cf46469008535a9f5a4c288e027d7
 EBUILD avrdude-5.4.ebuild 1081 RMD160 5450d48a5b407d2444a732db088eb26b8f780000 SHA1 1b315bc5399a5777e89a0a4882dee0f1114f8b8f SHA256 3b0124fadb7629dc7ff09cd565f4cab43201b97fcc3d7e283ec64a8446b45c45
 EBUILD avrdude-5.5.ebuild 1617 RMD160 4a23a6e1ee1b3409598a4fbd45b9fcf66ba4e43a SHA1 6f156da39e83371a1e0f3fd2b553b0e48ceef21c SHA256 c0e1ca7c5d03eed9bf8b9d995e9276e383fa191877cca8c646bc2b26f6fe348d
 EBUILD avrdude-5.8-r1.ebuild 1396 RMD160 9d6af90d5c050db11c3c060abb89ffd8dcd3623d SHA1 50de55cee620422aabe2a27fcf8f93224d39eeaf SHA256 eb0dd4db3ec0761791fc918b0523c3dbf5940165d6f8525869a202bfa5477b4f
 EBUILD avrdude-5.8.ebuild 1325 RMD160 c3ed2ab8a673a532478f984e7e9fb91afaf19b3a SHA1 429da10bc222a7845d1dc2af70248210cc3e8923 SHA256 eae2adf7a30b41fcb352c66ef46b5a81b39fdad6e9f5fdb92f8ee40c27461b28
-MISC ChangeLog 5442 RMD160 b1afe401e1a84fb6a9e9d81164e28684e71d5eb5 SHA1 891d7b907fa9c7b057e7b4ec619cbc5e540cfe04 SHA256 e2bea403b0f7675757ff37fec404a7f37c9ee03b32ac0af3dd920e686156786a
+MISC ChangeLog 5750 RMD160 71251b6424a750fe3969958b45e74f8722e7f377 SHA1 0c1725f6b0226fb3b66ed18e48f793f079ec37f7 SHA256 63791648ed93ccaeec89ab6b49ed4231cbe86073a2ce9a089787eb90138f0749
 MISC metadata.xml 263 RMD160 a02a2b7079d253bd9d8a61c4417c20327e9fb548 SHA1 3f0aff9e30bcc67c87b9ade8fdb10ed16f5559aa SHA256 5b8c9628b54bbe886fa3f1ce880c501edbbfc8ed6e02abfb6f486976356627b0
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;
++    }
+   }
+ 
+   /*