Apply the patches for kwin and kdebase-kioslaves.

Package-Manager: portage-2.1.2_pre3-r2

6 files changed, 367 insertions, 8 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 72e746f01a4f..2b9be2c621d1 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,13 @@
 # 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.312 2006/10/11 11:11:49 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.313 2006/10/16 22:36:19 flameeyes Exp $
+
+*kdebase-3.5.5-r1 (16 Oct 2006)
+
+  16 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdebase-kioslaves-3.5.5-fstab.patch,
+  +files/kwin-3.5.5-input-shape.patch, +kdebase-3.5.5-r1.ebuild:
+  Apply the patches for kwin and kdebase-kioslaves.
 
   11 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
   files/digest-kdebase-3.5.5, Manifest:
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index abbcfe7085c9..3f6b101de427 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -57,6 +57,10 @@ AUX kdebase-kioslaves-3.5.4-dbuscrash.patch 634 RMD160 6edaeef25e548c9626bc040fa
 MD5 69db6d085265e9a44d90a99061329859 files/kdebase-kioslaves-3.5.4-dbuscrash.patch 634
 RMD160 6edaeef25e548c9626bc040fa6d265f4f60bf69c files/kdebase-kioslaves-3.5.4-dbuscrash.patch 634
 SHA256 b206db33a2dbde889f1ce90bc352634542c70e6f8fe20c483d94cb5a6302b312 files/kdebase-kioslaves-3.5.4-dbuscrash.patch 634
+AUX kdebase-kioslaves-3.5.5-fstab.patch 3103 RMD160 53a4f0ded4d368f93eb29650d12d266735d7bf9e SHA1 1ffe0d67e77970774a5a2420f79b0579716dc8a7 SHA256 6a17470a3245a59c6e84a0142e64633e74b2bb12649e9c46c0903dd8fa4edb29
+MD5 76bc9dcbf83bccc0cbb0aaaf8560772e files/kdebase-kioslaves-3.5.5-fstab.patch 3103
+RMD160 53a4f0ded4d368f93eb29650d12d266735d7bf9e files/kdebase-kioslaves-3.5.5-fstab.patch 3103
+SHA256 6a17470a3245a59c6e84a0142e64633e74b2bb12649e9c46c0903dd8fa4edb29 files/kdebase-kioslaves-3.5.5-fstab.patch 3103
 AUX kdebase-startkde-3.5.3-xinitrcd.patch 596 RMD160 abc33f225160eed8db35d64e6c88099463bb2b20 SHA1 bcc9ffbaa6a3c247867a9f1417aa40f750e0d5e5 SHA256 22d894acb04d9bcf2c4b2a072b7d1bbfa0370f51e2b44c0dc1a40e05cca5c497
 MD5 b39a32f7368059e5587e374927714700 files/kdebase-startkde-3.5.3-xinitrcd.patch 596
 RMD160 abc33f225160eed8db35d64e6c88099463bb2b20 files/kdebase-startkde-3.5.3-xinitrcd.patch 596
@@ -81,6 +85,10 @@ AUX kwin-3.5.2-parallel-make.diff 920 RMD160 2a1a02fa56e2b7c79601d38abd08388c54b
 MD5 acbb4de9f0ed620e73cf727388f64315 files/kwin-3.5.2-parallel-make.diff 920
 RMD160 2a1a02fa56e2b7c79601d38abd08388c54b2f3d0 files/kwin-3.5.2-parallel-make.diff 920
 SHA256 5160b4419c302cb01a71dd8a28f804bcd8c1eabad5b345d62765d64cee3f0660 files/kwin-3.5.2-parallel-make.diff 920
+AUX kwin-3.5.5-input-shape.patch 2920 RMD160 d059a3386e6ff4ed06b5c843cc68105524808820 SHA1 3e1d3993ba87c157c6bf2c2db9f07a235e657568 SHA256 29f7c0677f0d799f983122e5ce05689ac326046452b6c9f6f71d2488161ac9db
+MD5 acec9d692344d8f456265c517248496b files/kwin-3.5.5-input-shape.patch 2920
+RMD160 d059a3386e6ff4ed06b5c843cc68105524808820 files/kwin-3.5.5-input-shape.patch 2920
+SHA256 29f7c0677f0d799f983122e5ce05689ac326046452b6c9f6f71d2488161ac9db files/kwin-3.5.5-input-shape.patch 2920
 AUX nsplugins-3.5.3-applet-redirects.patch 2317 RMD160 dcced9a334b8ffa745f92e934450d96257dcfde8 SHA1 f41bd9752c71c39249850f9ebb192b208f47e196 SHA256 7f6b1f2a81877404326b1aac04ffc30d1c74e2b2d1f54c6111c2911f8afc36da
 MD5 70a6642163fca943fb5beb6fd73fc5d6 files/nsplugins-3.5.3-applet-redirects.patch 2317
 RMD160 dcced9a334b8ffa745f92e934450d96257dcfde8 files/nsplugins-3.5.3-applet-redirects.patch 2317
