slow patch and ebuild thanks to Phil Whineray <pdw@slightly-cracked.com>. old version cleanout

(Portage version: 2.0.51.19)

8 files changed, 149 insertions, 38 deletions

diff --git a/dev-embedded/picprog/ChangeLog b/dev-embedded/picprog/ChangeLog
index 722b1cfbeb2b..8e9c550a4967 100644
--- a/dev-embedded/picprog/ChangeLog
+++ b/dev-embedded/picprog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-embedded/picprog
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/ChangeLog,v 1.9 2005/01/01 17:55:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/ChangeLog,v 1.10 2005/03/25 23:00:17 dragonheart Exp $
+
+*picprog-1.7-r1 (26 Mar 2005)
+
+  26 Mar 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/picprog-1.7-werner-almesberger.diff, -picprog-1.5.ebuild,
+  -picprog-1.6.ebuild, +picprog-1.7-r1.ebuild:
+  slow patch and ebuild thanks to Phil Whineray <pdw@slightly-cracked.com>.
+  Old version cleanout too.
 
   18 Jul 2004; Daniel Black <dragonheart@gentoo.org> picprog-1.7.ebuild:
   x86 stable
diff --git a/dev-embedded/picprog/Manifest b/dev-embedded/picprog/Manifest
index 4e0fdbb56e5a..c41339b3c02d 100644
--- a/dev-embedded/picprog/Manifest
+++ b/dev-embedded/picprog/Manifest
@@ -1,8 +1,7 @@
 MD5 475a90fb9b2765f6d1023350785c9e6e ChangeLog 1260
 MD5 c5b5ceb7ecb0df0ecfd4508c06ee7f37 metadata.xml 289
-MD5 e84e1a0163bd838ddde4dec2108d0248 picprog-1.5.ebuild 723
-MD5 516db04ad76043456bcb9ebd03ba227d picprog-1.6.ebuild 725
 MD5 88882b9fc239d8a050baf69a8610ef41 picprog-1.7.ebuild 724
-MD5 e725cab6fcb759047ce4fe2907b12bdf files/digest-picprog-1.5 62
-MD5 227aaa83f2e3548bb1896840fc746792 files/digest-picprog-1.6 62
+MD5 205a6c694ed01631977a6038a8566a40 picprog-1.7-r1.ebuild 836
 MD5 646f6161041a00507756e0c3e261df62 files/digest-picprog-1.7 62
