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-api/Manifest | 4 +- dev-java/log4j-api/log4j-api-2.17.1.ebuild | 82 ------------------------------ dev-java/log4j-api/log4j-api-2.17.2.ebuild | 2 +- 3 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 dev-java/log4j-api/log4j-api-2.17.1.ebuild (limited to 'dev-java/log4j-api') diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest index 354bd5b0a36a..4c7d47d5f021 100644 --- a/dev-java/log4j-api/Manifest +++ b/dev-java/log4j-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-api-2.17.1.ebuild 3342 BLAKE2B c3547005b8a23ed6bdf9414dcdf556d3a8f9894aefa0a6d918ffbde75da4ff1386ce8996281678593b0b931508612d45f2efdf3041e79d9c799b5648c84476c4 SHA512 881b89b9ee72ab0005fd75a2f9ef802bcc1e70e647ca378c6cf4f100d403b432c2125bf000ebbcbb79a0bcefcef6df810efa080da45c6bb2e9850a17075ee9aa -EBUILD log4j-api-2.17.2.ebuild 2902 BLAKE2B 02cd5c720fe7eaf30a9e7b934173c436661616b1d105e06f1f0bbc6b625a03c07f24f30d2662306818635e0780565b7c157395568810daf5d9369ffa70470e74 SHA512 8c16c4aa1874590879170494c36c4346ad982fb59dcd775114f60978c1855548df7d4e104264be3aa17eb7dca8f85cbe29a903dc270959c63ef6e5bb7776a7ca +EBUILD log4j-api-2.17.2.ebuild 2898 BLAKE2B 30b05532f1b879f095a3ea735077818fcfce91be99de9d47d547e842d0c8500e67d3f0051e046cf88c13dbde0d7f226b6fdb5266844936a662dc9775c46aa997 SHA512 4f42101df7321f37a28185156d93998f4cc5b67a7007fd17dbc84a8a87b2a50667d080304fee57f248617c047cafd7178ae569975555269266a11d46bfa6b2a6 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6 diff --git a/dev-java/log4j-api/log4j-api-2.17.1.ebuild b/dev-java/log4j-api/log4j-api-2.17.1.ebuild deleted file mode 100644 index dde9ca78860f..000000000000 --- a/dev-java/log4j-api/log4j-api-2.17.1.ebuild +++ /dev/null @@ -1,82 +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-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.17.1" -JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="The Apache Log4j 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" - -# junit-{jupiter,vintage} is not available in ::gentoo -RESTRICT="test" - -# Compile dependencies -# POM: ${PN}/pom.xml -# 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 -> >=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!!! -# test? org.assertj:assertj-core:3.20.2 -> !!!suitable-mavenVersion-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.jupiter:junit-jupiter-migrationsupport:5.7.2 -> !!!groupId-not-found!!! -# 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-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-1.8:*" - -DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md LICENSE.txt ) - -S="${WORKDIR}/apache-log4j-${PV}-src" - -JAVA_CLASSPATH_EXTRA="osgi-core-api" -JAVA_SRC_DIR="${PN}/src/main/java" -JAVA_RESOURCE_DIRS="${PN}/src/main/resources" - -# 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_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/log4j-api/log4j-api-2.17.2.ebuild b/dev-java/log4j-api/log4j-api-2.17.2.ebuild index 5de77360899f..3713bdff3a94 100644 --- a/dev-java/log4j-api/log4j-api-2.17.2.ebuild +++ b/dev-java/log4j-api/log4j-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" # junit-{jupiter,vintage} is not available in ::gentoo RESTRICT="test" -- cgit v1.2.3