New version, removing old versions

18 files changed, 18 insertions, 359 deletions

diff --git a/kde-base/kdeaccessibility/ChangeLog b/kde-base/kdeaccessibility/ChangeLog
index ef6783df7637..4eed50d7cc0d 100644
--- a/kde-base/kdeaccessibility/ChangeLog
+++ b/kde-base/kdeaccessibility/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeaccessibility
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.4 2004/01/04 15:27:42 weeve Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.5 2004/01/19 03:31:14 caleb Exp $
+
+*kdeaccessibility-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org>
+  kdeaccessibility-3.2.0_beta1.ebuild, kdeaccessibility-3.2.0_beta2.ebuild,
+  kdeaccessibility-3.2.0_rc1.ebuild:
+  New version, removing old versions
 
   04 Jan 2004; Jason Wever <weeve@gentoo.org>
   kdeaccessibility-3.2.0_beta2.ebuild:
diff --git a/kde-base/kdeaccessibility/Manifest b/kde-base/kdeaccessibility/Manifest
index f9b99e422040..f3e4d59a604b 100644
--- a/kde-base/kdeaccessibility/Manifest
+++ b/kde-base/kdeaccessibility/Manifest
@@ -1,6 +1,8 @@
 MD5 9b943490f64c852538665cec7a46735d kdeaccessibility-3.2.0_beta2.ebuild 346
 MD5 8146df03825ceced5ca2bb6b1cb41427 kdeaccessibility-3.2.0_beta1.ebuild 333
+MD5 9b943490f64c852538665cec7a46735d kdeaccessibility-3.2.0_rc1.ebuild 346
 MD5 3be0af6d5868c8d16022e2f2fb756d22 ChangeLog 807
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 970a900c45df2d2eca7eec5a9f2444b7 files/digest-kdeaccessibility-3.2.0_rc1 77
 MD5 4909eb29a0d8291c34de1d3e9808c1b5 files/digest-kdeaccessibility-3.2.0_beta1 77
 MD5 4e384b061a2f1df2c022ea5fca3ea862 files/digest-kdeaccessibility-3.2.0_beta2 77
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 260940f9cd10..b2002b156ba1 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,30 +1,17 @@
 MD5 e001e74325bfe345c33b484127cc9455 kdemultimedia-3.1.4-r1.ebuild 2903
 MD5 ba5ec72b2dffe46d4882b82d26c9e545 kdemultimedia-3.1.5.ebuild 2652
-MD5 d5c217233c94c5ca8ab5ab457b8cc05e kdemultimedia-3.0.4.ebuild 2516
-MD5 b32f475ff06f9c2682544f1b0c6cb808 kdemultimedia-3.2.0_beta2.ebuild 2116
-MD5 0226309c051b10cd5f73010fd9b734c3 kdemultimedia-3.1.2.ebuild 2701
-MD5 3d255d9be005918d42e3ff1bebade4e2 kdemultimedia-3.1.2-r1.ebuild 2742
-MD5 b32f475ff06f9c2682544f1b0c6cb808 kdemultimedia-3.2.0_rc1.ebuild 2116
-MD5 6d0c8d1c120e3539556fc705ef230401 kdemultimedia-3.2.0_beta1.ebuild 2058
-MD5 ae481a54afd8209bb8d8aaf6c4f1956d ChangeLog 11716
+MD5 fb61b76c94643a0f78ebe1c1e640bb05 kdemultimedia-3.2.0_rc1.ebuild 2113
+MD5 058d0fff95fbbe6a08792739d833162f ChangeLog 12173
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 5ba5ef8edef46a60644ba401b24c9332 kdemultimedia-3.0.5b.ebuild 2524
-MD5 c40a9c32c318c81150a0d45d13501e75 files/digest-kdemultimedia-3.1.2-r1 73
+MD5 6c4174f9b6cdd177f786361168b08e2b kdemultimedia-3.0.5b.ebuild 2521
 MD5 7b2708e69eb657af7e7487bdb7ee7d4f files/digest-kdemultimedia-3.1.4-r1 73
 MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.4-ln-sf.diff 1278
