Add patch for KDE bug #134341. Thanks Piotr Jaroszynski (Peper) for reporting.

Package-Manager: portage-2.1.2_rc2-r1

5 files changed, 248 insertions, 8 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 2eb7c3e231e6..0f252dd4c3b5 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.320 2006/11/18 16:52:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.321 2006/11/22 19:08:55 flameeyes Exp $
+
+*kdebase-3.5.5-r2 (22 Nov 2006)
+
+  22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/nsplugins-3.5.5-npapi-64bit.patch, +kdebase-3.5.5-r2.ebuild:
+  Add patch for KDE bug #134341. Thanks Piotr Jaroszynski (Peper) for reporting.
 
   18 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   -kdebase-3.5.3-r3.ebuild, -kdebase-3.5.4.ebuild, -kdebase-3.5.4-r1.ebuild,
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index f2bd2c1a20a5..443b20e44b6f 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -93,6 +93,10 @@ AUX nsplugins-3.5.3-applet-redirects.patch 2317 RMD160 dcced9a334b8ffa745f92e934
 MD5 70a6642163fca943fb5beb6fd73fc5d6 files/nsplugins-3.5.3-applet-redirects.patch 2317
 RMD160 dcced9a334b8ffa745f92e934450d96257dcfde8 files/nsplugins-3.5.3-applet-redirects.patch 2317
 SHA256 7f6b1f2a81877404326b1aac04ffc30d1c74e2b2d1f54c6111c2911f8afc36da files/nsplugins-3.5.3-applet-redirects.patch 2317
+AUX nsplugins-3.5.5-npapi-64bit.patch 718 RMD160 c4420f4625bfde9eb5e647371297192f8831a28f SHA1 dd5c2a8f60810eaeee06fdb94537d33b698cae7f SHA256 932895b1724ad7bc21d0732130169b967f8704696a86cfa2a154f0129b6472f2
+MD5 da09cd773016524764a40b2106a098dc files/nsplugins-3.5.5-npapi-64bit.patch 718
+RMD160 c4420f4625bfde9eb5e647371297192f8831a28f files/nsplugins-3.5.5-npapi-64bit.patch 718
+SHA256 932895b1724ad7bc21d0732130169b967f8704696a86cfa2a154f0129b6472f2 files/nsplugins-3.5.5-npapi-64bit.patch 718
 AUX post-3.5.0-kdebase-kdm.diff 508 RMD160 0b223a8e364540d6c9e877e5f560fe855b50030f SHA1 327cd873bfeaea0665364b973245d744fa09c938 SHA256 95cc8feb448616e63eae37e3093bbdee690d04f8542f7f04aeab7926a6cffcf2
 MD5 9daecff07d57dabba35da247e752916a files/post-3.5.0-kdebase-kdm.diff 508
 RMD160 0b223a8e364540d6c9e877e5f560fe855b50030f files/post-3.5.0-kdebase-kdm.diff 508
@@ -110,10 +114,14 @@ EBUILD kdebase-3.5.5-r1.ebuild 6082 RMD160 f70df06a169fdef6bec48fb02d6efbfd5dd1a
 MD5 7edcd4e0dad6a9130923cfb53f3638b0 kdebase-3.5.5-r1.ebuild 6082
 RMD160 f70df06a169fdef6bec48fb02d6efbfd5dd1a6aa kdebase-3.5.5-r1.ebuild 6082
 SHA256 9123a0fb5298654f4b5bae0539a05a840c7f7d917bf1e437602e0f5e91468c61 kdebase-3.5.5-r1.ebuild 6082
