diff --git a/sys-cluster/KVTree/KVTree-1.1.1.ebuild b/sys-cluster/KVTree/KVTree-1.3.0.ebuild
similarity index 57%
rename from sys-cluster/KVTree/KVTree-1.1.1.ebuild
rename to sys-cluster/KVTree/KVTree-1.3.0.ebuild
index e64d0507dd..0b4066a8f3 100644
--- a/sys-cluster/KVTree/KVTree-1.1.1.ebuild
+++ b/sys-cluster/KVTree/KVTree-1.3.0.ebuild
@@ -1,45 +1,44 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 inherit cmake
 
-SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 DESCRIPTION="KVTree provides a fully extensible C data structure modeled after Perl hashes"
 HOMEPAGE="https://github.com/ECP-VeloC/KVTree"
+SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0"
 IUSE="fcntl +flock mpi test"
-REQUIRED_USE="
-		?? ( fcntl flock )
-"
-RESTRICT="test? ( userpriv ) !test? ( test )"
+
 RDEPEND="
 	mpi? ( virtual/mpi )
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-2.8
-	app-admin/chrpath
-"
+BDEPEND="app-admin/chrpath"
 
-src_prepare() {
-	#do not build static library
-	sed -i '/kvtree-static/d' src/CMakeLists.txt || die
-	sed -i '/kvtree_base-static/d' src/CMakeLists.txt || die
-	#do not install README.md automatically
-	sed -i '/FILES README.md DESTINATION/d' CMakeLists.txt || die
-	default
-	cmake_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-no-install-readme.patch"
+	"${FILESDIR}/${PN}-1.2.0-no-static.patch"
+)
+REQUIRED_USE="?? ( fcntl flock )"
+RESTRICT="test? ( userpriv ) !test? ( test )"
 
 src_configure() {
+	local flock="NONE"
+	use fcntl && flock="FCNTL"
+	use flock && flock="FLOCK"
+
 	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
 		-DMPI="$(usex mpi ON OFF)"
-		-DKVTREE_FILE_LOCK="$(usex flock FLOCK $(usex fcntl FCNTL NONE))"
+		-DKVTREE_FILE_LOCK="${flock}"
+
+		-DBUILD_SHARED_LIBS=ON
 		-DKVTREE_LINK_STATIC=FALSE
 	)
 	cmake_src_configure
@@ -54,3 +53,12 @@ src_install() {
 	docinto "${DOCSDIR}/users"
 	dodoc -r doc/rst/users/.
 }
+
+src_test() {
+	if mountpoint -q /dev/shm ; then
+		cmake_src_test
+	else
+		eerror "make sure to mount /dev/shm or tests will fail"
+		die
+	fi
+}
diff --git a/sys-cluster/KVTree/Manifest b/sys-cluster/KVTree/Manifest
index 5745aa5f6d..fed8e4b0fc 100644
--- a/sys-cluster/KVTree/Manifest
+++ b/sys-cluster/KVTree/Manifest
@@ -1,2 +1,2 @@
-DIST KVTree-1.1.1.tar.gz 61667 BLAKE2B 26a5bf968b51d9ad9579563f144199243304040fb3c4f0d72cb4aa465292bb73ef8f85dd4e86a8ad9e5092550e97632b72ac7e632f30d10d668bca96a37b4c8f SHA512 229bd0bb1145aa38c244b4fd10da7a78fe37bf7aae93affb8401955ac0053218a6970a2459c043e46bdc74b0f8c2db421ea0d9f6a989cac24fe0ed31a2bb4d03
 DIST KVTree-1.2.0.tar.gz 61844 BLAKE2B 4bd7a975f3c2f510b7ade983c393ac86cb9bcb7216776fd59db8cc258f869f1157f5a08aee3c19fb8e23c796928b6b44c9e3dd95eee13c7e4a4c1fdf3b5d8f00 SHA512 ddc6f2b32bcf8e1a369a17b238d4454679f3a8a4fc1a9fa18e5317418cf73c7d0db2169b53513e15ad05e1f22c80cdd9d66cddbc8aa2ad2a1c95d4910b3d7f88
+DIST KVTree-1.3.0.tar.gz 62063 BLAKE2B 205d6cec078857846a6faa4544901e1d381e7e695fd7935ca690cabf9d65d51d5dda7a4ab5f9afd0ebb378ef6205d6982740ee71504e07f4db94be0775b8e27d SHA512 578c452e07ebf1df36f56fe740fac171535fc8ab421f1f211eab89438207a459b2376b2b645b6ca393f1c5c1c484fbfd467230598b1a4e785e429e521c5c22fd