summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-12-10 12:38:33 +0100
committerJohannes Huber <johu@gentoo.org>2016-12-10 12:38:33 +0100
commitdfbcb477e7ed01428c2030407e9e615dae359aa8 (patch)
treec61b5c97e21923767ea827d1e6bb3b9483768bec /kde-plasma
parentnet-libs/tox: add ~arm keyword (diff)
downloadgentoo-dfbcb477e7ed01428c2030407e9e615dae359aa8.tar.gz
gentoo-dfbcb477e7ed01428c2030407e9e615dae359aa8.tar.bz2
gentoo-dfbcb477e7ed01428c2030407e9e615dae359aa8.zip
kde-base/kdm -> kde-plasma/kdm
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/kdm/Manifest1
-rw-r--r--kde-plasma/kdm/files/kdm-4-gentoo-xinitrc.d.patch19
-rw-r--r--kde-plasma/kdm/files/kdm-logrotate8
-rw-r--r--kde-plasma/kdm/files/kdm.service12
-rw-r--r--kde-plasma/kdm/kdm-4.11.22.ebuild163
-rw-r--r--kde-plasma/kdm/metadata.xml11
-rw-r--r--kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild2
-rw-r--r--kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild2
-rw-r--r--kde-plasma/libkgreeter/libkgreeter-4.11.22.ebuild2
9 files changed, 217 insertions, 3 deletions
diff --git a/kde-plasma/kdm/Manifest b/kde-plasma/kdm/Manifest
new file mode 100644
index 000000000000..db5163f83985
--- /dev/null
+++ b/kde-plasma/kdm/Manifest
@@ -0,0 +1 @@
+DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-plasma/kdm/files/kdm-4-gentoo-xinitrc.d.patch b/kde-plasma/kdm/files/kdm-4-gentoo-xinitrc.d.patch
new file mode 100644
index 000000000000..538363af045e
--- /dev/null
+++ b/kde-plasma/kdm/files/kdm-4-gentoo-xinitrc.d.patch
@@ -0,0 +1,19 @@
+diff -Nurp kdm-4.3.1.orig/kdm/kfrontend/genkdmconf.c kdm-4.3.1/kdm/kfrontend/genkdmconf.c
+--- kdm-4.3.1.orig/kdm/kfrontend/genkdmconf.c 2009-09-20 07:57:19.746730568 +0200
++++ kdm-4.3.1/kdm/kfrontend/genkdmconf.c 2009-09-20 08:01:17.767496412 +0200
+@@ -687,6 +687,15 @@ static const char def_session2[] =
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
++"# run all system xinitrc shell scripts.\n"
++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
++" for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
++" if [ -x \"$i\" ]; then\n"
++" . \"$i\"\n"
++" fi\n"
++" done\n"
++"fi\n"
++"\n"
+ "case $session in\n"
+ " \"\")\n"
+ " exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
diff --git a/kde-plasma/kdm/files/kdm-logrotate b/kde-plasma/kdm/files/kdm-logrotate
new file mode 100644
index 000000000000..4bce1a0392d8
--- /dev/null
+++ b/kde-plasma/kdm/files/kdm-logrotate
@@ -0,0 +1,8 @@
+/var/log/kdm.log {
+ maxage 365
+ size=+1024k
+ notifempty
+ missingok
+ compress
+ copytruncate
+}
diff --git a/kde-plasma/kdm/files/kdm.service b/kde-plasma/kdm/files/kdm.service
new file mode 100644
index 000000000000..412ffa394ff5
--- /dev/null
+++ b/kde-plasma/kdm/files/kdm.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=KDM Display Manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/kde-plasma/kdm/kdm-4.11.22.ebuild b/kde-plasma/kdm/kdm-4.11.22.ebuild
new file mode 100644
index 000000000000..cee6373e0561
--- /dev/null
+++ b/kde-plasma/kdm/kdm-4.11.22.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+inherit systemd kde4-meta flag-o-matic user
+
+DESCRIPTION="Login manager by KDE, similar to xdm and gdm"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="debug +consolekit kerberos pam systemd"
+
+REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
+
+DEPEND="
+ kde-plasma/libkworkspace:4
+ media-libs/qimageblitz
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXtst
+ consolekit? (
+ >=sys-apps/dbus-1.0.2
+ sys-auth/consolekit
+ )
+ kerberos? ( virtual/krb5 )
+ pam? (
+ kde-plasma/kcheckpass:4
+ virtual/pam
+ )
+ systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+ $(add_kdeapps_dep kdepasswd)
+ kde-plasma/libkgreeter:4
+ >=x11-apps/xinit-1.0.5-r2
+ x11-apps/xmessage
+"
+
+KMEXTRACTONLY="
+ libs/kdm/kgreeterplugin.h
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+)
+
+pkg_setup() {
+ kde4-meta_pkg_setup
+
+ # Create kdm:kdm user
+ KDM_HOME=/var/lib/kdm
+ enewgroup kdm
+ enewuser kdm -1 -1 "${KDM_HOME}" kdm
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use kerberos KDE4_KRB5AUTH)
+ $(cmake-utils_use_with pam)
+ $(cmake-utils_use_with consolekit CkConnector)
+ )
+
+ kde4-meta_src_configure
+}
+
+src_install() {
+ export GENKDMCONF_FLAGS="--no-old --no-backup"
+
+ kde4-meta_src_install
+
+ # an equivalent file is already installed by kde-base/startkde, bug 377151
+ rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die
+
+ # Customize the kdmrc configuration:
+ # - SessionDirs set to /usr/share/xsessions
+ # - increase server timeout to 30s
+ # - TerminateServer=true to workaround X server regen bug, bug 278473
+ # - DataDir set to /var/lib/kdm
+ # - FaceDir set to /var/lib/kdm/faces
+ sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
+ -e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
+ -e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
+ -e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
+ -e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
+ -i "${ED}"/usr/share/config/kdm/kdmrc \
+ || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
+
+ # Don't install empty dir
+ rmdir "${ED}"/usr/share/config/kdm/sessions
+
+ # Set up permissions to kdm work directory
+ keepdir "${KDM_HOME}"
+ fowners root:kdm "${KDM_HOME}"
+ fperms 1770 "${KDM_HOME}"
+
+ # install logrotate file
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/kdm-logrotate kdm
+
+ systemd_dounit "${FILESDIR}"/kdm.service
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ local file src dest dir old_dirs=(
+ /var/lib/kdm-live
+ /var/lib/kdm-4.6
+ /var/lib/kdm-4.5
+ /var/lib/kdm-4.4
+ /usr/share/apps/kdm
+ /usr/kde/4.4/share/apps/kdm
+ /usr/kde/4.3/share/apps/kdm
+ /usr/kde/4.2/share/apps/kdm
+ )
+
+ mkdir -p "${EROOT}${KDM_HOME}/faces"
+ # Set the default kdm face icon if it's not already set by the system admin
+ # because this is user-overrideable in that way, it's not in src_install
+ for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
+ src=${file#*:}
+ dest=${file%:*}
+ if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
+ for dir in "${old_dirs[@]}"; do
+ if [[ -e ${EROOT}${dir}/${dest} ]]; then
+ cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
+ break 2
+ fi
+ done
+ if [[ -n ${src} ]]; then
+ cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
+ "${EROOT}${KDM_HOME}/${dest}"
+ fi
+ fi
+ done
+ for dir in "${old_dirs[@]}"; do
+ if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
+ echo
+ elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
+ elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
+ echo
+ elog "After doing so, you may delete the directory."
+ echo
+ fi
+ done
+
+ # Make sure permissions are correct -- old installations may have
+ # gotten this wrong
+ use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
+ chmod 1770 "${EROOT}${KDM_HOME}"
+
+ if use consolekit; then
+ echo
+ elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
+ elog "make sure consolekit daemon is running and started at login time"
+ elog
+ elog "rc-update add consolekit default && /etc/init.d/consolekit start"
+ echo
+ fi
+}
diff --git a/kde-plasma/kdm/metadata.xml b/kde-plasma/kdm/metadata.xml
new file mode 100644
index 000000000000..91f5d5a75b54
--- /dev/null
+++ b/kde-plasma/kdm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
+<use>
+ <flag name="consolekit">Enables support for authorization using consolekit</flag>
+</use>
+</pkgmetadata>
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild
index 81fc49b11248..f1a11ec155af 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild
@@ -90,6 +90,6 @@ pkg_postinst() {
elog "4.b Checking installed DMs..."
has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
- has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
+ has_version "kde-plasma/kdm" && check_dm "KDM" "/etc/pam.d/kde"
elog
}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild
index 18dcab74b264..4aac73ca0c1e 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild
@@ -90,6 +90,6 @@ pkg_postinst() {
elog "4.b Checking installed DMs..."
has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
- has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
+ has_version "kde-plasma/kdm" && check_dm "KDM" "/etc/pam.d/kde"
elog
}
diff --git a/kde-plasma/libkgreeter/libkgreeter-4.11.22.ebuild b/kde-plasma/libkgreeter/libkgreeter-4.11.22.ebuild
index 4db80128ab53..580bd71cb7c2 100644
--- a/kde-plasma/libkgreeter/libkgreeter-4.11.22.ebuild
+++ b/kde-plasma/libkgreeter/libkgreeter-4.11.22.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
- !<kde-base/kdm-4.11.17-r1:4
+ !<kde-plasma/kdm-4.11.17-r1:4
"
RDEPEND="${DEPEND}"