Fix a few crash conditions. Do not depend on kde-base/kdm anymore, bug #140582.

(Portage version: 2.1.1)

3 files changed, 64 insertions, 1 deletions

diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index 7982669ff958..629c0ce4d666 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.60 2006/09/17 22:52:59 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.61 2006/09/18 01:09:29 carlo Exp $
+
+*kdesktop-3.5.4-r1 (18 Sep 2006)
+
+  18 Sep 2006; Carsten Lohrke <carlo@gentoo.org> +kdesktop-3.5.4-r1.ebuild:
+  Fix a few crash conditions. Do not depend on kde-base/kdm anymore, bug #140582.
 
   17 Sep 2006; Carsten Lohrke <carlo@gentoo.org> -kdesktop-3.4.3.ebuild:
   Drop KDE 3.4.
diff --git a/kde-base/kdesktop/files/digest-kdesktop-3.5.4-r1 b/kde-base/kdesktop/files/digest-kdesktop-3.5.4-r1
new file mode 100644
index 000000000000..6f288113b784
--- /dev/null
+++ b/kde-base/kdesktop/files/digest-kdesktop-3.5.4-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 882a9729c08b197caef2c8712c980d9c kdebase-3.5.4.tar.bz2 23636847
+RMD160 29f763ec9de2cf3437b94567b317642e7df5e295 kdebase-3.5.4.tar.bz2 23636847
+SHA256 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 kdebase-3.5.4.tar.bz2 23636847
diff --git a/kde-base/kdesktop/kdesktop-3.5.4-r1.ebuild b/kde-base/kdesktop/kdesktop-3.5.4-r1.ebuild
new file mode 100644
index 000000000000..f4490a1ef811
--- /dev/null
+++ b/kde-base/kdesktop/kdesktop-3.5.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.4-r1.ebuild,v 1.1 2006/09/18 01:09:29 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
+
+DESCRIPTION="KDesktop is the KDE interface that handles the icons, desktop popup menus and the screensaver system."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="xscreensaver"
+
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
+	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
+	xscreensaver? ( || ( x11-proto/scrnsaverproto <virtual/x11-7 ) )"
+	# Requires the desktop background settings module,
+	# so until we separate the kcontrol modules into separate ebuilds :-),
+	# there's a dep here
+RDEPEND="${DEPEND}
+	$(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
+	$(deprange 3.5.3 $MAXKDEVER kde-base/kdialog)
+	$(deprange $PV $MAXKDEVER kde-base/konqueror)
+	xscreensaver? ( || ( x11-libs/libXScrnSaver <virtual/x11-7 ) )"
+
+KMCOPYLIB="libkonq libkonq/"
+KMEXTRACTONLY="kcheckpass/kcheckpass.h
+	libkonq/
+	kdm/kfrontend/themer/
+	kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
+KMCOMPILEONLY="kcontrol/background
+	kdmlib/"
+KMNODOCS=true
+
+src_compile() {
+	myconf="${myconf} $(use_with xscreensaver)"
+	kde-meta_src_compile
+}
+
+src_install() {
+	# ugly, needs fixing: don't install kcontrol/background
+	kde-meta_src_install
+
+	rmdir "${D}/${PREFIX}/share/templates/.source/emptydir"
+}
+
+pkg_postinst() {
+	mkdir -p "${PREFIX}/share/templates/.source/emptydir"
+}