Version bump KDE 4.3.1

(Portage version: 2.2_rc38/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 212 insertions, 1 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 8c43b1f3c421..8ff4d21dadcd 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.171 2009/08/09 10:40:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.172 2009/09/01 15:06:45 tampakrap Exp $
+
+*kdebase-startkde-4.3.1 (01 Sep 2009)
+
+  01 Sep 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  +files/gentoo-startkde4-1.patch, +kdebase-startkde-4.3.1.ebuild:
+  Version bump
 
   09 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   kdebase-startkde-4.3.0.ebuild:
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-1.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-1.patch
new file mode 100644
index 000000000000..652f76c0fefd
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4-1.patch
@@ -0,0 +1,67 @@
+diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/startkde.cmake
+--- kdebase-startkde-4.2.0-orig/startkde.cmake	2009-01-17 05:00:28.000000000 -0600
++++ kdebase-startkde-4.2.0/startkde.cmake	2009-02-21 12:52:02.000000000 -0600
+@@ -7,6 +7,35 @@
+ # because we still need to do some cleanup.
+ trap 'echo GOT SIGHUP' HUP
+
++_KDEDIR=@REPLACE_PREFIX@
++if [ "$_KDEDIR" != "/usr" ]; then
++	export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
++	export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
++fi
++@REPLACE_LDPATH@
++export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
++export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g')
++
++if [ -z "$HOME" ]; then
++	xmessage "HOME is unset. Your user config seems to be broken. Aborting."
++	exit 1
++fi
++
++# Gentoo: handle the possible home directory layout for config directory
++# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT}
++# for -kdeprefix and +kdeprefix respectively.
++if [ "${_KDEDIR}" = "/usr" ]; then
++	# If the directory doesn't exist make it
++	[ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4"
++else
++	# Use multiple directories based upon the KDE directory
++	[ -e "$HOME/.kde$(basename $_KDEDIR)" ] || mkdir "$HOME/.kde$(basename $_KDEDIR)"
++	if [ ! -d "$HOME/.kde$(basename $_KDEDIR)" ]; then
++		xmessage "$HOME/.kde$(basename $_KDEDIR) exists but is not a dir. Aborting."
++		exit 1
++	fi
++fi
++
+ # Check if a KDE session already is running and whether it's possible to connect to X
+ kcheckrunning
+ kcheckrunning_result=$?
+@@ -214,6 +243,13 @@
+   done
+ done
+
++# Gentoo part for FHS installs
++if [ "${_KDEDIR}" = "/usr" ]; then
++  for file in "/etc/kde/startup/"*.sh; do
++    test -r "${file}" && . "${file}"
++  done
++fi
++
+ # Set the path for Qt plugins provided by KDE
+ if test -n "$QT_PLUGIN_PATH"; then
+   QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
+@@ -427,6 +463,13 @@
+   done
+ done
+
++# Gentoo part for FHS installs
++if [ "${_KDEDIR}" = "/usr" ]; then
++  for file in "/etc/kde/shutdown/"*.sh; do
++    test -r "${file}" && . "${file}"
++  done
++fi
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.1.ebuild
new file mode 100644
index 000000000000..8b4cd9cd47cb
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.3.1.ebuild
@@ -0,0 +1,138 @@
+# 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.1.ebuild,v 1.1 2009/09/01 15:06:45 tampakrap 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/kmimetypefinder-${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/ktimezoned-${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-1.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."
+}
+
+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
+}