From d215dda40e35fd61bc7ec43e49af88147e10f949 Mon Sep 17 00:00:00 2001 From: Denis Dupeyron Date: Sun, 28 Jan 2007 17:21:26 +0000 Subject: [PATCH] Fixed bug #157521. Cleanups. Package-Manager: portage-2.1.2-r4 --- dev-embedded/picptk/ChangeLog | 8 +- dev-embedded/picptk/Manifest | 20 +- .../picptk/files/picptk-0.5a-headerfix.patch | 363 ------------------ dev-embedded/picptk/picptk-0.5a-r1.ebuild | 42 +- 4 files changed, 33 insertions(+), 400 deletions(-) delete mode 100644 dev-embedded/picptk/files/picptk-0.5a-headerfix.patch diff --git a/dev-embedded/picptk/ChangeLog b/dev-embedded/picptk/ChangeLog index 3a8ef42573e8..ec1668b41d3f 100644 --- a/dev-embedded/picptk/ChangeLog +++ b/dev-embedded/picptk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-embedded/picptk -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picptk/ChangeLog,v 1.8 2006/09/23 02:51:38 robbat2 Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picptk/ChangeLog,v 1.9 2007/01/28 17:21:26 calchan Exp $ + + 28 Jan 2007; Denis Dupeyron + -files/picptk-0.5a-headerfix.patch, picptk-0.5a-r1.ebuild: + Fixed bug #157521, thanks to Jakub Moc for the patch. Cleanups. 23 Sep 2006; Robin H. Johnson -picptk-0.5a.ebuild: Remove old revision for bug #148719. diff --git a/dev-embedded/picptk/Manifest b/dev-embedded/picptk/Manifest index 8edabbd22a4a..1bbb9af1f432 100644 --- a/dev-embedded/picptk/Manifest +++ b/dev-embedded/picptk/Manifest @@ -1,7 +1,3 @@ -AUX picptk-0.5a-headerfix.patch 12453 RMD160 f83695b90c3a30c19f392e534de0991e216d9f49 SHA1 de6236e61a1ae9273f34f59f296416197bf2ae18 SHA256 747b93c2770c7b2b5dd14eff6cb895656cb52e45f4ec293cc196e553a02b0781 -MD5 68d9a1dd472341c4c938e9e16d3f8680 files/picptk-0.5a-headerfix.patch 12453 -RMD160 f83695b90c3a30c19f392e534de0991e216d9f49 files/picptk-0.5a-headerfix.patch 12453 -SHA256 747b93c2770c7b2b5dd14eff6cb895656cb52e45f4ec293cc196e553a02b0781 files/picptk-0.5a-headerfix.patch 12453 AUX picptk-0.5a-r1-gccfixes.patch 12537 RMD160 9271d846b28f830f75e84f219848c5ac2f2a8769 SHA1 7b868fc559777b0926e8925f4dc0a831c9c435d0 SHA256 4c88f9395db1fcdfd46bcbb0ec382c1fd1436b4d118b683e78deb85206855026 MD5 055efa53df394b2c34e9fc030465e174 files/picptk-0.5a-r1-gccfixes.patch 12537 RMD160 9271d846b28f830f75e84f219848c5ac2f2a8769 files/picptk-0.5a-r1-gccfixes.patch 12537 @@ -11,14 +7,14 @@ MD5 cb3f066b02f6640108ae625a0b437b47 files/picptk-0.5a-r1-headerfix.patch 12456 RMD160 20c8006b51093c0b7accfae51ee346ab560e5e6f files/picptk-0.5a-r1-headerfix.patch 12456 SHA256 25645547914b0dcf7dbc71d9e27652282f9d7c1ef59034321eef615823b1d193 files/picptk-0.5a-r1-headerfix.patch 12456 DIST picptk-0.5a.tar.gz 66629 RMD160 5711497466a1b0abe10a2ec420cdc64f24bce7a6 SHA1 b7330a6a0f938c81fc18ab8dee0165a1a428c40d SHA256 606ee5dc7862079bbc5a187df4531a80af038c8e2541c4f83536bfc027d2bb13 -EBUILD picptk-0.5a-r1.ebuild 1335 RMD160 92741e62aee3a48f5c50d55b536a87580139a8b2 SHA1 701d3a245807f06f037d4cbbaa5611493b019d47 SHA256 d64cc084dcb8d3c7c0b615a32337d0ecd58a114d48fdec823b896ac72e41e1fa -MD5 1d84c91b890d8492bea1d8d99aa28840 picptk-0.5a-r1.ebuild 1335 -RMD160 92741e62aee3a48f5c50d55b536a87580139a8b2 picptk-0.5a-r1.ebuild 1335 -SHA256 d64cc084dcb8d3c7c0b615a32337d0ecd58a114d48fdec823b896ac72e41e1fa picptk-0.5a-r1.ebuild 1335 -MISC ChangeLog 1176 RMD160 845865f4fa2ec60f5cecaab477a3cf1d059b495b SHA1 805d5409606b2a2464d4437dcd33bd2aecbc3d4a SHA256 960d3e0a1f1fbdfb02c0af415a91312b6a43ec0202f8fbb9dc286f84adcb3953 -MD5 0ba2e76030814bd9c5a89da836bd29b5 ChangeLog 1176 -RMD160 845865f4fa2ec60f5cecaab477a3cf1d059b495b ChangeLog 1176 -SHA256 960d3e0a1f1fbdfb02c0af415a91312b6a43ec0202f8fbb9dc286f84adcb3953 ChangeLog 1176 +EBUILD picptk-0.5a-r1.ebuild 1202 RMD160 14731a68d8f7d40f1313a5473e73cb9c75494169 SHA1 78db9300b6b42b543cf726a5287d21e55746a675 SHA256 177ae395396a9b9bd478692addbdccaebc360e38d8147ffcc47ffcd2228ade36 +MD5 a6ee7ede55b9d5220759a6d1c6c7a610 picptk-0.5a-r1.ebuild 1202 +RMD160 14731a68d8f7d40f1313a5473e73cb9c75494169 picptk-0.5a-r1.ebuild 1202 +SHA256 177ae395396a9b9bd478692addbdccaebc360e38d8147ffcc47ffcd2228ade36 picptk-0.5a-r1.ebuild 1202 +MISC ChangeLog 1355 RMD160 f9eddd5d321b3ae11c118d6b788d28d1067f8e30 SHA1 597f1bf5891a4adea11d594c6792af1b58c3ace7 SHA256 4b26ce25f2aa2d1341913c13f5c3e718ce78abab4d3e57808f77ebc8c50ef687 +MD5 365cbed807cff87618ec49b0f84134ac ChangeLog 1355 +RMD160 f9eddd5d321b3ae11c118d6b788d28d1067f8e30 ChangeLog 1355 +SHA256 4b26ce25f2aa2d1341913c13f5c3e718ce78abab4d3e57808f77ebc8c50ef687 ChangeLog 1355 MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 metadata.xml 165 diff --git a/dev-embedded/picptk/files/picptk-0.5a-headerfix.patch b/dev-embedded/picptk/files/picptk-0.5a-headerfix.patch deleted file mode 100644 index 3ad3c7df3e3c..000000000000 --- a/dev-embedded/picptk/files/picptk-0.5a-headerfix.patch +++ /dev/null @@ -1,363 +0,0 @@ -diff -urbB picptk-0.5a.old/IfParPort.C picptk-0.5a/IfParPort.C ---- picptk-0.5a.old/IfParPort.C 1998-12-30 17:40:31.000000000 -0800 -+++ picptk-0.5a/IfParPort.C 2003-10-20 02:42:14.000000000 -0700 -@@ -27,6 +27,9 @@ - * Byte wide transfers GetByte() - * Support bidiriectional pins - */ -+ -+using namespace std; -+ - #include - #include - #include -@@ -72,7 +75,8 @@ - { out, 1, 2, 0x08 }, /* pin 17 (out) !SI */ - { nc, 0, 1, 0x00 }, /* pin 18 GND */ - }; -- cPinInfo = pinfo; -+ //cPinInfo = pinfo; -+ for(uint i = 0; i < kMaxPins; i++) cPinInfo[i] = pinfo[i]; - if(port >= kMaxPorts) - throw("Bad printer port number"); - cPort = ports[port]; -diff -urbB picptk-0.5a.old/IfParPort.h picptk-0.5a/IfParPort.h ---- picptk-0.5a.old/IfParPort.h 1998-12-30 17:40:31.000000000 -0800 -+++ picptk-0.5a/IfParPort.h 2003-10-20 02:42:14.000000000 -0700 -@@ -32,6 +32,7 @@ - #ifndef _ParPort_h_ - #define _ParPort_h_ - -+using namespace std; - #include // for uint - #include - -@@ -45,12 +46,14 @@ - uint cState[kPortSize]; // in bytes... - - typedef enum { nc, in, out, } Dir_t; -- struct PinInfo_t { -+ typedef struct PinInfo_t { - Dir_t dir; - char sense; - char offset; - char mask; -- } cPinInfo[kMaxPins]; -+ }; -+ -+ PinInfo_t cPinInfo[kMaxPins]; - - - // Gain access to parallel port, return 0 on success... -diff -urbB picptk-0.5a.old/IoIntel.C picptk-0.5a/IoIntel.C ---- picptk-0.5a.old/IoIntel.C 1998-12-30 17:40:32.000000000 -0800 -+++ picptk-0.5a/IoIntel.C 2003-10-20 02:42:14.000000000 -0700 -@@ -22,6 +22,7 @@ - * Intel Hex file I/O formatting and such... - * - */ -+using namespace std; - #include - #include // for sscanf - // ParseLine(...) - parse one line of Intel Hex8 format -@@ -65,7 +66,7 @@ - // If length is zero, writes end of file marker... - // This should be smarter about supressing zeros, maybe? - bool --IntelHex::OutputLine(ostream &os, int len, uint addr = 0, char *buffer = 0) { -+IntelHex::OutputLine(ostream &os, int len, uint addr, char *buffer) { - char line[200]; - int sum = 0; - int type = (len) ? 0 : 1; -diff -urbB picptk-0.5a.old/IoIntel.h picptk-0.5a/IoIntel.h ---- picptk-0.5a.old/IoIntel.h 1998-12-30 17:40:32.000000000 -0800 -+++ picptk-0.5a/IoIntel.h 2003-10-20 02:43:00.000000000 -0700 -@@ -24,10 +24,11 @@ - - #ifndef IntelHex_h - #define IntelHex_h -+using namespace std; - - #include // for uint --#include --#include -+#include -+#include - - // This probably should be more general and read multiple formats... - class IntelHex { -diff -urbB picptk-0.5a.old/Makefile.am picptk-0.5a/Makefile.am ---- picptk-0.5a.old/Makefile.am 1998-12-30 18:23:05.000000000 -0800 -+++ picptk-0.5a/Makefile.am 2003-10-20 02:42:14.000000000 -0700 -@@ -24,7 +24,7 @@ - .picprc \ - picptk.itk - --INCLUDES = -I . -I /usr/include/tcl8.0-int/generic/ -+INCLUDES = -I. -I/usr/include/tcl8.0-int/generic/ -I/usr/lib/tcl8.3/include/generic -I/usr/lib/tcl8.4/include/generic - - ##dnl info_TEXINFOS = picptk.texi - -diff -urbB picptk-0.5a.old/PicCore.C picptk-0.5a/PicCore.C ---- picptk-0.5a.old/PicCore.C 1998-12-30 17:40:32.000000000 -0800 -+++ picptk-0.5a/PicCore.C 2003-10-20 02:42:14.000000000 -0700 -@@ -19,6 +19,7 @@ - * - * $Id: picptk-0.5a-headerfix.patch,v 1.1 2003/10/20 09:51:31 robbat2 Exp $ - */ -+using namespace std; - #include - #include - #include // for strcat() -@@ -504,7 +505,7 @@ - SetPin(pin_do, 0); - } - // SetPin() - Hook to the driver's set pin... --void Pic::SetPin(Pin_t pin, int val = 1) { -+void Pic::SetPin(Pin_t pin, int val) { - if(!cDriver) throw (cDriver); // Get the hint? - cDriver->SetPin(pin, val); - } -diff -urbB picptk-0.5a.old/PicCore.h picptk-0.5a/PicCore.h ---- picptk-0.5a.old/PicCore.h 1998-12-30 17:40:32.000000000 -0800 -+++ picptk-0.5a/PicCore.h 2003-10-20 02:43:17.000000000 -0700 -@@ -21,8 +21,9 @@ - */ - #ifndef Pic_h - #define Pic_h -+using namespace std; - --#include -+#include - #include - #include - #include // for Environment -@@ -130,7 +131,7 @@ - int VerifySegment(Segment &seg, ProgressCb_t cb=0, void *arg=0); - int EraseSegment (Segment &seg, ProgressCb_t cb=0, void *arg=0); - int InitSegment (Segment &seg, ProgressCb_t cb=0, void *arg=0) { seg.Init(); return(0); } -- int DumpSegment (Segment &seg, ProgressCb_t cb=0, void *arg=0) { seg.Dump((ostream &)*arg); return(0); } -+ int DumpSegment (Segment &seg, ProgressCb_t cb=0, void *arg=0) { seg.Dump((ostream &)arg); return(0); } - int BlankCheckSegment (Segment &seg, ProgressCb_t cb=0, void *arg=0); - - // Set/Get based on Pin name -@@ -149,13 +150,13 @@ - const char *GetPref(const char *attr) { return(cEnv.Get(attr)); } - - // Make user functions apply to all segments... -- int Read (ProgressCb_t cb = 0, void *obj = 0) { return(EachSegment(&ReadSegment, cb, obj)); } -- int Write (ProgressCb_t cb = 0, void *obj = 0) { return(EachSegment(&WriteSegment, cb, obj)); } -- int Verify(ProgressCb_t cb = 0, void *obj = 0) { return(EachSegment(&VerifySegment, cb, obj)); } -- int Erase (ProgressCb_t cb = 0, void *obj = 0) { return(EachSegment(&EraseSegment, cb, obj)); } -- int DumpRam (ostream &os) { return(EachSegment(&DumpSegment, 0, &os, false)); } -+ int Read (ProgressCb_t cb = 0, void *obj = 0) { return(EachSegment(&Pic::ReadSegment, cb, obj)); } -+ int Write (ProgressCb_t cb = 0, void *obj = 0) { return(EachSegment(&Pic::WriteSegment, cb, obj)); } -+ int Verify(ProgressCb_t cb = 0, void *obj = 0) { return(EachSegment(&Pic::VerifySegment, cb, obj)); } -+ int Erase (ProgressCb_t cb = 0, void *obj = 0) { return(EachSegment(&Pic::EraseSegment, cb, obj)); } -+ int DumpRam (ostream &os) { return(EachSegment(&Pic::DumpSegment, 0, &os, false)); } - int LoadRam (const char *file); -- int InitRam () { return(EachSegment(&InitSegment, 0, 0, false)); } -+ int InitRam () { return(EachSegment(&Pic::InitSegment, 0, 0, false)); } - - // Configuration functions... - virtual const char **Chips(); // What chip types we support... -diff -urbB picptk-0.5a.old/PicDriver.h picptk-0.5a/PicDriver.h ---- picptk-0.5a.old/PicDriver.h 1998-12-30 17:40:32.000000000 -0800 -+++ picptk-0.5a/PicDriver.h 2003-10-20 02:43:19.000000000 -0700 -@@ -25,6 +25,7 @@ - */ - #ifndef _PicDriver_h_ - #define _PicDriver_h_ -+using namespace std; - - #include // for uint - #include // for serial port support -diff -urbB picptk-0.5a.old/PicMem.h picptk-0.5a/PicMem.h ---- picptk-0.5a.old/PicMem.h 1998-12-30 17:40:32.000000000 -0800 -+++ picptk-0.5a/PicMem.h 2003-10-20 02:43:22.000000000 -0700 -@@ -21,9 +21,10 @@ - */ - #ifndef Segment_h - #define Segment_h -+using namespace std; - - #include // for uint --#include -+#include - #include // for sprintf() - #include // for strcat() - -diff -urbB picptk-0.5a.old/PicParallel.C picptk-0.5a/PicParallel.C ---- picptk-0.5a.old/PicParallel.C 1998-12-30 17:40:32.000000000 -0800 -+++ picptk-0.5a/PicParallel.C 2003-10-20 02:42:14.000000000 -0700 -@@ -27,6 +27,7 @@ - * into actions... - */ - -+using namespace std; - #include - #include // for open(), close(), ... - -@@ -82,7 +83,7 @@ - } - - // Set specified pin... --void ParallelDriver::SetPin(Pic::Pin_t pin, int val = 1) { -+void ParallelDriver::SetPin(Pic::Pin_t pin, int val) { - int pinnum = cPinMap[pin]; - if(pinnum < 0) cPort->SetPin(-pinnum, val^1); - else cPort->SetPin(pinnum, val); -diff -urbB picptk-0.5a.old/PicParallel.h picptk-0.5a/PicParallel.h ---- picptk-0.5a.old/PicParallel.h 1998-12-30 17:40:32.000000000 -0800 -+++ picptk-0.5a/PicParallel.h 2003-10-20 02:43:24.000000000 -0700 -@@ -26,6 +26,7 @@ - */ - #ifndef _PicParallel_h_ - #define _PicParallel_h_ -+using namespace std; - - #include - #include -diff -urbB picptk-0.5a.old/PicPersonality.C picptk-0.5a/PicPersonality.C ---- picptk-0.5a.old/PicPersonality.C 1998-12-30 17:40:33.000000000 -0800 -+++ picptk-0.5a/PicPersonality.C 2003-10-20 02:42:14.000000000 -0700 -@@ -24,6 +24,7 @@ - * ToDo: - * Place this information in a config file rather than in code... - */ -+using namespace std; - #include - - // Pic::cAllPics - Description of all supported Pic members -diff -urbB picptk-0.5a.old/PicSerial.C picptk-0.5a/PicSerial.C ---- picptk-0.5a.old/PicSerial.C 1998-12-30 17:40:33.000000000 -0800 -+++ picptk-0.5a/PicSerial.C 2003-10-20 02:42:14.000000000 -0700 -@@ -34,6 +34,7 @@ - * and they need a non-standard tty driver to hold TX low indefinately. - * The driver appears to be a seperate kernel patch... - */ -+using namespace std; - - #include - #include // for open(), close(), ... -@@ -54,18 +55,18 @@ - SerialDriver::SerialDriver(Environment &env) : Driver(env) { - - #ifndef TIOCCBRK -- throw("No TIOCCBRK ioctl?! --You probably can't use a serial port --programmer unless you install a kernel -+ throw("No TIOCCBRK ioctl?!\n\ -+You probably can't use a serial port\n\ -+programmer unless you install a kernel\n\ - patch."); - - // That'll get user's attention, now let compile it anyway... - #define TIOCCBRK 0 - #endif - #ifndef TIOSCBRK -- throw("No TIOCCBRK ioctl?! --You probably can't use a serial port --programmer unless you install a kernel -+ throw("No TIOCCBRK ioctl?!\n\ -+You probably can't use a serial port\n\ -+programmer unless you install a kernel\n\ - patch."); - #define TIOSCBRK 0 - #endif // TIOSCBRK -@@ -94,7 +95,7 @@ - } - - // Set specified pin... --void SerialDriver::SetPin(Pic::Pin_t pin, int val = 1) { -+void SerialDriver::SetPin(Pic::Pin_t pin, int val) { - int tmp; - val &= 1; - switch(pin) { -diff -urbB picptk-0.5a.old/PicSerial.h picptk-0.5a/PicSerial.h ---- picptk-0.5a.old/PicSerial.h 1998-12-30 17:40:33.000000000 -0800 -+++ picptk-0.5a/PicSerial.h 2003-10-20 02:43:25.000000000 -0700 -@@ -26,6 +26,7 @@ - */ - #ifndef _PicSerial_h_ - #define _PicSerial_h_ -+using namespace std; - - #include - /* Serial port programmer... -diff -urbB picptk-0.5a.old/UiItk.C picptk-0.5a/UiItk.C ---- picptk-0.5a.old/UiItk.C 1998-12-31 08:33:53.000000000 -0800 -+++ picptk-0.5a/UiItk.C 2003-10-20 02:42:50.000000000 -0700 -@@ -27,6 +27,7 @@ - * a the need...) - * - */ -+using namespace std; - - #include - -@@ -34,7 +35,7 @@ - #include - #endif - --#include // for ostrstream -+#include // for ostrstream - - - /* Gui dispatch table for TCL commands... -diff -urbB picptk-0.5a.old/UiItk.h picptk-0.5a/UiItk.h ---- picptk-0.5a.old/UiItk.h 1998-12-30 17:40:33.000000000 -0800 -+++ picptk-0.5a/UiItk.h 2003-10-20 02:43:27.000000000 -0700 -@@ -30,6 +30,7 @@ - - // Even though the interface may be incrTk, - // contains what we need here... -+using namespace std; - #include - #include - -diff -urbB picptk-0.5a.old/UtEnvLite.h picptk-0.5a/UtEnvLite.h ---- picptk-0.5a.old/UtEnvLite.h 1998-12-30 17:40:33.000000000 -0800 -+++ picptk-0.5a/UtEnvLite.h 2003-10-20 02:43:31.000000000 -0700 -@@ -27,8 +27,9 @@ - */ - #ifndef _Environment_h_ - #define _Environment_h_ -+using namespace std; - --#include -+#include - #include - #include - -diff -urbB picptk-0.5a.old/UtRealTime.h picptk-0.5a/UtRealTime.h ---- picptk-0.5a.old/UtRealTime.h 1998-12-30 17:40:33.000000000 -0800 -+++ picptk-0.5a/UtRealTime.h 2003-10-20 02:43:33.000000000 -0700 -@@ -25,6 +25,7 @@ - - #ifndef RealTime_h - #define RealTime_h -+using namespace std; - - #include // for uint - #include // for sched_setscheduler() -diff -urbB picptk-0.5a.old/configure.in picptk-0.5a/configure.in ---- picptk-0.5a.old/configure.in 1998-12-31 08:46:54.000000000 -0800 -+++ picptk-0.5a/configure.in 2003-10-20 02:42:14.000000000 -0700 -@@ -7,12 +7,12 @@ - AC_PROG_INSTALL - - dnl Checks for libraries. --AC_CHECK_LIB(itk3.0, Itk_Init) --AC_CHECK_LIB(itk3.0, Itk_Init, cp picptk.itk picptk, cp picptk.tcl picptk) -+AC_CHECK_LIB(itk3.2, Itk_Init) -+AC_CHECK_LIB(itk3.2, Itk_Init, cp picptk.itk picptk, cp picptk.tcl picptk) - - dnl The following isn't totally true, but let's force the issue... --AC_CHECK_LIB(itk3.0, Itk_Init,,AC_MSG_ERROR([ --**** picptk now requires itcl3.0 -+AC_CHECK_LIB(itk3.2, Itk_Init,,AC_MSG_ERROR([ -+**** picptk now requires itcl3.2 - **** See the README file for more info. - ])) - diff --git a/dev-embedded/picptk/picptk-0.5a-r1.ebuild b/dev-embedded/picptk/picptk-0.5a-r1.ebuild index 1f92ecfc506e..b8a65fe610a2 100644 --- a/dev-embedded/picptk/picptk-0.5a-r1.ebuild +++ b/dev-embedded/picptk/picptk-0.5a-r1.ebuild @@ -1,13 +1,15 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picptk/picptk-0.5a-r1.ebuild,v 1.1 2006/02/25 11:46:50 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picptk/picptk-0.5a-r1.ebuild,v 1.2 2007/01/28 17:21:26 calchan Exp $ -inherit eutils flag-o-matic autotools +WANT_AUTOMAKE="1.4" +WANT_AUTOCONF="latest" + +inherit eutils autotools DESCRIPTION="Picptk is a programmer supporting the whole PIC family including all memory types (EEPROM, EPROM, and OTP)" HOMEPAGE="http://huizen.dds.nl/~gnupic/programmers_mike_butler.html" -# http://huizen.dds.nl/~gnupic/picptk-0.5a.tar.gz -SRC_URI="http://huizen.dds.nl/~gnupic/picptk-0.5a.tar.gz" +SRC_URI="http://huizen.dds.nl/~gnupic/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -15,33 +17,27 @@ KEYWORDS="~x86" IUSE="" RDEPEND="=dev-tcltk/itk-3.3* - dev-tcltk/iwidgets - dev-tcltk/itcl" -DEPEND="${RDEPEND} - sys-devel/gcc - sys-devel/automake - sys-devel/autoconf" + dev-tcltk/iwidgets + dev-tcltk/itcl" src_unpack() { unpack ${A} - epatch ${FILESDIR}/${PF}-headerfix.patch - epatch ${FILESDIR}/${PF}-gccfixes.patch - cd ${S} - export WANT_AUTOMAKE=1.4 - export WANT_AUTOCONF=2.1 + epatch "${FILESDIR}"/${PF}-headerfix.patch + epatch "${FILESDIR}"/${PF}-gccfixes.patch + cd "${S}" sed -i.orig -e '49,53d' \ -e 's/AM_PROG_INSTALL/AC_PROG_INSTALL/g' \ ${S}/aclocal.m4 || die "sed failed" - eautoconf || die "autoconf failed" - eautomake || die "automake failed" + eautoreconf || die "autoreconf failed" +} + +src_compile() { + econf LDFLAGS="-L/usr/lib/itk3.3 ${LDFLAGS}" || die "Configuration failed" + emake || die "Compilation failed" } src_install() { - #dobin picprog - #dodoc README #jdm*.png adapter.jpg - #dohtml picprog.html *.jpg *.png - #doman picprog.1 - einstall || die "einstall failed" + emake DESTDIR="${D}" install || die "Installation failed" dodoc AUTHORS NEWS README TODO newdoc .picprc sample.picprc } -- 2.26.2