From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B448138332 for ; Sun, 4 Mar 2018 10:06:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8CDAE08D0; Sun, 4 Mar 2018 10:06:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1107E089A for ; Sun, 4 Mar 2018 10:06:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEE05335C0C for ; Sun, 4 Mar 2018 10:06:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 698B9239 for ; Sun, 4 Mar 2018 10:06:32 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1520155948.6539dc8c14471d416ebe09ae58daceacba770be0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/elogind/elogind-235.2-r2.ebuild X-VCS-Directories: sys-auth/elogind/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6539dc8c14471d416ebe09ae58daceacba770be0 X-VCS-Branch: master Date: Sun, 4 Mar 2018 10:06:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 203c824b-a1ef-459e-862d-59863eaa9868 X-Archives-Hash: 0b202ecd33a783a14d4d575ed56a372e commit: 6539dc8c14471d416ebe09ae58daceacba770be0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 3 22:49:56 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 4 09:32:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6539dc8c sys-auth/elogind: Restore default-kill-user-processes=false Reported-by: Herbert Wantesh gmx.net> Closes: https://bugs.gentoo.org/646908 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-auth/elogind/elogind-235.2-r2.ebuild | 129 +++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/sys-auth/elogind/elogind-235.2-r2.ebuild b/sys-auth/elogind/elogind-235.2-r2.ebuild new file mode 100644 index 00000000000..9d4754ad22c --- /dev/null +++ b/sys-auth/elogind/elogind-235.2-r2.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-info meson pam udev xdg-utils + +DESCRIPTION="The systemd project's logind, extracted to a standalone package" +HOMEPAGE="https://github.com/elogind/elogind" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC0-1.0 LGPL-2.1+ public-domain" +SLOT="0" +KEYWORDS="amd64 ~arm x86" +IUSE="+acl debug doc +pam +policykit selinux" + +COMMON_DEPEND=" + sys-apps/util-linux + sys-libs/libcap + virtual/libudev:= + acl? ( sys-apps/acl ) + pam? ( virtual/pam ) + selinux? ( sys-libs/libselinux ) +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-util/gperf + dev-util/intltool + sys-devel/libtool + virtual/pkgconfig +" +RDEPEND="${COMMON_DEPEND} + !sys-apps/systemd +" +PDEPEND=" + sys-apps/dbus + policykit? ( sys-auth/polkit ) +" + +PATCHES=( + "${FILESDIR}/${PN}-235.1-docs.patch" + "${FILESDIR}/${P}-legacy-cgroupmode.patch" + "${FILESDIR}/${P}-drop-logintest.patch" # bug 645156 +) + +pkg_setup() { + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD" + + if use kernel_linux; then + linux-info_pkg_setup + fi +} + +src_prepare() { + default + xdg_environment_reset +} + +src_configure() { + local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)" + local cgroupmode="legacy" + + if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then + cgroupmode="hybrid" + elif [[ "xunified" = "x${rccgroupmode}" ]] ; then + cgroupmode="unified" + fi + + local emesonargs=( + -Ddocdir="${EPREFIX}/usr/share/doc/${P}" + -Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html" + -Dpamlibdir=$(getpam_mod_dir) + -Dudevrulesdir="$(get_udevdir)"/rules.d + --libdir="${EPREFIX}"/usr/$(get_libdir) + -Drootlibdir="${EPREFIX}"/$(get_libdir) + -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind + -Drootprefix="${EPREFIX}/" + -Dsmack=true + -Dman=auto + -Dhtml=$(usex doc auto false) + -Dcgroup-controller=openrc + -Ddefault-hierarchy=${cgroupmode} + -Ddebug=$(usex debug elogind false) + --buildtype $(usex debug debug release) + -Dacl=$(usex acl true false) + -Dpam=$(usex pam true false) + -Dselinux=$(usex selinux true false) + -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" + -Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions" + -Ddefault-kill-user-processes=false + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + newinitd "${FILESDIR}"/${PN}.init ${PN} + + sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die + newconfd ${PN}.conf ${PN} +} + +pkg_postinst() { + if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then + ewarn "elogind is currently started from boot runlevel." + elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then + ewarn "elogind is currently started from default runlevel." + ewarn "Please remove elogind from the default runlevel and" + ewarn "add it to the boot runlevel by:" + ewarn "# rc-update del elogind default" + ewarn "# rc-update add elogind boot" + else + ewarn "elogind is currently not started from any runlevel." + ewarn "You may add it to the boot runlevel by:" + ewarn "# rc-update add elogind boot" + fi + ewarn "Alternatively you can leave elogind out of any" + ewarn "runlevel. It will then be started automatically" + if use pam; then + ewarn "when the first service calls it via dbus, or the" + ewarn "first user logs into the system." + else + ewarn "when the first service calls it via dbus." + fi +}