diff --git a/net-analyzer/2ping/2ping-4.5.1.ebuild b/net-analyzer/2ping/2ping-4.5.1-r1.ebuild
similarity index 71%
rename from net-analyzer/2ping/2ping-4.5.1.ebuild
rename to net-analyzer/2ping/2ping-4.5.1-r1.ebuild
index 0e3433304a986..e26ab3b49f423 100644
--- a/net-analyzer/2ping/2ping-4.5.1.ebuild
+++ b/net-analyzer/2ping/2ping-4.5.1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="A bi-directional ping utility"
 HOMEPAGE="https://www.finnie.org/software/2ping/"
@@ -16,10 +16,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="server"
 
+distutils_enable_tests pytest
+
 src_install() {
 	distutils-r1_src_install
+
 	doman doc/2ping.1
 	dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
+
+	newbashcomp 2ping.bash_completion 2ping
+	dosym 2ping $(get_bashcompdir)/2ping6
+
 	use server && {
 		doinitd "${FILESDIR}"/2pingd
 		newconfd "${FILESDIR}"/2pingd.conf 2pingd