From 6871cbf66ee0d24e815b946c3624295cd5128c04 Mon Sep 17 00:00:00 2001 From: Jonathan Callen Date: Thu, 12 Nov 2009 22:00:50 +0000 Subject: Change name of X11 session script to match FDO session script name (Portage version: -svn/cvs/Linux i686) --- kde-base/kdebase-startkde/ChangeLog | 8 +- .../kdebase-startkde-4.3.3-r1.ebuild | 142 +++++++++++++++++++++ 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild (limited to 'kde-base') diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog index 686b516e4c0b..091269ded53f 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.182 2009/11/09 10:06:27 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.183 2009/11/12 22:00:50 abcd Exp $ + +*kdebase-startkde-4.3.3-r1 (12 Nov 2009) + + 12 Nov 2009; Jonathan Callen + +kdebase-startkde-4.3.3-r1.ebuild: + Change name of X11 session script to match FDO session script name 09 Nov 2009; Jonathan Callen -files/gentoo-startkde4.patch: diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-r1.ebuild new file mode 100644 index 000000000000..f62d4a300d23 --- /dev/null +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.3.3-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.3-r1.ebuild,v 1.1 2009/11/12 22:00:50 abcd 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=" + $(add_kdebase_dep kcminit) + $(add_kdebase_dep kdebase-desktoptheme) + $(add_kdebase_dep kdebase-kioslaves) + $(add_kdebase_dep kdebase-wallpapers) + $(add_kdebase_dep keditfiletype) + $(add_kdebase_dep kfmclient) + $(add_kdebase_dep kglobalaccel) + $(add_kdebase_dep kmimetypefinder) + $(add_kdebase_dep knotify) + $(add_kdebase_dep kreadconfig) + $(add_kdebase_dep krunner) + $(add_kdebase_dep ksmserver) + $(add_kdebase_dep ksplash) + $(add_kdebase_dep kstartupconfig) + $(add_kdebase_dep kstyles) + $(add_kdebase_dep ktimezoned) + $(add_kdebase_dep kurifilter-plugins) + $(add_kdebase_dep kwin) + $(add_kdebase_dep phonon-kde) + $(add_kdebase_dep plasma-apps) + $(add_kdebase_dep plasma-workspace) + $(add_kdebase_dep systemsettings) + 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" + + if use kdeprefix; then + KDE_X="KDE-${SLOT}" + else + KDE_X="KDE-4" + fi + + # x11 session script + cat <<-EOF > "${T}/${KDE_X}" + #!/bin/sh + exec ${KDEDIR}/bin/startkde + EOF + exeinto /etc/X11/Sessions + doexe "${T}/${KDE_X}" || die "doexe ${KDE_X} failed" + + # freedesktop compliant session script + 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 + elog "The name of the session script has changed." + elog "If you currently have XSESSION=\"kde-${SLOT}\" in your" + elog "configuration files, you will need to change it to" + elog "XSESSION=\"${KDE_X}\"" +} -- cgit v1.2.3-65-gdbad