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:=
