fix gnome-pilot deps

6 files changed, 19 insertions, 21 deletions

diff --git a/gnome-extra/gnome-pilot-conduits/ChangeLog b/gnome-extra/gnome-pilot-conduits/ChangeLog
index 670a54c25062..fd843c62b869 100644
--- a/gnome-extra/gnome-pilot-conduits/ChangeLog
+++ b/gnome-extra/gnome-pilot-conduits/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-pilot-conduits
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pilot-conduits/ChangeLog,v 1.9 2003/05/22 11:34:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pilot-conduits/ChangeLog,v 1.10 2003/06/10 14:55:47 liquidx Exp $
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org>
+  gnome-pilot-conduits-0.9.ebuild:
+  fixed gnome-pilot deps
 
 *gnome-pilot-conduits-2.0.9 (22 May 2003)
 
diff --git a/gnome-extra/gnome-pilot-conduits/Manifest b/gnome-extra/gnome-pilot-conduits/Manifest
index 112208f5ef9e..fb7fdfa0225f 100644
--- a/gnome-extra/gnome-pilot-conduits/Manifest
+++ b/gnome-extra/gnome-pilot-conduits/Manifest
@@ -1,5 +1,5 @@
-MD5 cde319a25e9e25d96bac23cce9382d66 ChangeLog 1965
-MD5 4810a30094aa2fa3f07072d47cacb6b7 gnome-pilot-conduits-0.9.ebuild 1061
+MD5 2d020acd08718dc63ed2fce8f0783a8f ChangeLog 2076
+MD5 db6db46c0f4669dc74fa7099284122b7 gnome-pilot-conduits-0.9.ebuild 1065
 MD5 4c6dc907cb255a761edba9482daf863d gnome-pilot-conduits-2.0.8.ebuild 635
 MD5 e23a3ec5e17f961ac0659a07e96ff0b6 gnome-pilot-conduits-2.0.9.ebuild 635
 MD5 76c98072408ae5c4e5a96245e5a20466 files/digest-gnome-pilot-conduits-0.9 77
diff --git a/gnome-extra/gnome-pilot-conduits/gnome-pilot-conduits-0.9.ebuild b/gnome-extra/gnome-pilot-conduits/gnome-pilot-conduits-0.9.ebuild
index cd5462445260..df95fb9f4469 100644
--- a/gnome-extra/gnome-pilot-conduits/gnome-pilot-conduits-0.9.ebuild
+++ b/gnome-extra/gnome-pilot-conduits/gnome-pilot-conduits-0.9.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/gnome-extra/gnome-pilot-conduits/gnome-pilot-conduits-0.9.ebuild,v 1.7 2003/02/13 12:19:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pilot-conduits/gnome-pilot-conduits-0.9.ebuild,v 1.8 2003/06/10 14:55:47 liquidx Exp $
 
 IUSE="nls"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Gnome Pilot Conduits"
 SRC_URI="ftp://ftp.gnome.org/pub/gnome/unstable/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.eskil.org/gnome-pilot/"
 
-DEPEND="gnome-extra/gnome-pilot"
+DEPEND="<gnome-extra/gnome-pilot-2"
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
diff --git a/gnome-extra/gnome-pim/ChangeLog b/gnome-extra/gnome-pim/ChangeLog
index df431a5712b3..1976bccbcc0e 100644
--- a/gnome-extra/gnome-pim/ChangeLog
+++ b/gnome-extra/gnome-pim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/gnome-pim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pim/ChangeLog,v 1.9 2003/05/22 22:26:39 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pim/ChangeLog,v 1.10 2003/06/10 14:58:29 liquidx Exp $
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> gnome-pim-1.4.8.ebuild:
+  fixed gnome-pilot deps and cleaned ebuild
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/gnome-extra/gnome-pim/Manifest b/gnome-extra/gnome-pim/Manifest
index a12c280b8355..5a4d9242eb1c 100644
--- a/gnome-extra/gnome-pim/Manifest
+++ b/gnome-extra/gnome-pim/Manifest
@@ -1,3 +1,3 @@
-MD5 409baf8bfa920bd9e9f76e00c72fb2c4 gnome-pim-1.4.8.ebuild 1196
-MD5 42993695dad3eee8ea589bf54c363f0e ChangeLog 1332
+MD5 03ab85018768242422fd75ae67220b01 ChangeLog 1453
+MD5 a544fff4c170aa0113fd07ecec71463e gnome-pim-1.4.8.ebuild 963
 MD5 cb1d2cd51f69dff9863bfd8b97b7b726 files/digest-gnome-pim-1.4.8 68
diff --git a/gnome-extra/gnome-pim/gnome-pim-1.4.8.ebuild b/gnome-extra/gnome-pim/gnome-pim-1.4.8.ebuild
index 8d9835441ef0..e42a81c58e32 100644
--- a/gnome-extra/gnome-pim/gnome-pim-1.4.8.ebuild
+++ b/gnome-extra/gnome-pim/gnome-pim-1.4.8.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/gnome-extra/gnome-pim/gnome-pim-1.4.8.ebuild,v 1.6 2003/05/22 22:26:39 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-pim/gnome-pim-1.4.8.ebuild,v 1.7 2003/06/10 14:58:29 liquidx Exp $
 
 IUSE="pda"
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 ~sparc "
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1"
 
 DEPEND="${RDEPEND}
-	pda? ( gnome-extra/gnome-pilot )"
+	pda? ( <gnome-extra/gnome-pilot-2 )"
 
 src_unpack() {
 	unpack ${A}
@@ -29,20 +29,11 @@ src_unpack() {
 }
 
 src_compile() {
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib				\
-		    || die
-
+	econf 
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     localstatedir=${D}/var/lib					\
-	     install || die
-
+	einstall || die
 	dodoc AUTHORS COPYING* ChangeLog NEWS README*
 }