Update to KDE 3.4.2.

(Portage version: 2.0.51.22-r2)

27 files changed, 1089 insertions, 7 deletions

diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 8a3be52272d9..b29073644ae7 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.132 2005/07/27 20:37:02 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.133 2005/07/28 12:54:24 greg_g Exp $
+
+*kdeaddons-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeaddons-3.4-configure.patch, +kdeaddons-3.4.2.ebuild:
+  New version. Add configure patch (#81966). Better detection of Berkeley DB.
 
   27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdeaddons-3.4.1.ebuild:
   Stable on hppa.
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.4.2 b/kde-base/kdeaddons/files/digest-kdeaddons-3.4.2
new file mode 100644
index 000000000000..554aacd0d674
--- /dev/null
+++ b/kde-base/kdeaddons/files/digest-kdeaddons-3.4.2
@@ -0,0 +1 @@
+MD5 af4fc7fa0dde8894b9d9582ecef7df2a kdeaddons-3.4.2.tar.bz2 1591335
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.4-configure.patch b/kde-base/kdeaddons/files/kdeaddons-3.4-configure.patch
new file mode 100644
index 000000000000..948cd77631bb
--- /dev/null
+++ b/kde-base/kdeaddons/files/kdeaddons-3.4-configure.patch
@@ -0,0 +1,104 @@
+diff -Nur kdeaddons-3.4.2.orig/kicker-applets/mediacontrol/configure.in.in kdeaddons-3.4.2/kicker-applets/mediacontrol/configure.in.in
+--- kdeaddons-3.4.2.orig/kicker-applets/mediacontrol/configure.in.in	2005-07-20 18:42:57.000000000 +0200
++++ kdeaddons-3.4.2/kicker-applets/mediacontrol/configure.in.in	2005-07-26 12:54:48.000000000 +0200
+@@ -32,6 +32,18 @@
+   fi
+ ])
+ 
+-AC_CHECK_XMMS
++AC_ARG_WITH(xmms,
++  [AC_HELP_STRING(--with-xmms,
++    [enable XMMS control applet @<:@default=check@:>@])],
++  [], with_xmms=check)
++
++if test "x$with_xmms" != xno; then
++  AC_CHECK_XMMS
++
++  if test "x$with_xmms" != xcheck && test "x$ac_cv_have_xmms" != xyes; then
++    AC_MSG_ERROR([--with-xmms was given, but test for XMMS failed])
++  fi
++fi
++
+ AC_SUBST(XMMS_LIBS)
+ AC_SUBST(XMMS_INCLUDES)
+diff -Nur kdeaddons-3.4.2.orig/noatun-plugins/configure.in.in kdeaddons-3.4.2/noatun-plugins/configure.in.in
+--- kdeaddons-3.4.2.orig/noatun-plugins/configure.in.in	2005-07-20 18:42:41.000000000 +0200
++++ kdeaddons-3.4.2/noatun-plugins/configure.in.in	2005-07-26 12:54:18.000000000 +0200
+@@ -173,14 +173,20 @@
+ noatun_sdl=no
+ dnl Check for SDL
+ dnl require SDL 1.2 just because it's the new stable version, and it's what I have
+-NOATUN_PATH_SDL(
+-[1.2.0],
+-[
+-noatun_sdl=yes
+-],
+-[
+-]
+-)
++
++AC_ARG_WITH(sdl,
++  [AC_HELP_STRING(--with-sdl,
++    [enable SDL Noatun plugins @<:@default=check@:>@])],
++  [], with_sdl=check)
++
++if test "x$with_sdl" != xno; then
++  NOATUN_PATH_SDL([1.2.0], [noatun_sdl=yes], [])
++
++  if test "x$with_sdl" != xcheck && test "x$noatun_sdl" != xyes; then
++    AC_MSG_ERROR([--with-sdl was given, but test for SDL failed])
++  fi
++fi
++
+ AM_CONDITIONAL(include_SDL, test "$noatun_sdl" = yes)
+ 
+ AC_CHECK_HEADERS(endian.h)
+diff -Nur kdeaddons-3.4.2.orig/noatun-plugins/oblique/configure.in.in kdeaddons-3.4.2/noatun-plugins/oblique/configure.in.in
+--- kdeaddons-3.4.2.orig/noatun-plugins/oblique/configure.in.in	2005-07-20 18:42:35.000000000 +0200
++++ kdeaddons-3.4.2/noatun-plugins/oblique/configure.in.in	2005-07-26 12:53:34.000000000 +0200
+@@ -1,19 +1,31 @@
++AC_ARG_WITH(berkeley-db,
++  [AC_HELP_STRING(--with-berkeley-db,
++    [enable support for Berkeley DB++ @<:@default=check@:>@])],
++  [], with_berkeley_db=check)
++
++AC_ARG_WITH(db-lib,
++  [AC_HELP_STRING([--with-db-lib=NAME],[name of the Berkeley DB++ library @<:@default=db_cxx@:>@])],
++    [ac_db_name="$withval"], [ac_db_name="db_cxx"])
+ 
+-AC_MSG_CHECKING(for Berkeley DB++)
+ berkeley_db=no
+-AC_LANG_PUSH(C++)
+-AC_TRY_COMPILE([
+-		#include <db_cxx.h>
+-	],[
+-	],[
+-		berkeley_db=yes
+-	])
+-AC_MSG_RESULT($berkeley_db)
+-AC_DEFINE(BERKELEY_DB,1,[Define if you have Berkeley DB++ installed])
+-BERKELEY_DB_LIBS="-ldb_cxx"
+-AC_SUBST(BERKELEY_DB_LIBS)
+-AC_LANG_POP(C++)
++if test "x$with_berkeley_db" != xno; then
++  berkeley_db=yes
+ 
+-AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
++  KDE_CHECK_HEADER([db_cxx.h],
++    [:], [berkeley_db=no])
++
++  AC_CHECK_LIB([$ac_db_name], [main],
++    [:], [berkeley_db=no])
+ 
++  if test "x$berkeley_db" = xyes; then
++    AC_DEFINE(BERKELEY_DB, 1, [Define if you have Berkeley DB++ installed])
++    BERKELEY_DB_LIBS="-l$ac_db_name"
++    AC_SUBST(BERKELEY_DB_LIBS)
++  fi
+ 
++  if test "x$with_berkeley_db" != xcheck && test "x$berkeley_db" != xyes; then
++    AC_MSG_ERROR([--with-berkeley-db was given, but test for Berkeley DB++ failed])
++  fi
++fi
++
++AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
diff --git a/kde-base/kdeaddons/kdeaddons-3.4.2.ebuild b/kde-base/kdeaddons/kdeaddons-3.4.2.ebuild
new file mode 100644
index 000000000000..4b48a5c3cd3f
--- /dev/null
+++ b/kde-base/kdeaddons/kdeaddons-3.4.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.4.2.ebuild,v 1.1 2005/07/28 12:54:24 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="arts berkdb sdl xmms"
+
+DEPEND="~kde-base/kdepim-${PV}
+	~kde-base/kdemultimedia-${PV}
+	~kde-base/kdegames-${PV}
+	arts? ( ~kde-base/arts-${PV} )
+	sdl? ( >=media-libs/libsdl-1.2 )
+	xmms? ( media-sound/xmms )
+	berkdb? ( || ( =sys-libs/db-4.3*
+	               =sys-libs/db-4.2* ) )"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Make vimpart use /usr/bin/kvim -- fixes bug 33257.
+	# This should continue to apply to upcoming versions since it's
+	# Gentoo-specific and won't go upstream.
+	epatch "${FILESDIR}/${PN}-3.2.0-kvim.diff"
+
+	# Configure patch. Applied for 3.5.
+	epatch "${FILESDIR}/kdeaddons-3.4-configure.patch"
+
+	# For the configure patch.
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	local myconf="$(use_with sdl) $(use_with xmms)"
+
+	if use berkdb; then
+		if has_version "=sys-libs/db-4.3*"; then
+			myconf="${myconf} --with-berkeley-db --with-db-lib=db_cxx-4.3
+			        --with-extra-includes=/usr/include/db4.3"
+		elif has_version "=sys-libs/db-4.2*"; then
+			myconf="${myconf} --with-berkeley-db --with-db-lib=db_cxx-4.2
+			        --with-extra-includes=/usr/include/db4.2"
+		fi
+	else
+		myconf="${myconf} --without-berkeley-db"
+	fi
+
+	kde_src_compile
+}
diff --git a/kde-base/kdeartwork/ChangeLog b/kde-base/kdeartwork/ChangeLog
index 6157f1cb5316..77d1646e6520 100644
--- a/kde-base/kdeartwork/ChangeLog
+++ b/kde-base/kdeartwork/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeartwork
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.126 2005/07/25 19:47:12 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.127 2005/07/28 12:55:05 greg_g Exp $
+
+*kdeartwork-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.4-configure.patch, +kdeartwork-3.4.2.ebuild:
+  New version. Add configure patch (#81966). Fix detection of xscreensaver
+  (#98819).
 
   25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdeartwork-3.4.1.ebuild:
   Stable on hppa.
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.4.2 b/kde-base/kdeartwork/files/digest-kdeartwork-3.4.2
new file mode 100644
index 000000000000..845e5d00f1ea
--- /dev/null
+++ b/kde-base/kdeartwork/files/digest-kdeartwork-3.4.2
@@ -0,0 +1 @@
+MD5 3fcf6c047ee7350350a9a4c918299603 kdeartwork-3.4.2.tar.bz2 18023334
diff --git a/kde-base/kdeartwork/files/kdeartwork-3.4-configure.patch b/kde-base/kdeartwork/files/kdeartwork-3.4-configure.patch
new file mode 100644
index 000000000000..f0649e935e01
--- /dev/null
+++ b/kde-base/kdeartwork/files/kdeartwork-3.4-configure.patch
@@ -0,0 +1,194 @@
+diff -Nur kdeartwork-3.4.2.orig/kscreensaver/configure.in.in kdeartwork-3.4.2/kscreensaver/configure.in.in
+--- kdeartwork-3.4.2.orig/kscreensaver/configure.in.in	2005-07-20 18:40:58.000000000 +0200
++++ kdeartwork-3.4.2/kscreensaver/configure.in.in	2005-07-26 13:54:39.000000000 +0200
+@@ -36,32 +36,41 @@
+ AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
+ AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
+ 
+-LIBART=
++AC_ARG_WITH(libart,
++  [AC_HELP_STRING(--with-libart,
++    [enable support for libart @<:@default=check@:>@])],
++  [], with_libart=check)
+ 
+-KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
+-  AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
+-])
+-
+-if test -n "$LIBART_CONFIG"; then
+-  vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+-  if test -n "$vers" && test "$vers" -ge 2003008
+-  then
+-     LIBART_LIBS="`$LIBART_CONFIG --libs`"
+-     LIBART_RPATH=
+-     for args in $LIBART_LIBS; do
++LIBART=
++if test "x$with_libart" != xno; then
++  KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
++    AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
++  ])
++
++  if test -n "$LIBART_CONFIG"; then
++    vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
++    if test -n "$vers" && test "$vers" -ge 2003008; then
++      LIBART_LIBS="`$LIBART_CONFIG --libs`"
++      LIBART_RPATH=
++      for args in $LIBART_LIBS; do
+ 	  case $args in
+ 	    -L*)
+ 	       LIBART_RPATH="$LIBART_RPATH $args"
+ 	       ;;
+           esac
+-     done
+-     LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
+-     LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
+-     LIBART=yes
+-
+-     AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
+-  else
+-     AC_MSG_WARN([You need at least libart 2.3.8])
++      done
++      LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
++      LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
++      LIBART=yes
++
++      AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
++    else
++      AC_MSG_WARN([You need at least libart 2.3.8])
++    fi
++  fi
++
++  if test "x$with_libart" != xcheck && test -z "$LIBART"; then
++      AC_MSG_ERROR([--with-libart was given, but test for libart failed])
+   fi
+ fi
+ 
+diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot
+--- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot	2005-07-20 18:40:57.000000000 +0200
++++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot	2005-07-26 13:54:39.000000000 +0200
+@@ -1,4 +1,4 @@
+-if test "$XSCREENSAVER" = "NO"; then
++if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then
+   echo ""
+   echo "xscreensaver could not be detected on your system."
+   echo "Check www.jwz.org/xscreensaver if you're loving to"
+diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in
+--- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in	2005-07-20 18:40:57.000000000 +0200
++++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in	2005-07-26 13:54:39.000000000 +0200
+@@ -1,4 +1,4 @@
+-AC_DEFUN([KDE_CHECK_XSREENSAVER],
++AC_DEFUN([KDE_CHECK_XSCREENSAVER],
+ [
+      XSCREENSAVER_CONFIG=NO
+      AC_FIND_FILE($1/flame.xml, [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG)
+@@ -22,46 +22,82 @@
+ done
+ IFS=$old_IFS
+ 
+-KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
+-   [
+-        KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
+-        [
+-    	    KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, 
+-  	      [ $xscreensaver_prefixes ],
+-	      [
+-    	          KDE_FIND_PATH(hacks/flame, XSCREENSAVER, 
+-  	          [ $xscreensaver_prefixes ],
+-	          [
+-		    XSCREENSAVER=NO
+-	          ])
+-	      ])
+-        ])
+-   ])
++AC_ARG_WITH(xscreensaver,
++  [AC_HELP_STRING(--with-xscreensaver,
++    [enable support for xscreensaver @<:@default=check@:>@])],
++  [], with_xscreensaver=check)
++
++AC_ARG_WITH(xscreensaver-dir,
++  [AC_HELP_STRING(--with-xscreensaver-dir=DIR,
++    [where xscreensaver is installed])], [])
++
++AC_ARG_WITH(xscreensaver-config,
++  [AC_HELP_STRING(--with-xscreensaver-config=DIR,
++    [where the xscreensaver config files are])], [])
++
++XSCREENSAVER=NO
++XSCREENSAVER_CONFIG=NO
++if test "x$with_xscreensaver" != xno; then
++  if test -n "$with_xscreensaver_dir" && test -f "$with_xscreensaver_dir/flame"; then
++    XSCREENSAVER="$with_xscreensaver_dir/flame"
++  fi
++
++  if test "x$XSCREENSAVER" = xNO && test -n "$kdelibsuff"; then
++    KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
++  fi
++
++  if test "x$XSCREENSAVER" = xNO; then
++    KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
++  fi
++
++  if test "x$XSCREENSAVER" = xNO; then
++    KDE_FIND_PATH(libexec/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
++  fi
++
++  if test "x$XSCREENSAVER" = xNO; then
++    KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
++  fi
++
++  if test "x$XSCREENSAVER" = xNO; then
++    KDE_FIND_PATH(hacks/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
++  fi
++
++  AC_MSG_CHECKING([for flame.xml])
++
++  if test -n "$with_xscreensaver_config" && test -f "$with_xscreensaver_config/flame.xml"; then
++    XSCREENSAVER_CONFIG="$with_xscreensaver_config"
++  fi
+ 
+-XSCREENSAVER_HACKS_DIR=
+-
+-if test "$XSCREENSAVER" != "NO"; then
+-     XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
+-     AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
+-
+-     AC_MSG_CHECKING([for flame.xml])
++  if test "x$XSCREENSAVER_CONFIG" = xNO; then
+      for subdir in lib/xscreensaver/config \
+ 		   lib/X11/xscreensaver/config \
+ 		   share/control-center/screensavers \
+-		   share/control-center/screensavers \
+ 		   share/xscreensaver/config \
+                    xscreensaver \
+ 		   config/control-center-2.0; do
+-         KDE_CHECK_XSREENSAVER($subdir)
++         KDE_CHECK_XSCREENSAVER($subdir)
+          if test "$XSCREENSAVER_CONFIG" != NO; then
+ 		break
+          fi
+      done
+-     AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
+-     AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", 
+-	[Defines where xscreensaver stores it's config files])
++  fi
++
++  AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
++
++  if test "x$XSCREENSAVER_CONFIG" = xNO; then
++    XSCREENSAVER=NO
++  fi
++
++  if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = xNO; then
++    AC_MSG_ERROR([--with-xscreensaver was given, but test for xscreensaver failed])
++  fi
++fi
++
++if test "$XSCREENSAVER" != "NO"; then
++     XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
++     AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
++     AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", [Defines where xscreensaver stores it's config files])
+ fi
+ 
+ AM_CONDITIONAL(include_XSCREENSAVER, test "$XSCREENSAVER" != "NO")
+ AC_SUBST(XSCREENSAVER_HACKS_DIR)
+-
diff --git a/kde-base/kdeartwork/kdeartwork-3.4.2.ebuild b/kde-base/kdeartwork/kdeartwork-3.4.2.ebuild
new file mode 100644
index 000000000000..1861abfe2460
--- /dev/null
+++ b/kde-base/kdeartwork/kdeartwork-3.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.4.2.ebuild,v 1.1 2005/07/28 12:55:05 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE artwork package"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="opengl xscreensaver"
+
+DEPEND="~kde-base/kdebase-${PV}
+	opengl? ( virtual/opengl )
+	xscreensaver? ( x11-misc/xscreensaver )"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Configure patch. Applied for 3.5.
+	epatch ${FILESDIR}/kdeartwork-3.4-configure.patch
+
+	# For the configure patch.
+	make -f admin/Makefile.common
+}
+
+src_compile() {
+	local myconf="--with-dpms --with-libart
+	              $(use_with opengl gl)"
+
+	if use xscreensaver; then
+		myconf="${myconf} --with-xscreensaver
+		        --with-xscreensaver-dir=/usr/lib/misc/xscreensaver
+		        --with-xscreensaver-config=/usr/share/xscreensaver/config"
+	else
+		myconf="${myconf} --without-xscreensaver"
+	fi
+
+	kde_src_compile
+}
diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index d81eb96b3282..121ea0093f08 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.135 2005/07/25 20:30:59 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.136 2005/07/28 12:55:50 greg_g Exp $
+
+*kdeedu-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.4.2.ebuild:
+  New version.
 
   25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdeedu-3.4.1.ebuild:
   Stable on hppa.
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.4.2 b/kde-base/kdeedu/files/digest-kdeedu-3.4.2
new file mode 100644
index 000000000000..733395bad924
--- /dev/null
+++ b/kde-base/kdeedu/files/digest-kdeedu-3.4.2
@@ -0,0 +1 @@
+MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kdeedu/kdeedu-3.4.2.ebuild b/kde-base/kdeedu/kdeedu-3.4.2.ebuild
new file mode 100644
index 000000000000..19e0fafd754c
--- /dev/null
+++ b/kde-base/kdeedu/kdeedu-3.4.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.2.ebuild,v 1.1 2005/07/28 12:55:51 greg_g Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE educational apps"
+
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+myconf="--disable-kig-python-scripting"
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index eba416e9e65b..427d93a900bf 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.170 2005/07/25 20:23:53 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.171 2005/07/28 12:56:36 greg_g Exp $
+
+*kdegraphics-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdegraphics-3.4-configure.patch, +kdegraphics-3.4.2.ebuild:
+  New version. Add configure patch (#81966).
 
   25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdegraphics-3.4.1.ebuild:
   Stable on hppa.
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.4.2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.4.2
new file mode 100644
index 000000000000..80c5b0d96ab2
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.4.2
@@ -0,0 +1 @@
+MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kdegraphics/files/kdegraphics-3.4-configure.patch b/kde-base/kdegraphics/files/kdegraphics-3.4-configure.patch
new file mode 100644
index 000000000000..ab54f067f705
--- /dev/null
+++ b/kde-base/kdegraphics/files/kdegraphics-3.4-configure.patch
@@ -0,0 +1,23 @@
+diff -Nur kdegraphics-3.4.2.orig/kfile-plugins/exr/configure.in.in kdegraphics-3.4.2/kfile-plugins/exr/configure.in.in
+--- kdegraphics-3.4.2.orig/kfile-plugins/exr/configure.in.in	2005-05-23 14:06:14.000000000 +0200
++++ kdegraphics-3.4.2/kfile-plugins/exr/configure.in.in	2005-07-26 13:32:45.000000000 +0200
+@@ -68,6 +68,17 @@
+   AC_SUBST(EXR_FLAGS)
+ ])
+ 
+-AC_FIND_LIBEXR
+-AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
++AC_ARG_WITH([openexr],
++  [AC_HELP_STRING([--with-openexr],
++    [Enable support for OpenEXR @<:@default=check@:>@])],
++  [], with_openexr=check)
++
++if test "x$with_openexr" != xno; then
++  AC_FIND_LIBEXR
+ 
++  if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then
++    AC_MSG_ERROR([--with-openexr was given, but test for OpenEXR failed])
++  fi
++fi
++
++AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
diff --git a/kde-base/kdegraphics/kdegraphics-3.4.2.ebuild b/kde-base/kdegraphics/kdegraphics-3.4.2.ebuild
new file mode 100644
index 000000000000..ca2326e482fc
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.4.2.ebuild,v 1.1 2005/07/28 12:56:36 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="gphoto2 imlib nodrm openexr opengl povray scanner tetex"
+
+DEPEND="~kde-base/kdebase-${PV}
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	gphoto2? ( media-libs/libgphoto2 )
+	scanner? ( media-gfx/sane-backends )
+	media-libs/libart_lgpl
+	media-libs/lcms
+	dev-libs/fribidi
+	imlib? ( media-libs/imlib )
+	virtual/ghostscript
+	media-libs/tiff
+	openexr? ( >=media-libs/openexr-1.2 )
+	povray? ( media-gfx/povray
+		  virtual/opengl )"
+
+RDEPEND="${DEPEND}
+	app-text/xpdf
+	tetex? (
+	|| ( >=app-text/tetex-2
+	     app-text/ptex
+	     app-text/cstetex
+	     app-text/dvipdfm ) )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Fix detection of gocr (kde bug 90082).
+	epatch "${FILESDIR}/kdegraphics-3.4.1-gocr.patch"
+
+	# Configure patch. Applied for 3.5.
+	epatch "${FILESDIR}/kdegraphics-3.4-configure.patch"
+
+	# For the configure patch.
+	make -f admin/Makefile.common
+}
+
+src_compile() {
+	if use gphoto2; then
+		myconf="${myconf} --with-kamera \
+				  --with-gphoto2-includes=/usr/include/gphoto2 \
+				  --with-gphoto2-libraries=/usr/lib/gphoto2"
+	else
+		myconf="${myconf} --without-kamera"
+	fi
+
+	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
+	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
+
+	myconf="${myconf} $(use_with imlib) $(use_enable !nodrm kpdf-drm)
+		$(use_with openexr)"
+
+	kde_src_compile
+}
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 26ea8d77f908..fff7a85abf48 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.165 2005/07/27 20:22:53 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.166 2005/07/28 12:57:23 greg_g Exp $
+
+*kdemultimedia-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdemultimedia-3.4-configure.patch, +kdemultimedia-3.4.2.ebuild:
+  New version. Add configure patch (#81966). Make support for MusicBrainz
+  optional.
 
   27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdemultimedia-3.4.1-r1.ebuild:
   Stable on hppa.
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.4.2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.4.2
new file mode 100644
index 000000000000..08c6932fbb61
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.4.2
@@ -0,0 +1 @@
+MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.4-configure.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.4-configure.patch
new file mode 100644
index 000000000000..f45ccebd657a
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.4-configure.patch
@@ -0,0 +1,159 @@
+diff -Nur kdemultimedia-3.4.2.orig/juk/configure.in.bot kdemultimedia-3.4.2/juk/configure.in.bot
+--- kdemultimedia-3.4.2.orig/juk/configure.in.bot	2005-05-23 14:07:04.000000000 +0200
++++ kdemultimedia-3.4.2/juk/configure.in.bot	2005-07-26 13:46:44.000000000 +0200
+@@ -7,7 +7,7 @@
+ 	echo "**************************************************"
+ fi
+ 
+-if test "x$have_gst" = "xno"; then
++if test "x$with_gstreamer" = xcheck && test "x$have_gst" = xno; then
+ 	echo "**************************************************"
+ 	echo "*"
+ 	echo "* You do not seem to have GStreamer >= 0.8 installed."
+@@ -19,7 +19,7 @@
+ 	echo "**************************************************"
+ fi
+ 
+-if test "x$have_musicbrainz" = "xfalse"; then
++if test "x$with_musicbrainz" = xcheck && test "x$have_musicbrainz" = xno; then
+ 	echo "**************************************************"
+ 	echo "*"
+ 	echo "* You do not seem to have libmusicbrainz and"
+diff -Nur kdemultimedia-3.4.2.orig/juk/configure.in.in kdemultimedia-3.4.2/juk/configure.in.in
+--- kdemultimedia-3.4.2.orig/juk/configure.in.in	2005-05-23 14:07:04.000000000 +0200
++++ kdemultimedia-3.4.2/juk/configure.in.in	2005-07-26 13:47:29.000000000 +0200
+@@ -20,39 +20,60 @@
+ AC_SUBST(LIB_ARTS)
+ AC_SUBST(ARTS_CFLAGS)
+ 
+-KDE_CHECK_HEADER(tunepimp/tp_c.h,
+-[
+-	AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz])
+-	have_musicbrainz=true
+-], [
+-	AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz])
+-	have_musicbrainz=false
+-])
+-
+-AM_CONDITIONAL(link_lib_MB, test x$have_musicbrainz = xtrue)
+-
+-# pkg-config seems to have a bug where it masks needed -L entries when it
+-# shouldn't, so disable that.
+-
+-PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+-export PKG_CONFIG_ALLOW_SYSTEM_LIBS
+-
+-dnl start with 0.8
+-GST_MAJORMINOR=0.8
+-GST_REQ=0.8.0
+-
+-PKG_CHECK_MODULES(GST, \
+-	gstreamer-$GST_MAJORMINOR >= $GST_REQ \
+-	gstreamer-control-$GST_MAJORMINOR >= $GST_REQ \
+-	gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ,
+-	have_gst=yes, have_gst=no)
++AC_ARG_WITH(musicbrainz,
++  [AC_HELP_STRING(--with-musicbrainz,
++    [enable support for MusicBrainz @<:@default=check@:>@])],
++  [], with_musicbrainz=check)
++
++have_musicbrainz=no
++if test "x$with_musicbrainz" != xno; then
++  KDE_CHECK_HEADER(tunepimp/tp_c.h, have_musicbrainz=yes)
++
++  if test "x$with_musicbrainz" != xcheck && test "x$have_musicbrainz" != xyes; then
++    AC_MSG_ERROR([--with-musicbrainz was given, but test for MusicBrainz failed])
++  fi
++fi
++
++if test "x$have_musicbrainz" = xyes; then
++  AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz])
++else
++  AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz])
++fi
++
++AM_CONDITIONAL(link_lib_MB, test "x$have_musicbrainz" = xyes)
++
++AC_ARG_WITH(gstreamer,
++  [AC_HELP_STRING(--with-gstreamer,
++    [enable support for GStreamer @<:@default=check@:>@])],
++  [], with_gstreamer=check)
++
++have_gst=no
++if test "x$with_gstreamer" != xno; then
++  # pkg-config seems to have a bug where it masks needed -L entries when it
++  # shouldn't, so disable that.
++
++  PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
++  export PKG_CONFIG_ALLOW_SYSTEM_LIBS
++
++  dnl start with 0.8
++  GST_MAJORMINOR=0.8
++  GST_REQ=0.8.0
++
++  PKG_CHECK_MODULES(GST, \
++    gstreamer-$GST_MAJORMINOR >= $GST_REQ \
++    gstreamer-control-$GST_MAJORMINOR >= $GST_REQ \
++    gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ,
++    have_gst=yes, have_gst=no)
++
++  if test "x$with_gstreamer" != xcheck && test "x$have_gst" != xyes; then
++    AC_MSG_ERROR([--with-gstreamer was given, but test for GStreamer failed])
++  fi
++fi
+ 
+-dnl Give error if we don't have gstreamer
+ if test "x$have_gst" = "xno"; then
+ 	GST_CFLAGS=""
+ 	LDADD_GST=""
+ 	LDFLAGS_GST=""
+-	AC_MSG_WARN([GStreamer version >= $GST_REQ required.])
+ 	AC_DEFINE(HAVE_GSTREAMER, 0, [have GStreamer])
+ else
+ 	LDADD_GST=`$PKG_CONFIG --libs-only-l gstreamer-$GST_MAJORMINOR`
+@@ -63,13 +84,14 @@
+ 	LIBDIRS_GST=`$PKG_CONFIG --libs-only-L gstreamer-$GST_MAJORMINOR`
+ 	LDADD_GST="$LDADD_GST $LIBDIRS_GST"
+ 
+-	AC_SUBST(GST_CFLAGS)
+-	AC_SUBST(LDADD_GST)
+-	AC_SUBST(LDFLAGS_GST)
+ 	AC_MSG_NOTICE([GStreamer version >= $GST_REQ found.])
+ 	AC_DEFINE(HAVE_GSTREAMER, 1, [have GStreamer])
+ fi
+ 
++AC_SUBST(GST_CFLAGS)
++AC_SUBST(LDADD_GST)
++AC_SUBST(LDFLAGS_GST)
++
+ if test "x$have_taglib" = "xfalse" || ( test "x$build_arts" = "xno" && test "x$have_gst" = "xno" ) ; then
+ 	DO_NOT_COMPILE="$DO_NOT_COMPILE juk"
+ fi
+diff -Nur kdemultimedia-3.4.2.orig/xine_artsplugin/configure.in.in kdemultimedia-3.4.2/xine_artsplugin/configure.in.in
+--- kdemultimedia-3.4.2.orig/xine_artsplugin/configure.in.in	2005-05-23 14:07:11.000000000 +0200
++++ kdemultimedia-3.4.2/xine_artsplugin/configure.in.in	2005-07-26 13:44:34.000000000 +0200
+@@ -238,8 +238,20 @@
+ ])
+ AC_CHECK_FUNC([ao_new_port])
+ 
+-dnl Check for xine libs (1.0.0 or higher)
+-AC_PATH_XINE(1.0.0,,
+-[
++AC_ARG_WITH([xine],
++  [AC_HELP_STRING([--with-xine],
++    [Enable support for Xine @<:@default=check@:>@])],
++  [], with_xine=check)
++
++have_xine=no
++if test "x$with_xine" != xno; then
++  AC_PATH_XINE(1.0.0, have_xine=yes)
++
++  if test "x$with_xine" != xcheck && test "x$have_xine" != xyes; then
++    AC_MSG_ERROR([--with-xine was given, but test for Xine failed])
++  fi
++fi
++
++if test "x$have_xine" != xyes; then
+   DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"
+-])
++fi
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.4.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.4.2.ebuild
new file mode 100644
index 000000000000..8e9dd6b95f2e
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.4.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.2.ebuild,v 1.1 2005/07/28 12:57:23 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="alsa audiofile encode flac gstreamer jack mp3 musicbrainz speex theora vorbis xine"
+
+DEPEND="~kde-base/kdebase-${PV}
+	media-sound/cdparanoia
+	media-libs/libsamplerate
+	audiofile? ( media-libs/audiofile )
+	mp3? ( media-libs/libmad )
+	jack? ( media-sound/jack-audio-connection-kit )
+	flac? ( media-libs/flac )
+	encode? ( media-sound/lame )
+	vorbis? ( media-sound/vorbis-tools )
+	xine? ( >=media-libs/xine-lib-1.0 )
+	alsa? ( media-libs/alsa-lib )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora )
+	gstreamer? ( >=media-libs/gstreamer-0.8
+	             >=media-libs/gst-plugins-0.8 )
+	>=media-libs/taglib-1.2
+	musicbrainz? ( media-libs/tunepimp )"
+
+RDEPEND="${DEPEND}
+	gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8 )
+		     vorbis? ( >=media-plugins/gst-plugins-ogg-0.8
+		               >=media-plugins/gst-plugins-vorbis-0.8 )
+		     flac? ( >=media-plugins/gst-plugins-flac-0.8 ) )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch "${FILESDIR}/kdemultimedia-3.4.0-amd64.patch"
+
+	# Configure patch. Applied for 3.5.
+	epatch "${FILESDIR}/kdemultimedia-3.4-configure.patch"
+
+	# For the configure patch.
+	make -f admin/Makefile.common
+}
+
+src_compile() {
+	use speex && myconf="--with-extra-includes=/usr/include/speex"
+
+	myconf="${myconf} --with-cdparanoia --enable-cdparanoia
+		$(use_with alsa arts-alsa) $(use_with alsa)
+		$(use_with vorbis) $(use_with encode lame)
+		$(use_with flac) $(use_with speex)
+		$(use_with mp3 libmad) $(use_with jack)
+		$(use_with xine) $(use_with musicbrainz)"
+
+	kde_src_compile
+}
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index ed132ae85c93..320539febb31 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.161 2005/07/25 19:55:05 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.162 2005/07/28 12:58:14 greg_g Exp $
+
+*kdepim-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.2-gcc32.patch, +files/kdepim-3.4-configure.patch,
+  +kdepim-3.4.2.ebuild:
+  New version. Add configure patch (#81966). Add patch to fix compilation with
+  gcc 3.2 (#99643).
 
   25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdepim-3.4.1-r1.ebuild,
   kdepim-3.4.1-r2.ebuild:
diff --git a/kde-base/kdepim/files/digest-kdepim-3.4.2 b/kde-base/kdepim/files/digest-kdepim-3.4.2
new file mode 100644
index 000000000000..6ac9eb92b059
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.4.2
@@ -0,0 +1 @@
+MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kdepim/files/kdepim-3.4-configure.patch b/kde-base/kdepim/files/kdepim-3.4-configure.patch
new file mode 100644
index 000000000000..d7024288d3e7
--- /dev/null
+++ b/kde-base/kdepim/files/kdepim-3.4-configure.patch
@@ -0,0 +1,110 @@
+diff -Nur kdepim-3.4.2.orig/configure.in.in kdepim-3.4.2/configure.in.in
+--- kdepim-3.4.2.orig/configure.in.in	2005-07-20 12:03:13.000000000 +0200
++++ kdepim-3.4.2/configure.in.in	2005-07-26 14:12:19.000000000 +0200
+@@ -46,7 +46,6 @@
+ [
+   KDE_CHECK_HEADERS(gnokii.h)
+   AC_REQUIRE([AC_HAVE_XPM])
+-  LIB_GNOKII=
+   AC_CHECK_LIB(gnokii, gn_cfg_read,
+        [ LIB_GNOKII="-lgnokii $LIB_BLUETOOTH" ],
+        [
+@@ -58,6 +57,21 @@
+   AC_SUBST(LIB_GNOKII)
+ ])
+ 
++AC_ARG_WITH(gnokii,
++  [AC_HELP_STRING(--with-gnokii,
++    [enable support for mobile phones through gnokii @<:@default=check@:>@])],
++  [], with_gnokii=check)
++
++LIB_GNOKII=
++if test "x$with_gnokii" != xno; then
++  # for kaddressbook/xxport/ and kmobile/devices/gnokii/
++  KDE_CHECK_BLUETOOTH
++  KDE_CHECK_GNOKII
++
++  if test "x$with_gnokii" != xcheck && test -z "$LIB_GNOKII"; then
++    AC_MSG_ERROR([--with-gnokii was given, but test for gnokii failed])
++  fi
++fi
+ 
+ dnl the below is copied from kdenetwork's configure as too many apps moved
+ dnl and noone can say which tests are needed and which are obsolete for kdepim ;(
+diff -Nur kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.bot kdepim-3.4.2/kaddressbook/xxport/configure.in.bot
+--- kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.bot	2005-05-23 14:12:19.000000000 +0200
++++ kdepim-3.4.2/kaddressbook/xxport/configure.in.bot	2005-07-26 14:11:23.000000000 +0200
+@@ -1,4 +1,4 @@
+-if test -z "$LIB_GNOKII"; then
++if test "x$with_gnokii" = xcheck && test -z "$LIB_GNOKII"; then
+   echo ""
+   echo "libgnokii (http://www.gnokii.org) is missing. The KDE Addressbook mobile phone import/export filter will not be available."
+   echo ""
+diff -Nur kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.in kdepim-3.4.2/kaddressbook/xxport/configure.in.in
+--- kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.in	2005-05-23 14:12:19.000000000 +0200
++++ kdepim-3.4.2/kaddressbook/xxport/configure.in.in	2005-07-26 14:11:23.000000000 +0200
+@@ -1,6 +1,2 @@
+ # $Id: kdepim-3.4-configure.patch,v 1.1 2005/07/28 12:58:14 greg_g Exp $
+-
+-KDE_CHECK_BLUETOOTH
+-KDE_CHECK_GNOKII
+-
+ AM_CONDITIONAL(compile_GNOKIIXXPORT, test -n "$LIB_GNOKII")
+diff -Nur kdepim-3.4.2.orig/kioslaves/configure.in.bot kdepim-3.4.2/kioslaves/configure.in.bot
+--- kdepim-3.4.2.orig/kioslaves/configure.in.bot	2005-05-23 14:12:02.000000000 +0200
++++ kdepim-3.4.2/kioslaves/configure.in.bot	2005-07-26 14:11:34.000000000 +0200
+@@ -1,4 +1,4 @@
+-if test -z "$SASL2_LIBS"; then
++if test "x$with_sasl" = xcheck && test -z "$SASL2_LIBS"; then
+   echo ""
+   echo "cyrus-sasl 2 library is missing. The sieve ioslave will not be built, and imap4 will lack of a lot of authentication methods."
+   echo ""
+diff -Nur kdepim-3.4.2.orig/kioslaves/configure.in.in kdepim-3.4.2/kioslaves/configure.in.in
+--- kdepim-3.4.2.orig/kioslaves/configure.in.in	2005-05-23 14:12:02.000000000 +0200
++++ kdepim-3.4.2/kioslaves/configure.in.in	2005-07-26 14:12:33.000000000 +0200
+@@ -1,16 +1,27 @@
+ KDE_CHECK_SSL
+ 
++AC_ARG_WITH(sasl,
++  [AC_HELP_STRING(--with-sasl,
++    [enable support for authentication through cyrus-sasl @<:@default=check@:>@])],
++  [], with_sasl=check)
++
+ sasl2_header="no"
+ SASL2_LIBS=""
++if test "x$with_sasl" != xno; then
++  KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
++  if test "$sasl2_header" = "yes" ; then
++    KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2")
++  fi
+ 
+-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
+-if test "$sasl2_header" = "yes" ; then
+-  KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2")
+-fi
++  if test "x$SASL2_LIBS" != "x" ; then
++    AC_DEFINE_UNQUOTED(HAVE_LIBSASL2, 1, [Define if you have cyrus-sasl2 libraries])
++  fi
+ 
+-if test "x$SASL2_LIBS" != "x" ; then
+-  AC_DEFINE_UNQUOTED(HAVE_LIBSASL2, 1, [Define if you have cyrus-sasl2 libraries])
++  if test "x$with_sasl" != xcheck && test -z "$SASL2_LIBS"; then
++    AC_MSG_ERROR([--with-sasl was given, but test for cyrus-sasl failed])
++  fi
+ fi
++
+ AC_SUBST(SASL2_LIBS)
+ 
+ AM_CONDITIONAL(compile_kio_sieve, test -n "$SASL2_LIBS")
+diff -Nur kdepim-3.4.2.orig/kmobile/devices/gnokii/configure.in.in kdepim-3.4.2/kmobile/devices/gnokii/configure.in.in
+--- kdepim-3.4.2.orig/kmobile/devices/gnokii/configure.in.in	2005-05-23 14:11:26.000000000 +0200
++++ kdepim-3.4.2/kmobile/devices/gnokii/configure.in.in	2005-07-26 14:11:23.000000000 +0200
+@@ -1,7 +1,2 @@
+ # $Id: kdepim-3.4-configure.patch,v 1.1 2005/07/28 12:58:14 greg_g Exp $
+-
+-# check for libgnokii (Nokia mobile phone library)
+-KDE_CHECK_GNOKII
+-
+-AM_CONDITIONAL(include_gnokii_device, [test -n "$LIB_GNOKII"])
+-
++AM_CONDITIONAL(include_gnokii_device, test -n "$LIB_GNOKII")
diff --git a/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch b/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch
new file mode 100644
index 000000000000..e81200a10c50
--- /dev/null
+++ b/kde-base/kdepim/files/kdepim-3.4.2-gcc32.patch
@@ -0,0 +1,162 @@
+diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_oe.cxx kdepim-3.4.2/kmailcvt/filter_oe.cxx
+--- kdepim-3.4.2.orig/kmailcvt/filter_oe.cxx	2005-05-23 14:12:15.000000000 +0200
++++ kdepim-3.4.2/kmailcvt/filter_oe.cxx	2005-07-26 16:33:01.000000000 +0200
+@@ -389,15 +389,15 @@
+ {
+     bool found = false;
+     bool foundFilename = false;
+-    QString folder = "";
++    QString folder;
+     // we must do this because folder with more than one upper letter
+     // at start have maybe not a file named like the folder !!!
+     QString search = filename.lower();
+     
+     while (!found)
+     {
+-        for ( QValueList<QString[4]>::Iterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
+-            QString tmp[4] = *it;
++        for ( FolderStructureIterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
++            FolderStructure tmp = *it;
+             if(foundFilename == false) {
+                 QString _tmpFileName = tmp[1];
+                 _tmpFileName = _tmpFileName.lower();
+@@ -410,7 +410,7 @@
+                 QString _currentID = tmp[2];
+                 QString _parentID = tmp[3];
+                 if(_currentID == search) {
+-                    if(_parentID == "") { // this is the root of the folder
++                    if(_parentID.isEmpty()) { // this is the root of the folder
+                         found = true;
+                         break;
+                     } else {
+@@ -421,7 +421,7 @@
+             }
+         }
+         // need to break the while loop maybe in some cases
+-        if((foundFilename == false) && (folder == "")) return folder;
++        if((foundFilename == false) && (folder.isEmpty())) return folder;
+     }
+     return folder;
+ }
+diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_oe.hxx kdepim-3.4.2/kmailcvt/filter_oe.hxx
+--- kdepim-3.4.2.orig/kmailcvt/filter_oe.hxx	2005-05-23 14:12:15.000000000 +0200
++++ kdepim-3.4.2/kmailcvt/filter_oe.hxx	2005-07-26 16:33:01.000000000 +0200
+@@ -61,8 +61,17 @@
+     bool parsedFolder;
+     /** true if the current parsing file is the folder file */
+     bool currentIsFolderFile;
++
++    /** Folder structure with following  4 entries:
++        1. descriptive folder name 
++        2. filename 
++        3. ID of current folder
++        4. ID of parent folder 
++    */
++    typedef FolderStructureBase<4> FolderStructure;
+     /** matrix with information about the folder structure*/
+-    QValueList<QString[4]> folderStructure;
++    QValueList<FolderStructure> folderStructure;
++    typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
+ 
+     /** name of the current folder */
+     QString folderName;
+diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_pmail.cxx kdepim-3.4.2/kmailcvt/filter_pmail.cxx
+--- kdepim-3.4.2.orig/kmailcvt/filter_pmail.cxx	2005-05-23 14:12:15.000000000 +0200
++++ kdepim-3.4.2/kmailcvt/filter_pmail.cxx	2005-07-26 16:33:01.000000000 +0200
+@@ -325,8 +325,8 @@
+     
+     while (!found)
+     {
+-        for ( QValueList<QString[5]>::Iterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
+-            QString tmp[5] = *it;
++        for ( FolderStructureIterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
++            FolderStructure tmp = *it;
+             
+             QString _ID = tmp[2];
+             if(_ID == search) {
+diff -Nur kdepim-3.4.2.orig/kmailcvt/filter_pmail.hxx kdepim-3.4.2/kmailcvt/filter_pmail.hxx
+--- kdepim-3.4.2.orig/kmailcvt/filter_pmail.hxx	2005-05-23 14:12:15.000000000 +0200
++++ kdepim-3.4.2/kmailcvt/filter_pmail.hxx	2005-07-26 16:33:01.000000000 +0200
+@@ -50,8 +50,18 @@
+     QDir dir;
+     /**  pointer to the info */
+     FilterInfo * inf;
+-    /** QStringList with the foldernames, First String contains the ID, the second the folder */
+-    QValueList<QString[5]> folderMatrix;
++
++    /** Folder structure here has 5 entries. */
++    typedef FolderStructureBase<5> FolderStructure;
++    /** List with the folder matrix, which contains following strings:
++	1. type (2 for root-folder, 1 for folder, 0 for mailarchiv)
++	2. type (1 for root-folder, 3 for folder, 0 for mailarchiv)  
++	3. "ID:flag:filename" of folder/archiv   
++	4. "ID:name" of parent folder
++	5. name of folder/archiv
++    */
++    QValueList<FolderStructure> folderMatrix;
++    typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
+     
+     /** true, if the folderfile is parsed **/
+     bool folderParsed;
+diff -Nur kdepim-3.4.2.orig/kmailcvt/filters.hxx kdepim-3.4.2/kmailcvt/filters.hxx
+--- kdepim-3.4.2.orig/kmailcvt/filters.hxx	2005-05-23 14:12:15.000000000 +0200
++++ kdepim-3.4.2/kmailcvt/filters.hxx	2005-07-26 16:33:01.000000000 +0200
+@@ -85,6 +85,57 @@
+ };
+ 
+ 
++
++/** 
++* Glorified QString[N] for (a) understandability (b) older gcc compatibility. 
++*/
++template <unsigned int size> class FolderStructureBase
++{
++public:
++	typedef QString NString[size];
++	/** Constructor. Need a default constructor for QValueList. */
++	FolderStructureBase() {} ;
++
++	/** Constructor. Turn N QStrings into a folder structure 
++	*   description. 
++	*/
++	FolderStructureBase(const NString &s)
++	{
++	    for(unsigned int i=0; i<size; i++) d[i]=s[i];
++	} ;
++
++	/** Copy Constructor. */
++	FolderStructureBase(const FolderStructureBase &s)
++	{
++	    for(unsigned int i=0; i<size; i++) d[i]=s[i];
++	} ;
++
++	/** Assignment operator. Does the same thing as 
++	*   the copy constructor.
++	*/
++	FolderStructureBase &operator =(const FolderStructureBase &s)
++	{
++	    for(unsigned int i=0; i<size; i++) d[i]=s[i];
++	    return *this;
++	} ;
++
++	/** Access the different fields. There doesn't seem to
++	*   be a real semantics for the fields.
++	*/
++	const QString operator [](unsigned int i) const
++	{
++	    if (i<size) return d[i]; else return QString::null;
++	} ;
++
++	/** Access the different fields, for writing. */
++	QString &operator [](unsigned int i)
++	{
++	    Q_ASSERT(i<size);
++	    if (i<size) return d[i]; else return d[0];
++	} ;
++private:
++	QString d[size];
++} ;
++
+ #endif
+ 
+-// vim: ts=2 sw=2 et
diff --git a/kde-base/kdepim/kdepim-3.4.2.ebuild b/kde-base/kdepim/kdepim-3.4.2.ebuild
new file mode 100644
index 000000000000..150a802ea89c
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.2.ebuild,v 1.1 2005/07/28 12:58:14 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="crypt gnokii pda"
+
+DEPEND="~kde-base/kdebase-${PV}
+	>=dev-libs/cyrus-sasl-2
+	pda? ( app-pda/pilot-link dev-libs/libmal )
+	gnokii? ( app-mobilephone/gnokii )
+	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Fix compilation with gcc 3.2 (kde bug 106274). Applied for 3.4.3.
+	epatch "${FILESDIR}/kdepim-3.4.2-gcc32.patch"
+
+	# Configure patch. Applied for 3.5.
+	epatch "${FILESDIR}/kdepim-3.4-configure.patch"
+
+	# For the configure patch.
+	make -f admin/Makefile.common
+}
+
+src_compile() {
+	local myconf="--with-sasl $(use_with gnokii)"
+
+	kde_src_compile
+}
diff --git a/kde-base/kdetoys/ChangeLog b/kde-base/kdetoys/ChangeLog
index 13e1edd8db80..c01166766617 100644
--- a/kde-base/kdetoys/ChangeLog
+++ b/kde-base/kdetoys/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdetoys
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.114 2005/07/27 20:27:40 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.115 2005/07/28 12:58:48 greg_g Exp $
+
+*kdetoys-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.4.2.ebuild:
+  New version.
 
   27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdetoys-3.4.1.ebuild:
   Stable on hppa.
diff --git a/kde-base/kdetoys/files/digest-kdetoys-3.4.2 b/kde-base/kdetoys/files/digest-kdetoys-3.4.2
new file mode 100644
index 000000000000..ef7ae126ed24
--- /dev/null
+++ b/kde-base/kdetoys/files/digest-kdetoys-3.4.2
@@ -0,0 +1 @@
+MD5 86f954b4233937eb4cc7dd8f97bbe39f kdetoys-3.4.2.tar.bz2 3204626
diff --git a/kde-base/kdetoys/kdetoys-3.4.2.ebuild b/kde-base/kdetoys/kdetoys-3.4.2.ebuild
new file mode 100644
index 000000000000..6126014745a5
--- /dev/null
+++ b/kde-base/kdetoys/kdetoys-3.4.2.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.4.2.ebuild,v 1.1 2005/07/28 12:58:48 greg_g Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE toys"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""