commit: e793c45267a4028b487fe55a7a46d9fdeaa684f6 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Sun Aug 14 18:12:24 2016 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Sun Aug 14 18:13:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e793c452
lxde-base/lxdm: Version bump Package-Manager: portage-2.3.0 lxde-base/lxdm/Manifest | 1 + lxde-base/lxdm/files/Xsession | 79 ++++++++++++++++++++++ .../files/lxdm-0.5.3-pam_console-disable.patch | 8 +++ lxde-base/lxdm/lxdm-0.5.3.ebuild | 67 ++++++++++++++++++ 4 files changed, 155 insertions(+) diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest index a9f2f86..9970171 100644 --- a/lxde-base/lxdm/Manifest +++ b/lxde-base/lxdm/Manifest @@ -1 +1,2 @@ DIST lxdm-0.4.1.tar.gz 296714 SHA256 9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08 SHA512 8ed4a955a910def4db66958d1cb24976db178b8763199a024b6c2119894745e3646566c42d01472dffbbcbb7fd21784b01e74dc88038e01caebaa3b6d720ff27 WHIRLPOOL 1bbb55bf955f46aaac54ca3372c09308baa496297e56026456e464217f115d6b26994e8be6b6b228b663bb2e14cf9d5ace6930f75024f6426825dd4fefc5349f +DIST lxdm-0.5.3.tar.xz 239132 SHA256 4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f WHIRLPOOL f0b36b1da0ea558fcd04fe2dbf3b6e65afb1d9f19e4d7fdb1ededfc9e3b35c1135cdb24477ce3fce024029484174c3c7009e76a66fd84694220eee1dccf4802c diff --git a/lxde-base/lxdm/files/Xsession b/lxde-base/lxdm/files/Xsession new file mode 100644 index 0000000..d5df36f --- /dev/null +++ b/lxde-base/lxdm/files/Xsession @@ -0,0 +1,79 @@ +#!/bin/sh +# +# LXDM wrapper to run around X sessions. +# Copied form lightdm + +echo "Running X session wrapper" + +#Convert MATE to lower case util MATE scripts are fixed +[ "$DESKTOP_SESSION" = "MATE" ] && DESKTOP_SESSION=mate +export DESKTOP_SESSION + +# Load profile +for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do + if [ -f "$file" ]; then + echo "Loading profile from $file"; + . "$file" + fi +done + +# Load resources +for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do + if [ -f "$file" ]; then + echo "Loading resource: $file" + xrdb -nocpp -merge "$file" + fi +done + +# Load keymaps +for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do + if [ -f "$file" ]; then + echo "Loading keymap: $file" + setxkbmap `cat "$file"` + XKB_IN_USE=yes + fi +done + +# Load xmodmap if not using XKB +if [ -z "$XKB_IN_USE" ]; then + for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do + if [ -f "$file" ]; then + echo "Loading modmap: $file" + xmodmap "$file" + fi + done +fi + +unset XKB_IN_USE + +# /etc/X11/xinit/xinitrc.d/80-dbus expects $command to be +# set to the Xsession arguments. So make it happy. See +# https://bugs.gentoo.org/show_bug.cgi?id=533456 +command="$@" + +# Run all system xinitrc shell scripts. +xinitdir="/etc/X11/xinit/xinitrc.d" +if [ -d "$xinitdir" ]; then + for script in $xinitdir/*; do + echo "Loading xinit script $script" + if [ -x "$script" -a ! -d "$script" ]; then + . "$script" + fi + done +fi + +# Load Xsession scripts +xsessionddir="/etc/X11/Xsession.d" +if [ -d "$xsessionddir" ]; then + for i in `ls $xsessionddir`; do + script="$xsessionddir/$i" + echo "Loading X session script $script" + if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then + . "$script" + fi + done +fi + +echo "X session wrapper complete, running session $@" + +exec $command diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch b/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch new file mode 100644 index 0000000..8fb8cb4 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch @@ -0,0 +1,8 @@ +--- lxdm-0.4.0.orig/pam/lxdm ++++ lxdm-0.4.0/pam/lxdm +@@ -5,4 +5,4 @@ account include system-auth + session optional pam_keyinit.so force revoke + session include system-auth +-session optional pam_console.so ++#session optional pam_console.so + session optional pam_gnome_keyring.so auto_start diff --git a/lxde-base/lxdm/lxdm-0.5.3.ebuild b/lxde-base/lxdm/lxdm-0.5.3.ebuild new file mode 100644 index 0000000..0665f7b --- /dev/null +++ b/lxde-base/lxdm/lxdm-0.5.3.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils autotools systemd + +DESCRIPTION="LXDE Display Manager" +HOMEPAGE="http://lxde.org"; +SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" + +IUSE="consolekit debug gtk3 nls pam" + +RDEPEND="consolekit? ( sys-auth/consolekit ) + x11-libs/libxcb + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + nls? ( sys-devel/gettext ) + pam? ( virtual/pam )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40 + virtual/pkgconfig" +DOCS=( AUTHORS README TODO ) + +src_prepare() { + # Upstream bug, tarball contains pre-made lxdm.conf + rm "${S}"/data/lxdm.conf || die + + # Fix consolekit and selinux + eapply "${FILESDIR}/${P}-pam_console-disable.patch" + + eapply_user + + # this replaces the bootstrap/autogen script in most packages + eautoreconf + + # process LINGUAS + if use nls; then + einfo "Running intltoolize ..." + intltoolize --force --copy --automake || die + strip-linguas -i "${S}/po" || die + fi +} +src_configure() { + econf --enable-password \ + --with-x \ + --with-xconn=xcb \ + --with-systemdsystemunitdir=$(systemd_get_systemunitdir) \ + $(use_enable consolekit) \ + $(use_enable gtk3) \ + $(use_enable nls) \ + $(use_enable debug) \ + $(use_with pam) +} + +src_install() { + default_src_install + + #Use Gentoo specific Xsession startup file + exeinto /etc/${PN} + doexe "${FILESDIR}"/Xsession +}
