commit: 5fa3176d02695d7dd7074f4d89df9f89990de333
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Nov 19 07:29:05 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:29:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa3176d
sys-cluster/ceph: remove old
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
sys-cluster/ceph/Manifest | 2 -
sys-cluster/ceph/ceph-12.2.12-r3.ebuild | 320 ----------------
sys-cluster/ceph/ceph-15.2.4-r3.ebuild | 403 ---------------------
sys-cluster/ceph/files/ceph-12.2.0-cflags.patch | 13 -
.../ceph/files/ceph-12.2.1-systemd-unitdir.patch | 10 -
.../ceph/files/ceph-12.2.11-boost-sonames.patch | 214 -----------
.../ceph/files/ceph-12.2.11-fix-min-call.patch | 13 -
.../ceph-12.2.12-civetweb-openssl-1.1.1.patch | 10 -
.../ceph-12.2.12-dont-use-bad-namespace.patch | 13 -
.../ceph/files/ceph-12.2.12-ncurses-tinfo.patch | 20 -
.../ceph/files/ceph-12.2.12-qa-warning.patch | 13 -
sys-cluster/ceph/files/ceph-12.2.4-cflags.patch | 38 --
.../ceph/files/ceph-12.2.4-rocksdb-cflags.patch | 11 -
sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch | 55 ---
sys-cluster/ceph/metadata.xml | 1 -
15 files changed, 1136 deletions(-)
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 3429c8d7285..3dfdc5719b1 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,7 +1,5 @@
-DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B
a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461
SHA512
e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
DIST ceph-14.2.11.tar.gz 129327263 BLAKE2B
fb04f3fde6642905dd21836c7472cf3b6cb484f69367ecf01b7d427c757e0fd1db4bd483bf9b0e485e1f8924a8e9201e8d47713a1de9281d5d96e45939bd1078
SHA512
765e8982d457cfd900acddc8f82c23824b32dc6d925d45e7693cba48c06fab798b6d57991dc9ad18a9ace9aff6fb2b917bd97f2d6435a7caceb03c9733e9602a
DIST ceph-14.2.13.tar.gz 129255298 BLAKE2B
32d12ede10ff657e9341e2fc31412018041a327a4c62219105a4e9576fa46643c12b936c3eaa003a78677c4ef401ef6bd73fe150604e8031482f1d237d483ff1
SHA512
3d51b729ccf26aa9a40c1320f4051755ec405abc714ae5257ec5433a13549e34fed0945f3091525fd8118d00c36fe4ae793125728d9e17f4221cdd1ee7de5b12
DIST ceph-14.2.14.tar.gz 129258764 BLAKE2B
a25ad78f607de33f3d87c96bf41d614266a0737ca855dbdc7dd88354cddc90037de8bf98e09392fba858f9224f98eaddae0943814a3b23a8a7e00181e5b91607
SHA512
4d5c11108cf42dc3bcf810d119329ba6e4cda02506215202d3b173bad8a9638d1fb2dff7c440d935efe8cd008e7d6e7bb02f681d2da06fccfb6d1d47078287dc
-DIST ceph-15.2.4.tar.gz 148011928 BLAKE2B
c0222725227cf922ed10bb19840b8cbfe0c0b8ae77a4f83f03a95c3fc198165740f7a1dee5e1983e9403634ce389c858e71ed3f2731202630e19961a5de0247a
SHA512
94e9b4c87d9f27dbfc9961b853f2cf159d65b614bf50ac3dabad9d801a181c547550ab4bca1f48c7a6e11aa6188e5858b110a9023dc214a043ed5ba375b3dee2
DIST ceph-15.2.5.tar.gz 149219528 BLAKE2B
8f2cea9a258b7c530bff72a46d45fabf5364cf919f098c7d77857afa0dfdbcd7c290aa5a0d88cce1d99923588cc303d27c0b85179378ff1c394d9ce0f135a1b1
SHA512
55de068886c48293e92ef95cf8343ae44825fd2bf9c3fa7d47cda92907a47bae79e0af730cd34d0155b0777901d0fd6f9d1f30537c66c54c95098df7368fca2e
DIST ceph-15.2.6.tar.gz 148124143 BLAKE2B
4132a2c50037839f712a796cf428190b0e450f0f8b6f157b3d983ca596d9e9e521f1f991c66e14455122c927ddaafada387ef780fd438b2506cfe56194177648
SHA512
0bbbbc532fb9f29437c094a86a1e58040f03b679e4d52ea9cc752ecf411c594c8ec37dc5e9f0ee47712d32b93b4e60b0f3fded280867d41c41b8db806b375e4e
diff --git a/sys-cluster/ceph/ceph-12.2.12-r3.ebuild
b/sys-cluster/ceph/ceph-12.2.12-r3.ebuild
deleted file mode 100644
index 029b309f009..00000000000
--- a/sys-cluster/ceph/ceph-12.2.12-r3.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
- python-r1 udev readme.gentoo-r1 systemd
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/ceph/ceph.git";
- SRC_URI=""
-else
- SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz";
- # currently broken (bug #708294)
- #KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/";
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
-IUSE+=" +system-boost systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
- acct-group/ceph
- acct-user/ceph
- virtual/libudev:=
- app-arch/bzip2:=
- app-arch/lz4:=
- app-arch/snappy:=
- app-arch/zstd:=
- app-misc/jq:=
- <dev-libs/crypto++-7.0:=
- dev-libs/leveldb:=[snappy,tcmalloc?]
- dev-libs/libaio:=
- dev-libs/libxml2:=
- sys-apps/keyutils:=
- sys-apps/util-linux:=
- sys-libs/zlib:=
- babeltrace? ( dev-util/babeltrace )
- ldap? ( net-nds/openldap:= )
- lttng? ( dev-util/lttng-ust:= )
- nss? ( dev-libs/nss:= )
- fuse? ( sys-fs/fuse:0= )
- xfs? ( sys-fs/xfsprogs:= )
- zfs? ( sys-fs/zfs:= )
- ssl? ( dev-libs/openssl:0= )
- radosgw? (
- dev-libs/expat:=
- <dev-libs/openssl-1.1:=
- net-misc/curl:=[curl_ssl_openssl]
- )
- system-boost? (
- =dev-libs/boost-1.66*:=[threads,context,python,${PYTHON_USEDEP}]
- )
- jemalloc? ( dev-libs/jemalloc:= )
- !jemalloc? ( >=dev-util/google-perftools-2.4:= )
- ${PYTHON_DEPS}
- "
-DEPEND="${COMMON_DEPEND}
- app-arch/cpio
- amd64? ( dev-lang/yasm )
- x86? ( dev-lang/yasm )
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/sphinx
- dev-util/gperf
- dev-util/valgrind
- sys-apps/which
- sys-devel/bc
- virtual/pkgconfig
- test? (
- dev-python/virtualenv[${PYTHON_USEDEP}]
- sys-apps/grep[pcre]
- sys-fs/btrfs-progs
- )"
-RDEPEND="${COMMON_DEPEND}
- net-misc/socat
- sys-apps/gptfdisk
- sys-block/parted
- sys-fs/e2fsprogs
- sys-fs/cryptsetup
- sys-fs/lvm2
- !<sys-apps/openrc-0.26.3
- dev-python/cherrypy[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pecan[${PYTHON_USEDEP}]
- dev-python/prettytable[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- "
-REQUIRED_USE="
- $(python_gen_useflags 'python2*')
- ${PYTHON_REQUIRED_USE}
- ?? ( ssl nss )
- ?? ( jemalloc tcmalloc )
- "
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-# ninja does not work at all
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-UNBUNDLE_LIBS=(
- src/erasure-code/jerasure/jerasure
- src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
- "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
- "${FILESDIR}/ceph-12.2.0-cflags.patch"
- "${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
- "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
- "${FILESDIR}/ceph-12.2.4-cflags.patch"
- "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
- "${FILESDIR}/ceph-12.2.5-no-werror.patch"
- "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
- "${FILESDIR}/ceph-12.2.11-fix-min-call.patch"
- "${FILESDIR}/ceph-12.2.12-dont-use-bad-namespace.patch"
- "${FILESDIR}/ceph-12.2.12-civetweb-openssl-1.1.1.patch"
- "${FILESDIR}/ceph-12.2.12-qa-warning.patch"
- "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch"
-)
-
-check-reqs_export_vars() {
- if use amd64; then
- CHECKREQS_DISK_BUILD="12G"
- CHECKREQS_DISK_USR="460M"
- else
- CHECKREQS_DISK_BUILD="1400M"
- CHECKREQS_DISK_USR="450M"
- fi
-
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
- enewgroup ceph ${CEPH_GID}
- enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
- check-reqs_export_vars
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- python_setup 'python2*'
- check-reqs_export_vars
- check-reqs_pkg_setup
- user_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- if use system-boost; then
- eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch"
- fi
-
- # remove tests that need root access
- rm src/test/cli/ceph-authtool/cap*.t
-
- #rm -rf "${UNBUNDLE_LIBS[@]}"
-}
-
-ceph_src_configure() {
- local flag
- local mycmakeargs=(
- -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
- -DWITH_BABELTRACE=$(usex babeltrace)
- -DWITH_CEPHFS=$(usex cephfs)
- -DWITH_FUSE=$(usex fuse)
- -DWITH_LTTNG=$(usex lttng)
- -DWITH_MGR=$(usex mgr)
- -DWITH_NSS=$(usex nss)
- -DWITH_OPENLDAP=$(usex ldap)
- -DWITH_RADOSGW=$(usex radosgw)
- -DWITH_SSL=$(usex ssl)
- -DWITH_SYSTEMD=$(usex systemd)
- -DWITH_TESTS=$(usex test)
- -DWITH_XFS=$(usex xfs)
- -DWITH_ZFS=$(usex zfs)
- -DENABLE_SHARED="yes"
- -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc
'jemalloc' 'libc')")
- -DWITH_SYSTEM_BOOST=$(usex system-boost)
- -DBOOST_J=$(makeopts_jobs)
- -DWITH_RDMA=no
- -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
- -DEPYTHON_VERSION="${EPYTHON#python}"
- )
- if use amd64 || use x86; then
- for flag in ${CPU_FLAGS_X86[@]}; do
- mycmakeargs+=("$(usex cpu_flags_x86_${flag}
"-DHAVE_INTEL_${flag^^}=1")")
- done
- fi
-
- rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
- cmake-utils_src_configure
-
- # bug #630232
- sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
- "${BUILD_DIR:--${S}}"/include/acconfig.h \
- || die "sed failed"
-}
-
-src_configure() {
- ceph_src_configure
-}
-
-python_compile() {
- local CMAKE_USE_DIR="${S}"
-
- ceph_src_configure
- pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
- emake VERBOSE=1 all
-
- # python modules are only compiled with "make install" so we need to do
this to
- # prevent doing a bunch of compilation in src_install
- DESTDIR="${T}" emake VERBOSE=1 install
- popd >/dev/null || die
-}
-
-src_compile() {
- cmake-utils_src_make all
-
- # we have to do this here to prevent from building everything multiple
times
- python_copy_sources
- python_foreach_impl python_compile
-}
-
-src_test() {
- make check || die "make check failed"
-}
-
-python_install() {
- local CMAKE_USE_DIR="${S}"
- pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
- DESTDIR="${ED}" emake install
- popd >/dev/null || die
-}
-
-src_install() {
- cmake-utils_src_install
- python_foreach_impl python_install
-
- find "${D}" -name '*.la' -delete || die
-
- exeinto /usr/$(get_libdir)/ceph
- newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
- fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
- insinto /etc/sysctl.d
- newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
- use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
- # units aren't installed by the build system unless systemd is enabled
- # so no point installing these with the USE flag disabled
- if use systemd; then
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf"
\
- "[email protected]"
-
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf"
\
- "[email protected]"
- fi
-
- udev_dorules udev/*.rules
-
- readme.gentoo_create_doc
-
- python_setup 'python2*'
-
- # bug #630232
- sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
- || die "sed failed"
-
- python_fix_shebang "${ED}"/usr/{,s}bin/
-
- # python_fix_shebang apparently is not idempotent
- sed -i -r
's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
- "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed
failed"
-
- local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* )
- dostrip -x "${rados_classes[@]#${D}}"
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
deleted file mode 100644
index 3c6f8a003fc..00000000000
--- a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,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
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/ceph/ceph.git";
- SRC_URI=""
-else
- SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz";
- KEYWORDS="~amd64 ~arm64 ~ppc64"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/";
-
-LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3
GPL-3 BSD Boost-1.0 MIT public-domain"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
jemalloc
- kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq
+radosgw
- rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-DEPEND="
- acct-group/ceph
- acct-user/ceph
- virtual/libudev:=
- app-arch/bzip2:=
- app-arch/lz4:=
- app-arch/snappy:=
- app-arch/zstd:=
- app-shells/bash:0
- app-misc/jq:=
- dev-libs/crypto++:=
- dev-libs/leveldb:=[snappy,tcmalloc(-)?]
- dev-libs/libaio:=
- dev-libs/libfmt:=
- dev-libs/libnl:3=
- dev-libs/libxml2:=
- dev-libs/xmlsec:=[!openssl?,!libressl?]
- dev-cpp/yaml-cpp:=
- dev-libs/nss:=
- dev-libs/protobuf:=
- net-dns/c-ares:=
- net-libs/gnutls:=
- sys-auth/oath-toolkit:=
- sys-apps/coreutils
- sys-apps/grep
- sys-apps/hwloc:=
- sys-apps/keyutils:=
- sys-apps/util-linux:=
- sys-apps/sed
- sys-apps/util-linux
- sys-libs/libcap-ng:=
- sys-libs/ncurses:0=
- sys-libs/zlib:=
- sys-process/numactl:=
- x11-libs/libpciaccess:=
- babeltrace? ( dev-util/babeltrace )
- fuse? ( sys-fs/fuse:0= )
- jemalloc? ( dev-libs/jemalloc:= )
- !jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
- kafka? ( dev-libs/librdkafka:= )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:= )
- lttng? ( dev-util/lttng-ust:= )
- rabbitmq? ( net-libs/rabbitmq-c:= )
- radosgw? (
- dev-libs/expat:=
- openssl? (
- dev-libs/openssl:=
- net-misc/curl:=[curl_ssl_openssl]
- )
- libressl? (
- dev-libs/libressl:=
- net-misc/curl:=[curl_ssl_libressl]
- )
- )
- ssl? (
- openssl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
- system-boost? (
=dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
- uring? ( sys-libs/liburing:= )
- xfs? ( sys-fs/xfsprogs:= )
- zfs? ( sys-fs/zfs:= )
- ${PYTHON_DEPS}
-"
-BDEPEND="
- amd64? ( dev-lang/yasm )
- x86? ( dev-lang/yasm )
- app-arch/cpio
- >=dev-util/cmake-3.5.0
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/sphinx
- dev-util/cunit
- dev-util/gperf
- dev-util/ragel
- dev-util/valgrind
- sys-apps/coreutils
- sys-apps/findutils
- sys-apps/grep
- sys-apps/sed
- sys-apps/which
- sys-devel/bc
- sys-devel/patch
- virtual/pkgconfig
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- dev-python/requests-mock[${PYTHON_USEDEP}]
- sys-apps/grep[pcre]
- sys-fs/btrfs-progs
- )
-"
-RDEPEND="${DEPEND}
- app-admin/sudo
- net-misc/socat
- sys-apps/gptfdisk
- sys-apps/nvme-cli
- >=sys-apps/smartmontools-7.0
- sys-block/parted
- sys-fs/cryptsetup
- sys-fs/lsscsi
- sys-fs/lvm2[-device-mapper-only(-)]
- virtual/awk
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/cherrypy[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pecan[${PYTHON_USEDEP}]
- dev-python/prettytable[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
- mgr? (
- dev-python/jsonpatch[${PYTHON_USEDEP}]
- dev-python/more-itertools[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pyjwt[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/routes[${PYTHON_USEDEP}]
- diskprediction? (
- $(python_gen_cond_dep
'<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
- )
- sci-libs/scikit-learn[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- )
-"
-# diskprediction needs older scipy not compatible with py38
-# bug #724438
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ?? ( jemalloc tcmalloc )
- ^^ ( openssl libressl )
- diskprediction? ( mgr !python_targets_python3_8 )
- kafka? ( radosgw )
- mgr? ( cephfs )
- rabbitmq? ( radosgw )
-"
-RESTRICT="!test? ( test )"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# create a non-debug release
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI=no
-
-PATCHES=(
- "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
- "${FILESDIR}/ceph-14.2.0-cflags.patch"
- "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
- "${FILESDIR}/ceph-13.2.0-cflags.patch"
- "${FILESDIR}/ceph-15.2.0-no-virtualenvs.patch"
- "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
- "${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-15.2.0-rocksdb-cmake.patch"
- "${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
- "${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
- "${FILESDIR}/ceph-14.2.10-python-warnings.patch"
- "${FILESDIR}/ceph-15.2.4-system-uring.patch"
- "${FILESDIR}/ceph-15.2.5-glibc-2.32.patch"
-)
-
-check-reqs_export_vars() {
- CHECKREQS_DISK_BUILD="5200M"
- CHECKREQS_DISK_USR="510M"
-
- export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
- check-reqs_export_vars
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- python_setup
- check-reqs_export_vars
- check-reqs_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- if use system-boost; then
- find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
- | xargs --null sed -r \
- -e 's|Boost::|boost_|g' \
- -e 's|Boost_|boost_|g' \
- -e 's|[Bb]oost_boost|boost_system|g' -i || die
- fi
-
- sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
- src/bash_completion/CMakeLists.txt || die
-
- if ! use diskprediction; then
- rm -rf src/pybind/mgr/diskprediction_local || die
- fi
-
- # remove tests that need root access
- rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
- local flag
- local mycmakeargs=(
- -DWITH_BABELTRACE=$(usex babeltrace)
- -DWITH_BLUESTORE_PMEM=$(usex pmdk)
- -DWITH_CEPHFS=$(usex cephfs)
- -DWITH_CEPHFS_SHELL=$(usex cephfs)
- -DWITH_DPDK=$(usex dpdk)
- -DWITH_SPDK=$(usex spdk)
- -DWITH_FUSE=$(usex fuse)
- -DWITH_LTTNG=$(usex lttng)
- -DWITH_GSSAPI=$(usex kerberos)
- -DWITH_GRAFANA=$(usex grafana)
- -DWITH_MGR=$(usex mgr)
- -DWITH_MGR_DASHBOARD_FRONTEND=OFF
- -DWITH_NUMA=$(usex numa)
- -DWITH_OPENLDAP=$(usex ldap)
- -DWITH_PYTHON3=3
- -DWITH_RADOSGW=$(usex radosgw)
- -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
- -DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
- -DWITH_RBD_RWL=$(usex rbd-rwl)
- -DWITH_SSL=$(usex ssl)
- -DWITH_SYSTEMD=$(usex systemd)
- -DWITH_TESTS=$(usex test)
- -DWITH_LIBURING=$(usex uring)
- -DWITH_XFS=$(usex xfs)
- -DWITH_ZFS=$(usex zfs)
- -DENABLE_SHARED="ON"
- -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc
'jemalloc' 'libc')")
- -DWITH_SYSTEM_BOOST=$(usex system-boost)
- -DBOOST_J=$(makeopts_jobs)
- -DWITH_RDMA=OFF
- -DWITH_TBB=OFF
- -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
- -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
- -DEPYTHON_VERSION="${EPYTHON#python}"
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
- -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
- -Wno-dev
- )
- if use amd64 || use x86; then
- for flag in ${CPU_FLAGS_X86[@]}; do
- mycmakeargs+=("$(usex cpu_flags_x86_${flag}
"-DHAVE_INTEL_${flag^^}=1")")
- done
- fi
-
- rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
- || die "failed to remove cmake cache"
-
- cmake_src_configure
-
- # bug #630232
- sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
- "${BUILD_DIR:-${S}}"/include/acconfig.h \
- || die "sed failed"
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- ceph_src_configure
-}
-
-python_compile() {
- local CMAKE_USE_DIR="${S}"
- ceph_src_configure
-
- pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
- emake VERBOSE=1 clean
- emake VERBOSE=1 all
-
- # python modules are only compiled with "make install" so we need to do
this to
- # prevent doing a bunch of compilation in src_install
- DESTDIR="${T}" emake VERBOSE=1 install
- popd >/dev/null || die
-}
-
-src_compile() {
- cmake_build VERBOSE=1 all
-
- # we have to do this here to prevent from building everything multiple
times
- python_copy_sources
- python_foreach_impl python_compile
-}
-
-src_test() {
- make check || die "make check failed"
-}
-
-python_install() {
- local CMAKE_USE_DIR="${S}"
- pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
- DESTDIR="${ED}" emake VERBOSE=1 install
- popd >/dev/null || die
-
- python_optimize
-}
-
-src_install() {
- cmake_src_install
- python_foreach_impl python_install
-
- find "${ED}" -name '*.la' -type f -delete || die
-
- exeinto /usr/$(get_libdir)/ceph
- newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
- keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
- fowners -R ceph:ceph /var/log/ceph
-
- newinitd "${FILESDIR}/rbdmap.initd" rbdmap
- newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
- insinto /etc/sysctl.d
- newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
- use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
- # units aren't installed by the build system unless systemd is enabled
- # so no point installing these with the USE flag disabled
- if use systemd; then
- systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf"
\
- "[email protected]"
-
- systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf"
\
- "[email protected]"
-
- fi
-
- udev_dorules udev/*.rules
- newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
-
- readme.gentoo_create_doc
-
- python_setup
-
- # bug #630232
- sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:"
"${ED}"/usr/bin/ceph{,-crash} \
- || die "sed failed"
-
- python_fix_shebang "${ED}"/usr/{,s}bin/
-
- # python_fix_shebang apparently is not idempotent
- local
shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
- grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
- | xargs --null --no-run-if-empty -- sed -i -r
"s:${shebang_regex}:\1:" || die
-
- local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
- dostrip -x "${rados_classes[@]#${ED}}"
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/files/ceph-12.2.0-cflags.patch
b/sys-cluster/ceph/files/ceph-12.2.0-cflags.patch
deleted file mode 100644
index 0f02e6e6d43..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.0-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
-index 24d1a50654..a9fac61196 100644
---- a/cmake/modules/Distutils.cmake
-+++ b/cmake/modules/Distutils.cmake
-@@ -43,7 +43,7 @@ function(distutils_add_cython_module name src)
- CC=${PY_CC}
- CXX=${PY_CXX}
- LDSHARED=${PY_LDSHARED}
-- OPT=\"-DNDEBUG -g -fwrapv -O2 -w\"
-+ OPT=\"-DNDEBUG -fwrapv -w\"
- LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
- CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
- CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
diff --git a/sys-cluster/ceph/files/ceph-12.2.1-systemd-unitdir.patch
b/sys-cluster/ceph/files/ceph-12.2.1-systemd-unitdir.patch
deleted file mode 100644
index 28d1a02d711..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.1-systemd-unitdir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
-index 3b03b6e613..c359ad2df9 100644
---- a/systemd/CMakeLists.txt
-+++ b/systemd/CMakeLists.txt
-@@ -17,4 +17,4 @@ install(FILES
- [email protected]
- [email protected]
- rbdmap.service
-- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/systemd/system)
-+ DESTINATION ${SYSTEMD_UNITDIR})
diff --git a/sys-cluster/ceph/files/ceph-12.2.11-boost-sonames.patch
b/sys-cluster/ceph/files/ceph-12.2.11-boost-sonames.patch
deleted file mode 100644
index bd17686bd9a..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.11-boost-sonames.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5403de8f4c..ee3336ee27 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -563,7 +563,7 @@ set(BOOST_COMPONENTS
- set(BOOST_HEADER_COMPONENTS container)
-
- if(WITH_MGR)
-- list(APPEND BOOST_COMPONENTS python)
-+ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION})
- endif()
- if(WITH_BOOST_CONTEXT)
- list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b0837ab1d9..e12cecf354 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -623,13 +623,13 @@ set(ceph_common_objs
- $<TARGET_OBJECTS:crush_objs>)
- set(ceph_common_deps
- json_spirit erasure_code rt ${LIB_RESOLV}
-- Boost::thread
-- Boost::system
-- Boost::regex
-- Boost::random
-- Boost::program_options
-- Boost::date_time
-- Boost::iostreams
-+ boost_thread
-+ boost_system
-+ boost_regex
-+ boost_random
-+ boost_program_options
-+ boost_date_time
-+ boost_iostreams
- ${BLKID_LIBRARIES}
- ${Backtrace_LIBRARIES}
- ${BLKIN_LIBRARIES}
-@@ -727,7 +727,7 @@ if (WITH_MGR)
- $<TARGET_OBJECTS:heap_profiler_objs>)
- target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr osdc client global-static common
-- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}
${ALLOC_LIBS})
-+ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES}
${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
- install(TARGETS ceph-mgr DESTINATION bin)
- endif (WITH_MGR)
-
-@@ -901,7 +901,7 @@ set(ceph_mds_srcs
- ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
-- Boost::thread)
-+ boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
-
- add_subdirectory(erasure-code)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index 57cb2a5b94..971af8ebec 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -156,7 +156,7 @@ if (WITH_CURL_OPENSSL OR (WITH_RADOSGW_BEAST_FRONTEND AND
WITH_RADOSGW_BEAST_OPE
- endif()
- if (WITH_RADOSGW_BEAST_FRONTEND)
- target_compile_definitions(rgw_a PUBLIC
BOOST_COROUTINES_NO_DEPRECATION_WARNING)
-- target_link_libraries(rgw_a Boost::coroutine Boost::context)
-+ target_link_libraries(rgw_a boost_coroutine boost_context)
- endif()
-
- set(radosgw_srcs
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 66e24b8bc9..0f659c98e2 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -145,7 +145,7 @@ add_executable(ceph_omapbench
- )
- target_link_libraries(ceph_omapbench
- librados
-- Boost::program_options
-+ boost_program_options
- global
- ${BLKID_LIBRARIES}
- ${CMAKE_DL_LIBS}
-@@ -199,7 +199,7 @@ if(${WITH_RADOSGW})
- cls_rgw_client
- cls_user_client
- cls_lock_client
-- Boost::regex
-+ boost_regex
- ${BLKID_LIBRARIES}
- ${CURL_LIBRARIES}
- ${EXPAT_LIBRARIES}
-@@ -229,7 +229,7 @@ if(${WITH_RADOSGW})
- cls_rgw_client
- cls_user_client
- cls_lock_client
-- Boost::regex
-+ boost_regex
- ${BLKID_LIBRARIES}
- ${CURL_LIBRARIES}
- ${EXPAT_LIBRARIES}
-diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
-index 9fba701e05..da3cbcfe96 100644
---- a/src/test/bench/CMakeLists.txt
-+++ b/src/test/bench/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(smalliobench_srcs
- add_executable(ceph_smalliobench
- ${smalliobench_srcs}
- )
--target_link_libraries(ceph_smalliobench librados Boost::program_options global
-+target_link_libraries(ceph_smalliobench librados boost_program_options global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- # ceph_smalliobenchrbd
-@@ -27,7 +27,7 @@ if(WITH_RBD)
- librados
- os
- global
-- Boost::program_options
-+ boost_program_options
- ${BLKID_LIBRARIES}
- ${CMAKE_DL_LIBS}
- )
-@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs
- add_executable(ceph_smalliobenchfs
- ${ceph_smalliobenchfs_srcs}
- )
--target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os
global
-+target_link_libraries(ceph_smalliobenchfs librados boost_program_options os
global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- # ceph_smalliobenchdumb
-@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs
- add_executable(ceph_smalliobenchdumb
- ${smalliobenchdumb_srcs}
- )
--target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options
os global
-+target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os
global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- # ceph_tpbench
-@@ -73,7 +73,7 @@ set(tpbench_srcs
- add_executable(ceph_tpbench
- ${tpbench_srcs}
- )
--target_link_libraries(ceph_tpbench librados Boost::program_options global
-+target_link_libraries(ceph_tpbench librados boost_program_options global
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
-
- install(TARGETS
-diff --git a/src/test/erasure-code/CMakeLists.txt
b/src/test/erasure-code/CMakeLists.txt
-index dc4e0865d0..69502342bb 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark
- ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
- ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common
Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common
boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
- DESTINATION bin)
-
- add_executable(ceph_erasure_code_non_regression
ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common
Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common
boost_program_options global ${CMAKE_DL_LIBS})
-
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options
global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options
global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
- DESTINATION bin)
-
-diff --git a/src/test/librados/CMakeLists.txt
b/src/test/librados/CMakeLists.txt
-index c35ddb3d8f..3916544259 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -137,7 +137,7 @@ add_executable(ceph_test_rados_api_tier
- set_target_properties(ceph_test_rados_api_tier PROPERTIES COMPILE_FLAGS
- ${UNITTEST_CXX_FLAGS})
- target_link_libraries(ceph_test_rados_api_tier
-- global rados_a ${UNITTEST_LIBS} Boost::system radostest)
-+ global rados_a ${UNITTEST_LIBS} boost_system radostest)
-
- # ceph_test_rados_api_snapshots
- add_executable(ceph_test_rados_api_snapshots
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index 9f72fa3b48..665c977606 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global)
- install(TARGETS ceph_radosacl DESTINATION bin)
-
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
-
- add_executable(ceph-monstore-tool
- ceph_monstore_tool.cc
- ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- install(PROGRAMS
- ceph-monstore-update-crush.sh
-@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool
- ceph_objectstore_tool.cc
- rebuild_mondb.cc
- RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global
Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global
boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
- target_link_libraries(ceph-objectstore-tool fuse)
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch
b/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch
deleted file mode 100644
index cd9eb4891cb..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
-index 0074c7964b..98991be7d2 100644
---- a/src/osd/PrimaryLogPG.cc
-+++ b/src/osd/PrimaryLogPG.cc
-@@ -1582,7 +1582,7 @@ void PrimaryLogPG::calc_trim_to()
- if (limit != eversion_t() &&
- limit != pg_trim_to &&
- pg_log.get_log().approx_size() > target) {
-- size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
-+ size_t num_to_trim = std::min((uint64_t)(pg_log.get_log().approx_size() -
target),
- cct->_conf->osd_pg_log_trim_max);
- if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
- cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) {
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch
b/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch
deleted file mode 100644
index a21bcc9325d..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/civetweb/src/civetweb.c 2017-11-02 10:58:06.000000000 -0700
-+++ b/src/civetweb/src/civetweb.c 2019-04-11 17:23:30.736346783 -0700
-@@ -851,6 +851,7 @@
- #include <openssl/crypto.h>
- #include <openssl/x509.h>
- #include <openssl/pem.h>
-+#include <openssl/engine.h>
- #else
- /* SSL loaded dynamically from DLL.
- * I put the prototypes here to be independent from OpenSSL source
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch
b/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch
deleted file mode 100644
index 9a23e1ee60a..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc
-index cf4e38995e..7a4089fca9 100644
---- a/src/rgw/rgw_crypt.cc
-+++ b/src/rgw/rgw_crypt.cc
-@@ -31,7 +31,7 @@ using namespace CryptoPP;
- #define dout_subsys ceph_subsys_rgw
-
- using namespace rgw;
--using ceph::crypto::PK11_ImportSymKey_FIPS;
-+//using ceph::crypto::PK11_ImportSymKey_FIPS;
-
- /**
- * Encryption in CTR mode. offset is used as IV for each block.
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch
b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch
deleted file mode 100644
index 1b72e5447db..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt
-index 7aa42e9efd..66186b159f 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
-@@ -46,7 +49,7 @@ target_link_libraries(rbd librbd librados
- cls_journal_client cls_rbd_client
- rbd_types
- journal
-- ceph-common global
-+ ceph-common global ${CURSES_LIBRARIES}
- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
- if(WITH_KRBD)
- target_link_libraries(rbd
diff --git a/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch
b/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch
deleted file mode 100644
index 1b63d6e21ba..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc
-index d95a397a84..d2cbf4b7b9 100644
---- a/src/common/blkdev.cc
-+++ b/src/common/blkdev.cc
-@@ -225,7 +225,7 @@ int get_device_by_uuid(uuid_d dev_uuid, const char* label,
char* partition,
- rc = get_block_device_base(partition, basename,
- sizeof(basename));
- if (rc >= 0) {
-- strncpy(device, basename, sizeof(basename));
-+ strncpy(device, basename, sizeof(device));
- rc = 0;
- } else {
- rc = -ENODEV;
diff --git a/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch
b/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch
deleted file mode 100644
index 3535d8cf436..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index c7cd39a110..e7b8115485 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -29,7 +29,7 @@ function(do_build_boost version)
- else()
- list(APPEND boost_features "address-model=32")
- endif()
-- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
-+ set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc
<---XXX
- list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
-
- string(REPLACE ";" "," boost_with_libs "${Boost_BUILD_COMPONENTS}")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7aa8a4392e..c7543a62bd 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -808,6 +808,7 @@ install(TARGETS ceph-mon DESTINATION bin)
-
- if (NOT WITH_SYSTEM_ROCKSDB)
- set(ROCKSDB_CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
-+ list(APPEND ROCKSDB_CMAKE_ARGS -DDISABLE_WARNING_AS_ERROR=ON)
-
- if(ALLOCATOR STREQUAL "jemalloc")
- list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_JEMALLOC=ON)
-diff --git a/src/compressor/zstd/CMakeLists.txt
b/src/compressor/zstd/CMakeLists.txt
-index d9d2b6e560..1b2099fcbd 100644
---- a/src/compressor/zstd/CMakeLists.txt
-+++ b/src/compressor/zstd/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # zstd
-
- # libzstd - build it statically
--set(ZSTD_C_FLAGS -fPIC -Wno-unused-variable -O3)
-+set(ZSTD_C_FLAGS -fPIC -Wno-unused-variable $ENV{CFLAGS})
-
- include(ExternalProject)
- ExternalProject_Add(zstd_ext
diff --git a/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch
b/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch
deleted file mode 100644
index d744318cd11..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ceph-12.2.4.orig/src/rocksdb/CMakeLists.txt 2018-03-05
19:06:21.016923872 -0800
-+++ ceph-12.2.4/src/rocksdb/CMakeLists.txt 2018-03-05 19:09:01.798721666
-0800
-@@ -147,7 +147,7 @@
- endif()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -fno-omit-frame-pointer")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer")
- include(CheckCXXCompilerFlag)
- CHECK_CXX_COMPILER_FLAG("-momit-leaf-frame-pointer"
HAVE_OMIT_LEAF_FRAME_POINTER)
- if(HAVE_OMIT_LEAF_FRAME_POINTER)
diff --git a/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch
b/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch
deleted file mode 100644
index dd24e7819fe..00000000000
--- a/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ur ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt
ceph-12.2.5/src/rapidjson/CMakeLists.txt
---- ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt 2018-07-09
11:18:09.188115751 -0700
-+++ ceph-12.2.5/src/rapidjson/CMakeLists.txt 2018-07-09 11:36:56.848639110
-0700
-@@ -50,7 +50,7 @@
- endif(CCACHE_FOUND)
-
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra
-Werror")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
- if (RAPIDJSON_BUILD_CXX11)
- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-@@ -73,7 +73,7 @@
- endif()
- endif()
- elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra
-Werror -Wno-missing-field-initializers")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra
-Wno-missing-field-initializers")
- if (RAPIDJSON_BUILD_CXX11)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- endif()
-diff -ur ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt
ceph-12.2.5/src/rocksdb/CMakeLists.txt
---- ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt 2018-07-09
11:18:09.219115543 -0700
-+++ ceph-12.2.5/src/rocksdb/CMakeLists.txt 2018-07-09 11:34:58.843411195
-0700
-@@ -174,15 +174,6 @@
- PROPERTIES COMPILE_FLAGS "-msse4.2")
- endif()
-
--option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
--if(FAIL_ON_WARNINGS)
-- if(MSVC)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
-- else() # assume GCC
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-- endif()
--endif()
--
- option(WITH_ASAN "build with ASAN" OFF)
- if(WITH_ASAN)
- add_definitions(-DROCKSDB_TSAN_RUN)
-diff -ur ceph-12.2.5.orig/src/rocksdb/Makefile ceph-12.2.5/src/rocksdb/Makefile
---- ceph-12.2.5.orig/src/rocksdb/Makefile 2018-03-11 18:58:51.000000000
-0700
-+++ ceph-12.2.5/src/rocksdb/Makefile 2018-07-09 11:35:53.847049123 -0700
-@@ -243,11 +243,6 @@
- WARNING_FLAGS = -W -Wextra -Wall -Wsign-compare -Wshadow \
- -Wno-unused-parameter
-
--ifndef DISABLE_WARNING_AS_ERROR
-- WARNING_FLAGS += -Werror
--endif
--
--
- ifdef LUA_PATH
-
- ifndef LUA_INCLUDE
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index b29a383d9b5..141b26fdddb 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -27,7 +27,6 @@
<flag name="kafka">Rados Gateway's pubsub support for Kafka push
endpoint</flag>
<flag name="lttng">Add support for LTTng</flag>
<flag name="mgr">Build the ceph-mgr daemon</flag>
- <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
<flag name="numa">Use <pkg>sys-process/numactl</pkg> for numa support in
rocksdb</flag>
<flag name="openssl">Use <pkg>dev-libs/openssl</pkg></flag>
<flag name="pmdk">Enable PMDK libraries</flag>
