[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/

[Aaron Bauman]

commit:     fb3ec4695deb9603c1fd7d5061af68e68041f75f
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Apr 17 06:56:42 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 01:27:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb3ec469

sys-cluster/ceph: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11718
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/ceph-10.2.0-dont-use-virtualenvs.patch   |  95 ------
 sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch    |  11 -
 .../ceph/files/ceph-10.2.1-unbundle-jerasure.patch | 355 ---------------------
 .../ceph/files/ceph-10.2.3-CVE-2016-8626.patch     |  33 --
 .../files/ceph-10.2.3-build-without-openldap.patch |  32 --
 ...ndings-and-tests-compatible-with-Python-3.patch |  22 --
 ...-Python-bindings-compatible-with-Python-3.patch |  45 ---
 .../ceph-10.2.7-fix-compilation-with-zstd.patch    |  49 ---
 sys-cluster/ceph/files/ceph-10.2.9-cflags.patch    |  15 -
 .../files/ceph-10.2.9-dont-run-lsb_release.patch   |  65 ----
 sys-cluster/ceph/files/ceph.confd-r1               |   4 -
 sys-cluster/ceph/files/ceph.confd-r3               |  63 ----
 sys-cluster/ceph/files/ceph.initd-r2               |  40 ---
 sys-cluster/ceph/files/ceph.initd-r7               |  87 -----
 14 files changed, 916 deletions(-)

diff --git a/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch b/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch
deleted file mode 100644
index f3627636aeb..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.0-dont-use-virtualenvs.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 7734be2..ba33bda 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -79,7 +79,6 @@ clean-local:
- 	  cd src/gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \
- 	fi
- 
--	@rm -rf src/test/virtualenv
- 	@rm -rf install-deps-*
- 
- 
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index df225d6..ca030cf 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -297,10 +297,6 @@ LIBCIVETWEB_DEPS =
- DENCODER_SOURCES =
- DENCODER_DEPS =
- 
--# put virtualenvs in this directory
--# otherwise it may overflow #! 80 kernel limit
--# beware that some build environments might not be able to write to /tmp
- export TMPDIR ?= /tmp
--export CEPH_BUILD_VIRTUALENV = $(TMPDIR)
- 
- radoslibdir = $(libdir)/rados-classes
-diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
-index 8ddcb1e..52dd5d5 100644
---- a/src/ceph-detect-init/Makefile.am
-+++ b/src/ceph-detect-init/Makefile.am
-@@ -53,15 +53,10 @@ EXTRA_DIST += \
- 	ceph-detect-init/tests/test_all.py \
- 	ceph-detect-init/tox.ini
- 
--export CEPH_DETECT_INIT_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv
--
--ceph-detect-init-all: ${CEPH_DETECT_INIT_VIRTUALENV}
--
--${CEPH_DETECT_INIT_VIRTUALENV}:
--	cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e .
-+ceph-detect-init-all:
- 
- ceph-detect-init-clean:
--	cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DETECT_INIT_VIRTUALENV} .coverage *.egg-info
-+	cd $(srcdir)/ceph-detect-init
- 
- ceph-detect-init-install-data:
- 	cd $(srcdir)/ceph-detect-init ; \
-diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
-index 9006303..0b35b0f 100644
---- a/src/ceph-disk/Makefile.am
-+++ b/src/ceph-disk/Makefile.am
-@@ -29,15 +29,10 @@ EXTRA_DIST += \
- 	ceph-disk/tests/test_main.py \
- 	ceph-disk/tox.ini
- 
--export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv
--
--ceph-disk-all: ${CEPH_DISK_VIRTUALENV}
--
--${CEPH_DISK_VIRTUALENV}:
--	cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DISK_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e .
-+ceph-disk-all:
- 
- ceph-disk-clean:
--	cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DISK_VIRTUALENV} .coverage *.egg-info
-+	cd $(srcdir)/ceph-disk
- 
- ceph-disk-install-data:
- 	cd $(srcdir)/ceph-disk ; \
-diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
-index e730850..9569947 100644
---- a/src/tools/Makefile.am
-+++ b/src/tools/Makefile.am
-@@ -45,6 +45,3 @@ noinst_HEADERS += \
- 	tools/rados/PoolDump.h \
- 	tools/cephfs/DataScan.h \
- 	tools/cephfs/RoleSelector.h
--
--EXTRA_DIST += \
--	tools/setup-virtualenv.sh
-diff --git a/src/tools/setup-virtualenv.sh b/src/tools/setup-virtualenv.sh
-index 9ff2d26..b6fca0a 100755
---- a/src/tools/setup-virtualenv.sh
-+++ b/src/tools/setup-virtualenv.sh
-@@ -15,6 +15,8 @@
- # GNU Library Public License for more details.
- #
- 
-+exit 0
-+
- DIR=$1
- rm -fr $DIR
- mkdir -p $DIR