-MD5 3ed07cc2984de1634087d9aceba7e3ec files/digest-kdemultimedia-3.2.0_beta1 74
-MD5 206f5622e824576d22d65844124169b2 files/digest-kdemultimedia-3.2.0_beta2 74
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.4-gentoo-timidity.diff 694
 MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.5-alpha.diff 300
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.4-gentoo-timidity.diff 694
 MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278
 MD5 6233d975ef73d65ac2d07bccd06e7719 files/digest-kdemultimedia-3.2.0_rc1 74
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.2-gentoo-timidity.diff 694
 MD5 d37340290c8c5fd5d8dc6345ec9dee75 files/digest-kdemultimedia-3.0.5b 74
 MD5 55cd599c61d48ca121ef4c96a905b6d1 files/kdemultimedia-3.1.5-gentoo-timidity.diff 590
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.5b-gentoo-timidity.diff 694
-MD5 bd16249f1d390fb635238b000fc0e1ef files/digest-kdemultimedia-3.0.4 73
-MD5 c40a9c32c318c81150a0d45d13501e75 files/digest-kdemultimedia-3.1.2 73
 MD5 239528cb3f6dd1fcc4e2bc4fd2ba9ba8 files/digest-kdemultimedia-3.1.5 73
-MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.2-ln-sf.diff 1278
 MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.4-alpha.diff 300
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.4 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.4
deleted file mode 100644
index a55f7bf3316c..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebb28282a85bd3e06a4d9cd9c7df6537 kdemultimedia-3.0.4.tar.bz2 5791734
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.2
deleted file mode 100644
index 1ef80cf7cf2c..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63ffa8b3c6b3151acdaaa22afd7e55ea kdemultimedia-3.1.2.tar.bz2 5927084
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.2-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.2-r1
deleted file mode 100644
index 1ef80cf7cf2c..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63ffa8b3c6b3151acdaaa22afd7e55ea kdemultimedia-3.1.2.tar.bz2 5927084
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0_beta1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0_beta1
deleted file mode 100644
index 4da9f0ba85e2..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 217ec4245b80c399dbfe639f60225209 kdemultimedia-3.1.93.tar.bz2 4762177
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0_beta2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0_beta2
deleted file mode 100644
index 7e491de88687..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49c1498924a9151d23a7a87e56703429 kdemultimedia-3.1.94.tar.bz2 4737137
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0_rc1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0_rc1
new file mode 100644
index 000000000000..93ec680771d6
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0_rc1
@@ -0,0 +1 @@
+MD5 aacca6ca02326a4f2a8846fd170e017a kdemultimedia-3.1.95.tar.bz2 4919399
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.0.4-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.0.4-gentoo-timidity.diff
deleted file mode 100644
index f392a244212e..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.0.4-gentoo-timidity.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c
---- kmidi/TIMIDITY/motif_p.c	Mon Feb 28 19:07:37 2000
-+++ kmidi/TIMIDITY/motif_p.c	Fri Oct 19 04:00:10 2001
-@@ -22,6 +22,7 @@
-     pipe communication between motif interface and sound generator
-
-     */
-+#include <sys/errno.h>
- #ifdef IA_MOTIF
-
- #include <stdio.h>
---- kmidi/TIMIDITY/tk_c.c       2002-04-04 21:15:35.000000000 -0600
-+++ kmidi/TIMIDITY/tk_c.c       2002-04-04 21:17:06.000000000 -0600
-@@ -12,6 +12,7 @@
-  *================================================================*/
- #ifdef TCLTK
-
-+#include <sys/errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.2-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.2-gentoo-timidity.diff
deleted file mode 100644
index f392a244212e..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1.2-gentoo-timidity.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c
---- kmidi/TIMIDITY/motif_p.c	Mon Feb 28 19:07:37 2000
-+++ kmidi/TIMIDITY/motif_p.c	Fri Oct 19 04:00:10 2001
-@@ -22,6 +22,7 @@
-     pipe communication between motif interface and sound generator
-
-     */
-+#include <sys/errno.h>
- #ifdef IA_MOTIF
-
- #include <stdio.h>
---- kmidi/TIMIDITY/tk_c.c       2002-04-04 21:15:35.000000000 -0600
-+++ kmidi/TIMIDITY/tk_c.c       2002-04-04 21:17:06.000000000 -0600
-@@ -12,6 +12,7 @@
-  *================================================================*/
- #ifdef TCLTK
-
-+#include <sys/errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.2-ln-sf.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.2-ln-sf.diff
deleted file mode 100644
index ee6daa91f3dc..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1.2-ln-sf.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- kmidi/TIMIDITY/makelinks	Sat Aug 24 11:36:27 2002
-+++ kmidi/TIMIDITY/makelinks	Sat Aug 24 11:36:15 2002
-@@ -3,7 +3,7 @@ srcdir=$1
- for header in common config controls ctl effects filter instrum mix \
-               output playmidi readmidi resample sbk sflayer tables \
-               version ; do
--    if [ ! -h ${header}.h ]; then ln -s ${srcdir}/${header}.h . ; fi
-+    if [ ! -h ${header}.h ]; then ln -sf ${srcdir}/${header}.h . ; fi
- done
- 
- for cfile in alsa_a arts_a b_out bag bsd20_a celeste_e chorus_e \
-@@ -13,14 +13,14 @@ for cfile in alsa_a arts_a b_out bag bsd
- 	     playmidi raw_a readmidi readsbk resample resample_f \
- 	     resample_l reverb_e sbktext sf2cfg slang_c sndfont \
- 	     sun_a tables timidity wav2pat wave_a ; do
--    if [ ! -h ${cfile}.c ]; then ln -s ${srcdir}/${cfile}.cpp ${cfile}.c ; fi
-+    if [ ! -h ${cfile}.c ]; then ln -sf ${srcdir}/${cfile}.cpp ${cfile}.c ; fi
- done
- 
- for lfile in cfg ; do
--    if [ ! -h ${lfile}.l ]; then ln -s ${srcdir}/${lfile}.l . ; fi
-+    if [ ! -h ${lfile}.l ]; then ln -sf ${srcdir}/${lfile}.l . ; fi
- done
- 
- # LEAVE THIS ONE AT THE END!!
- for other in BITMAPS ; do
--    if [ ! -h ${other} ]; then ln -s ${srcdir}/${other} . ; fi
-+    if [ ! -h ${other} ]; then ln -sf ${srcdir}/${other} . ; fi
- done
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.0.4.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.0.4.ebuild
deleted file mode 100644
index 62d53ed9c8b5..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.0.4.ebuild
+++ /dev/null
@@ -1,69 +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/kdemultimedia/kdemultimedia-3.0.4.ebuild,v 1.9 2003/09/11 01:16:25 msterret Exp $
-inherit kde-dist flag-o-matic eutils
-
-IUSE="nas esd motif gtk slang tcltk"
-DESCRIPTION="KDE $PV - multimedia apps"
-KEYWORDS="x86 ppc alpha"
-
-newdepend ">=sys-libs/ncurses-5.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/libvorbis-1.0_beta4
-	>=media-video/xanim-2.80.1
-	nas? ( >=media-libs/nas-1.4.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	slang? ( >=sys-libs/slang-1.4.4 )
-	>=media-sound/mpg123-0.59r
-	tcltk? ( >=dev-lang/tk-8.0.5-r2 )"
-#	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
-
-# koncd isn't compiled by default (kde.org's default)
-#RDEPEND="$RDEPEND
-#	cdr? ( app-cdr/cdrtools
-#	>=app-cdr/cdrdao-1.1.5 )"
-
-replace-flags "-O3" "-O2"
-filter-flags "-fforce-addr -fomit-frame-pointer"
-
-myaudio="--enable-audio=oss"
-myinterface="--enable-interface=xaw,ncurses"
-myconf="$myconf --enable-xaw --enable-ncurses"
-
-#use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" && myaudio="$myaudio,alsa" ||
-myconf="$myconf --without-alsa --disable-alsa"
-use nas		&& myaudio="$myaudio,nas --with-nas-library=/usr/X11R6/lib/libaudio.so --with-nas-includes=/usr/X11R6/include" || myconf="$myconf --disable-nas"
-use esd		&& myaudio="$myaudio,esd"					|| myconf="$myconf --disable-esd"
-use motif	&& myinterface="$myinterface,motif" && myconf="$myconf --enable-motif"
-use gtk		&& myinterface="$myinterface,gtk"   && myconf="$myconf --enable-gtk"
-use slang	&& myinterface="$myinterface,slang" && myconf="$myconf --enable-slang"
-use tcltk	&& myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk"
-
-myconf="$myconf $myaudio $myinterface"
-
-#use cdr		|| KDE_REMOVE_DIR="koncd"
-
-src_unpack() {
-	kde_src_unpack
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo-timidity.diff
-	#use alsa && patch -p0 < ${FILESDIR}/${P}-gentoo-alsa.diff
-
-	kde_sandbox_patch ${S}/kmidi/config
-
-	cd ${S}/kmidi/config
-	for x in Makefile.am Makefile.in; do
-		mv $x $x.orig
-		sed -e 's:TIMID_DIR = $(DESTDIR)/$(kde_datadir):TIMID_DIR = $(kde_datadir):g' $x.orig > $x
-	done
-}
-
-pkg_postinst() {
-	if [ -n "`use alsa`" ]; then
-	einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources.
-For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org.
-Meanwhile, you can use the alsa oss emulation."
-	fi
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.0.5b.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.0.5b.ebuild
index c64de6f532c8..74a90d3d139d 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.0.5b.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-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/kdemultimedia/kdemultimedia-3.0.5b.ebuild,v 1.3 2003/07/16 16:45:25 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.0.5b.ebuild,v 1.4 2004/01/19 03:29:52 caleb Exp $
 inherit kde-dist flag-o-matic eutils
 
 IUSE="nas esd motif gtk slang tcltk"
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1.2-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.2-r1.ebuild
deleted file mode 100644
index 16faa5cba9dc..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,69 +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/kdemultimedia/kdemultimedia-3.1.2-r1.ebuild,v 1.9 2004/01/11 13:48:19 lanius Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="nas esd motif slang tcltk oggvorbis cdr"
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-KEYWORDS="x86 ppc hppa ~sparc"
-
-newdepend ">=sys-libs/ncurses-5.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/libvorbis-1.0_beta4
-	!hppa? ( >=media-video/xanim-2.80.1 )
-	nas? ( >=media-libs/nas-1.4.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	motif? ( x11-libs/openmotif )
-	slang? ( >=sys-libs/slang-1.4.4 )
-	>=media-sound/mpg123-0.59r
-	tcltk? ( >=dev-lang/tk-8.0.5-r2 )
-	>=dev-libs/glib-1.3.3
-	oggvorbis? ( media-libs/libvorbis )
-	>=media-libs/xine-lib-1_beta10
-	#gtk? ( =x11-libs/gtk+-1.2* )"
-#	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
-
-RDEPEND="$RDEPEND
-	cdr? ( app-cdr/cdrtools
-	>=app-cdr/cdrdao-1.1.5 )"
-
-replace-flags "-O3" "-O2"
-
-myaudio="--enable-audio=oss"
-myinterface="--enable-interface=xaw,ncurses"
-myconf="$myconf --enable-xaw --enable-ncurses"
-myconf="$myconf --with-xine-prefix=/usr"
-
-# make -j2 fails, at least on ppc
-export MAKEOPTS="$MAKEOPTS -j1"
-
-PATCHES="$FILESDIR/$P-gentoo-timidity.diff
-	$FILESDIR/$P-ln-sf.diff"
-
-# alsa 0.9 not supported
-#use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" && myaudio="$myaudio,alsa" || myconf="$myconf --without-alsa --disable-alsa"
-use nas		&& myaudio="$myaudio,nas --with-nas-library=/usr/X11R6/lib/libaudio.so --with-nas-includes=/usr/X11R6/include" || myconf="$myconf --disable-nas"
-use esd		&& myaudio="$myaudio,esd"			|| myconf="$myconf --disable-esd"
-use motif	&& myinterface="$myinterface,motif" && myconf="$myconf --enable-motif"
-# kmidi/TIMIDITY miscompiles with gtk
-#use gtk		&& myinterface="$myinterface,gtk"   && myconf="$myconf --enable-gtk"
-use slang	&& myinterface="$myinterface,slang" && myconf="$myconf --enable-slang"
-use tcltk	&& myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk"
-use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
-
-use cdr		|| KDE_REMOVE_DIR="kaudiocreator"
-
-# turn off kaudiocreator if cdr isn't in use
-[ -z "`use cdr`" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator"
-
-[ "${ARCH}" = "hppa" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator kscd mpeglib mpeglib_artsplug kioslave"
-
-myconf="$myconf $myaudio $myinterface"
-
-pkg_postinst() {
-	if [ -n "`use alsa`" ]; then
-	einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources.
-For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org.
-Meanwhile, you can use the alsa oss emulation."
-	fi
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.2.ebuild
deleted file mode 100644
index 9687cb27fbba..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.1.2.ebuild
+++ /dev/null
@@ -1,69 +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/kdemultimedia/kdemultimedia-3.1.2.ebuild,v 1.6 2004/01/11 13:48:19 lanius Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="nas esd motif slang tcltk oggvorbis cdr"
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-KEYWORDS="x86 ppc sparc alpha"
-
-newdepend ">=sys-libs/ncurses-5.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/libvorbis-1.0_beta4
-	>=media-video/xanim-2.80.1
-	nas? ( >=media-libs/nas-1.4.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	motif? ( x11-libs/openmotif )
-	slang? ( >=sys-libs/slang-1.4.4 )
-	>=media-sound/mpg123-0.59r
-	tcltk? ( >=dev-lang/tk-8.0.5-r2 )
-	>=dev-libs/glib-1.3.3
-	oggvorbis? ( media-libs/libvorbis )"
-	#>=media-libs/xine-lib-0.9.14" # not yet available
-	#gtk? ( =x11-libs/gtk+-1.2* )
-#	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
-
-RDEPEND="$RDEPEND
-	cdr? ( app-cdr/cdrtools
-	>=app-cdr/cdrdao-1.1.5 )"
-
-replace-flags "-O3" "-O2"
-
-myaudio="--enable-audio=oss"
-myinterface="--enable-interface=xaw,ncurses"
-myconf="$myconf --enable-xaw --enable-ncurses"
-#myconf="$myconf --with-xine-prefix=/usr"
-
-# make -j2 fails, at least on ppc
-export MAKEOPTS="$MAKEOPTS -j1"
-
-PATCHES="$FILESDIR/$P-gentoo-timidity.diff
-	$FILESDIR/$P-ln-sf.diff"
-
-# alsa 0.9 not supported
-#use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" && myaudio="$myaudio,alsa" || myconf="$myconf --without-alsa --disable-alsa"
-use nas		&& myaudio="$myaudio,nas --with-nas-library=/usr/X11R6/lib/libaudio.so --with-nas-includes=/usr/X11R6/include" || myconf="$myconf --disable-nas"
-use esd		&& myaudio="$myaudio,esd"			|| myconf="$myconf --disable-esd"
-use motif	&& myinterface="$myinterface,motif" && myconf="$myconf --enable-motif"
-# kmidi/TIMIDITY miscompiles with gtk
-#use gtk		&& myinterface="$myinterface,gtk"   && myconf="$myconf --enable-gtk"
-use slang	&& myinterface="$myinterface,slang" && myconf="$myconf --enable-slang"
-use tcltk	&& myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk"
-use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
-
-use cdr		|| KDE_REMOVE_DIR="kaudiocreator"
-
-# xine doesn't compile yet
-# also turn off kaudiocreator if cdr isn't in use
-KDE_REMOVE_DIR="xine_artsplugin"
-[ -z "`use cdr`" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator"
-
-myconf="$myconf $myaudio $myinterface"
-
-pkg_postinst() {
-	if [ -n "`use alsa`" ]; then
-	einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources.
-For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org.
-Meanwhile, you can use the alsa oss emulation."
-	fi
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.0_beta1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.0_beta1.ebuild
deleted file mode 100644
index d4fb00813763..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.2.0_beta1.ebuild
+++ /dev/null
@@ -1,55 +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/kdemultimedia/kdemultimedia-3.2.0_beta1.ebuild,v 1.10 2004/01/11 13:48:19 lanius Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="nas esd motif slang tcltk oggvorbis gtk alsa gstreamer"
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-KEYWORDS="~x86"
-
-newdepend "sys-libs/ncurses
-	media-sound/cdparanoia
-	media-video/xanim
-	media-sound/mpg123
-	oggvorbis? ( media-libs/libvorbis )
-	nas? ( media-libs/nas )
-	esd? ( media-sound/esound )
-	motif? ( x11-libs/openmotif )
-	slang? ( sys-libs/slang )
-	tcltk? ( dev-lang/tk dev-lang/tcl )
-	>=dev-libs/glib-2.2.1
-	>=media-libs/xine-lib-1_beta12
-	gtk? ( =x11-libs/gtk+-1.2* )
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( media-libs/gstreamer )
-	media-libs/id3lib media-libs/musicbrainz
-	!media-sound/juk"
-
-replace-flags "-O3" "-O2"
-
-myaudio="--enable-audio=oss"
-myinterface="--enable-interface=xaw,ncurses"
-myconf="$myconf --enable-xaw --enable-ncurses"
-myconf="$myconf --with-xine-prefix=/usr"
-
-# make -j2 fails, at least on ppc
-use ppc && export MAKEOPTS="$MAKEOPTS -j1"
-
-# alsa 0.9 not supported
-use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" && myaudio="$myaudio,alsa" || myconf="$myconf --without-alsa --disable-alsa"
-use nas		&& myaudio="$myaudio,nas --with-nas-library=/usr/X11R6/lib/libaudio.so --with-nas-includes=/usr/X11R6/include" || myconf="$myconf --disable-nas"
-use esd		&& myaudio="$myaudio,esd"			|| myconf="$myconf --disable-esd"
-use motif	&& myinterface="$myinterface,motif" && myconf="$myconf --enable-motif"
-use slang	&& myinterface="$myinterface,slang" && myconf="$myconf --enable-slang"
-use tcltk	&& myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk"
-use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
-
-myconf="$myconf $myaudio $myinterface --with-cdda --disable-strict --disable-warnings"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	kde_src_compile
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.0_beta2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.0_rc1.ebuild
index 1044ac3a1fc3..957f188658e0 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.2.0_beta2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-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/kdemultimedia/kdemultimedia-3.2.0_beta2.ebuild,v 1.10 2004/01/18 14:59:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.2.0_rc1.ebuild,v 1.1 2004/01/19 03:29:52 caleb Exp $
 inherit kde-dist flag-o-matic
 
 IUSE="nas encode esd motif slang tcltk oggvorbis gtk alsa gstreamer"