diff options
Diffstat (limited to 'kde-base/kdebase-startkde')
5 files changed, 218 insertions, 1 deletions
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog index 6d4d3c12131d..22ac4498156a 100644 --- a/kde-base/kdebase-startkde/ChangeLog +++ b/kde-base/kdebase-startkde/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kdebase-startkde # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.2 2005/02/05 11:39:15 danarmak Exp $ + +*kdebase-startkde-3.4.0_beta2 (05 Feb 2005) + + 05 Feb 2005; Dan Armak <danarmak@gentoo.org> + +kdebase-startkde-3.4.0_beta2.ebuild: + Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this + date. This ebuild is for inside testing by the KDE team, and is of course + package.masked. *kdebase-startkde-3.4.0_beta1 (15 Jan 2005) diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest index ba9458d7138f..eec877a35746 100644 --- a/kde-base/kdebase-startkde/Manifest +++ b/kde-base/kdebase-startkde/Manifest @@ -1,7 +1,9 @@ +MD5 e11d975cc61454bfdfe44e1729eca5c8 kdebase-startkde-3.4.0_beta2.ebuild 2018 MD5 f9be91c1d472703db8c23698010517ea kdebase-startkde-3.4.0_beta1.ebuild 2053 MD5 85ec8fd1e0ad57bd77c7956fc1995289 ChangeLog 576 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 89ff958ef8379c39e29583728ff3f290 files/startkde-3.4.0_beta1-gentoo.diff 4024 MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdebase-startkde-3.4.0_beta1 216 +MD5 2e2e2d2d81cc101225b07b5032f29cca files/digest-kdebase-startkde-3.4.0_beta2 294 MD5 010340a437b3c0d1605af4ddf95368eb files/agent-shutdown.sh 260 MD5 c1250a1da4ea1fd131b44ebc27f32f3f files/agent-startup.sh 551 diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.0_beta2 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.0_beta2 new file mode 100644 index 000000000000..60877ecb8cea --- /dev/null +++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.0_beta2 @@ -0,0 +1,4 @@ +MD5 46a0b6a8f72b16812d4ad745902fdcf5 kdebase-3.3.90.tar.bz2 20659998 +MD5 cd0819379968496b415c3a4121272e1f kdebase-3.3.90-3.3.91.tar.xdelta 3128388 +MD5 3889cab60fdb15738a20aa9ba0f9c893 kdebase-3.3.91-3.3.92.tar.xdelta 3499698 +MD5 67e33c1060229856655bc8c613e4544d kdebase-3.3.92.tar.bz2 22577557 diff --git a/kde-base/kdebase-startkde/files/startkde-3.4.0_beta2-gentoo.diff b/kde-base/kdebase-startkde/files/startkde-3.4.0_beta2-gentoo.diff new file mode 100644 index 000000000000..0e91c148c7f9 --- /dev/null +++ b/kde-base/kdebase-startkde/files/startkde-3.4.0_beta2-gentoo.diff @@ -0,0 +1,135 @@ +--- startkde.orig 2005-01-04 01:36:08.000000000 +0200 ++++ startkde 2005-01-10 22:01:45.000000000 +0200 +@@ -7,6 +7,103 @@ + # because we still need to do some cleanup. + trap 'echo GOT SIGHUP' HUP + ++# Gentoo init ++ ++# Make sure this KDE is used by apps running from our env ++export PATH="/usr/kde/3.4/bin:${PATH}" ++ ++# KDE stores dotfiles in ~/.kde. To support running different minor versions ++# (eg 3.3, 3.4, 4.0...) during gradual upgrades, we store each version's ++# dotfiles in ~/.kdeX.Y. We used to make ~/.kde a symlink to a ~/.kdeX.Y, ++# but some apps store the real name (with X.Y in it) inside their configfiles, ++# so when we upgrade (and copy .kdeX.Y to .kdeX.(Y+1)) these files break horribly ++# (bug #40698). Therefore we have to move directories around. ++# ++# If a user runs two different KDE versions at the same time, mayhem will result. ++ ++cd ~ ++ ++# Upgrading from the old scheme where .kde is a symlink ++if [ -h .kde ]; then ++ rm .kde ++fi ++ ++# A kde died unexpectedly and couldn't move away its .kde. ++# The last running kde's version string is stored in ~/.kde-cur. ++if [ -d .kde ]; then ++ if [ ! -r .kde-cur ]; then ++ echo "!!! ~/.kde-cur does not exist or is not readable." 1>&2 ++ echo "Cannot get rid of ~/.kde directory; abandoning kde configdir management." 1>&2 ++ else ++ lastver="`cat .kde-cur`" ++ if [ -e ".kde$lastver" ]; then ++ echo "!!! ~/.kde$lastver already exists, can't move ~/.kde aside" 1>&2 ++ counter=1 ++ while [ -e ".kde$lastver.backup-$counter" ]; do ++ echo "!!! Backup dir ~/.kde$lastver.backup-$counter already exists." 1>&2 ++ echo "Find out what's going wrong!" 1>&2 ++ let counter++ ++ done ++ mv .kde ".kde$lastver.backup-$counter" ++ fi ++ rm .kde-cur ++ fi ++fi ++ ++# If we suceeded ++if [ ! -e .kde ]; then ++ ++ # If we have a configdir, activate it. ++ ourver=3.4 ++ ourdir=.kde$ourver ++ if [ -e "$ourdir" ]; then ++ if [ ! -d "$ourdir" ]; then ++ echo "!!! Configdir $ourdir is not a directory. Something's _really_ wrong. Aborting." 1>&2 ++ else ++ mv "$ourdir" .kde ++ fi ++ ++ # Otherwise (first run of this version), we copy over the most recent existing configdir. ++ else ++ for x in 3.3 3.2 3.1 3.0; do ++ if [ -d ".kde$x" ]; then ++ mostrecent=".kde$x" ++ break ++ fi ++ done ++ if [ -z "$mostrecent" ]; then ++ echo "No previous configdir found; starting with empty config" 1>&2 ++ else ++ echo "Copying previous configdir from $mostrecent" 1>&2 ++ cp -pr "$mostrecent" .kde ++ ++ # For the upgrade from kde 3.3, which still suffered from bug 40698, lots of little seds are needed. ++ if [ "$mostrecent" == ".kde3.3" ]; then ++ for file in share/apps/kdevdocumentation/search/htdig.conf \ ++ share/apps/kalarmd/clients \ ++ share/config/kdevdocumentationrc \ ++ share/config/katesyntaxhighlightingrc \ ++ share/config/ksmserverrc ++ do ++ sed -i -e "s:$HOME/.kde3.3:$HOME/.kde:g" -e 's:$HOME/.kde3.3:$HOME/.kde:g' ".kde/$file" ++ done ++ fi ++ fi ++ fi ++ ++ # Remember that we're running in case we die ++ echo 3.4 > .kde-cur ++fi ++ ++# environment friendly ++unset lastver ++unset counter ++unset ourver ++unset ourdir ++unset mostrecent ++ ++# Gentoo init ends ++ + # Check if a KDE session already is running + if dcop kdesktop >/dev/null 2>&1; then + echo "KDE seems to be already running on this display." +@@ -14,12 +112,12 @@ + exit 1 + fi + +-# Set the background to plain grey. ++# Set the background to plain cyan. + # The standard X background is nasty, causing moire effects and exploding + # people's heads. We use colours from the standard KDE palette for those with + # palettised displays. + if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then +- xsetroot -solid "#C0C0C0" ++ xsetroot -solid "#5477A0" + fi + + # we have to unset this for Darwin since it will screw up KDE's dynamic-loading +@@ -247,4 +345,13 @@ + done + done + ++ ++# Gentoo exit ++ ++# Move the configdir back ++mv .kde .kde3.4 ++rm .kde-cur ++ ++# Gentoo exit ends ++ + echo 'startkde: Done.' 1>&2 diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.4.0_beta2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.4.0_beta2.ebuild new file mode 100644 index 000000000000..0b01dfd5482f --- /dev/null +++ b/kde-base/kdebase-startkde/kdebase-startkde-3.4.0_beta2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2005 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.4.0_beta2.ebuild,v 1.1 2005/02/05 11:39:15 danarmak Exp $ + +KMNAME=kdebase +KMNOMODULE=true +KMEXTRACTONLY="kdm/kfrontend/sessions/kde.desktop.in startkde" +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta + +need-kde $PV + +DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts" +KEYWORDS="~x86" +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="$RDEPEND +$(deprange $PV $MAXKDEVER kde-base/kdesktop) +$(deprange $PV $MAXKDEVER kde-base/kcminit) +$(deprange $PV $MAXKDEVER kde-base/ksmserver) +$(deprange $PV $MAXKDEVER kde-base/kwin) +$(deprange $PV $MAXKDEVER kde-base/kpersonalizer) +$(deprange $PV $MAXKDEVER kde-base/kreadconfig) +$(deprange $PV $MAXKDEVER kde-base/ksplashml)" + +src_compile() { + einfo "Nothing to compile" +} + +src_install() { + + # startkde script + dodir $KDEDIR/bin + cd $D/$KDEDIR/bin + cp $S/startkde . + patch -p0 < $FILESDIR/startkde-$PV-gentoo.diff + sed -i -e "s:_KDEDIR_:${KDEDIR}:" startkde + chmod a+x startkde + + # startup and shutdown scripts + insopts -m0755 + insinto ${KDEDIR}/env + doins $FILESDIR/agent-startup.sh + insinto $KDEDIR/shutdown + doins $FILESDIR/agent-shutdown.sh + + # x11 session script - old style + cd ${T} + echo "#!/bin/sh +${KDEDIR}/bin/startkde" > kde-$SLOT + chmod a+x kde-$SLOT + exeinto /etc/X11/Sessions + doexe kde-$SLOT + + # x11 session - new style + dodir /usr/share/xsessions + sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE $PV:" \ + $S/kdm/kfrontend/sessions/kde.desktop.in > $D/usr/share/xsessions/kde-$SLOT.desktop +} + +pkg_postinst () { + einfo "To enable gpg-agent and/or ssh-agent in KDE sessions," + einfo "edit $KDEDIR/env/agent-startup.sh and $KDEDIR/shutdown/agent-shutdown.sh" +} |