Delete older ebuild.

Package-Manager: portage-2.2.0_alpha14_p4/cvs/Linux x86_64

8 files changed, 12 insertions, 389 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
-}
diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index c0d70bc02a84..4ed040ca7c37 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-pda/pilot-link
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.69 2011/01/12 15:59:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.70 2011/01/12 18:15:26 arfrever Exp $
+
+  12 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/pilot-link-0.12.2-readline.patch, -pilot-link-0.12.3-r2.ebuild,
+  -files/pilot-link-0.12.3-glibc-open.patch,
+  -files/pilot-link-0.12.3-int_types.patch:
+  Delete.
 
   12 Jan 2011; Brent Baude <ranger@gentoo.org> pilot-link-0.12.5.ebuild:
   Marking pilot-link-0.12.5 ppc for bug 333717
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-readline.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-readline.patch
deleted file mode 100644
index 5bfe01c5d1fa..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.12.2-readline.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur pilot-link-0.12.2.orig/m4/vl_lib_readline.m4 pilot-link-0.12.2/m4/vl_lib_readline.m4
---- pilot-link-0.12.2.orig/m4/vl_lib_readline.m4	2005-06-03 20:39:24.000000000 +0200
-+++ pilot-link-0.12.2/m4/vl_lib_readline.m4	2007-08-25 15:23:58.000000000 +0200
-@@ -89,23 +89,23 @@
-       fi
-       LIBS="$ORIG_LIBS"
-     ])
--  fi
- 
--  if test "$vl_cv_lib_readline" != "no"; then
--    msg_readline="yes"
--    RL_LIBS="$vl_cv_lib_readline"
--    AC_DEFINE(HAVE_LIBREADLINE, 1,
--              [Define if you have a readline compatible library])
--    AC_CHECK_HEADERS(readline.h readline/readline.h)
--    AC_CACHE_CHECK([whether readline supports history],
--                   vl_cv_lib_readline_history, [
--      vl_cv_lib_readline_history="no"
--      AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history="yes")
--    ])
--    if test "$vl_cv_lib_readline_history" = "yes"; then
--      AC_DEFINE(HAVE_READLINE_HISTORY, 1,
--                [Define if your readline library has \`add_history'])
--      AC_CHECK_HEADERS(history.h readline/history.h)
-+    if test "$vl_cv_lib_readline" != "no"; then
-+      msg_readline="yes"
-+      RL_LIBS="$vl_cv_lib_readline"
-+      AC_DEFINE(HAVE_LIBREADLINE, 1,
-+                [Define if you have a readline compatible library])
-+      AC_CHECK_HEADERS(readline.h readline/readline.h)
-+      AC_CACHE_CHECK([whether readline supports history],
-+                     vl_cv_lib_readline_history, [
-+        vl_cv_lib_readline_history="no"
-+        AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history="yes")
-+      ])
-+      if test "$vl_cv_lib_readline_history" = "yes"; then
-+        AC_DEFINE(HAVE_READLINE_HISTORY, 1,
-+                  [Define if your readline library has \`add_history'])
-+        AC_CHECK_HEADERS(history.h readline/history.h)
-+      fi
-     fi
-   fi
-   AC_SUBST(RL_LIBS)
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-glibc-open.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-glibc-open.patch
deleted file mode 100644
index 661d4edd3935..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.12.3-glibc-open.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN ./pilot-link-0.12.3.orig/src/pilot-schlep.c ./pilot-link-0.12.3/src/pilot-schlep.c
---- ./pilot-link-0.12.3.orig/src/pilot-schlep.c	2006-10-12 16:21:21.000000000 +0200
-+++ ./pilot-link-0.12.3/src/pilot-schlep.c	2009-02-16 16:09:25.321851803 +0100
-@@ -21,6 +21,9 @@
-  *
-  */
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- #include <stdio.h>
- 
- #include "pi-source.h"
-@@ -38,7 +38,7 @@
- 		fd;
- 	pi_buffer_t *buffer;
- 
--	fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC);
-+	fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
- 	if (fd < 0)
- 		return -1;
- 
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
deleted file mode 100644
index 23fcbc33456f..000000000000
--- a/app-pda/pilot-link/files/pilot-link-0.12.3-int_types.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
-@@ -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-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild
deleted file mode 100644
index 08617d770e34..000000000000
--- a/app-pda/pilot-link/pilot-link-0.12.3-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2010 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-r2.ebuild,v 1.16 2010/07/10 18:41:45 armin76 Exp $
-
-EAPI=2
-
-inherit perl-module java-pkg-opt-2 eutils autotools distutils
-
-DESCRIPTION="suite of tools for moving data between a Palm device and a desktop"
-HOMEPAGE="http://www.pilot-link.org/"
-SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="perl java python png readline threads bluetooth usb debug"
-
-BOTH_DEPEND="virtual/libiconv
-	>=sys-libs/ncurses-5.6-r1
-	>=dev-libs/popt-1.10.7
-	perl? ( >=dev-lang/perl-5.8.8-r2 )
-	python? ( >=dev-lang/python-2.4.4-r4 )
-	png? ( >=media-libs/libpng-1.2.40:0 )
-	readline? ( >=sys-libs/readline-5.2_p4 )
-	usb? ( virtual/libusb:0 )
-	bluetooth? ( net-wireless/bluez )"
-
-DEPEND="${BOTH_DEPEND}
-	java? ( >=virtual/jdk-1.4 )"
-
-RDEPEND="${BOTH_DEPEND}
-	java? ( >=virtual/jre-1.4 )"
-
-PYTHON_MODNAME="pisock.py pisockextras.py"
-
-src_prepare() {
-	# Fixing some broken configure switches and automagic deps.
-	epatch "${FILESDIR}/${PN}-0.12.2-readline.patch"
-	epatch "${FILESDIR}/${PN}-0.12.2-threads.patch"
-	epatch "${FILESDIR}"/${P}-png.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-
-	# Upstream's check for Werror was wrong. Fixes bug 194921.
-	epatch "${FILESDIR}/${PN}-0.12.2-werror_194921.patch"
-
-	# We install the Java bindings using the eclass functions so we disable
-	# their installation here.
-	use java && epatch "${FILESDIR}/${P}-java-install.patch"
-
-	# We install the Python bindings using the eclass functions so we disable
-	# their makefile.am rules here
-	use python && epatch  "${FILESDIR}/${P}-distutils.patch"
-
-	# Upstream patch to fix 64-bit issues.
-	epatch "${FILESDIR}/${P}-int_types.patch"
-
-	# Fix Glibc open without mode error
-	epatch "${FILESDIR}/${P}-glibc-open.patch"
-
-	# Respect JAVACFLAGS bug #267445
-	epatch "${FILESDIR}/${P}-respect-javacflags.patch"
-
-	# libusb-compat requires you to check the return value of usb_open!
-	epatch "${FILESDIR}/${P}-libusb-compat-usb_open.patch"
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	use prefix || EPREFIX=
-	# tcl/tk support is disabled as per upstream request.
-	econf \
-		--includedir="${EPREFIX}"/usr/include/libpisock \
-		--enable-conduits \
-		--with-tcl=no \
-		--without-included-popt \
-		--disable-compile-werror \
-		$(use_enable threads) \
-		$(use_enable usb libusb) \
-		$(use_enable debug) \
-		$(use_with png libpng "${EPREFIX}"/usr) \
-		$(use_with bluetooth bluez) \
-		$(use_with readline) \
-		$(use_with perl) \
-		$(use_with java) \
-		$(use_with python)
-}
-
-src_compile() {
-	# Unfortunately, parallel compilation is badly broken. cf. bug  202857.
-	emake -j1 || die "emake failed"
-
-	if use perl ; then
-		cd "${S}/bindings/Perl"
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-
-	if use python; then
-		cd "${S}/bindings/Python"
-		distutils_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README doc/README* doc/TODO NEWS AUTHORS || die "installing docs failed"
-
-	if use java ; then
-		cd "${S}/bindings/Java"
-		java-pkg_newjar ${PN}.jar
-		java-pkg_doso libjpisock.so
-	fi
-
-	if use perl ; then
-		cd "${S}/bindings/Perl"
-		perl-module_src_install
-	fi
-
-	if use python; then
-		cd "${S}/bindings/Python"
-		distutils_src_install
-	fi
-}
-
-pkg_preinst() {
-	perl-module_pkg_preinst
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}