Delete older ebuild.

(Portage version: 2.2.0_alpha14_p4/cvs/Linux x86_64)

3 files changed, 5 insertions, 160 deletions

diff --git a/app-pda/jpilot/ChangeLog b/app-pda/jpilot/ChangeLog
index 7e7d6dabd14e..80bf23c46b3f 100644
--- a/app-pda/jpilot/ChangeLog
+++ b/app-pda/jpilot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/jpilot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.44 2011/01/12 16:00:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.45 2011/01/12 18:18:30 arfrever Exp $
+
+  12 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -jpilot-0.99.9.ebuild, -files/jpilot-0.99.9-keyring-cats.patch:
+  Delete.
 
   12 Jan 2011; Brent Baude <ranger@gentoo.org> jpilot-1.8.0.ebuild:
   Marking jpilot-1.8.0 ppc for bug 333717
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
deleted file mode 100644
index 46a29608814a..000000000000
--- a/app-pda/jpilot/files/jpilot-0.99.9-keyring-cats.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- 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.9.ebuild b/app-pda/jpilot/jpilot-0.99.9.ebuild
deleted file mode 100644
index a2e9a890da54..000000000000
--- a/app-pda/jpilot/jpilot-0.99.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.9.ebuild,v 1.6 2008/05/21 12:44:39 drac Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
-HOMEPAGE="http://jpilot.org/"
-SRC_URI="http://jpilot.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="nls"
-
-RDEPEND=">=app-pda/pilot-link-0.11.8
-	>=x11-libs/gtk+-2.6.10-r1"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=dev-perl/XML-Parser-2.34
-	>=dev-util/pkgconfig-0.22"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fixes bug 93471.
-	epatch "${FILESDIR}/${P}-keyring-cats.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 nls) || die "configure failed"
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	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 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.*
-}
-
-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
-}