From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1343660-garchives=archives.gentoo.org@lists.gentoo.org>
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 56F0B158086
for <garchives@archives.gentoo.org>; Fri, 26 Nov 2021 19:46:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A2CE7E07BA;
Fri, 26 Nov 2021 19:46:29 +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 8618AE07BA
for <gentoo-commits@lists.gentoo.org>; Fri, 26 Nov 2021 19:46:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 675B1342CCE
for <gentoo-commits@lists.gentoo.org>; Fri, 26 Nov 2021 19:46:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DEE5C1BA
for <gentoo-commits@lists.gentoo.org>; Fri, 26 Nov 2021 19:46:26 +0000 (UTC)
From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" <chutzpah@gentoo.org>
Message-ID: <1637955975.c1a3e501b58af3bf03e08a32ba65150f30c1b492.chutzpah@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-cluster/ceph/ceph-15.2.15-r1.ebuild sys-cluster/ceph/ceph-15.2.15-r2.ebuild sys-cluster/ceph/ceph-16.2.6-r3.ebuild sys-cluster/ceph/ceph-16.2.6-r4.ebuild
X-VCS-Directories: sys-cluster/ceph/
X-VCS-Committer: chutzpah
X-VCS-Committer-Name: Patrick McLean
X-VCS-Revision: c1a3e501b58af3bf03e08a32ba65150f30c1b492
X-VCS-Branch: master
Date: Fri, 26 Nov 2021 19:46:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 933cdfb1-dc9d-47dc-b7d9-9317caae5a64
X-Archives-Hash: 5bf7e2afa737a4b2952ca2b3c99689c4
commit: c1a3e501b58af3bf03e08a32ba65150f30c1b492
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 26 19:42:45 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Nov 26 19:46:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a3e501
sys-cluster/ceph: relax snappy dep (bug #818883)
app-arch/snappy-1.1.9-r1 has a patch to fix the upstream change that
broke ceph, so allow <1.1.9 or >=1.1.9-r1 versions of snappy
Bug: https://bugs.gentoo.org/818883
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
sys-cluster/ceph/{ceph-15.2.15-r1.ebuild => ceph-15.2.15-r2.ebuild} | 6 ++++--
sys-cluster/ceph/{ceph-16.2.6-r3.ebuild => ceph-16.2.6-r4.ebuild} | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/ceph/ceph-15.2.15-r1.ebuild b/sys-cluster/ceph/ceph-15.2.15-r2.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-15.2.15-r1.ebuild
rename to sys-cluster/ceph/ceph-15.2.15-r2.ebuild
index c3738e9d833d..e9c79f993c8f 100644
--- a/sys-cluster/ceph/ceph-15.2.15-r1.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.15-r2.ebuild
@@ -9,7 +9,8 @@ CMAKE_MAKEFILE_GENERATOR=emake
DISTUTILS_OPTIONAL=1
inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
- python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+ python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles \
+ multiprocessing
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -39,7 +40,8 @@ DEPEND="
virtual/libudev:=
app-arch/bzip2:=
app-arch/lz4:=
- >=app-arch/snappy-1.1.9:=
+ app-arch/snappy:=
+ || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 )
app-arch/zstd:=
app-shells/bash:0
app-misc/jq:=
diff --git a/sys-cluster/ceph/ceph-16.2.6-r3.ebuild b/sys-cluster/ceph/ceph-16.2.6-r4.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-16.2.6-r3.ebuild
rename to sys-cluster/ceph/ceph-16.2.6-r4.ebuild
index b46d37c591cb..5e495f15ee5b 100644
--- a/sys-cluster/ceph/ceph-16.2.6-r3.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.6-r4.ebuild
@@ -11,7 +11,7 @@ CMAKE_MAKEFILE_GENERATOR=emake
inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs \
- systemd tmpfiles
+ systemd tmpfiles multiprocessing
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -43,7 +43,8 @@ DEPEND="
virtual/libudev:=
app-arch/bzip2:=
app-arch/lz4:=
- <app-arch/snappy-1.1.9:=
+ app-arch/snappy
+ || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 )
app-arch/zstd:=
app-shells/bash:0
app-misc/jq:=