kde-3.0.5b (masked via package.mask)

39 files changed, 1074 insertions, 16 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index e4d9594fa916..117032544c7b 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.40 2003/03/20 09:59:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.41 2003/04/08 19:58:00 hannes Exp $
+
+*arts-1.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> arts-1.0.5b.ebuild:
+  version bump
 
   14 Mar 2003; Dan Armak <danarmak@gentoo.org> arts-1.0.5a.ebuild:
   
diff --git a/kde-base/arts/arts-1.0.5b.ebuild b/kde-base/arts/arts-1.0.5b.ebuild
new file mode 100644
index 000000000000..597776baddb0
--- /dev/null
+++ b/kde-base/arts/arts-1.0.5b.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.0.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes Exp $
+inherit kde-base flag-o-matic
+
+IUSE="alsa"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+KEYWORDS="x86 ~ppc ~alpha sparc"
+HOMEPAGE="http://multimedia.kde.org"
+S="${WORKDIR}/${PN}-1.1"
+
+DESCRIPTION="KDE 3.x Sound Server"
+set-kdedir 3
+need-qt 3.0.5
+
+if [ "${COMPILER}" == "gcc3" ]; then
+	# GCC 3.1 kinda makes arts buggy and prone to crashes when compiled with 
+	# these.. Even starting a compile shuts down the arts server
+	filter-flags "-fomit-frame-pointer -fstrength-reduce"
+fi
+
+#fix bug 13453
+filter-flags "-foptimize-sibling-calls"
+
+SLOT="3.0"
+LICENSE="GPL-2 LGPL-2"
+
+# fix bug #10338
+PATCHES="${FILESDIR}/tmp-mcop-user-fix.patch"
+
+# fix bug #8175
+MAKEOPTS="$MAKEOPTS -j1"
+
+use alsa && myconf="$myconf --enable-alsa" || myconf="$myconf --disable-alsa"
+
+src_unpack() {
+	kde_src_unpack
+	kde_sandbox_patch ${S}/soundserver
+}
+
+src_install() {
+	kde_src_install
+	dodoc ${S}/doc/{NEWS,README,TODO}
+
+	# Moved here from kdelibs
+	dodir /etc/env.d
+	echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/bin
+LDPATH=${PREFIX}/lib
+CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/65kdelibs-3.0.5a # number goes down with version upgrade
+
+	echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/50kdedir-3.0.5a # number goes up with version upgrade
+
+}
diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 50c22b140151..8ce417f90e80 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.33 2003/03/19 15:36:16 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.34 2003/04/08 19:58:08 hannes Exp $
+
+*kdeaddons-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdeaddons-3.0.5b.ebuild:
+  version bump
 
 *kdeaddons-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdeaddons/kdeaddons-3.0.5b.ebuild b/kde-base/kdeaddons/kdeaddons-3.0.5b.ebuild
new file mode 100644
index 000000000000..402f65349d54
--- /dev/null
+++ b/kde-base/kdeaddons/kdeaddons-3.0.5b.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2003 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.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes Exp $
+inherit kde-dist flag-o-matic
+
+IUSE="sdl svga"
+DESCRIPTION="KDE $PV: addons - applets, plugins..."
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+
+newdepend "~kde-base/kdebase-${PV}
+	~kde-base/kdenetwork-${PV}
+	~kde-base/kdemultimedia-${PV}
+	~kde-base/arts-1.0.5b
+	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/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index 867b3754e0bf..d6ad38d158ea 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.28 2003/03/19 15:52:17 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.29 2003/04/08 19:58:08 hannes Exp $
+
+*kdeadmin-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdeadmin-3.0.5b.ebuild:
+  version bump
 
   15 Mar 2003; Dan Armak <danarmak@gentoo.org> kdeadmin-3.0.5a.ebuild:
   
diff --git a/kde-base/kdeadmin/kdeadmin-3.0.5b.ebuild b/kde-base/kdeadmin/kdeadmin-3.0.5b.ebuild
new file mode 100644
index 000000000000..0b6326eb98e5
--- /dev/null
+++ b/kde-base/kdeadmin/kdeadmin-3.0.5b.ebuild
@@ -0,0 +1,22 @@
+# 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.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes Exp $
+inherit kde-dist
+
+IUSE="pam"
+DESCRIPTION="KDE $PV - administration tools"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+PATCHES="${FILESDIR}/${PN}-qt311-gentoo.diff"
+
+newdepend "dev-libs/popt
+	pam? ( >=sys-libs/pam-0.72 )"
+	# >=app-arch/rpm-4.0.4-r1"
+
+use pam		&& myconf="$myconf --with-pam"	|| myconf="$myconf --without-pam --with-shadow"
+
+# Doesn't compile with the new rpm 4.2. I don't suppose this'll ever be fixed in the 3.0.x tree,
+# and it's not for gentoo ppl to fix rpm problems really :-) so disabling this. --danarmak 20030315
+myconf="$myconf --without-rpm"
+
+
+
diff --git a/kde-base/kdeartwork/ChangeLog b/kde-base/kdeartwork/ChangeLog
index 8eabfef52c08..cc2233632a09 100644
--- a/kde-base/kdeartwork/ChangeLog
+++ b/kde-base/kdeartwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeartwork
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.31 2003/03/19 15:58:18 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.32 2003/04/08 19:58:08 hannes Exp $
+
+*kdeartwork-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdeartwork-3.0.5b.ebuild:
+  version bump
 
 *kdeartwork-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdeartwork/kdeartwork-3.0.5b.ebuild b/kde-base/kdeartwork/kdeartwork-3.0.5b.ebuild
