Version bump to 0.99.9 with several fixes. Removed obsolete versions.

Fixes bugs 93471, 128076, 148440 and 160349.
Thanks to (in order of appearance) Craig Lawson, Mark Wagner, Serhij S. Stasyuk and Thomas Jost for their contributions!
Package-Manager: portage-2.1.3.9

13 files changed, 149 insertions, 239 deletions

diff --git a/app-pda/jpilot/ChangeLog b/app-pda/jpilot/ChangeLog
index ad961c09d24e..921e50293fc1 100644
--- a/app-pda/jpilot/ChangeLog
+++ b/app-pda/jpilot/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-pda/jpilot
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.31 2007/01/24 03:30:21 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.32 2007/09/17 05:38:36 philantrop Exp $
+
+*jpilot-0.99.9 (17 Sep 2007)
+
+  17 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  -files/jpilot-0.99.8-glibc-free.patch, -files/jpilot-0.99.8-glob.patch,
+  -files/jpilot-0.99.8-memory.patch,
+  +files/jpilot-0.99.9-keyring-cats.patch, -jpilot-0.99.8_pre9.ebuild,
+  -jpilot-0.99.8.ebuild, -jpilot-0.99.8-r1.ebuild, +jpilot-0.99.9.ebuild:
+  Version bump to 0.99.9 with several fixes. Removed obsolete versions. Fixes
+  bugs 93471, 128076, 148440 and 160349. Thanks to (in order of appearance)
+  Craig Lawson, Mark Wagner, Serhij S. Stasyuk and Thomas Jost for their
+  contributions!
 
   24 Jan 2007; Marius Mauch <genone@gentoo.org> jpilot-0.99.7-r1.ebuild,
   jpilot-0.99.8_pre9.ebuild, jpilot-0.99.8.ebuild, jpilot-0.99.8-r1.ebuild:
diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
index d1c304cf9c4c..cc2f4210e455 100644
--- a/app-pda/jpilot/Manifest
+++ b/app-pda/jpilot/Manifest
@@ -5,41 +5,24 @@ AUX jpilot-0.99.7-gcc2.patch 583 RMD160 b6f3ba7c0484d1966affa357baa9ac153a7bbb4b
 MD5 1a69d9c2c611a27639d15707d1a54549 files/jpilot-0.99.7-gcc2.patch 583
 RMD160 b6f3ba7c0484d1966affa357baa9ac153a7bbb4b files/jpilot-0.99.7-gcc2.patch 583
 SHA256 f852f3a6539965559dc63a765fb2eb0bcfeba946af48a984cb7ad8c73b9122ad files/jpilot-0.99.7-gcc2.patch 583
