gentoo auto-resync : 04:09:2022 - 22:23:05

8 files changed, 159 insertions, 2 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 46d1d21acf30..69f486e827d3 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest
index 7b45d3748b0f..c0826d1898fd 100644
--- a/dev-java/hamcrest/Manifest
+++ b/dev-java/hamcrest/Manifest
@@ -1,4 +1,4 @@
 AUX hamcrest-2.2-java-11.patch 6356 BLAKE2B 4950e452b7e785e575db862902c2deda6fd46575de46e5d429df116e642c9e95077a710f3e74069ec39d6eba177c498580cd81ac398a7f1395b6a9e278dcbf17 SHA512 d8240e2be33bb7594b570da8224f149ddbc36e55249b9e4ced0d03e2851d781a34b1763b8022b59345b90c0033f25c0d4a8a4e03b124abf08c183b30aa8eb556
 DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a
-EBUILD hamcrest-2.2.ebuild 1185 BLAKE2B 2ccfa695db1ce3e6ebe49d48c9166353513b563174095b5e67b895d4e576af1a4f706c3dd198fc5f6d5dd070deb761e2d9431e89da5966fd3a2e3239115a1600 SHA512 7892acddaf72cb39f5b1de60cb5ab0426a7af7aef50e801e72ba30808a09d2582ddf5b2db31f7cd89d1d3f3e968e0faa3e580ff8b0b843827b2e165cec669cc5
+EBUILD hamcrest-2.2.ebuild 1184 BLAKE2B 5a9bcc2e9ad572cb328f0b1f350c06854162d6b965af673122f619c25b267f697d11b767758afc83f458b2d2b985f648b669d83487ef5eb939fb18d391511152 SHA512 e7eb28035804cba51ef39b2c92676d9ed25b7775a24d7f07fa3616a3c4a350a2bee17ad359d1e63aed3104b4768f92f9a5bede86e2f5e4d21a0658639f1aab2f
 MISC metadata.xml 303 BLAKE2B b415b83e9cd87ea6d0c58b8096930a08d4f3732068be492e201820cfef6599045327972bdc36d5936fc2f04c49b5c82c16b64b808edc882f863047989c94256e SHA512 97de5ee8a7aa583829434d5768522c3d73cebbc70a44874cafc87f0827d595d01b6b545b9709ec24f034e3c62527627828c6c0b0ac158cc6a7c4a633bb26748f