new file mode 100644
index 000000000000..84dcd3c9af84
--- /dev/null
+++ b/kde-base/kdeartwork/kdeartwork-3.0.5b.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes Exp $
+inherit kde-dist eutils
+
+IUSE="opengl"
+DESCRIPTION="KDE $PV - artwork"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+
+newdepend "opengl? ( virtual/opengl ) ~kde-base/kdebase-${PV}"
+
+myconf="$myconf --with-dpms"
+use opengl && myconf="$myconf --with-gl" || myconf="$myconf --without-gl" 
+
+src_unpack() {
+	kde_src_unpack
+	cd ${S}
+	# added to fix GL problems within xscreensavers
+	epatch ${FILESDIR}/kdeartwork-screensaver.patch
+}
+
+# kepp this here just in case, seems fixed though
+src_install() {
+	dodir ${PREFIX}/share/apps/kthememgr/Themes
+	kde_src_install all
+}
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index dfc926823ae4..ff7663f44e2d 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.69 2003/04/01 20:28:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.70 2003/04/08 19:58:08 hannes Exp $
+
+*kdebase-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-3.0.5b.ebuild,
+  files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff,
+  files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff,
+  files/3.0.5b/startkde-3.0.5b-gentoo.diff:
+  version bump
 
   01 Apr 2003; danrmaak <danarmak@gentoo.org> kdebase-3.1.1-r1.ebuild:
   Added stable x86 keyword.
