From 8b078f28a142a96573a244af7ca1fbace6294e9f Mon Sep 17 00:00:00 2001
From: Caleb Tennis <caleb@gentoo.org>
Date: Wed, 24 Dec 2003 20:21:53 +0000
Subject: minor dependency fixes

---
 kde-base/kdeadmin/ChangeLog                   |  5 ++++-
 kde-base/kdeadmin/Manifest                    |  4 ++--
 kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild | 20 ++++++--------------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index 2a608b7d04c8..8b67b900564f 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdeadmin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.55 2003/12/03 23:14:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.56 2003/12/24 20:21:45 caleb Exp $
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.2.0_beta2.ebuild:
+  minor dependency fixes
 
 *kdeadmin-3.2.0_beta2 (03 Dec 2003)
 
diff --git a/kde-base/kdeadmin/Manifest b/kde-base/kdeadmin/Manifest
index ba7fa5482225..af59a5a5e03b 100644
--- a/kde-base/kdeadmin/Manifest
+++ b/kde-base/kdeadmin/Manifest
@@ -1,10 +1,10 @@
 MD5 be064c51dc99d15eac923e8eebd2e84e kdeadmin-3.1.4.ebuild 1363
 MD5 b2bdd0b01b78395be6bcb5d5af6a4d4b kdeadmin-3.0.5b.ebuild 791
 MD5 4b814e1828f9b286c828e94bec18aca7 kdeadmin-3.2.0_beta1.ebuild 1243
-MD5 18b629a78f73d38f3b6b33032a31772f ChangeLog 7450
+MD5 e979355c068cdcb5c8f99e7ee30e6cb0 ChangeLog 7552
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 97025c29f78ad5392ab528a179326531 kdeadmin-3.0.4.ebuild 528
-MD5 56cc9a783eebcbc3825fa7d70779b73f kdeadmin-3.2.0_beta2.ebuild 1243
+MD5 8e672f57c9c744233e1250cb3b0f73df kdeadmin-3.2.0_beta2.ebuild 1038
 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.2.0_beta2.ebuild b/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild
index 82fc0c1f1f11..2eb7bc4193bc 100644
--- a/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild
@@ -1,24 +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/kdeadmin/kdeadmin-3.2.0_beta2.ebuild,v 1.1 2003/12/03 23:14:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild,v 1.2 2003/12/24 20:21:45 caleb Exp $
 inherit kde-dist
 
-IUSE="pam foreign-sysvinit"
+IUSE="pam"
 DESCRIPTION="KDE administration tools (user manager, etc.)"
 KEYWORDS="~x86"
 
-newdepend "pam? ( >=sys-libs/pam-0.72 )
-	foreign-package? ( >=app-arch/rpm-4.0.4-r1 dev-libs/popt )"
-
-use pam		&& myconf="$myconf --with-pam"	|| myconf="$myconf --without-pam --with-shadow"
+DEPEND="~kde-base/kdebase-${PV}
+	pam? ( >=sys-libs/pam-0.72 )
+	sys-apps/lm_sensors"
 
 myconf="$myconf --without-rpm"
-DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"
-
-if [ -z "`use foreign-sysvinit`" ]; then
-	DO_NOT_COMPILE="$DO_NOT_COMPILE ksysv"
-fi
-
+DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage ksysv"
 
 # we only want to compile the lilo config module on x86, but there we want to make sure it's
 # always compiled to ensure consistent behaviour of the package across both lilo and grub systems,
@@ -27,10 +21,8 @@ fi
 # so, we make configure build it by removing the configure.in.in file that checks for
 # lilo's presense
 src_unpack() {
-
 	kde_src_unpack
 	use x86 && echo > ${S}/lilo-config/configure.in.in
-
 }
 
 # TODO: add nis support
-- 
cgit v1.2.3-65-gdbad