Split off kde-base/kfmclient from kde-base/konqueror

In order to not depend on konqueror in kde-base/kdebase-startkde,
kfmclient needs to be installed separately.  This entails adding a new
package, disabling the building of kfmclient in kde-base/konqueror,
adding the new package to metas and sets, adding a dependency on
kde-base/kfmclient to kde-base/kdebase-startkde, and adding appropriate
blockers on older version of kde-base/konqueror to kde-base/kfmclient.

This ended up touching many files in many directories; all changes in
this commit to 4.3.0 ebuilds will probably have to be committed to CVS
at the same time.

21 files changed, 435 insertions, 10 deletions

diff --git a/kde-base/kdebase-meta/Manifest b/kde-base/kdebase-meta/Manifest
index 56d45376bda..a3656f37696 100644
--- a/kde-base/kdebase-meta/Manifest
+++ b/kde-base/kdebase-meta/Manifest
@@ -1,5 +1,5 @@
-EBUILD kdebase-meta-4.3.0.ebuild 4210 RMD160 6f371babbf60d5333fdb47ff82823766b3efca85 SHA1 3a14f61a81e68fb2b276b6bcf4fb75d2b0a57dbc SHA256 54e7fa6f5b32902a248afae0ce3a254654484e3ce8d52fe2c21c41f938fb16c8
-EBUILD kdebase-meta-4.3.65.ebuild 4211 RMD160 f80b49c22d725854cbc72066d2eec66532cb6593 SHA1 bbe5f66c00f1c040c6152333eec79f2718290659 SHA256 4a6b5334ae8f30594573d97b17b899695a90e79ced76b5d4263681a3121eb317
-EBUILD kdebase-meta-4.3.9999.ebuild 4169 RMD160 1fbd2da8398c69dc1f36ef76bf94a84ad36a5646 SHA1 17b34cb0b0e96d3914582329ab5e5fa9145a3467 SHA256 11e61dc7b681c3fadd17853d65c70404fb2a3a582b77e535fb5cb5a13f67da44
-EBUILD kdebase-meta-9999.ebuild 4170 RMD160 522de7e312f947ac63fa57928d2bfb006330371c SHA1 3a534ba4679b0544bec5f5ad03659be808f288d0 SHA256 a07e07b893c5b054059fdaac9b050e372a7fbb1d17c75ef721b1e824b373f7d8
+EBUILD kdebase-meta-4.3.0-r1.ebuild 4258 RMD160 859637e05608928fc8938e9f3b932331f791ca96 SHA1 495dbc2a8572409efa2a858e8901375a91b80045 SHA256 667e17f7f3f0e17894195cbad6bb63852bbc16101223d6b72e4f343648afdba1
+EBUILD kdebase-meta-4.3.65-r1.ebuild 4259 RMD160 b6949777aafef8c9bab0b3a67614bc2e4f09844e SHA1 92e0261f6dbd0dc7b596ac121e01daa5436df266 SHA256 4ff237a0d96168a02b0e38a9d74fa217285b56cf2a0fab8f7d536ca6797e014a
+EBUILD kdebase-meta-4.3.9999.ebuild 4217 RMD160 72c772902f0adf7a1bb13b6151b1592afefdab75 SHA1 6154bd7aa4f85d4658e3a89c308abf31ee0e69a9 SHA256 f4f4451b5ff63ac3b495ec586672b2a53e4c75576b8217a90070a53c998a8687
+EBUILD kdebase-meta-9999.ebuild 4218 RMD160 dc046a8baa56c5b41969cbbd8f5ec85079b7a7f8 SHA1 732d2659618a4af822abb0091058e1444ed1a27c SHA256 1a9c19a7c3d3478ad730df66010b7925fd19ad16c89ab5afcf0569b48790e4c7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.3.0.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.3.0-r1.ebuild
index d431914f449..9e561492138 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.3.0.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.3.0-r1.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
 	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfile-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfind-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/khotkeys-${PV}:${SLOT}[kdeprefix=]
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.3.65.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.3.65-r1.ebuild
index 7d531214a45..7f25281ea8d 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.3.65.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.3.65-r1.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
 	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfile-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfind-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/khotkeys-${PV}:${SLOT}[kdeprefix=]
