Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/
Date: Wed, 31 Jan 2018 10:22:44
Message-Id: 1517394133.0def3e4411a9c544c9ecb7792038cb0f1a512184.asturm@gentoo
1 commit: 0def3e4411a9c544c9ecb7792038cb0f1a512184
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 31 10:21:05 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 31 10:22:13 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0def3e44
7
8 sys-auth/elogind: Cleanup
9
10 Package-Manager: Portage-2.3.21, Repoman-2.3.6
11
12 sys-auth/elogind/elogind-235.2-r1.ebuild | 51 ++++++++++++++++----------------
13 1 file changed, 25 insertions(+), 26 deletions(-)
14
15 diff --git a/sys-auth/elogind/elogind-235.2-r1.ebuild b/sys-auth/elogind/elogind-235.2-r1.ebuild
16 index eb33bb294c4..59b037e8e3f 100644
17 --- a/sys-auth/elogind/elogind-235.2-r1.ebuild
18 +++ b/sys-auth/elogind/elogind-235.2-r1.ebuild
19 @@ -58,10 +58,8 @@ src_prepare() {
20 }
21
22 src_configure() {
23 - local emesonargs cgroupmode rccgroupmode
24 -
25 - rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
26 - cgroupmode="legacy"
27 + local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
28 + local cgroupmode="legacy"
29
30 if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
31 cgroupmode="hybrid"
32 @@ -69,28 +67,29 @@ src_configure() {
33 cgroupmode="unified"
34 fi
35
36 - emesonargs=(
37 - -Ddocdir="${EPREFIX}/usr/share/doc/${P}" \
38 - -Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html" \
39 - -Dpamlibdir=$(getpam_mod_dir) \
40 - -Dudevrulesdir="$(get_udevdir)"/rules.d \
41 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
42 - -Drootlibdir="${EPREFIX}"/$(get_libdir) \
43 - -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \
44 - -Drootprefix="${EPREFIX}/" \
45 - -Dsmack=true \
46 - -Dman=auto \
47 - -Dhtml=$(usex doc auto false) \
48 - -Dcgroup-controller=openrc \
49 - -Ddefault-hierarchy=${cgroupmode} \
50 - -Ddebug=$(usex debug elogind false) \
51 - --buildtype $(usex debug debug release) \
52 - -Dacl=$(usex acl true false) \
53 - -Dpam=$(usex pam true false) \
54 - -Dselinux=$(usex selinux true false) \
55 - -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" \
56 + local emesonargs=(
57 + -Ddocdir="${EPREFIX}/usr/share/doc/${P}"
58 + -Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
59 + -Dpamlibdir=$(getpam_mod_dir)
60 + -Dudevrulesdir="$(get_udevdir)"/rules.d
61 + --libdir="${EPREFIX}"/usr/$(get_libdir)
62 + -Drootlibdir="${EPREFIX}"/$(get_libdir)
63 + -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
64 + -Drootprefix="${EPREFIX}/"
65 + -Dsmack=true
66 + -Dman=auto
67 + -Dhtml=$(usex doc auto false)
68 + -Dcgroup-controller=openrc
69 + -Ddefault-hierarchy=${cgroupmode}
70 + -Ddebug=$(usex debug elogind false)
71 + --buildtype $(usex debug debug release)
72 + -Dacl=$(usex acl true false)
73 + -Dpam=$(usex pam true false)
74 + -Dselinux=$(usex selinux true false)
75 + -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
76 -Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions"
77 )
78 +
79 meson_src_configure
80 }
81
82 @@ -104,9 +103,9 @@ src_install() {
83 }
84
85 pkg_postinst() {
86 - if [ "$(rc-config list boot | grep elogind)" != "" ]; then
87 + if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
88 ewarn "elogind is currently started from boot runlevel."
89 - elif [ "$(rc-config list default | grep elogind)" != "" ]; then
90 + elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
91 ewarn "elogind is currently started from default runlevel."
92 ewarn "Please remove elogind from the default runlevel and"
93 ewarn "add it to the boot runlevel by:"