Adding metadata

22 files changed, 232 insertions, 291 deletions

diff --git a/sys-cluster/ampi/Manifest b/sys-cluster/ampi/Manifest
index 067c0843907d..23990084a22f 100644
--- a/sys-cluster/ampi/Manifest
+++ b/sys-cluster/ampi/Manifest
@@ -1 +1,2 @@
 DIST ampi-0_pre20140616.tar.gz 1127315 BLAKE2B e003f44f74449b40f5cb2c98ca4d0eebd39aa82363c519e86b58cdd11056153d8cf9b196819cb654fcfb9eaa12ef9ca8a819a1c06a1a1f34d599541b5ac6aece SHA512 b6a8790c1686a32546194fa6c3818aa9d2ba08911621d5251e85a4114dad75e350f18560cf0527811c487f804265bc09a4b80faeab5eafbd670e4dfa103fe078
+DIST ampi-0_pre20170209.tar.gz 396561 BLAKE2B 782cd0bc9a56aa6fb571bba3f345cea2e15e567e1a5c962f125b03a57cfd59f3bbe7564a88c84f233a8fb444fd6a06cf368528cd6f9e3953e31d064194ce5966 SHA512 ac25e100e38d90ead9e9a76c16aef0e29a181a1ff684f120298de74c3abde44cf74e6a48b6b49e78fed4f30c3fdfdc04baea02b3137908311eeb3acc596a7717
diff --git a/sys-cluster/ampi/ampi-0_pre20140616-r1.ebuild b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
index 35ae5af1d5b6..41f35f9e9bad 100644
--- a/sys-cluster/ampi/ampi-0_pre20140616-r1.ebuild
+++ b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,20 +11,12 @@ SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
-RDEPEND="virtual/mpi
-	!sys-cluster/nullmpi"
+RDEPEND="virtual/mpi"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/"${P}"-missing-include.patch )
-
 src_prepare() {
 	default
 	eautoreconf
 }
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-cluster/ampi/ampi-0_pre20170209.ebuild b/sys-cluster/ampi/ampi-0_pre20170209.ebuild
new file mode 100644
index 000000000000..d56f675016e2
--- /dev/null
+++ b/sys-cluster/ampi/ampi-0_pre20170209.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="MPI library for algorithmic differentiation"
+HOMEPAGE="
+	https://www.mcs.anl.gov/~utke/AdjoinableMPI/AdjoinableMPIDox/index.html
+	https://github.com/bremond/adjoinablempi
+"
+SRC_URI="https://gitlab.com/liguros/distfiles/-/raw/main/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+
+RDEPEND="virtual/mpi"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/adjoinablempi-master
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-cluster/ampi/files/ampi-0_pre20140616-missing-include.patch b/sys-cluster/ampi/files/ampi-0_pre20140616-missing-include.patch
deleted file mode 100644
index 0e9452877728..000000000000
--- a/sys-cluster/ampi/files/ampi-0_pre20140616-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ADtoolStubs/OO/support.c	2024-04-04 13:10:23.506762461 +0000
-+++ b/ADtoolStubs/OO/support.c	2024-04-04 13:11:34.033298264 +0000
-@@ -8,6 +8,7 @@
- */
- #include <stdlib.h>
- #include <assert.h>
-+#include <stdio.h>
- #include "ampi/adTool/support.h"
- 
- MPI_Comm ADTOOL_AMPI_COMM_WORLD_SHADOW;
diff --git a/sys-cluster/ampi/metadata.xml b/sys-cluster/ampi/metadata.xml
index b201c2cfeade..c9baa1855424 100644
--- a/sys-cluster/ampi/metadata.xml
+++ b/sys-cluster/ampi/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
+  <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 9a051522d07b..8ae0d60b0262 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,2 +1,2 @@
-DIST glusterfs-11.1.tar.gz 8365581 BLAKE2B 56697bc484be53659f6f277041c6f4fc5f2ef3221709d90dbd621e66138fe2b3be2e31bde4c65d596fed3beacb2ee6a86506e97854cda00066ac804ee57923e9 SHA512 a021a612b01c2c43858b092db926e6d229f0f736c19b8a1015c0d3121fbc7739ab5273384d5e96fde6dbf4eaf620bc32a0530597e80483865d8ca79b820ed3b0
+DIST glusterfs-11.1.tar.gz 3935478 BLAKE2B daca25647d290fb1e68f628e674aaf47014453f12403350cc98fde84d477544e08cd5c7d9fbab0fd735affe48766430e03caf76f66c76d6c418e3242110effff SHA512 1502652bed6076d07372d3a4345c95d257ed988b77d7524d1610339828539a321d920eaa5b41e1290e82f069d61246a56b45164fb7a72cf813a265f3d5159e51
 DIST glusterfs-11.2.tar.gz 3937297 BLAKE2B 2735b32910e931cc36e325d685b43ba085804c34c0208335350085a0a6f92c947aa8a2e44fd561bf336f9df7dcd22fc169b02b99a9a9876f38170c0911fa3fa7 SHA512 6ac463047c5b1fee1d00ca9d6c16169762ed31c7d3b8dfb341bb8a90b83c15fdd9d48ebbe6cf79eee885f764cfa5391f4107837764c0a182eff1b51bede63d48