diff --git a/kde-base/kdebase-meta/kdebase-meta-4.3.9999.ebuild b/kde-base/kdebase-meta/kdebase-meta-4.3.9999.ebuild
index 120db241343..4211b9a9948 100644
--- a/kde-base/kdebase-meta/kdebase-meta-4.3.9999.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-4.3.9999.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
 	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfile-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfind-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/khotkeys-${PV}:${SLOT}[kdeprefix=]
diff --git a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild b/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
index 6f6b8355b9d..73196537394 100644
--- a/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-9999.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
 	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfile-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfind-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/khotkeys-${PV}:${SLOT}[kdeprefix=]
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 1514ac2b0d1..8ba489622df 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,8 +1,10 @@
 AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1abb7a1503a80d95e4db34fa7fe58accce6e8109 SHA256 6a2d645ef38d3db9d36166fac699848d07eb166f71a646d7f1466efeb394eb11
 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9
 AUX gentoo-startkde4.patch 2470 RMD160 590bd0604d20d254b4a7386bac436b5cd800188d SHA1 0ab1ae0f74100b8e506ebdc9e87dc94664da2f84 SHA256 31538cf162e7450cba61d76bd1b9a90b7e4669a8bf7fe7704d44ec9ab5832fe5
+DIST kdebase-workspace-4.3.0.tar.bz2 62293938 RMD160 08b3f5ca74c1b5688a1d26bf77acd42e9dd335c7 SHA1 9a27b91b2c8a673fbdd6ea88385de0327f10e248 SHA256 89e24bfccb442935779b777eed9401a7f4d45c464e44573ece6b65e636c21bad
 DIST kdebase-workspace-4.3.65.tar.lzma 61211187 RMD160 c0e346e037a9baef863b7a2107a9e221ef505a29 SHA1 017887bbedfaea1dc3502fca9c8d4ab2d6725e69 SHA256 99854ac054e6bf49e6b87ecb23d54f56a4a3e383f9516517fd7d3a4913860c34
