gentoo auto-resync : 01:05:2023 - 17:20:35

3 files changed, 4 insertions, 201 deletions

diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index c38be5cc8f94..f7d76030866b 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -9,13 +9,11 @@ AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ce
 AUX glusterfsd-10.2.initd 3042 BLAKE2B 27b79e854164bc2e75a69936abad90f774c1372089bd3d6fc44feef6a6566be39ec6dfe76f26c479a8466b3f76995616aea59c38b092343484dabe20572df45e SHA512 101db0f73dee54703cfb7d196eb6e22f11e15a48f6a18507391caf6b129041f74740757d2cb22492229d5be962126b587c3fb69d688820120f3c0f3be9c58f44
 DIST glusterfs-10.1.tar.gz 8273640 BLAKE2B a29eb83fbc3a65e5f5a1db3694e6f46519973256a10f5e16419c832cb308a36961a4e3569fffd3f6e21e47b4b1ff78bcd2e687fce7b9710dfb25d88fca2d622f SHA512 38bec8ae33128641b17c645733589c32d554ebb771bda50a11d35019e71654f3b75ca95d24d0c0d1ec4eb460edd99983e843a7218092d422d2185a227345de42
 DIST glusterfs-10.2.tar.gz 8278598 BLAKE2B 48e70a244e34cc41a5befbe94635e945c95b87f26e5e1892b099d23a13c6fb70eefb2a66b247a564b03eeb0707ee480b50096b154b3ac5d2a13051e6371995b3 SHA512 290c701fbd3f100096ef26b589ee0714449fc620c35e62bcb5fe2fe8de5f64963b40d7d5fe1b97b274ba791fa45f4175305b6a112f184f6ce11a1e0dc9f7ea30
-DIST glusterfs-8.6.tar.gz 7826147 BLAKE2B 3a8a488c9a8e4b1daf3ed01fa5e52a62cf791349c1169aaf8609252bfb8bc0a0534f9fc23fac27cfab11ac6fb5e3e1d9588b4ec8080b02cf97e679bf2c8fb5c2 SHA512 bb1125e5d6b4d424234bc40786847f217e7a05cecad1462dd91248cf9559569914f04e1f909e829051cb1db4079ecf906440a38af9de2bbf3bcf53ca8fa1f349
 DIST glusterfs-9.4.tar.gz 8173625 BLAKE2B c35c63696717bf09f8fbf77dca16a6f45de278253e768c6ffc40c0c097da9ea1b32888233da412a5333281995e89e08d9ed23fd47aba7c506de84b08f9f80cea SHA512 2a17197bd2b425117e34af004a6177b7c5012807cd99b9c6d37a1081e0ab9def6b013bedd0ba4122d149969755e0e2985bef8aed9cf612a27a6452b8719a33bf
 DIST glusterfs-9.5.tar.gz 8174643 BLAKE2B d7527b7749b753768bde086e88e146564b461f835bb9108ce24da9626d7d87e7e4da1b2a340c6497da2d8bafe0cd43e87c01d4ba6639635ff96d8788997a8042 SHA512 3483068ba6d72a9c63cc6fcb2dbcb38dd5001564d755cc3a30dbf6402eeab9a7c80759a535be1c5c06eae88b61156a336444c89b12bbecdabf56a87f00328a44
 EBUILD glusterfs-10.1-r1.ebuild 5706 BLAKE2B 67a1f1ad462693aab2c57569f3df76a41e04a0ff95589297ec3f18a3b081f44d2850e79376c1f996603aa003702624ff651557a06642b594de6376dd3d6fdbf1 SHA512 5ae594781e722eb7bcd3c8641098f0a1256ab87811de7c93af775f88dcca26a350d8381b4c55a8bf92d7fd62f4bab3a6cd2d522f150f61f36719cf1accf72613
 EBUILD glusterfs-10.2-r1.ebuild 5721 BLAKE2B 07968fb2a4c67b832a431e9770dceec31ea3fadf87d0028be5da14423ce11b82b53cd78db3cd43417e2ac7cbde0fc632425259b615b66fe45f4a51c2e4a26c3f SHA512 3b4fcacdd64de86b60c8505e6f81adb9765c5c4ce1b0b67e40c6ef0968962decc93184670368882704b9047eac06d64a461595cc4ecc9259d5febc4d01fe2eb7
 EBUILD glusterfs-10.2-r2.ebuild 5803 BLAKE2B 826c26ee4647c8f1d74e9e29932a455b8e392b4bc3fc55cb4d43c9b910ef2dc73cd92e92c155d2460bf2f7941e6c675e8f84ab5dc5a6474242fb9f6da2df6ecf SHA512 b6b924db244155ff4483247d710d26927a10aca33bfc4b216ef8337f1847a9e3d456a486fa47544e46142dc46160a38375cf8fe323cdc07eff627046777caa1e
