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: 1637575524.c296d9e65d048ee0b1e9eb74cbf8b8cbdd00fd50.sam@gentoo
1 commit: c296d9e65d048ee0b1e9eb74cbf8b8cbdd00fd50
2 Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
3 AuthorDate: Fri Nov 12 08:22:02 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 22 10:05:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c296d9e6
7
8 sys-cluster/glusterfs: prune 7.9.
9
10 It was a good version. May it rest in peace.
11
12 Package-Manager: Portage-3.0.28, Repoman-3.0.3
13 Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 sys-cluster/glusterfs/Manifest | 1 -
17 sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild | 207 --------------------------
18 sys-cluster/glusterfs/metadata.xml | 2 -
19 3 files changed, 210 deletions(-)
20
21 diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
22 index 36ce8aea0069..2f0292e58f62 100644
23 --- a/sys-cluster/glusterfs/Manifest
24 +++ b/sys-cluster/glusterfs/Manifest
25 @@ -1,4 +1,3 @@
26 -DIST glusterfs-7.9.tar.gz 7702149 BLAKE2B e23b5a45a8c2c4f02f0992dfc78bea942a1dcc621082cb5c6aebf73e0cba17a7c0334700aec8c82dc7d093fbddcf9f579320561412b94ec010cf51c0210f2654 SHA512 5683bf2ff3550b8286e27b70981cb176c445e432624db79f065eb5928bc4afdf009f54f3b1d5abde1f6d2c532c9c4820860685aea0d0f709dc78fcf35bfea688
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
31 diff --git a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild
32 deleted file mode 100644
33 index 9fe0f1f7df80..000000000000
34 --- a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild
35 +++ /dev/null
36 @@ -1,207 +0,0 @@
37 -# Copyright 1999-2021 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=7
41 -
42 -PYTHON_COMPAT=( python3_{7..9} )
43 -
44 -inherit autotools elisp-common python-single-r1 tmpfiles
45 -
46 -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
47 -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
48 -
49 -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
50 -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
51 -
52 -LICENSE="|| ( GPL-2 LGPL-3+ )"
53 -SLOT="0/${PV%%.*}"
54 -IUSE="debug emacs +fuse +georeplication infiniband ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
55 -
56 -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
57 - ipv6? ( libtirpc )"
58 -
59 -# the tests must be run as root
60 -RESTRICT="test"
61 -
62 -# sys-apps/util-linux is required for libuuid
63 -RDEPEND="
64 - acct-group/gluster
65 - acct-user/gluster
66 - dev-libs/libaio
67 - dev-libs/userspace-rcu:=
68 - net-libs/rpcsvc-proto
69 - sys-apps/util-linux
70 - sys-libs/readline:=
71 - emacs? ( >=app-editors/emacs-23.1:* )
72 - fuse? ( >=sys-fs/fuse-2.7.0:0 )
73 - georeplication? ( ${PYTHON_DEPS} )
74 - infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
75 - xml? ( dev-libs/libxml2 )
76 - !elibc_glibc? ( sys-libs/argp-standalone )
77 - libtirpc? ( net-libs/libtirpc:= )
78 - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
79 - dev-libs/openssl:=[-bindist(-)]
80 -"
81 -DEPEND="
82 - ${RDEPEND}
83 - sys-devel/bison
84 - sys-devel/flex
85 - virtual/acl
86 - test? ( >=dev-util/cmocka-1.0.1
87 - app-benchmarks/dbench
88 - dev-vcs/git
89 - net-fs/nfs-utils
90 - virtual/perl-Test-Harness
91 - dev-libs/yajl
92 - sys-fs/xfsprogs
93 - sys-apps/attr )
94 -"
95 -BDEPEND="
96 - virtual/pkgconfig
97 -"
98 -
99 -SITEFILE="50${PN}-mode-gentoo.el"
100 -
101 -DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
102 -
103 -PATCHES=(
104 - "${FILESDIR}/${PN}-7.7-flock.patch"
105 -)
106 -
107 -# Maintainer notes:
108 -# * The build system will always configure & build argp-standalone but it'll never use it
109 -# if the argp.h header is found in the system. Which should be the case with
110 -# glibc or if argp-standalone is installed.
111 -
112 -pkg_setup() {
113 - python_setup "python3*"
114 - python-single-r1_pkg_setup
115 -}
116 -
117 -src_prepare() {
118 - default
119 -
120 - # build rpc-transport and xlators only once as shared libs
121 - find rpc/rpc-transport xlators -name Makefile.am -exec \
122 - sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die
123 -
124 - # fix execution permissions
125 - chmod +x libglusterfs/src/gen-defaults.py || die
126 -
127 - eautoreconf
128 -}
129 -
130 -src_configure() {
131 - econf \
132 - --disable-fusermount \
133 - $(use_enable debug) \
134 - $(use_enable fuse fuse-client) \
135 - $(use_enable georeplication) \
136 - $(use_enable infiniband ibverbs) \
137 - $(use_enable static-libs static) \
138 - $(use_enable syslog) \
139 - $(use_enable test cmocka) \
140 - $(use_enable xml xml-output) \
141 - $(use libtirpc || echo --without-libtirpc) \
142 - $(use ipv6 && echo --with-ipv6-default) \
143 - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
144 - --localstatedir="${EPREFIX}"/var
145 -}
146 -
147 -src_compile() {
148 - default
149 - use emacs && elisp-compile extras/glusterfs-mode.el
150 -}
151 -
152 -src_test() {
153 - ./run-tests.sh || die
154 -}
155 -
156 -src_install() {
157 - default
158 -
159 - rm \
160 - "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
161 - "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
162 - "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
163 -
164 - insinto /etc/logrotate.d
165 - newins "${FILESDIR}"/glusterfs.logrotate glusterfs
166 -
167 - if use rsyslog ; then
168 - insinto /etc/rsyslog.d
169 - newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
170 - fi
171 -
172 - if use emacs ; then
173 - elisp-install ${PN} extras/glusterfs-mode.el*
174 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
175 - fi
176 -
177 - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
178 - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
179 -
180 - # insert some other tools which might be useful
181 - insinto /usr/share/glusterfs/scripts
182 - doins \
183 - extras/backend-{cleanup,xattr-sanitize}.sh \
184 - extras/clear_xattrs.sh \
185 - extras/migrate-unify-to-distribute.sh
186 -
187 - # correct permissions on installed scripts
188 - # fperms 0755 /usr/share/glusterfs/scripts/*.sh
189 - chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
190 -
191 - if use georeplication ; then
192 - # move the gsync-sync-gfid tool to a binary path
193 - # and set a symlink to be compliant with all other distros
194 - mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
195 - dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
196 - fi
197 -
198 - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
199 - newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
200 - newconfd "${FILESDIR}/${PN}.confd" glusterfsd
201 -
202 - keepdir /var/log/${PN}
203 - keepdir /var/lib/glusterd/{events,glusterfind/.keys}
204 -
205 - # QA
206 - rm -r "${ED}/var/run/" || die
207 - if ! use static-libs; then
208 - find "${D}" -type f -name '*.la' -delete || die
209 - fi
210 -
211 - python_optimize "${ED}"
212 -}
213 -
214 -pkg_postinst() {
215 - tmpfiles_process gluster.conf
216 -
217 - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
218 - elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
219 - elog " /etc/init.d/glusterd start"
220 - echo
221 - elog "For static configurations, the glusterfsd startup script can be multiplexed."
222 - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
223 - elog "separate service. To create additional instances of the glusterfsd service"
224 - elog "simply create a symlink to the glusterfsd startup script."
225 - echo
226 - elog "Example:"
227 - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2"
228 - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
229 - elog "You can now treat glusterfsd2 like any other service"
230 - echo
231 - ewarn "You need to use a ntp client to keep the clocks synchronized across all"
232 - ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
233 - ewarn "run GlusterFS."
234 - echo
235 - elog "If you are upgrading from a previous version of ${PN}, please read:"
236 - elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
237 -
238 - use emacs && elisp-site-regen
239 -}
240 -
241 -pkg_postrm() {
242 - use emacs && elisp-site-regen
243 -}
244
245 diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
246 index 6ee302ff2dc3..73cd1d833a48 100644
247 --- a/sys-cluster/glusterfs/metadata.xml
248 +++ b/sys-cluster/glusterfs/metadata.xml
249 @@ -23,8 +23,6 @@
250 <use>
251 <flag name="fuse">Add FUSE mount helper</flag>
252 <flag name="georeplication">Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag>
253 - <flag name="infiniband">Add support for Infiniband ibverbs transport.
254 - Libraries can be found in science overlay</flag>
255 <flag name="ipv6">Use IPv6 by default, requires libtirpc</flag>
256 <flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
257 <flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>