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:11
Message-Id: 1533081168.7b6e16d95b77dd23ae98b534138f62a503d27d6e.chutzpah@gentoo
1 commit: 7b6e16d95b77dd23ae98b534138f62a503d27d6e
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 31 23:52:48 2018 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 31 23:52:48 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6e16d9
7
8 sys-cluster/ceph: Remove old version 12.2.2-r1
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.2-r1.ebuild | 288 ---------------------------------
14 2 files changed, 289 deletions(-)
15
16 diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
17 index 3a1aa8f1597..3b1c8343aea 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.2.tar.gz 148763718 BLAKE2B 5c9a56bc536b723ca3a6a0aa68c7f456032c892716167dfa213cda4964e3a45e970efe6dd67e5c43ef6f6018bd9367e0c890de270acccf3217b848b58cb98488 SHA512 89b166dc4b58e0110ebe0147eef9f47e1090ccee01702b3f72cfbdca856d02bf03b2663de9e88c84b21a2a61f8f92211e217a05b8bdcf7d5de3158adbe49db88
24 DIST ceph-12.2.4.tar.gz 78694838 BLAKE2B 862c275eb5e42065b2f42d417f8efd2ee8ee67c19575eb19bc799d5923d0720fa4810e1c51915fee6f96a44d433059ca6b180861013b735287751ad24235e611 SHA512 ce9ec49e8693d11345adb3a219763cc76b626db2c26d8d9ba08ff0a4d6fdeb08739da29bb87ff0946fed8e6fd55c8db0672cb286f7ebb90cf2e11a47042ba5d6
25 DIST ceph-12.2.5.tar.gz 78758920 BLAKE2B 0e4a515ff80fdd39e8f1afd737434c7dc2a218f0a89b53ec31bc3a5478bfd876c6f2bf3c2947a8c2f056d9b94ffa34d18ceac06b00008605e84485ec631c7a32 SHA512 bd78358590eb077afcc3c1e12864fadee906c95ac8afee25bdca6155f99b75f89d923159fcc13430abba21a89fee3e566177ff5f9ffabdd3b3f220d05602ab86
26 DIST ceph-12.2.7.tar.gz 78783279 BLAKE2B 9058a5e408b3431cf0e8c28b44f95f6eb12f029697348eb6879efa9db4ad6a3b52b1040f484919a3f1781ac3a4aa72af3b8905760480fd3f3724dbceeab4eb07 SHA512 dde75a41c31cca54d4a680b0b93e28680a23f912a348cccca65e55e600c315bbfe3ced008d758fe8ba1e801a9d6e5f8079cc157ec5eef8916b86f487f42064ea
27
28 diff --git a/sys-cluster/ceph/ceph-12.2.2-r1.ebuild b/sys-cluster/ceph/ceph-12.2.2-r1.ebuild
29 deleted file mode 100644
30 index f90261d5bc3..00000000000
31 --- a/sys-cluster/ceph/ceph-12.2.2-r1.ebuild
32 +++ /dev/null
33 @@ -1,288 +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 python-r1 udev user systemd \
42 - readme.gentoo-r1 flag-o-matic
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 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/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
76 - dev-libs/crypto++:=[static-libs?]
77 - dev-libs/leveldb:=[snappy,static-libs?]
78 - dev-libs/libaio:=[static-libs?]
79 - dev-libs/libxml2:=[static-libs?]
80 - sys-apps/keyutils:=[static-libs?]
81 - sys-apps/util-linux:=[static-libs?]
82 - sys-libs/zlib:=[static-libs?]
83 - babeltrace? ( dev-util/babeltrace )
84 - ldap? ( net-nds/openldap:=[static-libs?] )
85 - lttng? ( dev-util/lttng-ust:= )
86 - nss? ( dev-libs/nss:= )
87 - fuse? ( sys-fs/fuse:0=[static-libs?] )
88 - ssl? ( dev-libs/openssl:=[static-libs?] )
89 - xfs? ( sys-fs/xfsprogs:=[static-libs?] )
90 - zfs? ( sys-fs/zfs:=[static-libs?] )
91 - radosgw? (
92 - dev-libs/expat:=[static-libs?]
93 - dev-libs/openssl:=[static-libs?]
94 - net-misc/curl:=[static-libs?]
95 - )
96 - jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
97 - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
98 - ${PYTHON_DEPS}
99 - "
100 -DEPEND="${COMMON_DEPEND}
101 - app-arch/cpio
102 - dev-lang/yasm
103 - dev-python/cython[${PYTHON_USEDEP}]
104 - dev-python/sphinx
105 - dev-util/gperf
106 - dev-util/valgrind
107 - sys-apps/which
108 - sys-devel/bc
109 - virtual/pkgconfig
110 - test? (
111 - dev-python/tox[${PYTHON_USEDEP}]
112 - dev-python/virtualenv[${PYTHON_USEDEP}]
113 - sys-apps/grep[pcre]
114 - sys-fs/btrfs-progs
115 - )"
116 -RDEPEND="${COMMON_DEPEND}
117 - net-misc/socat
118 - sys-apps/gptfdisk
119 - sys-block/parted
120 - sys-fs/cryptsetup
121 - !<sys-apps/openrc-0.26.3
122 - dev-python/cherrypy[${PYTHON_USEDEP}]
123 - dev-python/flask[${PYTHON_USEDEP}]
124 - dev-python/pecan[${PYTHON_USEDEP}]
125 - dev-python/prettytable[${PYTHON_USEDEP}]
126 - dev-python/pyopenssl[${PYTHON_USEDEP}]
127 - dev-python/requests[${PYTHON_USEDEP}]
128 - dev-python/werkzeug[${PYTHON_USEDEP}]
129 - "
130 -REQUIRED_USE="
131 - $(python_gen_useflags 'python2*')
132 - ${PYTHON_REQUIRED_USE}
133 - ?? ( ssl nss )
134 - ?? ( jemalloc tcmalloc )
135 - "
136 -
137 -RESTRICT="test? ( userpriv )"
138 -
139 -# distribution tarball does not include everything needed for tests
140 -RESTRICT+=" test"
141 -
142 -STRIP_MASK="/usr/lib*/rados-classes/*"
143 -
144 -UNBUNDLE_LIBS=(
145 - src/erasure-code/jerasure/jerasure
146 - src/erasure-code/jerasure/gf-complete
147 -)
148 -
149 -PATCHES=(
150 - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
151 - "${FILESDIR}/ceph-12.2.0-cflags.patch"
152 - "${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
153 - "${FILESDIR}/ceph-12.2.2-build-without-radosgw.patch"
154 -)
155 -
156 -check-reqs_export_vars() {
157 - if use amd64; then
158 - CHECKREQS_DISK_BUILD="12G"
159 - CHECKREQS_DISK_USR="460M"
160 - else
161 - CHECKREQS_DISK_BUILD="1400M"
162 - CHECKREQS_DISK_USR="450M"
163 - fi
164 -
165 - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
166 -}
167 -
168 -user_setup() {
169 - enewgroup ceph ${CEPH_GID}
170 - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
171 -}
172 -
173 -pkg_pretend() {
174 - check-reqs_export_vars
175 - check-reqs_pkg_pretend
176 -}
177 -
178 -pkg_setup() {
179 - python_setup 'python2*'
180 - check-reqs_export_vars
181 - check-reqs_pkg_setup
182 - user_setup
183 -}
184 -
185 -src_prepare() {
186 - default
187 -
188 - # remove tests that need root access
189 - rm src/test/cli/ceph-authtool/cap*.t
190 -
191 - #rm -rf "${UNBUNDLE_LIBS[@]}"
192 -}
193 -
194 -ceph_src_configure() {
195 - local flag
196 - local mycmakeargs=(
197 - -DWITH_BABELTRACE=$(usex babeltrace)
198 - -DWITH_CEPHFS=$(usex cephfs)
199 - -DWITH_FUSE=$(usex fuse)
200 - -DWITH_LTTNG=$(usex lttng)
201 - -DWITH_MGR=$(usex mgr)
202 - -DWITH_NSS=$(usex nss)
203 - -DWITH_OPENLDAP=$(usex ldap)
204 - -DWITH_RADOSGW=$(usex radosgw)
205 - -DWITH_SSL=$(usex ssl)
206 - -DWITH_SYSTEMD=$(usex systemd)
207 - -DWITH_TESTS=$(usex test)
208 - -DWITH_XFS=$(usex xfs)
209 - -DWITH_ZFS=$(usex zfs)
210 - -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
211 - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '')
212 - -DWITH_SYSTEM_BOOST=yes
213 - -DWITH_RDMA=no
214 - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
215 - )
216 - if use amd64 || use x86; then
217 - for flag in ${CPU_FLAGS_X86[@]}; do
218 - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
219 - done
220 - fi
221 -
222 - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
223 - cmake-utils_src_configure
224 -
225 - # bug #630232
226 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
227 - "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
228 - || die "sed failed"
229 -}
230 -
231 -src_configure() {
232 - ceph_src_configure
233 -}
234 -
235 -python_compile() {
236 - local CMAKE_USE_DIR="${S}"
237 -
238 - ceph_src_configure
239 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
240 - emake VERBOSE=1 all
241 -
242 - # python modules are only compiled with "make install" so we need to do this to
243 - # prevent doing a bunch of compilation in src_install
244 - DESTDIR="${T}" emake VERBOSE=1 install
245 - popd >/dev/null || die
246 -}
247 -
248 -src_compile() {
249 - cmake-utils_src_make all
250 -
251 - # we have to do this here to prevent from building everything multiple times
252 - BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
253 - python_foreach_impl python_compile
254 -}
255 -
256 -src_test() {
257 - make check || die "make check failed"
258 -}
259 -
260 -python_install() {
261 - local CMAKE_USE_DIR="${S}"
262 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
263 - DESTDIR="${D}" emake install
264 - popd >/dev/null || die
265 -}
266 -
267 -src_install() {
268 - cmake-utils_src_install
269 - python_foreach_impl python_install
270 -
271 - prune_libtool_files --all
272 -
273 - exeinto /usr/$(get_libdir)/ceph
274 - newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
275 -
276 - insinto /etc/logrotate.d/
277 - newins "${FILESDIR}"/ceph.logrotate ${PN}
278 -
279 - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
280 -
281 - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
282 -
283 - newinitd "${FILESDIR}/rbdmap.initd" rbdmap
284 - newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
285 - newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
286 -
287 - insinto /etc/sysctl.d
288 - newins "${FILESDIR}"/sysctld 90-${PN}.conf
289 -
290 - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
291 -
292 - # units aren't installed by the build system unless systemd is enabled
293 - # so no point installing these with the USE flag disabled
294 - if use systemd; then
295 - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
296 - "ceph-mds@.service"
297 -
298 - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
299 - "ceph-osd@.service"
300 - fi
301 -
302 - udev_dorules udev/*.rules
303 -
304 - readme.gentoo_create_doc
305 -
306 - python_setup 'python2*'
307 -
308 - # bug #630232
309 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
310 - || die "sed failed"
311 -
312 - python_fix_shebang "${ED}"/usr/{,s}bin/
313 -
314 - # python_fix_shebang apparently is not idempotent
315 - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
316 - "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
317 -}
318 -
319 -pkg_postinst() {
320 - readme.gentoo_print_elog
321 -}