minor dep fixes

15 files changed, 41 insertions, 28 deletions

diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index 857eb69f2363..b168704c613f 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -1,9 +1,9 @@
 MD5 3bf9136d3c3c79a44517a60b6c82bddf kdeaddons-3.0.4.ebuild 817
 MD5 dc2120a4612d763b0a60e63586a52858 kdeaddons-3.1.2.ebuild 1381
 MD5 cd68980bffbebd32c4d4709f07e05fe6 kdeaddons-3.2.0_beta1.ebuild 743
-MD5 bd39a4641ef42553cb9fccd13f59c5cd kdeaddons-3.1.4.ebuild 1394
+MD5 3a58a1193c75356db602aa8931950f01 kdeaddons-3.1.4.ebuild 1409
 MD5 cf8efeae531c50192c4b43441148aa96 kdeaddons-3.0.5b.ebuild 826
-MD5 41e5437e5d4e7ee7add02255fb406e9c kdeaddons-3.2.0_beta2.ebuild 743
+MD5 23bec0e176b5d60b8d990a084279b638 kdeaddons-3.2.0_beta2.ebuild 761
 MD5 64d635e030f4dfc7a289cc7f2c1439ae ChangeLog 7971
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.3-enable-crashes.diff 1415
diff --git a/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild b/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild
index 6256f9176a27..65c5290d4fcf 100644
--- a/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild,v 1.8 2003/12/24 21:21:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1.4.ebuild,v 1.9 2003/12/28 03:52:53 caleb Exp $
 inherit kde-dist flag-o-matic
 
 IUSE="sdl svga xmms esd"
 DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
 KEYWORDS="x86 ppc sparc hppa amd64"
 
