New version, removing old versions

27 files changed, 33 insertions, 332 deletions

diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 656e94f03f18..76ac54d013b4 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.65 2004/01/16 19:22:21 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.66 2004/01/19 03:34:31 caleb Exp $
+
+*kdeaddons-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.0.4.ebuild,
+  kdeaddons-3.1.2.ebuild, kdeaddons-3.2.0_beta1.ebuild,
+  kdeaddons-3.2.0_beta2.ebuild, kdeaddons-3.2.0_rc1.ebuild,
+  files/kdeaddons-3.1.1-enable-crashes.diff,
+  files/kdeaddons-3.1.2-enable-crashes.diff,
+  files/kdeaddons-3.1.3-enable-crashes.diff,
+  files/kdeaddons-3.2.0_beta2-kvim.diff, files/kdeaddons-3.2.0_rc1-kvim.diff:
+  New version, removing old versions
 
   16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdeaddons-3.1.5.ebuild:
   Marked stable on hppa.
diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index 614561c06af5..2a36029c0fed 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -1,24 +1,13 @@
-MD5 653e188e1b70d890da70aff024f57fb9 kdeaddons-3.0.4.ebuild 816
-MD5 c5f3d628a183a617579cda4bad88d6e5 kdeaddons-3.1.2.ebuild 1382
-MD5 139064b9ef2931f40df4c8c9baf2d0ed kdeaddons-3.2.0_beta1.ebuild 745
-MD5 9b69ce998e7e62c2337e3d5f01f8d991 kdeaddons-3.2.0_rc1.ebuild 981
+MD5 31f75dd92afd44cc3ea0619d84e77f1d kdeaddons-3.2.0_rc1.ebuild 978
 MD5 7f88d478a715c2c4ea106c0fe4b3be7f kdeaddons-3.1.4.ebuild 1419
 MD5 864417cda5cc151dfe86862ba774c1fa kdeaddons-3.0.5b.ebuild 825
-MD5 9b69ce998e7e62c2337e3d5f01f8d991 kdeaddons-3.2.0_beta2.ebuild 981
-MD5 ef1107de8cf3788ae4338cb3f3f2ee26 ChangeLog 8856
+MD5 592e75739080d45531f598b0bf3f7d3a ChangeLog 9329
 MD5 456ad7728e457dff8e9dbd9047c8dc5b kdeaddons-3.1.5.ebuild 1420
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 cda2046841796de1f20527d6dbe0afcc files/digest-kdeaddons-3.2.0_rc1 70
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.5-enable-crashes.diff 1415
-MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.3-enable-crashes.diff 1415
-MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.1-enable-crashes.diff 1415
-MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0_beta2-kvim.diff 363
+MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0_rc1-kvim.diff 363
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.4-enable-crashes.diff 1415
-MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.2-enable-crashes.diff 1415
 MD5 c6085bb9e78b909f1e887b6a60e86979 files/digest-kdeaddons-3.0.5b 69
-MD5 daf284d1e03ab78bef056c0b4c2a9285 files/digest-kdeaddons-3.0.4 68
-MD5 df951d350da34a4f43c9ef55e2a1ff5c files/digest-kdeaddons-3.1.2 69
 MD5 8d1ae5ff34c78f700fc0ac98ded081b7 files/digest-kdeaddons-3.1.4 69
 MD5 2ee3ac63e93c7273ade0f6392ebea71a files/digest-kdeaddons-3.1.5 69
