From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8477F158087 for ; Tue, 1 Feb 2022 19:02:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAE852BC061; Tue, 1 Feb 2022 19:02:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96A0A2BC061 for ; Tue, 1 Feb 2022 19:02:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68413342FE1 for ; Tue, 1 Feb 2022 19:02:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A6FBE2BF for ; Tue, 1 Feb 2022 19:02:37 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1643742134.4b85148a7c1196c409abe15da9c964f8d2aadc3b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-14.2.22-r1.ebuild sys-cluster/ceph/ceph-15.2.15-r2.ebuild sys-cluster/ceph/ceph-16.2.5.ebuild X-VCS-Directories: sys-cluster/ceph/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4b85148a7c1196c409abe15da9c964f8d2aadc3b X-VCS-Branch: master Date: Tue, 1 Feb 2022 19:02:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5e715fb1-1180-4f65-abab-f8e15827adac X-Archives-Hash: 094b13c71125a13c86f7d5e1a40a37f0 commit: 4b85148a7c1196c409abe15da9c964f8d2aadc3b Author: Michał Górny gentoo org> AuthorDate: Tue Feb 1 19:01:09 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Feb 1 19:02:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b85148a sys-cluster/ceph: Fix Python dependencies DISTUTILS_USE_SETUPTOOLS is not used with DISTUTILS_OPTIONAL, the dep on setuptools needs to be declared explicitly. Signed-off-by: Michał Górny gentoo.org> sys-cluster/ceph/ceph-14.2.22-r1.ebuild | 6 ++++-- sys-cluster/ceph/ceph-15.2.15-r2.ebuild | 6 ++++-- sys-cluster/ceph/ceph-16.2.5.ebuild | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys-cluster/ceph/ceph-14.2.22-r1.ebuild b/sys-cluster/ceph/ceph-14.2.22-r1.ebuild index 9675c7235f2b..860ccfb14768 100644 --- a/sys-cluster/ceph/ceph-14.2.22-r1.ebuild +++ b/sys-cluster/ceph/ceph-14.2.22-r1.ebuild @@ -3,7 +3,6 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend CMAKE_MAKEFILE_GENERATOR=emake DISTUTILS_OPTIONAL=1 @@ -87,14 +86,15 @@ DEPEND=" system-boost? ( dev-libs/boost:=[threads(+),context,python,${PYTHON_USEDEP}] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) - ${PYTHON_DEPS} " BDEPEND=" + ${PYTHON_DEPS} amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] dev-python/sphinx dev-util/cunit dev-util/gperf @@ -116,6 +116,7 @@ BDEPEND=" ) " RDEPEND="${DEPEND} + ${PYTHON_DEPS} app-admin/sudo net-misc/socat sys-apps/gptfdisk @@ -133,6 +134,7 @@ RDEPEND="${DEPEND} dev-python/prettytable[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] mgr? ( dev-python/more-itertools[${PYTHON_USEDEP}] diff --git a/sys-cluster/ceph/ceph-15.2.15-r2.ebuild b/sys-cluster/ceph/ceph-15.2.15-r2.ebuild index 8d09a94fc96e..6faac62ff814 100644 --- a/sys-cluster/ceph/ceph-15.2.15-r2.ebuild +++ b/sys-cluster/ceph/ceph-15.2.15-r2.ebuild @@ -3,7 +3,6 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend CMAKE_MAKEFILE_GENERATOR=emake DISTUTILS_OPTIONAL=1 @@ -95,14 +94,15 @@ DEPEND=" uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) - ${PYTHON_DEPS} " BDEPEND=" + ${PYTHON_DEPS} amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] dev-python/sphinx dev-util/cunit dev-util/gperf @@ -124,6 +124,7 @@ BDEPEND=" ) " RDEPEND="${DEPEND} + ${PYTHON_DEPS} app-admin/sudo net-misc/socat sys-apps/gptfdisk @@ -143,6 +144,7 @@ RDEPEND="${DEPEND} dev-python/prettytable[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] mgr? ( dev-python/jsonpatch[${PYTHON_USEDEP}] diff --git a/sys-cluster/ceph/ceph-16.2.5.ebuild b/sys-cluster/ceph/ceph-16.2.5.ebuild index 37d70a69897e..4e1446212d24 100644 --- a/sys-cluster/ceph/ceph-16.2.5.ebuild +++ b/sys-cluster/ceph/ceph-16.2.5.ebuild @@ -4,7 +4,6 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend DISTUTILS_OPTIONAL=1 LUA_COMPAT=( lua5-3 ) @@ -102,14 +101,15 @@ DEPEND=" xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) - ${PYTHON_DEPS} " BDEPEND=" + ${PYTHON_DEPS} amd64? ( dev-lang/nasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] dev-python/sphinx dev-util/cunit dev-util/gperf @@ -136,6 +136,7 @@ BDEPEND=" " RDEPEND=" ${DEPEND} + ${PYTHON_DEPS} app-admin/sudo net-misc/socat sys-apps/gptfdisk @@ -155,6 +156,7 @@ RDEPEND=" dev-python/prettytable[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] mgr? ( dev-python/jsonpatch[${PYTHON_USEDEP}]