diff --git a/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el b/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el
index 0b39ee3e1b54..c14b0d8de33b 100644
--- a/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el
+++ b/sys-cluster/glusterfs/files/50glusterfs-mode-gentoo.el
@@ -1,2 +1,5 @@
+
+;;; puppet-mode site-lisp configuration
+
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'glusterfs-mode "glusterfs-mode" "Major mode for editing glusterfs manifests")
diff --git a/sys-cluster/glusterfs/files/glusterd-10.2-r2.initd b/sys-cluster/glusterfs/files/glusterd-r3.initd
index e7e53f3ed9c4..27682d06216d 100644
--- a/sys-cluster/glusterfs/files/glusterd-10.2-r2.initd
+++ b/sys-cluster/glusterfs/files/glusterd-r3.initd
@@ -1,10 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Gluster elastic volume management daemon"
 command="/usr/sbin/glusterd"
-pidfile="/run/${SVCNAME}.pid"
+pidfile="/var/run/${SVCNAME}.pid"
 command_args="-N"
 
 command_background="yes"
@@ -16,14 +16,14 @@ depend() {
 
 start_pre() {
 	# Ensure that the GlusterFS auxiliary mount parent directory exists
-	checkpath --directory --owner gluster:gluster --mode 0775 /run/gluster
+	checkpath --directory --owner gluster:gluster --mode 0775 /var/run/gluster
 }
 
 start_post() {
 	local c=0
 	ebegin "Waiting for glusterd to start up"
-	while ! /usr/sbin/gluster volume list >/dev/null 2>&1 && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
-		c=$(( c+1 ))
+	while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
+		(( ++c ))
 	done
 	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
 	eend $?
diff --git a/sys-cluster/glusterfs/files/glusterfs-11.0-extras-defer-invoking-of-gluster-volume-set-help-as-.patch b/sys-cluster/glusterfs/files/glusterfs-11.0-extras-defer-invoking-of-gluster-volume-set-help-as-.patch
deleted file mode 100644
index f3eacb3a823d..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-11.0-extras-defer-invoking-of-gluster-volume-set-help-as-.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 26126dd1467fc40af372b9f2ba6ab167e5b9f309 Mon Sep 17 00:00:00 2001
-From: Jaco Kroon <jaco@uls.co.za>
-Date: Mon, 28 Aug 2023 09:54:47 +0200
-Subject: [PATCH] extras: defer invoking of gluster volume set help as late as
- we can.
-
----
- extras/command-completion/gluster.bash | 44 +++++++++++++++++++-------
- 1 file changed, 32 insertions(+), 12 deletions(-)
-
-diff --git a/extras/command-completion/gluster.bash b/extras/command-completion/gluster.bash
-index 70f8e19558..a096b62890 100644
---- a/extras/command-completion/gluster.bash
-+++ b/extras/command-completion/gluster.bash
-@@ -1,15 +1,5 @@
- #!/bin/bash
- 
--if pidof glusterd > /dev/null 2>&1; then
--        GLUSTER_SET_OPTIONS="
--        $(for token in `gluster volume set help 2>/dev/null | grep "^Option:" | cut -d ' ' -f 2`
--        do
--                echo "{$token},"
--        done)
--        "
--        GLUSTER_RESET_OPTIONS="$GLUSTER_SET_OPTIONS"
--fi
--
- GLUSTER_TOP_SUBOPTIONS1="
-         {nfs},
-         {brick},
-@@ -161,12 +151,14 @@ GLUSTER_VOLUME_OPTIONS="
-                 },
-                 {reset
-                         {__VOLNAME
--                                [ $GLUSTER_RESET_OPTIONS ]
-+                                {__VOLOPTIONS
-+                                },
-                         }
-                 },
-                 {set
-                         {__VOLNAME
--                                [ $GLUSTER_SET_OPTIONS ]
-+                                {__VOLOPTIONS
-+                                },
-                         }
-                 },
-                 {start
-@@ -280,6 +272,34 @@ __VOLNAME ()
-         return 0
- }
- 
-+__VOLOPTIONS()
-+{
-+        local zero=0
-+        local ret=0
-+        local cur_word="$2"
-+        local list=""
-+
-+        if [ "X$1" == "X" ]; then
-+                return
-+
-+        elif [ "$1" == "match" ]; then
-+                return 0
-+
-+        elif [ "$1" == "complete" ]; then
-+                if ! pidof glusterd > /dev/null 2>&1; then
-+                        list='';
-+                else
-+                        list=`gluster volume set help 2>/dev/null | grep "^Option:" | cut -d ' ' -f 2`
-+                fi
-+        else
-+                return 0
-+        fi
-+
-+        func_return=`echo $(compgen -W "$list" -- $cur_word)`
-+
-+        return 0
-+}
-+
- _gluster_throw () {
- #echo $1 >&2
-         COMPREPLY=''
--- 
-2.41.0
-
diff --git a/sys-cluster/glusterfs/files/glusterfs-11.2-sys-types.h-for-off64_t.patch b/sys-cluster/glusterfs/files/glusterfs-11.2-sys-types.h-for-off64_t.patch
deleted file mode 100644
index 521c363265a8..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-11.2-sys-types.h-for-off64_t.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cba66efc2b062baa953bd91229eee4b2aa2294d1 Mon Sep 17 00:00:00 2001
-From: Jaco Kroon <jaco@uls.co.za>
-Date: Fri, 22 Sep 2023 10:47:28 +0200
-Subject: [PATCH] Include sys/types.h for off64_t. (#4215)
-
-Reference: https://bugs.gentoo.org/908588
-
-As per off64_t(3) we need to include sys/types.h.
----
- libglusterfs/src/glusterfs/syscall.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libglusterfs/src/glusterfs/syscall.h b/libglusterfs/src/glusterfs/syscall.h
-index 4f1bfdc83c..f6c904df38 100644
---- a/libglusterfs/src/glusterfs/syscall.h
-+++ b/libglusterfs/src/glusterfs/syscall.h
-@@ -17,6 +17,7 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/socket.h>
-+#include <sys/types.h>
- #include <stdio.h>
- 
- /* GF follows the Linux XATTR definition, which differs in Darwin. */
--- 
-2.51.2
-
diff --git a/sys-cluster/glusterfs/files/glusterfsd-10.2.initd b/sys-cluster/glusterfs/files/glusterfs-r1.initd
index c8b6562e02a2..c2845855cf9c 100644
--- a/sys-cluster/glusterfs/files/glusterfsd-10.2.initd
+++ b/sys-cluster/glusterfs/files/glusterfs-r1.initd
@@ -1,8 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-if [ "${SVCNAME}" != "glusterfs" ]
+if [[ "${SVCNAME}" != "glusterfs" ]]
 then
 	GLUSTERFS_NAME="${SVCNAME#glusterfs.}"
 else
@@ -21,28 +21,28 @@ eval 'GLUSTERFS_MOUNTPOINT="${'${GLUSTERFS_NAME}'_mountpoint}"'
 
 depend() {
 	need net 
-	[ -n "${GLUSTERFS_MOUNTPOINT}" ] && need fuse
+	[[ -n "${GLUSTERFS_MOUNTPOINT}" ]] && need fuse
 	use dns
 	before netmount
 	after firewall ntp-client ntpd
 }
 
 checkconfig() {
-	if [ -z "${GLUSTERFS_NAME}" ]
+	if [[ -z "${GLUSTERFS_NAME}" ]]
 	then
 		eerror "The service name is not properly formatted."
 		return 1
 	fi
 
-	if [ -z "${GLUSTERFS_SERVER}" ]
+	if [[ -z "${GLUSTERFS_SERVER}" ]]
 	then
-		if [ -z "${GLUSTERFS_VOLFILE}" ]
+		if [[ -z "${GLUSTERFS_VOLFILE}" ]]
 		then
 			eerror "No GlusterFS volume file source has been defined.  Edit /etc/conf.d/glusterfs"
 			eerror "and configure a volume file source for ${SVCNAME}."
 			return 1
 		else
-			if [ ! -f "${GLUSTERFS_VOLFILE}" ]
+			if [[ ! -f "${GLUSTERFS_VOLFILE}" ]]
 			then
 				eerror "Cannot find volume file: ${GLUSTERFS_VOLFILE}"
 				return 1
@@ -50,7 +50,7 @@ checkconfig() {
 		fi
 	fi
 
-	if [ -n "${GLUSTERFS_MOUNTPOINT}" -a ! -d "${GLUSTERFS_MOUNTPOINT}" ]
+	if [[ -n "${GLUSTERFS_MOUNTPOINT}" && ! -d "${GLUSTERFS_MOUNTPOINT}" ]]
 	then
 		eerror "The mountpoint ${GLUSTERFS_MOUNTPOINT} does not exist."
 		return 1
@@ -65,7 +65,7 @@ start() {
 	ebegin "Starting GlusterFS (${SVCNAME})"
 	eindent
 
-	if [ -z "${GLUSTERFS_MOUNTPOINT}" ]
+	if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]]
 	then
 		einfo "Starting in server mode ..."
 		daemon="glusterfsd"
@@ -74,7 +74,7 @@ start() {
 		daemon="glusterfs"
 	fi
 
-	if [ -n "${GLUSTERFS_SERVER}" ]
+	if [[ -n "${GLUSTERFS_SERVER}" ]]
 	then
 		einfo "Using server supplied volume file"
 		start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
@@ -106,7 +106,7 @@ stop() {
 
 	ebegin "Stopping GlusterFS (${SVCNAME})"
 	eindent
-	if [ -z "${GLUSTERFS_MOUNTPOINT}" ]
+	if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]]
 	then
 		einfo "Stopping server process ..."
 		start-stop-daemon --stop --pidfile ${GLUSTERFS_PIDFILE}
diff --git a/sys-cluster/glusterfs/glusterfs-11.1-r2.ebuild b/sys-cluster/glusterfs/glusterfs-11.1.ebuild
index e1bc54dd2c4d..acad0da32f22 100644
--- a/sys-cluster/glusterfs/glusterfs-11.1-r2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-11.1.ebuild
@@ -1,74 +1,68 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 2021-2023 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
 PYTHON_COMPAT=( python3_{13..14} )
 
-inherit autotools elisp-common python-single-r1 tmpfiles systemd bash-completion-r1
+inherit autotools elisp-common python-single-r1 systemd
+
+SRC_URI="https://github.com/gluster/glusterfs/archive/refs/tags/v${PV}.tar.gz -> ${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/"
-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 ~loong ~ppc ppc64 ~riscv x86"
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
 
-IUSE="debug emacs +fuse georeplication ipv6 +libtirpc rsyslog selinux static-libs tcmalloc test +uring xml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	georeplication? ( xml )
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
 	ipv6? ( libtirpc )"
 
 # the tests must be run as root
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-11.0-extras-defer-invoking-of-gluster-volume-set-help-as-.patch"
-)
-
 # sys-apps/util-linux is required for libuuid
 RDEPEND="
 	acct-group/gluster
 	acct-user/gluster
 	dev-libs/libaio
-	dev-libs/openssl:=[-bindist(-)]
-	net-libs/rpcsvc-proto
 	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
 	sys-apps/util-linux
+	sys-libs/liburing:=
 	sys-libs/readline:=
-	${PYTHON_DEPS}
-
-	!elibc_glibc? ( sys-libs/argp-standalone )
+	dev-util/google-perftools
 	emacs? ( >=app-editors/emacs-23.1:* )
 	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	xml? ( dev-libs/libxml2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	selinux? ( sec-policy/selinux-glusterfs )
-	tcmalloc? ( dev-util/google-perftools )
-	uring? ( sys-libs/liburing:= )
-	xml? ( dev-libs/libxml2:= )
+	dev-libs/openssl:=[-bindist(-)]
+
 "
 DEPEND="
 	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
 	virtual/acl
-	test? (
-		>=dev-util/cmocka-1.0.1
+	test? ( >=dev-util/cmocka-1.0.1
 		app-benchmarks/dbench
-		dev-libs/xxhash
 		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
 		dev-libs/yajl
 		sys-fs/xfsprogs
-		sys-apps/attr
-	)
+		sys-apps/attr )
 "
 BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
 	virtual/pkgconfig
 "
 
+SITEFILE="50${PN}-mode-gentoo.el"
+
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
 
 # Maintainer notes:
@@ -96,21 +90,17 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		YACC=yacc.bison \
-		LEX=flex \
 		--disable-fusermount \
-		--disable-lto \
 		$(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 uring linux-io-uring) \
 		$(use_enable xml xml-output) \
-		$(usex ipv6 --with-ipv6-default "") \
-		$(usex libtirpc "" --without-libtirpc) \
-		$(usex tcmalloc "" --without-tcmalloc) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
 		--localstatedir="${EPREFIX}"/var
 }
 
@@ -119,17 +109,9 @@ src_compile() {
 	use emacs && elisp-compile extras/glusterfs-mode.el
 }
 
-src_test() {
-	./run-tests.sh || die
-}
-
 src_install() {
 	default
 
-	# Path changes based on whether app-shells/bash-completion is installed, bug #911523
-	rm -rf "${ED}"/etc/bash_completion.d "${D}$(get_bashcompdir)" || die
-	newbashcomp extras/command-completion/gluster.bash gluster
-
 	rm \
 		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
 		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
@@ -145,7 +127,7 @@ src_install() {
 
 	if use emacs ; then
 		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/50glusterfs-mode-gentoo.el"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
 	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
@@ -162,28 +144,27 @@ src_install() {
 	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
 	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
 
-	newinitd "${FILESDIR}/glusterfsd-10.2.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-10.2-r2.initd" glusterd
+	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}
 
-	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_fix_shebang "${ED}"
-	python_optimize
+	python_optimize "${ED}"
 }
 
-pkg_postinst() {
-	tmpfiles_process gluster.conf
+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"
diff --git a/sys-cluster/glusterfs/glusterfs-11.2.ebuild b/sys-cluster/glusterfs/glusterfs-11.2.ebuild
index bfb7aecc2e87..8dc75706bfd8 100644
--- a/sys-cluster/glusterfs/glusterfs-11.2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-11.2.ebuild
@@ -1,75 +1,68 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2021-2025 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
 PYTHON_COMPAT=( python3_{13..14} )
 
-inherit autotools elisp-common python-single-r1 tmpfiles systemd bash-completion-r1
+inherit autotools elisp-common python-single-r1 systemd
+
+SRC_URI="https://github.com/gluster/glusterfs/archive/refs/tags/v${PV}.tar.gz -> ${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/"
-SRC_URI="https://github.com/gluster/glusterfs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~x86"
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
 
-IUSE="debug emacs +fuse georeplication ipv6 +libtirpc rsyslog selinux static-libs tcmalloc test +uring xml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	georeplication? ( xml )
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
 	ipv6? ( libtirpc )"
 
 # the tests must be run as root
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-11.0-extras-defer-invoking-of-gluster-volume-set-help-as-.patch"
-	"${FILESDIR}/${PN}-11.2-sys-types.h-for-off64_t.patch"
-)
-
 # sys-apps/util-linux is required for libuuid
 RDEPEND="
 	acct-group/gluster
 	acct-user/gluster
 	dev-libs/libaio
-	dev-libs/openssl:=[-bindist(-)]
-	net-libs/rpcsvc-proto
 	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
 	sys-apps/util-linux
+	sys-libs/liburing:=
 	sys-libs/readline:=
-	${PYTHON_DEPS}
-
-	!elibc_glibc? ( sys-libs/argp-standalone )
+	dev-util/google-perftools
 	emacs? ( >=app-editors/emacs-23.1:* )
 	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	xml? ( dev-libs/libxml2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
 	libtirpc? ( net-libs/libtirpc:= )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	selinux? ( sec-policy/selinux-glusterfs )
-	tcmalloc? ( dev-util/google-perftools )
-	uring? ( sys-libs/liburing:= )
-	xml? ( dev-libs/libxml2:= )
+	dev-libs/openssl:=[-bindist(-)]
+
 "
 DEPEND="
 	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
 	virtual/acl
-	test? (
-		>=dev-util/cmocka-1.0.1
+	test? ( >=dev-util/cmocka-1.0.1
 		app-benchmarks/dbench
-		dev-libs/xxhash
 		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
 		dev-libs/yajl
 		sys-fs/xfsprogs
-		sys-apps/attr
-	)
+		sys-apps/attr )
 "
 BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
 	virtual/pkgconfig
 "
 
+SITEFILE="50${PN}-mode-gentoo.el"
+
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
 
 # Maintainer notes:
@@ -97,21 +90,17 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		YACC=yacc.bison \
-		LEX=flex \
 		--disable-fusermount \
-		--disable-lto \
 		$(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 uring linux-io_uring) \
 		$(use_enable xml xml-output) \
-		$(usex ipv6 --with-ipv6-default "") \
-		$(usex libtirpc "" --without-libtirpc) \
-		$(usex tcmalloc "" --without-tcmalloc) \
-		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
 		--localstatedir="${EPREFIX}"/var
 }
 
@@ -120,17 +109,9 @@ src_compile() {
 	use emacs && elisp-compile extras/glusterfs-mode.el
 }
 
-src_test() {
-	./run-tests.sh || die
-}
-
 src_install() {
 	default
 
-	# Path changes based on whether app-shells/bash-completion is installed, bug #911523
-	rm -rf "${ED}"/etc/bash_completion.d "${D}$(get_bashcompdir)" || die
-	newbashcomp extras/command-completion/gluster.bash gluster
-
 	rm \
 		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
 		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
@@ -146,7 +127,7 @@ src_install() {
 
 	if use emacs ; then
 		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/50glusterfs-mode-gentoo.el"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
 	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
@@ -163,28 +144,27 @@ src_install() {
 	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
 	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
 
-	newinitd "${FILESDIR}/glusterfsd-10.2.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-10.2-r2.initd" glusterd
+	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}
 
-	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_fix_shebang "${ED}"
-	python_optimize
+	python_optimize "${ED}"
 }
 
-pkg_postinst() {
-	tmpfiles_process gluster.conf
+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"
diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index ad92adb44ced..f60e54a23f7e 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -1,25 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
   <maintainer type="person">
-    <email>jkroon@gentoo.org</email>
+    <email>jaco@uls.co.za</email>
     <name>Jaco Kroon</name>
   </maintainer>
+  <maintainer type="person">
+    <email>jpds@protonmail.com</email>
+    <name>Jonathan Davies</name>
+  </maintainer>
   <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>proxy maintainers</name>
+  </maintainer>
   <longdescription lang="en">
 		GlusterFS is a cluster file-system capable of scaling to several peta-bytes. It aggregates various storage bricks over Infiniband RDMA or TCP/IP interconnect into one large parallel network file system. GlusterFS is based on a stackable user space design without compromising performance.
 	</longdescription>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gluster:glusterfs</remote-id>
+  </upstream>
   <use>
     <flag name="fuse">Add FUSE mount helper</flag>
     <flag name="georeplication">Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag>
+    <flag name="infiniband">Add support for Infiniband ibverbs transport.
+			Libraries can be found in science overlay</flag>
     <flag name="ipv6">Use IPv6 by default, requires libtirpc</flag>
     <flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
     <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>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/sys-cluster/keepalived/files/SSL_set0_wbio.patch b/sys-cluster/keepalived/files/SSL_set0_wbio.patch
new file mode 100644
index 000000000000..cd052da8c5f6
--- /dev/null
+++ b/sys-cluster/keepalived/files/SSL_set0_wbio.patch
@@ -0,0 +1,11 @@
+diff -urN keepalived-2.2.7.orig/keepalived/check/check_ssl.c keepalived-2.2.7/keepalived/check/check_ssl.c
+--- keepalived-2.2.7.orig/keepalived/check/check_ssl.c	2022-03-05 19:33:09.505401636 +0100
++++ keepalived-2.2.7/keepalived/check/check_ssl.c	2022-03-05 19:38:53.818426434 +0100
+@@ -237,7 +237,6 @@
+ #ifdef HAVE_SSL_SET0_RBIO
+ 		BIO_up_ref(req->bio);
+ 		SSL_set0_rbio(req->ssl, req->bio);
+-		SSL_set0_wbio(req->ssl, req->bio);
+ #else
+ 		SSL_set_bio(req->ssl, req->bio, req->bio);
+ #endif
diff --git a/sys-cluster/keepalived/files/keepalived.confd b/sys-cluster/keepalived/files/keepalived.confd
new file mode 100644
index 000000000000..5f56cb23b031
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.confd
@@ -0,0 +1,6 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Keepalived options
+# Increase logging:
+#KEEPALIVED_OPTS="-D"
diff --git a/sys-cluster/keepalived/files/keepalived.init b/sys-cluster/keepalived/files/keepalived.init
new file mode 100644
index 000000000000..c290c9dbc518
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.init
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use logger
+	# The interfaces do not actually need to exist to start, it handles them gracefully.
+	use net
+}
+
+command="/usr/sbin/keepalived"
+command_args="${KEEPALIVED_OPTS}"
+pidfile="/var/run/keepalived.pid"
+
+extra_commands="checkconfig reload"
+
+checkconfig() {
+	# keepalived has a config check command, but it does not work while the daemon is running!
+	if [ ! -e /etc/keepalived/keepalived.conf ] ; then
+		eerror "You need an /etc/keepalived/keepalived.conf file to run keepalived"
+		return 1
+	fi
+}
+
+start_pre() {
+	checkconfig || return 1
+}
+
+reload() {
+	ebegin "Reloading keepalived.conf"
+	start-stop-daemon --pidfile $pidfile --signal HUP
+	eend $?
+}
diff --git a/sys-cluster/keepalived/files/keepalived.service b/sys-cluster/keepalived/files/keepalived.service
index ec47a576b776..a3624ed41f63 100644
--- a/sys-cluster/keepalived/files/keepalived.service
+++ b/sys-cluster/keepalived/files/keepalived.service
@@ -1,12 +1,14 @@
 [Unit]
 Description=LVS and VRRP High Availability Monitor
 After=network-online.target syslog.target
+Wants=network-online.target
 
 [Service]
-Type=forking
+Type=notify
+NotifyAccess=all
 PIDFile=/run/keepalived.pid
 KillMode=process
-ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS
+ExecStart=/usr/sbin/keepalived --dont-fork $KEEPALIVED_OPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/sys-cluster/keepalived/files/keepalived.service.1 b/sys-cluster/keepalived/files/keepalived.service.1
new file mode 100644
index 000000000000..ec47a576b776
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.service.1
@@ -0,0 +1,13 @@
+[Unit]
+Description=LVS and VRRP High Availability Monitor
+After=network-online.target syslog.target
+
+[Service]
+Type=forking
+PIDFile=/run/keepalived.pid
+KillMode=process
+ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-cluster/keepalived/keepalived-2.3.3.ebuild b/sys-cluster/keepalived/keepalived-2.3.3.ebuild
index 451cce914910..9477dd433352 100644
--- a/sys-cluster/keepalived/keepalived-2.3.3.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.3.3.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 2021-2025 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
 inherit autotools systemd
@@ -11,12 +10,12 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+bfd dbus json regex snmp systemd"
 
-RDEPEND="
-	dev-libs/libnl:=
-	dev-libs/openssl:=
+RDEPEND="dev-libs/libnl:=
+	dev-libs/openssl:0=
+
 	dev-libs/popt
 	net-libs/libnfnetlink
 	sys-apps/iproute2
@@ -38,16 +37,12 @@ DOCS=(
 
 src_prepare() {
 	default
+	eapply ${FILESDIR}/SSL_set0_wbio.patch
+
 	eautoreconf
 }
 
 src_configure() {
-	# keepalived has support to dynamically use some libraries instead of
-	# linking them:
-	#--enable-dynamic-linking \
-	#--enable-libiptc-dynamic \
-	#--enable-libnl-dynamic \
-	#--enable-libxtables-dynamic \
 	econf \
 		--with-init="$(usex systemd systemd custom)" \
 		--with-kernel-dir="${ESYSROOT}"/usr \
@@ -74,7 +69,6 @@ src_install() {
 
 	# This was badly named by upstream, it's more HOWTO than anything else.
 	newdoc INSTALL INSTALL+HOWTO
-
 	# Clean up sysvinit files
 	rm -rv "${ED}"/etc/sysconfig || die
 }
diff --git a/sys-cluster/keepalived/keepalived-2.3.4.ebuild b/sys-cluster/keepalived/keepalived-2.3.4.ebuild
index 7f697cf9c3d7..9477dd433352 100644
--- a/sys-cluster/keepalived/keepalived-2.3.4.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.3.4.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2026 Gentoo Authors
+# Copyright 2021-2025 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
 inherit autotools systemd
@@ -11,12 +10,12 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+bfd dbus json regex snmp systemd"
 
-RDEPEND="
-	dev-libs/libnl:=
-	dev-libs/openssl:=
+RDEPEND="dev-libs/libnl:=
+	dev-libs/openssl:0=
+
 	dev-libs/popt
 	net-libs/libnfnetlink
 	sys-apps/iproute2
@@ -38,16 +37,12 @@ DOCS=(
 
 src_prepare() {
 	default
+	eapply ${FILESDIR}/SSL_set0_wbio.patch
+
 	eautoreconf
 }
 
 src_configure() {
-	# keepalived has support to dynamically use some libraries instead of
-	# linking them:
-	#--enable-dynamic-linking \
-	#--enable-libiptc-dynamic \
-	#--enable-libnl-dynamic \
-	#--enable-libxtables-dynamic \
 	econf \
 		--with-init="$(usex systemd systemd custom)" \
 		--with-kernel-dir="${ESYSROOT}"/usr \
@@ -74,7 +69,6 @@ src_install() {
 
 	# This was badly named by upstream, it's more HOWTO than anything else.
 	newdoc INSTALL INSTALL+HOWTO
-
 	# Clean up sysvinit files
 	rm -rv "${ED}"/etc/sysconfig || die
 }
diff --git a/sys-cluster/keepalived/metadata.xml b/sys-cluster/keepalived/metadata.xml
index 6dc02ef2b7d4..1a13506e493b 100644
--- a/sys-cluster/keepalived/metadata.xml
+++ b/sys-cluster/keepalived/metadata.xml
@@ -2,13 +2,21 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>
+  <longdescription>
+  VRRP2 implementation. Used for setting up high availability clusters.
+ </longdescription>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:keepalived:keepalived</remote-id>
+  </upstream>
   <use>
-    <flag name="bfd">compile with support for Bidirectional Forwarding Detection (BFD).</flag>
     <flag name="json">compile with signal to dump configuration and stats as JSON.</flag>
-    <flag name="regex">compile with support for regex in health checks</flag>
   </use>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>