From a5452c0e0e21e64050249eb092c9d4f5e1961ad7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 4 May 2018 12:00:43 +0100 Subject: x11-misc/sddm : revision bump (do not source files in home) --- .../files/sddm-dont-source-files-in-home.patch | 87 +++++++++++++++++ x11-misc/sddm/sddm-0.14.0-r4.ebuild | 104 -------------------- x11-misc/sddm/sddm-0.14.0-r5.ebuild | 105 +++++++++++++++++++++ 3 files changed, 192 insertions(+), 104 deletions(-) create mode 100644 x11-misc/sddm/files/sddm-dont-source-files-in-home.patch delete mode 100644 x11-misc/sddm/sddm-0.14.0-r4.ebuild create mode 100644 x11-misc/sddm/sddm-0.14.0-r5.ebuild diff --git a/x11-misc/sddm/files/sddm-dont-source-files-in-home.patch b/x11-misc/sddm/files/sddm-dont-source-files-in-home.patch new file mode 100644 index 00000000..63b4f53a --- /dev/null +++ b/x11-misc/sddm/files/sddm-dont-source-files-in-home.patch @@ -0,0 +1,87 @@ +diff -Nur a/data/scripts/wayland-session b/data/scripts/wayland-session +--- a/data/scripts/wayland-session 2016-08-22 18:51:12.000000000 +0100 ++++ b/data/scripts/wayland-session 2018-05-04 11:53:18.083001476 +0100 +@@ -11,13 +11,6 @@ + [ -z "$BASH" ] && exec $SHELL $0 "$@" + set +o posix + [ -f /etc/profile ] && . /etc/profile +- if [ -f $HOME/.bash_profile ]; then +- . $HOME/.bash_profile +- elif [ -f $HOME/.bash_login ]; then +- . $HOME/.bash_login +- elif [ -f $HOME/.profile ]; then +- . $HOME/.profile +- fi + ;; + */zsh) + [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" +@@ -25,22 +18,19 @@ + zhome=${ZDOTDIR:-$HOME} + # zshenv is always sourced automatically. + [ -f $zdir/zprofile ] && . $zdir/zprofile +- [ -f $zhome/.zprofile ] && . $zhome/.zprofile + [ -f $zdir/zlogin ] && . $zdir/zlogin +- [ -f $zhome/.zlogin ] && . $zhome/.zlogin + emulate -R sh + ;; + */csh|*/tcsh) + # [t]cshrc is always sourced automatically. + # Note that sourcing csh.login after .cshrc is non-standard. + wlsess_tmp=`mktemp /tmp/wlsess-env-XXXXXX` +- $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c 'export -p' >! $wlsess_tmp" ++ $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; /bin/sh -c 'export -p' >! $wlsess_tmp" + . $wlsess_tmp + rm -f $wlsess_tmp + ;; + *) # Plain sh, ksh, and anything we do not know. + [ -f /etc/profile ] && . /etc/profile +- [ -f $HOME/.profile ] && . $HOME/.profile + ;; + esac + +diff -Nur a/data/scripts/Xsession b/data/scripts/Xsession +--- a/data/scripts/Xsession 2016-08-22 18:51:12.000000000 +0100 ++++ b/data/scripts/Xsession 2018-05-04 11:53:38.548659869 +0100 +@@ -11,13 +11,6 @@ + [ -z "$BASH" ] && exec $SHELL $0 "$@" + set +o posix + [ -f /etc/profile ] && . /etc/profile +- if [ -f $HOME/.bash_profile ]; then +- . $HOME/.bash_profile +- elif [ -f $HOME/.bash_login ]; then +- . $HOME/.bash_login +- elif [ -f $HOME/.profile ]; then +- . $HOME/.profile +- fi + ;; + */zsh) + [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" +@@ -25,27 +18,23 @@ + zhome=${ZDOTDIR:-$HOME} + # zshenv is always sourced automatically. + [ -f $zdir/zprofile ] && . $zdir/zprofile +- [ -f $zhome/.zprofile ] && . $zhome/.zprofile + [ -f $zdir/zlogin ] && . $zdir/zlogin +- [ -f $zhome/.zlogin ] && . $zhome/.zlogin + emulate -R sh + ;; + */csh|*/tcsh) + # [t]cshrc is always sourced automatically. + # Note that sourcing csh.login after .cshrc is non-standard. + xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX` +- $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c 'export -p' >! $xsess_tmp" ++ $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; /bin/sh -c 'export -p' >! $xsess_tmp" + . $xsess_tmp + rm -f $xsess_tmp + ;; + *) # Plain sh, ksh, and anything we do not know. + [ -f /etc/profile ] && . /etc/profile +- [ -f $HOME/.profile ] && . $HOME/.profile + ;; + esac + + [ -f /etc/xprofile ] && . /etc/xprofile +-[ -f $HOME/.xprofile ] && . $HOME/.xprofile + + # run all system xinitrc shell scripts. + if [ -d /etc/X11/xinit/xinitrc.d ]; then diff --git a/x11-misc/sddm/sddm-0.14.0-r4.ebuild b/x11-misc/sddm/sddm-0.14.0-r4.ebuild deleted file mode 100644 index bc6402c9..00000000 --- a/x11-misc/sddm/sddm-0.14.0-r4.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils user - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" -KEYWORDS="amd64 ~arm x86" - -LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" -SLOT="0" -IUSE="+branding consolekit elogind +pam systemd" - -REQUIRED_USE="elogind? ( !systemd !consolekit ) - systemd? ( !elogind !consolekit ) - consolekit? ( !elogind !systemd ) -" - -RDEPEND=">=dev-qt/qtcore-5.6:5 - >=dev-qt/qtdbus-5.6:5 - >=dev-qt/qtgui-5.6:5 - >=dev-qt/qtdeclarative-5.6:5 - >=dev-qt/qtnetwork-5.6:5 - >=x11-base/xorg-server-1.15.1 - x11-libs/libxcb[xkb(-)] - branding? ( x11-themes/redcore-theme-sddm ) - consolekit? ( >=sys-auth/consolekit-0.9.4 ) - elogind? ( sys-auth/elogind ) - pam? ( sys-libs/pam ) - systemd? ( sys-apps/systemd:= ) - !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" - -DEPEND="${RDEPEND} - dev-python/docutils - >=dev-qt/linguist-tools-5.6:5 - >=dev-qt/qttest-5.6:5 - kde-frameworks/extra-cmake-modules - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch" - "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" - "${FILESDIR}/${P}-avatars.patch" - "${FILESDIR}/${PN}-enable-elogind.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then - if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then - die 'The active compiler needs to be gcc 4.7 (or newer)' - fi - fi -} - -src_prepare() { - if use consolekit; then - eapply "${FILESDIR}/${P}-consolekit.patch" - fi - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_PAM=$(usex pam) - -DNO_SYSTEMD=$(usex '!systemd') - -DUSE_ELOGIND=$(usex 'elogind') - -DBUILD_MAN_PAGES=ON - -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - # overwrite sddm.conf - if use consolekit; then - cp -avx ${FILESDIR}/sddm-redcore-consolekit.conf ${ED}etc/sddm.conf - elif use elogind; then - cp -avx ${FILESDIR}/sddm-redcore-elogind.conf ${ED}etc/sddm.conf - fi -} - -pkg_postinst() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video - - if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then - local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login) - if [[ -z ${line} ]]; then - ewarn - ewarn "Erroneous /etc/pam.d/system-login settings detected!" - ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:" - ewarn - ewarn "session optional pam_ck_connector.so nox11" - ewarn - ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update." - ewarn - fi - fi -} diff --git a/x11-misc/sddm/sddm-0.14.0-r5.ebuild b/x11-misc/sddm/sddm-0.14.0-r5.ebuild new file mode 100644 index 00000000..5f0adc98 --- /dev/null +++ b/x11-misc/sddm/sddm-0.14.0-r5.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit cmake-utils user + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" +KEYWORDS="amd64 ~arm x86" + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +IUSE="+branding consolekit elogind +pam systemd" + +REQUIRED_USE="elogind? ( !systemd !consolekit ) + systemd? ( !elogind !consolekit ) + consolekit? ( !elogind !systemd ) +" + +RDEPEND=">=dev-qt/qtcore-5.6:5 + >=dev-qt/qtdbus-5.6:5 + >=dev-qt/qtgui-5.6:5 + >=dev-qt/qtdeclarative-5.6:5 + >=dev-qt/qtnetwork-5.6:5 + >=x11-base/xorg-server-1.15.1 + x11-libs/libxcb[xkb(-)] + branding? ( x11-themes/redcore-theme-sddm ) + consolekit? ( >=sys-auth/consolekit-0.9.4 ) + elogind? ( sys-auth/elogind ) + pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd:= ) + !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" + +DEPEND="${RDEPEND} + dev-python/docutils + >=dev-qt/linguist-tools-5.6:5 + >=dev-qt/qttest-5.6:5 + kde-frameworks/extra-cmake-modules + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch" + "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" + "${FILESDIR}/${P}-avatars.patch" + "${FILESDIR}/${PN}-enable-elogind.patch" + "${FILESDIR}/${PN}-dont-source-files-in-home.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then + if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then + die 'The active compiler needs to be gcc 4.7 (or newer)' + fi + fi +} + +src_prepare() { + if use consolekit; then + eapply "${FILESDIR}/${P}-consolekit.patch" + fi + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_PAM=$(usex pam) + -DNO_SYSTEMD=$(usex '!systemd') + -DUSE_ELOGIND=$(usex 'elogind') + -DBUILD_MAN_PAGES=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + # overwrite autogenerated sddm.conf + if use consolekit; then + cp -avx ${FILESDIR}/sddm-redcore-consolekit.conf ${ED}etc/sddm.conf + elif use elogind; then + cp -avx ${FILESDIR}/sddm-redcore-elogind.conf ${ED}etc/sddm.conf + fi +} + +pkg_postinst() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video + + if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then + local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login) + if [[ -z ${line} ]]; then + ewarn + ewarn "Erroneous /etc/pam.d/system-login settings detected!" + ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:" + ewarn + ewarn "session optional pam_ck_connector.so nox11" + ewarn + ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update." + ewarn + fi + fi +} -- cgit v1.2.3