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/
Date: Tue, 31 Jul 2018 23:54:10
Message-Id: 1533080788.b2d3beb806dcf032858577738a099e79d3c76cbb.chutzpah@gentoo
1 commit: b2d3beb806dcf032858577738a099e79d3c76cbb
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 31 23:46:28 2018 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 31 23:46:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d3beb8
7
8 sys-cluster/ceph: Remove old version 13.2.0
9
10 Package-Manager: Portage-2.3.44, Repoman-2.3.10
11
12 sys-cluster/ceph/Manifest | 2 -
13 sys-cluster/ceph/ceph-13.2.0.ebuild | 353 ------------------------------------
14 2 files changed, 355 deletions(-)
15
16 diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
17 index 437a4828096..ab120b5cbe2 100644
18 --- a/sys-cluster/ceph/Manifest
19 +++ b/sys-cluster/ceph/Manifest
20 @@ -7,7 +7,5 @@ DIST ceph-12.2.2.tar.gz 148763718 BLAKE2B 5c9a56bc536b723ca3a6a0aa68c7f456032c89
21 DIST ceph-12.2.4.tar.gz 78694838 BLAKE2B 862c275eb5e42065b2f42d417f8efd2ee8ee67c19575eb19bc799d5923d0720fa4810e1c51915fee6f96a44d433059ca6b180861013b735287751ad24235e611 SHA512 ce9ec49e8693d11345adb3a219763cc76b626db2c26d8d9ba08ff0a4d6fdeb08739da29bb87ff0946fed8e6fd55c8db0672cb286f7ebb90cf2e11a47042ba5d6
22 DIST ceph-12.2.5.tar.gz 78758920 BLAKE2B 0e4a515ff80fdd39e8f1afd737434c7dc2a218f0a89b53ec31bc3a5478bfd876c6f2bf3c2947a8c2f056d9b94ffa34d18ceac06b00008605e84485ec631c7a32 SHA512 bd78358590eb077afcc3c1e12864fadee906c95ac8afee25bdca6155f99b75f89d923159fcc13430abba21a89fee3e566177ff5f9ffabdd3b3f220d05602ab86
23 DIST ceph-12.2.7.tar.gz 78783279 BLAKE2B 9058a5e408b3431cf0e8c28b44f95f6eb12f029697348eb6879efa9db4ad6a3b52b1040f484919a3f1781ac3a4aa72af3b8905760480fd3f3724dbceeab4eb07 SHA512 dde75a41c31cca54d4a680b0b93e28680a23f912a348cccca65e55e600c315bbfe3ced008d758fe8ba1e801a9d6e5f8079cc157ec5eef8916b86f487f42064ea
24 -DIST ceph-13.2.0-frontend-node-modules.tar.xz 44082360 BLAKE2B 0f1bcf1c5154bdc352c9314853099b314b76c76cf1c3ee2447803ea5d79d02bbc91a0f8aefa6df96b47fc2d89e531354ac485752d2dbb762498d3eaba273635a SHA512 ad3c38b055ba886215aea07c4afb202cc3bfb64cdebc816eb4f124f76f2401e04e5645859b2a780828bf8eddcc0093b36d4d9935b703ac2bbc4212e913abeb8c
25 -DIST ceph-13.2.0.tar.gz 89077825 BLAKE2B 07ee531a672e436df8f218ecb4a2425d33911771dcf9c63fa9fc36a868c93a101029d8a8c69fcea026882ac466e6032da76be0dc961ceb03845b955fb5762add SHA512 2524ad5a868024463e1a1edc5bd9c3f7bc1f58e47bf8d331902ed53206120abc6a427dd9c1d657131e67efd955d6ed8052b6c3fed8658aa905d58ac58ee62973
26 DIST ceph-13.2.1-frontend-node-modules.tar.xz 44352460 BLAKE2B 0a0099e60f0b36d48928dcda3f69dbb00e14a9a9e10c688ecbeb3daa3adbe339655652a43924043fe140ce1754525be2abed61f1ad5f24779fa4ff890d2b7cf6 SHA512 3938e8cadb6385cdaf023fe55ab5f202e44ed80173b128e3b76fc4849556cea90ce5d8884a928b93776b0509b5aef814f1078ba5e44a9d644b43a871aea06dd9
27 DIST ceph-13.2.1.tar.gz 90786830 BLAKE2B e0884a039ff0e8a1705d8f31f4dcf4cd8ab8989d7c2fa703417038ff9a6cf7b0fbca09abceb901970fbb2dd9a1dc87c2500fec38a2bfca86a9a6dcaab15be991 SHA512 411218ea6037bdf9425a741720ea89876e893e64fbfa518c9584ba581f805fde2c82b13ed47313279665e5d20f36223fc8d5c27055b580c72b22c2004e4da81b
28
29 diff --git a/sys-cluster/ceph/ceph-13.2.0.ebuild b/sys-cluster/ceph/ceph-13.2.0.ebuild
30 deleted file mode 100644
31 index 113df40b6e0..00000000000
32 --- a/sys-cluster/ceph/ceph-13.2.0.ebuild
33 +++ /dev/null
34 @@ -1,353 +0,0 @@
35 -# Copyright 1999-2018 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
40 -DISTUTILS_OPTIONAL=1
41 -
42 -inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
43 - python-r1 udev user readme.gentoo-r1 toolchain-funcs systemd
44 -
45 -if [[ ${PV} == *9999* ]]; then
46 - inherit git-r3
47 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"
48 - SRC_URI=""
49 -else
50 - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz
51 - mgr-frontend? ( mirror://gentoo/${P}-frontend-node-modules.tar.xz )"
52 - # unkeyworded for testing that this actually works
53 - # had to do a lot of hackery for the mgr frontend, dunno if anything broke
54 - KEYWORDS="~amd64 ~x86"
55 -fi
56 -
57 -DESCRIPTION="Ceph distributed filesystem"
58 -HOMEPAGE="https://ceph.com/"
59 -
60 -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
61 -SLOT="0"
62 -
63 -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
64 -
65 -IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr mgr-frontend"
66 -IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test"
67 -IUSE+=" xfs zfs"
68 -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
69 -
70 -# unbundling code commented out pending bugs 584056 and 584058
71 -#>=dev-libs/jerasure-2.0.0-r1
72 -#>=dev-libs/gf-complete-2.0.0
73 -COMMON_DEPEND="
74 - virtual/libudev:=
75 - app-arch/bzip2:=[static-libs?]
76 - app-arch/lz4:=[static-libs?]
77 - app-arch/snappy:=[static-libs?]
78 - app-arch/zstd:=[static-libs?]
79 - app-misc/jq:=[static-libs?]
80 - dev-libs/crypto++:=[static-libs?]
81 - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
82 - dev-libs/libaio:=[static-libs?]
83 - dev-libs/libxml2:=[static-libs?]
84 - dev-libs/nss:=
85 - sys-auth/oath-toolkit:=
86 - sys-apps/keyutils:=[static-libs?]
87 - sys-apps/util-linux:=[static-libs?]
88 - sys-libs/zlib:=[static-libs?]
89 - babeltrace? ( dev-util/babeltrace )
90 - ldap? ( net-nds/openldap:=[static-libs?] )
91 - lttng? ( dev-util/lttng-ust:= )
92 - fuse? ( sys-fs/fuse:0=[static-libs?] )
93 - ssl? ( dev-libs/openssl:=[static-libs?] )
94 - xfs? ( sys-fs/xfsprogs:=[static-libs?] )
95 - zfs? ( sys-fs/zfs:=[static-libs?] )
96 - mgr? (
97 - <net-libs/nodejs-9.0
98 - >net-libs/nodejs-8.10
99 - )
100 - mgr-frontend? ( net-libs/nodejs[npm] )
101 - radosgw? (
102 - dev-libs/expat:=[static-libs?]
103 - dev-libs/openssl:=[static-libs?]
104 - net-misc/curl:=[curl_ssl_openssl,static-libs?]
105 - )
106 - system-boost? (
107 - >=dev-libs/boost-1.66:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
108 - )
109 - jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
110 - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
111 - ${PYTHON_DEPS}
112 - "
113 -DEPEND="${COMMON_DEPEND}
114 - amd64? ( dev-lang/yasm )
115 - x86? ( dev-lang/yasm )
116 - app-arch/cpio
117 - dev-python/cython[${PYTHON_USEDEP}]
118 - dev-python/sphinx
119 - dev-util/cunit
120 - dev-util/gperf
121 - dev-util/valgrind
122 - sys-apps/which
123 - sys-devel/bc
124 - virtual/pkgconfig
125 - test? (
126 - dev-python/coverage[${PYTHON_USEDEP}]
127 - dev-python/tox[${PYTHON_USEDEP}]
128 - dev-python/virtualenv[${PYTHON_USEDEP}]
129 - sys-apps/grep[pcre]
130 - sys-fs/btrfs-progs
131 - )"
132 -RDEPEND="${COMMON_DEPEND}
133 - net-misc/socat
134 - sys-apps/gptfdisk
135 - sys-block/parted
136 - sys-fs/cryptsetup
137 - sys-fs/lvm2
138 - !<sys-apps/openrc-0.26.3
139 - dev-python/bcrypt[${PYTHON_USEDEP}]
140 - dev-python/cherrypy[${PYTHON_USEDEP}]
141 - dev-python/flask[${PYTHON_USEDEP}]
142 - dev-python/jinja[${PYTHON_USEDEP}]
143 - dev-python/pecan[${PYTHON_USEDEP}]
144 - dev-python/prettytable[${PYTHON_USEDEP}]
145 - dev-python/pyopenssl[${PYTHON_USEDEP}]
146 - dev-python/requests[${PYTHON_USEDEP}]
147 - dev-python/werkzeug[${PYTHON_USEDEP}]
148 - "
149 -REQUIRED_USE="
150 - ${PYTHON_REQUIRED_USE}
151 - || ( $(python_gen_useflags 'python3*') )
152 - mgr-frontend? ( mgr || ( $(python_gen_useflags 'python2*') ) )
153 - ?? ( jemalloc tcmalloc )
154 - "
155 -
156 -# currently does not configure without the mgr
157 -REQUIRED_USE+=" mgr"
158 -
159 -RESTRICT="test? ( userpriv )"
160 -
161 -# distribution tarball does not include everything needed for tests
162 -RESTRICT+=" test"
163 -
164 -# false positives unless all USE flags are on
165 -CMAKE_WARN_UNUSED_CLI="no"
166 -
167 -STRIP_MASK="/usr/lib*/rados-classes/*"
168 -
169 -UNBUNDLE_LIBS=(
170 - src/erasure-code/jerasure/jerasure
171 - src/erasure-code/jerasure/gf-complete
172 -)
173 -
174 -PATCHES=(
175 - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
176 - "${FILESDIR}/ceph-12.2.0-cflags.patch"
177 - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
178 - "${FILESDIR}/ceph-13.2.0-cflags.patch"
179 - "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
180 - "${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
181 - "${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch"
182 -)
183 -
184 -check-reqs_export_vars() {
185 - if use amd64; then
186 - CHECKREQS_DISK_BUILD="12G"
187 - CHECKREQS_DISK_USR="460M"
188 - else
189 - CHECKREQS_DISK_BUILD="1400M"
190 - CHECKREQS_DISK_USR="450M"
191 - fi
192 -
193 - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
194 -}
195 -
196 -user_setup() {
197 - enewgroup ceph ${CEPH_GID}
198 - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
199 -}
200 -
201 -pkg_pretend() {
202 - check-reqs_export_vars
203 - check-reqs_pkg_pretend
204 -}
205 -
206 -pkg_setup() {
207 - python_setup 'python3*'
208 - check-reqs_export_vars
209 - check-reqs_pkg_setup
210 - user_setup
211 -}
212 -
213 -src_prepare() {
214 - cmake-utils_src_prepare
215 -
216 - if use system-boost; then
217 - eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch"
218 - fi
219 -
220 - # prevent useless javascript from being installed to the system
221 - use mgr-frontend || rm -rf src/pybind/mgr/dashboard/frontend
222 -
223 - # remove tests that need root access
224 - rm src/test/cli/ceph-authtool/cap*.t || die
225 -
226 - #rm -rf "${UNBUNDLE_LIBS[@]}"
227 -}
228 -
229 -ceph_src_configure() {
230 - local flag
231 - local mycmakeargs=(
232 - -DWITH_BABELTRACE=$(usex babeltrace)
233 - -DWITH_CEPHFS=$(usex cephfs)
234 - -DWITH_DPDK=$(usex dpdk)
235 - -DWITH_FUSE=$(usex fuse)
236 - -DWITH_LTTNG=$(usex lttng)
237 - -DWITH_MGR=$(usex mgr)
238 - -DWITH_MGR_DASHBOARD_FRONTEND=$(usex mgr-frontend)
239 - -DWITH_OPENLDAP=$(usex ldap)
240 - -DWITH_RADOSGW=$(usex radosgw)
241 - -DWITH_SSL=$(usex ssl)
242 - -DWITH_SYSTEMD=$(usex systemd)
243 - -DWITH_TESTS=$(usex test)
244 - -DWITH_XFS=$(usex xfs)
245 - -DWITH_ZFS=$(usex zfs)
246 - -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
247 - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '')
248 - -DWITH_SYSTEM_BOOST=$(usex system-boost)
249 - -DBOOST_J=$(makeopts_jobs)
250 - -DWITH_RDMA=no
251 - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
252 - -DEPYTHON_VERSION="${EPYTHON#python}"
253 - )
254 - if use amd64 || use x86; then
255 - for flag in ${CPU_FLAGS_X86[@]}; do
256 - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
257 - done
258 - fi
259 -
260 - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
261 - cmake-utils_src_configure
262 -
263 - # bug #630232
264 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
265 - "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
266 - || die "sed failed"
267 -}
268 -
269 -src_configure() {
270 - ceph_src_configure
271 -}
272 -
273 -python_compile() {
274 - local CMAKE_USE_DIR="${S}"
275 -
276 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
277 - emake VERBOSE=1 all
278 -
279 - # python modules are only compiled with "make install" so we need to do this to
280 - # prevent doing a bunch of compilation in src_install
281 - DESTDIR="${T}" emake VERBOSE=1 install
282 - popd >/dev/null || die
283 -}
284 -
285 -src_compile() {
286 - if use mgr-frontend; then
287 - # npm likes trying to create /etc/npm
288 - addpredict /etc/npm
289 -
290 - # subshell to avoid polluting the environment
291 - (
292 - python_setup 'python2*'
293 -
294 - export CC="$(tc-getCC)" CXX="$(tc-getCXX)"
295 -
296 - set -e
297 -
298 - pushd src/pybind/mgr/dashboard/frontend >/dev/null
299 -
300 - npm install --offline --no-save --verbose --parseable \
301 - --no-rollback --no-progress --fetch-retries=0 \
302 - --nodedir="/usr/include/node" \
303 - --cache="${WORKDIR}/${P}-npm-cache" \
304 - --registry="http://npmjs.invalid" \
305 - --sass-binary-site="http://sass.invalid"
306 -
307 - # this tends to get installed to the system if it's still here
308 - rm -rf node_modules/node-sass/build
309 -
310 - popd >/dev/null
311 -
312 - ) || die "failed to build node modules for mgr-frontend"
313 - fi
314 -
315 - cmake-utils_src_make all
316 -
317 - # we have to do this here to prevent from building everything multiple times
318 - BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
319 - python_foreach_impl python_compile
320 -}
321 -
322 -src_test() {
323 - make check || die "make check failed"
324 -}
325 -
326 -python_install() {
327 - local CMAKE_USE_DIR="${S}"
328 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
329 - DESTDIR="${ED}" emake install
330 - popd >/dev/null || die
331 -}
332 -
333 -src_install() {
334 - cmake-utils_src_install
335 - python_foreach_impl python_install
336 -
337 - prune_libtool_files --all
338 -
339 - exeinto /usr/$(get_libdir)/ceph
340 - newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
341 -
342 - insinto /etc/logrotate.d/
343 - newins "${FILESDIR}"/ceph.logrotate ${PN}
344 -
345 - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
346 -
347 - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
348 -
349 - newinitd "${FILESDIR}/rbdmap.initd" rbdmap
350 - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
351 - newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
352 -
353 - insinto /etc/sysctl.d
354 - newins "${FILESDIR}"/sysctld 90-${PN}.conf
355 -
356 - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
357 -
358 - # units aren't installed by the build system unless systemd is enabled
359 - # so no point installing these with the USE flag disabled
360 - if use systemd; then
361 - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
362 - "ceph-mds@.service"
363 -
364 - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
365 - "ceph-osd@.service"
366 - fi
367 -
368 - udev_dorules udev/*.rules
369 -
370 - readme.gentoo_create_doc
371 -
372 - python_setup 'python3*'
373 -
374 - # bug #630232
375 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
376 - || die "sed failed"
377 -
378 - python_fix_shebang "${ED}"/usr/{,s}bin/
379 -
380 - # python_fix_shebang apparently is not idempotent
381 - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
382 - "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
383 -}
384 -
385 -pkg_postinst() {
386 - readme.gentoo_print_elog
387 -}