-AUX jpilot-0.99.8-glibc-free.patch 406 RMD160 d6349c55014dac1a2f88a7cd6a237b44df2dd3df SHA1 5508f74163b1742f171f13c3360a7c8430e08dc3 SHA256 b09a61b52bec8b57fe38d24dbdcd268b3a244fac94f364e3abf024d15861b565
-MD5 c8eaa3f88fdcb7db77f4791d3a211a24 files/jpilot-0.99.8-glibc-free.patch 406
-RMD160 d6349c55014dac1a2f88a7cd6a237b44df2dd3df files/jpilot-0.99.8-glibc-free.patch 406
-SHA256 b09a61b52bec8b57fe38d24dbdcd268b3a244fac94f364e3abf024d15861b565 files/jpilot-0.99.8-glibc-free.patch 406
-AUX jpilot-0.99.8-glob.patch 437 RMD160 30d1095f1afb0f7fe7d921eb2026f270e29144fa SHA1 42acc228363517af92c17d803e145de95c039820 SHA256 8e56a5df2d427ebadf0093bd205ead98f06e0acd9ce1004d51f39eb09ba75834
-MD5 57d5d8d16ab24394a87b2df189cb5180 files/jpilot-0.99.8-glob.patch 437
-RMD160 30d1095f1afb0f7fe7d921eb2026f270e29144fa files/jpilot-0.99.8-glob.patch 437
-SHA256 8e56a5df2d427ebadf0093bd205ead98f06e0acd9ce1004d51f39eb09ba75834 files/jpilot-0.99.8-glob.patch 437
-AUX jpilot-0.99.8-memory.patch 438 RMD160 e42c2dc9306e14cfbe08d5ef234dbb4daecd41b5 SHA1 f37b8ccd9b07e05c0f078b1f43ca963a2bf2f5b2 SHA256 288e27781e8b9f3729f851b11e70b8910b471621042542774901348e1a3785b6
-MD5 c1a8a08ca04295435b30b908fc3adff3 files/jpilot-0.99.8-memory.patch 438
-RMD160 e42c2dc9306e14cfbe08d5ef234dbb4daecd41b5 files/jpilot-0.99.8-memory.patch 438
-SHA256 288e27781e8b9f3729f851b11e70b8910b471621042542774901348e1a3785b6 files/jpilot-0.99.8-memory.patch 438
+AUX jpilot-0.99.9-keyring-cats.patch 2499 RMD160 ac5468e9755496532761f8411a98665b0acbf70d SHA1 c6e8e0c3f75878104e19f420c855b8a4fd09c003 SHA256 2380bee422f7410df3912796b0f0de84a3589c6eeea2223e93ccb98cd37fb39e
+MD5 80cad3fd702b9c05942ee3ded4e2f6b3 files/jpilot-0.99.9-keyring-cats.patch 2499
+RMD160 ac5468e9755496532761f8411a98665b0acbf70d files/jpilot-0.99.9-keyring-cats.patch 2499
+SHA256 2380bee422f7410df3912796b0f0de84a3589c6eeea2223e93ccb98cd37fb39e files/jpilot-0.99.9-keyring-cats.patch 2499
 DIST jpilot-0.99.7.tar.gz 1197119 RMD160 04516b0be321addaf636205372483178dff5c839 SHA1 4ecdc3c00fa4b7d475d156f1cef6840c5e8aa4dc SHA256 f9d5812b480dee9fddc112f1c461cad69eaabb2229ee6f0e1caffff9dfbdfae5
-DIST jpilot-0.99.8-pre9.tar.gz 1394323 RMD160 e90793dd896faeb0a2b54cfd8a21ff0a7730f2a2 SHA1 e93d032ed9374520a51431746babcbaf3d7e855d SHA256 5da78c1e23a3a0212c064918546cb7f1dde3851dfd35b8564f855900b85f81b5
-DIST jpilot-0.99.8.tar.gz 1589217 RMD160 9d19e41a8d73f1dbfc5107e0ee1657ac09b55189 SHA1 5ad7c15f4583a15afb7acd96db2c4e8e58311b29 SHA256 a89ca99df142efa6046509df7522794c34da84158893bfbce836c9f5fd943d78
+DIST jpilot-0.99.9.tar.gz 1671351 RMD160 0286b9f9579dbbdb8e9bd207384561814bab5114 SHA1 19a76f8815188a1b7993fbff81624e852a3bbc5c SHA256 341491ad727e234b58c7d5f057bcff363d15d2f223c1beab05fc49820dfe6432
 EBUILD jpilot-0.99.7-r1.ebuild 1669 RMD160 ca9bb952c637c08e0752a7cc5ecc1f8628dfa969 SHA1 410ac276ddd65fdd3b4780fc91e613ccd1810310 SHA256 e1fde7a504b74482f5842a00db1a9f7ac4b8f8c8c0d615430b7aa903916b79a9
 MD5 39c1049bfddc2a7563169513c2f034e9 jpilot-0.99.7-r1.ebuild 1669
 RMD160 ca9bb952c637c08e0752a7cc5ecc1f8628dfa969 jpilot-0.99.7-r1.ebuild 1669
 SHA256 e1fde7a504b74482f5842a00db1a9f7ac4b8f8c8c0d615430b7aa903916b79a9 jpilot-0.99.7-r1.ebuild 1669