@@ -113,14 +121,18 @@ EBUILD kdebase-3.5.4.ebuild 5736 RMD160 cf58383e8124d912fc4824b4b2e7c993f3aff5f5
 MD5 9cff00a4a3511e7967868205651b1914 kdebase-3.5.4.ebuild 5736
 RMD160 cf58383e8124d912fc4824b4b2e7c993f3aff5f5 kdebase-3.5.4.ebuild 5736
 SHA256 7a69a6e2cecfbf02ce2c01d428e2a91a2b087b22345702495a7f3490ec87c710 kdebase-3.5.4.ebuild 5736
+EBUILD kdebase-3.5.5-r1.ebuild 6018 RMD160 687c2914d904ce8764deedba3a1f7020a493bfef SHA1 af69273f1de6d58444244fe0991baef2e2c3cf75 SHA256 bd0be9006e8d6462ad491ab9de7a3d06ffacf8ea7e9369e145e63fa355acbba5
+MD5 7ec6d3c39efe2a20623a92a9b19fe0e9 kdebase-3.5.5-r1.ebuild 6018
+RMD160 687c2914d904ce8764deedba3a1f7020a493bfef kdebase-3.5.5-r1.ebuild 6018
+SHA256 bd0be9006e8d6462ad491ab9de7a3d06ffacf8ea7e9369e145e63fa355acbba5 kdebase-3.5.5-r1.ebuild 6018
 EBUILD kdebase-3.5.5.ebuild 5887 RMD160 6bc8c5348fb6828271b9ac50e61a6f13ccc1cb64 SHA1 85ba48b7aea8385e2629750fe6ff957f48fcc72a SHA256 30ffad371264d3e3da025d8607a8f900c15b7b9d07001d30c61d492f6ffd793b
 MD5 26e559feba28f7a8c81210f74e660eb0 kdebase-3.5.5.ebuild 5887
 RMD160 6bc8c5348fb6828271b9ac50e61a6f13ccc1cb64 kdebase-3.5.5.ebuild 5887
 SHA256 30ffad371264d3e3da025d8607a8f900c15b7b9d07001d30c61d492f6ffd793b kdebase-3.5.5.ebuild 5887