diff --git a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch b/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch
deleted file mode 100644
index 34f8eb84bee..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ceph-10.2.1/configure.ac
-+++ ceph-10.2.1/configure.ac
-@@ -908,7 +908,7 @@
- 	    ,
- 	    [with_libzfs=no])
- AS_IF([test "x$with_libzfs" = xyes],
--	    [PKG_CHECK_MODULES([LIBZFS], [zfs], [], [true])])
-+	    [PKG_CHECK_MODULES([LIBZFS], [libzfs], [], [true])])
- AS_IF([test "x$with_libzfs" = xyes],
- 	    [AC_DEFINE([HAVE_LIBZFS], [1], [Defined if you have libzfs enabled])])
- AM_CONDITIONAL(WITH_LIBZFS, [ test "$with_libzfs" = "yes" ])

diff --git a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch b/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch
deleted file mode 100644
index 8340b4d18bf..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.1-unbundle-jerasure.patch
+++ /dev/null
@@ -1,355 +0,0 @@
-diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
-index adcb95d..8099208 100644
---- a/src/erasure-code/jerasure/Makefile.am
-+++ b/src/erasure-code/jerasure/Makefile.am
-@@ -1,52 +1,17 @@
- # jerasure plugin
- noinst_HEADERS += \
--  erasure-code/jerasure/gf-complete/include/gf_complete.h \
--  erasure-code/jerasure/gf-complete/include/gf_general.h \
--  erasure-code/jerasure/gf-complete/include/gf_int.h \
--  erasure-code/jerasure/gf-complete/include/gf_method.h \
--  erasure-code/jerasure/gf-complete/include/gf_rand.h \
--  erasure-code/jerasure/gf-complete/include/gf_w16.h \
--  erasure-code/jerasure/gf-complete/include/gf_w32.h \
--  erasure-code/jerasure/gf-complete/include/gf_w4.h \
--  erasure-code/jerasure/gf-complete/include/gf_w64.h \
--  erasure-code/jerasure/gf-complete/include/gf_w8.h \
--  erasure-code/jerasure/jerasure/include/cauchy.h \
--  erasure-code/jerasure/jerasure/include/galois.h \
--  erasure-code/jerasure/jerasure/include/jerasure.h \
--  erasure-code/jerasure/jerasure/include/liberation.h \
--  erasure-code/jerasure/jerasure/include/reed_sol.h \
-   erasure-code/jerasure/ErasureCodeJerasure.h
- 
- jerasure_sources = \
-   erasure-code/ErasureCode.cc \
--  erasure-code/jerasure/jerasure/src/cauchy.c \
--  erasure-code/jerasure/jerasure/src/galois.c \
--  erasure-code/jerasure/jerasure/src/jerasure.c \
--  erasure-code/jerasure/jerasure/src/liberation.c \
--  erasure-code/jerasure/jerasure/src/reed_sol.c \
--  erasure-code/jerasure/gf-complete/src/gf_wgen.c \
--  erasure-code/jerasure/gf-complete/src/gf_method.c \
--  erasure-code/jerasure/gf-complete/src/gf_w16.c \
--  erasure-code/jerasure/gf-complete/src/gf.c \
--  erasure-code/jerasure/gf-complete/src/gf_w32.c \
--  erasure-code/jerasure/gf-complete/src/gf_w64.c \
--  erasure-code/jerasure/gf-complete/src/gf_w128.c \
--  erasure-code/jerasure/gf-complete/src/gf_general.c \
--  erasure-code/jerasure/gf-complete/src/gf_w4.c \
--  erasure-code/jerasure/gf-complete/src/gf_rand.c \
--  erasure-code/jerasure/gf-complete/src/gf_w8.c \
-   erasure-code/jerasure/ErasureCodePluginJerasure.cc \
-   erasure-code/jerasure/ErasureCodeJerasure.cc
- 
- erasure-code/jerasure/ErasureCodePluginJerasure.cc: ./ceph_ver.h
- 
- libec_jerasure_generic_la_SOURCES = ${jerasure_sources}
--libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS}  \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
--libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS}
-+libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS}
- libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-@@ -55,20 +20,11 @@ endif
- 
- erasure_codelib_LTLIBRARIES += libec_jerasure_generic.la
- 
--libec_jerasure_neon_la_SOURCES = ${jerasure_sources}                                       \
--                                  erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c  \
--                                  erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c  \
--                                  erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \
--                                  erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \
--                                  erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c
-+libec_jerasure_neon_la_SOURCES = ${jerasure_sources}
- libec_jerasure_neon_la_CFLAGS = ${AM_CFLAGS}  \
--	${ARM_NEON_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${ARM_NEON_FLAGS}
- libec_jerasure_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \
--	${ARM_NEON_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${ARM_NEON_FLAGS}
- libec_jerasure_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-@@ -84,16 +40,12 @@ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS}  \
- 	${INTEL_SSE_FLAGS} \
- 	${INTEL_SSE2_FLAGS} \
- 	${INTEL_SSE3_FLAGS} \
--	${INTEL_SSSE3_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${INTEL_SSSE3_FLAGS}
- libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
- 	${INTEL_SSE_FLAGS} \
- 	${INTEL_SSE2_FLAGS} \
- 	${INTEL_SSE3_FLAGS} \
--	${INTEL_SSSE3_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${INTEL_SSSE3_FLAGS}
- libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-@@ -111,18 +63,14 @@ libec_jerasure_sse4_la_CFLAGS = ${AM_CFLAGS}  \
- 	${INTEL_SSE3_FLAGS} \
- 	${INTEL_SSSE3_FLAGS} \
- 	${INTEL_SSE4_1_FLAGS} \
--	${INTEL_SSE4_2_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${INTEL_SSE4_2_FLAGS}
- libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
- 	${INTEL_SSE_FLAGS} \
- 	${INTEL_SSE2_FLAGS} \
- 	${INTEL_SSE3_FLAGS} \
- 	${INTEL_SSSE3_FLAGS} \
- 	${INTEL_SSE4_1_FLAGS} \
--	${INTEL_SSE4_2_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include
-+	${INTEL_SSE4_2_FLAGS}
- libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
-diff --git a/src/erasure-code/shec/ErasureCodePluginShec.cc b/src/erasure-code/shec/ErasureCodePluginShec.cc
-index d2b72f5..acbd172 100644
---- a/src/erasure-code/shec/ErasureCodePluginShec.cc
-+++ b/src/erasure-code/shec/ErasureCodePluginShec.cc
-@@ -71,7 +71,7 @@ public:
- };
- 
- extern "C" {
--#include "jerasure/include/galois.h"
-+#include "galois.h"
- 
- extern gf_t *gfp_array[];
- extern int  gfp_is_composite[];
-diff --git a/src/erasure-code/shec/ErasureCodeShec.cc b/src/erasure-code/shec/ErasureCodeShec.cc
-index 2180328..c84ffc7 100644
---- a/src/erasure-code/shec/ErasureCodeShec.cc
-+++ b/src/erasure-code/shec/ErasureCodeShec.cc
-@@ -28,8 +28,8 @@
- #include "crush/CrushWrapper.h"
- #include "osd/osd_types.h"
- extern "C" {
--#include "jerasure/include/jerasure.h"
--#include "jerasure/include/galois.h"
-+#include "jerasure.h"
-+#include "galois.h"
- 
- extern int calc_determinant(int *matrix, int dim);
- extern int* reed_sol_vandermonde_coding_matrix(int k, int m, int w);
-diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
-index 6b658d5..3281c60 100644
---- a/src/erasure-code/shec/Makefile.am
-+++ b/src/erasure-code/shec/Makefile.am
-@@ -4,49 +4,19 @@ shec_sources = \
- 	erasure-code/shec/ErasureCodePluginShec.cc \
- 	erasure-code/shec/ErasureCodeShec.cc \
- 	erasure-code/shec/ErasureCodeShecTableCache.cc \
--	erasure-code/shec/determinant.c \
--	erasure-code/jerasure/jerasure/src/cauchy.c \
--	erasure-code/jerasure/jerasure/src/galois.c \
--	erasure-code/jerasure/jerasure/src/jerasure.c \
--	erasure-code/jerasure/jerasure/src/liberation.c \
--	erasure-code/jerasure/jerasure/src/reed_sol.c \
--	erasure-code/jerasure/gf-complete/src/gf_wgen.c \
--	erasure-code/jerasure/gf-complete/src/gf_method.c \
--	erasure-code/jerasure/gf-complete/src/gf_w16.c \
--	erasure-code/jerasure/gf-complete/src/gf.c \
--	erasure-code/jerasure/gf-complete/src/gf_w32.c \
--	erasure-code/jerasure/gf-complete/src/gf_w64.c \
--	erasure-code/jerasure/gf-complete/src/gf_w128.c \
--	erasure-code/jerasure/gf-complete/src/gf_general.c \
--	erasure-code/jerasure/gf-complete/src/gf_w4.c \
--	erasure-code/jerasure/gf-complete/src/gf_rand.c \
--	erasure-code/jerasure/gf-complete/src/gf_w8.c
-+	erasure-code/shec/determinant.c
- 
- noinst_HEADERS += \
- 	erasure-code/shec/ErasureCodeShec.h \
--	erasure-code/shec/ErasureCodeShecTableCache.h \
--	erasure-code/jerasure/jerasure/include/cauchy.h \
--	erasure-code/jerasure/jerasure/include/galois.h \
--	erasure-code/jerasure/jerasure/include/jerasure.h \
--	erasure-code/jerasure/jerasure/include/liberation.h \
--	erasure-code/jerasure/jerasure/include/reed_sol.h \
--	erasure-code/jerasure/gf-complete/include/gf_int.h \
--	erasure-code/jerasure/gf-complete/include/gf_complete.h \
--	erasure-code/jerasure/gf-complete/include/gf_rand.h \
--	erasure-code/jerasure/gf-complete/include/gf_method.h \
--	erasure-code/jerasure/gf-complete/include/gf_general.h
-+	erasure-code/shec/ErasureCodeShecTableCache.h
- 
- erasure-code/shec/ErasureCodePluginShec.cc: ./ceph_ver.h
- 
- libec_shec_generic_la_SOURCES = ${shec_sources}
- libec_shec_generic_la_CFLAGS = ${AM_CFLAGS}  \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-@@ -57,22 +27,13 @@ endif
- 
- erasure_codelib_LTLIBRARIES += libec_shec_generic.la
- 
--libec_shec_neon_la_SOURCES = ${shec_sources} \
--	erasure-code/jerasure/gf-complete/src/neon/gf_w4_neon.c \
--	erasure-code/jerasure/gf-complete/src/neon/gf_w8_neon.c \
--	erasure-code/jerasure/gf-complete/src/neon/gf_w16_neon.c \
--	erasure-code/jerasure/gf-complete/src/neon/gf_w32_neon.c \
--	erasure-code/jerasure/gf-complete/src/neon/gf_w64_neon.c
-+libec_shec_neon_la_SOURCES = ${shec_sources}
- libec_shec_neon_la_CFLAGS = ${AM_CFLAGS}  \
- 	${ARM_NEON_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_neon_la_CXXFLAGS= ${AM_CXXFLAGS} \
- 	${ARM_NEON_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-@@ -91,8 +52,6 @@ libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS}  \
- 	${INTEL_SSE2_FLAGS} \
- 	${INTEL_SSE3_FLAGS} \
- 	${INTEL_SSSE3_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
-@@ -100,8 +59,6 @@ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
- 	${INTEL_SSE2_FLAGS} \
- 	${INTEL_SSE3_FLAGS} \
- 	${INTEL_SSSE3_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-@@ -122,8 +79,6 @@ libec_shec_sse4_la_CFLAGS = ${AM_CFLAGS}  \
- 	${INTEL_SSSE3_FLAGS} \
- 	${INTEL_SSE4_1_FLAGS} \
- 	${INTEL_SSE4_2_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
-@@ -133,8 +88,6 @@ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
- 	${INTEL_SSSE3_FLAGS} \
- 	${INTEL_SSE4_1_FLAGS} \
- 	${INTEL_SSE4_2_FLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- libec_shec_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
-diff --git a/src/erasure-code/shec/determinant.c b/src/erasure-code/shec/determinant.c
-index 15b62c9..bf5d290 100755
---- a/src/erasure-code/shec/determinant.c
-+++ b/src/erasure-code/shec/determinant.c
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#include "jerasure/include/galois.h"
-+#include "galois.h"
- 
- void print_matrix(int *mat, int dim)
- {
-diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am
-index bdce080..11895ae 100644
---- a/src/test/erasure-code/Makefile.am
-+++ b/src/test/erasure-code/Makefile.am
-@@ -166,12 +166,8 @@ check_TESTPROGRAMS += unittest_erasure_code
- unittest_erasure_code_jerasure_SOURCES = \
- 	test/erasure-code/TestErasureCodeJerasure.cc \
- 	${jerasure_sources}
--unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS) \
--	-Ierasure-code/jerasure/gf-complete/include \
--	-Ierasure-code/jerasure/jerasure/include
--unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) \
--	-Ierasure-code/jerasure/gf-complete/include \
--	-Ierasure-code/jerasure/jerasure/include
-+unittest_erasure_code_jerasure_CFLAGS = $(AM_CFLAGS)
-+unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS)
- unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
- if LINUX
- unittest_erasure_code_jerasure_LDADD += -ldl
-@@ -232,13 +228,9 @@ unittest_erasure_code_shec_SOURCES = \
- 	test/erasure-code/TestErasureCodeShec.cc \
- 	${shec_sources}
- unittest_erasure_code_shec_CFLAGS = ${libec_shec_la_CFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
-@@ -251,13 +243,9 @@ unittest_erasure_code_shec_all_SOURCES = \
- 	test/erasure-code/TestErasureCodeShec_all.cc \
- 	${shec_sources}
- unittest_erasure_code_shec_all_CFLAGS = ${libec_shec_la_CFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_all_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_all_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
-@@ -270,13 +258,9 @@ unittest_erasure_code_shec_thread_SOURCES = \
- 	test/erasure-code/TestErasureCodeShec_thread.cc \
- 	${shec_sources}
- unittest_erasure_code_shec_thread_CFLAGS = ${libec_shec_la_CFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_thread_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_thread_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
-@@ -289,13 +273,9 @@ unittest_erasure_code_shec_arguments_SOURCES = \
- 	test/erasure-code/TestErasureCodeShec_arguments.cc \
- 	${shec_sources}
- unittest_erasure_code_shec_arguments_CFLAGS = ${libec_shec_la_CFLAGS} \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_arguments_CXXFLAGS = ${libec_shec_la_CXXFLAGS} $(UNITTEST_CXXFLAGS) \
--	-I$(srcdir)/erasure-code/jerasure/jerasure/include \
--	-I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- 	-I$(srcdir)/erasure-code/jerasure \
- 	-I$(srcdir)/erasure-code/shec
- unittest_erasure_code_shec_arguments_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)

diff --git a/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch b/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch
deleted file mode 100644
index d767d8170df..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.3-CVE-2016-8626.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit dc2ffda7819d2ebeed3526d9e6da8f53221818de
-Author: Yehuda Sadeh <yehuda@××××××.com>
-Date:   Thu Oct 20 10:17:36 2016 -0700
-
-    rgw: handle empty POST condition
-    
-    Fixes: http://tracker.ceph.com/issues/17635
-    
-    Before accessing json entity, need to check that iterator is valid.
-    If there is no entry return appropriate error code.
-    
-    Signed-off-by: Yehuda Sadeh <yehuda@××××××.com>
-    (cherry picked from commit 23cb642243e09ca4a8e104f62a3bb7b2cbb6ea12)
-
-diff --git a/src/rgw/rgw_policy_s3.cc b/src/rgw/rgw_policy_s3.cc
-index 3843511..8af70a8 100644
---- a/src/rgw/rgw_policy_s3.cc
-+++ b/src/rgw/rgw_policy_s3.cc
-@@ -286,11 +286,13 @@ int RGWPolicy::from_json(bufferlist& bl, string& err_msg)
-       int r = add_condition(v[0], v[1], v[2], err_msg);
-       if (r < 0)
-         return r;
--    } else {
-+    } else if (!citer.end()) {
-       JSONObj *c = *citer;
-       dout(0) << "adding simple_check: " << c->get_name() << " : " << c->get_data() << dendl;
- 
-       add_simple_check(c->get_name(), c->get_data());
-+    } else {
-+      return -EINVAL;
-     }
-   }
-   return 0;

diff --git a/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch b/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch
deleted file mode 100644
index ffc16453604..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.3-build-without-openldap.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
-index c476129..cad54b8 100644
---- a/src/rgw/librgw.cc
-+++ b/src/rgw/librgw.cc
-@@ -470,7 +470,11 @@ namespace rgw {
-     const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn;
-     const string& ldap_dnattr =
-       store->ctx()->_conf->rgw_ldap_dnattr;
-+#ifdef HAVE_OPENLDAP
-     std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx());
-+#else
-+    std::string ldap_bindpw;
-+#endif /* HAVE_OPENLDAP */
- 
-     ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw.c_str(),
- 			      ldap_searchdn, ldap_dnattr);
-diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
-index e9f24f3..7291e69 100644
---- a/src/rgw/rgw_rest_s3.cc
-+++ b/src/rgw/rgw_rest_s3.cc
-@@ -3091,7 +3091,11 @@ void RGW_Auth_S3::init_impl(RGWRados* store)
-   const string& ldap_searchdn = store->ctx()->_conf->rgw_ldap_searchdn;
-   const string& ldap_dnattr =
-     store->ctx()->_conf->rgw_ldap_dnattr;
-+#ifdef HAVE_OPENLDAP
-   std::string ldap_bindpw = parse_rgw_ldap_bindpw(store->ctx());
-+#else
-+  std::string ldap_bindpw;
-+#endif /* HAVE_OPENLDAP */
- 
-   ldh = new rgw::LDAPHelper(ldap_uri, ldap_binddn, ldap_bindpw,
- 			    ldap_searchdn, ldap_dnattr);

diff --git a/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch b/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch
deleted file mode 100644
index 08a7920035a..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit e1dc386f93eb4613dc7e89cc76a031aeee5022ba
-Author: Oleh Prypin <oleh@××××.in>
-Date:   Thu Jul 21 18:33:25 2016 +0300
-
-    pybind: Make CephFS bindings and tests compatible with Python 3
-    
-    Signed-off-by: Oleh Prypin <oleh@××××.in>
-
-diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx
-index ac17ada1a1..bd14de3b16 100644
---- a/src/pybind/cephfs/cephfs.pyx
-+++ b/src/pybind/cephfs/cephfs.pyx
-@@ -613,8 +613,7 @@ cdef class LibCephFS(object):
- 
-         if not isinstance(mode, int):
-             raise TypeError('mode must be an int')
--        if isinstance(flags, basestring):
--            flags = cstr(flags, 'flags')
-+        if isinstance(flags, str_type):
-             cephfs_flags = 0
-             if flags == '':
-                 cephfs_flags = os.O_RDONLY

diff --git a/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch b/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch
deleted file mode 100644
index a81aae6e7ce..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 773e01294da518c6ec18f0a8b72e05def85fef6c
-Author: Oleh Prypin <oleh@××××.in>
-Date:   Fri Jun 24 15:48:57 2016 +0300
-
-    pybind: Make RBD Python bindings compatible with Python 3
-    
-    Signed-off-by: Oleh Prypin <oleh@××××.in>
-
-diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
-index 52727bf39e..8f25dfbee0 100644
---- a/src/pybind/rbd/rbd.pyx
-+++ b/src/pybind/rbd/rbd.pyx
-@@ -745,7 +745,7 @@ class RBD(object):
-                     break
-                 elif ret != -errno.ERANGE:
-                     raise make_ex(ret, 'error listing images')
--            return [decode_cstr(name) for name in c_names[:ret].split('\0')
-+            return [decode_cstr(name) for name in c_names[:ret].split(b'\0')
-                     if name]
-         finally:
-             free(c_names)
-@@ -1885,8 +1885,8 @@ written." % (self.name, ret, length))
-                     raise make_ex(ret, 'error listing images')
-             if ret == 0:
-                 return []
--            pools = map(decode_cstr, c_pools[:pools_size - 1].split('\0'))
--            images = map(decode_cstr, c_images[:images_size - 1].split('\0'))
-+            pools = map(decode_cstr, c_pools[:pools_size - 1].split(b'\0'))
-+            images = map(decode_cstr, c_images[:images_size - 1].split(b'\0'))
-             return list(zip(pools, images))
-         finally:
-             free(c_pools)
-@@ -1933,9 +1933,9 @@ written." % (self.name, ret, length))
-                     raise make_ex(ret, 'error listing images')
-             if ret == 0:
-                 return []
--            clients = map(decode_cstr, c_clients[:clients_size - 1].split('\0'))
--            cookies = map(decode_cstr, c_cookies[:cookies_size - 1].split('\0'))
--            addrs = map(decode_cstr, c_addrs[:addrs_size - 1].split('\0'))
-+            clients = map(decode_cstr, c_clients[:clients_size - 1].split(b'\0'))
-+            cookies = map(decode_cstr, c_cookies[:cookies_size - 1].split(b'\0'))
-+            addrs = map(decode_cstr, c_addrs[:addrs_size - 1].split(b'\0'))
-             return {
-                 'tag'       : decode_cstr(c_tag),
-                 'exclusive' : exclusive == 1,

diff --git a/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch b/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch
deleted file mode 100644
index 4e76deabe65..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.7-fix-compilation-with-zstd.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5a11f31aac4fa6a5c5ebb4fa0964e1c07a420e8c Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@g.o>
-Date: Wed, 12 Apr 2017 01:49:09 -0700
-Subject: [PATCH] configure: link against zstd if detected
-
-https://bugs.gentoo.org/show_bug.cgi?id=601610
----
- configure.ac        | 6 ++++--
- src/Makefile-env.am | 3 +++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 51daf91..8914b71 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -851,12 +851,14 @@ AS_IF([test "x$with_librocksdb_static" = "xyes"],
- AM_CONDITIONAL(WITH_SLIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" ])
- AM_CONDITIONAL(WITH_LIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" -o "x$with_librocksdb" = "xyes" ])
- 
--# rocksdb detects bzlib and lz4 in its Makefile, which forces us to do the same.
-+# rocksdb detects headers in its Makefile, which forces us to do the same.
- AS_IF([test "x$with_librocksdb_static" = "xyes"], [
-   AC_CHECK_HEADER([bzlib.h], [have_bzlib=yes])
--  AC_CHECK_HEADER([lz4.h], [have_lz4=yes])])
-+  AC_CHECK_HEADER([lz4.h], [have_lz4=yes])]
-+  AC_CHECK_HEADER([zstd.h], [have_zstd=yes])])
- AM_CONDITIONAL(HAVE_BZLIB, [test "x$have_bzlib" = "xyes"])
- AM_CONDITIONAL(HAVE_LZ4, [test "x$have_lz4" = "xyes"])
-+AM_CONDITIONAL(HAVE_ZSTD, [test "x$have_zstd" = "xyes"])
- 
- # needs libcurl and libxml2
- if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index 4771bad..0ee42f8 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -280,6 +280,9 @@ endif
- if HAVE_LZ4
- LIBKV += -llz4
- endif
-+if HAVE_ZSTD
-+LIBKV += -lzstd
-+endif
- endif # WITH_SLIBROCKSDB
- LIBKV += -lz -lleveldb -lsnappy
- LIBOS += $(LIBOS_TYPES) $(LIBKV) $(LIBFUSE_LIBS)
--- 
-2.10.2
-

diff --git a/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch b/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch
deleted file mode 100644
index 31221ae2f99..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index 4771bad02d..f92e20479b 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -53,10 +53,6 @@ endif
- ## automake environment
- 
- HARDENING_CFLAGS = \
--                   -O2 \
--                   -g \
--                   -pipe \
--                   -Wall \
-                    -Wp,-U_FORTIFY_SOURCE \
-                    -Wp,-D_FORTIFY_SOURCE=2 \
-                    -fexceptions \

diff --git a/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch b/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch
deleted file mode 100644
index a6b5515cee2..00000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-dont-run-lsb_release.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
-index 3926ac4bec..90e2eae50c 100644
---- a/src/ceph-detect-init/Makefile.am
-+++ b/src/ceph-detect-init/Makefile.am
-@@ -67,7 +67,7 @@ ceph-detect-init-clean:
- ceph-detect-init-install-data:
- 	cd $(srcdir)/ceph-detect-init ; \
- 	if test "$(DESTDIR)" ; then \
--		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+		if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
- 		else \
- 			options=--prefix=/usr ; \
-diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
-index a8532878c8..d908b1649a 100644
---- a/src/ceph-disk/Makefile.am
-+++ b/src/ceph-disk/Makefile.am
-@@ -43,7 +43,7 @@ ceph-disk-clean:
- ceph-disk-install-data:
- 	cd $(srcdir)/ceph-disk ; \
- 	if test "$(DESTDIR)" ; then \
--		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+		if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
- 		else \
- 			options=--prefix=/usr ; \
-diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am
-index 698522daa4..c49c190986 100644
---- a/src/pybind/cephfs/Makefile.am
-+++ b/src/pybind/cephfs/Makefile.am
-@@ -15,7 +15,7 @@ cephfs-pybind-clean: ${srcdir}/ceph_ver.h
- 
- cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h
- 	if test "$(DESTDIR)" ; then \
--		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+		if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
- 		else \
- 			options=--prefix=/usr ; \
-diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am
-index a4145bf0f4..960395fee8 100644
---- a/src/pybind/rados/Makefile.am
-+++ b/src/pybind/rados/Makefile.am
-@@ -15,7 +15,7 @@ rados-pybind-clean: ${srcdir}/ceph_ver.h
- 
- rados-pybind-install-exec: ${srcdir}/ceph_ver.h
- 	if test "$(DESTDIR)" ; then \
--		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+		if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
- 		else \
- 			options=--prefix=/usr ; \
-diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am
-index 7dd49333fa..fbb940d07d 100644
---- a/src/pybind/rbd/Makefile.am
-+++ b/src/pybind/rbd/Makefile.am
-@@ -15,7 +15,7 @@ rbd-pybind-clean: ${srcdir}/ceph_ver.h
- 
- rbd-pybind-install-exec: ${srcdir}/ceph_ver.h
- 	if test "$(DESTDIR)" ; then \
--		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
-+		if command -v lsb_release >/dev/null && lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
- 		else \
- 			options=--prefix=/usr ; \

diff --git a/sys-cluster/ceph/files/ceph.confd-r1 b/sys-cluster/ceph/files/ceph.confd-r1
deleted file mode 100644
index 3bdb8b485ed..00000000000
--- a/sys-cluster/ceph/files/ceph.confd-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-# Example
-
-# default ceph conf file
-#ceph_conf="/etc/ceph/ceph.conf"

diff --git a/sys-cluster/ceph/files/ceph.confd-r3 b/sys-cluster/ceph/files/ceph.confd-r3
deleted file mode 100644
index 281037c5998..00000000000
--- a/sys-cluster/ceph/files/ceph.confd-r3
+++ /dev/null
@@ -1,63 +0,0 @@
-# /etc/conf.d/ceph: startup configurations for ceph
-
-# default ceph conf file
-#ceph_conf="/etc/ceph/ceph.conf"
-
-# Set ulimits for Ceph services.
-#rc_ulimit="-n 131072 -u 257256"
-
-# the directory under /run to store runtime information in
-#rundir=/run/ceph
-
-# the user and group to run ceph as
-
-# settings for openrc supervisor for various ceph daemons
-#
-# defaults (can be overidden for each daemon)
-# stderr and stdout values get .${id}-std{out,err}.log appended to the provided value
-#
-#respawn_delay=20
-#respawn_max=5
-#respawn_period=1800
-#stdout="/dev/null"
-#stderr="/dev/null"
-
-# radosgw
-#radosgw_respawn_max
-#radosgw_respawn_delay=20
-#radosgw_respawn_period=1800
-#radosgw_stdout="/dev/null"
-#radosgw_stderr="/dev/null"
-
-# mon
-#mon_respawn_max=5
-#mon_respawn_delay=20
-#mon_respawn_period=1800
-#mon_stdout="/dev/null"
-#mon_stderr="/dev/null"
-
-# osd
-#osd_respawn_max=5
-#osd_respawn_delay=30
-#osd_respawn_period=1800
-#osd_stdout="/dev/null"
-#osd_stderr="/dev/null"
-
-# mds
-#mds_respawn_max=5
-#mds_respawn_delay=20
-#mds_respawn_period=1800
-#mds_stdout="/dev/null"
-#mds_stderr="/dev/null"
-
-# mgr
-#mgr_respawn_max=5
-#mgr_respawn_delay=20
-#mgr_respawn_period=1800
-#mgr_stdout="/dev/null"
-#mgr_stderr="/dev/null"
-
-# initd stop timeout.
-#CEPH_TERMTIMEOUT="TERM/120/KILL/5"
-#
-# vim:ft=gentoo-conf-d:ts=4:sts=4:sw=4:noet:

diff --git a/sys-cluster/ceph/files/ceph.initd-r2 b/sys-cluster/ceph/files/ceph.initd-r2
deleted file mode 100644
index 16267c58a13..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r2
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-command="/usr/bin/ceph-${daemon_type}"
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid"
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}"
-start_stop_daemon_args="--user ceph --group ceph"
-
-depend() {
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	checkpath -d -q -o ceph "$(dirname "${pidfile}")"
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-	fi
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}"
-	eend $?
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:

diff --git a/sys-cluster/ceph/files/ceph.initd-r7 b/sys-cluster/ceph/files/ceph.initd-r7
deleted file mode 100644
index 110d7bd0b63..00000000000
--- a/sys-cluster/ceph/files/ceph.initd-r7
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/var/log/ceph/ceph}
-: ${stderr:=/var/log/ceph/ceph}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
-	use dns logger
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd|mgr|radosgw) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o "${user}:${group}" "${rundir}"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-
-	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-
-	local arg_name arg_val
-	for arg_name in std{out,err} respawn_{delay,max,period}; do
-		eval arg_val="\${${daemon_type}_${arg_name}}"
-
-		if [ -z "${arg_val}" ]; then
-			eval arg_val="\${${arg_name}}"
-		else
-			eval "${arg_name}=\"${arg_val}\""
-		fi
-
-		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
-	eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: