commit: 3bded4743d8aef17d6f260cd9d156c315f27666c Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> AuthorDate: Sun Aug 28 12:58:01 2016 +0000 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> CommitDate: Sun Aug 28 12:58:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bded474
x11-misc/sddm: Version bump to 0.14.0 Package-Manager: portage-2.3.0 x11-misc/sddm/Manifest | 1 + x11-misc/sddm/files/sddm-0.14.0-consolekit.patch | 9 +++ x11-misc/sddm/sddm-0.14.0.ebuild | 82 ++++++++++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index 6c3d570..812706d 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1 +1,2 @@ DIST sddm-0.13.0.tar.xz 3869452 SHA256 dd868caaccf7783ead799f3b79e442d5adcb46251b78c8dbf3e9da0016dd347d SHA512 292a584945e74ea987088f975d5973b45a5b4fc07fa90b487fb9ece2de7ecca352344354474dfa8d103c8242367c19ad926e62a553e5b567d8d88a3f2c73c171 WHIRLPOOL e3961ecd5e22e8d565c16d86b6043ba7f3d6c1c296047d196577ab25af4e50216d67d53e9690b4df262c5ae4486bf36f88d345110a54bada9d75c4ff0dfc5ff3 +DIST sddm-0.14.0.tar.xz 3298360 SHA256 7e348258618b20f777767a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366 WHIRLPOOL d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb diff --git a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch new file mode 100644 index 00000000..64ea064 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch @@ -0,0 +1,9 @@ +--- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 ++++ b/data/scripts/Xsession 2016-08-28 14:53:07.157184480 +0200 +@@ -91,5 +91,5 @@ + if [ -z "$@" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." + else +- exec $@ ++ exec ck-launch-session $@ + fi diff --git a/x11-misc/sddm/sddm-0.14.0.ebuild b/x11-misc/sddm/sddm-0.14.0.ebuild new file mode 100644 index 00000000..eb423b0 --- /dev/null +++ b/x11-misc/sddm/sddm-0.14.0.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="consolekit +pam systemd" + +QT_MINIMAL="5.6" + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtdeclarative:5 + dev-qt/qtnetwork:5 + >=x11-base/xorg-server-1.15.1 + x11-libs/libxcb[xkb(-)] + consolekit? ( >=sys-auth/consolekit-0.9.4 ) + 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 + dev-qt/qttest:5 + virtual/pkgconfig" + +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() { + eapply "${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch" + # fix for flags handling and bug 563108 + eapply "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" + use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch" + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_PAM=$(usex pam) + -DNO_SYSTEMD=$(usex '!systemd') + -DBUILD_MAN_PAGES=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + ) + + cmake-utils_src_configure +} + +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 +}
