| 1 |
commit: 4b85148a7c1196c409abe15da9c964f8d2aadc3b |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 1 19:01:09 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 1 19:02:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b85148a |
| 7 |
|
| 8 |
sys-cluster/ceph: Fix Python dependencies |
| 9 |
|
| 10 |
DISTUTILS_USE_SETUPTOOLS is not used with DISTUTILS_OPTIONAL, the dep |
| 11 |
on setuptools needs to be declared explicitly. |
| 12 |
|
| 13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-cluster/ceph/ceph-14.2.22-r1.ebuild | 6 ++++-- |
| 16 |
sys-cluster/ceph/ceph-15.2.15-r2.ebuild | 6 ++++-- |
| 17 |
sys-cluster/ceph/ceph-16.2.5.ebuild | 6 ++++-- |
| 18 |
3 files changed, 12 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-cluster/ceph/ceph-14.2.22-r1.ebuild b/sys-cluster/ceph/ceph-14.2.22-r1.ebuild |
| 21 |
index 9675c7235f2b..860ccfb14768 100644 |
| 22 |
--- a/sys-cluster/ceph/ceph-14.2.22-r1.ebuild |
| 23 |
+++ b/sys-cluster/ceph/ceph-14.2.22-r1.ebuild |
| 24 |
@@ -3,7 +3,6 @@ |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
PYTHON_COMPAT=( python3_{7,8} ) |
| 28 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
| 29 |
CMAKE_MAKEFILE_GENERATOR=emake |
| 30 |
|
| 31 |
DISTUTILS_OPTIONAL=1 |
| 32 |
@@ -87,14 +86,15 @@ DEPEND=" |
| 33 |
system-boost? ( dev-libs/boost:=[threads(+),context,python,${PYTHON_USEDEP}] ) |
| 34 |
xfs? ( sys-fs/xfsprogs:= ) |
| 35 |
zfs? ( sys-fs/zfs:= ) |
| 36 |
- ${PYTHON_DEPS} |
| 37 |
" |
| 38 |
BDEPEND=" |
| 39 |
+ ${PYTHON_DEPS} |
| 40 |
amd64? ( dev-lang/yasm ) |
| 41 |
x86? ( dev-lang/yasm ) |
| 42 |
app-arch/cpio |
| 43 |
>=dev-util/cmake-3.5.0 |
| 44 |
dev-python/cython[${PYTHON_USEDEP}] |
| 45 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 46 |
dev-python/sphinx |
| 47 |
dev-util/cunit |
| 48 |
dev-util/gperf |
| 49 |
@@ -116,6 +116,7 @@ BDEPEND=" |
| 50 |
) |
| 51 |
" |
| 52 |
RDEPEND="${DEPEND} |
| 53 |
+ ${PYTHON_DEPS} |
| 54 |
app-admin/sudo |
| 55 |
net-misc/socat |
| 56 |
sys-apps/gptfdisk |
| 57 |
@@ -133,6 +134,7 @@ RDEPEND="${DEPEND} |
| 58 |
dev-python/prettytable[${PYTHON_USEDEP}] |
| 59 |
dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 60 |
dev-python/requests[${PYTHON_USEDEP}] |
| 61 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 62 |
dev-python/werkzeug[${PYTHON_USEDEP}] |
| 63 |
mgr? ( |
| 64 |
dev-python/more-itertools[${PYTHON_USEDEP}] |
| 65 |
|
| 66 |
diff --git a/sys-cluster/ceph/ceph-15.2.15-r2.ebuild b/sys-cluster/ceph/ceph-15.2.15-r2.ebuild |
| 67 |
index 8d09a94fc96e..6faac62ff814 100644 |
| 68 |
--- a/sys-cluster/ceph/ceph-15.2.15-r2.ebuild |
| 69 |
+++ b/sys-cluster/ceph/ceph-15.2.15-r2.ebuild |
| 70 |
@@ -3,7 +3,6 @@ |
| 71 |
|
| 72 |
EAPI=7 |
| 73 |
PYTHON_COMPAT=( python3_{7..9} ) |
| 74 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
| 75 |
CMAKE_MAKEFILE_GENERATOR=emake |
| 76 |
|
| 77 |
DISTUTILS_OPTIONAL=1 |
| 78 |
@@ -95,14 +94,15 @@ DEPEND=" |
| 79 |
uring? ( sys-libs/liburing:= ) |
| 80 |
xfs? ( sys-fs/xfsprogs:= ) |
| 81 |
zfs? ( sys-fs/zfs:= ) |
| 82 |
- ${PYTHON_DEPS} |
| 83 |
" |
| 84 |
BDEPEND=" |
| 85 |
+ ${PYTHON_DEPS} |
| 86 |
amd64? ( dev-lang/yasm ) |
| 87 |
x86? ( dev-lang/yasm ) |
| 88 |
app-arch/cpio |
| 89 |
>=dev-util/cmake-3.5.0 |
| 90 |
dev-python/cython[${PYTHON_USEDEP}] |
| 91 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 92 |
dev-python/sphinx |
| 93 |
dev-util/cunit |
| 94 |
dev-util/gperf |
| 95 |
@@ -124,6 +124,7 @@ BDEPEND=" |
| 96 |
) |
| 97 |
" |
| 98 |
RDEPEND="${DEPEND} |
| 99 |
+ ${PYTHON_DEPS} |
| 100 |
app-admin/sudo |
| 101 |
net-misc/socat |
| 102 |
sys-apps/gptfdisk |
| 103 |
@@ -143,6 +144,7 @@ RDEPEND="${DEPEND} |
| 104 |
dev-python/prettytable[${PYTHON_USEDEP}] |
| 105 |
dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 106 |
dev-python/requests[${PYTHON_USEDEP}] |
| 107 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 108 |
dev-python/werkzeug[${PYTHON_USEDEP}] |
| 109 |
mgr? ( |
| 110 |
dev-python/jsonpatch[${PYTHON_USEDEP}] |
| 111 |
|
| 112 |
diff --git a/sys-cluster/ceph/ceph-16.2.5.ebuild b/sys-cluster/ceph/ceph-16.2.5.ebuild |
| 113 |
index 37d70a69897e..4e1446212d24 100644 |
| 114 |
--- a/sys-cluster/ceph/ceph-16.2.5.ebuild |
| 115 |
+++ b/sys-cluster/ceph/ceph-16.2.5.ebuild |
| 116 |
@@ -4,7 +4,6 @@ |
| 117 |
EAPI=7 |
| 118 |
|
| 119 |
PYTHON_COMPAT=( python3_{7..9} ) |
| 120 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
| 121 |
DISTUTILS_OPTIONAL=1 |
| 122 |
LUA_COMPAT=( lua5-3 ) |
| 123 |
|
| 124 |
@@ -102,14 +101,15 @@ DEPEND=" |
| 125 |
xfs? ( sys-fs/xfsprogs:= ) |
| 126 |
zbd? ( sys-block/libzbd:= ) |
| 127 |
zfs? ( sys-fs/zfs:= ) |
| 128 |
- ${PYTHON_DEPS} |
| 129 |
" |
| 130 |
BDEPEND=" |
| 131 |
+ ${PYTHON_DEPS} |
| 132 |
amd64? ( dev-lang/nasm ) |
| 133 |
x86? ( dev-lang/yasm ) |
| 134 |
app-arch/cpio |
| 135 |
>=dev-util/cmake-3.5.0 |
| 136 |
dev-python/cython[${PYTHON_USEDEP}] |
| 137 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 138 |
dev-python/sphinx |
| 139 |
dev-util/cunit |
| 140 |
dev-util/gperf |
| 141 |
@@ -136,6 +136,7 @@ BDEPEND=" |
| 142 |
" |
| 143 |
RDEPEND=" |
| 144 |
${DEPEND} |
| 145 |
+ ${PYTHON_DEPS} |
| 146 |
app-admin/sudo |
| 147 |
net-misc/socat |
| 148 |
sys-apps/gptfdisk |
| 149 |
@@ -155,6 +156,7 @@ RDEPEND=" |
| 150 |
dev-python/prettytable[${PYTHON_USEDEP}] |
| 151 |
dev-python/pyopenssl[${PYTHON_USEDEP}] |
| 152 |
dev-python/requests[${PYTHON_USEDEP}] |
| 153 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 154 |
dev-python/werkzeug[${PYTHON_USEDEP}] |
| 155 |
mgr? ( |
| 156 |
dev-python/jsonpatch[${PYTHON_USEDEP}] |
Archives