diff --git a/kde-base/kdebase/files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff b/kde-base/kdebase/files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff
new file mode 100644
index 000000000000..940b20968a0f
--- /dev/null
+++ b/kde-base/kdebase/files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff
@@ -0,0 +1,148 @@
+   We have two problems when we start to use Xft1.2 or Xft2.0
+
+   1)  With Xft1.2 or Xft2.0 we now use fontconfig, and thus have
+       to cast the variables for use with fontconfig struct's and
+       variables.
+
+   2)  With Xft2.0, some functions in xftint.h are already defined
+       in the Xft.h from Xft2.0.
+
+   Fix:  If we have Xft1.2 or Xft2.0, either change configure to
+         to define XFT_WITH_FONTCONFIG, or add -DXFT_WITH_FONTCONFIG
+         to our CXXFLAGS.
+
+         If we have Xft2.0, define HAVE_XFT2 somehow.
+
+
+   Martin Schlemmer <azarah@gentoo.org> (25 Dec 2002)
+
+
+--- kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfig.cpp.orig	2002-12-25 04:06:47.000000000 +0200
++++ kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfig.cpp	2002-12-25 04:07:27.000000000 +0200
+@@ -276,7 +276,11 @@
+             }
+             case XftTypeString:
+                 str+="\"";
++#ifndef XFT_WITH_FONTCONFIG
+                 str+=test->value.u.s;
++#else
++                str+=(const char *)test->value.u.s;
++#endif
+                 str+="\"";
+                 break;
+             case XftTypeBool:
+@@ -554,7 +558,11 @@
+     XftValue           value;
+     CXftConfig::TEntry *entry=new CXftConfig::TEntry;
+ 
++#ifndef XFT_WITH_FONTCONFIG
+     value.u.s=sval;
++#else
++    value.u.s=(FcChar8 *)sval;
++#endif
+     value.type=XftTypeString;
+     entry->test=XftTestCreate(XftQualAny, "family", XftOpEqual, value);
+ 
+@@ -780,7 +788,11 @@
+ 
+     for(entry=itsList.first(); entry; entry=itsList.next())
+         if(entry->test && 0==CMisc::stricmp(entry->test->field, "family") && XftTypeString==entry->test->value.type &&
++#ifndef XFT_WITH_FONTCONFIG
+            0==CMisc::stricmp(entry->test->value.u.s, family.latin1()) && entry->edit &&
++#else
++           0==CMisc::stricmp((const char *)entry->test->value.u.s, family.latin1()) && entry->edit &&
++#endif
+            0==CMisc::stricmp(entry->edit->field, field) && XftOpAssign==entry->edit->op && entry->edit->expr)
+             break;
+ 
+@@ -798,7 +810,11 @@
+             free(test->field);
+ 
+         if(XftTypeString==test->value.type)
++#ifndef XFT_WITH_FONTCONFIG
+             free(test->value.u.s);
++#else
++            free((FcChar8 *)test->value.u.s);
++#endif
+     }
+ }
+ 
+--- kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfigEditor.cpp.orig	2002-12-25 04:07:06.000000000 +0200
++++ kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/XftConfigEditor.cpp	2002-12-25 04:07:27.000000000 +0200
+@@ -469,7 +469,11 @@
+                     break;
+                 case XftTypeString:
+                     expr->op=XftOpString;
++#ifndef XFT_WITH_FONTCONFIG
+                     expr->u.sval=val.u.s;
++#else
++                    expr->u.sval=(char *)val.u.s;
++#endif
+                     break;
+                 case XftTypeBool:
+                 default:
+@@ -655,12 +659,24 @@
+     if("foundry"==field || "family"==field || "encoding"==field || "style"==field)
+     {
+         val.type=XftTypeString;
++#ifndef XFT_WITH_FONTCONFIG
+         val.u.s=(char *)malloc(edit ? strVal.length()+1 : strVal.length()-1);
++#else
++        val.u.s=(FcChar8 *)malloc(edit ? strVal.length()+1 : strVal.length()-1);
++#endif
+ 
+         if(edit)
++#ifndef XFT_WITH_FONTCONFIG
+             strcpy(val.u.s, strVal.local8Bit());
++#else
++            strcpy((char *)val.u.s, strVal.local8Bit());
++#endif
+         else
++#ifndef XFT_WITH_FONTCONFIG
+             strcpy(val.u.s, strVal.mid(1, strVal.length()-2).local8Bit());  // Need to remove quotes from each end of the string...
++#else
++            strcpy((char *)val.u.s, strVal.mid(1, strVal.length()-2).local8Bit());  // Need to remove quotes from each end of the string...
++#endif
+     }
+     else if("spacing"==field)
+     {
+@@ -747,8 +763,13 @@
+         {
+             // Not sure about this...
+             val.type=XftTypeString;
++#ifndef XFT_WITH_FONTCONFIG
+             val.u.s=(char *)malloc(strVal.length()+1);
+             strcpy(val.u.s, strVal.local8Bit());
++#else
++            val.u.s=(FcChar8 *)malloc(strVal.length()+1);
++            strcpy((char *)val.u.s, strVal.local8Bit());
++#endif
+         }
+         else if("rgba"==field)
+         {
+--- kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/xftint.h.orig	2002-12-25 04:07:17.000000000 +0200
++++ kdebase-3.0.5a/kcontrol/kfontinst/kfontinst/xftint.h	2002-12-25 04:07:27.000000000 +0200
+@@ -276,8 +276,10 @@
+ XftSubstPrint (XftSubst *subst);
+ 
+ /* xftdir.c */
++#ifndef HAVE_XFT2
+ Bool
+ XftDirScan (XftFontSet *set, const char *dir);
++#endif
+ 
+ /* xftdpy.c */
+ int
+@@ -388,10 +390,12 @@
+ XftListValueCompare (XftValue	v1,
+ 		     XftValue	v2);
+ 
++#ifndef HAVE_XFT2
+ Bool
+ XftListValueListCompare (XftValueList	*v1orig,
+ 			 XftValueList	*v2orig,
+ 			 XftQual	qual);
++#endif
+ 
+ Bool
+ XftListMatch (XftPattern    *p,
diff --git a/kde-base/kdebase/files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff b/kde-base/kdebase/files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff
new file mode 100644
index 000000000000..0971b0d039c3
--- /dev/null
+++ b/kde-base/kdebase/files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff
@@ -0,0 +1,11 @@
+--- Xft.h.orig	2002-10-30 00:48:12.000000000 +0200
++++ Xft.h	2002-10-30 00:47:28.000000000 +0200
+@@ -150,6 +150,8 @@
+     int         ref;
+ };
+ 
++typedef FcValueList XftValueList;
++
+ /*
+  * End of Gentoo hack
+  */
diff --git a/kde-base/kdebase/files/3.0.5b/startkde-3.0.5b-gentoo.diff b/kde-base/kdebase/files/3.0.5b/startkde-3.0.5b-gentoo.diff
new file mode 100644
index 000000000000..8a4ba044dae5
--- /dev/null
+++ b/kde-base/kdebase/files/3.0.5b/startkde-3.0.5b-gentoo.diff
@@ -0,0 +1,55 @@
+--- startkde.orig	2002-12-16 04:05:14.000000000 +0200
++++ startkde	2003-01-28 09:56:45.000000000 +0200
+@@ -1,8 +1,21 @@
+-#!/bin/sh
++#!/bin/sh --login
+ #
+-#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.0.5a )
++#  GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.0.5a )
+ #
+ 
++# Gentoo part:
++export PATH="_KDEDIR_/bin:${PATH}"
++export KDEDIR="_KDEDIR_"
++# only use env.d's KDEDIRS, which should only include locations like /usr - NOT KDE locations
++
++cd ~
++[ -d .kde ] && mv .kde .kde.backup
++[ -e .kde3 ] || mkdir .kde3
++ln -sf .kde3 .kde
++export KDEHOME="${HOME}/.kde3"
++
++# Gentoo part ends
++
+ # Boot sequence:
+ #
+ # kdeinit is used to fork off processes which improves memory usage
+@@ -25,12 +38,12 @@
+ # especially necessary on slow machines, where starting KDE takes one or two
+ # minutes until anything appears on the screen.
+ #
+-# Set the background to plain grey.
++# Set the background to cyan (Gentoo version change).
+ # The standard X background is nasty, causing moire effects and exploding
+ # people's heads. We use colours from the standard KDE palette for those with
+ # palettised displays.
+ 
+-test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
++test "$XDM_MANAGED" || bkg="-solid #5477A0"
+ xsetroot -cursor_name left_ptr $bkg
+ 
+ # The user's personal KDE directory is usually ~/.kde, but this setting
+@@ -131,7 +144,12 @@
+ fi
+ 
+ # the splashscreen and progress indicator
+-ksplash
++# Gentoo addition: run $KSPLASH if set, otherwise just the default 'ksplash'
++if [ -n "$KSPLASH" ]; then
++    $KSPLASH
++else
++    ksplash
++fi
+ 
+ # We set LD_BIND_NOW to increase the efficiency of kdeinit.
+ # kdeinit unsets this variable before loading applications.
diff --git a/kde-base/kdebase/kdebase-3.0.5b.ebuild b/kde-base/kdebase/kdebase-3.0.5b.ebuild
new file mode 100644
index 000000000000..34351eccb125
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.0.5b.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes Exp $
+inherit eutils flag-o-matic kde-dist
+
+IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba"
+
+DESCRIPTION="KDE ${PV} - base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+
+newdepend ">=media-sound/cdparanoia-3.9.8
+	ldap? ( >=net-nds/openldap-1.2 )
+	pam? ( >=sys-libs/pam-0.73 )
+	motif? ( >=x11-libs/openmotif-2.1.30 )
+	encode? ( >=media-sound/lame-3.89b )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )
+	cups? ( net-print/cups )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	opengl? ( virtual/opengl )
+	samba? ( net-fs/samba )
+	sys-apps/gzip"
+#	lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet
+
+RDEPEND="${RDEPEND}
+	sys-apps/eject"
+
+myconf="${myconf} --with-dpms --with-cdparanoia"
+
+use ldap	&& myconf="${myconf} --with-ldap" 	|| myconf="${myconf} --without-ldap"
+use pam		&& myconf="${myconf} --with-pam"		|| myconf="${myconf} --with-shadow"
+use motif	&& myconf="${myconf} --with-motif"	|| myconf="${myconf} --without-motif"
+use encode	&& myconf="${myconf} --with-lame"		|| myconf="${myconf} --without-lame"
+use cups	&& myconf="${myconf} --with-cups"		|| myconf="${myconf} --disable-cups"
+use oggvorbis 	&& myconf="${myconf} --with-vorbis"	|| myconf="${myconf} --without-vorbis"
+use opengl	&& myconf="${myconf} --with-gl"		|| myconf="${myconf} --without-gl"
+use ssl		&& myconf="${myconf} --with-ssl"		|| myconf="${myconf} --without-ssl"
+use pam		&& myconf="${myconf} --with-pam=yes"	|| myconf="${myconf} --with-pam=no --with-shadow"
+
+get_xft_setup() {
+	# This function tries to figure out if we have QT compiled against Xft1
+	# or Xft2.0, and also if we have Xft1, Xft2.0 or a broken Xft setup
+	# <azarah@gentoo.org> (24 Dec 2002)
+
+	# Check if QT was compiled agaist Xft1 or Xft2 ... the idea is to only get
+	# the major version of the linked lib if its Xft2, else it should be "" ..
+	# we then set it to "1" with the next check.
+	export QT_XFT_VER="`ldd ${QTDIR}/lib/libqt.so 2> /dev/null | grep "libXft" | awk '{split($1, ver, "."); print ver[3]}'`"
+	[ -z "${QT_XFT_VER}" ] && QT_XFT_VER="1"
+
+	# Check if the Xft headers are Xft1 or Xft2 ... the idea is to only get the
+	# major version of the Xft version if its Xft2, else it should be "" ..
+	# we then set it to "1" with the next check.
+	local XFT_HDR_VER="`grep "XFT_MAJOR" /usr/X11R6/include/X11/Xft/Xft.h | awk '($2 == "XFT_MAJOR") {print $3}'`"
+	[ -z "${XFT_HDR_VER}" ] && XFT_HDR_VER="1"
+
+	# Check if the libs installed are Xft1 or Xft2 ...  We only check
+	# what the /usr/X11R6/lib/libXft.so symlink poinst to, as that should
+	# be 99% what apps will link to (except if we have Xft2 in /usr/lib,
+	# but that should not matter) ...
+	local XFT_LIB_VER="`readlink /usr/X11R6/lib/libXft.so 2> /dev/null | \
+		awk '{split($0, file, "/"); for (x in file) if (file[x] ~ /libXft\.so\.2/) print file[x]}'`"
+	[ "${XFT_LIB_VER/libXft}" != "${XFT_LIB_VER}" ] \
+		&& XFT_LIB_VER="2" \
+		|| XFT_LIB_VER="1"
+
+	if [ "${XFT_HDR_VER}" -eq "2" -a "${XFT_LIB_VER}" -eq "2" ]
+	then
+		# Yep, we have Xft2 support ...
+		export HAVE_XFT_2="yes"
+
+		[ -n "${BUILDDEBUG}" ] && einfo "We have Xft2.0 support"
+
+	elif [ "${XFT_HDR_VER}" != "${XFT_LIB_VER}" ]
+	then
+		# Xft support are broken (mixed header and lib versions) ...
+		export HAVE_XFT_2="broken"
+
+		[ -n "${BUILDDEBUG}" ] && einfo "We have broken Xft support"
+
+	elif [ "${XFT_HDR_VER}" -eq "1" -a "${XFT_LIB_VER}" -eq "1" ]
+	then
+		# Nope, we only have Xft1 installed ...
+		export HAVE_XFT_2="no"
+
+		[ -n "${BUILDDEBUG}" ] && einfo "We have Xft1 support"
+	fi
+}
+
+pkg_setup() {
+
+	# It should generally be considered bad form to touch files in the
+	# live filesystem, but we had a broken Xft.h out there, and to expect
+	# all users to update X because of it is harsh.  Also, there is no
+	# official fix to xfree for this issue as of writing.  See bug #9423
+	# for more info.
+	cd /usr/X11R6/include/X11/Xft
+	if patch --dry-run -p0 < ${FILESDIR}/${PVR}/${P}-xft_h-fix.diff > /dev/null
+	then
+		EPATCH_SINGLE_MSG="Patching Xft.h to fix missing defines..." \
+		epatch ${FILESDIR}/${PVR}/${P}-xft_h-fix.diff
+	fi
+
+	get_xft_setup
+
+	# Check what the setup are, and if things do not seem OK, die
+	# with a hopefully helpful message ...
+	if [ "${HAVE_XFT_2}" = "yes" -a "${QT_XFT_VER}" -eq "1" ]
+	then
+		eerror "You have Xft2.0 installed, but QT is linked against Xft1!"
+		eerror
+		eerror "Please fix this by remerging >=x11-libs/qt-3.1 and doing:"
+		eerror
+		eerror "  # emerge \">=x11-libs/qt-3.1\""
+		die "You have Xft2.0 installed, but QT is linked against Xft1!"
+
+	elif [ "${HAVE_XFT_2}" = "broken" ]
+	then
+		eerror "You have a broken Xft setup!  This could mean that you"
+		eerror "have Xft2.0 headers with Xft1 libs, or reversed.  Please"
+		eerror "fix this before you try to merge kdebase again."
+		die "You have a broken Xft setup!"
+
+	elif [ "${HAVE_XFT_2}" = "no" -a "${QT_XFT_VER}" -eq "2" ]
+	then
+		eerror "You have QT compiled against Xft2.0, but Xft2.0 is no"
+		eerror "longer installed.  Please remerge QT, and then try"
+		eerror "again to merge kdebase."
+		die "You have QT compiled against Xft2.0, but Xft2.0 is no longer installed."
+	fi
+}
+
+src_unpack() {
+
+	kde_src_unpack
+
+	get_xft_setup
+
+	# Apply this only if we have a Xft1.2 Xft.h or have Xft2.0 installed ...
+	if [ -n "`grep "fontconfig" /usr/X11R6/include/X11/Xft/Xft.h`" ] || \
+	   [ "${HAVE_XFT_2}" = "yes" ]
+	then
+		cd ${S}; epatch ${FILESDIR}/${PVR}/${P}-xft2.0-fix.diff
+	fi
+}
+
+src_compile() {
+
+	get_xft_setup
+
+	# Add '-DXFT_WITH_FONTCONFIG' to our C[XX]FLAGS if we have a Xft.h that
+	# uses fontconfig ... this will enable the fix in the '${P}-xft2.0-fix.diff'
+	# patch.
+	if [ -n "`grep "fontconfig" /usr/X11R6/include/X11/Xft/Xft.h`" ]
+	then
+		append-flags "-DXFT_WITH_FONTCONFIG"
+	fi
+
+	# Add '-DHAVE_XFT2' to our C[XX]FLAGS if we have Xft2.0 installed ...
+	# this will enable the fix in the '${P}-xft2.0-fix.diff' patch.
+	if [ "${HAVE_XFT_2}" = "yes" ]
+	then
+		append-flags "-DHAVE_XFT2"
+	fi
+
+	kde_src_compile myconf configure
+	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
+	kde_src_compile make
+}
+
+src_install() {
+
+	kde_src_install
+
+	# cf bug #5953
+	if [ "`use pam`" ]
+	then
+		insinto /etc/pam.d
+		newins ${FILESDIR}/kscreensaver.pam kscreensaver
+		newins ${FILESDIR}/kde.pam kde
+	fi
+
+	# startkde script
+	cd ${D}/${KDEDIR}/bin
+	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
+	dosed "s:_KDEDIR_:${KDEDIR}:" ${KDEDIR}/bin/startkde
+	chmod a+x startkde
+
+	# x11 session script
+	cd ${T}
+	echo "#!/bin/sh
+${KDEDIR}/bin/startkde" > kde-${PV}
+	chmod a+x kde-${PV}
+	# old scheme - compatibility
+	exeinto /usr/X11R6/bin/wm
+	doexe kde-${PV}
+	# new scheme - for now >=xfree-4.2-r3 only
+	exeinto /etc/X11/Sessions
+	doexe kde-${PV}
+
+	cd ${D}/${PREFIX}/share/config/kdm || die
+	dosed "s:SessionTypes=:SessionTypes=kde-${PV},:" \
+		${PREFIX}/share/config/kdm/kdmrc
+	dosed "s:Session=${PREFIX}/share/config/kdm/Xsession:Session=/etc/X11/xdm/Xsession:" \
+		${PREFIX}/share/config/kdm/kdmrc
+
+	#backup splashscreen images, so they can be put back when unmerging 
+	#mosfet or so.
+	if [ ! -d ${KDEDIR}/share/apps/ksplash.default ]
+	then
+		cd ${D}/${KDEDIR}/share/apps
+		cp -rf ksplash/ ksplash.default
+	fi
+    
+	# Show gnome icons when choosing new icon for desktop shortcut
+	dodir /usr/share/pixmaps
+	mv ${D}/${KDEDIR}/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/
+	rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/
+	cd ${D}/${KDEDIR}/share/apps/kdesktop/
+	ln -sf /usr/share/pixmaps/ pics
+	
+	# fix bug #12705: make sure default Xreset, Xsetup, Xwilling files are installed
+	# into the kdm config dir
+	cd ${S}/kdm/kfrontend
+	./genkdmconf --in . --no-old
+	insinto ${PREFIX}/share/config/kdm
+	doins Xreset Xsetup Xstartup
+
+	# portage has a problem working with empty directories
+	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
+	
+}
+
+pkg_postinst() {
+	mkdir -p ${KDEDIR}/share/templates/.source/emptydir
+}
+
diff --git a/kde-base/kdebindings/ChangeLog b/kde-base/kdebindings/ChangeLog
index bb7ca15f7ef3..63b85204df27 100644
--- a/kde-base/kdebindings/ChangeLog
+++ b/kde-base/kdebindings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebindings
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/ChangeLog,v 1.29 2003/03/14 19:14:09 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/ChangeLog,v 1.30 2003/04/08 19:58:08 hannes Exp $
+
+*kdebindings-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdebindings-3.0.5b.ebuild:
+  version bump
 
 *kdebindings-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdebindings/kdebindings-3.0.5b.ebuild b/kde-base/kdebindings/kdebindings-3.0.5b.ebuild
new file mode 100644
index 000000000000..19da2d906b1b
--- /dev/null
+++ b/kde-base/kdebindings/kdebindings-3.0.5b.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes Exp $
+# TODO: add gnustep bindings
+inherit kde-dist
+
+IUSE="mozilla java python"
+DESCRIPTION="KDE $PV - kde library bindings for languages other than c++"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+PATCHES="${FILESDIR}/${P}-qt31.diff"
+
+newdepend ">=kde-base/kdebase-${PV}
+	=x11-libs/gtk+-1.2*
+	dev-lang/perl
+	python? ( dev-lang/python )
+	java? (	virtual/jdk )
+	=x11-libs/gtk+-1.2*
+	=dev-libs/glib-1.2*
+	>=kde-base/kdenetwork-${PV}
+	mozilla? ( net-www/mozilla )"
+
+use python									|| myconf="$myconf --without-python"
+use java	&& myconf="$myconf --with-java=$(java-config --jdk-home)"	|| myconf="$myconf --without-java"
+#myconf="$myconf --enable-objc"
+
+export LIBPYTHON="`python-config`"
+
+src_unpack()
+{
+	kde_src_unpack
+
+	if [ -z "`use mozilla`" ]; then
+	# disable mozilla bindings/xpart
+	cd ${S}
+	cp configure configure.orig
+	sed -e 's:mozilla_incldirs=:# mozilla_incldirs=:' configure.orig > configure
+	chmod +x configure
+	fi
+}
diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index c3982c3d173a..d176221f0ec1 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.30 2003/03/19 15:51:02 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.31 2003/04/08 19:58:08 hannes Exp $
+
+*kdeedu-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdeedu-3.0.5b.ebuild:
+  version bump
 
 *kdeedu-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdeedu/kdeedu-3.0.5b.ebuild b/kde-base/kdeedu/kdeedu-3.0.5b.ebuild
new file mode 100644
index 000000000000..aa31c535b166
--- /dev/null
+++ b/kde-base/kdeedu/kdeedu-3.0.5b.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes Exp $
+inherit kde-dist
+
+IUSE=""
+DESCRIPTION="KDE $PV - educational apps"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+
+src_unpack() {
+	kde_src_unpack
+	kde_sandbox_patch ${S}/klettres/klettres
+}
+
+src_compile() {
+	kde_src_compile myconf configure
+
+	# build fails with -fomit-frame-pointer optimization in kgeo
+	kde_remove_flag kgeo -fomit-frame-pointer
+	kde_remove_flag kgeo/kgeo -fomit-frame-pointer
+
+	kde_src_compile make
+}
diff --git a/kde-base/kdegames/ChangeLog b/kde-base/kdegames/ChangeLog
index 4238196ac176..891a647c05d4 100644
--- a/kde-base/kdegames/ChangeLog
+++ b/kde-base/kdegames/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegames
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.29 2003/03/19 15:49:51 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.30 2003/04/08 19:58:08 hannes Exp $
+
+*kdegames-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdegames-3.0.5b.ebuild,
+  files/kdegames-3.0.5b-gentoo.diff:
+  version bump
 
 *kdegames-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdegames/files/kdegames-3.0.5b-gentoo.diff b/kde-base/kdegames/files/kdegames-3.0.5b-gentoo.diff
new file mode 100644
index 000000000000..e138d0b33c5b
--- /dev/null
+++ b/kde-base/kdegames/files/kdegames-3.0.5b-gentoo.diff
@@ -0,0 +1,11 @@
+--- doc/kbattleship/index.docbook~	2002-12-20 22:39:55.000000000 +0100
++++ doc/kbattleship/index.docbook	2002-12-20 22:40:11.000000000 +0100
+@@ -162,7 +162,7 @@
+ place your ship. The first one will have a length of four squares, the next
+ will be three fields long &etc;. Click on the field where you want to start
+ the placement. If you click with the &LMB; the ship will be placed horizotally,
+-a <keycombo>&Shift;&LMB;</keycombo> click will cause it to be placed
++a &Shift;&LMB; click will cause it to be placed
+ vertically. &Shift; itself will flip the ship placement preview.
+ </para>
+ 
diff --git a/kde-base/kdegames/kdegames-3.0.5b.ebuild b/kde-base/kdegames/kdegames-3.0.5b.ebuild
new file mode 100644
index 000000000000..05b6bb4e15db
--- /dev/null
+++ b/kde-base/kdegames/kdegames-3.0.5b.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes Exp $
+inherit kde-dist
+
+DESCRIPTION="KDE $PV - games"
+IUSE=""
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+PATCHES="${FILESDIR}/${P}-gentoo.diff"
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index b95069b06df8..111330277077 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.37 2003/03/19 15:54:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.38 2003/04/08 19:58:08 hannes Exp $
+
+*kdegraphics-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdegraphics-3.0.5b.ebuild,
+  files/kdegraphics-3.0.5b-kghostviewrc:
+  version bump
 
 *kdegraphics-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdegraphics/files/kdegraphics-3.0.5b-kghostviewrc b/kde-base/kdegraphics/files/kdegraphics-3.0.5b-kghostviewrc
new file mode 100644
index 000000000000..5c2e48efba0c
--- /dev/null
+++ b/kde-base/kdegraphics/files/kdegraphics-3.0.5b-kghostviewrc
@@ -0,0 +1,16 @@
+[General]
+Antialiasing=true
+Interpreter=gs
+Messages=false
+Palette=color
+Platform fonts=false
+ShowPageList=true
+ShowPageNames=false
+ShowScrollBars=true
+WatchFile=false
+
+[Ghostscript]
+Antialiasing arguments=-sDEVICE=x11 -dTextAlphaBits=4 -dGraphicsAlphaBits=2 -dMaxBitmap=10000000
+Interpreter=gs
+Non-antialiasing arguments=-sDEVICE=x11
+
diff --git a/kde-base/kdegraphics/kdegraphics-3.0.5b.ebuild b/kde-base/kdegraphics/kdegraphics-3.0.5b.ebuild
new file mode 100644
index 000000000000..6268d6669879
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.0.5b.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes Exp $
+inherit kde-dist
+
+IUSE="scanner gphoto2 tetex"
+DESCRIPTION="KDE $PV - graphics-related apps"
+
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+
+newdepend "gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 )
+	dev-lang/perl
+	scanner? ( media-gfx/sane-backends  )
+	tetex? ( >=app-text/tetex-1.0.7 )
+	media-libs/imlib
+	app-text/ghostscript"
+#	x86? ( scanner? sys-libs/libieee1284 )
+	    
+use gphoto2	&& myconf="$myconf --with-kamera --with-gphoto2-includes=/usr/include/gphoto2 \
+				   --with-gphoto2-libraries=/usr/lib/gphoto2 \
+				   --with-gpio --with-gpio-includes=/usr/include \
+				   --with-gpio-libraries=/usr/lib" || myconf="$myconf --without-kamera"
+
+use tetex 	&& myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
+
+use scanner	|| KDE_REMOVE_DIR="kooka libkscan"
+
+myconf="$myconf --with-imlib --with-imlib-config=/usr/bin "
+
+need-autoconf 2.1
+
+src_unpack() {
+
+	kde_src_unpack
+
+	if [ -z "`use scanner`" ]; then
+	cd $S
+	mv Makefile.am Makefile.am.orig
+	sed -e 's:$(KSCANDIR)::' Makefile.am.orig > Makefile.am
+	fi
+}
+
+src_install() {
+	kde_src_install
+    
+	# default kghostviewrc beacuse kghostview doesn't generate a working default run on its 1st run
+	# fix bug #6562
+	dodir $PREFIX/share/config
+	cp $FILESDIR/$P-kghostviewrc $D/$PREFIX/share/config/kghostviewrc
+}
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 4d6e3fba10c1..836768b058ff 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.71 2003/03/31 13:36:24 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.72 2003/04/08 19:58:08 hannes Exp $
+
+*kdelibs-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.0.5b.ebuild,
+  files/kdelibs-3.0.5b-libxml2-2.5.2.diff:
+  version bump
 
   27 Mar 2003; Dan Armak <danarmak@gentoo.org> all 3.x ebuilds:
   
diff --git a/kde-base/kdelibs/files/kdelibs-3.0.5b-libxml2-2.5.2.diff b/kde-base/kdelibs/files/kdelibs-3.0.5b-libxml2-2.5.2.diff
new file mode 100644
index 000000000000..19c0ef9c9aab
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.0.5b-libxml2-2.5.2.diff
@@ -0,0 +1,11 @@
+--- kdoctools/customization/entities/general.entities~	2003-03-14 23:11:41.000000000 +0100
++++ kdoctools/customization/entities/general.entities	2003-03-14 23:12:24.000000000 +0100
+@@ -353,7 +353,7 @@
+ <!ENTITY SMTP	"<acronym>SMTP</acronym>">
+ <!ENTITY SGI	"<trademark>SGI</trademark>">
+ <!ENTITY Solaris	"<trademark>Solaris</trademark>">
+-<!ENTITY SuSE	'<trademark class="registered"><acronym>SuSE</acronym></trademark>'>
++<!ENTITY SuSE	'<acronym><trademark class="registered">SuSE</trademark></acronym>'>
+ <!ENTITY ThreeCom	'<trademark class="registered">3Com</trademark>'>
+ <!ENTITY tkmidi	"<application>tkmidi</application>">
+ <!ENTITY TrueType	'<trademark class="registered">TrueType</trademark>'>
diff --git a/kde-base/kdelibs/kdelibs-3.0.5b.ebuild b/kde-base/kdelibs/kdelibs-3.0.5b.ebuild
new file mode 100644
index 000000000000..7fe863464104
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.0.5b.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes Exp $
+inherit kde kde.org eutils
+#don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
+
+IUSE="alsa cups ipv6 ssl"
+DESCRIPTION="KDE $PV - base libraries needed by all kde programs"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+HOMEPAGE="http//www.kde.org/"
+
+SLOT="3.0"
+LICENSE="GPL-2 LGPL-2"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire
+# DEPEND from scratch.
+DEPEND=""
+RDEPEND=""
+newdepend "dev-lang/perl
+	>=media-libs/audiofile-0.1.9
+	>=sys-apps/bzip2-1.0.1
+	>=dev-libs/libxslt-1.0.7
+	>=dev-libs/libpcre-3.5
+	>=dev-libs/libxml2-2.4.10
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
+	cups? ( >=net-print/cups-1.1.14 )
+	>=media-libs/tiff-3.5.5
+	app-admin/fam-oss
+	~kde-base/arts-1.0.5b
+	app-text/ghostscript
+	sys-devel/gettext"
+
+newdepend "/c"
+newdepend "/autotools"
+
+RDEPEND="$RDEPEND
+	app-text/sgml-common
+	cups? ( net-print/cups )
+	dev-lang/python
+	>=sys-apps/portage-2.0.36" # for bug #7359
+
+myconf="$myconf --with-distribution=Gentoo"
+use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
+use ssl		&& myconf="$myconf --with-ssl-dir=/usr"		|| myconf="$myconf --without-ssl"
+use alsa	&& myconf="$myconf --with-alsa"			|| myconf="$myconf --without-alsa"
+use cups	&& myconf="$myconf --enable-cups"		|| myconf="$myconf --disable-cups"
+
+[ "$ARCH" == "x86" ] && myconf="$myconf --enable-fast-malloc=full"
+
+qtver-from-kdever ${PV}
+need-qt $selected_version
+
+set-kdedir $PV
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-libxml2-2.5.2.diff
+	kde_sandbox_patch ${S}/kio/misc/kpac
+}
+
+
+src_install() {
+
+	kde_src_install
+	dohtml *.html
+
+}
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index cfe7267d9e14..57f1135b521c 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,12 @@
 # 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.39 2003/03/19 15:48:24 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.40 2003/04/08 19:58:08 hannes Exp $
