Update to KDE 3.4.2.

(Portage version: 2.0.51.22-r2)

4 files changed, 332 insertions, 1 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index e84a60a8496f..059550e97692 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.211 2005/07/25 19:44:23 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.212 2005/07/28 13:01:46 greg_g Exp $
+
+*kdebase-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  files/kdebase-3.4.1-configure.patch, +kdebase-3.4.2.ebuild:
+  New version. Add configure patch (#81966).
 
   25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdebase-3.4.1-r1.ebuild:
   Stable on hppa.
diff --git a/kde-base/kdebase/files/digest-kdebase-3.4.2 b/kde-base/kdebase/files/digest-kdebase-3.4.2
new file mode 100644
index 000000000000..d855af2ae699
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.4.2
@@ -0,0 +1 @@
+MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kdebase/files/kdebase-3.4-configure.patch b/kde-base/kdebase/files/kdebase-3.4-configure.patch
new file mode 100644
index 000000000000..4df19e3721f9
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-3.4-configure.patch
@@ -0,0 +1,194 @@
+diff -Nur kdebase-3.4.2.orig/kcontrol/input/configure.in.bot kdebase-3.4.2/kcontrol/input/configure.in.bot
+--- kdebase-3.4.2.orig/kcontrol/input/configure.in.bot	2005-05-23 14:13:38.000000000 +0200
++++ kdebase-3.4.2/kcontrol/input/configure.in.bot	2005-07-28 13:35:17.000000000 +0200
+@@ -1,10 +1,4 @@
+-if test "$LUSBLIB" = "no"; then
+-  echo
+-  echo "   Problem!  libusb library not found, get it from"
+-  echo "   http://libusb.sourceforge.net"
+-fi
+-
+-if (test x"$USB_LIBS" = x""); then
++if test "x$with_libusb" = xcheck && test "x$have_libusb" = xno; then
+   echo ""
+   echo "Logitech mouse support is disabled. Provide libusb to enable it."
+   echo ""
+diff -Nur kdebase-3.4.2.orig/kcontrol/input/configure.in.in kdebase-3.4.2/kcontrol/input/configure.in.in
+--- kdebase-3.4.2.orig/kcontrol/input/configure.in.in	2005-05-23 14:13:38.000000000 +0200
++++ kdebase-3.4.2/kcontrol/input/configure.in.in	2005-07-28 13:35:17.000000000 +0200
+@@ -1,19 +1,26 @@
+-LIBUSBCONFIG=""
+-AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no)
+-if test $LIBUSBCONFIG = "no"  ; then
+-    AC_MSG_WARN(Can't find libusb-config)
+-    AC_MSG_WARN(Check your libusb installation)
+-    USB_LIBS=""
+-    USB_CFLAGS=""
+-else  
+-    USB_LIBS="$($LIBUSBCONFIG --libs)"
+-    USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
+-AC_CHECK_LIB(usb,main,
+-    AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb]),
+-    [],
+-    $USB_LIBS
+-)
++AC_ARG_WITH(libusb,
++    [AS_HELP_STRING(--with-libusb,
++        [enable control of some mouse models through libusb @<:@default=check@:>@])],
++    [], with_libusb=check)
++
++USB_LIBS=
++USB_CFLAGS=
++have_libusb=no
++if test "x$with_libusb" != xno; then
++    AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no)
++    if test $LIBUSBCONFIG != "no"; then
++        USB_LIBS="$($LIBUSBCONFIG --libs)"
++        USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
++    
++        AC_CHECK_LIB(usb,main,
++            [have_libusb=yes
++             AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])],
++            [], [$USB_LIBS]
++        )
++    fi
++    if test "x$with_libusb" != xcheck && test "x$have_libusb" = xno; then
++        AC_MSG_FAILURE([--with-libusb was given, but test for libusb failed])
++    fi
+ fi
+ AC_SUBST(USB_LIBS)
+ AC_SUBST(USB_CFLAGS)
+-
+diff -Nur kdebase-3.4.2.orig/kcontrol/view1394/configure.in.in kdebase-3.4.2/kcontrol/view1394/configure.in.in
+--- kdebase-3.4.2.orig/kcontrol/view1394/configure.in.in	2005-05-23 14:13:48.000000000 +0200
++++ kdebase-3.4.2/kcontrol/view1394/configure.in.in	2005-07-28 13:35:17.000000000 +0200
+@@ -1,3 +1,15 @@
++AC_ARG_WITH(libraw1394,
++  [AS_HELP_STRING(--with-libraw1394,
++    [enable visualization of ieee1394 devices through libraw1394 @<:@default=check@:>@])],
++  [], with_libraw1394=check)
++
+ VIEW1394_SUBDIR=
+-KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394)
++if test "x$with_libraw1394" != xno; then
++  KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394)
++
++  if test "x$with_libraw1394" != xcheck && test -z "$VIEW1394_SUBDIR"; then
++    AC_MSG_FAILURE([--with-libraw1394 was given, but test for libraw1394 failed])
++  fi
++fi
++
+ AM_CONDITIONAL(include_kcontrol_view1394, test -n "$VIEW1394_SUBDIR")
+diff -Nur kdebase-3.4.2.orig/kioslave/smb/configure.in.bot kdebase-3.4.2/kioslave/smb/configure.in.bot
+--- kdebase-3.4.2.orig/kioslave/smb/configure.in.bot	2005-05-23 14:14:19.000000000 +0200
++++ kdebase-3.4.2/kioslave/smb/configure.in.bot	2005-07-28 13:35:17.000000000 +0200
+@@ -1,4 +1,4 @@
+-if test "$have_libsmbclient" = no; then
++if test "x$with_samba" = xcheck && test "x$have_libsmbclient" = xno; then
+   echo ""
+   echo "You're missing libsmbclient from samba 3.0"
+   echo "KDE will not be able to browse windows shares without it,"
+diff -Nur kdebase-3.4.2.orig/kioslave/smb/configure.in.in kdebase-3.4.2/kioslave/smb/configure.in.in
+--- kdebase-3.4.2.orig/kioslave/smb/configure.in.in	2005-05-23 14:14:19.000000000 +0200
++++ kdebase-3.4.2/kioslave/smb/configure.in.in	2005-07-28 13:35:17.000000000 +0200
+@@ -1,20 +1,34 @@
+ AC_DEFUN([SMB_CHECK],
+ [
+ AC_REQUIRE([KDE_CHECK_LARGEFILE])
+-have_libsmbclient=yes
+-KDE_CHECK_HEADER(libsmbclient.h, ,[have_libsmbclient=no] )
+-KDE_CHECK_LIB(smbclient, smbc_new_context, [] ,[have_libsmbclient=no])
+ 
+-AM_CONDITIONAL(include_kioslave_smb, test "$have_libsmbclient" = yes)
++AC_ARG_WITH(samba,
++  [AS_HELP_STRING(--with-samba,
++    [enable the samba ioslave @<:@default=check@:>@])],
++  [], with_samba=check)
+ 
+-SMBCLIENT_EXTRA_LIBS=""
+-AC_CHECK_FUNC(yp_get_default_domain, [],
++have_libsmbclient=no
++if test "x$with_samba" != xno; then
++  have_libsmbclient=yes
++  KDE_CHECK_HEADER(libsmbclient.h, [], [have_libsmbclient=no])
++  KDE_CHECK_LIB(smbclient, smbc_new_context, [], [have_libsmbclient=no])
++
++  SMBCLIENT_EXTRA_LIBS=""
++  AC_CHECK_FUNC(yp_get_default_domain, [],
+   [
+      KDE_CHECK_LIB(nsl, yp_get_default_domain, 
+            [SMBCLIENT_EXTRA_LIBS="-lnsl"] )
+   ])
+ 
+-AC_SUBST(SMBCLIENT_EXTRA_LIBS)
++  AC_SUBST(SMBCLIENT_EXTRA_LIBS)
++
++  if test "x$with_samba" != xcheck && test "x$have_libsmbclient" = xno; then
++    AC_MSG_FAILURE([--with-samba was given, but test for libsmbclient failed])
++  fi
++fi
++
++AM_CONDITIONAL(include_kioslave_smb, test "x$have_libsmbclient" = xyes)
++
+ ])
+ 
+ SMB_CHECK
+diff -Nur kdebase-3.4.2.orig/kioslave/thumbnail/configure.in.in kdebase-3.4.2/kioslave/thumbnail/configure.in.in
+--- kdebase-3.4.2.orig/kioslave/thumbnail/configure.in.in	2005-05-23 14:14:20.000000000 +0200
++++ kdebase-3.4.2/kioslave/thumbnail/configure.in.in	2005-07-28 13:35:59.000000000 +0200
+@@ -99,6 +99,18 @@
+   AC_SUBST(EXR_FLAGS)
+ ])
+ 
+-AC_FIND_LIBEXR
++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 -Nur kdebase-3.4.2.orig/ksysguard/configure.in.in kdebase-3.4.2/ksysguard/configure.in.in
+--- kdebase-3.4.2.orig/ksysguard/configure.in.in	2005-05-23 14:15:09.000000000 +0200
++++ kdebase-3.4.2/ksysguard/configure.in.in	2005-07-28 13:35:17.000000000 +0200
+@@ -23,11 +23,19 @@
+ AM_CONDITIONAL(include_ksysguardd_openbsd, test "$UNAME" = OpenBSD)
+ AC_SUBST(UNAME)
+ 
+-KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
+-AC_SUBST(LIBSENSORS)
++AC_ARG_WITH(sensors,
++	[AS_HELP_STRING(--with-sensors,
++		[enable support for lm_sensors @<:@default=check@:>@])],
++	[], with_sensors=check)
+ 
+-dnl Check for dell laptop support
+-AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
++if test "x$with_sensors" != xno; then
++	KDE_CHECK_HEADERS(sensors/sensors.h)
++	KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
++
++	if test "x$with_readline" != xcheck && test -z "$LIBSENSORS"; then
++        	AC_MSG_FAILURE([--with-sensors was given, but test for lm_sensors failed])
++	fi
++fi
+ 
+ case "$UNAME" in
+ 	Linux) LIBHOSTS="$LIBSENSORS" ;;
+@@ -35,5 +43,7 @@
+ 	Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
+ esac
+ AC_SUBST(LIBHOSTS)
++AC_SUBST(LIBSENSORS)
+ 
+-KDE_CHECK_HEADERS(sensors/sensors.h)
++dnl Check for dell laptop support
++AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
diff --git a/kde-base/kdebase/kdebase-3.4.2.ebuild b/kde-base/kdebase/kdebase-3.4.2.ebuild
new file mode 100644
index 000000000000..0e5f460e5194
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.4.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2.ebuild,v 1.1 2005/07/28 13:01:46 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl pam samba ssl"
+# hal: enables hal backend for 'media:' ioslave
+
+DEPEND="arts? ( ~kde-base/arts-${PV} )
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	pam? ( kde-base/kdebase-pam )
+	>=dev-libs/cyrus-sasl-2
+	ldap? ( >=net-nds/openldap-2 )
+	cups? ( net-print/cups )
+	ssl? ( dev-libs/openssl )
+	opengl? ( virtual/opengl )
+	openexr? ( >=media-libs/openexr-1.2 )
+	samba? ( >=net-fs/samba-3.0.4 )
+	lm_sensors? ( sys-apps/lm_sensors )
+	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
+	ieee1394? ( sys-libs/libraw1394 )
+	hal? ( =sys-apps/dbus-0.23*
+	       =sys-apps/hal-0.4* )"
+
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.4 )
+	virtual/eject"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch "${FILESDIR}/kdebase-3.4.1-startkde-gentoo.patch"
+
+	# Configure patch. Applied for 3.5.
+	epatch "${FILESDIR}/kdebase-3.4-configure.patch"
+
+	# For the configure patch.
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	local myconf="--with-dpms
+	              $(use_with arts) $(use_with ldap)
+	              $(use_with cups) $(use_with opengl gl)
+	              $(use_with ssl) $(use_with samba) $(use_with openexr)
+	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
+	              $(use_with ieee1394 libraw1394) $(use_with hal)"
+
+	if use pam; then
+		myconf="${myconf} --with-pam=yes"
+	else
+		myconf="${myconf} --with-pam=no --with-shadow"
+	fi
+
+	# the java test is problematic (see kde bug 100729) and
+	# useless. All that's needed for java applets to work is
+	# to have the 'java' executable in PATH.
+	myconf="${myconf} --without-java"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
+
+	# startup and shutdown scripts
+	insinto ${KDEDIR}/env
+	doins ${FILESDIR}/agent-startup.sh
+
+	exeinto ${KDEDIR}/shutdown
+	doexe ${FILESDIR}/agent-shutdown.sh
+
+	# freedesktop environment variables
+	cat <<EOF > ${T}/xdg.sh
+export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
+export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
+EOF
+	insinto ${KDEDIR}/env
+	doins ${T}/xdg.sh
+
+	# x11 session script
+	cat <<EOF > ${T}/kde-${SLOT}
+#!/bin/sh
+exec ${KDEDIR}/bin/startkde
+EOF
+	exeinto /etc/X11/Sessions
+	doexe ${T}/kde-${SLOT}
+
+	# freedesktop compliant session script
+	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
+		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
+	insinto /usr/share/xsessions
+	doins ${T}/kde-${SLOT}.desktop
+
+	# Customize the kdmrc configuration
+	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
+	       -e "s:#GreetFont=:GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0\n#GreetFont=:" \
+	       -e "s:#StdFont=:StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0\n#StdFont=:" \
+	       -e "s:#FailFont=:FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0\n#FailFont=:" \
+	       -e "s:#AntiAliasing=:AntiAliasing=true\n#AntiAliasing=:" \
+		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
+
+	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
+}
+
+pkg_postinst() {
+	# set the default kdm face icon if it's not already set by the system admin
+	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+	fi
+
+	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
+
+	echo
+	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
+	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
+	echo
+}