[kde-base] minor cleanups

8 files changed, 7 insertions, 158 deletions

diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index a3f2dbb305f..b1486b2cf12 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,10 +1,8 @@
 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.2.3.tar.bz2 50801994 RMD160 6f3576fc61261f13b75b94d90606bf61d6b000f6 SHA1 0c92579c651c5a08ff6440762eb5c2ad9d5bc0ad SHA256 e281f9fb63391a162378dcddd4ed8327d8438d1ff4b261adb22c01a89b56aff3
 DIST kdebase-workspace-4.2.96.tar.bz2 62237744 RMD160 e6027a117745f54f0796497e2701f6839b7db308 SHA1 ffbd3e9e25eb3c4d1c41ff5856d7e27c260ceb95 SHA256 13347d08af1a221091c4501a1e0555bfd7774ca0ed951e96a3431d025011d64e
 DIST kdebase-workspace-4.3.60.tar.lzma 61015715 RMD160 9725f4e755781b1bdcb9b294e074cfdcc7982eef SHA1 fb557e49aff7815e468cde9aff544fe7213635ce SHA256 6c0d6782e6f2b48cf058561d0c3d8b2f3cd6781c86cc5fb580a68f407a7f5413
-EBUILD kdebase-startkde-4.2.3-r1.ebuild 3998 RMD160 f84d48ca87a7cf99836fe5b44ce0f5a263c412ad SHA1 c33031d2b2c20cc495bdc6399e0ce7ce770338e8 SHA256 6114b0e206e167c1e5864e2aa1f5455675e2803beba4092e094c602321f1ad27
 EBUILD kdebase-startkde-4.2.96.ebuild 3931 RMD160 fa15f8c0358e523d945d637d113edcc545ecb3c5 SHA1 65feb77b4026b5a23bdf0af3fe70bc58eae49d71 SHA256 2ef15205487c4b0d6ac424775d6467b5ea5744b01797f26f8734c9a97c0eb024
 EBUILD kdebase-startkde-4.3.60.ebuild 3931 RMD160 fa15f8c0358e523d945d637d113edcc545ecb3c5 SHA1 65feb77b4026b5a23bdf0af3fe70bc58eae49d71 SHA256 2ef15205487c4b0d6ac424775d6467b5ea5744b01797f26f8734c9a97c0eb024
 EBUILD kdebase-startkde-4.3.9999.ebuild 3889 RMD160 b5568be91fdebfcbfc12b7e2860dbfb686eb566e SHA1 dbcbcf3c06cc2079ad478e3624b346cccafb86be SHA256 8d6c6d74616739e581d427c7fe43a38bb9cad1321aa36099b156cb18eb501d78
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.2.3-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.2.3-r1.ebuild
deleted file mode 100644
index 2dd1649ad4f..00000000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.2.3-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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.2.3.ebuild,v 1.1 2009/05/06 23:07:34 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/kdedglobalaccel-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/kde-wallpapers-${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=]
-	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/krdc/Manifest b/kde-base/krdc/Manifest
index 643b3f5f7f1..a5504d36ab0 100644
--- a/kde-base/krdc/Manifest
+++ b/kde-base/krdc/Manifest
@@ -1,9 +1,9 @@
 DIST kdenetwork-4.2.4.tar.bz2 7038448 RMD160 2ea29be5b112af974add898419403c9d8cea9436 SHA1 31f3f1c44690339ce523c309a3d2c131563d9f97 SHA256 e6e7e86d2a1d73e39bda57e4be88194cd400353ae7d3420613af4636da61f3e5
 DIST kdenetwork-4.2.96.tar.bz2 7378891 RMD160 e7056d26729ceb86dde86c794d9291dfdb9b5341 SHA1 e15eb7b78b0330c841cdc0d167d0a3d38d833fe4 SHA256 89dfea08f972233fb321a68f73db62a4e3dd6d0aa603cbeeca7557246923b65a
 DIST kdenetwork-4.3.60.tar.lzma 6362618 RMD160 fa624bf06a384616a309f1c1b08ee0b9740c1a58 SHA1 b56a6d05d2a10b10954e5e263681da3a2a0c0b04 SHA256 aab4bf85cccda104b88e4470b8b17543e9902f824abaf975af7a40667369b39b
