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/files/, sys-auth/elogind/
Date: Fri, 15 Nov 2019 17:37:54
Message-Id: 1573839460.7402aa2a4fc7ba4243043529784bddfb93cdaecd.asturm@gentoo
1 commit: 7402aa2a4fc7ba4243043529784bddfb93cdaecd
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 15 14:28:32 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 15 17:37:40 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7402aa2a
7
8 sys-auth/elogind: 241.4 version bump
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 sys-auth/elogind/Manifest | 1 +
14 sys-auth/elogind/elogind-241.4.ebuild | 134 ++++++++++++++++++++++
15 sys-auth/elogind/files/elogind-241.4-nodocs.patch | 29 +++++
16 3 files changed, 164 insertions(+)
17
18 diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
19 index ff7b0c59822..a0e5f088472 100644
20 --- a/sys-auth/elogind/Manifest
21 +++ b/sys-auth/elogind/Manifest
22 @@ -1 +1,2 @@
23 DIST elogind-241.3.tar.gz 1401391 BLAKE2B 90bc10af1b6d66bc6b6e15314cbc7005f270ebd04767a88d93605d81b199758c7f5423ea85f9810f8dfcde82c6c2b8094e2237cf2ca70a9dfc45a4a8e20b0439 SHA512 b33c0ed85c4a97216f8d56441207510be180258d4f4e5ff9dea07d59d53b84b03c27f5397f09214ce9fc880f38865e20d7c05b41255d4b762c33099b7ebb53eb
24 +DIST elogind-241.4.tar.gz 1400769 BLAKE2B f1ddf87a6a4e3d06c184ae004d99acbfc1a753d0e5c6d18ff4c10a51b350cee0c14f833aba6f2a2a0f4891ad323868b9a94a3acb8b9eec2e30405b9fa4a09425 SHA512 e1685ac81028eab4a4cf63c7b962ae85f07bc0e39b2562934f863bfdf39417445c432fab5454e7c64b337ab62d95fb69abbe1139464a059a86fb485ed0534ad8
25
26 diff --git a/sys-auth/elogind/elogind-241.4.ebuild b/sys-auth/elogind/elogind-241.4.ebuild
27 new file mode 100644
28 index 00000000000..1ea75923793
29 --- /dev/null
30 +++ b/sys-auth/elogind/elogind-241.4.ebuild
31 @@ -0,0 +1,134 @@
32 +# Copyright 1999-2019 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=7
36 +
37 +if [[ ${PV} = *9999* ]]; then
38 + EGIT_BRANCH="v241-stable"
39 + EGIT_REPO_URI="https://github.com/elogind/elogind.git"
40 + inherit git-r3
41 +else
42 + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
43 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
44 +fi
45 +
46 +inherit linux-info meson pam udev xdg-utils
47 +
48 +DESCRIPTION="The systemd project's logind, extracted to a standalone package"
49 +HOMEPAGE="https://github.com/elogind/elogind"
50 +
51 +LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
52 +SLOT="0"
53 +IUSE="+acl debug doc +pam +policykit selinux"
54 +
55 +COMMON_DEPEND="
56 + sys-apps/util-linux
57 + sys-libs/libcap
58 + virtual/libudev:=
59 + acl? ( sys-apps/acl )
60 + pam? ( sys-libs/pam )
61 + selinux? ( sys-libs/libselinux )
62 +"
63 +DEPEND="${COMMON_DEPEND}
64 + app-text/docbook-xml-dtd:4.2
65 + app-text/docbook-xml-dtd:4.5
66 + app-text/docbook-xsl-stylesheets
67 + dev-util/gperf
68 + dev-util/intltool
69 + sys-devel/libtool
70 + virtual/pkgconfig
71 +"
72 +RDEPEND="${COMMON_DEPEND}
73 + !sys-apps/systemd
74 +"
75 +PDEPEND="
76 + sys-apps/dbus
77 + policykit? ( sys-auth/polkit )
78 +"
79 +
80 +DOCS=( NEWS README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
81 +
82 +PATCHES=( "${FILESDIR}/${P}-nodocs.patch" )
83 +
84 +pkg_setup() {
85 + local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
86 +
87 + use kernel_linux && linux-info_pkg_setup
88 +}
89 +
90 +src_prepare() {
91 + default
92 + xdg_environment_reset
93 +}
94 +
95 +src_configure() {
96 + local rccgroupmode="$(grep rc_cgroup_mode \"${EPREFIX}/etc/rc.conf\" | cut -d '"' -f 2)"
97 + local cgroupmode="legacy"
98 +
99 + if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
100 + cgroupmode="hybrid"
101 + elif [[ "xunified" = "x${rccgroupmode}" ]] ; then
102 + cgroupmode="unified"
103 + fi
104 +
105 + local emesonargs=(
106 + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
107 + -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
108 + -Dpamlibdir=$(getpam_mod_dir)
109 + -Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d
110 + --libdir="${EPREFIX}"/usr/$(get_libdir)
111 + -Drootlibdir="${EPREFIX}"/$(get_libdir)
112 + -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
113 + -Drootprefix="${EPREFIX}/"
114 + -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
115 + -Dman=auto
116 + -Dsmack=true
117 + -Dcgroup-controller=openrc
118 + -Ddefault-hierarchy=${cgroupmode}
119 + -Ddefault-kill-user-processes=false
120 + -Dacl=$(usex acl true false)
121 + --buildtype $(usex debug debug release)
122 + -Dhtml=$(usex doc auto false)
123 + -Dpam=$(usex pam true false)
124 + -Dselinux=$(usex selinux true false)
125 + -Dutmp=$(usex elibc_musl false true)
126 + )
127 +
128 + meson_src_configure
129 +}
130 +
131 +src_install() {
132 + DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
133 +
134 + meson_src_install
135 +
136 + newinitd "${FILESDIR}"/${PN}.init ${PN}
137 +
138 + sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
139 + newconfd ${PN}.conf ${PN}
140 +}
141 +
142 +pkg_postinst() {
143 + if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
144 + elog "elogind is currently started from boot runlevel."
145 + elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
146 + ewarn "elogind is currently started from default runlevel."
147 + ewarn "Please remove elogind from the default runlevel and"
148 + ewarn "add it to the boot runlevel by:"
149 + ewarn "# rc-update del elogind default"
150 + ewarn "# rc-update add elogind boot"
151 + else
152 + elog "elogind is currently not started from any runlevel."
153 + elog "You may add it to the boot runlevel by:"
154 + elog "# rc-update add elogind boot"
155 + elog
156 + elog "Alternatively, you can leave elogind out of any"
157 + elog "runlevel. It will then be started automatically"
158 + if use pam; then
159 + elog "when the first service calls it via dbus, or"
160 + elog "the first user logs into the system."
161 + else
162 + elog "when the first service calls it via dbus."
163 + fi
164 + fi
165 +}
166
167 diff --git a/sys-auth/elogind/files/elogind-241.4-nodocs.patch b/sys-auth/elogind/files/elogind-241.4-nodocs.patch
168 new file mode 100644
169 index 00000000000..299087483ce
170 --- /dev/null
171 +++ b/sys-auth/elogind/files/elogind-241.4-nodocs.patch
172 @@ -0,0 +1,29 @@
173 +We don't want the build system to install to docdir for us.
174 +
175 +--- a/meson.build 2019-10-26 23:24:34.743783753 +0200
176 ++++ b/meson.build 2019-10-26 23:26:50.847647926 +0200
177 +@@ -3342,15 +3342,10 @@
178 + # install_data('modprobe.d/systemd.conf',
179 + # install_dir : modprobedir)
180 + #endif // 0
181 +-install_data('LICENSE.GPL2',
182 +- 'LICENSE.LGPL2.1',
183 +- 'NEWS',
184 + #if 0 /// elogind has upgraded to markdown
185 + # 'README',
186 + #else
187 +- 'README.md',
188 + #endif // 0
189 +- 'docs/CODING_STYLE.md',
190 + #if 0 /// irrelevant for elogind
191 + # 'docs/DISTRO_PORTING.md',
192 + # 'docs/ENVIRONMENT.md',
193 +@@ -3359,8 +3354,6 @@
194 + # 'docs/TRANSLATORS.md',
195 + # 'docs/UIDS-GIDS.md',
196 + #endif // 0
197 +- 'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
198 +- install_dir : docdir)
199 +
200 + #if 0 /// UNNEEDED by elogind
201 + # meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))