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-cluster/ceph/
Date: Fri, 14 Aug 2020 23:22:30
Message-Id: 1597447294.79860bfbe7b9e5b34e8eb5608e68de5519be10ec.asturm@gentoo
1 commit: 79860bfbe7b9e5b34e8eb5608e68de5519be10ec
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 3 21:25:53 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 14 23:21:34 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79860bfb
7
8 sys-cluster/ceph: Drop superfluous calls to python_is_python3
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 sys-cluster/ceph/ceph-14.2.9-r1.ebuild | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-)
14
15 diff --git a/sys-cluster/ceph/ceph-14.2.9-r1.ebuild b/sys-cluster/ceph/ceph-14.2.9-r1.ebuild
16 index 8fbefa08d5f..8f788600013 100644
17 --- a/sys-cluster/ceph/ceph-14.2.9-r1.ebuild
18 +++ b/sys-cluster/ceph/ceph-14.2.9-r1.ebuild
19 @@ -215,7 +215,7 @@ ceph_src_configure() {
20 local mycmakeargs=(
21 -DWITH_BABELTRACE=$(usex babeltrace)
22 -DWITH_CEPHFS=$(usex cephfs)
23 - -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
24 + -DWITH_CEPHFS_SHELL=$(usex cephfs)
25 -DWITH_DPDK=$(usex dpdk)
26 -DWITH_DPDK=$(usex spdk)
27 -DWITH_FUSE=$(usex fuse)
28 @@ -226,9 +226,9 @@ ceph_src_configure() {
29 -DWITH_MGR_DASHBOARD_FRONTEND=NO
30 -DWITH_NUMA=$(usex numa)
31 -DWITH_OPENLDAP=$(usex ldap)
32 - -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
33 - -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
34 - -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
35 + -DMGR_PYTHON_VERSION=3
36 + -DWITH_PYTHON3=ON
37 + -DWITH_PYTHON2=OFF
38 -DWITH_RADOSGW=$(usex radosgw)
39 -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
40 -DWITH_SSL=$(usex ssl)