version bump

5 files changed, 38 insertions, 25 deletions

diff --git a/app-pda/jpilot/ChangeLog b/app-pda/jpilot/ChangeLog
index 77ee9383c8c1..fcf8d2f84f7d 100644
--- a/app-pda/jpilot/ChangeLog
+++ b/app-pda/jpilot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/jpilot
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.5 2003/09/24 20:36:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.6 2003/11/12 23:05:53 liquidx Exp $
+
+*jpilot-0.99.6 (12 Nov 2003)
+
+  12 Nov 2003; Alastair Tse <liquidx@gentoo.org> jpilot-0.99.3.ebuild:
+  version bump and ebuild cleanup
 
   25 Sep 2003; Martin Holzer <mholzer@gentoo.org> jpilot-0.99.5.ebuild:
   fixed gtk depend. Closes #25666
diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
index 8ae9c0ab9aad..e95022763885 100644
--- a/app-pda/jpilot/Manifest
+++ b/app-pda/jpilot/Manifest
@@ -1,10 +1,8 @@
-MD5 3ac80909a211788ab0454d3b5edcf37d ChangeLog 2522
+MD5 b8965aaa382313a2207cec6dc9572f40 ChangeLog 2658
 MD5 34c46453a9eaec0d549fefd4ca289d65 jpilot-0.99.2-r1.ebuild 1808
-MD5 a3560fc5cd2016ab4307daa400622599 jpilot-0.99.3.ebuild 1802
 MD5 58ea5fdbff8aca65b4ffbcbf53b54485 jpilot-0.99.5.ebuild 1889
-MD5 ef4b7ace60616e5289fd4eb25939f332 jpilot-0.99.6.ebuild 1982
+MD5 c51da447c5b7a8753db7c415772e7392 jpilot-0.99.6.ebuild 2195
 MD5 075fea99b82d61028585dc3e42f00466 metadata.xml 156
 MD5 772a9edf8c450460098e6af60fee716d files/digest-jpilot-0.99.2-r1 205
-MD5 dff8556ccfee490766561e1f87897882 files/digest-jpilot-0.99.3 205
 MD5 fec9283977e434f78771d9dc3b05569f files/digest-jpilot-0.99.5 208
 MD5 a7d9f40520d6a14eb9e4c3368ca41785 files/digest-jpilot-0.99.6 208
diff --git a/app-pda/jpilot/files/digest-jpilot-0.99.3 b/app-pda/jpilot/files/digest-jpilot-0.99.3
deleted file mode 100644
index f384ba7c3be3..000000000000
--- a/app-pda/jpilot/files/digest-jpilot-0.99.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e0ec41c291dfbee4189d232150785141 jpilot-0.99.3.tar.gz 965780
-MD5 962702319e49618b2dced101572b41e8 malsync_2.0.7.src.tar.gz 173957
-MD5 754e8dd3f6614cfc68d637ae62f88851 jpilot-syncmal_0.71.tar.gz 302724
diff --git a/app-pda/jpilot/files/digest-jpilot-0.99.6 b/app-pda/jpilot/files/digest-jpilot-0.99.6
new file mode 100644
index 000000000000..065d69848fe4
--- /dev/null
+++ b/app-pda/jpilot/files/digest-jpilot-0.99.6
@@ -0,0 +1,3 @@
+MD5 1572138321ce6759c65ecf83b8c84ef4 jpilot-0.99.6.tar.gz 1162066
+MD5 b6342df8559a53a51cf3294ac06ed992 malsync_2.1.1.src.tar.gz 171745
+MD5 fdfb0bbaaa6651f4389cc13eb44066f9 jpilot-syncmal_0.71.2.tar.gz 299645
diff --git a/app-pda/jpilot/jpilot-0.99.3.ebuild b/app-pda/jpilot/jpilot-0.99.6.ebuild
index 5a4c207da6c4..3eed58709535 100644
--- a/app-pda/jpilot/jpilot-0.99.3.ebuild
+++ b/app-pda/jpilot/jpilot-0.99.6.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.3.ebuild,v 1.3 2003/09/06 22:21:40 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.6.ebuild,v 1.1 2003/11/12 23:05:54 liquidx Exp $
 
-IUSE="nls"
-
-SYNCMAL="0.71"
-MALSYNC="2.0.7"
+SYNCMAL="0.71.2"
+MALSYNC="2.1.1"
 DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
 SRC_URI="http://jpilot.org/${P}.tar.gz
 	http://www.tomw.org/malsync/malsync_${MALSYNC}.src.tar.gz
@@ -18,11 +16,20 @@ HOMEPAGE="http://jpilot.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~sparc ~alpha"
+IUSE="nls gtk2"
 
-DEPEND="=x11-libs/gtk+-1.2*
+RDEPEND="gtk2? ( >=x11-libs/gtk+-2 )
+	!gtk2? ( >=x11-libs/gtk+-1.2 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )	
 	>=app-pda/pilot-link-0.11.5"
 
+DEPEND="${RDEPEND}
+	gtk2? ( dev-util/pkgconfig )
+	nls? ( sys-devel/gettext )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
@@ -32,31 +39,34 @@ src_unpack() {
 }
 
 src_compile() {
-	use nls || NLS_OPTION="--disable-nls"
-	econf ${NLS_OPTION} || die
+	econf $(use_enable gtk2) \
+		$(use_enable nls) \
+		${myconf} || die "configure failed"
 
 	# make sure we use $CFLAGS
-	mv Makefile Makefile.old
-	sed -e "s:-g -O2:${CFLAGS}:" Makefile.old > Makefile
-	emake || die
+	sed -i "s/-g -O2/${CFLAGS}/" Makefile
+	emake || die "make failed"
 
 	# build malsync plugin
 	cd ${S}/jpilot-syncmal_${SYNCMAL}
-	econf
-	emake || die
+	econf $(use_enable gtk2) \
+		${myconf} || die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
 	# work around for broken Makefile
 	dodir /usr/bin
 
-	einstall || die
+	einstall \
+		docdir=${D}/usr/share/doc/${PF} \
+		icondir=${D}/usr/share/doc/${PF}/icons \
+		desktopdir=${D}/usr/share/applications || die "install failed"
 
 	insinto /usr/lib/jpilot/plugins
 	doins jpilot-syncmal_${SYNCMAL}/.libs/libsyncmal.so
 
-	dodoc README TODO UPGRADING ABOUT-NLS BUGS CHANGELOG COPYING \
-	      CREDITS INSTALL
+	dodoc README TODO UPGRADING ABOUT-NLS BUGS ChangeLog COPYING INSTALL
 	doman docs/*.1
 
 	newdoc jpilot-syncmal_${SYNCMAL}/ChangeLog ChangeLog.jpilot-syncmal