minor dep cleanups

8 files changed, 32 insertions, 34 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index b4bdb559d9d1..4c6414955d20 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.103 2003/12/24 21:25:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.104 2003/12/28 03:39:35 caleb Exp $
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild,
+  kdebase-3.2.0_beta2.ebuild:
+  minor dep cleanups
 
   24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild,
   kdebase-3.2.0_beta2.ebuild:
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 9763422210cf..e6ec513c522b 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,10 +1,10 @@
 MD5 0ddf72a18a286698c80e009c517ea462 kdebase-3.2.0_beta1-r1.ebuild 3614
 MD5 84d91eead31fcf756ae37c745232e88d kdebase-3.1.2.ebuild 3791
-MD5 df76eb3581871ef425f9ffc1868438f9 kdebase-3.2.0_beta2.ebuild 3136
+MD5 78f831ac808475b743dd01e675a1854d kdebase-3.2.0_beta2.ebuild 3159
 MD5 924761c92da94a05214375c0d374e947 kdebase-3.0.5b.ebuild 7924
-MD5 4e706951ae26c2b9c6f6c1c6cfe99985 kdebase-3.1.4.ebuild 4026
+MD5 503bc3080361343fa799872b1769bcbb kdebase-3.1.4.ebuild 3964
 MD5 2e7914e7f0c37c2da3d1db99bbf38d1f kdebase-3.0.4-r3.ebuild 4486
-MD5 4cad4694fd6a988894aeb37d066bb36f ChangeLog 18305
+MD5 2ce4f705c925247f8444553f220c6d80 ChangeLog 18426
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69
 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
diff --git a/kde-base/kdebase/kdebase-3.1.4.ebuild b/kde-base/kdebase/kdebase-3.1.4.ebuild
index 59bf5de5cb49..9dc59a14d473 100644
--- a/kde-base/kdebase/kdebase-3.1.4.ebuild
+++ b/kde-base/kdebase/kdebase-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/kdebase/kdebase-3.1.4.ebuild,v 1.13 2003/12/24 21:25:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.4.ebuild,v 1.14 2003/12/28 03:39:35 caleb Exp $
 inherit kde-dist eutils
 
 IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
@@ -8,7 +8,7 @@ DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror...
 
 KEYWORDS="x86 ppc sparc ~alpha hppa amd64"
 
-newdepend ">=media-sound/cdparanoia-3.9.8
+DEPEND=">=media-sound/cdparanoia-3.9.8
 	ldap? ( >=net-nds/openldap-1.2 )
 	pam? ( >=sys-libs/pam-0.73 )
 	motif? ( virtual/motif )
@@ -21,9 +21,8 @@ newdepend ">=media-sound/cdparanoia-3.9.8
 	java? ( || ( virtual/jdk virtual/jre ) )
 	>=media-libs/freetype-2
 	dev-util/pkgconfig"
-#	lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet
 
-RDEPEND="$RDEPEND sys-apps/eject"
+RDEPEND="$DEPEND sys-apps/eject"
 
 myconf="$myconf --with-dpms --with-cdparanoia"
 
diff --git a/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild b/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild
index f1b6904dc1d0..787ee180a933 100644
--- a/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild
+++ b/kde-base/kdebase/kdebase-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/kdebase/kdebase-3.2.0_beta2.ebuild,v 1.3 2003/12/24 21:25:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild,v 1.4 2003/12/28 03:39:35 caleb Exp $
 inherit kde-dist eutils
 
 IUSE="ldap pam motif encode cups ssl opengl samba java"
@@ -21,7 +21,7 @@ DEPEND="media-sound/cdparanoia
 	>=media-libs/freetype-2
 	dev-util/pkgconfig"
 
-RDEPEND="sys-apps/eject"
+RDEPEND="$DEPEND sys-apps/eject"
 
 myconf="$myconf --with-dpms --with-cdparanoia"
 myconf="$myconf `use_with ldap` `use_with motif`"
@@ -34,6 +34,7 @@ use java	&& myconf="$myconf --with-java=$(java-config --jdk-home)"	|| myconf="$m
 PATCHES=""
 
 src_unpack() {
+	echo $RDEPEND
 	kde_src_unpack
 }
 
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 4eb3c7c8e6f6..4d8677bd6ab1 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.104 2003/12/24 21:09:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.105 2003/12/28 03:37:41 caleb Exp $
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.4.ebuild,
+  kdelibs-3.2.0_beta2.ebuild:
+  minor dep cleanups
 
   24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.4.ebuild,
   kdelibs-3.2.0_beta2.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 43f66110d020..8ce221bcde7f 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,10 +1,10 @@
 MD5 8be197e19e85404d68a4f5270efd4d44 kdelibs-3.1.2-r1.ebuild 2532