-MISC ChangeLog 55251 RMD160 eeff48d7a6b4d1b8690bdb0fcc030f2faf4e002d SHA1 f53e34fb8789f97e92169aee787ac0fcee46014c SHA256 6dfcfb9810c9cf760e3a8e38f7649044e0f99e92b87d0a9db0c32030737b8efc
-MD5 4022bb79d4c8e09a30a78fa9b4bd26c2 ChangeLog 55251
-RMD160 eeff48d7a6b4d1b8690bdb0fcc030f2faf4e002d ChangeLog 55251
-SHA256 6dfcfb9810c9cf760e3a8e38f7649044e0f99e92b87d0a9db0c32030737b8efc ChangeLog 55251
+EBUILD kdebase-3.5.5-r2.ebuild 6136 RMD160 921281a5d0245fcf3c437d8f6f3ca3d1a68b15d5 SHA1 e317d78f76cf68d7e72a9b51f09e4146e9d12b37 SHA256 f1059c368430a656515cbf80bdb9c0ace33145e57b327d405668849a3b47676a
+MD5 1e8465004f15517c27027b5bf8755310 kdebase-3.5.5-r2.ebuild 6136
+RMD160 921281a5d0245fcf3c437d8f6f3ca3d1a68b15d5 kdebase-3.5.5-r2.ebuild 6136
+SHA256 f1059c368430a656515cbf80bdb9c0ace33145e57b327d405668849a3b47676a kdebase-3.5.5-r2.ebuild 6136
+MISC ChangeLog 55489 RMD160 1bed7ef25cda4a9af2b7917b925eaa0b01223581 SHA1 703ac96a641770f92e5a2a99ae418d348219ea9f SHA256 2dd39950c145afedea5d2e3b61f7141210e66caf80c14ebc913d358d284effc1
+MD5 1685e7f1ea6f368beb017e0cb4ea3b66 ChangeLog 55489
+RMD160 1bed7ef25cda4a9af2b7917b925eaa0b01223581 ChangeLog 55489
+SHA256 2dd39950c145afedea5d2e3b61f7141210e66caf80c14ebc913d358d284effc1 ChangeLog 55489
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -124,10 +132,13 @@ SHA256 597ab4944116d710976429afa6318b5eb3243417225fe3db430c63d2568dfcba files/di
 MD5 4413bb62e0a3313d499ee48fb91adfaf files/digest-kdebase-3.5.5-r1 521
 RMD160 4631b6a312d8f0a17d62d4a7f98bb92ab09fa8d1 files/digest-kdebase-3.5.5-r1 521
 SHA256 f8d736f629130da8e0d90a8ebd0a550634334af2739900a17d0e04c688b248e2 files/digest-kdebase-3.5.5-r1 521