-EBUILD krdc-4.2.4.ebuild 1170 RMD160 c27388f78da0ae761f6b429d49b297df4551f560 SHA1 8e7587b57b75e1898ca6e8fe148c58cde1a11bf3 SHA256 6978bd29631f18874acf3a11cc6e6a93de4159d4f5558090c699fbfd234ee386
-EBUILD krdc-4.2.96.ebuild 1049 RMD160 657eba4791bd1f2b64873121d556a531b5334a8f SHA1 431169eb75a9e635f37c1e40f3d1585b0fe0b4c7 SHA256 8d9b1120213675c9d2e707a7fb54d29105b07491d6bb81f864af3f0598aa30c9
-EBUILD krdc-4.3.60.ebuild 1049 RMD160 657eba4791bd1f2b64873121d556a531b5334a8f SHA1 431169eb75a9e635f37c1e40f3d1585b0fe0b4c7 SHA256 8d9b1120213675c9d2e707a7fb54d29105b07491d6bb81f864af3f0598aa30c9
-EBUILD krdc-4.3.9999.ebuild 1007 RMD160 bb88f4caf1befad21572806bb22abeb95778454a SHA1 3b40209713abc320b304baeb0ebfb79ad36052af SHA256 a4d8d03cf48824554cd9506cdff7b91b6c6e0568b3a122fcfdcf27a54d101368
-EBUILD krdc-9999.ebuild 1007 RMD160 bb88f4caf1befad21572806bb22abeb95778454a SHA1 3b40209713abc320b304baeb0ebfb79ad36052af SHA256 a4d8d03cf48824554cd9506cdff7b91b6c6e0568b3a122fcfdcf27a54d101368
+EBUILD krdc-4.2.4.ebuild 985 RMD160 ab7922ef287e4c34b2f3d533d5b1d79ced627d21 SHA1 52a444498cb13f3df440d12593904917edd452d3 SHA256 7d33ea265be6dde7ab768e69462fddbe5d3feadc672af6910460e67b4428feb2
+EBUILD krdc-4.2.96.ebuild 864 RMD160 7090ca7396f29885e191e7215a7e9ed3b91e7f35 SHA1 3fc20e0d2160fdfe46a29440b15447612c5363e2 SHA256 1da3c220d8e44ec0623580ca1b3a473b8adbbdacdd25a10225aca86b95aac235
+EBUILD krdc-4.3.60.ebuild 936 RMD160 d7f114e525587a254619a1d425b4b1e2b1728bb5 SHA1 c8f4b88c9712b34db0c22c08023d80b5ed9adec3 SHA256 08b83682dc7d29c939e4aded671bb13f1533f1f5daf4782fe483f9235917b674
+EBUILD krdc-4.3.9999.ebuild 822 RMD160 bc1f20010916f1fce0d5676bc6f540b4fb58f496 SHA1 81a7da7c631f7ba598f97d31b54647df98c2e0ab SHA256 9d914daff1fc2f073cc037d9ac5b92ebc4d52fc9063a35543339833a2f81dad5
+EBUILD krdc-9999.ebuild 894 RMD160 2e4773dc5ad167e19d7387fb483adeeb55178a8d SHA1 b700d2aef04a718f7e343d489c957a51bfee2e41 SHA256 b5d3a02ae5bddd9870b63447b2aec2f19de07981b15682b1f8e68cf38fa40ac3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/krdc/krdc-4.2.4.ebuild b/kde-base/krdc/krdc-4.2.4.ebuild
index bd28332631a..3a256f8b1e6 100644
--- a/kde-base/krdc/krdc-4.2.4.ebuild
+++ b/kde-base/krdc/krdc-4.2.4.ebuild
@@ -11,9 +11,6 @@ DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="debug +handbook jpeg vnc zeroconf"
 
