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