Version bump and remove old. Update LICENSE and use EAPI 4.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

6 files changed, 19 insertions, 214 deletions

diff --git a/dev-embedded/picprog/ChangeLog b/dev-embedded/picprog/ChangeLog
index f84e2a92b4d4..39dd1e611fb5 100644
--- a/dev-embedded/picprog/ChangeLog
+++ b/dev-embedded/picprog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-embedded/picprog
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/ChangeLog,v 1.20 2009/09/23 21:20:20 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/ChangeLog,v 1.21 2011/05/07 09:43:32 radhermit Exp $
+
+*picprog-1.9.1 (07 May 2011)
+
+  07 May 2011; Tim Harder <radhermit@gentoo.org> -picprog-1.7.ebuild,
+  -picprog-1.7-r1.ebuild, -files/picprog-1.7-gcc41.patch,
+  -files/picprog-1.7-werner-almesberger.diff, -picprog-1.8.1.ebuild,
+  +picprog-1.9.1.ebuild:
+  Version bump and remove old. Update LICENSE and use EAPI 4.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> picprog-1.7-r1.ebuild:
   Really remove virtual/libc
diff --git a/dev-embedded/picprog/files/picprog-1.7-gcc41.patch b/dev-embedded/picprog/files/picprog-1.7-gcc41.patch
deleted file mode 100644
index d6f79cc75870..000000000000
--- a/dev-embedded/picprog/files/picprog-1.7-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- picport.h	2004-07-14 01:24:34.000000000 -0400
-+++ picport.h.orig	2006-04-14 19:16:53.000000000 -0400
-@@ -45,7 +45,7 @@
-   int W[16];
- 
-   int modembits;
--  void picport::set_clock_data (int rts, int dtr);
-+  void set_clock_data (int rts, int dtr);
- 
-   void p_out (int b);
-   int p_in ();
diff --git a/dev-embedded/picprog/files/picprog-1.7-werner-almesberger.diff b/dev-embedded/picprog/files/picprog-1.7-werner-almesberger.diff
deleted file mode 100644
index 5be24442eb35..000000000000
--- a/dev-embedded/picprog/files/picprog-1.7-werner-almesberger.diff
+++ /dev/null
@@ -1,125 +0,0 @@
---- 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.7-r1.ebuild b/dev-embedded/picprog/picprog-1.7-r1.ebuild
deleted file mode 100644
index fff76109fbc9..000000000000
--- a/dev-embedded/picprog/picprog-1.7-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.7-r1.ebuild,v 1.4 2009/09/23 21:20:20 patrick 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"
-SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-DEPEND="sys-devel/gcc
-	sys-apps/coreutils"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/picprog-1.7-werner-almesberger.diff
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	dobin picprog || die
-	dodoc README
-	dohtml picprog.html *.png
-	doman picprog.1
-}
diff --git a/dev-embedded/picprog/picprog-1.7.ebuild b/dev-embedded/picprog/picprog-1.7.ebuild
deleted file mode 100644
index f6bfd3442173..000000000000
--- a/dev-embedded/picprog/picprog-1.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.7.ebuild,v 1.7 2009/09/23 16:40:52 patrick Exp $
-
-DESCRIPTION="a pic16xxx series microcontroller programmer software for the simple serial port device"
-HOMEPAGE="http://www.iki.fi/hyvatti/pic/picprog.html"
-SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-DEPEND="sys-devel/gcc
-	sys-apps/coreutils"
-RDEPEND=""
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	dobin picprog || die
-	dodoc README
-	dohtml picprog.html *.png
-	doman picprog.1
-}
diff --git a/dev-embedded/picprog/picprog-1.8.1.ebuild b/dev-embedded/picprog/picprog-1.9.1.ebuild
index ed9626e41ca5..9c8f8586ae55 100644
--- a/dev-embedded/picprog/picprog-1.8.1.ebuild
+++ b/dev-embedded/picprog/picprog-1.9.1.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.8.1.ebuild,v 1.3 2007/02/21 20:13:18 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picprog/picprog-1.9.1.ebuild,v 1.1 2011/05/07 09:43:32 radhermit Exp $
 
-inherit eutils
+EAPI=4
+
+inherit toolchain-funcs
 
 DESCRIPTION="A PIC16, PIC18 and dsPIC microcontroller programmer software for the serial port."
 HOMEPAGE="http://www.iki.fi/hyvatti/pic/picprog.html"
 SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-DEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/${PN}-1.7-werner-almesberger.diff || die "epatch failed"
-	epatch "${FILESDIR}"/${PN}-1.7-gcc41.patch || die "epatch failed"
-}
+DEPEND=""
 
 src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake CXX=$(tc-getCXX) CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	dobin picprog || die
+	dobin picprog
 	dodoc README
 	dohtml picprog.html *.png
 	doman picprog.1