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!
(Portage version: 2.1.3.9)

12 files changed, 129 insertions, 196 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/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() {