diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
index 875c65d2afd60..d558b8b8c6df8 100644
--- a/dev-java/msv/Manifest
+++ b/dev-java/msv/Manifest
@@ -1 +1,2 @@
+DIST msv-2022.7.tar.gz 2594951 BLAKE2B fce006f4b845efcd930b7999ac00eaab06c404888eb73a6eeab6cfad616b4922271d2d682abc82f3be4c4f6a791aa14681f6e6bfebd2118ac3aa2bcba41fd1f8 SHA512 315342628f79c561883be0d966211dd81daae66a414dcc9bb5a87d86f97121d38b5835e9a6d1ac7c21ccff46040e53d3cabd32e9ea677c9ca4335a86c5259949
 DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
diff --git a/dev-java/msv/metadata.xml b/dev-java/msv/metadata.xml
index a12324e097b70..d52f73b93e44d 100644
--- a/dev-java/msv/metadata.xml
+++ b/dev-java/msv/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-<longdescription>
-The Sun Multi-Schema XML Validator (MSV) is a Java technology tool
-to validate XML documents against several kinds of XML schemata.
-</longdescription>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Sun Multi-Schema XML Validator (MSV) is a Java technology tool
+		to validate XML documents against several kinds of XML schemata.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">xmlark/msv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/msv/msv-2022.7.ebuild b/dev-java/msv/msv-2022.7.ebuild
new file mode 100644
index 0000000000000..300997bdee205
--- /dev/null
+++ b/dev-java/msv/msv-2022.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild msv-2022.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.java.dev.msv:msv-core:2022.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Multi-Schema Validator Core package"
+HOMEPAGE="https://github.com/xmlark/msv/msv-core"
+SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# isorelax:isorelax:20030108 -> !!!groupId-not-found!!!
+# net.java.dev.msv:xsdlib:2022.7 -> !!!suitable-mavenVersion-not-found!!!
+# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
+# xerces:xercesImpl:2.12.2 -> >=dev-java/xerces-2.12.2:2
+# xml-apis:xml-apis:1.4.01 -> >=dev-java/xml-commons-external-1.4.01:1.4
+# xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
+
+CP_DEPEND="
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0
+	dev-java/xerces:2
+	dev-java/xml-commons-external:1.4
+	dev-java/xml-commons-resolver:0
+	dev-java/xsdlib:0
+"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/msv-${P}/msv"
+
+JAVA_MAIN_CLASS="com.sun.msv.driver.textui.Driver"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	# Selection according to pom.xml#L182-L210
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -wholename "**/*Test.java" \
+			-o -wholename "**/*TestCase.java" \
+			-o -wholename "**/*TestCases.java" \) \
+			! -wholename "**/*\$*" \
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}