Removing old ebuilds

22 files changed, 25 insertions, 507 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 7b5a529585cd..8f35ce72e576 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.45 2003/06/19 14:32:46 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.46 2003/06/22 19:08:14 caleb Exp $
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1, 3.1-r1
 
   16 Jun 2003; Will Woods <wwoods@gentoo.org> kdemultimedia-3.1.2.ebuild:
   Marked stable for alpha
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index f7f5c9717107..4e33fe83167b 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,28 +1,18 @@
-MD5 9b272cbfcbca8d284f2b39787c14e25f ChangeLog 6631
-MD5 6ef1a62b5177796e9dc01e5037031786 kdemultimedia-2.2.2-r1.ebuild 1475
 MD5 6f1ef1d0aeddc81da816f138ee90e778 kdemultimedia-3.0.4.ebuild 2517
-MD5 9dd75bdbc32e1c440d23edd235bac84b kdemultimedia-3.0.5a.ebuild 2523
-MD5 617f827cce13d597e59f810b00a9e446 kdemultimedia-3.1-r1.ebuild 2701
-MD5 9a2144e67e17eebd7f6301c8bca49906 kdemultimedia-3.1.ebuild 2702
+MD5 5e2801cef56980212b29759a12c06c03 kdemultimedia-3.1.2.ebuild 2698
+MD5 6ef1a62b5177796e9dc01e5037031786 kdemultimedia-2.2.2-r1.ebuild 1475
+MD5 12c0790bc186bb9d59c3ad0a1eb38917 ChangeLog 6723
 MD5 7deb57de3796a481b67fa061bbde893d kdemultimedia-3.1.1.ebuild 2697
 MD5 8fb79646776cf184ad0689232821cf49 kdemultimedia-3.0.5b.ebuild 2525
-MD5 5e2801cef56980212b29759a12c06c03 kdemultimedia-3.1.2.ebuild 2698
-MD5 f6cf44aaa0e416ee6dcc0a66f734d83a files/digest-kdemultimedia-2.2.2-r1 146
-MD5 bd16249f1d390fb635238b000fc0e1ef files/digest-kdemultimedia-3.0.4 73
-MD5 1d8fbf6a3381fec3bcf4b41f830cc360 files/digest-kdemultimedia-3.0.5a 74
-MD5 617c96da71ee9854ff09217902c45ac0 files/digest-kdemultimedia-3.1 71
-MD5 617c96da71ee9854ff09217902c45ac0 files/digest-kdemultimedia-3.1-r1 71
-MD5 86d8f1ace438437515940f470b8d4ddd files/kdemultimedia-2.2.2-gentoo.diff 2416
-MD5 86d8f1ace438437515940f470b8d4ddd files/kdemultimedia-2.2.2-r1-gentoo.diff 2416
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.4-gentoo-timidity.diff 694
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.5a-gentoo-timidity.diff 694
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1-gentoo-timidity.diff 694
-MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1-ln-sf.diff 1278
-MD5 448728e6c262cd057b361af52d1f0c16 files/digest-kdemultimedia-3.1.1 73
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.1-gentoo-timidity.diff 694
-MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.1-ln-sf.diff 1278
+MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.2-gentoo-timidity.diff 694
 MD5 d37340290c8c5fd5d8dc6345ec9dee75 files/digest-kdemultimedia-3.0.5b 74
+MD5 f6cf44aaa0e416ee6dcc0a66f734d83a files/digest-kdemultimedia-2.2.2-r1 146
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.5b-gentoo-timidity.diff 694
+MD5 86d8f1ace438437515940f470b8d4ddd files/kdemultimedia-2.2.2-r1-gentoo.diff 2416
+MD5 bd16249f1d390fb635238b000fc0e1ef files/digest-kdemultimedia-3.0.4 73
+MD5 448728e6c262cd057b361af52d1f0c16 files/digest-kdemultimedia-3.1.1 73
 MD5 c40a9c32c318c81150a0d45d13501e75 files/digest-kdemultimedia-3.1.2 73
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.2-gentoo-timidity.diff 694
+MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.1-ln-sf.diff 1278
 MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.2-ln-sf.diff 1278
+MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.1-gentoo-timidity.diff 694
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.5a b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.5a
deleted file mode 100644
index 69f12f17c1ce..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.5a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 641d30ecca821afc74ba47e7276b654a kdemultimedia-3.0.5a.tar.bz2 5791676
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1
deleted file mode 100644
index 329db88fe0e7..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c418c435b14ab5bcb51247c2d182b80d kdemultimedia-3.1.tar.bz2 5970329
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1-r1
deleted file mode 100644
index 329db88fe0e7..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c418c435b14ab5bcb51247c2d182b80d kdemultimedia-3.1.tar.bz2 5970329
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-2.2.2-gentoo.diff b/kde-base/kdemultimedia/files/kdemultimedia-2.2.2-gentoo.diff
deleted file mode 100644
index 548c6dd407ab..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-2.2.2-gentoo.diff
+++ /dev/null
@@ -1,66 +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>
-diff -ru kdemultimedia-2.2.1.orig/kmidi/alsa_a.cpp kdemultimedia-2.2.1/kmidi/alsa_a.cpp
---- kmidi/alsa_a.cpp	Thu Aug 24 21:49:04 2000
-+++ kmidi/alsa_a.cpp	Fri Oct 19 04:01:06 2001
-@@ -254,7 +254,7 @@
-                == 1 warning
-                == -1 fails
-  */
--static int set_playback_info (void* handle__,
-+static int set_playback_info (snd_pcm_t* handle__,
- 			      uint32* encoding__, uint32* rate__,
- 			      const int32 extra_param[5])
- {
-@@ -426,13 +426,13 @@
-     playback_params.fragments_max = extra_param[0];
- #endif
-   playback_params.buf.block.frags_min = 1;
--  snd_pcm_plugin_flush(handle__, SND_PCM_CHANNEL_PLAYBACK);
-+  snd_pcm_plugin_flush((snd_pcm_t *)handle__, SND_PCM_CHANNEL_PLAYBACK);
- 
-   playback_params.start_mode = SND_PCM_START_FULL;
-   playback_params.stop_mode = SND_PCM_STOP_STOP;
-   //playback_params.stop_mode = SND_PCM_STOP_ROLLOVER;
- 
--  tmp = snd_pcm_channel_params (handle__, &playback_params);
-+  tmp = snd_pcm_channel_params ((snd_pcm_t *)handle__, &playback_params);
- 
- //fprintf(stderr,"tmp = %d from snd_pcm_channel_params\n",tmp);
-   if (tmp != 0)
-@@ -448,7 +448,7 @@
-     }
- 
- 
--  if (snd_pcm_plugin_prepare(handle__, SND_PCM_CHANNEL_PLAYBACK) < 0) {
-+  if (snd_pcm_plugin_prepare((snd_pcm_t *)handle__, SND_PCM_CHANNEL_PLAYBACK) < 0) {
-       fprintf(stderr, "unable to prepare channel\n");
-       return -1;
-   } 
-@@ -456,7 +456,7 @@
-   memset(&setup, 0, sizeof(setup));
-   setup.channel = SND_PCM_CHANNEL_PLAYBACK;
-   setup.mode = SND_PCM_MODE_BLOCK;
--  if (snd_pcm_plugin_setup(handle__, &setup) < 0) {
-+  if (snd_pcm_plugin_setup((snd_pcm_t *)handle__, &setup) < 0) {
-       fprintf(stderr, "unable to obtain setup\n");
-       return -1;
-   }
-@@ -466,7 +466,7 @@
- //fprintf(stderr, "setup frags = %d\n", setup.buf.block.frags);
- //fprintf(stderr, "setup frag_size = %d\n", setup.buf.block.frag_size);
- 
--  if(snd_pcm_plugin_status(handle__, &playback_status) == 0)
-+  if(snd_pcm_plugin_status((snd_pcm_t *)handle__, &playback_status) == 0)
-     {
-       if (setup.format.rate != orig_rate)
- 	{
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.0.5a-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.0.5a-gentoo-timidity.diff
deleted file mode 100644
index f392a244212e..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.0.5a-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-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1-gentoo-timidity.diff
deleted file mode 100644
index f392a244212e..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1-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-ln-sf.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1-ln-sf.diff
deleted file mode 100644
index ee6daa91f3dc..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1-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.5a.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.0.5a.ebuild
deleted file mode 100644
index 046a16cc3258..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.0.5a.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.5a.ebuild,v 1.6 2003/02/13 12:28:18 vapier Exp $
-inherit kde-dist flag-o-matic eutils
-
-IUSE="nas esd motif gtk slang tcltk"
-DESCRIPTION="KDE $PV - multimedia apps"
-KEYWORDS="x86 ~ppc ~alpha sparc"
-
-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.1-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1-r1.ebuild
deleted file mode 100644
index c9846a9ba368..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.1-r1.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.1-r1.ebuild,v 1.5 2003/02/28 20:44:52 wwoods 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? ( virtual/motif )
-	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.1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.ebuild
deleted file mode 100644
index 2ea0faaa2ec3..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.1.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.1.ebuild,v 1.8 2003/02/15 20:56:25 weeve 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"
-
-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 )
-	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/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 876c0e6b7d57..f2f07a34f809 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.40 2003/06/19 14:32:58 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.41 2003/06/22 19:11:19 caleb Exp $
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1, 3.1.1
 
   16 Jun 2003; Will Woods <wwoods@gentoo.org> kdenetwork-3.1.2.ebuild:
   Marked stable for alpha
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index e7392822251d..37a27681e215 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,24 +1,16 @@
-MD5 555b58909e51d3ea1540d3c2be585896 ChangeLog 5685
+MD5 e6811a9b5e680cf30978893e6c7a2caf kdenetwork-3.0.5b.ebuild 968
+MD5 0fa9477ff987143f6689c775a36e5bd9 kdenetwork-3.1.2.ebuild 877
 MD5 2855066433f32ebe500a93ea3b1d366c kdenetwork-2.2.2-r2.ebuild 603
 MD5 7ee307959ba5ec560a0ad4044842f832 kdenetwork-3.0.4-r1.ebuild 1058
-MD5 3eae1afd41911bfee40a760b1bf8568a kdenetwork-3.0.5a.ebuild 967
-MD5 ce60f0025c07b1748b3b6254be3858c2 kdenetwork-3.1.ebuild 920
-MD5 960d3fd45443a3d76d0e244c9b3833b3 kdenetwork-3.1.1.ebuild 880
-MD5 e6811a9b5e680cf30978893e6c7a2caf kdenetwork-3.0.5b.ebuild 968
 MD5 ab815504ee1202af353991ee509bb283 kdenetwork-3.1.1-r1.ebuild 997
-MD5 0fa9477ff987143f6689c775a36e5bd9 kdenetwork-3.1.2.ebuild 877
-MD5 5eff7873bc0ddc7248a5c0a3d44ba2db files/digest-kdenetwork-2.2.2-r2 139
-MD5 fd9d0a9e3a15f685d5368343cae44daa files/digest-kdenetwork-3.0.4-r1 151
-MD5 c97042204651bd92a0d0ccff4d6d0467 files/digest-kdenetwork-3.0.5a 71
-MD5 efb32a414366975251ba09b9bb40c1b1 files/digest-kdenetwork-3.1 68
-MD5 fa71bfa7d91dfad1c95002f15bbefa6a files/kdenetwork-3.1-alpha.diff 533
-MD5 450c5fbda500f395c2514d2fb8f6a5b4 files/kdenetwork-3.1-libxml2-2.5.2.diff 559
+MD5 fd1aaa7c1ecd967eefbcf86cac93e295 ChangeLog 5776
 MD5 8cfc35635879b3b4fc158d2efa9ec0bb files/lisa 559
-MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
 MD5 86ce22554d0bf8df52bc6fe7425184a3 files/reslisa 570
+MD5 5eff7873bc0ddc7248a5c0a3d44ba2db files/digest-kdenetwork-2.2.2-r2 139
 MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
-MD5 9ffa1c32d0e67edf1ea46483e02ceb91 files/digest-kdenetwork-3.1.1 70
+MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
+MD5 1b93352391186816969c66a339688062 files/kdenetwork-3.1.1-kmail-sig.diff 1442
 MD5 f67a62b0d07393c5fe1e38380eee7225 files/digest-kdenetwork-3.0.5b 71
+MD5 fd9d0a9e3a15f685d5368343cae44daa files/digest-kdenetwork-3.0.4-r1 151
 MD5 9ffa1c32d0e67edf1ea46483e02ceb91 files/digest-kdenetwork-3.1.1-r1 70
-MD5 1b93352391186816969c66a339688062 files/kdenetwork-3.1.1-kmail-sig.diff 1442
 MD5 bf764f7c6af05def055c6a5b25cad6aa files/digest-kdenetwork-3.1.2 70
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.0.5a b/kde-base/kdenetwork/files/digest-kdenetwork-3.0.5a
deleted file mode 100644
index 343bf6643ede..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.0.5a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 527973059f0b880e714f8a4eae0d18e5 kdenetwork-3.0.5a.tar.bz2 3863844
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.1
deleted file mode 100644
index b911373048bb..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f286a6708c80c439401817bf31f63fba kdenetwork-3.1.tar.bz2 4962256
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.1.1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.1.1
deleted file mode 100644
index c9621f46a951..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d981fa1114d06256230bed4a4b948766 kdenetwork-3.1.1.tar.bz2 4962697
diff --git a/kde-base/kdenetwork/files/kdenetwork-3.1-alpha.diff b/kde-base/kdenetwork/files/kdenetwork-3.1-alpha.diff
deleted file mode 100644
index 5cb223c37ad1..000000000000
--- a/kde-base/kdenetwork/files/kdenetwork-3.1-alpha.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- kpf/src/WebServer.cpp~	2002-12-03 01:09:08.000000000 +0100
-+++ kpf/src/WebServer.cpp	2002-12-03 01:09:42.000000000 +0100
-@@ -234,7 +234,7 @@
- #ifdef __osf__
-         (size_t) sizeof(on)
- #else
--        reinterpret_cast<socklen_t>(sizeof(on))
-+        reinterpret_cast<socklen_t>((unsigned int)sizeof(on))
- #endif
-       );
- 
-@@ -249,7 +249,7 @@
- #ifdef __osf__
-         (size_t) sizeof(on)
- #else
--        reinterpret_cast<socklen_t>(sizeof(on))
-+        reinterpret_cast<socklen_t>((unsigned int)sizeof(on))
- #endif
-       );
- 
diff --git a/kde-base/kdenetwork/files/kdenetwork-3.1-libxml2-2.5.2.diff b/kde-base/kdenetwork/files/kdenetwork-3.1-libxml2-2.5.2.diff
deleted file mode 100644
index 98880220c8eb..000000000000
--- a/kde-base/kdenetwork/files/kdenetwork-3.1-libxml2-2.5.2.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/kit/index.docbook~	2003-02-27 15:37:05.000000000 +0100
-+++ doc/kit/index.docbook	2003-02-27 15:37:34.000000000 +0100
-@@ -1,7 +1,7 @@
- <?xml version="1.0" ?>
- <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kappname "&kit;">
--  <!ENTITY AOL "<trademark class='registered'><acronym>AOL</acronym></trademark>">
-+  <!ENTITY AOL "<acronym><trademark class='registered'>AOL</trademark></acronym>">
-   <!ENTITY package "kdenetwork">
-   <!ENTITY % addindex "IGNORE">
-   <!ENTITY % English "INCLUDE">
diff --git a/kde-base/kdenetwork/kdenetwork-3.0.5a.ebuild b/kde-base/kdenetwork/kdenetwork-3.0.5a.ebuild
deleted file mode 100644
index fa7eeb5515f6..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.0.5a.ebuild
+++ /dev/null
@@ -1,32 +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/kdenetwork/kdenetwork-3.0.5a.ebuild,v 1.8 2003/03/11 21:11:46 seemant Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE $PV - network apps: kmail..."
-newdepend "~kde-base/kdebase-${PV} dev-lang/perl" # perl is used for ksirc scripting
-KEYWORDS="x86 ~ppc ~alpha sparc"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	kde_sandbox_patch ${S}/kppp
-}
-
-src_install() {
-	kde_src_install
-	chmod +s ${D}/${KDEDIR}/bin/reslisa
-
-	# empty config file needed for lisa to work with default settinsg
-	touch ${D}/etc/lisarc
-
-	# lisa, reslisa initscripts
-	dodir /etc/init.d
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lisa.conf lisa
-	newins ${FILESDIR}/reslisa.conf reslisa
-}
diff --git a/kde-base/kdenetwork/kdenetwork-3.1.1.ebuild b/kde-base/kdenetwork/kdenetwork-3.1.1.ebuild
deleted file mode 100644
index 2abe6ed423ea..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.1.1.ebuild
+++ /dev/null
@@ -1,28 +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/kdenetwork/kdenetwork-3.1.1.ebuild,v 1.3 2003/04/11 01:26:50 lostlogic Exp $
-inherit kde-dist 
-
-IUSE=""
-DESCRIPTION="KDE network apps: kmail, kppp, knode..."
-KEYWORDS="x86 ~ppc sparc ~alpha"
-newdepend "=kde-base/kdebase-${PV}*"
-
-src_install() {
-	kde_src_install
-
-	chmod +s ${D}/${KDEDIR}/bin/reslisa
-
-	# empty config file needed for lisa to work with default settings
-	touch ${D}/etc/lisarc
-
-	# lisa, reslisa initscripts
-	dodir /etc/init.d
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
-	chmod +x ${D}/etc/init.d/*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lisa.conf lisa
-	newins ${FILESDIR}/reslisa.conf reslisa
-}
diff --git a/kde-base/kdenetwork/kdenetwork-3.1.ebuild b/kde-base/kdenetwork/kdenetwork-3.1.ebuild
deleted file mode 100644
index dadf273dd900..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.1.ebuild
+++ /dev/null
@@ -1,29 +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/kdenetwork/kdenetwork-3.1.ebuild,v 1.11 2003/02/28 20:44:52 wwoods Exp $
-inherit kde-dist 
-
-IUSE=""
-DESCRIPTION="KDE network apps: kmail, kppp, knode..."
-KEYWORDS="x86 ppc sparc ~alpha"
-PATCHES="${FILESDIR}/${P}-libxml2-2.5.2.diff"
-newdepend "~kde-base/kdebase-${PV}"
-
-src_install() {
-	kde_src_install
-
-	chmod +s ${D}/${KDEDIR}/bin/reslisa
-
-	# empty config file needed for lisa to work with default settings
-	touch ${D}/etc/lisarc
-
-	# lisa, reslisa initscripts
-	dodir /etc/init.d
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
-	chmod +x ${D}/etc/init.d/*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lisa.conf lisa
-	newins ${FILESDIR}/reslisa.conf reslisa
-}