sys-cluster/ceph: Version bump to 14.2.2

Closes: https://bugs.gentoo.org/687946
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 88518c8a7277c9f6b9f6b235ff6a6b6f9ed51b18..61a1acb646daf90deb0492561bf5cc784355e13d 100644 (file)
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -3,4 +3,4 @@ DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
 DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
 DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c
-DIST ceph-14.2.1.tar.gz 117111511 BLAKE2B c00181223c6e02e7fe696ed4226f1751eca48e799f8b5377a06621eb3300f81b58dc20f325b455df04fcbd0c28b981fae1cfc778a8d69414247ddd206d0c6175 SHA512 fccde341344c721fbfc7f7cb73db4f65933d7fcacc9495398b55b37d1e208f0bad0cd78a4da08a3b5e26cca3175e7707f7dfb76fae5aa094f58afaed8603c866
+DIST ceph-14.2.2.tar.gz 117536881 BLAKE2B 2926c3d6fde5e9540d4e797dabf61451ce78e5d2f8d382d192fd8c1759620075860ab0cea7512330f2965d11e4b37a0ecce4fa11d9c5d256ecc884fa5f604922 SHA512 1ce61fb75e331cca39aaa8c0498bbb3cb874edb22ea45a4c2d82171b5e0c7c4ab2b081674b77177d5e612a0efdfa01de10a4becc4a7ee0eed1b2b3d358a72dc1

diff --git a/sys-cluster/ceph/ceph-14.2.1.ebuild b/sys-cluster/ceph/ceph-14.2.2.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-14.2.1.ebuild
rename to sys-cluster/ceph/ceph-14.2.2.ebuild
index 6cab06ebd9c3ad1a7344aac73580655f3be4e207..0f25b21d3b718178eb3bcc6483f77b8f7ac3a432 100644 (file)
--- a/sys-cluster/ceph/ceph-14.2.1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.2.ebuild
@@ -152,7 +152,6 @@ PATCHES=(
        "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
        "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
        "${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-       "${FILESDIR}/ceph-14.2.1-ncurses-tinfo.patch"
 )
 
 # dpdk and ninja don't get along
@@ -227,6 +226,7 @@ ceph_src_configure() {
                -DWITH_MGR_DASHBOARD_FRONTEND=NO
                -DWITH_NUMA=$(usex numa)
                -DWITH_OPENLDAP=$(usex ldap)
+               -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
                -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
                -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
                -DWITH_RADOSGW=$(usex radosgw)

diff --git a/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch b/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch
deleted file mode 100644 (file)
index 7f74a10..0000000
--- a/sys-cluster/ceph/files/ceph-14.2.1-ncurses-tinfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b7bf406cff5e0f82fc87f19d5987cd4e719919e1 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 8 Apr 2019 16:34:53 +0200
-Subject: [PATCH] cmake: Fix build against ncurses with separate libtinfo
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/tools/rbd/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt
-index 36b2408a8d28..0e38a033ff55 100644
---- a/src/tools/rbd/CMakeLists.txt
-+++ b/src/tools/rbd/CMakeLists.txt
-@@ -1,3 +1,6 @@
-+set(CURSES_NEED_NCURSES TRUE)
-+find_package(Curses REQUIRED)
-+
- set(rbd_srcs
-   rbd.cc
-   ArgumentTypes.cc
-@@ -52,7 +55,7 @@ target_link_libraries(rbd librbd librados
-   cls_journal_client cls_rbd_client
-   rbd_types
-   journal
--  ceph-common global ncurses
-+  ceph-common global ${CURSES_LIBRARIES}
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
- if(WITH_KRBD)
-   target_link_libraries(rbd