diff --git a/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild b/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild
index d35ab4509..56bceb7bc 100644
--- a/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild
+++ b/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2 versionator
+inherit java-pkg-2 java-ant-2
 
-MY_PV=$(replace_all_version_separators '_')
+MY_PV=$(ver_rs '_')
 
 DESCRIPTION="Open-source graph component for Java"
 SRC_URI="https://github.com/jgraph/jgraphx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -16,7 +16,7 @@ DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5"
 LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~x86"
 
 src_prepare() {
diff --git a/dev-java/jgraphx/jgraphx-4.0.6.ebuild b/dev-java/jgraphx/jgraphx-4.0.6.ebuild
index d35ab4509..56bceb7bc 100644
--- a/dev-java/jgraphx/jgraphx-4.0.6.ebuild
+++ b/dev-java/jgraphx/jgraphx-4.0.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2 versionator
+inherit java-pkg-2 java-ant-2
 
-MY_PV=$(replace_all_version_separators '_')
+MY_PV=$(ver_rs '_')
 
 DESCRIPTION="Open-source graph component for Java"
 SRC_URI="https://github.com/jgraph/jgraphx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -16,7 +16,7 @@ DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5"
 LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~x86"
 
 src_prepare() {
diff --git a/dev-java/jgraphx/metadata.xml b/dev-java/jgraphx/metadata.xml
new file mode 100644
index 000000000..4fa8ff351
--- /dev/null
+++ b/dev-java/jgraphx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>