diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /kde-base/kdebase-startkde | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'kde-base/kdebase-startkde')
-rw-r--r-- | kde-base/kdebase-startkde/Manifest | 3 | ||||
-rwxr-xr-x | kde-base/kdebase-startkde/files/KDE-4 | 97 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/files/agent-shutdown.sh | 13 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/files/agent-startup.sh | 29 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch | 26 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/files/kdebase-startkde-kscreen.patch | 20 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/kdebase-startkde-4.11.14.ebuild | 95 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild | 95 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/kdebase-startkde-4.11.21.ebuild | 95 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/metadata.xml | 8 |
10 files changed, 481 insertions, 0 deletions
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest new file mode 100644 index 000000000000..8126fee160e2 --- /dev/null +++ b/kde-base/kdebase-startkde/Manifest @@ -0,0 +1,3 @@ +DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2 +DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee +DIST kde-workspace-4.11.21.tar.xz 13550508 SHA256 7196c68802af335b15a3b8e14c55a15ed7c2c0e9145a047dc6d4a281fe7f7c8f SHA512 6e4244177564bb497b2ab0ef5a6e98bdbc2629d8118af16d3cbb08d20d3e3cb6d9433c48c85e0b999226c02950a7a296eb2dbbb6f0bb3e1931300b18f64f5321 WHIRLPOOL c24bea247f39927aad8d80a6cf6dcb967ad4d650000877fb8d962fd9091626e49d776b2e4a99943d4ce1c40226c2827f346f5f2478d95208ba1e7ac609ff415d diff --git a/kde-base/kdebase-startkde/files/KDE-4 b/kde-base/kdebase-startkde/files/KDE-4 new file mode 100755 index 000000000000..86a49d88eec8 --- /dev/null +++ b/kde-base/kdebase-startkde/files/KDE-4 @@ -0,0 +1,97 @@ +#!/bin/sh +# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ + +# source of this file: x11-apps/xinit-1.3.0-r2 + +case $# in +1) + case $1 in + failsafe) + exec xterm -geometry 80x24-0-0 + ;; + esac +esac + +# redirect errors to a file in user's home directory if we can +for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done + +# clean up after xbanner +if which freetemp 2> /dev/null ; then + freetemp +fi + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +userxkbmap=$HOME/.Xkbmap + +sysresources=/etc/X11/Xresources +sysmodmap=/etc/X11/Xmodmap +sysxkbmap=/etc/X11/Xkbmap + +rh6sysresources=/etc/X11/xinit/Xresources +rh6sysmodmap=/etc/X11/xinit/Xmodmap + + +# merge in defaults +if [ -f "$rh6sysresources" ]; then + xrdb -merge "$rh6sysresources" +fi + +if [ -f "$sysresources" ]; then + xrdb -merge "$sysresources" +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +# merge in keymaps +if [ -f "$sysxkbmap" ]; then + setxkbmap `cat "$sysxkbmap"` + XKB_IN_USE=yes +fi + +if [ -f "$userxkbmap" ]; then + setxkbmap `cat "$userxkbmap"` + XKB_IN_USE=yes +fi + +# +# Eeek, this seems like too much magic here +# +if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then + if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then + xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` + if [ -n "$xkbsymbols" ]; then + setxkbmap -symbols "$xkbsymbols" + XKB_IN_USE=yes + fi + fi +fi + +# xkb and xmodmap don't play nice together +if [ -z "$XKB_IN_USE" ]; then + if [ -f "$rh6sysmodmap" ]; then + xmodmap "$rh6sysmodmap" + fi + + if [ -f "$sysmodmap" ]; then + xmodmap "$sysmodmap" + fi + + if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" + fi +fi + +unset XKB_IN_USE + +exec "@GENTOO_PORTAGE_EPREFIX@/usr/bin/startkde" diff --git a/kde-base/kdebase-startkde/files/agent-shutdown.sh b/kde-base/kdebase-startkde/files/agent-shutdown.sh new file mode 100644 index 000000000000..07cf74772b5b --- /dev/null +++ b/kde-base/kdebase-startkde/files/agent-shutdown.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# +# This file is executed at kde shutdown. +# Uncomment the following lines to kill the agents +# that were started at session startup. + +#if [ -n "${GPG_AGENT_INFO}" ]; then +# kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1 +#fi + +#if [ -n "${SSH_AGENT_PID}" ]; then +# eval "$(ssh-agent -s -k)" +#fi diff --git a/kde-base/kdebase-startkde/files/agent-startup.sh b/kde-base/kdebase-startkde/files/agent-startup.sh new file mode 100644 index 000000000000..4b99f6e8b63d --- /dev/null +++ b/kde-base/kdebase-startkde/files/agent-startup.sh @@ -0,0 +1,29 @@ +# Agents startup file +# +# This file is sourced at kde startup, so that +# the environment variables set here are available +# throughout the session. + +# Uncomment the following lines to start gpg-agent +# and/or ssh-agent at kde startup. +# If you do so, do not forget to uncomment the respective +# lines in KDEDIR/shutdown/agent-shutdown.sh to +# properly kill the agents when the session ends. + +#if [ -x /usr/bin/gpg-agent ]; then +# eval "$(/usr/bin/gpg-agent --daemon)" +#fi + +#if [ -x /usr/bin/ssh-agent ]; then +# eval "$(/usr/bin/ssh-agent -s)" +#fi + +# Uncomment the following lines to start rxvt-unicode which has the ability to +# run multiple terminals in one single process, thus starting up faster and +# saving resources. +# The --opendisplay ensures that the daemon quits when the X server terminates, +# therefore we don't need matching lines in agent-shutdown.sh. + +#if [ -x /usr/bin/urxvtd ]; then +# /usr/bin/urxvtd --opendisplay --fork --quiet +#fi diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch new file mode 100644 index 000000000000..4d5177507700 --- /dev/null +++ b/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch @@ -0,0 +1,26 @@ +--- startkde.cmake.old 2011-03-24 13:07:04.919889148 +0100 ++++ startkde.cmake 2011-03-24 13:14:42.033174445 +0100 +@@ -187,6 +187,11 @@ + done + done + ++# Gentoo part for FHS installs ++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/startup/"*.sh; do ++ test -r "${file}" && . "${file}" ++done ++ + # 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`" +@@ -400,6 +405,11 @@ + done + done + ++# Gentoo part for FHS installs ++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/shutdown/"*.sh; do ++ test -r "${file}" && . "${file}" ++done ++ + unset KDE_FULL_SESSION + xprop -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION 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.14.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.14.ebuild new file mode 100644 index 000000000000..dd32d36a5100 --- /dev/null +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.14.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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_kdeapps_dep kdebase-runtime-meta) + wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) + $(add_kdeapps_dep kfmclient) + $(add_kdeapps_dep knotify) + $(add_kdeapps_dep kreadconfig) + $(add_kdebase_dep krunner) + $(add_kdebase_dep ksmserver) + $(add_kdebase_dep ksplash) + $(add_kdebase_dep kstartupconfig) + $(add_kdebase_dep kwin) + $(add_kdeapps_dep phonon-kde) + $(add_kdeapps_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\"" +} diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild new file mode 100644 index 000000000000..3e8de630a325 --- /dev/null +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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_kdeapps_dep kdebase-runtime-meta) + wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) + $(add_kdeapps_dep kfmclient) + $(add_kdeapps_dep knotify) + $(add_kdeapps_dep kreadconfig) + $(add_kdebase_dep krunner) + $(add_kdebase_dep ksmserver) + $(add_kdebase_dep ksplash) + $(add_kdebase_dep kstartupconfig) + $(add_kdebase_dep kwin) + $(add_kdeapps_dep phonon-kde) + $(add_kdeapps_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\"" +} diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.21.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.21.ebuild new file mode 100644 index 000000000000..3785171fda7e --- /dev/null +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.21.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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_kdeapps_dep kdebase-runtime-meta) + wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) + $(add_kdeapps_dep kfmclient) + $(add_kdeapps_dep knotify) + $(add_kdeapps_dep kreadconfig) + $(add_kdebase_dep krunner) + $(add_kdebase_dep ksmserver) + $(add_kdebase_dep ksplash) + $(add_kdebase_dep kstartupconfig) + $(add_kdebase_dep kwin) + $(add_kdeapps_dep phonon-kde) + $(add_kdeapps_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\"" +} diff --git a/kde-base/kdebase-startkde/metadata.xml b/kde-base/kdebase-startkde/metadata.xml new file mode 100644 index 000000000000..8028a443f9c9 --- /dev/null +++ b/kde-base/kdebase-startkde/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>kde</herd> + <use> + <flag name="wallpapers">Install the KDE wallpapers</flag> + </use> +</pkgmetadata> |