Added an upstream patch to fix 64-bit issues causing problems in some applications using pilot-link (e. g. jpilot, bug 87842). Disabled parallel make for now as it's badly broken (bug 202857).

Package-Manager: portage-2.1.4_rc9

4 files changed, 57 insertions, 10 deletions

diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index 470daa989052..8cd36aab8199 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-pda/pilot-link
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.31 2007/12/19 21:09:49 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.32 2007/12/20 23:08:58 philantrop Exp $
+
+  20 Dec 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/pilot-link-0.12.3-int_types.patch, pilot-link-0.12.3.ebuild:
+  Added an upstream patch to fix 64-bit issues causing problems in some
+  applications using pilot-link (e. g. jpilot, bug 87842). Disabled parallel
+  make for now as it's badly broken (bug 202857).
 
 *pilot-link-0.12.3 (19 Dec 2007)
 
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index 75790a0bf94e..a85209e2dbc9 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -62,6 +62,10 @@ AUX pilot-link-0.12.2-werror_194921.patch 810 RMD160 4268bebfc8a40c45ed70d571cbf
 MD5 1885158df81fd520592e8d05d1e63e62 files/pilot-link-0.12.2-werror_194921.patch 810
 RMD160 4268bebfc8a40c45ed70d571cbfb220abbb8bc9b files/pilot-link-0.12.2-werror_194921.patch 810
 SHA256 7e5e472e0c62fcaf5fe883928bd83402c848ac81ac50e61a571e6f64e7f21503 files/pilot-link-0.12.2-werror_194921.patch 810
+AUX pilot-link-0.12.3-int_types.patch 876 RMD160 f3b9becb4d4cae32fc418848ee733dfd7afbcba6 SHA1 d977e9d4dd204c7d5dfcf69e35a375e0eacc5833 SHA256 e728fb7cc751a211db1d5bbbc9f16fbc56659187827a20c2434c64aaeed1388f
+MD5 4ec9e123ae2140f869dff81bdf36933e files/pilot-link-0.12.3-int_types.patch 876
+RMD160 f3b9becb4d4cae32fc418848ee733dfd7afbcba6 files/pilot-link-0.12.3-int_types.patch 876
+SHA256 e728fb7cc751a211db1d5bbbc9f16fbc56659187827a20c2434c64aaeed1388f files/pilot-link-0.12.3-int_types.patch 876
 AUX pilot-link-0.12.3-java-install.patch 823 RMD160 e6999723dd9a71f95f56d704ba6a1f4f1de2e77c SHA1 4bb887091f18c44b3b344d309d673ef56f4096dd SHA256 60f6c9cd3a03adcef22e598f6d497f3095c1e702ac1d4fcac91e84affbc2fe8f
 MD5 ed3e3bd74be1ed9599fb840edb4d2120 files/pilot-link-0.12.3-java-install.patch 823
 RMD160 e6999723dd9a71f95f56d704ba6a1f4f1de2e77c files/pilot-link-0.12.3-java-install.patch 823
@@ -85,14 +89,14 @@ EBUILD pilot-link-0.12.2.ebuild 2632 RMD160 e203ecbd99e0207c256a9dbfcb9c3e28eb77
 MD5 28737c5663e20aab4031346e82a76136 pilot-link-0.12.2.ebuild 2632
 RMD160 e203ecbd99e0207c256a9dbfcb9c3e28eb77142c pilot-link-0.12.2.ebuild 2632
 SHA256 87152d234ac44bb8d0542eed0d1243c5d755ad3feb4bb5aa897ee158c595fad0 pilot-link-0.12.2.ebuild 2632
