From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Jul 2018 11:42:03 +0100 Subject: gentoo resync : 07.07.2018 --- sys-cluster/ceph/Manifest | 2 +- sys-cluster/ceph/ceph-13.2.0.ebuild | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'sys-cluster/ceph') diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 161e43638c9a..317d8ba502c9 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -70,5 +70,5 @@ EBUILD ceph-12.2.2-r1.ebuild 7315 BLAKE2B 4ea06a4679902338bcfc631f16c3d3fe60efa5 EBUILD ceph-12.2.2.ebuild 7315 BLAKE2B dee5111ca1f52b26f49f27384bbff20d339ab9dd9ad4eba77709f2f9af59c42480f1d55324e8691b9b86b7ee2615a68c473d2d389355c7d57fc2b2b19672f980 SHA512 af0421ed063be53baa3daef7a8ec0b9c7bfdf66180afa483ed3459a664fce463b4de65a23869577f616ff4149a40e8223ed27de792bbb2a9b001bf9baaed39ab EBUILD ceph-12.2.4-r2.ebuild 7823 BLAKE2B 5f79161d66f36efab2282d6d40ed9982921cdc647584aef23a049083c42be27a016322ffb0fb4480b8c6993d5242760d4502fa29a5e23c0aa575863e8c6a1ced SHA512 57e8cb259190716954a2e5603fc9fdaced2abfdf93f12ae744e0beb6f0d311f0b51a715a60e335b4f14d40062fdd7147bb21975de016ae23ea7878f023d70b9b EBUILD ceph-12.2.5.ebuild 7845 BLAKE2B c9719913a9c4d362871131f2a302231c6705ffa0770e4a8668d48fbc8f5aea357fb895a53a2114dea2f4027b4bd9d64364485a427e3b0f95ca5b1900f79106b3 SHA512 a5c958a257d7764f2d0e3d2ebabfb65b3027726c5a4f8976464f9cf13190a5ca161057dae43746c8aac43c7df1f5828b2aad1f2c2ca88d8a3a2103298d9096e2 -EBUILD ceph-13.2.0.ebuild 9433 BLAKE2B 1adbf1bcfa3bda5082114997f69638576133247d0946a7b7d03f8f7cc8f912f26fc551c315d5ffad6655f7dca72bbee6f7f6b1cfa474c26cf3bd27b67debbd57 SHA512 9c0b2edf6ced2a3759204ccad2c6ef3ec26a028178fb86796617233f948be0990e017de468b331f08f543bef548d0348ca34fcc7ee08fc4c0dd80b18150c7fc8 +EBUILD ceph-13.2.0.ebuild 9379 BLAKE2B 49969daeb122519f4c20cf33123e67925ae32a4532cb9a59d0881779986e8e07389335d100c1f256f5760f9674fa94eb95fc0f33e02d08b02cfb0f528db8ddcd SHA512 39f9a42d3cb820a957839b271b4b6b88f40095ca3c6bd444921583909f1ba50abbccf8d1a04da61282da37bf288a2d4da109e54c60e607c1b3f54f794c2b9ed6 MISC metadata.xml 1773 BLAKE2B e6fa9ca15441688a4072db66e4e02ca9afcad1c0da4ac06e581a84815b09d8e0793e39f10840cb6950f811cf679ed3322a8b234d3a4a9ac1f0e58aa0927d1447 SHA512 8a74d9f391e32c7d13f12b7234a7e4b36f81acb67764fe7d6c53217723e2fa98ea918edf4b3c908595974c82353def83a3ff236bcdaac5a6f2234b14ea17ca9a diff --git a/sys-cluster/ceph/ceph-13.2.0.ebuild b/sys-cluster/ceph/ceph-13.2.0.ebuild index 036cfc442fc2..41559adb2006 100644 --- a/sys-cluster/ceph/ceph-13.2.0.ebuild +++ b/sys-cluster/ceph/ceph-13.2.0.ebuild @@ -28,7 +28,7 @@ SLOT="0" CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) -IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr mgr-frontend nss" +IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr mgr-frontend" IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test" IUSE+=" xfs zfs" IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" @@ -47,6 +47,7 @@ COMMON_DEPEND=" dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] + dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] @@ -54,7 +55,6 @@ COMMON_DEPEND=" babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) - nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) ssl? ( dev-libs/openssl:=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) @@ -116,7 +116,6 @@ REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( $(python_gen_useflags 'python3*') ) mgr-frontend? ( mgr || ( $(python_gen_useflags 'python2*') ) ) - ?? ( ssl nss ) ?? ( jemalloc tcmalloc ) " @@ -203,7 +202,6 @@ ceph_src_configure() { -DWITH_LTTNG=$(usex lttng) -DWITH_MGR=$(usex mgr) -DWITH_MGR_DASHBOARD_FRONTEND=$(usex mgr-frontend) - -DWITH_NSS=$(usex nss) -DWITH_OPENLDAP=$(usex ldap) -DWITH_RADOSGW=$(usex radosgw) -DWITH_SSL=$(usex ssl) -- cgit v1.2.3