Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/sssd/
Date: Sat, 15 May 2021 16:13:40
Message-Id: 1621094723.4ba2a3a242005962bd8f7ab51a60b5a1a13b3f4f.whissi@gentoo
1 commit: 4ba2a3a242005962bd8f7ab51a60b5a1a13b3f4f
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 15 15:51:20 2021 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat May 15 16:05:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba2a3a2
7
8 sys-auth/sssd: fix style
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 sys-auth/sssd/sssd-2.5.0.ebuild | 23 ++++++++++++++---------
14 1 file changed, 14 insertions(+), 9 deletions(-)
15
16 diff --git a/sys-auth/sssd/sssd-2.5.0.ebuild b/sys-auth/sssd/sssd-2.5.0.ebuild
17 index 5589ebcb8df..4242b9b973e 100644
18 --- a/sys-auth/sssd/sssd-2.5.0.ebuild
19 +++ b/sys-auth/sssd/sssd-2.5.0.ebuild
20 @@ -104,12 +104,17 @@ pkg_setup() {
21 }
22
23 src_prepare() {
24 - sed -i 's:/var/run:/run:' \
25 - "${S}"/src/examples/logrotate || die
26 -
27 default
28 +
29 + sed -i \
30 + -e 's:/var/run:/run:' \
31 + "${S}"/src/examples/logrotate \
32 + || die
33 +
34 eautoreconf
35 +
36 multilib_copy_sources
37 +
38 if use python && multilib_is_native_abi; then
39 python_setup
40 fi
41 @@ -142,6 +147,7 @@ multilib_src_configure() {
42 --with-nscd="${EPREFIX}"/usr/sbin/nscd
43 --with-unicode-lib="glib2"
44 --disable-rpath
45 + --disable-static
46 --sbindir=/usr/sbin
47 --enable-local-provider
48 $(multilib_native_use_with systemd kcm)
49 @@ -212,6 +218,10 @@ multilib_src_compile() {
50 fi
51 }
52
53 +multilib_src_test() {
54 + multilib_is_native_abi && emake check
55 +}
56 +
57 multilib_src_install() {
58 if multilib_is_native_abi; then
59 emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
60 @@ -219,7 +229,6 @@ multilib_src_install() {
61 python_optimize
62 python_fix_shebang "${ED}"
63 fi
64 -
65 else
66 # easier than playing with automake...
67 dopammod .libs/pam_sss.so
68 @@ -264,7 +273,7 @@ multilib_src_install_all() {
69 keepdir /var/log/sssd
70
71 # strip empty dirs
72 - if ! use doc ; then
73 + if ! use doc; then
74 rm -r "${ED}"/usr/share/doc/"${PF}"/doc || die
75 rm -r "${ED}"/usr/share/doc/"${PF}"/{hbac,idmap,nss_idmap,sss_simpleifp}_doc || die
76 fi
77 @@ -272,10 +281,6 @@ multilib_src_install_all() {
78 rm -r "${ED}"/run || die
79 }
80
81 -multilib_src_test() {
82 - multilib_is_native_abi && emake check
83 -}
84 -
85 pkg_postinst() {
86 elog "You must set up sssd.conf (default installed into /etc/sssd)"
87 elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"