-#nx? ( >=net-misc/nxcl-0.9-r1 ) doesnt work atm
-#sed -e '72,74d' -i ${WORKDIR}/krdc_build/krdc/cmake_install.cmake || die "sed failed" #nomachine default key isnt there, doesnt matter
-
 DEPEND="
 	jpeg? ( media-libs/jpeg )
 	vnc? ( >=net-libs/libvncserver-0.9 )
diff --git a/kde-base/krdc/krdc-4.2.96.ebuild b/kde-base/krdc/krdc-4.2.96.ebuild
index be82313b324..d15155c66d2 100644
--- a/kde-base/krdc/krdc-4.2.96.ebuild
+++ b/kde-base/krdc/krdc-4.2.96.ebuild
@@ -11,9 +11,6 @@ DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="debug +handbook jpeg vnc zeroconf"
 
-#nx? ( >=net-misc/nxcl-0.9-r1 ) doesnt work atm
-#sed -e '72,74d' -i ${WORKDIR}/krdc_build/krdc/cmake_install.cmake || die "sed failed" #nomachine default key isnt there, doesnt matter
-
 DEPEND="
 	jpeg? ( media-libs/jpeg )
 	vnc? ( >=net-libs/libvncserver-0.9 )
diff --git a/kde-base/krdc/krdc-4.3.60.ebuild b/kde-base/krdc/krdc-4.3.60.ebuild
index be82313b324..ed750f65312 100644
--- a/kde-base/krdc/krdc-4.3.60.ebuild
+++ b/kde-base/krdc/krdc-4.3.60.ebuild
@@ -11,8 +11,7 @@ DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="debug +handbook jpeg vnc zeroconf"
 
-#nx? ( >=net-misc/nxcl-0.9-r1 ) doesnt work atm
-#sed -e '72,74d' -i ${WORKDIR}/krdc_build/krdc/cmake_install.cmake || die "sed failed" #nomachine default key isnt there, doesnt matter
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61
 
 DEPEND="
 	jpeg? ( media-libs/jpeg )
diff --git a/kde-base/krdc/krdc-4.3.9999.ebuild b/kde-base/krdc/krdc-4.3.9999.ebuild
index 2a7307fb107..bedff30cce1 100644
--- a/kde-base/krdc/krdc-4.3.9999.ebuild
+++ b/kde-base/krdc/krdc-4.3.9999.ebuild
@@ -11,9 +11,6 @@ DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
 KEYWORDS=""
 IUSE="debug +handbook jpeg vnc zeroconf"
 
-#nx? ( >=net-misc/nxcl-0.9-r1 ) doesnt work atm
-#sed -e '72,74d' -i ${WORKDIR}/krdc_build/krdc/cmake_install.cmake || die "sed failed" #nomachine default key isnt there, doesnt matter
-
 DEPEND="
 	jpeg? ( media-libs/jpeg )
 	vnc? ( >=net-libs/libvncserver-0.9 )
diff --git a/kde-base/krdc/krdc-9999.ebuild b/kde-base/krdc/krdc-9999.ebuild
index 2a7307fb107..3748b57b061 100644
--- a/kde-base/krdc/krdc-9999.ebuild
+++ b/kde-base/krdc/krdc-9999.ebuild
@@ -11,8 +11,7 @@ DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
 KEYWORDS=""
 IUSE="debug +handbook jpeg vnc zeroconf"
 
-#nx? ( >=net-misc/nxcl-0.9-r1 ) doesnt work atm
-#sed -e '72,74d' -i ${WORKDIR}/krdc_build/krdc/cmake_install.cmake || die "sed failed" #nomachine default key isnt there, doesnt matter
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61
 
 DEPEND="
 	jpeg? ( media-libs/jpeg )