minor dependency fixes

6 files changed, 24 insertions, 15 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index f73fc6dd4ab2..dbdac385ed40 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.57 2003/12/03 01:20:09 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.58 2003/12/24 20:03:08 caleb Exp $
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_beta2.ebuild:
+  dependency fixes
 
 *kdenetwork-3.2.0_beta2 (02 Dec 2003)
 
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 1aa607564833..a072eb9bf808 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,9 +1,9 @@
 MD5 7e817e7218f39f054e7a36aba705462d kdenetwork-3.0.5b.ebuild 967
 MD5 c19d19fa121c8ab24dadf4fb7dbec00c kdenetwork-3.1.2.ebuild 882
 MD5 38f1bf08add1b8b5e942221c5539c904 kdenetwork-3.1.4.ebuild 882
-MD5 4ab09e17d4f0ab5b3e76964119646ebc kdenetwork-3.2.0_beta2.ebuild 1057
+MD5 cd6ddd6db1971e722253d1ea231a3199 kdenetwork-3.2.0_beta2.ebuild 1070
 MD5 7ee307959ba5ec560a0ad4044842f832 kdenetwork-3.0.4-r1.ebuild 1058
-MD5 1272e94cb4c568273e06d1a739b467de ChangeLog 7811
+MD5 92fd463197f3e7382bc0d796ed46e8ef ChangeLog 7909
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 39e16590465d76d78ea9188b59d1e5ea kdenetwork-3.2.0_beta1.ebuild 1057
 MD5 8cfc35635879b3b4fc158d2efa9ec0bb files/lisa 559
diff --git a/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild b/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild
index be2b1c5dadcd..8d48e8bb6c05 100644
--- a/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild,v 1.1 2003/12/03 01:20:09 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild,v 1.2 2003/12/24 20:03:08 caleb Exp $
 inherit kde-dist
 
-IUSE="slp"
+IUSE="slp samba"
 DESCRIPTION="KDE network apps: kopete, kppp, kget. kmail and knode are now in kdepim."
 KEYWORDS="~x86"
-newdepend "~kde-base/kdebase-${PV}
+DEPEND="~kde-base/kdebase-${PV}
+	slp? ( net-libs/openslp )
+	samba? ( net-fs/samba )
 	!net-im/kopete
 	!net-wireless/kwifimanager"
 
-use slp 	&& myconf="$myconf --enable-slp"	|| myconf="$myconf --disable-slp"
+myconf="$myconf `use_enable slp`"
 
 src_compile()
 {
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 19ddc9d15673..5960e7a4ccb8 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.59 2003/12/03 01:30:31 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.60 2003/12/24 20:04:16 caleb Exp $
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.2.0_beta2.ebuild:
+  minor dependency fixes
 
 *kdepim-3.2.0_beta2 (02 Dec 2003)
 
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index d2263c5d7fda..f98879500a17 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -3,9 +3,9 @@ MD5 c459f9f78b0d6b1018568ad4534ddd77 kdepim-3.1.2.ebuild 748
 MD5 b226533211bc7dcc66b16fd0448480be kdepim-3.2.0_beta1.ebuild 695
 MD5 49d046366b4923264510510dd72a3429 kdepim-3.1.4.ebuild 852
 MD5 0ddec5d7dec99cac69d3e13bb3b4ebc4 kdepim-3.1.2-r1.ebuild 1009
-MD5 dd936ddc62a4441809fdf621e06bc044 ChangeLog 7774
+MD5 c8a935714096badf1a5ac5d425753333 ChangeLog 7874
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 14fa2a632cfa46ea7ca28c998df50e6c kdepim-3.2.0_beta2.ebuild 695
+MD5 6b596bf134e39c38c193f37e093aef78 kdepim-3.2.0_beta2.ebuild 673
 MD5 7eefe33e5fa8de798421ee125378d399 kdepim-3.0.5b.ebuild 577
 MD5 ce5fa57255f8b647438149e6fc6c0cd0 files/digest-kdepim-3.0.4 66
 MD5 d870663d465fa52954057d4e4edca9ba files/digest-kdepim-3.1.2 66
diff --git a/kde-base/kdepim/kdepim-3.2.0_beta2.ebuild b/kde-base/kdepim/kdepim-3.2.0_beta2.ebuild
index 28b31d4751fa..dad3ce4519e9 100644
--- a/kde-base/kdepim/kdepim-3.2.0_beta2.ebuild
+++ b/kde-base/kdepim/kdepim-3.2.0_beta2.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.0_beta2.ebuild,v 1.1 2003/12/03 01:30:32 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.0_beta2.ebuild,v 1.2 2003/12/24 20:04:16 caleb Exp $
 inherit kde-dist
 
-IUSE="pda crypt"
+IUSE="pda crypt ldap"
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 KEYWORDS="~x86"
 
-newdepend "pda? ( app-pda/pilot-link dev-libs/libmal )
-	crypt? ( app-crypt/cryptplug )
-	~kde-base/kdenetwork-${PV}" # mimelib is needed for support of some stuff with exchange servers
+DEPEND="~kde-base/kdenetwork-${PV}
+	pda? ( app-pda/pilot-link dev-libs/libmal )
+	ldap? ( net-nds/openldap )
+	crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
 
 use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"