Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/
Date: Tue, 03 Jul 2018 00:19:44
Message-Id: 1530576581.daffe111e4a2c1fa43bf64c73d0e7ae1d74ea435.chutzpah@gentoo
1 commit: daffe111e4a2c1fa43bf64c73d0e7ae1d74ea435
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 3 00:09:19 2018 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 3 00:09:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daffe111
7
8 sys-cluster/ceph: NSS is apparently mandatory in 13.2.0
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 sys-cluster/ceph/ceph-13.2.0.ebuild | 6 ++----
13 1 file changed, 2 insertions(+), 4 deletions(-)
14
15 diff --git a/sys-cluster/ceph/ceph-13.2.0.ebuild b/sys-cluster/ceph/ceph-13.2.0.ebuild
16 index 036cfc442fc..41559adb200 100644
17 --- a/sys-cluster/ceph/ceph-13.2.0.ebuild
18 +++ b/sys-cluster/ceph/ceph-13.2.0.ebuild
19 @@ -28,7 +28,7 @@ SLOT="0"
20
21 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
22
23 -IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr mgr-frontend nss"
24 +IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr mgr-frontend"
25 IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test"
26 IUSE+=" xfs zfs"
27 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
28 @@ -47,6 +47,7 @@ COMMON_DEPEND="
29 dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
30 dev-libs/libaio:=[static-libs?]
31 dev-libs/libxml2:=[static-libs?]
32 + dev-libs/nss:=
33 sys-auth/oath-toolkit:=
34 sys-apps/keyutils:=[static-libs?]
35 sys-apps/util-linux:=[static-libs?]
36 @@ -54,7 +55,6 @@ COMMON_DEPEND="
37 babeltrace? ( dev-util/babeltrace )
38 ldap? ( net-nds/openldap:=[static-libs?] )
39 lttng? ( dev-util/lttng-ust:= )
40 - nss? ( dev-libs/nss:= )
41 fuse? ( sys-fs/fuse:0=[static-libs?] )
42 ssl? ( dev-libs/openssl:=[static-libs?] )
43 xfs? ( sys-fs/xfsprogs:=[static-libs?] )
44 @@ -116,7 +116,6 @@ REQUIRED_USE="
45 ${PYTHON_REQUIRED_USE}
46 || ( $(python_gen_useflags 'python3*') )
47 mgr-frontend? ( mgr || ( $(python_gen_useflags 'python2*') ) )
48 - ?? ( ssl nss )
49 ?? ( jemalloc tcmalloc )
50 "
51
52 @@ -203,7 +202,6 @@ ceph_src_configure() {
53 -DWITH_LTTNG=$(usex lttng)
54 -DWITH_MGR=$(usex mgr)
55 -DWITH_MGR_DASHBOARD_FRONTEND=$(usex mgr-frontend)
56 - -DWITH_NSS=$(usex nss)
57 -DWITH_OPENLDAP=$(usex ldap)
58 -DWITH_RADOSGW=$(usex radosgw)
59 -DWITH_SSL=$(usex ssl)