-EBUILD kdebase-startkde-4.3.65.ebuild 4034 RMD160 173e05dc5c1937dba93ddd7acc23ecc270e3fd91 SHA1 49d8e1128dfbcd949d8151724923117e792d3a3f SHA256 44d762709bb712190962d6eb06d04559aa9d15e3f6bb4d8fc9fa6072199a1945
-EBUILD kdebase-startkde-4.3.9999.ebuild 3992 RMD160 317d80a6981b527e3cd00fa034f06b984768e79f SHA1 1e3f79d237c6cb6c3e378092df761b2bb2bc5538 SHA256 696f6b908b8f8ad7e7c835a54867b4e98a933364adcce2014d85caafb51adcdc
-EBUILD kdebase-startkde-9999.ebuild 3992 RMD160 317d80a6981b527e3cd00fa034f06b984768e79f SHA1 1e3f79d237c6cb6c3e378092df761b2bb2bc5538 SHA256 696f6b908b8f8ad7e7c835a54867b4e98a933364adcce2014d85caafb51adcdc
+EBUILD kdebase-startkde-4.3.0-r1.ebuild 4202 RMD160 db2ecd573591aefc67db3f36ce731fdb0e1b5ca2 SHA1 a15d9d59538f4937dbd8622c7de74bf4cc0e7155 SHA256 2c37dc1f576aba431d35e10d6232e776f0074336fad90d960f1cdaca585f84db
+EBUILD kdebase-startkde-4.3.65-r1.ebuild 4082 RMD160 50fe51a652b7399d0d22f9aed0b66ba5d60d0cc7 SHA1 d28d7844cc8b0c44d7eb588ea00f90e7f8a7c10b SHA256 e7508464308fa8e7d39ecbd95dae5352ea016161a404cd63af5a47e842b25f0c
+EBUILD kdebase-startkde-4.3.9999.ebuild 4040 RMD160 f4d160360c2f2e4ad990b2dbeed4357b59217fa7 SHA1 e25c7f98df15500b467f833a325f31c5277cfe0f SHA256 e2008217de800c53e2401a4fc4dea8695daf0516bcd820a3469fe7010d91ab34
+EBUILD kdebase-startkde-9999.ebuild 4040 RMD160 f4d160360c2f2e4ad990b2dbeed4357b59217fa7 SHA1 e25c7f98df15500b467f833a325f31c5277cfe0f SHA256 e2008217de800c53e2401a4fc4dea8695daf0516bcd820a3469fe7010d91ab34
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.0-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.0-r1.ebuild
new file mode 100644
index 00000000000..ac0f1e900e0
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.3.0-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.3.0.ebuild,v 1.2 2009/08/09 10:40:54 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+KMNOMODULE="true"
+inherit kde4-meta multilib
+
+DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# The KDE apps called from the startkde script.
+# These provide the most minimal KDE desktop.
+RDEPEND="
+	>=kde-base/kcminit-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kdebase-desktoptheme-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kdebase-wallpapers-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kreadconfig-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/krunner-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/ksmserver-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/ksplash-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kstartupconfig-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kstyles-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kwin-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/phonon-kde-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/plasma-apps-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/plasma-workspace-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/systemsettings-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kmimetypefinder-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=]
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	x11-apps/xset
+"
+
+KMEXTRACTONLY="
+	ConfigureChecks.cmake
+	kdm/
+	safestartkde.cmake
+	startkde.cmake
+"
+
+PATCHES=("${FILESDIR}/gentoo-startkde4.patch")
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Patch the startkde script to setup the environment for KDE
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${KDEDIR}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	# Sort the LDFLAGS out if necessary
+	if use kdeprefix; then
+		sed -e "s#@REPLACE_LDFLAGS@#export LDFLAGS=${_libdirs}:\$LDFLAGS#" \
+			-i startkde.cmake || die "Sed for LDPATH failed."
+	else
+		sed -e "s#@REPLACE_LDFLAGS@##" \
+			-i startkde.cmake || die "sed for LDPATH failed"
+	fi
+
+	# Complete LDPATH
+	sed -e "s#@REPLACE_LIBDIR@#$(get_libdir)#" \
+		-i startkde.cmake || die "Sed for REPLACE_LIBDIR failed."
+	# Now fix the prefix
+	sed -e "s#@REPLACE_PREFIX@#${KDEDIR}#" \
+		-i startkde.cmake || die "Sed for REPLACE_PREFIX failed."
+
+	# Replace applications menu prefix
+	sed -e "s#@REPLACE_MENU_PREFIX@#kde-${SLOT}-#" \
+		-i startkde.cmake || die "Sed for REPLACE_MENU_PREFIX failed."
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	# startup and shutdown scripts
+	if use kdeprefix; then
+		insinto "${KDEDIR}/env"
+	else
+		insinto "/etc/kde/startup"
+	fi
+	doins "${FILESDIR}/agent-startup.sh" || die "doexe agent-startup.sh failed"
+
+	if use kdeprefix; then
+		exeinto "${KDEDIR}/shutdown"
+	else
+		exeinto "/etc/kde/shutdown"
+	fi
+	doexe "${FILESDIR}/agent-shutdown.sh" || die "doexe agent-shutdown.sh failed"
+
+	# x11 session script
+	local DIR="kde-${SLOT}"
+	cat <<-EOF > "${T}/${DIR}"
+	#!/bin/sh
+	exec ${KDEDIR}/bin/startkde
+	EOF
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${DIR}" || die "doexe ${DIR} failed"
+
+	# freedesktop compliant session script
+	local KDE_X
+	if use kdeprefix; then
+		KDE_X="KDE-${SLOT}"
+	else
+		KDE_X="KDE-4"
+	fi
+	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
+		"${S}/kdm/kfrontend/sessions/kde.desktop.cmake" > "${T}/${KDE_X}.desktop"
+	insinto /usr/share/xsessions
+	doins "${T}/${KDE_X}.desktop" || die "doins ${KDE_X}.desktop failed"
+}
+
+pkg_postinst () {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	if use kdeprefix; then
+		elog "edit ${KDEDIR}/env/agent-startup.sh and"
+		elog "${KDEDIR}/shutdown/agent-shutdown.sh"
+	else
+		elog "edit /etc/kde/startup/agent-startup.sh and"
+		elog "/etc/kde/shutdown/agent-shutdown.sh"
+	fi
+	echo
+}
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.65.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.65-r1.ebuild
index d1f937ede22..ee8aa6bd7e0 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.3.65.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.3.65-r1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kdebase-wallpapers-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kmimetypefinder-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.9999.ebuild
index 686ae18f260..ac3c39a6807 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.3.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.3.9999.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kdebase-wallpapers-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kmimetypefinder-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index 686ae18f260..ac3c39a6807 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kdebase-wallpapers-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kmimetypefinder-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
diff --git a/kde-base/kfmclient/Manifest b/kde-base/kfmclient/Manifest
new file mode 100644
index 00000000000..ce8c5dbee64
--- /dev/null
+++ b/kde-base/kfmclient/Manifest
@@ -0,0 +1,7 @@
+DIST kdebase-4.3.0.tar.bz2 4260097 RMD160 13574180e2c032037640b01dd74011fdf6eef4ef SHA1 073ccad4728bef9ca8ba0f3849c8c6756be52199 SHA256 03ff78bbe298ca5525d6f2cda361cabfc355583c276fb22af0470ea2775f2f28
+DIST kdebase-4.3.65.tar.lzma 3799544 RMD160 b6b3f2f7fb56ce77740d596ba09becee51c69d9b SHA1 1ee8f9fd8e69d0d4ab58e66fd95c86fb2ba48707 SHA256 a18e1d592f97c738f6406e70e7bf4719e75aeb0f03dafc2cc12b38a4cc92e99e
+EBUILD kfmclient-4.3.0.ebuild 1249 RMD160 90442441dce3d72944e28e753aa7c5b36ff90c1d SHA1 facd4233989ee2f903a55a9ac1f058a835b48830 SHA256 8782dfc304259781b570d46ea3f488702920e420db728cdaa1a4f29bfe154836
+EBUILD kfmclient-4.3.65.ebuild 1251 RMD160 f8a8099da0dccd83ace03d1673418cbd8e022c7a SHA1 435be2c11685578b93bd9053b252a34d3c78a7c6 SHA256 428b49112a4501288ed688932abeec29e5f354714cb8a89c6c6d5286c6fca7c4
+EBUILD kfmclient-4.3.9999.ebuild 1207 RMD160 d26ac6331a2c6dbf137c1af7229e0babaf81ebc5 SHA1 d07b4a504d03eafefdc6164491fa8ff893a386f9 SHA256 843eb90b8d19d01a084b4a087414328ae15aa714094a7d59bc05677b3077e4d0
+EBUILD kfmclient-9999.ebuild 1209 RMD160 bf4f212a0eb26f726d0f69b4048072f7ec30b7da SHA1 7600b15d2bc59784028311079e2747eac2f210fe SHA256 e2aa0fdece9d1df2c4a5fa17153073cf15164720cbecbd23cf8591b11efa6d8b
+MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/kde-base/kfmclient/kfmclient-4.3.0.ebuild b/kde-base/kfmclient/kfmclient-4.3.0.ebuild
new file mode 100644
index 00000000000..8c6f1e4e05b
--- /dev/null
+++ b/kde-base/kfmclient/kfmclient-4.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="kdebase-apps"
+KMMODULE="konqueror/client"
+inherit kde4-meta
+
+DESCRIPTION="KDE tool for opening URLs from the command line"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+# Moved from kde-base/konqueror in 4.3.0-r2 and 4.3.65-r1, so ugly blockers...
+RDEPEND="
+	!kdeprefix? (
+		!kde-base/konqueror:kde-4[-kdeprefix]
+		!kde-base/konqueror:4.1[-kdeprefix]
+		!kde-base/konqueror:4.2[-kdeprefix]
+		!<=kde-base/konqueror-4.3.0-r1:4.3[-kdeprefix]
+		!<=kde-base/konqueror-4.3.65:4.4[-kdeprefix]
+	)
+	kdeprefix? ( !<=kde-base/konqueror-4.3.0-r1:4.3[kdeprefix] )
+	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRACTONLY="
+	konqueror/kfmclient.desktop
+	konqueror/kfmclient_dir.desktop
+	konqueror/kfmclient_html.desktop
+	konqueror/kfmclient_war.desktop
+	konqueror/src/org.kde.Konqueror.Main.xml
+	konqueror/src/org.kde.Konqueror.MainWindow.xml
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Do not install non-kfmclient *.desktop files
+	sed -i -e "/konqbrowser\.desktop/d" \
+		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
+		-e "/install(FILES profile/s/^/#DONOTWANT/" \
+		konqueror/CMakeLists.txt
+}
diff --git a/kde-base/kfmclient/kfmclient-4.3.65.ebuild b/kde-base/kfmclient/kfmclient-4.3.65.ebuild
new file mode 100644
index 00000000000..052d526e3a9
--- /dev/null
+++ b/kde-base/kfmclient/kfmclient-4.3.65.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="kdebase-apps"
+KMMODULE="konqueror/client"
+inherit kde4-meta
+
+DESCRIPTION="KDE tool for opening URLs from the command line"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+# Moved from kde-base/konqueror in 4.3.0-r2 and 4.3.65-r1, so ugly blockers...
+RDEPEND="
+	!kdeprefix? (
+		!kde-base/konqueror:kde-4[-kdeprefix]
+		!kde-base/konqueror:4.1[-kdeprefix]
+		!kde-base/konqueror:4.2[-kdeprefix]
+		!<=kde-base/konqueror-4.3.0-r1:4.3[-kdeprefix]
+		!<=kde-base/konqueror-4.3.65:4.4[-kdeprefix]
+	)
+	kdeprefix? ( !<=kde-base/konqueror-4.3.65:${SLOT}[kdeprefix] )
+	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRACTONLY="
+	konqueror/kfmclient.desktop
+	konqueror/kfmclient_dir.desktop
+	konqueror/kfmclient_html.desktop
+	konqueror/kfmclient_war.desktop
+	konqueror/src/org.kde.Konqueror.Main.xml
+	konqueror/src/org.kde.Konqueror.MainWindow.xml
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Do not install non-kfmclient *.desktop files
+	sed -i -e "/konqbrowser\.desktop/d" \
+		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
+		-e "/install(FILES profile/s/^/#DONOTWANT/" \
+		konqueror/CMakeLists.txt
+}
diff --git a/kde-base/kfmclient/kfmclient-4.3.9999.ebuild b/kde-base/kfmclient/kfmclient-4.3.9999.ebuild
new file mode 100644
index 00000000000..04d1afca430
--- /dev/null
+++ b/kde-base/kfmclient/kfmclient-4.3.9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="kdebase-apps"
+KMMODULE="konqueror/client"
+inherit kde4-meta
+
+DESCRIPTION="KDE tool for opening URLs from the command line"
+KEYWORDS=""
+IUSE="debug"
+
+# Moved from kde-base/konqueror in 4.3.0-r2 and 4.3.65-r1, so ugly blockers...
+RDEPEND="
+	!kdeprefix? (
+		!kde-base/konqueror:kde-4[-kdeprefix]
+		!kde-base/konqueror:4.1[-kdeprefix]
+		!kde-base/konqueror:4.2[-kdeprefix]
+		!<=kde-base/konqueror-4.3.0-r1:4.3[-kdeprefix]
+		!<=kde-base/konqueror-4.3.65:4.4[-kdeprefix]
+	)
+	kdeprefix? ( !<=kde-base/konqueror-4.3.0-r1:4.3[kdeprefix] )
+	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRACTONLY="
+	konqueror/kfmclient.desktop
+	konqueror/kfmclient_dir.desktop
+	konqueror/kfmclient_html.desktop
+	konqueror/kfmclient_war.desktop
+	konqueror/src/org.kde.Konqueror.Main.xml
+	konqueror/src/org.kde.Konqueror.MainWindow.xml
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Do not install non-kfmclient *.desktop files
+	sed -i -e "/konqbrowser\.desktop/d" \
+		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
+		-e "/install(FILES profile/s/^/#DONOTWANT/" \
+		konqueror/CMakeLists.txt
+}
diff --git a/kde-base/kfmclient/kfmclient-9999.ebuild b/kde-base/kfmclient/kfmclient-9999.ebuild
new file mode 100644
index 00000000000..3ca1dfd4227
--- /dev/null
+++ b/kde-base/kfmclient/kfmclient-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="kdebase-apps"
+KMMODULE="konqueror/client"
+inherit kde4-meta
+
+DESCRIPTION="KDE tool for opening URLs from the command line"
+KEYWORDS=""
+IUSE="debug"
+
+# Moved from kde-base/konqueror in 4.3.0-r2 and 4.3.65-r1, so ugly blockers...
+RDEPEND="
+	!kdeprefix? (
+		!kde-base/konqueror:kde-4[-kdeprefix]
+		!kde-base/konqueror:4.1[-kdeprefix]
+		!kde-base/konqueror:4.2[-kdeprefix]
+		!<=kde-base/konqueror-4.3.0-r1:4.3[-kdeprefix]
+		!<=kde-base/konqueror-4.3.65:4.4[-kdeprefix]
+	)
+	kdeprefix? ( !<=kde-base/konqueror-4.3.65:${SLOT}[kdeprefix] )
+	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRACTONLY="
+	konqueror/kfmclient.desktop
+	konqueror/kfmclient_dir.desktop
+	konqueror/kfmclient_html.desktop
+	konqueror/kfmclient_war.desktop
+	konqueror/src/org.kde.Konqueror.Main.xml
+	konqueror/src/org.kde.Konqueror.MainWindow.xml
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Do not install non-kfmclient *.desktop files
+	sed -i -e "/konqbrowser\.desktop/d" \
+		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
+		-e "/install(FILES profile/s/^/#DONOTWANT/" \
+		konqueror/CMakeLists.txt
+}
diff --git a/kde-base/kfmclient/metadata.xml b/kde-base/kfmclient/metadata.xml
new file mode 100644
index 00000000000..a23f444b67d
--- /dev/null
+++ b/kde-base/kfmclient/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-base/konqueror/Manifest b/kde-base/konqueror/Manifest
index 14317b17e0e..d0e4d10f2ad 100644
--- a/kde-base/konqueror/Manifest
+++ b/kde-base/konqueror/Manifest
@@ -1,5 +1,7 @@
+DIST kdebase-4.3.0.tar.bz2 4260097 RMD160 13574180e2c032037640b01dd74011fdf6eef4ef SHA1 073ccad4728bef9ca8ba0f3849c8c6756be52199 SHA256 03ff78bbe298ca5525d6f2cda361cabfc355583c276fb22af0470ea2775f2f28
 DIST kdebase-4.3.65.tar.lzma 3799544 RMD160 b6b3f2f7fb56ce77740d596ba09becee51c69d9b SHA1 1ee8f9fd8e69d0d4ab58e66fd95c86fb2ba48707 SHA256 a18e1d592f97c738f6406e70e7bf4719e75aeb0f03dafc2cc12b38a4cc92e99e
