Version bump KDE SC 4.11.13

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 122 insertions, 1 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 13982414baad..cd826a832e47 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.376 2014/09/16 18:17:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.377 2014/10/25 20:03:17 mrueg Exp $
+
+*kdebase-startkde-4.11.13 (25 Oct 2014)
+
+  25 Oct 2014; Manuel Rüger <mrueg@gentoo.org>
+  +kdebase-startkde-4.11.13.ebuild, +files/kdebase-startkde-kscreen.patch:
+  Version bump KDE SC 4.11.13
 
 *kdebase-startkde-4.11.12 (16 Sep 2014)
 
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch
new file mode 100644
index 000000000000..65644aff83a3
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch
@@ -0,0 +1,20 @@
+Only try to run krandrstartup if it exists wrt bug #524266.
+
+After f7f5d84c85b6c7f946b94808849648b4cb6ea667, krandrstartup is no longer
+available if kde-base/systemsettings is built with USE="kscreen". Otherwise,
+KDE will fail to start
+
+Source: http://pkgs.fedoraproject.org/cgit/kde-workspace.git/tree/startkde.cmake
+diff --git a/startkde.cmake b/startkde.cmake
+index afc2cfb..4220e64 100644
+--- a/startkde.cmake
++++ b/startkde.cmake
+@@ -105,7 +105,7 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
+     fi
+ fi
+ 
+-. krandrstartup
++KRANDRSTARTUP=`which krandrstartup 2>/dev/null` && . $KRANDRSTARTUP
+ 
+ if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+     xrdb -quiet -merge -nocpp <<EOF
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.13.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.13.ebuild
new file mode 100644
index 000000000000..acc4f6f3cffa
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.13.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 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.11.13.ebuild,v 1.1 2014/10/25 20:03:17 mrueg Exp $
+
+EAPI=5
+
+KMNAME="kde-workspace"
+KMNOMODULE="true"
+inherit kde4-meta prefix
+
+DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+wallpapers"
+
+# The KDE apps called from the startkde script.
+# These provide the most minimal KDE desktop.
+RDEPEND="
+	$(add_kdebase_dep kcminit)
+	$(add_kdebase_dep kdebase-runtime-meta)
+	wallpapers? ( $(add_kdebase_dep kde-wallpapers) )
+	$(add_kdebase_dep kfmclient)
+	$(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 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/
+	startkde.cmake
+"
+
+PATCHES=(
+	"${FILESDIR}/gentoo-startkde4-4.patch"
+	"${FILESDIR}/${PN}-kscreen.patch"
+)
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	cp "${FILESDIR}/KDE-4" "${T}"
+
+	# fix ${EPREFIX}
+	eprefixify startkde.cmake "${T}/KDE-4"
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	# startup and shutdown scripts
+	insinto /etc/kde/startup
+	doins "${FILESDIR}/agent-startup.sh"
+
+	insinto /etc/kde/shutdown
+	doins "${FILESDIR}/agent-shutdown.sh"
+
+	# x11 session script
+	exeinto /etc/X11/Sessions
+	doexe "${T}/KDE-4"
+
+	# freedesktop compliant session script
+	sed -e "s:\${BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
+		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
+	insinto /usr/share/xsessions
+	doins "${T}/KDE-4.desktop"
+}
+
+pkg_postinst () {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
+	elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
+	echo
+	elog "The name of the session script has changed."
+	elog "If you currently have XSESSION=\"kde-$(get_kde_version)\" in your"
+	elog "configuration files, you will need to change it to"
+	elog "XSESSION=\"KDE-4\""
+}