+
+*kdemultimedia-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdemultimedia-3.0.5b.ebuild,
+  files/kdemultimedia-3.0.5b-gentoo-timidity.diff:
+  version bump
 
 *kdemultimedia-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.0.5b-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.0.5b-gentoo-timidity.diff
new file mode 100644
index 000000000000..f392a244212e
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.0.5b-gentoo-timidity.diff
@@ -0,0 +1,21 @@
+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/kdemultimedia-3.0.5b.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.0.5b.ebuild
new file mode 100644
index 000000000000..8f37ff6afdcf
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.0.5b.ebuild
@@ -0,0 +1,69 @@
+# 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.5b.ebuild,v 1.1 2003/04/08 19:58:08 hannes 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/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index c7cf0bd2f4a6..4222cd11ff74 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,11 @@
 # 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.33 2003/03/19 15:35:36 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.34 2003/04/08 19:58:09 hannes Exp $
+
+*kdenetwork-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.0.5b.ebuild:
+  version bump
 
 *kdenetwork-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdenetwork/kdenetwork-3.0.5b.ebuild b/kde-base/kdenetwork/kdenetwork-3.0.5b.ebuild
new file mode 100644
index 000000000000..e72bda4e1f89
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.0.5b.ebuild
@@ -0,0 +1,32 @@
+# 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.5b.ebuild,v 1.1 2003/04/08 19:58:09 hannes 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/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 2e1ea34a9bef..f439ed2d145f 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.32 2003/03/19 15:55:40 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.33 2003/04/08 19:58:09 hannes Exp $
+
+*kdepim-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdepim-3.0.5b.ebuild:
+  version bump
 
 *kdepim-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdepim/kdepim-3.0.5b.ebuild b/kde-base/kdepim/kdepim-3.0.5b.ebuild