-EBUILD konqueror-4.3.65.ebuild 1145 RMD160 5fdd895d01779ef041c89b9897a53adb0b861eef SHA1 fdcb75b43e1ef18510da1bd6ed99d1c78511545b SHA256 893f59d238465d33a14fd5d97e2fddf6155f514120a009eaf636706a850a14f6
-EBUILD konqueror-4.3.9999.ebuild 1103 RMD160 dbb204efee19d00d79d806479e7ba6c86df9cd60 SHA1 ce8b8cf74524c78a552514e0c146164715cfc55d SHA256 cf8d58acdefe8ea258117db9ac02082a1ae6d1710391ab7e6916e0e4c06891d2
-EBUILD konqueror-9999.ebuild 1103 RMD160 dbb204efee19d00d79d806479e7ba6c86df9cd60 SHA1 ce8b8cf74524c78a552514e0c146164715cfc55d SHA256 cf8d58acdefe8ea258117db9ac02082a1ae6d1710391ab7e6916e0e4c06891d2
+EBUILD konqueror-4.3.0-r2.ebuild 1363 RMD160 cea3a852dab44f936d023925859ba65220f3a91e SHA1 ce742fcfd6372d81d9e9f6f1eac9196a8b5ba11b SHA256 bc8177a2815529195cb357c11447d1729dff638954e470ad98eb44da0255730b
+EBUILD konqueror-4.3.65-r1.ebuild 1363 RMD160 cea3a852dab44f936d023925859ba65220f3a91e SHA1 ce742fcfd6372d81d9e9f6f1eac9196a8b5ba11b SHA256 bc8177a2815529195cb357c11447d1729dff638954e470ad98eb44da0255730b
+EBUILD konqueror-4.3.9999.ebuild 1321 RMD160 a5941cfe90ea66dcb2b1f8d0b806f7fbce1f370e SHA1 dd6014e40be3029fbe18d14986f5f48a07eb3820 SHA256 17b92b3c4a802044441ffe74c3b3716e82a1068f2e40c038c8a6fed14947ab7f
+EBUILD konqueror-9999.ebuild 1321 RMD160 a5941cfe90ea66dcb2b1f8d0b806f7fbce1f370e SHA1 dd6014e40be3029fbe18d14986f5f48a07eb3820 SHA256 17b92b3c4a802044441ffe74c3b3716e82a1068f2e40c038c8a6fed14947ab7f
 MISC metadata.xml 447 RMD160 a363d675b9e4cbae0dba36a389a4590066e9c231 SHA1 fc3609b3260f19f1ace06535a16058e690a419f5 SHA256 ab0632566cfbd89e0ac0771c9ad8b3ab0b7a62ab4bc46e7670a5ab6cf577acf6