-EBUILD glusterfs-8.6-r1.ebuild 5596 BLAKE2B 576c5127454a94ad9053d9c135078623220950f5adfde4882afaff1d8a278f5d2edfd2ee96903d5bd5c536f342664f9aa9c3cf121eccd6e9d50bd1ec9355cca5 SHA512 ed6defe5a98688b1e3288e29c2c8e578383b8899b693277bf84bf6f2525576d3d956d598c5cec44cfe1c076bd4d184bee1f47ee04adc90bc7705c24a22b7e193
 EBUILD glusterfs-9.4-r1.ebuild 5622 BLAKE2B 099a1195b46d751fe86331a2eb1ef030fa241544e557a8bd185918b2d8d246dfbc84ac25239984671b98a13eef21eebfe75329a3526f16cd23d2f8c2041f48a2 SHA512 c517af5ea225f0d19ca263d72f37829f6d38785f618d949d1a3dc91500f3fe0c2ffb021dff176d128be989d4cbebb5c347829c665a03198f14d5fb7f4af3a3d7
 EBUILD glusterfs-9.5-r1.ebuild 5625 BLAKE2B a391dd02914a53962d049595a956134191546377921f6753e2016f6fb7b99135bbe831dd7b379a8c35ddc56960b1c0155ccf49104d815c12a309ab0f157d7933 SHA512 97c75a78296d9b758b76ac2a86cf2b283fe84532f20a4a75c930b8fbe3b24d486a5d023de95e9a8b0fe204e332d2a6b7bb0cee8a109337ed0041ad303949d915
-MISC metadata.xml 1493 BLAKE2B f604a35253606968126f1619cbc004f7e78b47b5f57f747cbdf67da6a0e126305c5b6773d2ad8ee2d4d323f87fb51d7f39ae01fc78b1ffd9133ba88e4db81df2 SHA512 d57d6e5e0086bd0fdcd3409fa303208427f2acaed7ba4c9b5904618f04df3fd89269334b0c751983f6c4389d0b46b2a72cd10ac0047a96b2289c09f19c0f9eae
+MISC metadata.xml 1575 BLAKE2B 8d83c4db883ecd85230029532fdd5cea2e51391c2659a5280d4eeb453390b8413c58aca550f365049de36914da4d0d977356ba30c29afe0ca8e58ff41d34d321 SHA512 07bd2f41605ab4f1bde167d8b3d620492c5d85ef77ea49ae53970ab579afcd70e1aae9a40e8856d88034045c7201fcccdb079efc0af0ac76f32fde3417d7ad76
diff --git a/sys-cluster/glusterfs/glusterfs-8.6-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.6-r1.ebuild
deleted file mode 100644
index aa052ba39ca1..000000000000
--- a/sys-cluster/glusterfs/glusterfs-8.6-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit autotools elisp-common python-single-r1 tmpfiles systemd
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
-SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-
-IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog selinux static-libs +syslog test +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
-	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} )
-	selinux? ( sec-policy/selinux-glusterfs )
-	xml? ( dev-libs/libxml2 )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	dev-libs/openssl:=[-bindist(-)]
-"
-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 -exec \
-		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 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}"/usr/lib/tmpfiles.d \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-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
-
-	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
-	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
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r4.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	systemd_dounit extras/systemd/{glusterd,glustereventsd,glusterfssharedstorage,gluster-ta-volume}.service
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-
-	python_optimize "${ED}"
-}
-
-pkg_postinst() {
-	tmpfiles_process gluster.conf
-
-	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 ec48e5f0ac96..a7e4c474e8aa 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -28,4 +28,7 @@
 		<flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
 		<flag name="uring">Control whether or not glusterfs is compiled with uring support or not.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">gluster/glusterfs</remote-id>
+	</upstream>
 </pkgmetadata>