Version bump #9794 + USE flag handling #9198

6 files changed, 97 insertions, 115 deletions

diff --git a/dev-libs/pilot-link/ChangeLog b/dev-libs/pilot-link/ChangeLog
index feb9f9000173..d5c78f9f9562 100644
--- a/dev-libs/pilot-link/ChangeLog
+++ b/dev-libs/pilot-link/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/pilot-link
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/ChangeLog,v 1.9 2002/09/09 01:23:29 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/ChangeLog,v 1.10 2002/11/03 21:11:03 vapier Exp $
+
+*pilot-link-0.11.5 (28 Oct 2002)
+
+  28 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + added proper support for USE flags.
+  Disabled perl for now while upstream fixes problems.
 
 *pilot-link-0.11.3 (08 Aug 2002)
 
@@ -8,7 +14,6 @@
   Added PPC to KEYWORDS.
 
   08 Aug 2002; Matthew Turk <satai@gentoo.org> ChangeLog  :
-
   Update to latest version, fixing numerous problems, particularly the numbering
   of contact fields.  Suggested recompile of all applications using this -
   gnome-pilot, gnome-pilot-conduits, jpilot and evolution.
@@ -16,44 +21,37 @@
 *pilot-link-0.11.1-r1 (30 Jul 2002)
 
   30 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
-
   Fix bug #5615 (headers installing into the filesystem root).
 
   22 Jul 2002; Owen Stampflee <owen@gentoo.org> :
-
   Added PPC to KEYWORDS.
 
 *pilot-link-0.11.1 (21 Jul 2002)
 
   21 Jul 2002; Seemant Kulleen <seemant@gentoo.org> pilot-link-0.11.1.ebuild
   files/digest-pilot-link-0.11.1 :
-
   Version bump.
 
 *pilot-link-0.11.0 (14 Jul 2002)
 
   14 Jul 2002; Seemant Kulleen <seemant@gentoo.org> pilot-link-0.11.0.ebuild
   files/digest-pilot-link-0.11.0 :
-
   Version bump to newest stable.
 
 *pilot-link-0.10.99 (20 May 2002)
 
   20 May 2002; Seemant Kulleen <seemant@gentoo.org>
   pilot-link-0.10.99.ebuild files/digest-pilot-link-0.10.99 :
-
   This is a developer release of pilot-link, but it works with a wider
   variety of hardware.  gnome-pilot had to be patched for it as well.  the
   new gnome-pilot and this are masked for the present.
 
- 06 Apr 2002; G.Bevin <gbevin@gentoo.org> files/pilot-link-0.9.6-gcc3.diff :
-
+  06 Apr 2002; G.Bevin <gbevin@gentoo.org> files/pilot-link-0.9.6-gcc3.diff :
   C++ compliancy fixes for correct compilation with gcc3
 
 *pilot-link-0.9.6-r3 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/dev-libs/pilot-link/files/digest-pilot-link-0.11.1 b/dev-libs/pilot-link/files/digest-pilot-link-0.11.1
