From 895b4b54463c2ed8648bbcb1187d61746a33d0be Mon Sep 17 00:00:00 2001
From: Martin Holzer <mholzer@gentoo.org>
Date: Wed, 24 Sep 2003 20:36:10 +0000
Subject: fixed gtk depend. Closes #25666

---
 app-pda/jpilot/ChangeLog            |  5 ++++-
 app-pda/jpilot/Manifest             |  4 ++--
 app-pda/jpilot/jpilot-0.99.5.ebuild | 10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app-pda/jpilot/ChangeLog b/app-pda/jpilot/ChangeLog
index 7bbb4beb705b..77ee9383c8c1 100644
--- a/app-pda/jpilot/ChangeLog
+++ b/app-pda/jpilot/ChangeLog
@@ -1,6 +1,9 @@
 # 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.4 2003/09/09 17:41:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/ChangeLog,v 1.5 2003/09/24 20:36:05 mholzer Exp $
+
+  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> jpilot-0.99.5.ebuild:
+  fixed gtk depend. Closes #25666
 
   09 Sep 2003; Aron Griffis <agriffis@gentoo.org> jpilot-0.99.5.ebuild:
   Stable on alpha
diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
index 352e848730df..5cd5f761fcc6 100644
--- a/app-pda/jpilot/Manifest
+++ b/app-pda/jpilot/Manifest
@@ -1,7 +1,7 @@
-MD5 1009fd999e070d7dfb583bbc3d932834 ChangeLog 2416
+MD5 3ac80909a211788ab0454d3b5edcf37d ChangeLog 2522
 MD5 34c46453a9eaec0d549fefd4ca289d65 jpilot-0.99.2-r1.ebuild 1808
 MD5 a3560fc5cd2016ab4307daa400622599 jpilot-0.99.3.ebuild 1802
-MD5 c791fa8e255e262f7244851563b8439f jpilot-0.99.5.ebuild 1882
+MD5 58ea5fdbff8aca65b4ffbcbf53b54485 jpilot-0.99.5.ebuild 1889
 MD5 075fea99b82d61028585dc3e42f00466 metadata.xml 156
 MD5 772a9edf8c450460098e6af60fee716d files/digest-jpilot-0.99.2-r1 205
 MD5 dff8556ccfee490766561e1f87897882 files/digest-jpilot-0.99.3 205
diff --git a/app-pda/jpilot/jpilot-0.99.5.ebuild b/app-pda/jpilot/jpilot-0.99.5.ebuild
index f387203e1e6b..e8e93f60454b 100644
--- a/app-pda/jpilot/jpilot-0.99.5.ebuild
+++ b/app-pda/jpilot/jpilot-0.99.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.6 2003/09/09 17:41:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-0.99.5.ebuild,v 1.7 2003/09/24 20:36:05 mholzer Exp $
 
 SYNCMAL="0.71.2"
 MALSYNC="2.1.1"
@@ -17,9 +17,10 @@ HOMEPAGE="http://jpilot.org/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc alpha"
-IUSE="nls"
+IUSE="nls gtk gtk2"
 
-DEPEND=">=x11-libs/gtk+-2
+DEPEND="gtk2? ( >=x11-libs/gtk+-2 )
+	gtk? ( >=x11-libs/gtk+-1.2 )
 	>=app-pda/pilot-link-0.11.5"
 
 src_unpack() {
@@ -37,8 +38,7 @@ src_compile() {
 	econf ${myconf}
 
 	# make sure we use $CFLAGS
-	mv Makefile Makefile.old
-	sed -e "s/-g -O2/${CFLAGS}/" Makefile.old > Makefile
+	sed -i "s/-g -O2/${CFLAGS}/" Makefile
 	emake || die
 
 	# build malsync plugin
-- 
cgit v1.2.3-65-gdbad