-MISC ChangeLog 54120 RMD160 ee333dcfb4d3b6d7eae36c5195b32901b7422b51 SHA1 b7e752647a9a0ee6c5d01d95e14c200127be931b SHA256 3b4715fc97cfbe38c712b010a54c6cce59ad2490874c53ffb62b050a9bd0a415
-MD5 524001d682d1ab2812c0e9dc878b878f ChangeLog 54120
-RMD160 ee333dcfb4d3b6d7eae36c5195b32901b7422b51 ChangeLog 54120
-SHA256 3b4715fc97cfbe38c712b010a54c6cce59ad2490874c53ffb62b050a9bd0a415 ChangeLog 54120
+MISC ChangeLog 54368 RMD160 a29fa9b55eae71463c71346c95fd3463f6d42042 SHA1 f378711895cd9a7b54d97cdb7210f6a58d1764fb SHA256 565c559793b6347ecb50dcbbb90b8d90a804f3c2b286a4ad62b7ae629ef81f90
+MD5 0bc3666c6fe91f0c0c9e3c559e7b5b58 ChangeLog 54368
+RMD160 a29fa9b55eae71463c71346c95fd3463f6d42042 ChangeLog 54368
+SHA256 565c559793b6347ecb50dcbbb90b8d90a804f3c2b286a4ad62b7ae629ef81f90 ChangeLog 54368
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -140,10 +152,13 @@ SHA256 57967b3edb5abfc41e2ac6b719634e3326019f8d3f65de0b0065ed4e8eb2d7e0 files/di
 MD5 4413bb62e0a3313d499ee48fb91adfaf files/digest-kdebase-3.5.5 521
 RMD160 4631b6a312d8f0a17d62d4a7f98bb92ab09fa8d1 files/digest-kdebase-3.5.5 521
 SHA256 f8d736f629130da8e0d90a8ebd0a550634334af2739900a17d0e04c688b248e2 files/digest-kdebase-3.5.5 521
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLNF8QVeVlgLp4x8RAtY1AJ9x5IcasbBsw3OrD9cxMiXsbHN4XACcDpVd
-wwpEDBYowZbyG8OG0b2fLpc=
-=5Eww
+iD8DBQFFNAl1AiZjviIA2XgRAsncAKCfIEACjwx0e0IBFQx0jW8Ludy0KwCgqoax
+VarJtiHj3ZKmqEJtn7BAKAU=
+=IM2B
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.5-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.5-r1
new file mode 100644
index 000000000000..f51965cf1cbe
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.5.5-r1
@@ -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/kdebase-kioslaves-3.5.5-fstab.patch b/kde-base/kdebase/files/kdebase-kioslaves-3.5.5-fstab.patch
new file mode 100644
index 000000000000..3f0721e75fb7
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-kioslaves-3.5.5-fstab.patch
@@ -0,0 +1,73 @@
+From: Stephan Kulow <coolo@kde.org>
+To: kde-commits@kde.org
+Subject: branches/KDE/3.5/kdebase/kioslave/media/mediamanager
+Date: Mon, 09 Oct 2006 09:32:17 +0000
+Message-Id: <1160386337.725673.25740.nullmailer@svn.kde.org>
+Cc: kde-packager@kde.org
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+X-Length: 6245
+
+SVN commit 593835 by coolo:
+
+devices that are in fstab should show up no matter what HAL thinks
+CCMAIL: kde-packager@kde.org
+
+
+ M  +16 -7     halbackend.cpp  
+
+
+--- branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp #593834:593835
+@@ -215,11 +215,6 @@
+              !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) )
+             return;
+ 
+-        if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
+-               !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
+-             ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
+-            return;
+-
+         /* Query drive udi */
+         QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
+         /* We don't list floppy volumes because we list floppy drives */
+@@ -240,7 +235,19 @@
+ 
+         /* Create medium */
+         Medium* medium = new Medium(udi, "");
++        setVolumeProperties(medium);
+ 
++        if ( isInFstab( medium ).isNull() )
++        {
++            // if it's not mountable by user and not by HAL, don't show it at all
++            if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
++                   !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
++                 ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
++            {
++                delete medium;
++                return;
++            }
++        }
+         QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
+         kdDebug() << "automount " << options["automount"] << endl;
+         if (options["automount"] == "true" && allowNotification ) {
+@@ -248,7 +255,6 @@
+             if (!error.isEmpty())
+                 kdDebug() << "error " << error << endl;
+         }
+-        setVolumeProperties(medium);
+         m_mediaList.addMedium(medium, allowNotification);
+ 
+         return;
+@@ -992,7 +998,10 @@
+ 
+     for (; it!=end; ++it)
+     {
+-        kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl;
++        QString reald = (*it)->realDeviceName();
++        if ( reald.endsWith( "/" ) )
++            reald = reald.left( reald.length() - 1 );
++        kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl;
+         if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) )
+ 	{
+             QStringList opts = (*it)->mountOptions();
diff --git a/kde-base/kdebase/files/kwin-3.5.5-input-shape.patch b/kde-base/kdebase/files/kwin-3.5.5-input-shape.patch
new file mode 100644
index 000000000000..94cd32d24636
--- /dev/null
+++ b/kde-base/kdebase/files/kwin-3.5.5-input-shape.patch
@@ -0,0 +1,63 @@
+From l.lunak@kde.org Tue Oct 10 12:25:53 2006
+To: kde-commits@kde.org
+Subject: branches/KDE/3.5/kdebase/kwin
+Message-Id: <1160475953.522428.2616.nullmailer@svn.kde.org>
+Cc: kde-packager@kde.org,
+ 135250-done@bugs.kde.org
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+X-Length: 6070
+X-UID: 85
+
+SVN commit 594159 by lunakl:
+
+Build the input shape on a helper window instead of directly,
+this avoids having a hole in the shape temporarily. This seems
+to break non-click-to-focus mouse policies on some systems
+(works fine here though).
+BUG: 135250
+CCMAIL: kde-packager@kde.org
+
+
+
+ M  +19 -6     client.cpp  
+
+
+--- branches/KDE/3.5/kdebase/kwin/client.cpp #594158:594159
+@@ -477,16 +477,29 @@
+     // calls it or when the decoration is created/destroyed
+ 
+     if( Shape::version() >= 0x11 ) // 1.1, has input shape support
+-        { // there appears to be no way to find out if a window has input
+-          // shape set or not, so always set propagate the input shape
+-          // (it's the same like the bounding shape by default)
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0,
++        { // There appears to be no way to find out if a window has input
++          // shape set or not, so always propagate the input shape
++          // (it's the same like the bounding shape by default).
++          // Also, build the shape using a helper window, not directly
++          // in the frame window, because the sequence set-shape-to-frame,
++          // remove-shape-of-client, add-input-shape-of-client has the problem
++          // that after the second step there's a hole in the input shape
++          // until the real shape of the client is added and that can make
++          // the window lose focus (which is a problem with mouse focus policies)
++        static Window helper_window = None;
++        if( helper_window == None )
++            helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(),
++                0, 0, 1, 1, 0, 0, 0 );
++        XResizeWindow( qt_xdisplay(), helper_window, width(), height());
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0,
+                            frameId(), ShapeBounding, ShapeSet );
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput,
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput,
+                            clientPos().x(), clientPos().y(),
+                            window(), ShapeBounding, ShapeSubtract );
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput,
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput,
+                            clientPos().x(), clientPos().y(),
+                            window(), ShapeInput, ShapeUnion );
++        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0,
++                           helper_window, ShapeInput, ShapeSet );
+         }
+     }
diff --git a/kde-base/kdebase/kdebase-3.5.5-r1.ebuild b/kde-base/kdebase/kdebase-3.5.5-r1.ebuild
new file mode 100644
index 000000000000..bb9704f7acf7
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.5.5-r1.ebuild
@@ -0,0 +1,195 @@
+# 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-r1.ebuild,v 1.1 2006/10/16 22:36:19 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? ( >=sys-apps/dbus-0.33
+		   =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
+		) <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"
+
+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
+}