work with newest pilot-link

6 files changed, 29 insertions, 63 deletions

diff --git a/gnome-extra/gnome-pilot/ChangeLog b/gnome-extra/gnome-pilot/ChangeLog
index fc8d803523f9..0f504db9a1ae 100644
--- a/gnome-extra/gnome-pilot/ChangeLog
+++ b/gnome-extra/gnome-pilot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-pilot
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pilot/ChangeLog,v 1.7 2002/07/01 23:49:29 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pilot/ChangeLog,v 1.8 2002/07/16 22:26:35 seemant Exp $
+
+*gnome-pilot-0.1.65-r4 (16 Jul 2002)
+
+  16 Jul 2002; Seemant Kulleen <seemant@gentoo.org>
+  gnome-pilot-0.1.65-r4.ebuild files/digest-gnome-pilot-0.1.65-r4 :
+
+  Updated to work with pilot-link-0.11.0
 
 *gnome-pilot-0.1.65-r3 (01 Jul 2002)
 
diff --git a/gnome-extra/gnome-pilot/files/digest-gnome-pilot-0.1.65-r2 b/gnome-extra/gnome-pilot/files/digest-gnome-pilot-0.1.65-r2
deleted file mode 100644
index abc0583a25a4..000000000000
--- a/gnome-extra/gnome-pilot/files/digest-gnome-pilot-0.1.65-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac5b833ed0388936f3baceb7f8d5ed46 gnome-pilot-0.1.65.tar.bz2 683363
diff --git a/gnome-extra/gnome-pilot/files/digest-gnome-pilot-0.1.65-r1 b/gnome-extra/gnome-pilot/files/digest-gnome-pilot-0.1.65-r4
index abc0583a25a4..abc0583a25a4 100644
--- a/gnome-extra/gnome-pilot/files/digest-gnome-pilot-0.1.65-r1
+++ b/gnome-extra/gnome-pilot/files/digest-gnome-pilot-0.1.65-r4
diff --git a/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r1.ebuild b/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r1.ebuild
deleted file mode 100644
index e8c69045400e..000000000000
--- a/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r1.ebuild,v 1.2 2002/07/11 06:30:26 drobbins Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome Pilot apps"
-SRC_URI="ftp://ftp.gnome.org/pub/gnome/unstable/sources/gnome-pilot/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/gnome-pilot/"
-
-DEPEND="
-	>=gnome-base/control-center-1.4.0.1-r1
-	>=dev-libs/pilot-link-0.9.6
-	>=dev-util/gob-1.0.12
-	>=gnome-base/libglade-0.17"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${PN}-gentoo.diff
-}
-
-src_compile() {
-	local myopts
-
-	CFLAGS="${CFLAGS} `gnome-config --cflags libglade vfs`"
-
-	use nls \
-		&& myopts="--enable-nls" \
-		|| myopts="--disable-nls"
-
-	mkdir intl && touch intl/libgettext.h
-	
-	./configure --prefix=/usr \
-		--with-gnome-libs=/usr/lib \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--enable-usb-visor=yes \
-		${myopts} \
-		--host=${CHOST} || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS
-}
diff --git a/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r3.ebuild b/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r3.ebuild
index ff0b7020e057..ec1431926dde 100644
--- a/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r3.ebuild
+++ b/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r3.ebuild,v 1.1 2002/07/01 23:49:29 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r3.ebuild,v 1.2 2002/07/16 22:26:35 seemant Exp $
 
 
 S=${WORKDIR}/${P}
@@ -18,6 +18,7 @@ RDEPEND="nls? ( sys-devel/gettext )"
 
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 
diff --git a/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r2.ebuild b/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r4.ebuild
index 63e6e5d8106b..5c0fe051e0cc 100644
--- a/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r2.ebuild
+++ b/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r2.ebuild,v 1.1 2002/05/27 14:28:35 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pilot/gnome-pilot-0.1.65-r4.ebuild,v 1.1 2002/07/16 22:26:35 seemant Exp $
 
 
 S=${WORKDIR}/${P}
@@ -9,14 +9,17 @@ SRC_URI="ftp://ftp.gnome.org/pub/gnome/unstable/sources/gnome-pilot/${P}.tar.bz2
 HOMEPAGE="http://www.gnome.org/gnome-pilot/"
 
 DEPEND=">=gnome-base/control-center-1.4.0.1-r1
-	gnome-base/gnome-core
-	>=dev-libs/pilot-link-0.9.6
+	>=gnome-base/gnome-libs-1.4.1.7
+	=gnome-base/gnome-panel-1.4*
+	>=dev-libs/pilot-link-0.11.0
 	>=dev-util/gob-1.0.12
 	>=gnome-base/libglade-0.17"
+
 RDEPEND="nls? ( sys-devel/gettext )"
 
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 
@@ -26,20 +29,27 @@ src_unpack() {
 }
 
 src_compile() {
-	local myopts
 
-	CFLAGS="${CFLAGS} `gnome-config --cflags libglade vfs`"
+	local myconf
+
+#	use gtk2 \
+#		&& CFLAGS="${CFLAGS} `pkg-config --cflags libglade vfs`" \
+#		|| CFLAGS="${CFLAGS} `gtk-config --prefix`"
 
 	use nls \
-		&& myopts="--enable-nls" \
-		|| myopts="--disable-nls"
+		&& myconf="--enable-nls" \
+		|| myconf="--disable-nls"
 	
-	myopts="${myopts} --enable-usb-visor=yes --with-gnome-libs=/usr/lib"
+	myconf="${myconf} --enable-usb-visor=yes --with-gnome-libs=/usr/lib"
+
 	
 	mkdir intl && touch intl/libgettext.h
 	
-	econf ${myopts} || die
+	econf ${myconf} || die
 
+	cp Makefile Makefile.orig
+	sed "s:PISOCK_LIBS = -lpisock:PISOCK_LIBS = -lpisock -lpisync:g" \
+		Makefile.orig > Makefile
 	emake || die
 }