minor dependency fixes

11 files changed, 36 insertions, 28 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 1d1d3901989b..c7f19f67ae74 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.65 2003/12/27 17:04:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.66 2003/12/28 03:42:04 caleb Exp $
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.1.4.ebuild,
+  kdegraphics-3.2.0_beta2.ebuild:
+  minor dep changes
 
   27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.2.0_beta2.ebuild:
   Don't use the bidi use flag - require fribidi as that gives us ksvg support
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 3f3ffe4abb7d..a3e4f5b51d58 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,10 +1,10 @@
-MD5 6bcbf261c1f097b400c16f63064463c5 kdegraphics-3.1.4.ebuild 1131
+MD5 c055e6dcfd3a08be5ff798fe938b87d1 kdegraphics-3.1.4.ebuild 1044
 MD5 d8b0ff86e19478f71ae5863b9d03cafe kdegraphics-3.2.0_beta1.ebuild 1144
 MD5 3394eb4c86a2982feaf88495fe8088d6 kdegraphics-3.0.5b.ebuild 1483
-MD5 b911abe6ebb951a754c3f7a29260a728 kdegraphics-3.2.0_beta2.ebuild 1061
+MD5 eceed76a5fdd2a7fb0ba9260c3c44021 kdegraphics-3.2.0_beta2.ebuild 1060
 MD5 1a43ebed5b770636586e9da51697c8fe kdegraphics-3.0.4.ebuild 1474
 MD5 1b54a7c0338a9ba9ac4952d68c9951c8 kdegraphics-3.1.2.ebuild 1216
-MD5 32b6a0bc50f07b1f4cde6814a6831808 ChangeLog 9655
+MD5 537816db2d894872a7545263435535d4 ChangeLog 9783
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 7bd7c1b329b82343ac65b1a405f0d1a2 files/digest-kdegraphics-3.2.0_beta1 72
 MD5 b75485677b5b2ebd002e9ac615da063f files/digest-kdegraphics-3.2.0_beta2 72
diff --git a/kde-base/kdegraphics/kdegraphics-3.1.4.ebuild b/kde-base/kdegraphics/kdegraphics-3.1.4.ebuild
index 415c8a98733a..fe61b3e9246b 100644
--- a/kde-base/kdegraphics/kdegraphics-3.1.4.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.1.4.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/kdegraphics/kdegraphics-3.1.4.ebuild,v 1.9 2003/12/23 15:27:02 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.1.4.ebuild,v 1.10 2003/12/28 03:42:04 caleb Exp $
 inherit kde-dist
 
 IUSE="gphoto2 tetex scanner"
@@ -8,8 +8,7 @@ DESCRIPTION="KDE graphics-related apps"
 
 KEYWORDS="x86 ppc sparc hppa amd64"
 
-newdepend "gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 )
-	dev-lang/perl
+DEPEND="gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 )
 	scanner? ( media-gfx/sane-backends )
 	tetex? ( virtual/tetex )
 	media-libs/imlib
@@ -17,10 +16,9 @@ newdepend "gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 )
 	virtual/glut virtual/opengl
 	media-libs/tiff
 	!media-gfx/kpovmodeler
-	x86? ( scanner? sys-libs/libieee1284 )
-	>=sys-apps/portage-2.0.47" # needed for the above dep ANDing to work
+	x86? ( scanner? sys-libs/libieee1284 )"
 
-RDEPEND="$RDEPEND app-text/xpdf"
+RDEPEND="$DEPEND app-text/xpdf"
 
 use gphoto2	&& myconf="$myconf --with-kamera \
 			   --with-gphoto2-includes=/usr/include/gphoto2 \
diff --git a/kde-base/kdegraphics/kdegraphics-3.2.0_beta2.ebuild b/kde-base/kdegraphics/kdegraphics-3.2.0_beta2.ebuild
index 21c680ae9ba6..a12682699d38 100644
--- a/kde-base/kdegraphics/kdegraphics-3.2.0_beta2.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-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/kdegraphics/kdegraphics-3.2.0_beta2.ebuild,v 1.5 2003/12/27 17:04:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.2.0_beta2.ebuild,v 1.6 2003/12/28 03:42:04 caleb Exp $
 inherit kde-dist
 
 IUSE="gphoto2 tetex scanner opengl"
