[gentoo-commits] gentoo-x86 commit in kde-base/kdebase-startkde: ChangeLog kdebase-startkde-3.5.10-r2.ebuild kdebase-startkde-3.5.10-r1.ebuild

[Marcus Hanwell (cryos)]

cryos       08/09/28 17:24:53

  Modified:             ChangeLog
  Added:                kdebase-startkde-3.5.10-r2.ebuild
  Removed:              kdebase-startkde-3.5.10-r1.ebuild
  Log:
  Push changes to KDEDIRS to allow third party KDE 3.5 apps to function. See bug 237718.
  (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

Revision  Changes    Path
1.127                kde-base/kdebase-startkde/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/ChangeLog?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/ChangeLog?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/ChangeLog?r1=1.126&r2=1.127

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- ChangeLog	27 Sep 2008 18:02:17 -0000	1.126
+++ ChangeLog	28 Sep 2008 17:24:53 -0000	1.127
@@ -1,6 +1,14 @@
 # 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.126 2008/09/27 18:02:17 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.127 2008/09/28 17:24:53 cryos Exp $
+
+*kdebase-startkde-3.5.10-r2 (28 Sep 2008)
+
+  28 Sep 2008; Marcus D. Hanwell <cryos@g.o>
+  files/kdebase-startkde-3.5-gentoo.patch,
+  -kdebase-startkde-3.5.10-r1.ebuild, +kdebase-startkde-3.5.10-r2.ebuild:
+  Push changes to KDEDIRS to allow third party KDE 3.5 apps to function. See
+  bug 237718.
 
 *kdebase-startkde-3.5.10-r1 (27 Sep 2008)
 



1.1                  kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r2.ebuild?rev=1.1&content-type=text/plain

Index: kdebase-startkde-3.5.10-r2.ebuild
===================================================================
# 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-3.5.10-r2.ebuild,v 1.1 2008/09/28 17:24:53 cryos Exp $

KMNAME=kdebase
KMNOMODULE=true
KMEXTRACTONLY="kdm/kfrontend/sessions/kde.desktop.in startkde"
EAPI="1"
inherit multilib kde-meta eutils

DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""

# The kde apps called from the startkde script.
# kdesktop, kicker etc are started because they put files in $KDEDIR/share/autostart
# and so in theory they aren't strictly necessary deps.
RDEPEND="x11-apps/xmessage
		x11-apps/xsetroot
		x11-apps/xset
		x11-apps/xrandr
		x11-apps/mkfontdir
		x11-apps/xprop
>=kde-base/kdesktop-${PV}:${SLOT}
>=kde-base/kcminit-${PV}:${SLOT}
>=kde-base/ksmserver-${PV}:${SLOT}
>=kde-base/kwin-${PV}:${SLOT}
>=kde-base/kpersonalizer-${PV}:${SLOT}
>=kde-base/kreadconfig-${PV}:${SLOT}
>=kde-base/ksplashml-${PV}:${SLOT}"

PATCHES=( "${FILESDIR}/${PN}-3.5-gentoo.patch" )

src_compile() {
	# Patch the startkde script to setup the environment for KDE 4.0
	# Add our KDEDIR
	sed -i -e "s#@REPLACE_PREFIX@#${PREFIX}#" \
		"${S}/startkde" || die "Sed for PREFIX failed."

	# 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 -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \
		"${S}/startkde" || die "Sed for LDPATH failed."
}

src_install() {
	# startkde script
	exeinto "${KDEDIR}/bin"
	doexe startkde

	# startup and shutdown scripts
	insinto "${KDEDIR}/env"
	doins "${WORKDIR}/patches/agent-startup.sh"

	exeinto "${KDEDIR}/shutdown"
	doexe "${WORKDIR}/patches/agent-shutdown.sh"

	# freedesktop environment variables
	cat <<EOF > "${T}/xdg.sh"
export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
EOF
	insinto "${KDEDIR}/env"
	doins "${T}/xdg.sh"

	# x11 session script
	cat <<EOF > "${T}/kde-${SLOT}"
#!/bin/sh
exec ${KDEDIR}/bin/startkde
EOF
	exeinto /etc/X11/Sessions
	doexe "${T}/kde-${SLOT}"

	# (not really) freedesktop compliant session script
	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
		"${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop"
	insinto /usr/share/xsessions
	doins "${T}/kde-${SLOT}.desktop"
}

pkg_postinst () {
	echo
	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
	elog "edit ${KDEDIR}/env/agent-startup.sh and"
	elog "${KDEDIR}/shutdown/agent-shutdown.sh"
	echo
}