-MD5 160b3a3dffc104b5b4680e6d6d8e9b97 kdelibs-3.1.4.ebuild 2385
+MD5 f60f274a0c0952c6b49eef03bc0e75b7 kdelibs-3.1.4.ebuild 2176
 MD5 91a9be08b638d2eb478665d154e9908e kdelibs-3.2.0_beta1.ebuild 2550
 MD5 ea339cdf171dc8b017d7df79ad1edc10 kdelibs-3.0.4-r1.ebuild 2296
 MD5 922dfd3fab1f4078d891c62afdd90148 kdelibs-3.0.5b-r1.ebuild 1990
-MD5 0195776b8dda72ab3b3d4463e54e6760 kdelibs-3.2.0_beta2.ebuild 2387
-MD5 c3384a21067ffaeadbf1b9d325f478af ChangeLog 17682
+MD5 78ea645fcb838acc6afcf005f1be936a kdelibs-3.2.0_beta2.ebuild 2347
+MD5 10603756a523eb860e4b0a518cc58dd8 ChangeLog 17803
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 4232704fe9aeecbb09dbed9cb45b8529 files/kdelibs-3.0.5b-khtml.patch 848
 MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
diff --git a/kde-base/kdelibs/kdelibs-3.1.4.ebuild b/kde-base/kdelibs/kdelibs-3.1.4.ebuild
index cfc9a60b07a7..1f108fe7aa2e 100644
--- a/kde-base/kdelibs/kdelibs-3.1.4.ebuild
+++ b/kde-base/kdelibs/kdelibs-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/kdelibs/kdelibs-3.1.4.ebuild,v 1.12 2003/12/24 21:09:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.4.ebuild,v 1.13 2003/12/28 03:37:41 caleb Exp $
 inherit kde
 #don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
 
@@ -12,13 +12,7 @@ SLOT="3.1"
 LICENSE="GPL-2 LGPL-2"
 SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2"
 
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=""
-RDEPEND="doc? ( ~app-doc/kdelibs-apidocs-$PV )"
-newdepend "dev-lang/perl
-	>=media-libs/audiofile-0.1.9
-	>=app-arch/bzip2-1.0.1
+DEPEND=">=app-arch/bzip2-1.0.1
 	>=dev-libs/libxslt-1.0.7
 	>=dev-libs/libpcre-3.5
 	>=dev-libs/libxml2-2.4.10
@@ -32,9 +26,8 @@ newdepend "dev-lang/perl
 	sys-devel/gettext
 	~kde-base/arts-1.1.4"
 
-newdepend "/autotools"
-
-RDEPEND="$RDEPEND
+RDEPEND="$DEPEND
+	doc? ( ~app-doc/kdelibs-apidocs-$PV )
 	app-text/sgml-common
 	cups? ( net-print/cups )
 	dev-lang/python"
diff --git a/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild b/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild
index f9beb801f259..2d0cafead353 100644
--- a/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild
@@ -1,8 +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/kdelibs/kdelibs-3.2.0_beta2.ebuild,v 1.6 2003/12/24 21:09:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild,v 1.7 2003/12/28 03:37:41 caleb Exp $
 inherit kde
 
+need-autoconf 2.5
+set-kdedir ${PV}
+
 MY_PV=3.1.94
 S=${WORKDIR}/${PN}-${MY_PV}
 
@@ -16,8 +19,7 @@ SRC_URI="mirror://kde/unstable/${MY_PV}/src/${PN}-${MY_PV}.tar.bz2"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
-DEPEND="dev-lang/perl
-	app-arch/bzip2
+DEPEND="app-arch/bzip2
 	dev-libs/libxslt
 	dev-libs/libpcre
 	dev-libs/libxml2
@@ -32,17 +34,12 @@ DEPEND="dev-lang/perl
 	~kde-base/arts-1.2.0_beta2
 	>=x11-libs/qt-3.2.0"
 
-newdepend "/autotools"
-
-RDEPEND="$RDEPEND
+RDEPEND="$DEPEND
 	app-text/sgml-common
 	cups? ( net-print/cups )
 	doc? ( app-doc/doxygen )
 	dev-lang/python"
 
-need-autoconf 2.5
-set-kdedir ${PV}
-
 src_unpack() {
 	kde_src_unpack
 	cd ${S} && make -f admin/Makefile.common && aclocal