-EBUILD jpilot-0.99.8-r1.ebuild 1710 RMD160 8782bcc0aa0670dcad2df3746f0be2ffe2768a86 SHA1 f43ea20a4ebb302ad0875d9a994b92121cfd3237 SHA256 b01e0e52e61c56495270806e21b0b06f9deb9d674a67b4b21519cb09a8a7aa06
-MD5 aef0a867c13cbb24617dbf9d00413d70 jpilot-0.99.8-r1.ebuild 1710
-RMD160 8782bcc0aa0670dcad2df3746f0be2ffe2768a86 jpilot-0.99.8-r1.ebuild 1710
-SHA256 b01e0e52e61c56495270806e21b0b06f9deb9d674a67b4b21519cb09a8a7aa06 jpilot-0.99.8-r1.ebuild 1710
-EBUILD jpilot-0.99.8.ebuild 1665 RMD160 b9058389237d41a568d049c2438e7e990fcabd50 SHA1 31e2bcf135751a88ea751643bac2f79154aa88bb SHA256 9467d750cb2ecf6c87dafc89509d69dca59dd67f22b06ab0271a73461e11d9d6
-MD5 4a5679f602b7eaf27a3480168b2654d0 jpilot-0.99.8.ebuild 1665
-RMD160 b9058389237d41a568d049c2438e7e990fcabd50 jpilot-0.99.8.ebuild 1665
-SHA256 9467d750cb2ecf6c87dafc89509d69dca59dd67f22b06ab0271a73461e11d9d6 jpilot-0.99.8.ebuild 1665
-EBUILD jpilot-0.99.8_pre9.ebuild 1691 RMD160 d8260c24af3e364c480455fdee5c5923e427591a SHA1 3cc89ada9a7526511e23c83e1e421775d8dc9941 SHA256 2fdb3224648f5c10d94fa0015dbb7c344128cfcd451dc2e12e6c791a10e34936
-MD5 be60936f1d8ca162734bd4564e5dae5c jpilot-0.99.8_pre9.ebuild 1691
-RMD160 d8260c24af3e364c480455fdee5c5923e427591a jpilot-0.99.8_pre9.ebuild 1691
-SHA256 2fdb3224648f5c10d94fa0015dbb7c344128cfcd451dc2e12e6c791a10e34936 jpilot-0.99.8_pre9.ebuild 1691
-MISC ChangeLog 6146 RMD160 89d1faeb398bc233d8ac7e74d75a4e16b49c6082 SHA1 3791080edd73df4f1712cc4436a0be94456a7417 SHA256 68df8643bd92589c2032d0a456561861e9c566962eadee96db427a2273631906
-MD5 479f512a9c2861c7ec883ee514836a3b ChangeLog 6146
-RMD160 89d1faeb398bc233d8ac7e74d75a4e16b49c6082 ChangeLog 6146
-SHA256 68df8643bd92589c2032d0a456561861e9c566962eadee96db427a2273631906 ChangeLog 6146
+EBUILD jpilot-0.99.9.ebuild 1681 RMD160 35a27851b6a8b5fcdc04e7395f4463ef8fbad6cb SHA1 a1d89e1f2061944fa9545b56ef8e1051ccab9ff2 SHA256 c6c7635f76d018a8ff76b5da10f76ad0b6c5b3b595868d274af264077cf77ed9
+MD5 284607594116dfd1af041a6e14303455 jpilot-0.99.9.ebuild 1681
+RMD160 35a27851b6a8b5fcdc04e7395f4463ef8fbad6cb jpilot-0.99.9.ebuild 1681
+SHA256 c6c7635f76d018a8ff76b5da10f76ad0b6c5b3b595868d274af264077cf77ed9 jpilot-0.99.9.ebuild 1681
+MISC ChangeLog 6736 RMD160 dc8a0b8721e39970cd2153e7186160aa5f7395cf SHA1 0caffef5e32551ef3237bba3f00de694741848cf SHA256 0c24a90ac1cfa00346121866b059f756190a86e5374aaf84d013bb13e2c8437d
+MD5 6bda569f57ead455ecbad627618cc522 ChangeLog 6736
+RMD160 dc8a0b8721e39970cd2153e7186160aa5f7395cf ChangeLog 6736
+SHA256 0c24a90ac1cfa00346121866b059f756190a86e5374aaf84d013bb13e2c8437d ChangeLog 6736
 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
 MD5 075fea99b82d61028585dc3e42f00466 metadata.xml 156
 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe metadata.xml 156
