gentoo resync : 28.04.2021

3 files changed, 52 insertions, 3 deletions

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 96fbcf645441..50bf95df2daf 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,4 +1,6 @@
 AUX xerces-2.12.0-overrides.patch 1526 BLAKE2B 837bba05c47933fa4cc44a5a326fe6a7c872028181ec11c8da7e8ec182c8bcabeead38b1ad336ae20ec47dffb30e98a8d2c181e4dfbffa12d14bfe017fff4e19 SHA512 b81fb06ba89b6ef374205d623d655309778c9713f0ff11fa392d9f53d6331eaa342ce4145433c2e187f26145b3d9b8de7d48778bfd0c29497900ab47556d2bf9
 DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
-EBUILD xerces-2.12.0.ebuild 851 BLAKE2B 9755ce17d188c07894bc6041c666776f342d1236222b3f1f81722bf9d6b661091804701ac0b64998fbb6f7eae950703abbce7ebb0a3b4bcc1c4a344c480db74a SHA512 4fac8c7f9b83911e0d53dc0f64d1df08f9454e87b15638231349f2bf391c847bbdc5856ed9db772b8fa74c5dea55861b5501c6ee99019307837910a676287562
+DIST xerces-2.12.1.jar 2149927 BLAKE2B b02c518754bcab1da9200122b398496c273a84c07a60945c0eea5524a230f5f4815b619685fc41bf48a124f9147803b9452d5d0105b57d535c9c666c52196571 SHA512 2c4ce274904eda6eb4b0b8800dc8383bc6504e215eb9603c45a25c32335651c8ea4d69539b984c048c1974d2aed3d852fff168eb44e2a9b1087ded578394b849
+EBUILD xerces-2.12.0.ebuild 917 BLAKE2B 3def60cd9da9f91d4750595b0373053095b764e9e84e485d184093fc81b61f73655c4a84465259c4e791d7cc45d9e6a345afa4bebf15c6c800beb26d292e287c SHA512 520d71a67bcc9c0a7d195513d2b6160ca279b5ef4901ffcb8ced3de688db66af58f1db713a25c50c462504800dd1d5aa8e40d41cc279b3c1e0f9fdd90d6755b9
+EBUILD xerces-2.12.1.ebuild 784 BLAKE2B 2b1fc5fe458e4b064e8149de5c4b9f691210e8947f4a8e70f72715e0ba6e92ef4f3be2b61474947f5ea29dfafeb55ca6d707a94f7cd2a10c1e3f4562f13d20f5 SHA512 81acd3d9ea6587c9851800606d82279846b7eb6f55483b83a007c54be7959d8a0ae38f0fc1406e07d0905208beb43c50e54660a47ba317722a66f1247d59a869
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xerces/xerces-2.12.0.ebuild b/dev-java/xerces/xerces-2.12.0.ebuild
index 92df4f503cd6..638b1ea00e7f 100644
--- a/dev-java/xerces/xerces-2.12.0.ebuild
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.0"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -40,8 +41,12 @@ JAVA_GENTOO_CLASSPATH="
 
 S="${WORKDIR}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-overrides.patch"
+)
+
 src_prepare() {
 	default
 
-	epatch "${FILESDIR}/${P}-overrides.patch"
+	java-pkg-2_src_prepare
 }
diff --git a/dev-java/xerces/xerces-2.12.1.ebuild b/dev-java/xerces/xerces-2.12.1.ebuild
new file mode 100644
index 000000000000..0d5e000fae02
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="xercesImpl"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Xerces Java XML parser"
+HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html"
+SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/xml-commons-resolver:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-11:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-11:*"
+
+JAVA_SRC_DIR="org"
+
+JAVA_GENTOO_CLASSPATH="xml-commons-resolver"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	rm -rv "org/w3c" || die
+}