Added a missing patch file.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 216 insertions, 1 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 32d310f06cd4..8e4b6bfc8be1 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.127 2008/09/28 17:24:53 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.128 2008/10/02 12:10:25 jmbsvicetto Exp $
+
+*kdebase-startkde-4.1.2 (02 Oct 2008)
+
+  02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/gentoo-startkde4.patch, +kdebase-startkde-4.1.2.ebuild:
+  Added a missing patch file.
 
 *kdebase-startkde-3.5.10-r2 (28 Sep 2008)
 
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
new file mode 100644
index 000000000000..7526e39160b6
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
@@ -0,0 +1,64 @@
+--- startkde.cmake	2008-07-15 15:49:02.000000000 -0400
++++ startkde.cmake.cryos	2008-09-27 14:44:01.000000000 -0400
+@@ -7,6 +7,33 @@
+ # because we still need to do some cleanup.
+ trap 'echo GOT SIGHUP' HUP
+ 
++export KDEDIR=@REPLACE_PREFIX@
++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')
++@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=$?
+@@ -209,6 +236,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`"
+@@ -420,6 +454,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.1.2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.1.2.ebuild
new file mode 100644
index 000000000000..11d8aa9ec3a8
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.1.2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2008 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.1.2.ebuild,v 1.1 2008/10/02 12:10:25 jmbsvicetto 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="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+# The KDE apps called from the startkde script.
+# These provide the most minimal KDE desktop.
+RDEPEND="${DEPEND}
+	>=kde-base/kcminit-${PV}:${SLOT}
+	>=kde-base/kdebase-data-${PV}:${SLOT}
+	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}
+	>=kde-base/kde-wallpapers-${PV}:${SLOT}
+	>=kde-base/knotify-${PV}:${SLOT}
+	>=kde-base/kreadconfig-${PV}:${SLOT}
+	>=kde-base/krunner-${PV}:${SLOT}
+	>=kde-base/ksmserver-${PV}:${SLOT}
+	>=kde-base/ksplash-${PV}:${SLOT}
+	>=kde-base/kstartupconfig-${PV}:${SLOT}
+	>=kde-base/kstyles-${PV}:${SLOT}
+	>=kde-base/kwin-${PV}:${SLOT}
+	>=kde-base/plasma-apps-${PV}:${SLOT}
+	>=kde-base/plasma-workspace-${PV}:${SLOT}
+	>=kde-base/systemsettings-${PV}:${SLOT}
+	x11-apps/xmessage
+	x11-apps/xsetroot
+	x11-apps/xset
+	x11-apps/xrandr
+	x11-apps/mkfontdir
+	x11-apps/xprop"
+
+KMEXTRACTONLY="startkde.cmake
+	ConfigureChecks.cmake
+	kdm/
+	safestartkde.cmake"
+KMCOMPILEONLY="kdm/kfrontend/sessions/"
+
+PATCHES=("${FILESDIR}/gentoo-startkde4.patch")
+
+src_configure() {
+	# Patch the startkde script to setup the environment for KDE 4.0
+	# Add our KDEDIR
+	if use kdeprefix; then
+		sed -e "s#@REPLACE_LDFLAGS@#export LFFLAGS=${_libdirs}:\$LDFAGS#" \
+			-i "${S}/startkde.cmake" || die "Sed for LDPATH failed."
+	else
+		sed -e "s#@REPLACE_LDFLAGS@##" -i "${S}/startkde.cmake" || \
+			die "sed for LDPATH failed"
+	fi
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	# Complete LDPATH
+	sed -e "s#@REPLACE_LIBS@#${_libdirs}#" \
+		-i "${S}/startkde.cmake" || die "Sed for LDPATH failed."
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	local DIR
+
+	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"
+
+	# freedesktop environment variables
+	cat <<-EOF > "${T}/xdg.sh"
+	export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
+	export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
+	EOF
+	if use kdeprefix; then
+		insinto "${KDEDIR}/env"
+	else
+		insinto "/etc/kde/startup"
+	fi
+	doins "${T}/xdg.sh" || die "doins xdg.sh failed"
+
+	# Set DIR to S{SLOT} for the kde-4 and kde-svn slot or kde-${SLOT} for all other slots
+	case "${SLOT}" in
+		kde-4 | kde-svn) DIR="${SLOT}" ;;
+		*) DIR="kde-${SLOT}"
+	esac
+
+	# x11 session script
+	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
+}