From 471fa32b97d78be42a08afb523ca578053989db8 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 30 Jun 2020 09:59:37 +0200 Subject: x11-misc/lightdm: Revbump for changed Xsession file. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Lars Wendler --- x11-misc/lightdm/files/Xsession | 60 ++++++------ x11-misc/lightdm/lightdm-1.30.0-r1.ebuild | 155 ++++++++++++++++++++++++++++++ x11-misc/lightdm/lightdm-1.30.0.ebuild | 155 ------------------------------ 3 files changed, 185 insertions(+), 185 deletions(-) create mode 100644 x11-misc/lightdm/lightdm-1.30.0-r1.ebuild delete mode 100644 x11-misc/lightdm/lightdm-1.30.0.ebuild (limited to 'x11-misc/lightdm') diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession index d982a0ac89e9..1fe0110c9d9b 100644 --- a/x11-misc/lightdm/files/Xsession +++ b/x11-misc/lightdm/files/Xsession @@ -5,36 +5,36 @@ echo "Running X session wrapper" # Load profile -for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do - if [ -f "$file" ]; then - echo "Loading profile from $file"; - . "$file" +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" +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"` +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" +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 @@ -48,27 +48,27 @@ command="$@" # Run all system xinitrc shell scripts. xinitdir="/etc/X11/xinit/xinitrc.d" -if [ -d "$xinitdir" ]; then - for script in $xinitdir/*; do - if [ -x "$script" -a ! -d "$script" ]; then - echo "Loading xinit script $script" - . "$script" +if [ -d "${xinitdir}" ] ; then + for script in ${xinitdir}/* ; do + if [ -x "${script}" ] && [ ! -d "${script}" ] ; then + echo "Loading xinit script ${script}" + . "${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" - if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then - echo "Loading X session script $script" - . "$script" +if [ -d "${xsessionddir}" ] ; then + for i in $(ls ${xsessionddir}) ; do + script="${xsessionddir}/${i}" + if [ -r "${script}" ] && [ -f "${script}" ] && expr "${i}" : '^[[:alnum:]_-]\+$' > /dev/null ; then + echo "Loading X session script ${script}" + . "${script}" fi done fi -echo "X session wrapper complete, running session $@" +echo "X session wrapper complete, running session ${@}" -exec $command +exec ${command} diff --git a/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild new file mode 100644 index 000000000000..ea3868227341 --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd user vala xdg-utils + +DESCRIPTION="A lightweight display manager" +HOMEPAGE="https://github.com/CanonicalLtd/lightdm" +SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz + mirror://gentoo/introspection-20110205.m4.tar.bz2" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86" +IUSE="audit +gnome +gtk +introspection non_root qt5 vala" + +COMMON_DEPEND=" + >=dev-libs/glib-2.44.0:2 + dev-libs/libxml2 + sys-libs/pam + x11-libs/libX11 + >=x11-libs/libxklavier-5 + audit? ( sys-process/audit ) + gnome? ( sys-apps/accountsservice ) + introspection? ( >=dev-libs/gobject-introspection-1 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + ) +" +RDEPEND="${COMMON_DEPEND} + >=sys-auth/pambase-20101024-r2" +DEPEND="${COMMON_DEPEND} + gnome? ( gnome-base/gnome-common ) +" +BDEPEND=" + dev-util/gtk-doc-am + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + vala? ( $(vala_depend) ) +" +PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" + +DOCS=( NEWS ) +RESTRICT="test" +REQUIRED_USE="vala? ( introspection )" + +pkg_setup() { + export LIGHTDM_USER=${LIGHTDM_USER:-lightdm} + if use non_root ; then + enewgroup ${LIGHTDM_USER} + enewgroup video # Just in case it hasn't been created yet + enewuser ${LIGHTDM_USER} -1 -1 /var/lib/${LIGHTDM_USER} ${LIGHTDM_USER},video + esethome ${LIGHTDM_USER} /var/lib/${LIGHTDM_USER} + fi +} + +src_prepare() { + xdg_environment_reset + + sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 + sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die + + einfo "Fixing the session-wrapper variable in lightdm.conf" + sed -i -e \ + "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + data/lightdm.conf || die "Failed to fix lightdm.conf" + + # use correct version of qmake. bug #566950 + sed \ + -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \ + -i configure.ac || die + + default + + # Remove bogus Makefile statement. This needs to go upstream + sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die + if has_version dev-libs/gobject-introspection; then + eautoreconf + else + AT_M4DIR=${WORKDIR} eautoreconf + fi + + use vala && vala_src_prepare +} + +src_configure() { + # Set default values if global vars unset + local _greeter _session _user + _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} + _session=${LIGHTDM_SESSION:=gnome} + _user="$(usex non_root "${LIGHTDM_USER}" root)" + # Let user know how lightdm is configured + einfo "Gentoo configuration" + einfo "Default greeter: ${_greeter}" + einfo "Default session: ${_session}" + einfo "Greeter user: ${_user}" + + use qt5 && append-cxxflags -std=c++11 + + # also disable tests because libsystem.c does not build. Tests are + # restricted so it does not matter anyway. + local myeconfargs=( + --localstatedir=/var + --disable-static + --disable-tests + $(use_enable audit libaudit) + $(use_enable introspection) + --disable-liblightdm-qt + $(use_enable qt5 liblightdm-qt5) + $(use_enable vala) + --with-user-session=${_session} + --with-greeter-session=${_greeter} + --with-greeter-user=${_user} + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Delete apparmor profiles because they only work with Ubuntu's + # apparmor package. Bug #494426 + if [[ -d ${ED}/etc/apparmor.d ]]; then + rm -r "${ED}/etc/apparmor.d" || die \ + "Failed to remove apparmor profiles" + fi + + insinto /etc/${PN} + doins data/{${PN},keys}.conf + doins "${FILESDIR}"/Xsession + fperms +x /etc/${PN}/Xsession + # /var/lib/lightdm-data could be useful. Bug #522228 + keepdir /var/lib/${PN}-data + + find "${ED}" -type f \( -name '*.a' -o -name "*.la" \) -delete || die + rm -r "${ED}"/etc/init || die + + # Remove existing pam file. We will build a new one. Bug #524792 + rm -r "${ED}"/etc/pam.d/${PN}{,-greeter} || die + pamd_mimic system-local-login ${PN} auth account password session #372229 + pamd_mimic system-local-login ${PN}-greeter auth account password session #372229 + dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 + + readme.gentoo_create_doc + + systemd_dounit "${FILESDIR}/${PN}.service" +} + +pkg_postinst() { + systemd_reenable "${PN}.service" +} diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0.ebuild deleted file mode 100644 index ea3868227341..000000000000 --- a/x11-misc/lightdm/lightdm-1.30.0.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd user vala xdg-utils - -DESCRIPTION="A lightweight display manager" -HOMEPAGE="https://github.com/CanonicalLtd/lightdm" -SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz - mirror://gentoo/introspection-20110205.m4.tar.bz2" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86" -IUSE="audit +gnome +gtk +introspection non_root qt5 vala" - -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2 - dev-libs/libxml2 - sys-libs/pam - x11-libs/libX11 - >=x11-libs/libxklavier-5 - audit? ( sys-process/audit ) - gnome? ( sys-apps/accountsservice ) - introspection? ( >=dev-libs/gobject-introspection-1 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - ) -" -RDEPEND="${COMMON_DEPEND} - >=sys-auth/pambase-20101024-r2" -DEPEND="${COMMON_DEPEND} - gnome? ( gnome-base/gnome-common ) -" -BDEPEND=" - dev-util/gtk-doc-am - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" - -DOCS=( NEWS ) -RESTRICT="test" -REQUIRED_USE="vala? ( introspection )" - -pkg_setup() { - export LIGHTDM_USER=${LIGHTDM_USER:-lightdm} - if use non_root ; then - enewgroup ${LIGHTDM_USER} - enewgroup video # Just in case it hasn't been created yet - enewuser ${LIGHTDM_USER} -1 -1 /var/lib/${LIGHTDM_USER} ${LIGHTDM_USER},video - esethome ${LIGHTDM_USER} /var/lib/${LIGHTDM_USER} - fi -} - -src_prepare() { - xdg_environment_reset - - sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 - sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die - - einfo "Fixing the session-wrapper variable in lightdm.conf" - sed -i -e \ - "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ - data/lightdm.conf || die "Failed to fix lightdm.conf" - - # use correct version of qmake. bug #566950 - sed \ - -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \ - -i configure.ac || die - - default - - # Remove bogus Makefile statement. This needs to go upstream - sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die - if has_version dev-libs/gobject-introspection; then - eautoreconf - else - AT_M4DIR=${WORKDIR} eautoreconf - fi - - use vala && vala_src_prepare -} - -src_configure() { - # Set default values if global vars unset - local _greeter _session _user - _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} - _session=${LIGHTDM_SESSION:=gnome} - _user="$(usex non_root "${LIGHTDM_USER}" root)" - # Let user know how lightdm is configured - einfo "Gentoo configuration" - einfo "Default greeter: ${_greeter}" - einfo "Default session: ${_session}" - einfo "Greeter user: ${_user}" - - use qt5 && append-cxxflags -std=c++11 - - # also disable tests because libsystem.c does not build. Tests are - # restricted so it does not matter anyway. - local myeconfargs=( - --localstatedir=/var - --disable-static - --disable-tests - $(use_enable audit libaudit) - $(use_enable introspection) - --disable-liblightdm-qt - $(use_enable qt5 liblightdm-qt5) - $(use_enable vala) - --with-user-session=${_session} - --with-greeter-session=${_greeter} - --with-greeter-user=${_user} - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # Delete apparmor profiles because they only work with Ubuntu's - # apparmor package. Bug #494426 - if [[ -d ${ED}/etc/apparmor.d ]]; then - rm -r "${ED}/etc/apparmor.d" || die \ - "Failed to remove apparmor profiles" - fi - - insinto /etc/${PN} - doins data/{${PN},keys}.conf - doins "${FILESDIR}"/Xsession - fperms +x /etc/${PN}/Xsession - # /var/lib/lightdm-data could be useful. Bug #522228 - keepdir /var/lib/${PN}-data - - find "${ED}" -type f \( -name '*.a' -o -name "*.la" \) -delete || die - rm -r "${ED}"/etc/init || die - - # Remove existing pam file. We will build a new one. Bug #524792 - rm -r "${ED}"/etc/pam.d/${PN}{,-greeter} || die - pamd_mimic system-local-login ${PN} auth account password session #372229 - pamd_mimic system-local-login ${PN}-greeter auth account password session #372229 - dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 - - readme.gentoo_create_doc - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_postinst() { - systemd_reenable "${PN}.service" -} -- cgit v1.2.3-65-gdbad