new file mode 100644
index 000000000000..c03d264b608c
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.0.5b.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:09 hannes Exp $
+inherit kde-dist
+
+IUSE="pda"
+DESCRIPTION="KDE $PV - PIM (Personal Information Management) apps: korganizer..."
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+
+newdepend "pda? ( >=dev-libs/pilot-link-0.11.1-r1 )
+	dev-lang/perl"
+
+use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
+
+src_install() {
+	kde_src_install
+	docinto html
+	dodoc *.html
+}
diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog
index 98ddb7eb83ac..b3c1288d9f38 100644
--- a/kde-base/kdesdk/ChangeLog
+++ b/kde-base/kdesdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdesdk
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.20 2003/03/14 19:14:09 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.21 2003/04/08 19:58:09 hannes Exp $
+
+*kdesdk-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdesdk-3.0.5b.ebuild:
+  version bump
 
 *kdesdk-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdesdk/kdesdk-3.0.5b.ebuild b/kde-base/kdesdk/kdesdk-3.0.5b.ebuild
new file mode 100644
index 000000000000..381d999c9b43
--- /dev/null
+++ b/kde-base/kdesdk/kdesdk-3.0.5b.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:09 hannes Exp $
+inherit kde-dist
+
+IUSE=""
+DESCRIPTION="KDE $PV - SDK: kbabel, ..."
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
diff --git a/kde-base/kdetoys/ChangeLog b/kde-base/kdetoys/ChangeLog
index 2b4015676efc..414487ce4f70 100644
--- a/kde-base/kdetoys/ChangeLog
+++ b/kde-base/kdetoys/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdetoys
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.25 2003/03/19 15:56:47 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.26 2003/04/08 19:58:09 hannes Exp $
+
+*kdetoys-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdetoys-3.0.5b.ebuild:
+  version bump
 
 *kdetoys-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdetoys/kdetoys-3.0.5b.ebuild b/kde-base/kdetoys/kdetoys-3.0.5b.ebuild
new file mode 100644
index 000000000000..95e72018b2ee
--- /dev/null
+++ b/kde-base/kdetoys/kdetoys-3.0.5b.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:09 hannes Exp $
+inherit kde-dist
+
+IUSE=""
+DESCRIPTION="KDE $PV - toys"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
+
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 3db61489baf5..9978add09aad 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.25 2003/03/19 15:57:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.26 2003/04/08 19:58:09 hannes Exp $
+
+*kdeutils-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdeutils-3.0.5b.ebuild:
+  version bump
 
 *kdeutils-3.1.1 (14 Mar 2003)
 
diff --git a/kde-base/kdeutils/kdeutils-3.0.5b.ebuild b/kde-base/kdeutils/kdeutils-3.0.5b.ebuild
new file mode 100644
index 000000000000..e68ec90bed33
--- /dev/null
+++ b/kde-base/kdeutils/kdeutils-3.0.5b.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.0.5b.ebuild,v 1.1 2003/04/08 19:58:09 hannes Exp $
+inherit kde-dist
+
+IUSE=""
+DESCRIPTION="KDE $PV - utilities"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"