diff --git a/sys-cluster/fence-agents/Manifest b/sys-cluster/fence-agents/Manifest
index fec49b9..46837c7 100644
--- a/sys-cluster/fence-agents/Manifest
+++ b/sys-cluster/fence-agents/Manifest
@@ -1,4 +1,2 @@
-DIST fence-agents-3.1.5.tar.gz 897416 BLAKE2B 5eaae8cd03af16c9a071f110dc3b7151b9dcb2176942e04c95b464644ed7e6b44972b0fefaee72e08855e6b27b0f6b177eb887e3f856529103e1c3508dda196a SHA512 3941e2ec9f7db8dfe9fbf8aa360359fa1ff4f3c2d3e6e778289f0bbc39481a54915dbf93d9a9b66f6953ddd2c81562daa7c90e6c0f59ec42e9bfb779ae242992
-EBUILD fence-agents-3.1.5-r1.ebuild 1683 BLAKE2B 94f5be38404e29b495a7f036d7d44c5a2f7c8ed3b283819088171a54643930b0f07ecdc522b1343205b77ed6904287e3ecba5d9339c4b03d1a842d54ce12c005 SHA512 42049b456c003eabd8b3e1ee850de1496b2a224aec7824215c367f0a5d86e6dc42c7f29d8272a67eeb87b4ed1f2cdbcb62bd3fd5759dbca3ba5018b3afceb8b9
-EBUILD fence-agents-4.8.0.ebuild 1052 BLAKE2B a3028827e8b18e1a4eb87d04f13433567421a3e610521eda9ad10ae1fd7394276b1b3a766b3b2223641b67b424df41ac5549c0c2a492d7364e49d824c8070c4f SHA512 bea4fe405f891f804c5747eaf3637b567ba1bd7c3f6f015fcac8e59914cc906161721767be40abfcfc24f498ef8f73af755fe3360deb0886a0e222f80af0b8c7
+EBUILD fence-agents-4.8.0.ebuild 1053 BLAKE2B ef74d23950771edb15f6ef888b5f0058596ee65b230bbfa2f6935035697c121f3b37cba3ec49ec51c0df2871ce5b6bed5a6a8370f82c57bc4e75762e4617a565 SHA512 695ab9f10b65248b2a341f4e77d6b85c24d5e262f644f2615a776074fa8495857805b96642d79d472161e1f1c7c38e580df7b405a61cc8c8f1c8969a6c8455a4
 MISC metadata.xml 323 BLAKE2B 5e4be67c1adc13cde9aa864ef0f8320057022077348ed7d7d77bc509482e1ee057b570558548e9e89544b612feef0655ba39d4453c16fc039ba84ccabe0ba297 SHA512 771302bd401362ba141c27bd7c8b34c2a7f1b2ad310035f5af2aab1188b9451d9189536a5ec607479ccfabd7a35bb4fab84e713c5aa9ea85948397ad5c6609a4
diff --git a/sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild b/sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild
deleted file mode 100644
index a1e725a..0000000
--- a/sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Fencing Agents"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/f/e/${PN}/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~sys-cluster/libccs-${PV}"
-DEPEND="${RDEPEND}
-	dev-python/pexpect
-	dev-libs/libxslt
-	dev-python/pexpect
-	dev-python/pycurl
-	dev-python/suds"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${P} \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var
-}
-
-src_install() {
-	default
-	# dont force /var/run creation on installation wrt #451798
-	rm -rf "${D}"/var/run
-}
-
-pkg_postinst() {
-	if [[ "${ROOT}" != "/" ]] ; then
-		ewarn "You have to run 'ccs_update_schema' in the chroot-environment"
-		ewarn "to update the schema file for the cluster configuration."
-		ewarn "Otherwise you will not be able to define ressources."
-	else
-		elog "Running ccs_update_schema to update the configuration file schema"
-		/usr/sbin/ccs_update_schema -v -f
-	fi
-}
-
-pkg_postrm() {
-	if [[ "${ROOT}" != "/" ]] ; then
-		ewarn "You have to run 'ccs_update_schema' in the chroot-environment"
-		ewarn "to update the schema file for the cluster configuration."
-		ewarn "Otherwise you may be able to define ressources even though they"
-		ewarn "are not present anymore."
-	else
-		elog "Running ccs_update_schema to update the configuration file schema"
-		/usr/sbin/ccs_update_schema -v -f
-	fi
-}
diff --git a/sys-cluster/fence-agents/fence-agents-4.8.0.ebuild b/sys-cluster/fence-agents/fence-agents-4.8.0.ebuild
index 1cadd4d..218c2e5 100644
--- a/sys-cluster/fence-agents/fence-agents-4.8.0.ebuild
+++ b/sys-cluster/fence-agents/fence-agents-4.8.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_9 python3_10 )
 
 inherit autotools multilib python-any-r1 git-r3
 
@@ -25,7 +25,7 @@ DEPEND="
 	$(python_gen_any_dep '
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/suds[${PYTHON_USEDEP}]
+		dev-python/suds-community[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 	')"