@@ -19,7 +19,7 @@ DEPEND="~kde-base/kdebase-${PV}
 	media-libs/tiff
 	x86? ( scanner? sys-libs/libieee1284 )"
 
-RDEPEND="$RDEPEND app-text/xpdf"
+RDEPEND="$DEPEND app-text/xpdf"
 
 use gphoto2	&& myconf="$myconf --with-kamera \
 				   --with-gphoto2-includes=/usr/include/gphoto2 \
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index ceecc0b802ad..b7f2e51278e7 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.70 2003/12/24 20:16:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.71 2003/12/28 03:46:06 caleb Exp $
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.4-r1.ebuild,
+  kdemultimedia-3.2.0_beta2.ebuild:
+  minor dependency fixes
 
   24 Dec 2003; Caleb Tennis <caleb@gentoo.org>
   kdemultimedia-3.2.0_beta2.ebuild:
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 85132e1cd278..3d907aa75dbe 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,10 +1,10 @@
-MD5 b742f0cfd74db149dbb96e673cf293d2 kdemultimedia-3.1.4-r1.ebuild 2871
+MD5 d948664003ca1ef964deb2b7ad1e5428 kdemultimedia-3.1.4-r1.ebuild 2863
 MD5 d5c217233c94c5ca8ab5ab457b8cc05e kdemultimedia-3.0.4.ebuild 2516
-MD5 395cc6b4c31d2ec1a6391cba13075bd5 kdemultimedia-3.2.0_beta2.ebuild 2139
+MD5 a5f7178a10a2f1616207cc1329e89a0d kdemultimedia-3.2.0_beta2.ebuild 2158
 MD5 ad5e44c7442e5a17f4473679209966c8 kdemultimedia-3.1.2.ebuild 2698
 MD5 9346d26a0ffe17b3c90792d410c5543d kdemultimedia-3.1.2-r1.ebuild 2739
 MD5 671e88cff042e3df24377c0252fffa16 kdemultimedia-3.2.0_beta1.ebuild 2051
-MD5 d7a4edcdb9b2acea1d5aa603355d7864 ChangeLog 10542
+MD5 fbeae6e3b4a561c3db76b2f514163cb1 ChangeLog 10682
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 5ba5ef8edef46a60644ba401b24c9332 kdemultimedia-3.0.5b.ebuild 2524
 MD5 c40a9c32c318c81150a0d45d13501e75 files/digest-kdemultimedia-3.1.2-r1 73
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1.4-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.4-r1.ebuild
index c5c7e1fb418f..070cd783667c 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.1.4-r1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.1.4-r1.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/kdemultimedia/kdemultimedia-3.1.4-r1.ebuild,v 1.8 2003/11/29 23:13:53 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1.4-r1.ebuild,v 1.9 2003/12/28 03:46:06 caleb Exp $
 inherit kde-dist flag-o-matic
 
 IUSE="nas esd motif slang tcltk oggvorbis cdr"
 DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
 KEYWORDS="x86 sparc ppc hppa amd64"
 
-newdepend ">=sys-libs/ncurses-5.2
+DEPEND=">=sys-libs/ncurses-5.2
 	>=media-sound/cdparanoia-3.9.8
 	>=media-libs/libvorbis-1.0_beta4
 	!hppa? ( >=media-video/xanim-2.80.1 )
@@ -23,7 +23,7 @@ newdepend ">=sys-libs/ncurses-5.2
 	#gtk? ( =x11-libs/gtk+-1.2* )
 #	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
 
