Remove virtual/x11 dependency, use new patch set.

(Portage version: 2.1.2.5)

3 files changed, 73 insertions, 1 deletions

diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index 33bcdb29b93a..beff410ef528 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.89 2007/04/21 20:50:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.90 2007/04/30 20:00:28 carlo Exp $
+
+*kdesktop-3.5.6-r2 (30 Apr 2007)
+
+  30 Apr 2007; Carsten Lohrke <carlo@gentoo.org> +kdesktop-3.5.6-r2.ebuild:
+  Remove virtual/x11 dependency, use new patch set.
 
   21 Apr 2007; Raúl Porcel <armin76@gentoo.org> kdesktop-3.5.5-r1.ebuild:
   ia64 stable
diff --git a/kde-base/kdesktop/files/digest-kdesktop-3.5.6-r2 b/kde-base/kdesktop/files/digest-kdesktop-3.5.6-r2
new file mode 100644
index 000000000000..1d41d209c152
--- /dev/null
+++ b/kde-base/kdesktop/files/digest-kdesktop-3.5.6-r2
@@ -0,0 +1,6 @@
+MD5 805dd677fdd09a260cac73b39c3171e3 kdebase-3.5-patchset-04.tar.bz2 8502
+RMD160 419e527c8c2b00ca49eb395793374b3459989897 kdebase-3.5-patchset-04.tar.bz2 8502
+SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961 kdebase-3.5-patchset-04.tar.bz2 8502
+MD5 a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2 24155599
+RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c kdebase-3.5.6.tar.bz2 24155599
+SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e kdebase-3.5.6.tar.bz2 24155599
diff --git a/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild b/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild
new file mode 100644
index 000000000000..1f9141da7e37
--- /dev/null
+++ b/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild,v 1.1 2007/04/30 20:00:28 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-04.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="kdehiddenvisibility xscreensaver"
+
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
+	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
+	xscreensaver? ( x11-proto/scrnsaverproto )"
+	# Requires the desktop background settings module,
+	# so until we separate the kcontrol modules into separate ebuilds :-),
+	# there's a dep here
+RDEPEND="${DEPEND}
+	$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
+	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)
+	$(deprange $PV $MAXKDEVER kde-base/konqueror)
+	xscreensaver? ( x11-libs/libXScrnSaver )"
+
+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
+
+PATCHES="${FILESDIR}/${PN}-3.5.5-seli-xinerama.patch"
+
+src_unpack() {
+	kde-meta_src_unpack
+	# see bug #143375
+	sed  -e "s:SUBDIRS = . lock pics patterns programs init:SUBDIRS = . lock pics patterns programs:" \
+		-i kdesktop/Makefile.am
+}
+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() {
+	kde_pkg_postinst
+	mkdir -p "${PREFIX}/share/templates/.source/emptydir"
+}