Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/sssd/
Date: Mon, 12 Aug 2019 21:44:23
Message-Id: 1565646252.7460b079440d446267c5b317fe5c81d72c631871.zlogene@gentoo
1 commit: 7460b079440d446267c5b317fe5c81d72c631871
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 12 17:45:18 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 12 21:44:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7460b079
7
8 sys-auth/sssd: Disable broken Python support
9
10 Closes: https://bugs.gentoo.org/690510
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
13
14 sys-auth/sssd/sssd-1.16.3-r2.ebuild | 14 ++++----------
15 sys-auth/sssd/sssd-2.1.0.ebuild | 14 ++++----------
16 sys-auth/sssd/sssd-2.2.0.ebuild | 14 ++++----------
17 3 files changed, 12 insertions(+), 30 deletions(-)
18
19 diff --git a/sys-auth/sssd/sssd-1.16.3-r2.ebuild b/sys-auth/sssd/sssd-1.16.3-r2.ebuild
20 index 123d6645791..6397b5835b1 100644
21 --- a/sys-auth/sssd/sssd-1.16.3-r2.ebuild
22 +++ b/sys-auth/sssd/sssd-1.16.3-r2.ebuild
23 @@ -3,9 +3,7 @@
24
25 EAPI=7
26
27 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
28 -
29 -inherit autotools flag-o-matic linux-info multilib-minimal pam python-r1 systemd toolchain-funcs
30 +inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain-funcs
31
32 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
33 HOMEPAGE="https://pagure.io/SSSD/sssd"
34 @@ -14,7 +12,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
35
36 LICENSE="GPL-3"
37 SLOT="0"
38 -IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
39 +IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
40
41 COMMON_DEP="
42 >=virtual/pam-0-r1[${MULTILIB_USEDEP}]
43 @@ -104,12 +102,6 @@ multilib_src_configure() {
44 # set initscript to sysv because the systemd option needs systemd to
45 # be installed. We provide our own systemd file anyway.
46 local myconf=()
47 - if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
48 - myconf+=($(multilib_native_use_with python python2-bindings))
49 - fi
50 - if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
51 - myconf+=($(multilib_native_use_with python python3-bindings))
52 - fi
53 #Work around linker dependency problem.
54 append-ldflags "-Wl,--allow-shlib-undefined"
55
56 @@ -142,6 +134,8 @@ multilib_src_configure() {
57 $(multilib_native_use_with ssh)
58 --with-crypto="nss"
59 --with-initscript="sysv"
60 + --without-python2-bindings
61 + --without-python3-bindings
62
63 KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
64 )
65
66 diff --git a/sys-auth/sssd/sssd-2.1.0.ebuild b/sys-auth/sssd/sssd-2.1.0.ebuild
67 index 146e47c5995..3bb83f60232 100644
68 --- a/sys-auth/sssd/sssd-2.1.0.ebuild
69 +++ b/sys-auth/sssd/sssd-2.1.0.ebuild
70 @@ -3,9 +3,7 @@
71
72 EAPI=7
73
74 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
75 -
76 -inherit autotools flag-o-matic linux-info multilib-minimal pam python-r1 systemd toolchain-funcs
77 +inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain-funcs
78
79 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
80 HOMEPAGE="https://pagure.io/SSSD/sssd"
81 @@ -14,7 +12,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
82
83 LICENSE="GPL-3"
84 SLOT="0"
85 -IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
86 +IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
87
88 COMMON_DEP="
89 >=virtual/pam-0-r1[${MULTILIB_USEDEP}]
90 @@ -101,12 +99,6 @@ multilib_src_configure() {
91 # set initscript to sysv because the systemd option needs systemd to
92 # be installed. We provide our own systemd file anyway.
93 local myconf=()
94 - if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
95 - myconf+=($(multilib_native_use_with python python2-bindings))
96 - fi
97 - if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
98 - myconf+=($(multilib_native_use_with python python3-bindings))
99 - fi
100 #Work around linker dependency problem.
101 append-ldflags "-Wl,--allow-shlib-undefined"
102
103 @@ -139,6 +131,8 @@ multilib_src_configure() {
104 $(multilib_native_use_with ssh)
105 --with-crypto="nss"
106 --with-initscript="sysv"
107 + --without-python2-bindings
108 + --without-python3-bindings
109
110 KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
111 )
112
113 diff --git a/sys-auth/sssd/sssd-2.2.0.ebuild b/sys-auth/sssd/sssd-2.2.0.ebuild
114 index 146e47c5995..3bb83f60232 100644
115 --- a/sys-auth/sssd/sssd-2.2.0.ebuild
116 +++ b/sys-auth/sssd/sssd-2.2.0.ebuild
117 @@ -3,9 +3,7 @@
118
119 EAPI=7
120
121 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
122 -
123 -inherit autotools flag-o-matic linux-info multilib-minimal pam python-r1 systemd toolchain-funcs
124 +inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain-funcs
125
126 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
127 HOMEPAGE="https://pagure.io/SSSD/sssd"
128 @@ -14,7 +12,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
129
130 LICENSE="GPL-3"
131 SLOT="0"
132 -IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
133 +IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
134
135 COMMON_DEP="
136 >=virtual/pam-0-r1[${MULTILIB_USEDEP}]
137 @@ -101,12 +99,6 @@ multilib_src_configure() {
138 # set initscript to sysv because the systemd option needs systemd to
139 # be installed. We provide our own systemd file anyway.
140 local myconf=()
141 - if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
142 - myconf+=($(multilib_native_use_with python python2-bindings))
143 - fi
144 - if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
145 - myconf+=($(multilib_native_use_with python python3-bindings))
146 - fi
147 #Work around linker dependency problem.
148 append-ldflags "-Wl,--allow-shlib-undefined"
149
150 @@ -139,6 +131,8 @@ multilib_src_configure() {
151 $(multilib_native_use_with ssh)
152 --with-crypto="nss"
153 --with-initscript="sysv"
154 + --without-python2-bindings
155 + --without-python3-bindings
156
157 KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
158 )