@@ -47,19 +30,13 @@ SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb metadata
 MD5 3dd04ef7f79b82cb749898c42edd0d34 files/digest-jpilot-0.99.7-r1 244
 RMD160 df48ce46fc736fe25e0277ad86d2bfb9de666498 files/digest-jpilot-0.99.7-r1 244
 SHA256 35e6cc428ff21e1eeea45e4be2272ecce91a505930f2d742f1759bd27886dd3c files/digest-jpilot-0.99.7-r1 244
-MD5 b81afd92dceabab1182817baea3fcbce files/digest-jpilot-0.99.8 244
-RMD160 b033a9588eda4e4ff3ec0cbfd25f179e2f272492 files/digest-jpilot-0.99.8 244
-SHA256 cb32673ac1727867e12aa6248bf3ef8caf3af85d53ed9a515b13553e958b36d1 files/digest-jpilot-0.99.8 244
-MD5 b81afd92dceabab1182817baea3fcbce files/digest-jpilot-0.99.8-r1 244
-RMD160 b033a9588eda4e4ff3ec0cbfd25f179e2f272492 files/digest-jpilot-0.99.8-r1 244
-SHA256 cb32673ac1727867e12aa6248bf3ef8caf3af85d53ed9a515b13553e958b36d1 files/digest-jpilot-0.99.8-r1 244
-MD5 adee8f4ae955c3460ca736067f052bd1 files/digest-jpilot-0.99.8_pre9 259
-RMD160 761ae205b7057c0069910e9efe96fbf4864314cd files/digest-jpilot-0.99.8_pre9 259
-SHA256 0ec70de0c3da3d51e517477f215776d00caf800e0b3f0f001724de7bf85c0260 files/digest-jpilot-0.99.8_pre9 259
+MD5 94a44a4c4eb89682fbc97f8f8dbb69fa files/digest-jpilot-0.99.9 244
+RMD160 a3adcf0157a9f515ce8da5a2f6506ea49a8ace5b files/digest-jpilot-0.99.9 244
+SHA256 94492c26c66dd52f3efbf2839b8f3600095ae9fbae05fb2c7b5f30300fd8b557 files/digest-jpilot-0.99.9 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFFttVr6J2i8a8J4okRAvT0AKDYbTnrnBUJvvNfb2C0AGzsPcqHnACdFoG9
-o7xvSlXgh+IIUANCY+F/OkA=
-=L/YI
+iD8DBQFG7hLnCkvF58q80IkRAr/cAJ9/L0t3Wwx/jUfhD++s1o/CGkkbBwCgkIv2
+FBl4Faw4nSRG1S2O8Oz7bJ0=
+=tfS0
 -----END PGP SIGNATURE-----