+MD5 4413bb62e0a3313d499ee48fb91adfaf files/digest-kdebase-3.5.5-r2 521
+RMD160 4631b6a312d8f0a17d62d4a7f98bb92ab09fa8d1 files/digest-kdebase-3.5.5-r2 521
+SHA256 f8d736f629130da8e0d90a8ebd0a550634334af2739900a17d0e04c688b248e2 files/digest-kdebase-3.5.5-r2 521
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXzpaAiZjviIA2XgRAj9GAKCxRMYvXC75Vte0EHYSggRx34V40gCcCk9y
-L1qSvAy4wDhVQiJ6HF7w1aM=
-=HswK
+iD8DBQFFZKBQAiZjviIA2XgRAjzeAJ0eLzO8J1/BoIk+CWIKnoQt94SAJQCg9M4z
+V0JdqyarC6/TxBTiVlCZov0=
+=Pp7o
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.5-r2 b/kde-base/kdebase/files/digest-kdebase-3.5.5-r2
new file mode 100644
index 000000000000..f51965cf1cbe
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.5.5-r2
@@ -0,0 +1,6 @@
+MD5 420445e2dbddfd83ebc25e85a9b9cdda kdebase-3.5-patchset-03.tar.bz2 21409
+RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 kdebase-3.5-patchset-03.tar.bz2 21409
+SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 kdebase-3.5-patchset-03.tar.bz2 21409
+MD5 0c685af1cbca75f9c77b3ed231ba0468 kdebase-3.5.5.tar.bz2 23851886
+RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 kdebase-3.5.5.tar.bz2 23851886
+SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 kdebase-3.5.5.tar.bz2 23851886
diff --git a/kde-base/kdebase/files/nsplugins-3.5.5-npapi-64bit.patch b/kde-base/kdebase/files/nsplugins-3.5.5-npapi-64bit.patch
new file mode 100644
index 000000000000..090219caa0b4
--- /dev/null
+++ b/kde-base/kdebase/files/nsplugins-3.5.5-npapi-64bit.patch
@@ -0,0 +1,20 @@
+--- kdebase-3.4.2/nsplugins/sdk/npapi.h.npapi-64bit-fixes	2005-05-23 14:14:25.000000000 +0200
++++ kdebase-3.4.2/nsplugins/sdk/npapi.h	2006-11-13 10:49:45.000000000 +0100
+@@ -58,7 +58,7 @@
+ typedef unsigned short uint16;
+ #endif
+ #ifndef _UINT32
+-#if defined(__alpha)
++#if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
+ typedef unsigned int uint32;
+ #else /* __alpha */
+ typedef unsigned long uint32;
+@@ -68,7 +68,7 @@ typedef unsigned long uint32;
+ typedef short int16;
+ #endif
+ #ifndef _INT32
+-#if defined(__alpha) || defined(_AIX)
++#if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
+ typedef int int32;
+ #else /* __alpha || _AIX */
+ typedef long int32;
diff --git a/kde-base/kdebase/kdebase-3.5.5-r2.ebuild b/kde-base/kdebase/kdebase-3.5.5-r2.ebuild
new file mode 100644
index 000000000000..5d51090d35eb
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.5.5-r2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.5-r2.ebuild,v 1.1 2006/11/22 19:08:55 flameeyes Exp $
+
+inherit kde-dist eutils flag-o-matic
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
+pam samba ssl zeroconf xcomposite xscreensaver xinerama"
+# 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.2-r2 )
+	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? ( || ( dev-libs/dbus-qt3-old ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+		   =sys-apps/hal-0.5*
+		   sys-apps/pmount )
+	zeroconf? ( net-misc/mDNSResponder )
+	xcomposite? ( || ( (
+			x11-libs/libXcomposite
+			x11-libs/libXdamage
+			) <x11-base/xorg-x11-7 )
+		)
+	|| ( (
+			x11-libs/libX11
+			x11-libs/libXau
+			x11-libs/libXfixes
+			x11-libs/libXrender
+			x11-libs/libXtst
+			x11-libs/libXext
+			xscreensaver? ( x11-libs/libXScrnSaver )
+			xinerama? ( x11-libs/libXinerama )
+		) <virtual/x11-7 )"
+
+RDEPEND="${DEPEND}
+	sys-apps/usbutils
+	java? ( >=virtual/jre-1.4 )
+	kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) )
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-apps/xinit
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+			x11-apps/setxkbmap
+			x11-apps/xprop
+		) <virtual/x11-7 )"
+
+DEPEND="${DEPEND}
+	xcomposite? ( || ( (
+			x11-proto/compositeproto
+			x11-proto/damageproto
+			) <x11-base/xorg-x11-7 )
+		)
+	|| ( (
+			xscreensaver? ( x11-proto/scrnsaverproto )
+			xinerama? ( x11-proto/xineramaproto )
+			x11-apps/bdftopcf
+		) <virtual/x11-7 )
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch
+	${FILESDIR}/kdebase-kioslaves-3.5.5-fstab.patch
+	${FILESDIR}/kwin-3.5.5-input-shape.patch
+	${FILESDIR}/nsplugins-3.5.5-npapi-64bit.patch"
+
+pkg_setup() {
+	kde_pkg_setup
+	if use hal && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus qt3; then
+		eerror "To enable HAL support in this package is required to have"
+		eerror "sys-apps/dbus compiled with Qt 3 support."
+		eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"."
+		die "Please reemerge sys-apps/dbus with USE=\"qt3\"."
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	# Avoid using imake (kde bug 114466).
+	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
+	rm -f "${S}/configure"
+
+	# FIXME - disable broken tests
+	sed -i -e "s:TESTS =.*:TESTS =:" ${S}/kioslave/smtp/Makefile.am || die "sed failed"
+	sed -i -e "s:TESTS =.*:TESTS =:" ${S}/kioslave/trash/Makefile.am || die "sed failed"
+	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed"
+}
+
+src_compile() {
+	local myconf="--with-dpms
+				  $(use_with arts) $(use_with ldap)
+				  $(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)
+				  $(use_enable zeroconf dnssd)
+				  $(use_with xcomposite composite)
+				  $(use_with xscreensaver)
+				  $(use_with xinerama)
+				  --with-usbids=/usr/share/misc/usb.ids"
+
+	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"
+
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	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=:" \
+		"${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
+	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.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
+}