diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /sys-cluster/glusterfs | |
parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) |
gentoo resync : 20.03.2021
Diffstat (limited to 'sys-cluster/glusterfs')
-rw-r--r-- | sys-cluster/glusterfs/Manifest | 15 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-7.7.ebuild | 211 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-7.9.ebuild | 9 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-8.3.ebuild | 9 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-8.4.ebuild (renamed from sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild) | 40 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-9.0.ebuild | 9 | ||||
-rw-r--r-- | sys-cluster/glusterfs/glusterfs-9999.ebuild | 207 | ||||
-rw-r--r-- | sys-cluster/glusterfs/metadata.xml | 6 |
8 files changed, 25 insertions, 481 deletions
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest index 7a6071a4a2e4..f632ca564e3a 100644 --- a/sys-cluster/glusterfs/Manifest +++ b/sys-cluster/glusterfs/Manifest @@ -5,15 +5,12 @@ AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d6 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 -DIST glusterfs-7.7.tar.gz 7675420 BLAKE2B cadd415053d791f5fe4fddbc45bf237275b29fb0340202eaf81bbd2e98c8e7a1b59fa276b8b47679224198675759287a2245095a751602a866d512155dfa73c8 SHA512 0a301802920e337a4931ed36133c76ef551e0c1794d324e5a0a120d289a53fb8a4a2fd8adaa7abe5a40b8b17cc2bb18d01426c9f18d91f68b1589429ddbaa125 -DIST glusterfs-7.8.tar.gz 7703665 BLAKE2B 39a2b459fc021bf17c2ea12661d8c808a688c5934de087d23550409f6c68dff5ea94156dcba52f15d78db8b600ebf9418152a6d6bf10d1ac6291d43d14f3ceda SHA512 40f7df4bb80a372b370366e8f370f9efdf838122be84d5524b2353027b4eb6005a43b808911214c56411264764164d6480418329db94ed0fe284fdcbd9bccbea DIST glusterfs-7.9.tar.gz 7702149 BLAKE2B e23b5a45a8c2c4f02f0992dfc78bea942a1dcc621082cb5c6aebf73e0cba17a7c0334700aec8c82dc7d093fbddcf9f579320561412b94ec010cf51c0210f2654 SHA512 5683bf2ff3550b8286e27b70981cb176c445e432624db79f065eb5928bc4afdf009f54f3b1d5abde1f6d2c532c9c4820860685aea0d0f709dc78fcf35bfea688 DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae04d15f99eb414bf961ea67aa7e08d01ea47c8793a33afbc0ff6cf63ecb81f78fa1ba74d66e2d4358ef2bdadacc SHA512 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9 +DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2a84917592e699d88564b24fe55689b95770f385ac5b645069f287d4af974db76a77c0f44ea5d2e88f995b427f7 SHA512 a81394b3584c2e6c27060367b443c0879512054ed9287740bc24308603b9e3c11376179ed6589d5d38441982cd6415e3612f98ae4c97ddf7d5c747b42171d796 DIST glusterfs-9.0.tar.gz 8171193 BLAKE2B f9f9905515607b4877432bde264075f73c4c076ae435a67ab803affc468f5f88d02235419fea6e25db19adecff9b797a41eb5ac63772fe81251c064389f7aca6 SHA512 daa5a7342c067c75668910e8fed17145636e7a576830b4cd68e81d9fceedaab918228b8780ebd5014e2397e0606858af650cd2c52bec0883ccd2126955ad07e7 -EBUILD glusterfs-7.7.ebuild 6021 BLAKE2B 8fa14aca6d875f249394d2e789f24d6117be84fb843571ffe0801de154f9895d498ecec94ca19853d663cc91da8739c7f76d10254c8cf87dff99a59c104f4e97 SHA512 ae62b59e2a86455bded295bc228375278c20a087e4a0d1aa87d30557e5650d66299a8aaa01c4c83c1b12cf75f1f2bb49ebb6cf39610aab8cb3b242866d14d5d9 -EBUILD glusterfs-7.8-r1.ebuild 6047 BLAKE2B d9774fd4008b3db282ec4552d617d8c5f6f4691ce5c5b6f8d10e2f49367ea8f9b231643993b64d1fdb8cdbeaa6b1eb5d5563ff09bc75611439986bf011641b1e SHA512 1f45d9004d11650333b5e8da161bd964cf63fa48423744f0a50b153bf5dd6523f0516ac107452c86cb048e5ebc7964fd7b577e63c8963dba9057935f0290093a -EBUILD glusterfs-7.9.ebuild 6057 BLAKE2B 830f2663d250a0a5d8fd416f64987903f57320159d70a66fd20047b22c6a7f5fddf129cab2cc984ad150736577071a33091bf95b01312f26dbd273c8dbc538ad SHA512 f354ef6c4325bd650a8b4d799604fc0adb3f75435912f8c3b70ac015778220a068439706b8616e5eed9b525841a7697a73be11d7913b84a72bc96db4d5d88267 -EBUILD glusterfs-8.3.ebuild 5571 BLAKE2B bee24160ef958ea64135b9bef14b86a057a76d0ad2f4d784019c850155650506451065c2848d6e783019b893312341b7c143d521e55acca3d7374e2a34574086 SHA512 0686cd96ef8dc5224cc288af1ae83c9b56815655c7a1806bcd1fef0a9f2202c1184c857c64e1e005265052793db3609abe00413edccc53afb1c73f0695675224 -EBUILD glusterfs-9.0.ebuild 5575 BLAKE2B 99f344c639b942e9313071560e745048c65a97bd0e97f39c897aa1e6630c87d020a4223d30a39d10c571cf4fb3a36c9c4c09802accea3bd83f854c6de769062b SHA512 befabf6d6aa1d0d73a87ffe59ebac6a6d3ac235104365ee3c4bbacf4e0c3125c671449973a8247241de93e0dd2fa72afd12b86988f1c55ce9a34b304423c97a5 -EBUILD glusterfs-9999.ebuild 5975 BLAKE2B fbdd9a5bc3f752562a77e6feeeb0fb675f285893923ce418f52158c3b9953348f6120f3537b8920d51a56f2b9748eacd17161e1cadbde879cdb3246e30084801 SHA512 8abe566a9400d78417a9d8cf1b1966bcf5afa2a2d1dd9e9a00a8b5325a57c6cdcfba6ef453d8a9db06c8fce4e0fa79af7e16c256a4812fb2f2dcda058317d58f -MISC metadata.xml 1472 BLAKE2B d4aa7cc4c10e383af3c4cdb201894e8bdcf85822a98920c8ab7d262bf6c028b02ca0f4a06e6717c8bb4d11d803cba7daffa917be64392dd26dca677a00312af7 SHA512 0de0bb313c559ed3623e84960dee5e3c5628f8c793e7ed376fb7f88311f6879d15dfe112e27ce4dbcba69dbec00b73a03ed78e5d4eafcaec6383ea13908b6c31 +EBUILD glusterfs-7.9.ebuild 5938 BLAKE2B 7b31e021d5702e99ef8041f3cb7345ec13f88b721adbe8aaae10432592186bbadb8327fce4f2ba6416e40c4b1c75a05f0a1de53c3f4aeb55143ebe66b2bf42a1 SHA512 d1b260eea7412f9db4d0054fa8d9b4ee265232d31b68bbb7171ba28927c8fe1348032a80386da19c851735a0c3264dfb1b32e2bf0dfb520f172e755458178e65 +EBUILD glusterfs-8.3.ebuild 5452 BLAKE2B 1746dbcbe52adca356cb848d864daae65fbac286e9a5ead200db2efe1e007f0ab8029baa8e5d3de898cdbe5c2be62f00d8f7d33e7c2d5eca78cb09f69d9db18d SHA512 b35a4949640fc579acb4254536e5242592ddcfb78ae79280b115c8b6565160f7b5bb9aafa41f97cb4d66d800e7048bd50a266bca8b0e4ab9412f7865cce396d3 +EBUILD glusterfs-8.4.ebuild 5456 BLAKE2B eeb9144d6e458da1dac3feb025b2aca0d58e3a2fae7f722999f9b784a99931bc74bd8c53e4aff27969cb9a96b321467f1ccb051686481cdc3c42cf9613bf2f9a SHA512 1d87562916c3bf7ed30e8d150b747a2832f6178b5c9a6d74e62351926c3b7f9183c94c7759e7c9a0d4f06297eb90108a613200494481354cfdae762a1cb93955 +EBUILD glusterfs-9.0.ebuild 5456 BLAKE2B eeb9144d6e458da1dac3feb025b2aca0d58e3a2fae7f722999f9b784a99931bc74bd8c53e4aff27969cb9a96b321467f1ccb051686481cdc3c42cf9613bf2f9a SHA512 1d87562916c3bf7ed30e8d150b747a2832f6178b5c9a6d74e62351926c3b7f9183c94c7759e7c9a0d4f06297eb90108a613200494481354cfdae762a1cb93955 +MISC metadata.xml 1516 BLAKE2B dc32b16a9cc12174d5cf6a82f8d45920392d43545a4ed9be1c6a0ec3bc50b7c51a647b049c1b74971e95a4de949c9205ad168bfc8f074ca4c535d2999b917d3a SHA512 04542d21102f1722d8f82e498f38e91316932d96f0a05eec74180e4ad133b83fd26d58d3591d2906995072c184822d7ed16357d741b7de99a0c7ff7571da6a08 diff --git a/sys-cluster/glusterfs/glusterfs-7.7.ebuild b/sys-cluster/glusterfs/glusterfs-7.7.ebuild deleted file mode 100644 index 77bd676415e3..000000000000 --- a/sys-cluster/glusterfs/glusterfs-7.7.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common python-single-r1 systemd - -if [[ ${PV#9999} != ${PV} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gluster/glusterfs.git" -else - SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -fi - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0" -IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} ) - ipv6? ( libtirpc )" - -# the tests must be run as root -RESTRICT="test" - -# sys-apps/util-linux is required for libuuid -RDEPEND=" - acct-group/gluster - acct-user/gluster - dev-libs/libaio - dev-libs/userspace-rcu:= - net-libs/rpcsvc-proto - sys-apps/util-linux - sys-libs/readline:= - emacs? ( >=app-editors/emacs-23.1:* ) - fuse? ( >=sys-fs/fuse-2.7.0:0 ) - georeplication? ( ${PYTHON_DEPS} ) - infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - !libressl? ( dev-libs/openssl:=[-bindist] ) - libressl? ( dev-libs/libressl:= ) -" -DEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - virtual/acl - test? ( >=dev-util/cmocka-1.0.1 - app-benchmarks/dbench - dev-vcs/git - net-fs/nfs-utils - virtual/perl-Test-Harness - dev-libs/yajl - sys-fs/xfsprogs - sys-apps/attr ) -" -BDEPEND=" - virtual/pkgconfig -" - -SITEFILE="50${PN}-mode-gentoo.el" - -DOCS=( AUTHORS ChangeLog NEWS README.md THANKS ) - -PATCHES=( - "${FILESDIR}/${PN}-7.7-flock.patch" -) - -# Maintainer notes: -# * The build system will always configure & build argp-standalone but it'll never use it -# if the argp.h header is found in the system. Which should be the case with -# glibc or if argp-standalone is installed. - -pkg_setup() { - python_setup "python3*" - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # build rpc-transport and xlators only once as shared libs - find rpc/rpc-transport xlators -name Makefile.am | - xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die - - # fix execution permissions - chmod +x libglusterfs/src/gen-defaults.py || die - - eautoreconf -} - -src_configure() { - econf \ - --disable-fusermount \ - $(use_enable debug) \ - $(use_enable fuse fuse-client) \ - $(use_enable georeplication) \ - $(use_enable infiniband ibverbs) \ - $(use_enable static-libs static) \ - $(use_enable syslog) \ - $(use_enable test cmocka) \ - $(use_enable xml xml-output) \ - $(use libtirpc || echo --without-libtirpc) \ - $(use ipv6 && echo --with-ipv6-default) \ - --with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \ - --localstatedir="${EPREFIX}"/var -} - -src_compile() { - default - use emacs && elisp-compile extras/glusterfs-mode.el -} - -src_install() { - default - - rm \ - "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \ - "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \ - "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed" - - insinto /etc/logrotate.d - newins "${FILESDIR}"/glusterfs.logrotate glusterfs - - if use rsyslog ; then - insinto /etc/rsyslog.d - newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf - fi - - if use emacs ; then - elisp-install ${PN} extras/glusterfs-mode.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim - fi - - # insert some other tools which might be useful - insinto /usr/share/glusterfs/scripts - doins \ - extras/backend-{cleanup,xattr-sanitize}.sh \ - extras/clear_xattrs.sh \ - extras/migrate-unify-to-distribute.sh - - # correct permissions on installed scripts - # fperms 0755 /usr/share/glusterfs/scripts/*.sh - chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die - - if use georeplication ; then - # move the gsync-sync-gfid tool to a binary path - # and set a symlink to be compliant with all other distros - mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die - dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid - fi - - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd - newinitd "${FILESDIR}/glusterd-r3.initd" glusterd - newconfd "${FILESDIR}/${PN}.confd" glusterfsd - - keepdir /var/log/${PN} - keepdir /var/lib/glusterd/{events,glusterfind/.keys} - - # QA - rm -r "${ED}/var/run/" || die - if ! use static-libs; then - find "${D}" -type f -name '*.la' -delete || die - fi -} - -src_test() { - ./run-tests.sh || die -} - -pkg_postinst() { - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" - elog "volumes dynamically. To do so, simply use the gluster CLI after running:" - elog " /etc/init.d/glusterd start" - echo - elog "For static configurations, the glusterfsd startup script can be multiplexed." - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" - elog "separate service. To create additional instances of the glusterfsd service" - elog "simply create a symlink to the glusterfsd startup script." - echo - elog "Example:" - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" - elog "You can now treat glusterfsd2 like any other service" - echo - ewarn "You need to use a ntp client to keep the clocks synchronized across all" - ewarn "of your servers. Setup a NTP synchronizing service before attempting to" - ewarn "run GlusterFS." - echo - elog "If you are upgrading from a previous version of ${PN}, please read:" - elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/" - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sys-cluster/glusterfs/glusterfs-7.9.ebuild b/sys-cluster/glusterfs/glusterfs-7.9.ebuild index 45b362b492e5..84f522b78c81 100644 --- a/sys-cluster/glusterfs/glusterfs-7.9.ebuild +++ b/sys-cluster/glusterfs/glusterfs-7.9.ebuild @@ -7,13 +7,8 @@ PYTHON_COMPAT=( python3_{7..9} ) inherit autotools elisp-common python-single-r1 systemd -if [[ ${PV#9999} != ${PV} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gluster/glusterfs.git" -else - SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -fi +SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" diff --git a/sys-cluster/glusterfs/glusterfs-8.3.ebuild b/sys-cluster/glusterfs/glusterfs-8.3.ebuild index 8354a144baa5..7781fd95707c 100644 --- a/sys-cluster/glusterfs/glusterfs-8.3.ebuild +++ b/sys-cluster/glusterfs/glusterfs-8.3.ebuild @@ -7,13 +7,8 @@ PYTHON_COMPAT=( python3_{7..9} ) inherit autotools elisp-common python-single-r1 systemd -if [[ ${PV#9999} != ${PV} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gluster/glusterfs.git" -else - SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -fi +SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" diff --git a/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.4.ebuild index 44c9755c9263..447c689852df 100644 --- a/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild +++ b/sys-cluster/glusterfs/glusterfs-8.4.ebuild @@ -7,22 +7,17 @@ PYTHON_COMPAT=( python3_{7..9} ) inherit autotools elisp-common python-single-r1 systemd -if [[ ${PV#9999} != ${PV} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gluster/glusterfs.git" -else - SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -fi +SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/" +HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0" -IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml" +SLOT="0/${PV%%.*}" +IUSE="debug emacs +fuse +georeplication ipv6 libressl +libtirpc rsyslog static-libs +syslog test +xml" -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} ) +REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml ) ipv6? ( libtirpc )" # the tests must be run as root @@ -40,7 +35,6 @@ RDEPEND=" emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( ${PYTHON_DEPS} ) - infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) xml? ( dev-libs/libxml2 ) !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) @@ -70,10 +64,6 @@ SITEFILE="50${PN}-mode-gentoo.el" DOCS=( AUTHORS ChangeLog NEWS README.md THANKS ) -PATCHES=( - "${FILESDIR}/${PN}-7.7-flock.patch" -) - # Maintainer notes: # * The build system will always configure & build argp-standalone but it'll never use it # if the argp.h header is found in the system. Which should be the case with @@ -88,8 +78,8 @@ src_prepare() { default # build rpc-transport and xlators only once as shared libs - find rpc/rpc-transport xlators -name Makefile.am | - xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die + find rpc/rpc-transport xlators -name Makefile.am -exec \ + sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die # fix execution permissions chmod +x libglusterfs/src/gen-defaults.py || die @@ -103,7 +93,6 @@ src_configure() { $(use_enable debug) \ $(use_enable fuse fuse-client) \ $(use_enable georeplication) \ - $(use_enable infiniband ibverbs) \ $(use_enable static-libs static) \ $(use_enable syslog) \ $(use_enable test cmocka) \ @@ -140,10 +129,8 @@ src_install() { elisp-site-file-install "${FILESDIR}/${SITEFILE}" fi - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim - fi + insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim + insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim # insert some other tools which might be useful insinto /usr/share/glusterfs/scripts @@ -156,13 +143,6 @@ src_install() { # fperms 0755 /usr/share/glusterfs/scripts/*.sh chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die - if use georeplication ; then - # move the gsync-sync-gfid tool to a binary path - # and set a symlink to be compliant with all other distros - mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die - dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid - fi - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd newinitd "${FILESDIR}/glusterd-r3.initd" glusterd newconfd "${FILESDIR}/${PN}.confd" glusterfsd diff --git a/sys-cluster/glusterfs/glusterfs-9.0.ebuild b/sys-cluster/glusterfs/glusterfs-9.0.ebuild index f8603e0e9ea4..447c689852df 100644 --- a/sys-cluster/glusterfs/glusterfs-9.0.ebuild +++ b/sys-cluster/glusterfs/glusterfs-9.0.ebuild @@ -7,13 +7,8 @@ PYTHON_COMPAT=( python3_{7..9} ) inherit autotools elisp-common python-single-r1 systemd -if [[ ${PV#9999} != ${PV} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gluster/glusterfs.git" -else - SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -fi +SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild deleted file mode 100644 index 4d96e7c5291e..000000000000 --- a/sys-cluster/glusterfs/glusterfs-9999.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common python-single-r1 systemd - -if [[ ${PV#9999} != ${PV} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gluster/glusterfs.git" -else - SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0" -IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} ) - ipv6? ( libtirpc )" - -# the tests must be run as root -RESTRICT="test" - -# sys-apps/util-linux is required for libuuid -RDEPEND=" - acct-group/gluster - acct-user/gluster - dev-libs/libaio - dev-libs/userspace-rcu:= - net-libs/rpcsvc-proto - sys-apps/util-linux - sys-libs/readline:= - emacs? ( >=app-editors/emacs-23.1:* ) - fuse? ( >=sys-fs/fuse-2.7.0:0 ) - georeplication? ( ${PYTHON_DEPS} ) - infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - !libressl? ( dev-libs/openssl:=[-bindist] ) - libressl? ( dev-libs/libressl:= ) -" -DEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - virtual/acl - test? ( >=dev-util/cmocka-1.0.1 - app-benchmarks/dbench - dev-vcs/git - net-fs/nfs-utils - virtual/perl-Test-Harness - dev-libs/yajl - sys-fs/xfsprogs - sys-apps/attr ) -" -BDEPEND=" - virtual/pkgconfig -" - -SITEFILE="50${PN}-mode-gentoo.el" - -DOCS=( AUTHORS ChangeLog NEWS README.md THANKS ) - -# Maintainer notes: -# * The build system will always configure & build argp-standalone but it'll never use it -# if the argp.h header is found in the system. Which should be the case with -# glibc or if argp-standalone is installed. - -pkg_setup() { - python_setup "python3*" - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # build rpc-transport and xlators only once as shared libs - find rpc/rpc-transport xlators -name Makefile.am | - xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die - - # fix execution permissions - chmod +x libglusterfs/src/gen-defaults.py || die - - eautoreconf -} - -src_configure() { - econf \ - --disable-fusermount \ - $(use_enable debug) \ - $(use_enable fuse fuse-client) \ - $(use_enable georeplication) \ - $(use_enable infiniband ibverbs) \ - $(use_enable static-libs static) \ - $(use_enable syslog) \ - $(use_enable test cmocka) \ - $(use_enable xml xml-output) \ - $(use libtirpc || echo --without-libtirpc) \ - $(use ipv6 && echo --with-ipv6-default) \ - --with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \ - --localstatedir="${EPREFIX}"/var -} - -src_compile() { - default - use emacs && elisp-compile extras/glusterfs-mode.el -} - -src_install() { - default - - rm \ - "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \ - "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \ - "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed" - - insinto /etc/logrotate.d - newins "${FILESDIR}"/glusterfs.logrotate glusterfs - - if use rsyslog ; then - insinto /etc/rsyslog.d - newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf - fi - - if use emacs ; then - elisp-install ${PN} extras/glusterfs-mode.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim - fi - - # insert some other tools which might be useful - insinto /usr/share/glusterfs/scripts - doins \ - extras/backend-{cleanup,xattr-sanitize}.sh \ - extras/clear_xattrs.sh \ - extras/migrate-unify-to-distribute.sh - - # correct permissions on installed scripts - # fperms 0755 /usr/share/glusterfs/scripts/*.sh - chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die - - if use georeplication ; then - # move the gsync-sync-gfid tool to a binary path - # and set a symlink to be compliant with all other distros - mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die - dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid - fi - - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd - newinitd "${FILESDIR}/glusterd-r3.initd" glusterd - newconfd "${FILESDIR}/${PN}.confd" glusterfsd - - keepdir /var/log/${PN} - keepdir /var/lib/glusterd/{events,glusterfind/.keys} - - # QA - rm -r "${ED}/var/run/" || die - if ! use static-libs; then - find "${D}" -type f -name '*.la' -delete || die - fi -} - -src_test() { - ./run-tests.sh || die -} - -pkg_postinst() { - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" - elog "volumes dynamically. To do so, simply use the gluster CLI after running:" - elog " /etc/init.d/glusterd start" - echo - elog "For static configurations, the glusterfsd startup script can be multiplexed." - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" - elog "separate service. To create additional instances of the glusterfsd service" - elog "simply create a symlink to the glusterfsd startup script." - echo - elog "Example:" - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" - elog "You can now treat glusterfsd2 like any other service" - echo - ewarn "You need to use a ntp client to keep the clocks synchronized across all" - ewarn "of your servers. Setup a NTP synchronizing service before attempting to" - ewarn "run GlusterFS." - echo - elog "If you are upgrading from a previous version of ${PN}, please read:" - elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/" - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml index 4b9042d82440..a56a24bcf1f6 100644 --- a/sys-cluster/glusterfs/metadata.xml +++ b/sys-cluster/glusterfs/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>jaco@uls.co.za</email> <name>Jaco Kroon</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>jpds@protonmail.com</email> <name>Jonathan Davies</name> </maintainer> @@ -13,7 +13,7 @@ <email>cluster@gentoo.org</email> <name>Gentoo Cluster Project</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>proxy maintainers</name> </maintainer> |