diff --git a/kde-base/konqueror/konqueror-4.3.65.ebuild b/kde-base/konqueror/konqueror-4.3.0-r2.ebuild
index 83e5e375090..e2b3e26abfb 100644
--- a/kde-base/konqueror/konqueror-4.3.65.ebuild
+++ b/kde-base/konqueror/konqueror-4.3.0-r2.ebuild
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}
 	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfind-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kurifilter-plugins-${PV}:${SLOT}[kdeprefix=]
 	auth? ( >=kde-base/kpasswdserver-${PV}:${SLOT}[kdeprefix=] )
 	bookmarks? ( >=kde-base/keditbookmarks-${PV}:${SLOT}[kdeprefix=] )
@@ -29,9 +30,17 @@ PDEPEND="
 "
 
 KMEXTRACTONLY="
+	konqueror/client/
 	lib/konq/
 "
 
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Do not install *.desktop files for kfmclient
+	sed -i -e "/kfmclient\.desktop/d" konqueror/CMakeFiles.txt
+}
+
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
diff --git a/kde-base/konqueror/konqueror-4.3.65-r1.ebuild b/kde-base/konqueror/konqueror-4.3.65-r1.ebuild
new file mode 100644
index 00000000000..e2b3e26abfb
--- /dev/null
+++ b/kde-base/konqueror/konqueror-4.3.65-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME="kdebase-apps"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+auth +bookmarks debug +handbook thumbnail"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT="test"
+
+DEPEND="
+	>=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfind-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kurifilter-plugins-${PV}:${SLOT}[kdeprefix=]
+	auth? ( >=kde-base/kpasswdserver-${PV}:${SLOT}[kdeprefix=] )
+	bookmarks? ( >=kde-base/keditbookmarks-${PV}:${SLOT}[kdeprefix=] )
+"
+PDEPEND="
+	thumbnail? ( >=kde-base/mplayerthumbs-${PV}:${SLOT}[kdeprefix=] )
+"
+
+KMEXTRACTONLY="
+	konqueror/client/
+	lib/konq/
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Do not install *.desktop files for kfmclient
+	sed -i -e "/kfmclient\.desktop/d" konqueror/CMakeFiles.txt
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+	elog "emerge -1 kde-base/dolphin:${SLOT}"
+	elog
+	elog "To use Java on webpages: emerge jre"
+	echo
+}
diff --git a/kde-base/konqueror/konqueror-4.3.9999.ebuild b/kde-base/konqueror/konqueror-4.3.9999.ebuild
index 7a1cfca9214..0db7bc23a60 100644
--- a/kde-base/konqueror/konqueror-4.3.9999.ebuild
+++ b/kde-base/konqueror/konqueror-4.3.9999.ebuild
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}
 	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfind-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kurifilter-plugins-${PV}:${SLOT}[kdeprefix=]
 	auth? ( >=kde-base/kpasswdserver-${PV}:${SLOT}[kdeprefix=] )
 	bookmarks? ( >=kde-base/keditbookmarks-${PV}:${SLOT}[kdeprefix=] )