-newdepend "=kde-base/kdebase-${PV}*
+DEPEND="=kde-base/kdebase-${PV}*
 	~kde-base/kdenetwork-${PV}
 	~kde-base/kdemultimedia-${PV}
 	~kde-base/arts-${PV//3./1.}
@@ -15,6 +15,7 @@ newdepend "=kde-base/kdebase-${PV}*
 	sdl? ( >=media-libs/libsdl-1.2 )
 	svga? ( media-libs/svgalib )
 	xmms? ( media-sound/xmms )"
+RDEPEND="$DEPEND"
 
 use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
 
diff --git a/kde-base/kdeaddons/kdeaddons-3.2.0_beta2.ebuild b/kde-base/kdeaddons/kdeaddons-3.2.0_beta2.ebuild
index 3c2c4cf07a14..62f9b7ea4c2d 100644
--- a/kde-base/kdeaddons/kdeaddons-3.2.0_beta2.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.2.0_beta2.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/kde-base/kdeaddons/kdeaddons-3.2.0_beta2.ebuild,v 1.3 2003/12/24 21:21:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.2.0_beta2.ebuild,v 1.4 2003/12/28 03:52:53 caleb Exp $
 inherit kde-dist flag-o-matic
 
 IUSE="sdl svga xmms esd"
@@ -13,6 +13,7 @@ DEPEND="~kde-base/kdepim-${PV}
 	sdl? ( >=media-libs/libsdl-1.2 )
 	svga? ( media-libs/svgalib )
 	xmms? ( media-sound/xmms )"
+RDEPEND="$DEPEND"
 
 use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
 
diff --git a/kde-base/kdeadmin/Manifest b/kde-base/kdeadmin/Manifest
index 2ea4bc430831..b79ee3d413fe 100644
--- a/kde-base/kdeadmin/Manifest
+++ b/kde-base/kdeadmin/Manifest
@@ -1,10 +1,10 @@
-MD5 be064c51dc99d15eac923e8eebd2e84e kdeadmin-3.1.4.ebuild 1363
+MD5 90cf289fd10b064326e2dcd67f643066 kdeadmin-3.1.4.ebuild 1377
 MD5 b2bdd0b01b78395be6bcb5d5af6a4d4b kdeadmin-3.0.5b.ebuild 791
 MD5 4b814e1828f9b286c828e94bec18aca7 kdeadmin-3.2.0_beta1.ebuild 1243
 MD5 3d99edaa7f1398a6fcf3806e550cd849 ChangeLog 7707
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 97025c29f78ad5392ab528a179326531 kdeadmin-3.0.4.ebuild 528
-MD5 1941eb0aaf1ed97cc36530d63ea0a7e2 kdeadmin-3.2.0_beta2.ebuild 1040
+MD5 267d64521aa309e5ade9acebf949ddec kdeadmin-3.2.0_beta2.ebuild 1035
 MD5 a6705bd443a458d94e5cb40b6d8d17cd kdeadmin-3.1.2.ebuild 1599
 MD5 cfd611aaf828a1fb0407ac3a55ce0167 files/digest-kdeadmin-3.2.0_beta1 69
 MD5 8e7d18ab7de7bfdfaa653d7bf258c101 files/digest-kdeadmin-3.2.0_beta2 69
diff --git a/kde-base/kdeadmin/kdeadmin-3.1.4.ebuild b/kde-base/kdeadmin/kdeadmin-3.1.4.ebuild
index 9780773f6a3f..afed7e3affd0 100644
--- a/kde-base/kdeadmin/kdeadmin-3.1.4.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.1.4.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.1.4.ebuild,v 1.7 2003/11/30 00:25:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.1.4.ebuild,v 1.8 2003/12/28 03:51:52 caleb Exp $
 inherit kde-dist
 
 IUSE="pam foreign-package foreign-sysvinit"
 DESCRIPTION="KDE administration tools (user manager, etc.)"
 KEYWORDS="x86 ppc sparc hppa amd64"
 
-newdepend "pam? ( >=sys-libs/pam-0.72 )
+DEPEND="pam? ( >=sys-libs/pam-0.72 )
 	foreign-package? ( >=app-arch/rpm-4.0.4-r1 dev-libs/popt )"
+RDEPEND="$DEPEND"
 
 use pam		&& myconf="$myconf --with-pam"	|| myconf="$myconf --without-pam --with-shadow"
 
diff --git a/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild b/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild
index c034c31c51ef..f416c2732837 100644
--- a/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.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/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild,v 1.4 2003/12/26 12:25:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild,v 1.5 2003/12/28 03:51:52 caleb Exp $
 inherit kde-dist
 
 IUSE="pam"
@@ -9,7 +9,7 @@ KEYWORDS="~x86"
 
 DEPEND="~kde-base/kdebase-${PV}
 	pam? ( >=sys-libs/pam-0.72 )"
-#	sys-apps/lm-sensors"
+RDEPEND="$DEPEND"
 
 myconf="$myconf --without-rpm"
 DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage ksysv"
diff --git a/kde-base/kdeartwork/Manifest b/kde-base/kdeartwork/Manifest
index 0225489831b8..4bcad69cdc34 100644
--- a/kde-base/kdeartwork/Manifest
+++ b/kde-base/kdeartwork/Manifest
@@ -1,8 +1,8 @@
 MD5 3e32aee79a022a10491626bd4648e368 kdeartwork-3.0.5b.ebuild 784
 MD5 d6f35cb5cfa1b2fde7a70b2f75a8010a kdeartwork-3.0.4.ebuild 776
 MD5 ae54e65e8e035373ad43d0f64b53a4be kdeartwork-3.1.2.ebuild 560
-MD5 d3b78cd291e027fe2d170db3a4ad54f1 kdeartwork-3.1.4.ebuild 561
-MD5 3fc6211d616a17698cad8aaa4d3eb72d kdeartwork-3.2.0_beta2.ebuild 547
+MD5 de2d2e3efc76b50b5e84a43f6a01ecb3 kdeartwork-3.1.4.ebuild 572
+MD5 d2fdad004ddd689f67433758bf93d24a kdeartwork-3.2.0_beta2.ebuild 487
 MD5 4f6e55143db144dc1fa34e5acd7b8af3 ChangeLog 6809
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 3b1a0a9f43c8a9cab2096e9da8bccacd kdeartwork-3.2.0_beta1.ebuild 547
diff --git a/kde-base/kdeartwork/kdeartwork-3.1.4.ebuild b/kde-base/kdeartwork/kdeartwork-3.1.4.ebuild
index 620fdfb6573c..ebc73e3502fe 100644
--- a/kde-base/kdeartwork/kdeartwork-3.1.4.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.1.4.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.1.4.ebuild,v 1.7 2003/11/29 23:18:36 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.1.4.ebuild,v 1.8 2003/12/28 03:50:44 caleb Exp $
 inherit kde-dist
 
 IUSE="opengl"
-newdepend "opengl? ( virtual/opengl ) =kde-base/kdebase-${PV}*"
+DEPEND="opengl? ( virtual/opengl )
+	~kde-base/kdebase-${PV}"
+RDEPEND="$DEPEND"
 
 DESCRIPTION="KDE artwork package"
 KEYWORDS="x86 ppc sparc hppa amd64"
diff --git a/kde-base/kdeartwork/kdeartwork-3.2.0_beta2.ebuild b/kde-base/kdeartwork/kdeartwork-3.2.0_beta2.ebuild
index c95d976d1fbd..8f51d546be08 100644
--- a/kde-base/kdeartwork/kdeartwork-3.2.0_beta2.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.2.0_beta2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.2.0_beta2.ebuild,v 1.1 2003/12/03 23:13:34 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.2.0_beta2.ebuild,v 1.2 2003/12/28 03:50:44 caleb Exp $
 inherit kde-dist
 
 IUSE="opengl"
-#newdepend "opengl? ( virtual/opengl ) =kde-base/kdebase-${PV}*"
-newdepend "opengl? ( virtual/opengl ) kde-base/kdebase"
+DEPEND="opengl? ( virtual/opengl )
+	~kde-base/kdebase-${PV}"
 
 DESCRIPTION="KDE artwork package"
 KEYWORDS="~x86"
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index dbdac385ed40..fa5dc4df12a9 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,10 @@
 # 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.58 2003/12/24 20:03:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.59 2003/12/28 03:43:36 caleb Exp $
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.4.ebuild,
+  kdenetwork-3.2.0_beta2.ebuild:
+  minor dep fixes
 
   24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_beta2.ebuild:
   dependency fixes
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index a072eb9bf808..0eb4c2e1edf1 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 cd6ddd6db1971e722253d1ea231a3199 kdenetwork-3.2.0_beta2.ebuild 1070
+MD5 65d54e75c0c9dd6389a6a8c7cdd8d45d kdenetwork-3.1.4.ebuild 892
+MD5 a0dc267da4e01157c91b7ffa882de91a kdenetwork-3.2.0_beta2.ebuild 1088
 MD5 7ee307959ba5ec560a0ad4044842f832 kdenetwork-3.0.4-r1.ebuild 1058
-MD5 92fd463197f3e7382bc0d796ed46e8ef ChangeLog 7909
+MD5 420ab141f134f1bc81cbb62c916ba432 ChangeLog 8033
 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.1.4.ebuild b/kde-base/kdenetwork/kdenetwork-3.1.4.ebuild
index fda6704a099c..09c3fcab22d7 100644
--- a/kde-base/kdenetwork/kdenetwork-3.1.4.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.1.4.ebuild
@@ -1,12 +1,13 @@
 # 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.1.4.ebuild,v 1.7 2003/11/29 23:05:19 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.1.4.ebuild,v 1.8 2003/12/28 03:43:36 caleb Exp $
 inherit kde-dist
 
 IUSE=""
 DESCRIPTION="KDE network apps: kmail, kppp, knode..."
 KEYWORDS="x86 ppc sparc hppa amd64"
-newdepend "=kde-base/kdebase-${PV}*"
+DEPEND="~kde-base/kdebase-${PV}"
+RDEPEND="$DEPEND"
 
 src_install() {
 	kde_src_install
diff --git a/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild b/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild
index 8d48e8bb6c05..a1bc3b8a9044 100644
--- a/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.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/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild,v 1.2 2003/12/24 20:03:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.2.0_beta2.ebuild,v 1.3 2003/12/28 03:43:36 caleb Exp $
 inherit kde-dist
 
 IUSE="slp samba"
@@ -11,6 +11,7 @@ DEPEND="~kde-base/kdebase-${PV}
 	samba? ( net-fs/samba )
 	!net-im/kopete
 	!net-wireless/kwifimanager"
+RDEPEND="$DEPEND"
 
 myconf="$myconf `use_enable slp`"
 
diff --git a/kde-base/kdesdk/Manifest b/kde-base/kdesdk/Manifest
index 7aa52130f271..83ed622c4323 100644
--- a/kde-base/kdesdk/Manifest
+++ b/kde-base/kdesdk/Manifest
@@ -1,7 +1,7 @@
 MD5 5162ba47db9f1ebffe40b43edb88530e kdesdk-3.2.0_beta1-r1.ebuild 429
 MD5 dd022a9ce711fa89a564de5fcf659f9a kdesdk-3.0.4.ebuild 318
 MD5 b0ce3ca9ab15a0bbc184cd751093985e kdesdk-3.1.2.ebuild 315
-MD5 7504fc1423cefaa130007865ddadc2f1 kdesdk-3.2.0_beta2.ebuild 426
+MD5 349700e3d36a9bfa83bdb171bcc2c9de kdesdk-3.2.0_beta2.ebuild 442
 MD5 18d856d9c26e25f78df3d0fad077cd5c kdesdk-3.1.4.ebuild 322
 MD5 f30aeb691a19f6f59fe38b74d2673fb3 kdesdk-3.0.5b.ebuild 328
 MD5 2e36a45e6654bd7f539b2c42c1e3852e ChangeLog 4665
diff --git a/kde-base/kdesdk/kdesdk-3.2.0_beta2.ebuild b/kde-base/kdesdk/kdesdk-3.2.0_beta2.ebuild
index f8c39d90b539..e62ebbda439e 100644
--- a/kde-base/kdesdk/kdesdk-3.2.0_beta2.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.2.0_beta2.ebuild
@@ -1,14 +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/kdesdk/kdesdk-3.2.0_beta2.ebuild,v 1.1 2003/12/03 22:54:43 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.2.0_beta2.ebuild,v 1.2 2003/12/28 03:48:19 caleb Exp $
 inherit kde-dist
 
 IUSE=""
 DESCRIPTION="KDE SDK: kbabel, ..."
 KEYWORDS="~x86"
 
-newdepend "!dev-util/umbrello
+DEPEND="!dev-util/umbrello
 	!dev-util/kcachegrind
 	>=dev-util/calltree-0.9.1
 	media-gfx/graphviz
 	sys-devel/flex"
+
+RDEPEND="$DEPEND"