-RDEPEND="$RDEPEND
+RDEPEND="$DEPEND
 	cdr? ( app-cdr/cdrtools
 	>=app-cdr/cdrdao-1.1.5 )"
 
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.0_beta2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.0_beta2.ebuild
index fd8ce271c6ed..dfcf48508480 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.2.0_beta2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-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/kdemultimedia/kdemultimedia-3.2.0_beta2.ebuild,v 1.3 2003/12/24 20:16:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.2.0_beta2.ebuild,v 1.4 2003/12/28 03:46:07 caleb Exp $
 inherit kde-dist flag-o-matic
 
 IUSE="nas esd motif slang tcltk oggvorbis gtk alsa gstreamer"
@@ -27,6 +27,8 @@ DEPEND="~kde-base/kdebase-${PV}
 	media-libs/id3lib media-libs/musicbrainz media-libs/taglib
 	!media-sound/juk"
 
+RDEPEND="$DEPEND"
+
 replace-flags "-O3" "-O2"
 
 myaudio="--enable-audio=oss"
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index f98879500a17..bf8fd7f1591e 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,11 +1,11 @@
 MD5 a354060b9af1f8b8d8705c003fc976ee kdepim-3.0.4.ebuild 569
 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 2cbfe5cc5d490784693e7a47ac6fa0a6 kdepim-3.1.4.ebuild 843
 MD5 0ddec5d7dec99cac69d3e13bb3b4ebc4 kdepim-3.1.2-r1.ebuild 1009
 MD5 c8a935714096badf1a5ac5d425753333 ChangeLog 7874
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 6b596bf134e39c38c193f37e093aef78 kdepim-3.2.0_beta2.ebuild 673
+MD5 95a98605bffffe2ee40c1ed0671117b7 kdepim-3.2.0_beta2.ebuild 691
 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.1.4.ebuild b/kde-base/kdepim/kdepim-3.1.4.ebuild
index 9bad8541a06c..83e50a6ea468 100644
--- a/kde-base/kdepim/kdepim-3.1.4.ebuild
+++ b/kde-base/kdepim/kdepim-3.1.4.ebuild
@@ -1,17 +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.1.4.ebuild,v 1.7 2003/11/29 23:20:39 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.1.4.ebuild,v 1.8 2003/12/28 03:45:05 caleb Exp $
 inherit kde-dist
 
 IUSE="pda"
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer..."
 KEYWORDS="x86 ppc sparc hppa amd64"
 
-newdepend "pda? ( >=app-pda/pilot-link-0.11.1-r1
-				>=dev-libs/libmal-0.31 )
-	dev-lang/perl
-	=kde-base/kdebase-${PV}*
+DEPEND="pda? ( >=app-pda/pilot-link-0.11.1-r1 >=dev-libs/libmal-0.31 )
+	~kde-base/kdebase-${PV}
 	~kde-base/kdenetwork-${PV}" # mimelib is needed for support of some stuff with exchange servers
+RDEPEND="$DEPEND"
 
 use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
 
diff --git a/kde-base/kdepim/kdepim-3.2.0_beta2.ebuild b/kde-base/kdepim/kdepim-3.2.0_beta2.ebuild
index dad3ce4519e9..0ce3e59fb542 100644
--- a/kde-base/kdepim/kdepim-3.2.0_beta2.ebuild
+++ b/kde-base/kdepim/kdepim-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/kdepim/kdepim-3.2.0_beta2.ebuild,v 1.2 2003/12/24 20:04:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.0_beta2.ebuild,v 1.3 2003/12/28 03:45:05 caleb Exp $
 inherit kde-dist
 
 IUSE="pda crypt ldap"
@@ -11,6 +11,7 @@ DEPEND="~kde-base/kdenetwork-${PV}
 	pda? ( app-pda/pilot-link dev-libs/libmal )
 	ldap? ( net-nds/openldap )
 	crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
+RDEPEND="$DEPEND"
 
 use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"