Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/, sys-cluster/ceph/
Date: Thu, 07 Sep 2017 23:40:33
Message-Id: 1504827621.7eea3cfaacc3251aaefa1fb0575927ded4036cfc.chutzpah@gentoo
1 commit: 7eea3cfaacc3251aaefa1fb0575927ded4036cfc
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 7 23:40:21 2017 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 7 23:40:21 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eea3cfa
7
8 sys-cluster/ceph: Clean out old versions
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 sys-cluster/ceph/Manifest | 3 -
13 sys-cluster/ceph/ceph-0.94.9.ebuild | 172 ---------------
14 sys-cluster/ceph/ceph-10.2.8.ebuild | 292 -------------------------
15 sys-cluster/ceph/ceph-9.2.1-r2.ebuild | 189 ----------------
16 sys-cluster/ceph/files/ceph-0.79-libzfs.patch | 13 --
17 sys-cluster/ceph/files/ceph-9.2.1-libxfs.patch | 28 ---
18 6 files changed, 697 deletions(-)
19
20 diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
21 index ba05389cad1..54c044058ee 100644
22 --- a/sys-cluster/ceph/Manifest
23 +++ b/sys-cluster/ceph/Manifest
24 @@ -1,7 +1,4 @@
25 -DIST ceph-0.94.9.tar.gz 9044702 SHA256 d5bc07e7aef75f74d75f0356e5dd2a17956cbad6bb552a1e96a0fabd80924050 SHA512 ef4bbcc4429e22a2d924fd52dc42f522d5327f67ee8c1781d7cf602c2932a485cb48db21bdc33e7c7fbc968eec59c17882ebb18e6405599e11a3abc248f1d376 WHIRLPOOL f348159e8d7dd5e1ac3810a51846f50f6cefdbc5fa4cd15c3127b1136eb960baca8ad8db33c78a5d6435720cf1e2c277e068d09f9b9dbcf0f8ad56d7ddd914dc
26 DIST ceph-10.2.3.tar.gz 11596171 SHA256 dca933aa14db67b404d836ef510bd418091978edc2f0c74dfc530ba0aa5e8994 SHA512 9de1e6851fc343d2c52c72cec3f7887d998d5b588f1251ee3a1fda14427badfa10408e6691fb03a374a10f4ec9844868423fee70fbbe2c0d962af98481412f19 WHIRLPOOL 981ebca66113a07a5cc6e5934272a72b29a2c19e03398f7b622c11df6ea0a05339558dfc2f11504403cbbd0efe0b090ad59f4b86206b46db57587744091aa26a
27 DIST ceph-10.2.7.tar.gz 14518491 SHA256 2cdfeaa9a08e94c2d35f540b450bbf64b2a694bd537679834185e98fc59d8ba2 SHA512 7e0686e9efa4ddd9d548f4145b448f8232f1ca29b08428daa5cd60a74ce26f1176a1f2ebbf2ac1761d9e6c1d364a5ffa194d2b3a18a8111f59b7c27f7a1d7734 WHIRLPOOL b6b6902230401b5f4c6f27801f315678bdc7b99aab4e50b54d941fc3a425b4f0fa9390484f2e12d6b4f962253fb8772fb706dad35d490b4542b06db166fab59b
28 -DIST ceph-10.2.8.tar.gz 14548472 SHA256 f284743b007cbb61fc9849dc2249942886116c2cb2abcd346d2304d52b16eaaa SHA512 1f3bf81bf6745033e034c3c4e4f05db5c39b2e8435da20fc130971559e8fde0d640bf00bfaafb374d24c45f873e7d768ae9d7d8cd3388347f5804c4bfc303f09 WHIRLPOOL a8bf29ff913c08d423beb0fefa792c06a653d8ac00bd698b7f77bbaf4657f0530ad5a43043dabb24308ed5a4e569fec53130a78d78d8eddf16026a942de8cc40
29 DIST ceph-10.2.9.tar.gz 14550219 SHA256 3d93f4fc4a66b1d9f9ce43f65868dc18287cea32fbb2c7421faca6aed2b52a80 SHA512 1d59146614aa87ca551b05b795a684071a3cfb4ce6013e978ba650403c6732b2aa13f3c3cc191e6a1ea34b4631c82e97700593c24e200c41ec2f2b43b3ef5547 WHIRLPOOL 42215d33c4f617087e1b0ef81cd41b42330c3605acf625b0668d44eba9e982239683b466a1cc1a6f926fc1d439dfd6be4ce220f783da7d2214d36a2a6cc9181f
30 DIST ceph-12.2.0.tar.gz 148372459 SHA256 0f601a9e28e9ce6837119b3ef0d89e1e44e0432f1f5d55567a947efefdd4d4ce SHA512 e084109c48f5666e35df5ee49262dee36ba5e7620fda30002dec538a87de11bdd21157436b5656557cd909a0943071046f3a17dd679aa1129b88b8b925f73113 WHIRLPOOL 60016eb5a20159bfc74b16c4135055cf8bf68bd868ef897b2455107a1014d4663efd55e6f5977e7d2e29010660a59d6134e3af32922d15dccbae07145c9023ea
31 -DIST ceph-9.2.1.tar.gz 9933444 SHA256 1918dfc3df80df5986c5b7ff6bc6c78064eef0f6c5e8269dba30e08c703a7c2f SHA512 1e84c1e2d64f4156a523658ed11552b045f75986922b7b7dbaf4719e73a0a6aadc71eb2b94ae363526f729534a592921a437468a41a3cea88c1b84e09de8505a WHIRLPOOL 3a0eb6712e5b0235707e86129e1d66f1184f50cd4980c30f6d8cc0e7dfd96d30b91177ed16dd7abf2ad4983c6a543eb91915f74f661f7d3e3c810b5b1d656aca
32
33 diff --git a/sys-cluster/ceph/ceph-0.94.9.ebuild b/sys-cluster/ceph/ceph-0.94.9.ebuild
34 deleted file mode 100644
35 index 1d7eef4c590..00000000000
36 --- a/sys-cluster/ceph/ceph-0.94.9.ebuild
37 +++ /dev/null
38 @@ -1,172 +0,0 @@
39 -# Copyright 1999-2017 Gentoo Foundation
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=5
43 -PYTHON_COMPAT=( python2_7 )
44 -
45 -if [[ $PV = *9999* ]]; then
46 - scm_eclass=git-r3
47 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"
48 - SRC_URI=""
49 -else
50 - [[ -n ${UPSTREAM_VER} ]] && \
51 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
52 -
53 - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz
54 - ${UPSTREAM_PATCHSET_URI}"
55 -fi
56 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
57 -
58 -inherit check-reqs autotools eutils multilib python-single-r1 udev readme.gentoo-r1 systemd ${scm_eclass}
59 -
60 -DESCRIPTION="Ceph distributed filesystem"
61 -HOMEPAGE="https://ceph.com/"
62 -
63 -LICENSE="LGPL-2.1"
64 -SLOT="0"
65 -IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc python tcmalloc xfs zfs"
66 -
67 -COMMON_DEPEND="
68 - app-arch/snappy
69 - dev-libs/boost:=[threads]
70 - dev-libs/fcgi
71 - dev-libs/libaio
72 - dev-libs/libedit
73 - dev-libs/leveldb[snappy]
74 - nss? ( dev-libs/nss )
75 - cryptopp? ( dev-libs/crypto++ )
76 - sys-apps/keyutils
77 - sys-apps/util-linux
78 - dev-libs/libxml2
79 - babeltrace? ( dev-util/babeltrace )
80 - fuse? ( sys-fs/fuse:0 )
81 - libatomic? ( dev-libs/libatomic_ops )
82 - xfs? ( sys-fs/xfsprogs )
83 - zfs? ( sys-fs/zfs )
84 - gtk? (
85 - x11-libs/gtk+:2
86 - dev-cpp/gtkmm:2.4
87 - gnome-base/librsvg
88 - )
89 - radosgw? (
90 - dev-libs/fcgi
91 - dev-libs/expat
92 - net-misc/curl
93 - )
94 - jemalloc? ( dev-libs/jemalloc )
95 - !jemalloc? ( dev-util/google-perftools )
96 - lttng? ( dev-util/lttng-ust )
97 - ${PYTHON_DEPS}
98 - "
99 -DEPEND="${COMMON_DEPEND}
100 - virtual/pkgconfig"
101 -RDEPEND="${COMMON_DEPEND}
102 - sys-apps/hdparm
103 - dev-python/flask[${PYTHON_USEDEP}]
104 - dev-python/requests[${PYTHON_USEDEP}]
105 - "
106 -REQUIRED_USE="
107 - ${PYTHON_REQUIRED_USE}
108 - ^^ ( nss cryptopp )
109 - ?? ( jemalloc tcmalloc )
110 - "
111 -
112 -STRIP_MASK="/usr/lib*/rados-classes/*"
113 -
114 -PATCHES=(
115 - "${FILESDIR}"/${PN}-0.79-libzfs.patch
116 -)
117 -CHECKREQS_DISK_BUILD="1400M"
118 -
119 -pkg_setup() {
120 - python_setup
121 -}
122 -
123 -src_prepare() {
124 - # Upstream's patchset
125 - if [[ -n ${UPSTREAM_VER} ]]; then
126 - einfo "Try to apply Ceph Upstream patch set"
127 - EPATCH_SUFFIX="patch" \
128 - EPATCH_FORCE="yes" \
129 - EPATCH_OPTS="-p1" \
130 - epatch "${WORKDIR}"/patches-upstream
131 - fi
132 -
133 - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
134 -
135 - epatch_user
136 - eautoreconf
137 -}
138 -
139 -src_configure() {
140 - local myeconfargs=(
141 - --without-hadoop
142 - --docdir="${EPREFIX}/usr/share/doc/${PF}"
143 - --includedir=/usr/include
144 - $(use_with debug)
145 - $(use_with fuse)
146 - $(use_with libaio)
147 - $(use_with libatomic libatomic-ops)
148 - $(use_with nss)
149 - $(use_with cryptopp)
150 - $(use_with radosgw)
151 - $(use_with gtk gtk2)
152 - $(use_enable static-libs static)
153 - $(use_with jemalloc)
154 - $(use_with xfs libxfs)
155 - $(use_with zfs libzfs)
156 - $(use_with lttng )
157 - $(use_with babeltrace)
158 - --without-kinetic
159 - --without-librocksdb
160 - )
161 -
162 - use jemalloc || \
163 - myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") )
164 -
165 - PYTHON="${EPYTHON}" \
166 - econf "${myeconfargs[@]}"
167 -}
168 -
169 -src_install() {
170 - default
171 -
172 - prune_libtool_files --all
173 -
174 - exeinto /usr/$(get_libdir)/ceph
175 - newexe src/init-ceph ceph_init.sh
176 -
177 - insinto /etc/logrotate.d/
178 - newins "${FILESDIR}"/ceph.logrotate ${PN}
179 -
180 - chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
181 -
182 - keepdir /var/lib/${PN}
183 - keepdir /var/lib/${PN}/tmp
184 - keepdir /var/log/${PN}/stat
185 -
186 - newinitd "${FILESDIR}/rbdmap.initd" rbdmap
187 - newinitd "${FILESDIR}/${PN}.initd-r1.1" ${PN}
188 - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
189 -
190 - systemd_dounit "${FILESDIR}/ceph.target"
191 - systemd_newunit "${FILESDIR}/ceph-mds_at.service" "ceph-mds@.service"
192 - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
193 - systemd_newunit "${FILESDIR}/ceph-osd_at.service" "ceph-osd@.service"
194 - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
195 - systemd_newunit "${FILESDIR}/ceph-mon_at.service" "ceph-mon@.service"
196 -
197 - python_fix_shebang \
198 - "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
199 - "${ED}"/usr/bin/{ceph,ceph-rest-api,ceph-brag}
200 -
201 - #install udev rules
202 - udev_dorules udev/50-rbd.rules
203 - udev_dorules udev/95-ceph-osd.rules
204 -
205 - readme.gentoo_create_doc
206 -}
207 -
208 -pkg_postinst() {
209 - readme.gentoo_print_elog
210 -}
211
212 diff --git a/sys-cluster/ceph/ceph-10.2.8.ebuild b/sys-cluster/ceph/ceph-10.2.8.ebuild
213 deleted file mode 100644
214 index 90cd7f880ef..00000000000
215 --- a/sys-cluster/ceph/ceph-10.2.8.ebuild
216 +++ /dev/null
217 @@ -1,292 +0,0 @@
218 -# Copyright 1999-2017 Gentoo Foundation
219 -# Distributed under the terms of the GNU General Public License v2
220 -
221 -EAPI=6
222 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
223 -
224 -inherit check-reqs autotools eutils python-r1 udev user \
225 - readme.gentoo-r1 systemd versionator flag-o-matic
226 -
227 -if [[ ${PV} == *9999* ]]; then
228 - inherit git-r3
229 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"
230 - SRC_URI=""
231 -else
232 - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
233 - KEYWORDS="~amd64 ~arm64 ~x86"
234 -fi
235 -
236 -DESCRIPTION="Ceph distributed filesystem"
237 -HOMEPAGE="https://ceph.com/"
238 -
239 -LICENSE="LGPL-2.1"
240 -SLOT="0"
241 -
242 -IUSE="babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio"
243 -IUSE+=" libatomic lttng +nss +radosgw static-libs +tcmalloc test xfs zfs"
244 -
245 -# unbundling code commented out pending bugs 584056 and 584058
246 -#>=dev-libs/jerasure-2.0.0-r1
247 -#>=dev-libs/gf-complete-2.0.0
248 -COMMON_DEPEND="
249 - app-arch/snappy:=
250 - sys-libs/zlib:=
251 - app-arch/lz4:=
252 - app-arch/bzip2:=
253 - app-arch/zstd:=
254 - dev-libs/boost:=[threads]
255 - dev-libs/libaio:=
256 - dev-libs/leveldb:=[snappy]
257 - nss? ( dev-libs/nss:= )
258 - libatomic? ( dev-libs/libatomic_ops:= )
259 - cryptopp? ( dev-libs/crypto++:= )
260 - sys-apps/keyutils
261 - sys-apps/util-linux
262 - dev-libs/libxml2:=
263 - radosgw? ( dev-libs/fcgi:= )
264 - ldap? ( net-nds/openldap:= )
265 - babeltrace? ( dev-util/babeltrace )
266 - fuse? ( sys-fs/fuse:0= )
267 - xfs? ( sys-fs/xfsprogs:= )
268 - zfs? ( sys-fs/zfs:= )
269 - gtk? (
270 - x11-libs/gtk+:2=
271 - dev-cpp/gtkmm:2.4
272 - gnome-base/librsvg:=
273 - )
274 - radosgw? (
275 - dev-libs/fcgi:=
276 - dev-libs/expat:=
277 - net-misc/curl:=
278 - )
279 - jemalloc? ( dev-libs/jemalloc:= )
280 - !jemalloc? ( dev-util/google-perftools )
281 - lttng? ( dev-util/lttng-ust:= )
282 - ${PYTHON_DEPS}
283 - "
284 -DEPEND="${COMMON_DEPEND}
285 - dev-python/cython[${PYTHON_USEDEP}]
286 - app-arch/cpio
287 - virtual/pkgconfig
288 - dev-python/sphinx
289 - test? (
290 - sys-fs/btrfs-progs
291 - sys-apps/grep[pcre]
292 - dev-python/tox[${PYTHON_USEDEP}]
293 - dev-python/virtualenv[${PYTHON_USEDEP}]
294 - )"
295 -RDEPEND="${COMMON_DEPEND}
296 - sys-apps/hdparm
297 - sys-block/parted
298 - sys-fs/cryptsetup
299 - sys-apps/gptfdisk
300 - dev-python/flask[${PYTHON_USEDEP}]
301 - dev-python/requests[${PYTHON_USEDEP}]
302 - "
303 -REQUIRED_USE="
304 - $(python_gen_useflags 'python2*')
305 - ${PYTHON_REQUIRED_USE}
306 - ^^ ( nss cryptopp )
307 - ?? ( jemalloc tcmalloc )
308 - "
309 -
310 -# work around bug in ceph compilation (rgw/ceph_dencoder-rgw_dencoder.o... undefined reference to `vtable for RGWZoneGroup')
311 -REQUIRED_USE+=" radosgw"
312 -
313 -#RESTRICT="test? ( userpriv )"
314 -
315 -# distribution tarball does not include everything needed for tests
316 -RESTRICT+=" test"
317 -
318 -STRIP_MASK="/usr/lib*/rados-classes/*"
319 -
320 -UNBUNDLE_LIBS=(
321 - src/erasure-code/jerasure/jerasure
322 - src/erasure-code/jerasure/gf-complete
323 -)
324 -
325 -PATCHES=(
326 - "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
327 - #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
328 - "${FILESDIR}/${PN}-10.2.1-libzfs.patch"
329 - "${FILESDIR}/${PN}-10.2.3-build-without-openldap.patch"
330 - "${FILESDIR}/${PN}-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch"
331 - "${FILESDIR}/${PN}-10.2.5-Make-CephFS-bindings-and-tests-compatible-with-Python-3.patch"
332 - "${FILESDIR}/${PN}-10.2.7-fix-compilation-with-zstd.patch"
333 -)
334 -
335 -check-reqs_export_vars() {
336 - if use debug; then
337 - CHECKREQS_DISK_BUILD="23G"
338 - CHECKREQS_DISK_USR="7G"
339 - elif use amd64; then
340 - CHECKREQS_DISK_BUILD="12G"
341 - CHECKREQS_DISK_USR="450M"
342 - else
343 - CHECKREQS_DISK_BUILD="1400M"
344 - CHECKREQS_DISK_USR="450M"
345 - fi
346 -
347 - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
348 -}
349 -
350 -user_setup() {
351 - enewgroup ceph ${CEPH_GID}
352 - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
353 -}
354 -
355 -emake_python_bindings() {
356 - local action="${1}" params binding module
357 - shift
358 - params=("${@}")
359 -
360 - __emake_python_bindings_do_impl() {
361 - ceph_run_econf "${EPYTHON}"
362 - emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
363 -
364 - # these don't work and aren't needed on python3
365 - if [[ ${EBUILD_PHASE} == install ]]; then
366 - for module in "${S}"/src/pybind/*.py; do
367 - module_basename="$(basename "${module}")"
368 - if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then
369 - continue
370 - elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then
371 - python_domodule ${module}
372 - fi
373 - done
374 - fi
375 - }
376 -
377 - pushd "${S}/src"
378 - for binding in rados rbd $(use cephfs && echo cephfs); do
379 - python_foreach_impl __emake_python_bindings_do_impl
380 - done
381 - popd
382 -
383 - unset __emake_python_bindings_do_impl
384 -}
385 -
386 -pkg_pretend() {
387 - check-reqs_export_vars
388 - check-reqs_pkg_pretend
389 -}
390 -
391 -pkg_setup() {
392 - python_setup
393 - check-reqs_export_vars
394 - check-reqs_pkg_setup
395 - user_setup
396 -}
397 -
398 -src_prepare() {
399 - default
400 -
401 - # remove tests that need root access
402 - rm src/test/cli/ceph-authtool/cap*.t
403 -
404 - #rm -rf "${UNBUNDLE_LIBS[@]}"
405 -
406 - append-flags -fPIC
407 - eautoreconf
408 -}
409 -
410 -src_configure() {
411 - ECONFARGS=(
412 - --without-hadoop
413 - --includedir=/usr/include
414 - $(use_with cephfs)
415 - $(use_with debug)
416 - $(use_with fuse)
417 - $(use_with libaio)
418 - $(use_with libatomic libatomic-ops)
419 - $(use_with nss)
420 - $(use_with cryptopp)
421 - $(use_with radosgw)
422 - $(use_with gtk gtk2)
423 - $(use_enable static-libs static)
424 - $(use_with jemalloc)
425 - $(use_with xfs libxfs)
426 - $(use_with zfs libzfs)
427 - $(use_with lttng )
428 - $(use_with babeltrace)
429 - $(use_with ldap openldap)
430 - $(use jemalloc || usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal")
431 - --with-mon
432 - --with-eventfd
433 - --with-cython
434 - --without-kinetic
435 - --without-librocksdb
436 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
437 - )
438 -
439 - # we can only use python2.7 for building at the moment
440 - ceph_run_econf "python2*"
441 -}
442 -
443 -ceph_run_econf() {
444 - [[ -z ${ECONFARGS} ]] && die "called ${FUNCNAME[0]} with ECONFARGS unset"
445 - [[ -z ${1} ]] && die "called ${FUNCNAME[0]} without passing python implementation"
446 -
447 - pushd "${S}" >/dev/null || die
448 - #
449 - # This generates a QA warning about running econf in src_compile
450 - # and src_install. Unfortunately the only other way to do this would
451 - # involve building all of for each python implementation times, which
452 - # wastes a _lot_ of CPU time and disk space. This hack will no longer
453 - # be needed with >=ceph-11.2.
454 - #
455 - python_setup "${1}"
456 - econf "${ECONFARGS[@]}"
457 -
458 - popd >/dev/null || die
459 -}
460 -
461 -src_compile() {
462 - emake
463 - emake_python_bindings all
464 -
465 - use test && emake check-local
466 -}
467 -
468 -src_test() {
469 - make check || die "make check failed"
470 -}
471 -
472 -src_install() {
473 - default
474 - emake_python_bindings install-exec "DESTDIR=\"${D}\""
475 -
476 - prune_libtool_files --all
477 -
478 - exeinto /usr/$(get_libdir)/ceph
479 - newexe src/init-ceph ceph_init.sh
480 -
481 - insinto /etc/logrotate.d/
482 - newins "${FILESDIR}"/ceph.logrotate ${PN}
483 -
484 - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
485 -
486 - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
487 -
488 - newinitd "${FILESDIR}/rbdmap.initd" rbdmap
489 - newinitd "${FILESDIR}/${PN}.initd-r5" ${PN}
490 - newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
491 -
492 - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
493 - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
494 -
495 - udev_dorules udev/*.rules
496 -
497 - readme.gentoo_create_doc
498 -
499 - python_setup 'python2*'
500 - python_fix_shebang "${ED}"/usr/{,s}bin/
501 -
502 - # python_fix_shebang apparently is not idempotent
503 - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
504 - "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
505 -}
506 -
507 -pkg_postinst() {
508 - readme.gentoo_print_elog
509 -}
510
511 diff --git a/sys-cluster/ceph/ceph-9.2.1-r2.ebuild b/sys-cluster/ceph/ceph-9.2.1-r2.ebuild
512 deleted file mode 100644
513 index 529686284af..00000000000
514 --- a/sys-cluster/ceph/ceph-9.2.1-r2.ebuild
515 +++ /dev/null
516 @@ -1,189 +0,0 @@
517 -# Copyright 1999-2017 Gentoo Foundation
518 -# Distributed under the terms of the GNU General Public License v2
519 -
520 -EAPI=5
521 -PYTHON_COMPAT=( python2_7 )
522 -
523 -if [[ $PV = *9999* ]]; then
524 - scm_eclass=git-r3
525 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"
526 - SRC_URI=""
527 -else
528 - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
529 -fi
530 -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
531 -
532 -inherit check-reqs autotools eutils multilib python-single-r1 udev user readme.gentoo systemd versionator ${scm_eclass}
533 -
534 -DESCRIPTION="Ceph distributed filesystem"
535 -HOMEPAGE="https://ceph.com/"
536 -
537 -LICENSE="LGPL-2.1"
538 -SLOT="0"
539 -IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc tcmalloc xfs zfs"
540 -
541 -COMMON_DEPEND="
542 - app-arch/snappy
543 - dev-libs/boost:=[threads]
544 - dev-libs/fcgi
545 - dev-libs/libaio
546 - dev-libs/libedit
547 - dev-libs/leveldb[snappy]
548 - nss? ( dev-libs/nss )
549 - cryptopp? ( dev-libs/crypto++ )
550 - sys-apps/keyutils
551 - sys-apps/util-linux
552 - dev-libs/libxml2
553 - babeltrace? ( dev-util/babeltrace )
554 - fuse? ( sys-fs/fuse:0 )
555 - libatomic? ( dev-libs/libatomic_ops )
556 - xfs? ( sys-fs/xfsprogs )
557 - zfs? ( sys-fs/zfs )
558 - gtk? (
559 - x11-libs/gtk+:2
560 - dev-cpp/gtkmm:2.4
561 - gnome-base/librsvg
562 - )
563 - radosgw? (
564 - dev-libs/fcgi
565 - dev-libs/expat
566 - net-misc/curl
567 - )
568 - jemalloc? ( dev-libs/jemalloc )
569 - !jemalloc? ( dev-util/google-perftools )
570 - lttng? ( dev-util/lttng-ust )
571 - ${PYTHON_DEPS}
572 - "
573 -DEPEND="${COMMON_DEPEND}
574 - virtual/pkgconfig"
575 -RDEPEND="${COMMON_DEPEND}
576 - sys-apps/hdparm
577 - dev-python/flask[${PYTHON_USEDEP}]
578 - dev-python/requests[${PYTHON_USEDEP}]
579 - "
580 -REQUIRED_USE="
581 - ${PYTHON_REQUIRED_USE}
582 - ^^ ( nss cryptopp )
583 - ?? ( jemalloc tcmalloc )
584 - "
585 -
586 -STRIP_MASK="/usr/lib*/rados-classes/*"
587 -
588 -PATCHES=(
589 - "${FILESDIR}"/${PN}-0.79-libzfs.patch
590 - "${FILESDIR}"/${P}-libxfs.patch
591 -)
592 -
593 -check-reqs_export_vars() {
594 - # check-reqs does not support use flags, and there is a lot of variability
595 - # in Ceph.
596 - # 16G /var/tmp/portage/sys-cluster/ceph-9999-r1/work/ceph-9999
597 - # 6.7G /var/tmp/portage/sys-cluster/ceph-9999-r1/image/usr
598 - # 23G /var/tmp/portage/sys-cluster/ceph-9999-r1
599 - # Size requirements tested for Hammer & Jewel releases
600 - if use debug; then
601 - export CHECKREQS_DISK_BUILD="23G"
602 - export CHECKREQS_DISK_USR="7G"
603 - else
604 - export CHECKREQS_DISK_BUILD="9G"
605 - export CHECKREQS_DISK_USR="450M"
606 - fi
607 -
608 - export CHECKREQS_MEMORY="7G"
609 -}
610 -
611 -user_setup() {
612 - enewgroup ceph
613 - enewuser ceph -1 -1 /var/lib/ceph ceph
614 -}
615 -
616 -pkg_setup() {
617 - python_setup
618 - check-reqs_export_vars
619 - check-reqs_pkg_setup
620 - user_setup
621 -}
622 -
623 -src_prepare() {
624 - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
625 -
626 - epatch_user
627 - eautoreconf
628 -}
629 -
630 -pkg_pretend() {
631 - check-reqs_export_vars
632 - check-reqs_pkg_pretend
633 -}
634 -
635 -src_configure() {
636 - local myeconfargs=(
637 - --without-hadoop
638 - --docdir="${EPREFIX}/usr/share/doc/${PF}"
639 - --includedir=/usr/include
640 - $(use_with debug)
641 - $(use_with fuse)
642 - $(use_with libaio)
643 - $(use_with libatomic libatomic-ops)
644 - $(use_with nss)
645 - $(use_with cryptopp)
646 - $(use_with radosgw)
647 - $(use_with gtk gtk2)
648 - $(use_enable static-libs static)
649 - $(use_with jemalloc)
650 - $(use_with xfs libxfs)
651 - $(use_with zfs libzfs)
652 - $(use_with lttng )
653 - $(use_with babeltrace)
654 - --without-kinetic
655 - --without-librocksdb
656 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
657 - )
658 -
659 - use jemalloc || \
660 - myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") )
661 -
662 - PYTHON="${EPYTHON}" \
663 - econf "${myeconfargs[@]}"
664 -}
665 -
666 -src_install() {
667 - default
668 -
669 - prune_libtool_files --all
670 -
671 - exeinto /usr/$(get_libdir)/ceph
672 - newexe src/init-ceph ceph_init.sh
673 -
674 - insinto /etc/logrotate.d/
675 - newins "${FILESDIR}"/ceph.logrotate ${PN}
676 -
677 - chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
678 -
679 - keepdir /var/lib/${PN}
680 - keepdir /var/lib/${PN}/tmp
681 - keepdir /var/log/${PN}/stat
682 -
683 - fowners ceph:ceph /var/lib/ceph
684 -
685 - newinitd "${FILESDIR}/rbdmap.initd" rbdmap
686 - newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
687 - newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
688 -
689 - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
690 - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
691 -
692 - python_fix_shebang \
693 - "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
694 - "${ED}"/usr/bin/{ceph,ceph-rest-api,ceph-detect-init,ceph-brag}
695 -
696 - #install udev rules
697 - udev_dorules udev/50-rbd.rules
698 - udev_dorules udev/95-ceph-osd.rules
699 -
700 - readme.gentoo_create_doc
701 -}
702 -
703 -pkg_postinst() {
704 - readme.gentoo_print_elog
705 -}
706
707 diff --git a/sys-cluster/ceph/files/ceph-0.79-libzfs.patch b/sys-cluster/ceph/files/ceph-0.79-libzfs.patch
708 deleted file mode 100644
709 index 6d79c178d43..00000000000
710 --- a/sys-cluster/ceph/files/ceph-0.79-libzfs.patch
711 +++ /dev/null
712 @@ -1,13 +0,0 @@
713 -diff --git a/src/os/Makefile.am b/src/os/Makefile.am
714 -index 252c678..c28ad0a 100644
715 ---- a/src/os/Makefile.am
716 -+++ b/src/os/Makefile.am
717 -@@ -61,7 +61,7 @@ noinst_HEADERS += \
718 -
719 - if WITH_LIBZFS
720 - libos_zfs_a_SOURCES = os/ZFS.cc
721 --libos_zfs_a_CXXFLAGS = ${AM_CXXFLAGS} ${LIBZFS_CFLAGS}
722 -+libos_zfs_a_CXXFLAGS = ${AM_CXXFLAGS} ${LIBZFS_CFLAGS} -I/usr/include/libzfs -I/usr/include/libspl
723 - noinst_LIBRARIES += libos_zfs.a
724 - noinst_HEADERS += os/ZFS.h
725 - endif
726
727 diff --git a/sys-cluster/ceph/files/ceph-9.2.1-libxfs.patch b/sys-cluster/ceph/files/ceph-9.2.1-libxfs.patch
728 deleted file mode 100644
729 index 85515be3653..00000000000
730 --- a/sys-cluster/ceph/files/ceph-9.2.1-libxfs.patch
731 +++ /dev/null
732 @@ -1,28 +0,0 @@
733 -From 602425abd5cef741fc1b5d4d1dd70c68e153fc8d Mon Sep 17 00:00:00 2001
734 -From: Ira Cooper <ira@××××××.com>
735 -Date: Thu, 31 Mar 2016 12:30:45 -0400
736 -Subject: [PATCH] configure: Add -D_LARGEFILE64_SOURCE to Linux build.
737 -
738 -Without -D_LARGEFILE64_SOURCE we can't build against libxfs,
739 -because off64_t must be defined.
740 -
741 -Signed-off-by: Ira Cooper <ira@××××××.com>
742 ----
743 - configure.ac | 1 +
744 - 1 file changed, 1 insertion(+)
745 -
746 -diff --git a/configure.ac b/configure.ac
747 -index 48a7fc2..610c40b 100644
748 ---- a/configure.ac
749 -+++ b/configure.ac
750 -@@ -63,6 +63,7 @@ darwin*)
751 - ;;
752 - linux*)
753 - linux="yes"
754 -+ CFLAGS="-D_LARGEFILE64_SOURCE ${CFLAGS}"
755 - ;;
756 - freebsd*)
757 - freebsd="yes"
758 ---
759 -2.8.4
760 -