11 files changed, 7 insertions, 121 deletions
diff --git a/kde-base/kdeadmin/Manifest b/kde-base/kdeadmin/Manifest
index 3c15f725af03..3297cb9605c3 100644
--- a/kde-base/kdeadmin/Manifest
+++ b/kde-base/kdeadmin/Manifest
@@ -1,17 +1,9 @@
 MD5 d727d206ddd8b2778cf4d2f437f6858d kdeadmin-3.1.4.ebuild 1386
-MD5 d7c75a6f37872dabdf0773415de93c16 kdeadmin-3.2.0_rc1.ebuild 1048
-MD5 b2bdd0b01b78395be6bcb5d5af6a4d4b kdeadmin-3.0.5b.ebuild 791
-MD5 4b814e1828f9b286c828e94bec18aca7 kdeadmin-3.2.0_beta1.ebuild 1243
+MD5 f524135b04ca93c3d316e10ccaf98ed7 kdeadmin-3.2.0_rc1.ebuild 1047
+MD5 9a6368ffddfe1dd001c5fa03ab28c0e4 kdeadmin-3.0.5b.ebuild 788
 MD5 9451fa715374ab69819d76ba9057ae92 kdeadmin-3.1.5.ebuild 1388
-MD5 668ff6d204e05485b3f7d71c6040c97e ChangeLog 8109
+MD5 6bfcdbccdd9bab30bbc7423218b79cae ChangeLog 8363
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 97025c29f78ad5392ab528a179326531 kdeadmin-3.0.4.ebuild 528
-MD5 d7c75a6f37872dabdf0773415de93c16 kdeadmin-3.2.0_beta2.ebuild 1048
-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
-MD5 f8da196912e8b6de614b016bae287008 files/digest-kdeadmin-3.0.4 68
-MD5 9d9790e505ef8279e0aa0b2ab12e7330 files/digest-kdeadmin-3.1.2 68
 MD5 8227cd79fb23631f6457559bb65559a6 files/digest-kdeadmin-3.1.4 68
 MD5 89f969232ae263ab1480a42928ebf694 files/digest-kdeadmin-3.1.5 68
 MD5 e741759e72657c73057f606db0adc641 files/kdeadmin-qt311-gentoo.diff 608
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.0.4 b/kde-base/kdeadmin/files/digest-kdeadmin-3.0.4
deleted file mode 100644
index bc66b675c29a..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e93fd31067deab4e08460e84174dd19 kdeadmin-3.0.4.tar.bz2 1267550
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.1.2 b/kde-base/kdeadmin/files/digest-kdeadmin-3.1.2
deleted file mode 100644
index 64969fc356cb..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94c2981cd54bd02549664852fb82dd05 kdeadmin-3.1.2.tar.bz2 1557029
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0_beta1 b/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0_beta1
deleted file mode 100644
index 500582365877..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 242a5a37724ec89ef754733edc958475 kdeadmin-3.1.93.tar.bz2 1574263
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0_beta2 b/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0_beta2
deleted file mode 100644
index 6b82d9808337..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c81b49f264d619fdfc25554bb0a4e305 kdeadmin-3.1.94.tar.bz2 1563352
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0_rc1 b/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0_rc1
new file mode 100644
index 000000000000..3b84d31aedc5
--- /dev/null
+++ b/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0_rc1
@@ -0,0 +1 @@
+MD5 44165c72284cd7380f7d5fc8978697df kdeadmin-3.1.95.tar.bz2 1604464
diff --git a/kde-base/kdeadmin/kdeadmin-3.0.4.ebuild b/kde-base/kdeadmin/kdeadmin-3.0.4.ebuild
deleted file mode 100644
index c6b3f86f45db..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.0.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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.0.4.ebuild,v 1.5 2003/02/13 12:25:45 vapier Exp $
-inherit kde-dist
-
-IUSE="pam"
-DESCRIPTION="KDE $PV - administration tools"
-KEYWORDS="x86 ppc alpha"
-
-newdepend ">=app-arch/rpm-4.0.4-r1
-	dev-libs/popt
-	pam? ( >=sys-libs/pam-0.72 )"
-
-use pam		&& myconf="$myconf --with-pam"	|| myconf="$myconf --without-pam --with-shadow"
-myconf="$myconf --with-rpm"
diff --git a/kde-base/kdeadmin/kdeadmin-3.0.5b.ebuild b/kde-base/kdeadmin/kdeadmin-3.0.5b.ebuild
index f74c96ac37eb..46a04df7cbf1 100644
--- a/kde-base/kdeadmin/kdeadmin-3.0.5b.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.0.5b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.0.5b.ebuild,v 1.3 2003/07/16 16:28:32 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.0.5b.ebuild,v 1.4 2004/01/19 03:36:53 caleb Exp $
 inherit kde-dist
 
 IUSE="pam"
diff --git a/kde-base/kdeadmin/kdeadmin-3.1.2.ebuild b/kde-base/kdeadmin/kdeadmin-3.1.2.ebuild
deleted file mode 100644
index 62d05a336193..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.2.ebuild,v 1.8 2003/09/11 01:16:25 msterret Exp $
-inherit kde-dist
-
-IUSE="pam foreign-package foreign-sysvinit"
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-KEYWORDS="x86 ppc sparc alpha hppa"
-
-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"
-
-if [ -n "`use foreign-package`" ]; then
-	myconf="$myconf --with-rpmlib"
-else
-	myconf="$myconf --without-rpm"
-	KDE_REMOVE_DIR="$KDE_REMOVE_DIR kpackage"
-fi
-
-if [ -z "`use foreign-sysvinit`" ]; then
-	KDE_REMOVE_DIR="$KDE_REMOVE_DIR ksysv"
-fi
-
-need-automake 1.7
-need-autoconf 2.5
-
-# 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,
-# because configure when left to its own devices will build lilo-config or not basd on whether
-# lilo is present in the path.
-# 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
-
-}
-
-src_compile() {
-	AMVERSION= "`automake --version | head -n 1 | cut -d " " -f4`"
-	if ["$AMVERSION" != "1.7.2" ]; then
-		rm -f configure configure.in
-	fi
-
-	kde_src_compile configure
-	kde_src_compile make
-}
-
-# TODO: add nis support
diff --git a/kde-base/kdeadmin/kdeadmin-3.2.0_beta1.ebuild b/kde-base/kdeadmin/kdeadmin-3.2.0_beta1.ebuild
deleted file mode 100644
index a4e3fef98d0f..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.2.0_beta1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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_beta1.ebuild,v 1.1 2003/11/02 15:04:24 caleb Exp $
-inherit kde-dist
-
-IUSE="pam foreign-sysvinit"
-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"
-
-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
-
-
-# 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,
-# because configure when left to its own devices will build lilo-config or not basd on whether
-# lilo is present in the path.
-# 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
diff --git a/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild b/kde-base/kdeadmin/kdeadmin-3.2.0_rc1.ebuild
index 38fc63183fe5..ee8705af63a7 100644
--- a/kde-base/kdeadmin/kdeadmin-3.2.0_beta2.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.2.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.8 2004/01/17 11:20:57 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.2.0_rc1.ebuild,v 1.1 2004/01/19 03:36:53 caleb Exp $
 inherit kde-dist
 
 IUSE="pam"