-MD5 33a482bd32a1f2fd8c9612c624858c5a files/digest-kdeaddons-3.2.0_beta1 70
-MD5 e3148ad5c949cb8d544e0587f8fa1b4e files/digest-kdeaddons-3.2.0_beta2 70
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.0.4 b/kde-base/kdeaddons/files/digest-kdeaddons-3.0.4
deleted file mode 100644
index 055f3928cfc1..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ced17e59e7fd36e606623e226c47718 kdeaddons-3.0.4.tar.bz2 938774
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.2 b/kde-base/kdeaddons/files/digest-kdeaddons-3.1.2
deleted file mode 100644
index 475443b581ba..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a16c3df67c7096cc25e5d2acb557912 kdeaddons-3.1.2.tar.bz2 1079412
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_beta1 b/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_beta1
deleted file mode 100644
index f5b3695b6bec..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3924f5b13ad0817ee11a91bfe236f45 kdeaddons-3.1.93.tar.bz2 1322267
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_beta2 b/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_beta2
deleted file mode 100644
index 3e50b0730bc4..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f7e110f1d668a42333922ab1e6cbe96 kdeaddons-3.1.94.tar.bz2 1307240
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_rc1 b/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_rc1
new file mode 100644
index 000000000000..5ae457a2ba7b
--- /dev/null
+++ b/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0_rc1
@@ -0,0 +1 @@
+MD5 06625c7ff01537504bdbf53ab5997631 kdeaddons-3.1.95.tar.bz2 1362993
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.1.1-enable-crashes.diff b/kde-base/kdeaddons/files/kdeaddons-3.1.1-enable-crashes.diff
deleted file mode 100644
index 704eda533e80..000000000000
--- a/kde-base/kdeaddons/files/kdeaddons-3.1.1-enable-crashes.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-===================================================================
-RCS file: /home2/webcvs/mirror/kdeaddons/konq-plugins/Makefile.am,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -p -r1.12 -r1.13
---- konq-plugins/Makefile.am	2002/06/24 22:34:10	1.12
-+++ konq-plugins/Makefile.am	2002/11/28 14:08:20	1.13
-@@ -1,2 +1,2 @@
--SUBDIRS = khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
-+SUBDIRS = crashes khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
-           babelfish validators domtreeviewer webarchiver sidebar kuick smbmounter
-===================================================================
-RCS file: /home2/webcvs/mirror/kdeaddons/konq-plugins/crashes/crashesplugin.cpp,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -p -r1.8 -r1.9
---- konq-plugins/crashes/crashesplugin.cpp	2002/09/18 09:37:52	1.8
-+++ konq-plugins/crashes/crashesplugin.cpp	2002/11/28 14:08:20	1.9
-@@ -135,12 +135,12 @@ void CrashesPlugin::slotAboutToShow()
- 
- void CrashesPlugin::newBookmarkCallback( const QString & text, const QCString & url, const QString & additionnalInfo )
- {
--  m_crashesList << qMakePair(text,url);
-+  m_crashesList.prepend(qMakePair(text,url));
- }
- 
- void CrashesPlugin::endFolderCallback( )
- {
--  m_crashesList << qMakePair(QString("-"),QCString("-"));
-+  m_crashesList.prepend(qMakePair(QString("-"),QCString("-")));
- }
- 
- void CrashesPlugin::slotClearCrashes() {
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.1.2-enable-crashes.diff b/kde-base/kdeaddons/files/kdeaddons-3.1.2-enable-crashes.diff
deleted file mode 100644
index 704eda533e80..000000000000
--- a/kde-base/kdeaddons/files/kdeaddons-3.1.2-enable-crashes.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-===================================================================
-RCS file: /home2/webcvs/mirror/kdeaddons/konq-plugins/Makefile.am,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -p -r1.12 -r1.13
---- konq-plugins/Makefile.am	2002/06/24 22:34:10	1.12
-+++ konq-plugins/Makefile.am	2002/11/28 14:08:20	1.13
-@@ -1,2 +1,2 @@
--SUBDIRS = khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
-+SUBDIRS = crashes khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
-           babelfish validators domtreeviewer webarchiver sidebar kuick smbmounter
-===================================================================
-RCS file: /home2/webcvs/mirror/kdeaddons/konq-plugins/crashes/crashesplugin.cpp,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -p -r1.8 -r1.9
---- konq-plugins/crashes/crashesplugin.cpp	2002/09/18 09:37:52	1.8
-+++ konq-plugins/crashes/crashesplugin.cpp	2002/11/28 14:08:20	1.9
-@@ -135,12 +135,12 @@ void CrashesPlugin::slotAboutToShow()
- 
- void CrashesPlugin::newBookmarkCallback( const QString & text, const QCString & url, const QString & additionnalInfo )
- {
--  m_crashesList << qMakePair(text,url);
-+  m_crashesList.prepend(qMakePair(text,url));
- }
- 
- void CrashesPlugin::endFolderCallback( )
- {
--  m_crashesList << qMakePair(QString("-"),QCString("-"));
-+  m_crashesList.prepend(qMakePair(QString("-"),QCString("-")));
- }
- 
- void CrashesPlugin::slotClearCrashes() {
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.1.3-enable-crashes.diff b/kde-base/kdeaddons/files/kdeaddons-3.1.3-enable-crashes.diff
deleted file mode 100644
index 704eda533e80..000000000000
--- a/kde-base/kdeaddons/files/kdeaddons-3.1.3-enable-crashes.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-===================================================================
-RCS file: /home2/webcvs/mirror/kdeaddons/konq-plugins/Makefile.am,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -p -r1.12 -r1.13
---- konq-plugins/Makefile.am	2002/06/24 22:34:10	1.12
-+++ konq-plugins/Makefile.am	2002/11/28 14:08:20	1.13
-@@ -1,2 +1,2 @@
--SUBDIRS = khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
-+SUBDIRS = crashes khtmlsettingsplugin kimgalleryplugin dirfilter uachanger \
-           babelfish validators domtreeviewer webarchiver sidebar kuick smbmounter
-===================================================================
-RCS file: /home2/webcvs/mirror/kdeaddons/konq-plugins/crashes/crashesplugin.cpp,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -p -r1.8 -r1.9
---- konq-plugins/crashes/crashesplugin.cpp	2002/09/18 09:37:52	1.8
-+++ konq-plugins/crashes/crashesplugin.cpp	2002/11/28 14:08:20	1.9
-@@ -135,12 +135,12 @@ void CrashesPlugin::slotAboutToShow()
- 
- void CrashesPlugin::newBookmarkCallback( const QString & text, const QCString & url, const QString & additionnalInfo )
- {
--  m_crashesList << qMakePair(text,url);
-+  m_crashesList.prepend(qMakePair(text,url));
- }
- 
- void CrashesPlugin::endFolderCallback( )
- {
--  m_crashesList << qMakePair(QString("-"),QCString("-"));
-+  m_crashesList.prepend(qMakePair(QString("-"),QCString("-")));
- }
- 
- void CrashesPlugin::slotClearCrashes() {
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.2.0_beta2-kvim.diff b/kde-base/kdeaddons/files/kdeaddons-3.2.0_rc1-kvim.diff
index 6b1aaa827def..6b1aaa827def 100644
--- a/kde-base/kdeaddons/files/kdeaddons-3.2.0_beta2-kvim.diff
+++ b/kde-base/kdeaddons/files/kdeaddons-3.2.0_rc1-kvim.diff
diff --git a/kde-base/kdeaddons/kdeaddons-3.0.4.ebuild b/kde-base/kdeaddons/kdeaddons-3.0.4.ebuild
deleted file mode 100644
index d95e7c263244..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.0.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.0.4.ebuild,v 1.8 2004/01/05 23:33:58 robbat2 Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="sdl svga"
-DESCRIPTION="KDE $PV: addons - applets, plugins..."
-KEYWORDS="x86 ppc alpha"
-
-newdepend "~kde-base/kdebase-${PV}
-	~kde-base/kdenetwork-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/arts-1.0.4
-	sdl? ( >=media-libs/libsdl-1.2 )
-	svga? ( media-libs/svgalib )"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-# fix bug #7625
-if [ "$COMPILER" == "gcc3" ]; then
-	if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then
-		append-flags -mno-sse2
-	fi
-fi
diff --git a/kde-base/kdeaddons/kdeaddons-3.1.2.ebuild b/kde-base/kdeaddons/kdeaddons-3.1.2.ebuild
deleted file mode 100644
index 6e27a277af42..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 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.2.ebuild,v 1.10 2004/01/05 23:33:58 robbat2 Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="sdl svga xmms"
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-KEYWORDS="x86 ppc sparc alpha hppa"
-
-newdepend "=kde-base/kdebase-${PV}*
-	~kde-base/kdenetwork-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/kdegames-${PV}
-	~kde-base/arts-1.1.2
-	sdl? ( >=media-libs/libsdl-1.2 )
-	svga? ( media-libs/svgalib )
-	xmms? ( media-sound/xmms )"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-use xmms || export ac_cv_have_xmms=no
-
-# fix bug #7625
-if [ "$COMPILER" == "gcc3" ]; then
-	if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then
-		append-flags -mno-sse2
-	fi
-fi
-
-# enable building of konqueror carsh recovery plugin. it was disabled accidentally
-# in the orig kde 3.1 release and was reenabled soon after in cvs head
-PATCHES="$FILESDIR/$P-enable-crashes.diff"
-
-need-automake 1.7
-need-autoconf 2.5
-
-src_compile() {
-	AMVERSION="`automake --version | head -n1 | cut -d " " -f4`"
-	if [ "$AMVERSION" != "1.7.2" ]; then
-		rm -f configure configure.in
-	fi
-
-	kde_src_compile configure
-	kde_src_compile make
-}
-
diff --git a/kde-base/kdeaddons/kdeaddons-3.2.0_beta1.ebuild b/kde-base/kdeaddons/kdeaddons-3.2.0_beta1.ebuild
deleted file mode 100644
index e9b437fb609c..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.2.0_beta1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2004 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_beta1.ebuild,v 1.4 2004/01/05 23:33:58 robbat2 Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="sdl svga xmms"
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-KEYWORDS="~x86"
-
-newdepend "~kde-base/kdebase-${PV}
-	~kde-base/kdenetwork-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/arts-${PV//3./1.}
-	sdl? ( >=media-libs/libsdl-1.2 )
-	svga? ( media-libs/svgalib )
-	xmms? ( media-sound/xmms )"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-use xmms || export ac_cv_have_xmms=no
diff --git a/kde-base/kdeaddons/kdeaddons-3.2.0_beta2.ebuild b/kde-base/kdeaddons/kdeaddons-3.2.0_rc1.ebuild
index 87f96bee55da..9b2acba73fed 100644
--- a/kde-base/kdeaddons/kdeaddons-3.2.0_beta2.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-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/kdeaddons/kdeaddons-3.2.0_beta2.ebuild,v 1.8 2004/01/17 11:14:46 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.2.0_rc1.ebuild,v 1.1 2004/01/19 03:34:31 caleb Exp $
 inherit kde-dist flag-o-matic
 
 IUSE="sdl svga xmms esd"
@@ -22,4 +22,4 @@ use xmms || export ac_cv_have_xmms=no
 # Make vimpart use /usr/bin/kvim -- fixes bug 33257.
 # This should continue to apply to upcoming versions since it's
 # Gentoo-specific and won't go upstream.
-PATCHES="$FILESDIR/${PN}-3.2.0_beta2-kvim.diff"
+PATCHES="$FILESDIR/${PN}-3.2.0_rc1-kvim.diff"
diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index 9d47d51cd659..8d90b5c54118 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeadmin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.61 2004/01/16 19:23:12 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.62 2004/01/19 03:36:53 caleb Exp $
+
+*kdeadmin-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.0.4.ebuild,
+  kdeadmin-3.1.2.ebuild, kdeadmin-3.2.0_beta1.ebuild,
+  kdeadmin-3.2.0_beta2.ebuild, kdeadmin-3.2.0_rc1.ebuild:
+  New version, removing old versions
 
   16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdeadmin-3.1.5.ebuild:
   Marked stable on hppa.
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"