diff --git a/app-pda/jpilot/files/digest-jpilot-0.99.8 b/app-pda/jpilot/files/digest-jpilot-0.99.8
deleted file mode 100644
index 79669a2350c1..000000000000
--- a/app-pda/jpilot/files/digest-jpilot-0.99.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4bdb200367e691e64d02bd6dfcdec604 jpilot-0.99.8.tar.gz 1589217
-RMD160 9d19e41a8d73f1dbfc5107e0ee1657ac09b55189 jpilot-0.99.8.tar.gz 1589217
-SHA256 a89ca99df142efa6046509df7522794c34da84158893bfbce836c9f5fd943d78 jpilot-0.99.8.tar.gz 1589217
diff --git a/app-pda/jpilot/files/digest-jpilot-0.99.8-r1 b/app-pda/jpilot/files/digest-jpilot-0.99.8-r1
deleted file mode 100644
index 79669a2350c1..000000000000
--- a/app-pda/jpilot/files/digest-jpilot-0.99.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4bdb200367e691e64d02bd6dfcdec604 jpilot-0.99.8.tar.gz 1589217
-RMD160 9d19e41a8d73f1dbfc5107e0ee1657ac09b55189 jpilot-0.99.8.tar.gz 1589217
-SHA256 a89ca99df142efa6046509df7522794c34da84158893bfbce836c9f5fd943d78 jpilot-0.99.8.tar.gz 1589217
diff --git a/app-pda/jpilot/files/digest-jpilot-0.99.8_pre9 b/app-pda/jpilot/files/digest-jpilot-0.99.8_pre9
deleted file mode 100644
index 332707dd3f3f..000000000000
--- a/app-pda/jpilot/files/digest-jpilot-0.99.8_pre9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7747fedeffc64ecd3185a40477062fcc jpilot-0.99.8-pre9.tar.gz 1394323
-RMD160 e90793dd896faeb0a2b54cfd8a21ff0a7730f2a2 jpilot-0.99.8-pre9.tar.gz 1394323
-SHA256 5da78c1e23a3a0212c064918546cb7f1dde3851dfd35b8564f855900b85f81b5 jpilot-0.99.8-pre9.tar.gz 1394323
diff --git a/app-pda/jpilot/files/digest-jpilot-0.99.9 b/app-pda/jpilot/files/digest-jpilot-0.99.9
new file mode 100644
index 000000000000..8a6a0502d4a1
--- /dev/null
+++ b/app-pda/jpilot/files/digest-jpilot-0.99.9
@@ -0,0 +1,3 @@
+MD5 c39df29aeed57b84a674524856ebc290 jpilot-0.99.9.tar.gz 1671351
+RMD160 0286b9f9579dbbdb8e9bd207384561814bab5114 jpilot-0.99.9.tar.gz 1671351
+SHA256 341491ad727e234b58c7d5f057bcff363d15d2f223c1beab05fc49820dfe6432 jpilot-0.99.9.tar.gz 1671351
diff --git a/app-pda/jpilot/files/jpilot-0.99.8-glibc-free.patch b/app-pda/jpilot/files/jpilot-0.99.8-glibc-free.patch
deleted file mode 100644
index 0b33fc8b191f..000000000000
--- a/app-pda/jpilot/files/jpilot-0.99.8-glibc-free.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr jpilot-0.99.8.orig/jpilot.c jpilot-0.99.8/jpilot.c
---- jpilot-0.99.8.orig/jpilot.c	2005-10-24 20:15:41.000000000 +0100
-+++ jpilot-0.99.8/jpilot.c	2006-05-23 08:57:41.000000000 +0100
-@@ -1371,7 +1371,7 @@
-    gdk_pixdata_from_pixbuf(pixdata, pixbuf, FALSE);
-    data = gdk_pixdata_serialize(pixdata, &len);
- 
--   g_free(pixbuf);
-+   g_object_unref(pixbuf);
-    g_free(pixdata);
- 
-    return data;
diff --git a/app-pda/jpilot/files/jpilot-0.99.8-glob.patch b/app-pda/jpilot/files/jpilot-0.99.8-glob.patch
deleted file mode 100644
index 3b478400f286..000000000000
--- a/app-pda/jpilot/files/jpilot-0.99.8-glob.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: jpilot-sync.c
-===================================================================
-RCS file: /cvs/jpilot/jpilot_src/jpilot-sync.c,v
-retrieving revision 1.23
-diff -u -r1.23 jpilot-sync.c
---- jpilot-sync.c	28 Jan 2005 16:54:13 -0000	1.23
-+++ jpilot-sync.c	5 Nov 2005 15:07:57 -0000
-@@ -44,6 +44,7 @@
- pid_t glob_child_pid;
- GtkWidget *glob_dialog;
- pid_t glob_child_pid;
-+GtkTooltips *glob_tooltips;
- 
- unsigned char skip_plugins;
- 
diff --git a/app-pda/jpilot/files/jpilot-0.99.8-memory.patch b/app-pda/jpilot/files/jpilot-0.99.8-memory.patch
deleted file mode 100644
index cb8e270b1c21..000000000000
--- a/app-pda/jpilot/files/jpilot-0.99.8-memory.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- utils.c.orig	2005-12-11 13:04:24.000000000 -0500
-+++ utils.c	2005-12-11 13:04:38.000000000 -0500
-@@ -2042,9 +2042,6 @@
-       fwrite(RecordBuffer->data, header.rec_len, 1, pc_in);
- #endif /* PILOT_LINK_0_12 */
-       jp_logf(JP_LOG_DEBUG, "record deleted\n");
--#ifdef PILOT_LINK_0_12
--      pi_buffer_free(RecordBuffer);
--#endif /* PILOT_LINK_0_12 */
-       fclose(pc_in);
- #ifdef PILOT_LINK_0_12
-       pi_buffer_free(RecordBuffer);
diff --git a/app-pda/jpilot/files/jpilot-0.99.9-keyring-cats.patch b/app-pda/jpilot/files/jpilot-0.99.9-keyring-cats.patch
new file mode 100644
index 000000000000..46a29608814a
--- /dev/null
+++ b/app-pda/jpilot/files/jpilot-0.99.9-keyring-cats.patch
@@ -0,0 +1,95 @@
+--- KeyRing/keyring.c.original	2006-06-24 21:49:51.000000000 -0700
++++ KeyRing/keyring.c	2006-12-17 20:02:08.000000000 -0800
+@@ -160,6 +160,8 @@
+ 
+ static int keyring_find(int unique_id);
+ 
++int plugin_unpack_cai_from_ai(struct CategoryAppInfo *cai, unsigned char *ai_raw, int len);
++
+ /****************************** Main Code *************************************/
+ static int pack_KeyRing(struct KeyRing *kr, unsigned char *buf, int buf_size,
+ 			int *wrote_size)
+@@ -1348,17 +1350,12 @@
+ 
+    /* This gets the application specific data out of the database for us.
+     * We still need to write a function to unpack it from its blob form. */
++
++   memset (&ai, 0, sizeof (ai));
+    
+    jp_get_app_info("Keys-Gtkr", &buf, &buf_size);
+ 
+-   /* This call should work, but the appinfo is too small, so we do it */
+-   /* Keyring is not using a legal category app info structure */
+-   /* unpack_CategoryAppInfo(&ai, buf, buf_size+4); */
+-   
+-   /* I'm going to be lazy and only get the names, since that's all I use */
+-   for (i=0; i<NUM_KEYRING_CAT_ITEMS; i++) {
+-      memcpy(&ai.name[i][0], buf+i*16+2, 16);
+-   }
++   plugin_unpack_cai_from_ai (&ai, buf, buf_size);
+ 
+    free(buf);
+    
+@@ -2238,3 +2235,62 @@
+ 
+    return EXIT_SUCCESS;
+ }
++
++/* Stolen from pilot-link and modified slightly. */
++int plugin_unpack_cai_from_ai(struct CategoryAppInfo *ai, unsigned char *record, int len)
++{
++	int 	i, rec;
++
++	if (len < 2 + 16 * 16 + 16 + 2)
++		return 0;
++	rec = get_short(record);
++	for (i = 0; i < 16; i++) {
++		if (rec & (1 << i))
++			ai->renamed[i] = 1;
++		else
++			ai->renamed[i] = 0;
++	}
++	record += 2;
++	for (i = 0; i < 16; i++) {
++		memcpy(ai->name[i], record, 16);
++		record += 16;
++	}
++	memcpy(ai->ID, record, 16);
++	record += 16;
++	ai->lastUniqueID = get_byte(record);
++	record += 2;
++
++	return 2 + 16 * 16 + 16 + 2;
++}
++
++int plugin_pack_cai_into_ai(struct CategoryAppInfo *ai, unsigned char *record, int len)
++{
++	int 	i, rec;
++	
++	unsigned char *start = record;
++
++	if (!record) {
++		return 2 + 16 * 16 + 16 + 2;
++	}
++	if (len < (2 + 16 * 16 + 16 + 2))
++		return 0;	/* not enough room */
++	rec = 0;
++	for (i = 0; i < 16; i++) {
++		if (ai->renamed[i])
++			rec |= (1 << i);
++	}
++	set_short(record, rec);
++	record += 2;
++	for (i = 0; i < 16; i++) {
++		memcpy(record, ai->name[i], 16);
++		record += 16;
++	}
++	memcpy(record, ai->ID, 16);
++	record += 16;
++	set_byte(record, ai->lastUniqueID);
++	record++;
++	set_byte(record, 0);		/* gapfill */
++	record++;
++
++	return (record - start);
++}
diff --git a/app-pda/jpilot/jpilot-0.99.8-r1.ebuild b/app-pda/jpilot/jpilot-0.99.8-r1.ebuild
deleted file mode 100644
index 9a34a2120a9d..000000000000
--- a/app-pda/jpilot/jpilot-0.99.8-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.8-r1.ebuild,v 1.3 2007/01/24 03:30:21 genone Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
-HOMEPAGE="http://jpilot.org/"
-SRC_URI="mirror://gentoo/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="nls gtk"
-
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-	>=app-pda/pilot-link-0.11.5"
-DEPEND="${RDEPEND}
-	gtk? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S} || die
-
-	# There are four icons available.  Use the third.
-	sed -i 's/jpilot.xpm/jpilot-icon3.xpm/' jpilot.desktop || die
-
-	# these two patches are from upstream
-	epatch ${FILESDIR}/${P}-memory.patch
-	epatch ${FILESDIR}/${P}-glob.patch
-	epatch ${FILESDIR}/${P}-glibc-free.patch
-}
-
-src_compile() {
-	econf $(use_enable gtk gtk2) $(use_enable nls) || die "configure failed"
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} \
-		libdir=/usr/$(get_libdir) \
-		docdir=/usr/share/doc/${PF} \
-		icondir=/usr/share/pixmaps \
-		desktopdir=/usr/share/applications || die "install failed"
-
-	dodoc README TODO UPGRADING ABOUT-NLS BUGS ChangeLog
-	doman docs/*.1
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins ${S}/jpilotrc.*
-}
-
-pkg_postinst() {
-	elog
-	elog "The jpilot-syncmal plugin has moved to its own ebuild."
-	elog "If you want to use that plugin, please run"
-	elog "    emerge jpilot-syncmal"
-	elog
-	elog "There are other plugins available as well.  To see the"
-	elog "list, please run"
-	elog "    emerge -s jpilot"
-	elog
-}
diff --git a/app-pda/jpilot/jpilot-0.99.8_pre9.ebuild b/app-pda/jpilot/jpilot-0.99.8_pre9.ebuild
deleted file mode 100644
index f8ae050e4d56..000000000000
--- a/app-pda/jpilot/jpilot-0.99.8_pre9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.8_pre9.ebuild,v 1.4 2007/01/24 03:30:21 genone Exp $
-
-inherit eutils multilib
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
-HOMEPAGE="http://jpilot.org/"
-#SRC_URI="http://jpilot.org/${P}.tar.gz"
-SRC_URI="http://ludovic.rousseau.free.fr/softwares/jpilot/jpilot-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="nls gtk"
-
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-	>=app-pda/pilot-link-0.11.5"
-DEPEND="${RDEPEND}
-	gtk? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S} || die
-	# There are four icons available.  Use the third.
-	sed -i 's/jpilot.xpm/jpilot-icon3.xpm/' jpilot.desktop || die
-}
-
-src_compile() {
-	econf $(use_enable gtk gtk2) $(use_enable nls) || die "configure failed"
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} \
-		libdir=/usr/$(get_libdir) \
-		docdir=/usr/share/doc/${PF} \
-		icondir=/usr/share/pixmaps \
-		desktopdir=/usr/share/applications || die "install failed"
-
-	dodoc README TODO UPGRADING ABOUT-NLS BUGS ChangeLog COPYING INSTALL
-	doman docs/*.1
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins ${S}/jpilotrc.*
-}
-
-pkg_postinst() {
-	elog
-	elog "The jpilot-syncmal plugin has moved to its own ebuild."
-	elog "If you want to use that plugin, please run"
-	elog "    emerge jpilot-syncmal"
-	elog
-	elog "There are other plugins available as well.  To see the"
-	elog "list, please run"
-	elog "    emerge -s jpilot"
-	elog
-}
diff --git a/app-pda/jpilot/jpilot-0.99.8.ebuild b/app-pda/jpilot/jpilot-0.99.9.ebuild
index eebef6a1b0b3..4982ec0b27c1 100644
--- a/app-pda/jpilot/jpilot-0.99.8.ebuild
+++ b/app-pda/jpilot/jpilot-0.99.9.ebuild
@@ -1,54 +1,53 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.8.ebuild,v 1.3 2007/01/24 03:30:21 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.9.ebuild,v 1.1 2007/09/17 05:38:36 philantrop Exp $
 
 inherit eutils multilib
 
 DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
 HOMEPAGE="http://jpilot.org/"
-SRC_URI="mirror://gentoo/distfiles/${P}.tar.gz"
+SRC_URI="http://jpilot.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="nls gtk"
+IUSE="nls"
 
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-	>=app-pda/pilot-link-0.11.5"
-DEPEND="${RDEPEND}
-	gtk? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
+DEPEND=">=app-pda/pilot-link-0.11.8
+		>=x11-libs/gtk+-2.6.10-r1
+		nls? ( sys-devel/gettext )
+		>=dev-perl/XML-Parser-2.34"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S} || die
+	cd "${S}"
 
-	# There are four icons available.  Use the third.
-	sed -i 's/jpilot.xpm/jpilot-icon3.xpm/' jpilot.desktop || die
+	# Fixes bug 93471.
+	epatch "${FILESDIR}/${P}-keyring-cats.patch"
 
-	# these two patches are from upstream
-	epatch ${FILESDIR}/${P}-memory.patch
-	epatch ${FILESDIR}/${P}-glob.patch
+	# There are four icons available.  Use the third.
+	sed -i -e 's/jpilot.xpm/jpilot-icon3.xpm/' jpilot.desktop || die "sed'ing the desktop file failed"
 }
 
 src_compile() {
-	econf $(use_enable gtk gtk2) $(use_enable nls) || die "configure failed"
+	econf $(use_enable nls) || die "configure failed"
 	emake -j1 || die "make failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} \
-		libdir=/usr/$(get_libdir) \
+	make install DESTDIR="${D}" \
+		libdir=/usr/$(get_libdir)/jpilot/plugins \
 		docdir=/usr/share/doc/${PF} \
 		icondir=/usr/share/pixmaps \
 		desktopdir=/usr/share/applications || die "install failed"
 
-	dodoc README TODO UPGRADING ABOUT-NLS BUGS ChangeLog
+	dodoc ABOUT-NLS AUTHORS BUGS ChangeLog INSTALL NEWS README TODO || die "installing docs failed"
 	doman docs/*.1
 
 	dodir /usr/share/${PN}
 	insinto /usr/share/${PN}
-	doins ${S}/jpilotrc.*
+	doins "${S}"/jpilotrc.*
 }
 
 pkg_postinst() {