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

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

7 files changed, 36 insertions, 222 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/Manifest b/dev-embedded/picprog/Manifest
index ddbd8ec7cbf6..123a5569ace4 100644
--- a/dev-embedded/picprog/Manifest
+++ b/dev-embedded/picprog/Manifest
@@ -1,11 +1,20 @@
-AUX picprog-1.7-gcc41.patch 293 RMD160 84e5cfa32db086bc79ca928a59d56fd8f003a9c2 SHA1 c77a6748e0cb4b4988997dd12aa0714fa3b3f0dc SHA256 e50318041ed36ae630b4a9bba9fff496433bce19ce0df12883502e77732d444e
-AUX picprog-1.7-werner-almesberger.diff 3329 RMD160 ef4a24e2201cbcefb441b4a8c84ca7fc8b464269 SHA1 3b853af340bf2d8f4417117ab45c593dc2510a4a SHA256 89ed91ff511ba5971d645e4c98e5dd4425c69343dc0182ce689b85894d6e5530
-DIST picprog-1.7.tar.gz 55118 RMD160 e8a1c74b2335783682f88aee92cf910f519b8206 SHA1 a8f95a2b6cbac4aab6c867f356f6e7f93207bd8e SHA256 08c9abd24aada73f934775bec8e0573054800daa1cf72b9bddaab1fa7ad3f352
-DIST picprog-1.8.1.tar.gz 58040 RMD160 243104bec4c7be17ee53e7e0f59c4cf067144ceb SHA1 bd2b6c544c4acc8345cdc9553ddc31c3378eda42 SHA256 1e9e17a764611828a6af028cb1a6eda4abd6ad4c7fed17ca4b6ea246c74a4a19
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST picprog-1.8.3.tar.gz 58506 RMD160 c48e4a658475bd55f42821e54b637e0b598f0b48 SHA1 94e937ba4ef1941e7431c90e9d48a5f456e7f497 SHA256 6dfc51aee7051876c93b51e346fbd933e9d4caff3d11deb9ee1642fbf7da70fe
-EBUILD picprog-1.7-r1.ebuild 853 RMD160 08415c6d203b44025e27850a7c9e0882a017c292 SHA1 33629036629f849cf9317108e42a602d51b60326 SHA256 00d3f512b6f847f840da3af2d9afd23c87845522976bf460694d0b5a1ef170a6
-EBUILD picprog-1.7.ebuild 695 RMD160 32eb7cdaaed305ab8ed83160c0a59e10c876ba1f SHA1 9993ddc16656d23b8b5fec68204ce8673ffd5db2 SHA256 0408d03e9737da53bf0b460191eb69e2bff3128cd230f2eb89bda41baa86386a
-EBUILD picprog-1.8.1.ebuild 892 RMD160 ef64de080625c85bfc4db42a3649260e1c20d8ee SHA1 acbd8707e7a1dcc1b253ce61b23041234ebfd8a6 SHA256 b98b9cbedcae3af514eb23d94ee78a77c965d2283e2a3fbe4e1a73a2591bf4ce
+DIST picprog-1.9.1.tar.gz 76452 RMD160 63293485f27e88a6de684bc10bbeb52c85681a53 SHA1 7956eabb6ff9a8427ad65e3186ef17a172c31620 SHA256 057572133390122051622c412b8b3abeb38487a205645c427252ec61c38304e4
 EBUILD picprog-1.8.3.ebuild 874 RMD160 dd0fa87d61f99286eac5a89ab9135ab3532b379f SHA1 1a73c33b82190a406c2cc66b017e45252c22e1af SHA256 bd5e510e1d03895ca1189300ab30fe5e1ea347dc3fd8a4a9930799fc157a4347
-MISC ChangeLog 2833 RMD160 c9fbbea09247360b39776e7d478cd6cce3a70c2b SHA1 d424bd9fa751c77a442054cce14f1d30b4fe71f1 SHA256 f238b61e83af31fff7a882f8c4b4cb32acadc92a85d15fcab42a89318fe560df
+EBUILD picprog-1.9.1.ebuild 714 RMD160 94e8b81640335bedabfc3044ea1bb71b26ccc813 SHA1 18fea0d9d95b65f801113f97c11de8190d1f65ba SHA256 d311b11a7d0a212ae89580238df521849709aaa4b60be8cc5dac228eef96b196
+MISC ChangeLog 3150 RMD160 66e591ff204bc9318933416e511fb57f9ec572f0 SHA1 28b005c2b953f46126a12ceacc53f10a00056b00 SHA256 5ae74e020f0d6ee356297f51c94345bf88004eb4f772f08080cdb4ac96b7acbe
 MISC metadata.xml 289 RMD160 bf9fb1258fcfd3fddf106bf96af9611f77925637 SHA1 52c7fbd10e489e879efb3e527eab5fc2f8e3f89c SHA256 b668d618f089ff8dd246ca3707d9d326a299669e330c550c75b834512255390d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNxRRPAAoJEEqz6FtPBkyjnNgIALeyW92Ly45zTTEIQ4aP16BE
+EUffWiy3aBiDdG5TAxCi9DGpVUTFgw+GQmaHDmydK4qXEsSmWN+3rqmXpPybDERq
+iThl17iESYyfWFbPWW1gmtto7R/njcljAMXDEyqNAFd4mdS+50cY01lmcBspJruw
+tzJ1qaLJ8cX/sgA72IdrpxhmOJFNwIRxryQSycaZv7wVo1qxcY1Edao8vyULQ72p
+L4CTNAnvyzJTd+/ZP53wFcK8xjN+qGYZiTUO6lb6cZsGj2TldL9pBbqMZd1FOVSY
+qCiaZ/wT1hjBhvt6HspzKN8GTaNGkerlx0jY60WBJezkidok06bhxd1Eq31CZ4A=
+=7+JG
+-----END PGP SIGNATURE-----
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