diff --git a/dev-java/hamcrest/hamcrest-2.2.ebuild b/dev-java/hamcrest/hamcrest-2.2.ebuild
index 273849e22970..8660d4f26194 100644
--- a/dev-java/hamcrest/hamcrest-2.2.ebuild
+++ b/dev-java/hamcrest/hamcrest-2.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest
new file mode 100644
index 000000000000..fb3adf51b6d3
--- /dev/null
+++ b/dev-java/jakarta-servlet-api/Manifest
@@ -0,0 +1,3 @@
+DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9
+EBUILD jakarta-servlet-api-4.0.4.ebuild 927 BLAKE2B 8022535954bb467e0cd1e0baaa897320aafb8ad24e3929635a31ce9f0757863e698d9da0cc47fb46e3e78267dd9378e4083f26c5e2b980b7fbfd72f54e956d39 SHA512 270c4e04bf2166e817f1464a7e90a8f6c275f2058176dd3c922e2bc6789369bcc6a5b3c0d22b93ea682583ab11f9aeb471148ebe53111fb8581a1db8277bf770
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
new file mode 100644
index 000000000000..c3a5a44be505
--- /dev/null
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-4.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.servlet:jakarta.servlet-api:4.0.4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Javax servlet API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.servlet"
+SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${P}-RELEASE.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-2-with-classpath-exception )"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+DOCS=( {CONTRIBUTING,NOTICE,README}.md )
+
+S="${WORKDIR}/servlet-${PV}-RELEASE"
+
+JAVA_AUTOMATIC_MODULE_NAME="java.servlet"
+JAVA_SRC_DIR="api/src/main/java"
+JAVA_RESOURCE_DIRS="api/src/main/res"
+
+src_prepare() {
+	default
+	cp -r api/src/main/{java,res} || die
+	find api/src/main/res -type f -name '*.java' -exec rm -rf {} + || die
+	java-pkg-2_src_prepare
+}
diff --git a/dev-java/jakarta-servlet-api/metadata.xml b/dev-java/jakarta-servlet-api/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/jakarta-servlet-api/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index 5e84a7c66ddb..df008f37c6cb 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,4 +1,5 @@
 AUX logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch 799 BLAKE2B 5ed73567f9ef6f6fb08c1f9d6fff43e71a22760a31bddcc454a75c62d26b50bad46510f6c748c019ab90e69e6e6007ee3de2507104f956b4c24b658716a6b6ed SHA512 5214fab891a28e02b6748a307e1741207c16dbf0f9fbfcef86f1303c2ab15714348a1f1750965ee928ed422ffa7261f0bc7340756805ba196fe86dce66039ae5
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
+EBUILD logback-core-1.2.11-r1.ebuild 3474 BLAKE2B 3cd56c40553f2fbaebb653b03ed6cad465667f78685eef4ad5c34cbb7b7b2ce679dd18fdb157af65100da2971e886f25cf12f5872b960fbc03f3280fee328310 SHA512 f4a9e7f335d70483c592ae5a5c370f377ae96f300c7605617d91ae7ddbfa0ef2a95b2ee7de41f4f2f17edfa3c2d523a62eb682cb59fa035bb195ae5e17e7dd20
 EBUILD logback-core-1.2.11.ebuild 3571 BLAKE2B 1a57d13feba258d96db96f632056abe972f464cf2194a996b8550681a7b09896c8e80ddec34b660cd9239809567a360b53b6ebc7d6e7ef284785a673dff364af SHA512 f45a45c16eb7297b9f15bd68233715c36ec4c683e672d8c74ce3ff2c9457a1aacef857661506e60752cf6dde6ad35156684b5483c5b679ff89238b9ec4e52b2c
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
new file mode 100644
index 000000000000..5be7d55efb75
--- /dev/null
+++ b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
@@ -0,0 +1,111 @@
+# 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/qos-ch/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-core-1.2.11.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="ch.qos.logback:logback-core:1.2.11"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="logback-core module"
+HOMEPAGE="https://logback.qos.ch"
+SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
+
+LICENSE="EPL-1.0 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Common dependencies
+# POM: pom.xml
+# javax.mail:mail:1.4 -> !!!groupId-not-found!!!
+# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
+# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0
+# org.fusesource.jansi:jansi:1.9 -> >=dev-java/jansi-1.13:0
+
+CP_DEPEND="
+	dev-java/jakarta-servlet-api:4
+	dev-java/janino:0
+	dev-java/jansi:0
+	dev-java/javax-mail:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? joda-time:joda-time:2.9.2 -> >=dev-java/joda-time-2.10.10:0
+# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4
+# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
+# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/assertj-core:3
+		dev-java/joda-time:0
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( ../README.md )
+
+S="${WORKDIR}/logback-v_${PV}/logback-core"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,assertj-core-3,mockito-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_prepare() {
+	default
+	sed \
+		-e 's:org.mockito.Matchers:org.mockito.ArgumentMatchers:' \
+		-i 'src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderIntegrationTest.java' || die
+
+	# Ignore test failing under Java 16
+	# See https://github.com/qos-ch/logback/commit/d6a8200cea6d960bf6832b9b95aed64e87474afb
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" -ge "17" ]] ; then
+		eapply "${FILESDIR}/logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch"
+	fi
+}
+
+src_test() {
+	# 67,73 logback-core/pom.xml
+	# <excludes>
+	#   <exclude>**/All*Test.java</exclude>
+	#   <exclude>**/PackageTest.java</exclude>
+	#   <!-- ConsoleAppenderTest redirects System.out which is not well tolerated by Maven -->
+	#   <exclude>**/ConsoleAppenderTest.java</exclude>
+	#   <!--<exclude>**/TimeBasedRollingTest.java</exclude>-->
+	# </excludes>
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-name "*Test.java" \
+			! -wholename "**/All*Test.java" \
+			! -wholename "**/PackageTest.java" \
+			! -name "AbstractAppenderTest.java" \
+			! -name "AbstractPatternLayoutBaseTest.java" \
+			! -name "AbstractSocketAppenderIntegrationTest.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+
+	# accessible: module java.base does not "opens java.lang" to unnamed module @42bb2aee
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" -ge "17" ]] ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}