From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-java/log4j-12-api/Manifest | 4 +- dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild | 85 ------------------------ dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild | 2 +- 3 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild (limited to 'dev-java/log4j-12-api') diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest index be1cfaa6103b..b6567519434f 100644 --- a/dev-java/log4j-12-api/Manifest +++ b/dev-java/log4j-12-api/Manifest @@ -1,5 +1,3 @@ -DIST apache-log4j-2.17.1-src.tar.gz 11602282 BLAKE2B 6e6a69565ee28fc138ddb78258ac30b13a9be3f3baee64c3427b63b059c552d314be3c4a345ea297010d345c4dcb31d154aaea6cd2fc587512c6087c5dfe0745 SHA512 21cdfca54eb0d6af261a5ae89ff98197473d9c0203b0ab530f3aef6c90957bfb95a423983c8a19d7fbab05ec194b6fad8e46628e32270dd8b94ddd194a1cb177 DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176 -EBUILD log4j-12-api-2.17.1.ebuild 3114 BLAKE2B 7562325f5e69a7214ba566703a02a25e68711c97586d86bc9890a7130ae7c866c593cc57bfe17b7054a71a195fcd24749a5ed4b0a6bff25bd10bbd67e4e9d47f SHA512 b3132797dd6e578b5c560a97181b7ed4793564067d4164315eb537f417a195c36b64c3ad571d90e665ccf85e97ca79f172480533f048851c2ea84bb64a1d3fb4 -EBUILD log4j-12-api-2.17.2.ebuild 3245 BLAKE2B 89db0cdfbb308eabb2d516ae8cc2ab5daa03db1fd2907cf845dc3d07e90688595a6d9ef200a9034335642f1b93ced5c0b7773649a289fe9f01ffcf205a0a6b3b SHA512 52fe2d2c24d09f8f071276bd071600d19fc9a80f2094e159bd3822b737bd228e53d261844895fc3fe94898e03dc20fc1ba9ab56a8e7c24234500a5905e8c59f5 +EBUILD log4j-12-api-2.17.2.ebuild 3241 BLAKE2B 70ea7a1af7385a6e9197d98b743ab2e0c48350e7f3fa5fbd93600b5d3586f3fc2daf947d8bfdea57ffc9c74c78634f6020989488c466dc8403ccfb4db0fe3199 SHA512 1a770758d425819e6e37dbf5a902255adccf23372c8d054ae8e2e8b5dbbde6184809ea9899f9d65bdbc8b7323c3af45aec2a944780a03b608adbdf89c279d450 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6 diff --git a/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild deleted file mode 100644 index fff8bf02ece8..000000000000 --- a/dev-java/log4j-12-api/log4j-12-api-2.17.1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# 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-1.2-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-12-api-2.17.1.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.17.1" -JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="The Apache Log4j 1.x Compatibility API" -HOMEPAGE="https://logging.apache.org/log4j/2.x/" -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" - -# We don't have junit-vintage and junit-jupiter -RESTRICT="test" - -# Common dependencies -# POM: log4j-1.2-api/pom.xml -# org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2 -# org.apache.logging.log4j:log4j-core:2.17.1 -> >=dev-java/log4j-core-2.17.1:2 - -CP_DEPEND=" - ~dev-java/log4j-api-${PV}:2 - ~dev-java/log4j-core-${PV}:2 -" - -# Compile dependencies -# POM: log4j-1.2-api/pom.xml -# org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1 -# POM: log4j-1.2-api/pom.xml -# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.12.4 -> >=dev-java/jackson-dataformat-xml-2.13.0:0 -# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 -# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!! -# test? org.apache.logging.log4j:log4j-api:2.17.1 -> >=dev-java/log4j-api-2.17.1:2 -# test? org.apache.logging.log4j:log4j-core:2.17.1 -> >=dev-java/log4j-core-2.17.1:2 -# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!! -# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!! -# test? org.junit.jupiter:junit-jupiter-engine:5.7.2 -> !!!groupId-not-found!!! -# test? org.junit.vintage:junit-vintage-engine:5.7.2 -> !!!groupId-not-found!!! - -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:* - dev-java/jboss-jms-api:1.1" -# test? ( -# !!!artifactId-not-found!!! -# !!!groupId-not-found!!! -# >=dev-java/commons-io-2.11.0:1 -# >=dev-java/jackson-dataformat-xml-2.13.0:0 -# ~dev-java/log4j-api-${PV}:2 -# ~dev-java/log4j-core-${PV}:2 -# ) -#" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt ) - -S="${WORKDIR}/apache-log4j-${PV}-src" - -JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1" -JAVA_SRC_DIR="log4j-1.2-api/src/main/java" -JAVA_RESOURCE_DIRS=( - "log4j-1.2-api/src/main/resources" -) - -# JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!" -# JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java" -# JAVA_TEST_RESOURCE_DIRS=( -# "log4j-1.2-api/src/test/resources" -# ) - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild index d18971755058..744dbf26acb1 100644 --- a/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild +++ b/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild @@ -18,7 +18,7 @@ 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" # We don't have junit-vintage and junit-jupiter RESTRICT="test" -- cgit v1.2.3