diff --git a/sys-boot/bmaptools/bmaptools-3.6.ebuild b/sys-boot/bmaptools/bmaptools-3.6-r2.ebuild
similarity index 54%
rename from sys-boot/bmaptools/bmaptools-3.6.ebuild
rename to sys-boot/bmaptools/bmaptools-3.6-r2.ebuild
index ec3b9004c7..b2fa55e385 100644
--- a/sys-boot/bmaptools/bmaptools-3.6.ebuild
+++ b/sys-boot/bmaptools/bmaptools-3.6-r2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -18,9 +17,26 @@ SRC_URI="https://github.com/intel/bmap-tools/archive/refs/tags/v${PV}.tar.gz ->
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test" # missing python slot fot backports-* packages
+
 S="${WORKDIR}/${MY_P}"
+
 RDEPEND="dev-python/six"
 
+# leave it here until backports-* are ported into python3.9 and 10
+
+#DEPEND="
+#	${RDEPEND}
+#	test? (
+#		dev-python/backports-tempfile[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/nose[${PYTHON_USEDEP}]
+#	)
+#"
+
 python_install_all() {
 	distutils-r1_python_install_all
 }
+
+#distutils_enable_tests nose
diff --git a/sys-boot/bmaptools/metadata.xml b/sys-boot/bmaptools/metadata.xml
index 7a38bb9009..90c5ed1085 100644
--- a/sys-boot/bmaptools/metadata.xml
+++ b/sys-boot/bmaptools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
 </pkgmetadata>