Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/
Date: Mon, 22 Nov 2021 10:11:21
Message-Id: 1637575526.fb18b610c51ef016b129e8a52944bd704b93f594.sam@gentoo
1 commit: fb18b610c51ef016b129e8a52944bd704b93f594
2 Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
3 AuthorDate: Fri Nov 12 08:28:43 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 22 10:05:26 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb18b610
7
8 sys-cluster/glusterfs: Prune 8.X, X<5.
9
10 8.5 is current stable, stable request for 8.6 has been made, will leave
11 both versions for now.
12
13 Package-Manager: Portage-3.0.28, Repoman-3.0.3
14 Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 sys-cluster/glusterfs/Manifest | 2 -
18 sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild | 194 --------------------------
19 sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild | 194 --------------------------
20 3 files changed, 390 deletions(-)
21
22 diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
23 index d34ae42e54a3..28d35cc90275 100644
24 --- a/sys-cluster/glusterfs/Manifest
25 +++ b/sys-cluster/glusterfs/Manifest
26 @@ -1,5 +1,3 @@
27 -DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae04d15f99eb414bf961ea67aa7e08d01ea47c8793a33afbc0ff6cf63ecb81f78fa1ba74d66e2d4358ef2bdadacc SHA512 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9
28 -DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2a84917592e699d88564b24fe55689b95770f385ac5b645069f287d4af974db76a77c0f44ea5d2e88f995b427f7 SHA512 a81394b3584c2e6c27060367b443c0879512054ed9287740bc24308603b9e3c11376179ed6589d5d38441982cd6415e3612f98ae4c97ddf7d5c747b42171d796
29 DIST glusterfs-8.5.tar.gz 7873397 BLAKE2B 6ababf15fda216c9a47c05859f7123847d711dd5a12e3ec2c5dcf8475f35830c9a32f7b21ad763ab1be59b06f1d93f83acc0cbb8f7635456a3638be73b162aa4 SHA512 e256141a76deb9a255be31422d76b0c81aad4a7e5b166d2be90a79d340ceb811cbff11f469166ef7582f40f58f47fb056aa05aafd4b35f094bf9c21a5c08f3bb
30 DIST glusterfs-8.6.tar.gz 7826147 BLAKE2B 3a8a488c9a8e4b1daf3ed01fa5e52a62cf791349c1169aaf8609252bfb8bc0a0534f9fc23fac27cfab11ac6fb5e3e1d9588b4ec8080b02cf97e679bf2c8fb5c2 SHA512 bb1125e5d6b4d424234bc40786847f217e7a05cecad1462dd91248cf9559569914f04e1f909e829051cb1db4079ecf906440a38af9de2bbf3bcf53ca8fa1f349
31 DIST glusterfs-9.4.tar.gz 8173625 BLAKE2B c35c63696717bf09f8fbf77dca16a6f45de278253e768c6ffc40c0c097da9ea1b32888233da412a5333281995e89e08d9ed23fd47aba7c506de84b08f9f80cea SHA512 2a17197bd2b425117e34af004a6177b7c5012807cd99b9c6d37a1081e0ab9def6b013bedd0ba4122d149969755e0e2985bef8aed9cf612a27a6452b8719a33bf
32
33 diff --git a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild
34 deleted file mode 100644
35 index e951ef2e84cd..000000000000
36 --- a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild
37 +++ /dev/null
38 @@ -1,194 +0,0 @@
39 -# Copyright 1999-2021 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=7
43 -
44 -PYTHON_COMPAT=( python3_{7..9} )
45 -
46 -inherit autotools elisp-common python-single-r1 tmpfiles
47 -
48 -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
49 -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
50 -
51 -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
52 -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
53 -
54 -LICENSE="|| ( GPL-2 LGPL-3+ )"
55 -SLOT="0/${PV%%.*}"
56 -IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
57 -
58 -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
59 - ipv6? ( libtirpc )"
60 -
61 -# the tests must be run as root
62 -RESTRICT="test"
63 -
64 -# sys-apps/util-linux is required for libuuid
65 -RDEPEND="
66 - acct-group/gluster
67 - acct-user/gluster
68 - dev-libs/libaio
69 - dev-libs/userspace-rcu:=
70 - net-libs/rpcsvc-proto
71 - sys-apps/util-linux
72 - sys-libs/readline:=
73 - emacs? ( >=app-editors/emacs-23.1:* )
74 - fuse? ( >=sys-fs/fuse-2.7.0:0 )
75 - georeplication? ( ${PYTHON_DEPS} )
76 - xml? ( dev-libs/libxml2 )
77 - !elibc_glibc? ( sys-libs/argp-standalone )
78 - libtirpc? ( net-libs/libtirpc:= )
79 - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
80 - dev-libs/openssl:=[-bindist(-)]
81 -"
82 -DEPEND="
83 - ${RDEPEND}
84 - sys-devel/bison
85 - sys-devel/flex
86 - virtual/acl
87 - test? ( >=dev-util/cmocka-1.0.1
88 - app-benchmarks/dbench
89 - dev-vcs/git
90 - net-fs/nfs-utils
91 - virtual/perl-Test-Harness
92 - dev-libs/yajl
93 - sys-fs/xfsprogs
94 - sys-apps/attr )
95 -"
96 -BDEPEND="
97 - virtual/pkgconfig
98 -"
99 -
100 -SITEFILE="50${PN}-mode-gentoo.el"
101 -
102 -DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
103 -
104 -# Maintainer notes:
105 -# * The build system will always configure & build argp-standalone but it'll never use it
106 -# if the argp.h header is found in the system. Which should be the case with
107 -# glibc or if argp-standalone is installed.
108 -
109 -pkg_setup() {
110 - python_setup "python3*"
111 - python-single-r1_pkg_setup
112 -}
113 -
114 -src_prepare() {
115 - default
116 -
117 - # build rpc-transport and xlators only once as shared libs
118 - find rpc/rpc-transport xlators -name Makefile.am -exec \
119 - sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
120 -
121 - # fix execution permissions
122 - chmod +x libglusterfs/src/gen-defaults.py || die
123 -
124 - eautoreconf
125 -}
126 -
127 -src_configure() {
128 - econf \
129 - --disable-fusermount \
130 - $(use_enable debug) \
131 - $(use_enable fuse fuse-client) \
132 - $(use_enable georeplication) \
133 - $(use_enable static-libs static) \
134 - $(use_enable syslog) \
135 - $(use_enable test cmocka) \
136 - $(use_enable xml xml-output) \
137 - $(use libtirpc || echo --without-libtirpc) \
138 - $(use ipv6 && echo --with-ipv6-default) \
139 - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
140 - --localstatedir="${EPREFIX}"/var
141 -}
142 -
143 -src_compile() {
144 - default
145 - use emacs && elisp-compile extras/glusterfs-mode.el
146 -}
147 -
148 -src_test() {
149 - ./run-tests.sh || die
150 -}
151 -
152 -src_install() {
153 - default
154 -
155 - rm \
156 - "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
157 - "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
158 - "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
159 -
160 - insinto /etc/logrotate.d
161 - newins "${FILESDIR}"/glusterfs.logrotate glusterfs
162 -
163 - if use rsyslog ; then
164 - insinto /etc/rsyslog.d
165 - newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
166 - fi
167 -
168 - if use emacs ; then
169 - elisp-install ${PN} extras/glusterfs-mode.el*
170 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
171 - fi
172 -
173 - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
174 - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
175 -
176 - # insert some other tools which might be useful
177 - insinto /usr/share/glusterfs/scripts
178 - doins \
179 - extras/backend-{cleanup,xattr-sanitize}.sh \
180 - extras/clear_xattrs.sh \
181 - extras/migrate-unify-to-distribute.sh
182 -
183 - # correct permissions on installed scripts
184 - # fperms 0755 /usr/share/glusterfs/scripts/*.sh
185 - chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
186 -
187 - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
188 - newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
189 - newconfd "${FILESDIR}/${PN}.confd" glusterfsd
190 -
191 - keepdir /var/log/${PN}
192 - keepdir /var/lib/glusterd/{events,glusterfind/.keys}
193 -
194 - # QA
195 - rm -r "${ED}/var/run/" || die
196 - if ! use static-libs; then
197 - find "${D}" -type f -name '*.la' -delete || die
198 - fi
199 -
200 - python_optimize "${ED}"
201 -}
202 -
203 -pkg_postinst() {
204 - tmpfiles_process gluster.conf
205 -
206 - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
207 - elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
208 - elog " /etc/init.d/glusterd start"
209 - echo
210 - elog "For static configurations, the glusterfsd startup script can be multiplexed."
211 - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
212 - elog "separate service. To create additional instances of the glusterfsd service"
213 - elog "simply create a symlink to the glusterfsd startup script."
214 - echo
215 - elog "Example:"
216 - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2"
217 - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
218 - elog "You can now treat glusterfsd2 like any other service"
219 - echo
220 - ewarn "You need to use a ntp client to keep the clocks synchronized across all"
221 - ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
222 - ewarn "run GlusterFS."
223 - echo
224 - elog "If you are upgrading from a previous version of ${PN}, please read:"
225 - elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
226 -
227 - use emacs && elisp-site-regen
228 -}
229 -
230 -pkg_postrm() {
231 - use emacs && elisp-site-regen
232 -}
233
234 diff --git a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild
235 deleted file mode 100644
236 index e951ef2e84cd..000000000000
237 --- a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild
238 +++ /dev/null
239 @@ -1,194 +0,0 @@
240 -# Copyright 1999-2021 Gentoo Authors
241 -# Distributed under the terms of the GNU General Public License v2
242 -
243 -EAPI=7
244 -
245 -PYTHON_COMPAT=( python3_{7..9} )
246 -
247 -inherit autotools elisp-common python-single-r1 tmpfiles
248 -
249 -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
250 -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
251 -
252 -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
253 -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
254 -
255 -LICENSE="|| ( GPL-2 LGPL-3+ )"
256 -SLOT="0/${PV%%.*}"
257 -IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
258 -
259 -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
260 - ipv6? ( libtirpc )"
261 -
262 -# the tests must be run as root
263 -RESTRICT="test"
264 -
265 -# sys-apps/util-linux is required for libuuid
266 -RDEPEND="
267 - acct-group/gluster
268 - acct-user/gluster
269 - dev-libs/libaio
270 - dev-libs/userspace-rcu:=
271 - net-libs/rpcsvc-proto
272 - sys-apps/util-linux
273 - sys-libs/readline:=
274 - emacs? ( >=app-editors/emacs-23.1:* )
275 - fuse? ( >=sys-fs/fuse-2.7.0:0 )
276 - georeplication? ( ${PYTHON_DEPS} )
277 - xml? ( dev-libs/libxml2 )
278 - !elibc_glibc? ( sys-libs/argp-standalone )
279 - libtirpc? ( net-libs/libtirpc:= )
280 - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
281 - dev-libs/openssl:=[-bindist(-)]
282 -"
283 -DEPEND="
284 - ${RDEPEND}
285 - sys-devel/bison
286 - sys-devel/flex
287 - virtual/acl
288 - test? ( >=dev-util/cmocka-1.0.1
289 - app-benchmarks/dbench
290 - dev-vcs/git
291 - net-fs/nfs-utils
292 - virtual/perl-Test-Harness
293 - dev-libs/yajl
294 - sys-fs/xfsprogs
295 - sys-apps/attr )
296 -"
297 -BDEPEND="
298 - virtual/pkgconfig
299 -"
300 -
301 -SITEFILE="50${PN}-mode-gentoo.el"
302 -
303 -DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
304 -
305 -# Maintainer notes:
306 -# * The build system will always configure & build argp-standalone but it'll never use it
307 -# if the argp.h header is found in the system. Which should be the case with
308 -# glibc or if argp-standalone is installed.
309 -
310 -pkg_setup() {
311 - python_setup "python3*"
312 - python-single-r1_pkg_setup
313 -}
314 -
315 -src_prepare() {
316 - default
317 -
318 - # build rpc-transport and xlators only once as shared libs
319 - find rpc/rpc-transport xlators -name Makefile.am -exec \
320 - sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
321 -
322 - # fix execution permissions
323 - chmod +x libglusterfs/src/gen-defaults.py || die
324 -
325 - eautoreconf
326 -}
327 -
328 -src_configure() {
329 - econf \
330 - --disable-fusermount \
331 - $(use_enable debug) \
332 - $(use_enable fuse fuse-client) \
333 - $(use_enable georeplication) \
334 - $(use_enable static-libs static) \
335 - $(use_enable syslog) \
336 - $(use_enable test cmocka) \
337 - $(use_enable xml xml-output) \
338 - $(use libtirpc || echo --without-libtirpc) \
339 - $(use ipv6 && echo --with-ipv6-default) \
340 - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
341 - --localstatedir="${EPREFIX}"/var
342 -}
343 -
344 -src_compile() {
345 - default
346 - use emacs && elisp-compile extras/glusterfs-mode.el
347 -}
348 -
349 -src_test() {
350 - ./run-tests.sh || die
351 -}
352 -
353 -src_install() {
354 - default
355 -
356 - rm \
357 - "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
358 - "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
359 - "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
360 -
361 - insinto /etc/logrotate.d
362 - newins "${FILESDIR}"/glusterfs.logrotate glusterfs
363 -
364 - if use rsyslog ; then
365 - insinto /etc/rsyslog.d
366 - newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
367 - fi
368 -
369 - if use emacs ; then
370 - elisp-install ${PN} extras/glusterfs-mode.el*
371 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
372 - fi
373 -
374 - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
375 - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
376 -
377 - # insert some other tools which might be useful
378 - insinto /usr/share/glusterfs/scripts
379 - doins \
380 - extras/backend-{cleanup,xattr-sanitize}.sh \
381 - extras/clear_xattrs.sh \
382 - extras/migrate-unify-to-distribute.sh
383 -
384 - # correct permissions on installed scripts
385 - # fperms 0755 /usr/share/glusterfs/scripts/*.sh
386 - chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
387 -
388 - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
389 - newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
390 - newconfd "${FILESDIR}/${PN}.confd" glusterfsd
391 -
392 - keepdir /var/log/${PN}
393 - keepdir /var/lib/glusterd/{events,glusterfind/.keys}
394 -
395 - # QA
396 - rm -r "${ED}/var/run/" || die
397 - if ! use static-libs; then
398 - find "${D}" -type f -name '*.la' -delete || die
399 - fi
400 -
401 - python_optimize "${ED}"
402 -}
403 -
404 -pkg_postinst() {
405 - tmpfiles_process gluster.conf
406 -
407 - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
408 - elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
409 - elog " /etc/init.d/glusterd start"
410 - echo
411 - elog "For static configurations, the glusterfsd startup script can be multiplexed."
412 - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
413 - elog "separate service. To create additional instances of the glusterfsd service"
414 - elog "simply create a symlink to the glusterfsd startup script."
415 - echo
416 - elog "Example:"
417 - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2"
418 - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
419 - elog "You can now treat glusterfsd2 like any other service"
420 - echo
421 - ewarn "You need to use a ntp client to keep the clocks synchronized across all"
422 - ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
423 - ewarn "run GlusterFS."
424 - echo
425 - elog "If you are upgrading from a previous version of ${PN}, please read:"
426 - elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
427 -
428 - use emacs && elisp-site-regen
429 -}
430 -
431 -pkg_postrm() {
432 - use emacs && elisp-site-regen
433 -}