deleted file mode 100644
index f74fe850d359..000000000000
--- a/dev-libs/pilot-link/files/digest-pilot-link-0.11.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7b7b00ff13fe4e499f02bdfb1785178 pilot-link-0.11.1.tar.bz2 640198
diff --git a/dev-libs/pilot-link/files/digest-pilot-link-0.11.5 b/dev-libs/pilot-link/files/digest-pilot-link-0.11.5
new file mode 100644
index 000000000000..9e6b741ec15a
--- /dev/null
+++ b/dev-libs/pilot-link/files/digest-pilot-link-0.11.5
@@ -0,0 +1 @@
+MD5 f7e9d73959d9e1d998837e93d03c58e7 pilot-link-0.11.5.tar.bz2 635370
diff --git a/dev-libs/pilot-link/files/pilot-link-0.9.6-gcc3.diff b/dev-libs/pilot-link/files/pilot-link-0.9.6-gcc3.diff
deleted file mode 100644
index de0b5e307e64..000000000000
--- a/dev-libs/pilot-link/files/pilot-link-0.9.6-gcc3.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- pilot-link-0.9.6/include/pi-datebook.hxx_orig	Sat Apr  6 18:15:44 2002
-+++ pilot-link-0.9.6/include/pi-datebook.hxx	Sat Apr  6 18:16:01 2002
-@@ -34,7 +34,7 @@
-      };
- 
-    private:
--     friend appointmentList_t;
-+     friend class appointmentList_t;
-      
-      tm _begin;			// When the appointment begins
-      tm _end;			// When the appointment ends
---- pilot-link-0.9.6/include/pi-address.hxx_orig	Sat Apr  6 18:16:52 2002
-+++ pilot-link-0.9.6/include/pi-address.hxx	Sat Apr  6 18:17:03 2002
-@@ -33,7 +33,7 @@
- 
-      char *_entry[19];
-      
--     friend addressList_t;
-+     friend class addressList_t;
-      
-      address_t *_next;
- 
---- pilot-link-0.9.6/include/pi-todo.hxx_orig	Sat Apr  6 18:17:13 2002
-+++ pilot-link-0.9.6/include/pi-todo.hxx	Sat Apr  6 18:17:30 2002
-@@ -23,7 +23,7 @@
- 
- class todo_t : public baseApp_t
- {
--     friend todoList_t;
-+     friend class todoList_t;
-      
-      struct tm *_due;		// Non-NULL if there is a due date
-      int _priority;		// A priority in the range 1-5
---- pilot-link-0.9.6/include/pi-memo.hxx_orig	Sat Apr  6 18:17:39 2002
-+++ pilot-link-0.9.6/include/pi-memo.hxx	Sat Apr  6 18:17:48 2002
-@@ -19,7 +19,7 @@
- 
- class memo_t : public baseApp_t
- {
--     friend memoList_t;
-+     friend class memoList_t;
-      
-      char *_text;
-      int _size;
---- pilot-link-0.9.6/include/pi-iambicExpense.hxx_orig	Sat Apr  6 18:17:56 2002
-+++ pilot-link-0.9.6/include/pi-iambicExpense.hxx	Sat Apr  6 18:18:07 2002
-@@ -27,7 +27,7 @@
- 
- class iambicExpense_t : public baseApp_t
- {
--     friend iambicExpenseList_t;
-+     friend class iambicExpenseList_t;
-      
-      short _flags;
-      char *_type;
diff --git a/dev-libs/pilot-link/pilot-link-0.11.1.ebuild b/dev-libs/pilot-link/pilot-link-0.11.1.ebuild
deleted file mode 100644
index 72178c7da4a7..000000000000
--- a/dev-libs/pilot-link/pilot-link-0.11.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.1.ebuild,v 1.5 2002/10/04 05:17:22 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A suite of tools contains a series of conduits for moving
-information to and from your Palm device and your desktop or workstation
-system."
-
-SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
-HOMEPAGE="http://www.pilot-link.org/"
-DEPEND="virtual/glibc"
-
-SLOT="0"
-LICENSE="GPL-2 | LGPL"
-KEYWORDS="x86 ppc sparc sparc64"
-
-src_compile() {
-
-	local myconf
-
-	use perl || myconf="${myconf} --with-perl5=no"
-	use java || myconf="${myconf} --with-java=no"
-	use tcltk || myconf="${myconf} --with-tcl=no --with-itcl=no --with-tk=no"
-
-	econf \
-		--includedir=/usr/include/libpisock \
-		--with-perl5=no \
-		--with-python=no \
-		--with-java=no \
-		--with-tcl=no \
-		--with-itcl=no \
-		--with-tk=no || die
-
-	cd ${S}
-	emake || die
-
-
-}
-
-src_install() {
-
-	make \
-		DESTDIR=${D} \
-		install || die
-
-	dodoc ChangeLog README TODO NEWS AUTHORS
-
-}
diff --git a/dev-libs/pilot-link/pilot-link-0.11.5.ebuild b/dev-libs/pilot-link/pilot-link-0.11.5.ebuild
new file mode 100644
index 000000000000..60787fa5107e
--- /dev/null
+++ b/dev-libs/pilot-link/pilot-link-0.11.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.11.5.ebuild,v 1.1 2002/11/03 21:11:03 vapier Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="suite of tools for moving data between a Palm device and a desktop"
+
+SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
+HOMEPAGE="http://www.pilot-link.org/"
+
+SLOT="0"
+LICENSE="GPL-2 | LGPL"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+IUSE="perl java tcltk python pic png readline"
+
+DEPEND="virtual/glibc
+	sys-libs/ncurses
+	perl? ( sys-devel/perl )
+	java? ( virtual/jre )
+	tcltk? ( dev-lang/tcl dev-tcltk/itcl dev-lang/tk )
+	python? ( dev-lang/python )
+	png? ( media-libs/libpng )
+	readline? ( sys-libs/readline )"
+
+src_compile() {
+	local myconf="--with-gnu-ld --includedir=/usr/include/libpisock"
+
+	use pic && myconf="${myconf} --with-pic"
+
+#	couldnt get this to work
+#	use java \
+#		&& myconf="${myconf} --with-java=yes" \
+#		|| myconf="${myconf} --with-java=no"
+	myconf="${myconf} --with-java=no"
+
+#	http://gnu-designs.com/bugs/view_bug_page.php?f_id=259
+#	use perl \
+#		&& myconf="${myconf} --with-perl=yes" \
+#		|| myconf="${myconf} --with-perl=no"
+	myconf="${myconf} --with-perl=no"
+
+	use python \
+		&& myconf="${myconf} --with-python=yes" \
+		|| myconf="${myconf} --with-python=no"
+
+	use tcltk \
+		&& myconf="${myconf} --with-tcl=yes --with-itcl=yes --with-tk=yes" \
+		|| myconf="${myconf} --with-tcl=no --with-itcl=no --with-tk=no"
+
+	use png && myconf="${myconf} --with-libpng=/usr"
+
+	use readline \
+		&& myconf="${myconf} --with-readline=yes" \
+		|| myconf="${myconf} --with-readline=no"
+
+#	make configure script:
+#	  - look for ncurses rather than termcap
+#	    http://gnu-designs.com/bugs/view_bug_page.php?f_id=381
+#	  - link png check with more libraries
+#	    http://gnu-designs.com/bugs/view_bug_page.php?f_id=380
+	cp configure configure.old
+	sed -e 's:-ltermcap:-lncurses:' \
+	 -e 's:-lpng:-lpng -lz -lstdc++:' \
+		configure.old > configure
+
+#	fix pilot-debug.c
+#	 http://gnu-designs.com/bugs/view_bug_page.php?f_id=129
+	cp src/pilot-debug.c src/pilot-debug.c.old
+	sed -e 's:TCL_MINOR_VERSION <4:TCL_MINOR_VERSION <3:' \
+		src/pilot-debug.c.old > src/pilot-debug.c
+
+	econf ${myconf} || die
+
+#	so python doesnt violate sandbox
+#	http://gnu-designs.com/bugs/view_bug_page.php?f_id=382
+	cp bindings/Makefile bindings/Makefile.old
+	sed -e 's:--prefix=$(prefix):--prefix=$(prefix) --root=$(DESTDIR):' \
+		bindings/Makefile.old > bindings/Makefile
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	mv ${D}/*.hxx ${D}/usr/include/libpisock/
+
+	dodoc ChangeLog README doc/README* doc/TODO NEWS AUTHORS
+}