From dfbcb477e7ed01428c2030407e9e615dae359aa8 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sat, 10 Dec 2016 12:38:33 +0100 Subject: kde-base/kdm -> kde-plasma/kdm --- kde-base/kdm/Manifest | 1 - kde-base/kdm/files/kdm-4-gentoo-xinitrc.d.patch | 19 --- kde-base/kdm/files/kdm-logrotate | 8 -- kde-base/kdm/files/kdm.service | 12 -- kde-base/kdm/kdm-4.11.22.ebuild | 163 ------------------------ kde-base/kdm/metadata.xml | 11 -- 6 files changed, 214 deletions(-) delete mode 100644 kde-base/kdm/Manifest delete mode 100644 kde-base/kdm/files/kdm-4-gentoo-xinitrc.d.patch delete mode 100644 kde-base/kdm/files/kdm-logrotate delete mode 100644 kde-base/kdm/files/kdm.service delete mode 100644 kde-base/kdm/kdm-4.11.22.ebuild delete mode 100644 kde-base/kdm/metadata.xml (limited to 'kde-base') diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest deleted file mode 100644 index db5163f83985..000000000000 --- a/kde-base/kdm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802 diff --git a/kde-base/kdm/files/kdm-4-gentoo-xinitrc.d.patch b/kde-base/kdm/files/kdm-4-gentoo-xinitrc.d.patch deleted file mode 100644 index 538363af045e..000000000000 --- a/kde-base/kdm/files/kdm-4-gentoo-xinitrc.d.patch +++ /dev/null @@ -1,19 +0,0 @@ -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-base/kdm/files/kdm-logrotate b/kde-base/kdm/files/kdm-logrotate deleted file mode 100644 index 4bce1a0392d8..000000000000 --- a/kde-base/kdm/files/kdm-logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/kdm.log { - maxage 365 - size=+1024k - notifempty - missingok - compress - copytruncate -} diff --git a/kde-base/kdm/files/kdm.service b/kde-base/kdm/files/kdm.service deleted file mode 100644 index 412ffa394ff5..000000000000 --- a/kde-base/kdm/files/kdm.service +++ /dev/null @@ -1,12 +0,0 @@ -[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-base/kdm/kdm-4.11.22.ebuild b/kde-base/kdm/kdm-4.11.22.ebuild deleted file mode 100644 index 1ab6487d7516..000000000000 --- a/kde-base/kdm/kdm-4.11.22.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# 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="KDE login manager, 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-base/kdm/metadata.xml b/kde-base/kdm/metadata.xml deleted file mode 100644 index 91f5d5a75b54..000000000000 --- a/kde-base/kdm/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - - - Enables support for authorization using consolekit - - -- cgit v1.2.3-65-gdbad