-EBUILD pilot-link-0.12.3.ebuild 2568 RMD160 1bd021fd3107f5a9c9f019d5ff80669c07d0a7d6 SHA1 fa1166465734536fd62545b29272665c2e104d16 SHA256 d05a31a079f9e853eb111cb85c39bd77d7876bd38ebc033ed99d51461929ff6b
-MD5 e06cbd0243588673e80b073ce8cca857 pilot-link-0.12.3.ebuild 2568
-RMD160 1bd021fd3107f5a9c9f019d5ff80669c07d0a7d6 pilot-link-0.12.3.ebuild 2568
-SHA256 d05a31a079f9e853eb111cb85c39bd77d7876bd38ebc033ed99d51461929ff6b pilot-link-0.12.3.ebuild 2568
-MISC ChangeLog 8611 RMD160 c28db3deb91fc3f79f0a2cafdb5b755d76dc47bc SHA1 bc5b0c83497317bc133cd63184ddb2bd3a03d223 SHA256 db861e6199d553802cde1c2a6f54b46208ded38bc0c76515cd3b96523ba1b4a2
-MD5 cbd0ab0ea63b1b312f7bc3e79620e3c5 ChangeLog 8611
-RMD160 c28db3deb91fc3f79f0a2cafdb5b755d76dc47bc ChangeLog 8611
-SHA256 db861e6199d553802cde1c2a6f54b46208ded38bc0c76515cd3b96523ba1b4a2 ChangeLog 8611
+EBUILD pilot-link-0.12.3.ebuild 2752 RMD160 35bf185c760f7979a8e38061ec975ad46c0fb6a1 SHA1 9a5279196abc613d0cdda3a79a299b3933c48045 SHA256 9246a7b5592a10ab0523e69fbf191c7125c65cd43c8d4edb57cab94c397a2e54
+MD5 546fb5f4aa41f0279629438eb8cc323c pilot-link-0.12.3.ebuild 2752
+RMD160 35bf185c760f7979a8e38061ec975ad46c0fb6a1 pilot-link-0.12.3.ebuild 2752
+SHA256 9246a7b5592a10ab0523e69fbf191c7125c65cd43c8d4edb57cab94c397a2e54 pilot-link-0.12.3.ebuild 2752
+MISC ChangeLog 8936 RMD160 0f07ea111a6f5445835dc845bf89aac122a95c1a SHA1 a4daafc7fb1d7deaadb1f862573bbc9be16a32f3 SHA256 e60aba54a8a9c436ccc96759d970f6837e587936f730f4349c259d58a1993e95
+MD5 a4fc86fe6a6c14bade618b7efe55f165 ChangeLog 8936
+RMD160 0f07ea111a6f5445835dc845bf89aac122a95c1a ChangeLog 8936
+SHA256 e60aba54a8a9c436ccc96759d970f6837e587936f730f4349c259d58a1993e95 ChangeLog 8936
 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
 MD5 075fea99b82d61028585dc3e42f00466 metadata.xml 156
 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe metadata.xml 156
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-int_types.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-int_types.patch
new file mode 100644
index 000000000000..872c59e4e946
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.3-int_types.patch
@@ -0,0 +1,31 @@
+--- pilot-link-0.12.3/include/pi-md5.h	2006-10-17 15:24:07.000000000 +0200
++++ pilot-link/include/pi-md5.h	2007-12-18 04:03:09.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: pilot-link-0.12.3-int_types.patch,v 1.1 2007/12/20 23:08:58 philantrop Exp $
++ * $Id: pilot-link-0.12.3-int_types.patch,v 1.1 2007/12/20 23:08:58 philantrop Exp $
+  *
+  * pi-md5.h: Header file for Colin Plumb's MD5 implementation.
+  *           Modified by Ian Jackson so as not to use Colin Plumb's
+@@ -13,8 +13,20 @@
+ #ifndef MD5_H
+ #define MD5_H
+ 
++#include "config.h"
++#if HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#if HAVE_STDINT_H
++#include <stdint.h>
++#endif
++#ifdef HAVE_INTTYPES_H || HAVE_STDINT_H
++#define UINT8 uint8_t
++#define UINT32 uint32_t
++#else
+ #define UINT8 unsigned char
+-#define UINT32 unsigned long
++#define UINT32 unsigned int
++#endif
+ 
+ struct MD5Context {
+ 	UINT32 buf[4];
diff --git a/app-pda/pilot-link/pilot-link-0.12.3.ebuild b/app-pda/pilot-link/pilot-link-0.12.3.ebuild
index 0da9c146929b..d3bfdbe863d6 100644
--- a/app-pda/pilot-link/pilot-link-0.12.3.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.3.ebuild,v 1.1 2007/12/19 21:09:49 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.3.ebuild,v 1.2 2007/12/20 23:08:58 philantrop Exp $
 
 inherit perl-module java-pkg-opt-2 eutils autotools
 
@@ -30,6 +30,9 @@ DEPEND="${BOTH_DEPEND}
 RDEPEND="${BOTH_DEPEND}
 	java? ( >=virtual/jre-1.4 )"
 
+# Unfortunately, parallel compilation is badly broken. cf. bug  202857.
+MAKEOPTS="${MAKEOPTS} -j1"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -46,6 +49,9 @@ src_unpack() {
 	# their installation here.
 	use java && epatch "${FILESDIR}/${P}-java-install.patch"
 
+	# Upstream patch to fix 64-bit issues.
+	epatch "${FILESDIR}/${P}-int_types.patch"
+
 	AT_M4DIR="m4" eautoreconf
 }