| 1 |
commit: c390511f04d842685ab2c0b45759e4daae782f24 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Wed Jul 1 00:10:44 2020 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 1 00:11:25 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c390511f |
| 7 |
|
| 8 |
sys-cluster/ceph: Bump to 15.2.4, cleanups to 14.2.10 |
| 9 |
|
| 10 |
Copyright: Sony Interactive Entertainment Inc. |
| 11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-cluster/ceph/Manifest | 2 +- |
| 15 |
sys-cluster/ceph/ceph-14.2.10.ebuild | 16 ++++++++-------- |
| 16 |
.../ceph/{ceph-15.2.3.ebuild => ceph-15.2.4.ebuild} | 19 ++++++++++--------- |
| 17 |
3 files changed, 19 insertions(+), 18 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest |
| 20 |
index 8c2cc97fb01..494ff52007c 100644 |
| 21 |
--- a/sys-cluster/ceph/Manifest |
| 22 |
+++ b/sys-cluster/ceph/Manifest |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc |
| 25 |
DIST ceph-14.2.10.tar.gz 129274835 BLAKE2B b3f14897db478418b982281bf367a0c497cdfa8991a73e277b5582663c159550f3eff5bdc78a506e267eae8d59c59b19b8a9294802cb532fd7dfa9f612ed0e53 SHA512 5ec95b933a360183f89404446c5e1912a81853dfb1134bb8868bc6675a0185420c2bf1eba72308014a008f617aeb8733d51eb8c8eea5d472c32514cf483f4ea6 |
| 26 |
DIST ceph-14.2.9.tar.gz 128419205 BLAKE2B bace7469d9066a3da7320a0eb894013fae5b7139c15679dddae7df28c593a1029956234a1ba0d3bbdf1639e3a975aa776c695efefb915113a16099c80d563675 SHA512 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e |
| 27 |
-DIST ceph-15.2.3.tar.gz 147807898 BLAKE2B ff5e9707cf05e22af718ee177cce87ea9913b1b78d7ba17589f2c7fdaea0a7a27dd1f7b8e9947a095ed74106b6b19258fd8be259100624032f3a6e8ce5243390 SHA512 0378365863bcb86e62d64a2eff91e39a91218eabfb126dae74185e1fe52b21a3d5113f885ddb8076551f2f069435e18b24417bf70f29f23e21fac7065e412912 |
| 28 |
+DIST ceph-15.2.4.tar.gz 148011928 BLAKE2B c0222725227cf922ed10bb19840b8cbfe0c0b8ae77a4f83f03a95c3fc198165740f7a1dee5e1983e9403634ce389c858e71ed3f2731202630e19961a5de0247a SHA512 94e9b4c87d9f27dbfc9961b853f2cf159d65b614bf50ac3dabad9d801a181c547550ab4bca1f48c7a6e11aa6188e5858b110a9023dc214a043ed5ba375b3dee2 |
| 29 |
|
| 30 |
diff --git a/sys-cluster/ceph/ceph-14.2.10.ebuild b/sys-cluster/ceph/ceph-14.2.10.ebuild |
| 31 |
index b9bca5dfb76..f335155f0e1 100644 |
| 32 |
--- a/sys-cluster/ceph/ceph-14.2.10.ebuild |
| 33 |
+++ b/sys-cluster/ceph/ceph-14.2.10.ebuild |
| 34 |
@@ -7,9 +7,8 @@ CMAKE_MAKEFILE_GENERATOR=emake |
| 35 |
|
| 36 |
DISTUTILS_OPTIONAL=1 |
| 37 |
|
| 38 |
-inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ |
| 39 |
- multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \ |
| 40 |
- systemd tmpfiles |
| 41 |
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \ |
| 42 |
+ python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles |
| 43 |
|
| 44 |
if [[ ${PV} == *9999* ]]; then |
| 45 |
inherit git-r3 |
| 46 |
@@ -175,7 +174,7 @@ RESTRICT="test? ( userpriv )" |
| 47 |
RESTRICT+=" test" |
| 48 |
|
| 49 |
# false positives unless all USE flags are on |
| 50 |
-CMAKE_WARN_UNUSED_CLI="no" |
| 51 |
+CMAKE_WARN_UNUSED_CLI=no |
| 52 |
|
| 53 |
PATCHES=( |
| 54 |
"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" |
| 55 |
@@ -192,6 +191,7 @@ PATCHES=( |
| 56 |
"${FILESDIR}/ceph-14.2.4-python-executable.patch" |
| 57 |
"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch" |
| 58 |
"${FILESDIR}/ceph-14.2.10-missing-includes.patch" |
| 59 |
+ "${FILESDIR}/ceph-14.2.10-python-warnings.patch" |
| 60 |
) |
| 61 |
|
| 62 |
check-reqs_export_vars() { |
| 63 |
@@ -213,7 +213,7 @@ pkg_setup() { |
| 64 |
} |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
- cmake-utils_src_prepare |
| 68 |
+ cmake_src_prepare |
| 69 |
|
| 70 |
if use system-boost; then |
| 71 |
find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ |
| 72 |
@@ -281,7 +281,7 @@ ceph_src_configure() { |
| 73 |
rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ |
| 74 |
|| die "failed to remove cmake cache" |
| 75 |
|
| 76 |
- cmake-utils_src_configure |
| 77 |
+ cmake_src_configure |
| 78 |
|
| 79 |
# bug #630232 |
| 80 |
sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ |
| 81 |
@@ -309,7 +309,7 @@ python_compile() { |
| 82 |
} |
| 83 |
|
| 84 |
src_compile() { |
| 85 |
- cmake-utils_src_make VERBOSE=1 all |
| 86 |
+ cmake_build VERBOSE=1 all |
| 87 |
|
| 88 |
# we have to do this here to prevent from building everything multiple times |
| 89 |
python_copy_sources |
| 90 |
@@ -330,7 +330,7 @@ python_install() { |
| 91 |
} |
| 92 |
|
| 93 |
src_install() { |
| 94 |
- cmake-utils_src_install |
| 95 |
+ cmake_src_install |
| 96 |
python_foreach_impl python_install |
| 97 |
|
| 98 |
find "${ED}" -name '*.la' -type f -delete || die |
| 99 |
|
| 100 |
diff --git a/sys-cluster/ceph/ceph-15.2.3.ebuild b/sys-cluster/ceph/ceph-15.2.4.ebuild |
| 101 |
similarity index 96% |
| 102 |
rename from sys-cluster/ceph/ceph-15.2.3.ebuild |
| 103 |
rename to sys-cluster/ceph/ceph-15.2.4.ebuild |
| 104 |
index 49968eb700f..dc446889a8f 100644 |
| 105 |
--- a/sys-cluster/ceph/ceph-15.2.3.ebuild |
| 106 |
+++ b/sys-cluster/ceph/ceph-15.2.4.ebuild |
| 107 |
@@ -7,9 +7,8 @@ CMAKE_MAKEFILE_GENERATOR=emake |
| 108 |
|
| 109 |
DISTUTILS_OPTIONAL=1 |
| 110 |
|
| 111 |
-inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ |
| 112 |
- multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \ |
| 113 |
- systemd tmpfiles |
| 114 |
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \ |
| 115 |
+ python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles |
| 116 |
|
| 117 |
if [[ ${PV} == *9999* ]]; then |
| 118 |
inherit git-r3 |
| 119 |
@@ -180,7 +179,7 @@ RESTRICT="test? ( userpriv )" |
| 120 |
RESTRICT+=" test" |
| 121 |
|
| 122 |
# false positives unless all USE flags are on |
| 123 |
-CMAKE_WARN_UNUSED_CLI="no" |
| 124 |
+CMAKE_WARN_UNUSED_CLI=no |
| 125 |
|
| 126 |
PATCHES=( |
| 127 |
"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" |
| 128 |
@@ -195,6 +194,7 @@ PATCHES=( |
| 129 |
"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch" |
| 130 |
"${FILESDIR}/ceph-15.2.2-systemd-unit.patch" |
| 131 |
"${FILESDIR}/ceph-15.2.3-spdk-compile.patch" |
| 132 |
+ "${FILESDIR}/ceph-14.2.10-python-warnings.patch" |
| 133 |
) |
| 134 |
|
| 135 |
check-reqs_export_vars() { |
| 136 |
@@ -216,12 +216,12 @@ pkg_setup() { |
| 137 |
} |
| 138 |
|
| 139 |
src_prepare() { |
| 140 |
- cmake-utils_src_prepare |
| 141 |
+ cmake_src_prepare |
| 142 |
|
| 143 |
if use system-boost; then |
| 144 |
find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ |
| 145 |
| xargs --null sed -r \ |
| 146 |
- -e 's|Boost::|Boost_|g' \ |
| 147 |
+ -e 's|Boost::|boost_|g' \ |
| 148 |
-e 's|Boost_|boost_|g' \ |
| 149 |
-e 's|[Bb]oost_boost|boost_system|g' -i || die |
| 150 |
fi |
| 151 |
@@ -276,6 +276,7 @@ ceph_src_configure() { |
| 152 |
-DEPYTHON_VERSION="${EPYTHON#python}" |
| 153 |
-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
| 154 |
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" |
| 155 |
+ -Wno-dev |
| 156 |
) |
| 157 |
if use amd64 || use x86; then |
| 158 |
for flag in ${CPU_FLAGS_X86[@]}; do |
| 159 |
@@ -286,7 +287,7 @@ ceph_src_configure() { |
| 160 |
rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ |
| 161 |
|| die "failed to remove cmake cache" |
| 162 |
|
| 163 |
- cmake-utils_src_configure |
| 164 |
+ cmake_src_configure |
| 165 |
|
| 166 |
# bug #630232 |
| 167 |
sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ |
| 168 |
@@ -314,7 +315,7 @@ python_compile() { |
| 169 |
} |
| 170 |
|
| 171 |
src_compile() { |
| 172 |
- cmake-utils_src_make VERBOSE=1 all |
| 173 |
+ cmake_build VERBOSE=1 all |
| 174 |
|
| 175 |
# we have to do this here to prevent from building everything multiple times |
| 176 |
python_copy_sources |
| 177 |
@@ -335,7 +336,7 @@ python_install() { |
| 178 |
} |
| 179 |
|
| 180 |
src_install() { |
| 181 |
- cmake-utils_src_install |
| 182 |
+ cmake_src_install |
| 183 |
python_foreach_impl python_install |
| 184 |
|
| 185 |
find "${ED}" -name '*.la' -type f -delete || die |
Archives