+MD5 646f6161041a00507756e0c3e261df62 files/digest-picprog-1.7-r1 62
+MD5 72e83a1c722fa24f95702a8367c95a95 files/picprog-1.7-werner-almesberger.diff 3329
diff --git a/dev-embedded/picprog/files/digest-picprog-1.5 b/dev-embedded/picprog/files/digest-picprog-1.5
deleted file mode 100644
index 36c6865708b7..000000000000
--- a/dev-embedded/picprog/files/digest-picprog-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dcce871d91eaef4d4effc8cdcdb56155 picprog-1.5.tar.gz 52895
diff --git a/dev-embedded/picprog/files/digest-picprog-1.6 b/dev-embedded/picprog/files/digest-picprog-1.6
deleted file mode 100644
index f5e3492605a2..000000000000
--- a/dev-embedded/picprog/files/digest-picprog-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d9949a85e55f6eba6dde85295f790528 picprog-1.6.tar.gz 54875
diff --git a/dev-embedded/picprog/files/digest-picprog-1.7-r1 b/dev-embedded/picprog/files/digest-picprog-1.7-r1
new file mode 100644
index 000000000000..efe3b6c88b09
--- /dev/null
+++ b/dev-embedded/picprog/files/digest-picprog-1.7-r1
@@ -0,0 +1 @@
+MD5 342f65a9cc71a0507fe8083181e2681c picprog-1.7.tar.gz 55118
diff --git a/dev-embedded/picprog/files/picprog-1.7-werner-almesberger.diff b/dev-embedded/picprog/files/picprog-1.7-werner-almesberger.diff
new file mode 100644
index 000000000000..5be24442eb35
--- /dev/null
+++ b/dev-embedded/picprog/files/picprog-1.7-werner-almesberger.diff
@@ -0,0 +1,125 @@
+--- picprog-1.7/main.cc.orig	2004-10-18 07:33:58.995275000 -0300
++++ picprog-1.7/main.cc	2004-10-18 08:06:50.275140000 -0300
+@@ -41,7 +41,7 @@
+ 
+ program prog;
+ 
+-char short_opts [] = "d:p:i:o:c:qh?";
++char short_opts [] = "d:p:i:o:c:qsh?";
+ 
+ int
+ main (int argc, char **argv)
+@@ -81,6 +81,7 @@
+     {"erase", no_argument, &opt_erase, 1},
+     {"burn", no_argument, &opt_burn, 1},
+     {"force-calibration", no_argument, &opt_calibration, 1},
++    {"slow", no_argument, NULL, 's'},
+     {0, 0, 0, 0}
+   };
+ 
+@@ -113,6 +114,12 @@
+     case 'q':
+       opt_quiet = 1;
+       break;
++    case 's':
++	// Add extra delays for capacity added by very long cable
++	picport::t_edge = 10; // 10 us
++	picport::t_on = 200000;  // 200 ms
++	picport::t_off = 700000; // 700 ms - I'm not kidding !
++	break;
+     default: // -? -h --help unknown flag
+       opt_usage = 1;
+     }
+--- picprog-1.7/picport.h.orig	2004-10-18 07:39:03.325205000 -0300
++++ picprog-1.7/picport.h	2004-10-18 07:40:52.113394000 -0300
+@@ -59,6 +59,10 @@
+ 
+ public:
+ 
++  static int t_on;
++  static int t_off;
++  static int t_edge;
++
+   static void delay (long ns);
+ 
+   enum commands {
+--- picprog-1.7/picport.cc.orig	2004-10-18 07:28:46.554692000 -0300
++++ picprog-1.7/picport.cc	2004-10-18 08:30:38.385152000 -0300
+@@ -54,6 +54,11 @@
+ unsigned int picport::tsc_1000ns = 0;
+ int picport::use_nanosleep = -1;
+ 
++// Extra delays for long cables, in us
++int picport::t_on = 0;
++int picport::t_off = 0;
++int picport::t_edge = 0;
++
+ void
+ picport::set_clock_data (int rts, int dtr)
+ {
+@@ -102,7 +107,7 @@
+   // Before first call to set_clock_data, read the modem status.
+   ioctl (fd, TIOCMGET, &modembits);
+   set_clock_data (0, 0);
+-  usleep (50);
++  usleep (50+t_edge);
+   // Check the CTS.  If it is up, even when we just lowered DTR,
+   // we probably are not talking to a JDM type programmer.
+   int i;
+@@ -200,13 +205,13 @@
+     cerr << "Unable to start break on tty " << tty << ":" << strerror (e) << endl;
+     exit (EX_IOERR);
+   }
+-  usleep (10);
++  usleep (10+t_off);
+ }
+ 
+ picport::~picport ()
+ {
+   ioctl (fd, TIOCCBRK, 0);
+-  usleep (1);
++  usleep (1+t_off);
+   tcsetattr (fd, TCSANOW, &saved);
+   close (fd);
+   delete [] portname;
+@@ -216,15 +221,15 @@
+ {
+   set_clock_data (0, 0);
+   ioctl (fd, TIOCCBRK, 0);
+-  usleep (50);
++  usleep (50+t_off);
+   ioctl (fd, TIOCSBRK, 0);
+-  usleep (10);
++  usleep (10+t_on);
+   addr = 0;
+ }
+ 
+ void picport::delay (long ns)
+ {
+-  if (1 == use_nanosleep) {
++  if (1 == use_nanosleep && !t_edge) {
+     timespec ts = {ns / 1000000000, ns % 1000000000}, ts2;
+     while (nanosleep (&ts, &ts2) && EINTR == errno)
+       ts = ts2;
+@@ -232,7 +237,7 @@
+   }
+ 
+ #ifdef RDTSC_WORKS
+-  if (tsc_1000ns > 1) {
++  if (tsc_1000ns > 1 && !t_edge) {
+     unsigned long a1, d1, a2, d2;
+     asm volatile("rdtsc":"=a" (a1), "=d" (d1));
+     d2 = d1;
+@@ -259,10 +264,10 @@
+   volatile int i;
+   gettimeofday (&tv1, 0);
+   tv2.tv_sec = tv1.tv_sec;
+-  tv2.tv_usec = 0xffffffff & (tv1.tv_usec + 1 + (ns + 999)/1000);
++  tv2.tv_usec = 0xffffffff & (tv1.tv_usec + 1 + (ns + 999)/1000+t_edge);
+   if (tv2.tv_usec < tv1.tv_usec)
+     tv2.tv_sec++;
+-  for (i = 0; i < 10000; i++) {
++  for (i = 0; i < 10000 || t_edge; i++) {
+     gettimeofday (&tv1, 0);
+     if (tv1.tv_sec > tv2.tv_sec
+ 	|| tv1.tv_sec == tv2.tv_sec && tv1.tv_usec >= tv2.tv_usec)
diff --git a/dev-embedded/picprog/picprog-1.5.ebuild b/dev-embedded/picprog/picprog-1.5.ebuild
deleted file mode 100644
index de02e7d6c182..000000000000
--- a/dev-embedded/picprog/picprog-1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.5.ebuild,v 1.5 2005/01/01 17:55:18 eradicator Exp $
-
-DESCRIPTION="a pic16xxx series microcontroller programmer software for the simple serial port device"
-HOMEPAGE="http://www.iki.fi/hyvatti/pic/${PN}.html"
-SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc
-	virtual/libc
-	sys-apps/coreutils"
-RDEPEND="virtual/libc"
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	dobin picprog || die
-	dodoc README
-	dohtml picprog.html *.jpg *.png
-	doman picprog.1
-}
diff --git a/dev-embedded/picprog/picprog-1.6.ebuild b/dev-embedded/picprog/picprog-1.7-r1.ebuild
index 9c8610699b2b..e13507fb5404 100644
--- a/dev-embedded/picprog/picprog-1.6.ebuild
+++ b/dev-embedded/picprog/picprog-1.7-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.6.ebuild,v 1.5 2005/01/01 17:55:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.7-r1.ebuild,v 1.1 2005/03/25 23:00:17 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="a pic16xxx series microcontroller programmer software for the simple serial port device"
 HOMEPAGE="http://www.iki.fi/hyvatti/pic/picprog.html"
@@ -8,7 +10,7 @@ SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND="sys-devel/gcc
@@ -16,6 +18,12 @@ DEPEND="sys-devel/gcc
 	sys-apps/coreutils"
 RDEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/picprog-1.7-werner-almesberger.diff
+}
+
 src_compile() {
 	emake CXXFLAGS="${CXXFLAGS}" || die
 }
@@ -23,6 +31,6 @@ src_compile() {
 src_install() {
 	dobin picprog || die
 	dodoc README
-	dohtml picprog.html *.jpg *.png
+	dohtml picprog.html *.png
 	doman picprog.1
 }