gentoo resync : 20.03.2022

2 files changed, 25 insertions, 25 deletions

diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
index a1c4aa4f5513..57920f6243f5 100644
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@@ -1,3 +1,3 @@
-DIST apache-log4j-2.15.0-src.tar.gz 11550453 BLAKE2B 3b7a356714fbff0ad81f633750a45f6b3869df933c89c22b28346e49c6dfb83002ecf6374d04b1ae6a45b5486314654c8a660f3aee7a6b30273439e44db2c610 SHA512 61574722ab0a24bd0301fea57504a645f98f0e5913d1e02e49d25b3dcbf2dcbb3153cfca58fdde632087f94edc8e83820951288ba494234954ab4eeeb6b8be6a
-EBUILD log4j-api-2.15.0.ebuild 3375 BLAKE2B 088b7ae0b330c542ba653f3da205891343037d79feb0ece1b2e8cfdf15f211e672f3ca17b5b4d8d83701c7b72c7f9a426a83cb7c1c7fe78b1c2d19797c8cd1b0 SHA512 acc7c15befa203bbc4924fa6d7865d1cfbab5cb7adfdab07082804f64f9fa53282cf701e4272638b79d575728cd7a7389957b18e0c8507203f34b19fd075914e
+DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177
+EBUILD log4j-api-2.17.1.ebuild 3342 BLAKE2B c3547005b8a23ed6bdf9414dcdf556d3a8f9894aefa0a6d918ffbde75da4ff1386ce8996281678593b0b931508612d45f2efdf3041e79d9c799b5648c84476c4 SHA512 881b89b9ee72ab0005fd75a2f9ef802bcc1e70e647ca378c6cf4f100d403b432c2125bf000ebbcbb79a0bcefcef6df810efa080da45c6bb2e9850a17075ee9aa
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api/log4j-api-2.15.0.ebuild b/dev-java/log4j-api/log4j-api-2.17.1.ebuild
index 10e57a693ca9..dde9ca78860f 100644
--- a/dev-java/log4j-api/log4j-api-2.15.0.ebuild
+++ b/dev-java/log4j-api/log4j-api-2.17.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.15.0/apache-log4j-2.15.0-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.15.0.ebuild
+# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.1/apache-log4j-2.17.1-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.17.1.ebuild
 
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-api:2.15.0"
+MAVEN_ID="org.apache.logging.log4j:log4j-api:2.17.1"
 JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
 
 inherit java-pkg-2 java-pkg-simple
@@ -18,18 +18,17 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # junit-{jupiter,vintage} is not available in ::gentoo
 RESTRICT="test"
 
 # Compile dependencies
 # POM: ${PN}/pom.xml
-# org.apache.logging.log4j:log4j-api-java9:2.15.0 -> >=dev-java/log4j-api-java9-2.15.0:2
-# org.osgi:org.osgi.core:4.3.1 -> !!!artifactId-not-found!!!
+# org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
 # POM: ${PN}/pom.xml
-# test? com.fasterxml.jackson.core:jackson-core:2.12.4 -> !!!groupId-not-found!!!
-# test? com.fasterxml.jackson.core:jackson-databind:2.12.4 -> !!!groupId-not-found!!!
+# test? com.fasterxml.jackson.core:jackson-core:2.12.4 -> >=dev-java/jackson-core-2.13.0:0
+# test? com.fasterxml.jackson.core:jackson-databind:2.12.4 -> >=dev-java/jackson-databind-2.13.0:0
 # test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
 # test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
 # test? org.apache.maven:maven-core:3.6.3 -> !!!groupId-not-found!!!
@@ -40,41 +39,42 @@ RESTRICT="test"
 # test? org.junit.jupiter:junit-jupiter-params:5.7.2 -> !!!groupId-not-found!!!
 # test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!!
 
-DEPEND=">=virtual/jdk-11:*
-	dev-java/osgi-core-api:0
-	dev-java/log4j-api-java9:2"
+DEPEND=">=virtual/jdk-1.8:*
+	dev-java/osgi-core-api:0"
 #	test? (
 #		!!!groupId-not-found!!!
 #		!!!suitable-mavenVersion-not-found!!!
 #		>=dev-java/commons-lang-3.12.0:3.6
+#		>=dev-java/jackson-core-2.13.0:0
+#		>=dev-java/jackson-databind-2.13.0:0
 #	)
 #"
 
-RDEPEND=">=virtual/jre-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt )
 
 S="${WORKDIR}/apache-log4j-${PV}-src"
 
-JAVA_CLASSPATH_EXTRA="log4j-api-java9-2,osgi-core-api"
+JAVA_CLASSPATH_EXTRA="osgi-core-api"
 JAVA_SRC_DIR="${PN}/src/main/java"
 JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
 
-#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_GENTOO_CLASSPATH="jackson-core,jackson-databind,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
 #	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
 #	JAVA_TEST_RESOURCE_DIRS=(
 #		"${PN}/src/test/resources"
 #	)
 
-src_prepare() {
-	default
-	mkdir -p log4j-api/src/main/resources/META-INF/versions/9 || die
-	pushd log4j-api/src/main/resources/META-INF/versions/9 || die
-		jar -xf "$(java-pkg_getjar --build-only log4j-api-java9-2 log4j-api-java9.jar)" \
-			org/apache/logging/log4j/util module-info.class || die
-		rm org/apache/logging/log4j/util/{PrivateSecurityManagerStackTraceUtil,PropertySource}.class || die
-	popd || die
-}
+#	src_prepare() {
+#		default
+#		mkdir -p log4j-api/src/main/resources/META-INF/versions/9 || die
+#		pushd log4j-api/src/main/resources/META-INF/versions/9 || die
+#			jar -xf "$(java-pkg_getjar --build-only log4j-api-java9-2 log4j-api-java9.jar)" \
+#				org/apache/logging/log4j/util module-info.class || die
+#			rm org/apache/logging/log4j/util/{PrivateSecurityManagerStackTraceUtil,PropertySource}.class || die
+#		popd || die
+#	}
 
 src_install() {
 	default # https://bugs.gentoo.org/789582