@@ -29,9 +30,17 @@ PDEPEND="
 "
 
 KMEXTRACTONLY="
+	konqueror/client/
 	lib/konq/
 "
 
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Do not install *.desktop files for kfmclient
+	sed -i -e "/kfmclient\.desktop/d" konqueror/CMakeFiles.txt
+}
+
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
diff --git a/kde-base/konqueror/konqueror-9999.ebuild b/kde-base/konqueror/konqueror-9999.ebuild
index 7a1cfca9214..0db7bc23a60 100644
--- a/kde-base/konqueror/konqueror-9999.ebuild
+++ b/kde-base/konqueror/konqueror-9999.ebuild
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}
 	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kfind-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfmclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kurifilter-plugins-${PV}:${SLOT}[kdeprefix=]
 	auth? ( >=kde-base/kpasswdserver-${PV}:${SLOT}[kdeprefix=] )
 	bookmarks? ( >=kde-base/keditbookmarks-${PV}:${SLOT}[kdeprefix=] )
@@ -29,9 +30,17 @@ PDEPEND="
 "
 
 KMEXTRACTONLY="
+	konqueror/client/
 	lib/konq/
 "
 
+src_prepare() {
+	kde4-meta_src_prepare
+
+	# Do not install *.desktop files for kfmclient
+	sed -i -e "/kfmclient\.desktop/d" konqueror/CMakeFiles.txt
+}
+
 pkg_postinst() {
 	kde4-meta_pkg_postinst