From bf091a83ac5cdd060495df0aef0aeab9066672a1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Mar 2023 12:37:08 +0000 Subject: gentoo auto-resync : 20:03:2023 - 12:37:08 --- dev-java/Manifest.gz | Bin 57155 -> 57149 bytes dev-java/java-dep-check/Manifest | 4 +- dev-java/java-dep-check/files/Main-0.5.java | 2 +- .../java-dep-check/java-dep-check-0.5-r1.ebuild | 28 -------- .../java-dep-check/java-dep-check-0.5-r2.ebuild | 28 ++++++++ dev-java/snakeyaml/Manifest | 2 + dev-java/snakeyaml/snakeyaml-2.0.ebuild | 76 +++++++++++++++++++++ 7 files changed, 109 insertions(+), 31 deletions(-) delete mode 100644 dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild create mode 100644 dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild create mode 100644 dev-java/snakeyaml/snakeyaml-2.0.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index ed777c296426..acabf00db0d9 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/java-dep-check/Manifest b/dev-java/java-dep-check/Manifest index 765dfeca2e41..add9f6c76c0a 100644 --- a/dev-java/java-dep-check/Manifest +++ b/dev-java/java-dep-check/Manifest @@ -1,3 +1,3 @@ -AUX Main-0.5.java 14974 BLAKE2B c8cab47bca61f5c792d214f817768ed9455bb31f407ea5259e760ee8e66c6ab7cd811079bd8d1764fbf0c70da4aad1d9ab5500385c3894292b6e8e8e51c54e6f SHA512 3111783b22e01b357bae675fabd9af86536d4db82cc7dad1f4dac4c3a64efd84f3b6f35e5b5698dafc696d3ecde49589bcb167967130004e3fd1716db9d868f6 -EBUILD java-dep-check-0.5-r1.ebuild 567 BLAKE2B 55606a39097bd6b123189c87ae5c5f1850ea3bca6d154f2221a77b0152ebe2ef98999df49d3c5c4357feeb5cf54375b135041d2dce6418a0ce3406190167a753 SHA512 a8689eeee1917923469e07d7a9bcb1faa5b11faed008482fbb93ee8d4b9615c647221d55a2005eb05b90d1f5366a7abb718b24d30514f8115cee5aa6d5b09048 +AUX Main-0.5.java 14974 BLAKE2B 9bf245b17dfd26ce7f67b299eeefea0006c33af0ce8fb86a2145627980f1db7feb71253e4405aea9fd743a75f43203162b93e6e500612b0af1d595bc9f09db6b SHA512 de0ac9be9c7ac231f71758dff985a4f79e03ba59b74decf20c32d2c53fab762923970d62ebca3076627c45fe3b53ad0b0fc180f3e9cc389f5f6defc3426aaba5 +EBUILD java-dep-check-0.5-r2.ebuild 567 BLAKE2B 55606a39097bd6b123189c87ae5c5f1850ea3bca6d154f2221a77b0152ebe2ef98999df49d3c5c4357feeb5cf54375b135041d2dce6418a0ce3406190167a753 SHA512 a8689eeee1917923469e07d7a9bcb1faa5b11faed008482fbb93ee8d4b9615c647221d55a2005eb05b90d1f5366a7abb718b24d30514f8115cee5aa6d5b09048 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559 diff --git a/dev-java/java-dep-check/files/Main-0.5.java b/dev-java/java-dep-check/files/Main-0.5.java index bcd6b4f2a9d6..b8a1e053e301 100644 --- a/dev-java/java-dep-check/files/Main-0.5.java +++ b/dev-java/java-dep-check/files/Main-0.5.java @@ -73,7 +73,7 @@ public final class Main extends ClassVisitor { * Empty Constructor, sets ASM op code version */ public Main() { - super(Opcodes.ASM5); + super(Opcodes.ASM9); } /** diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild deleted file mode 100644 index 39cd7d500a85..000000000000 --- a/dev-java/java-dep-check/java-dep-check-0.5-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2016-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java Dependency checker" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -CP_DEPEND=" - dev-java/commons-cli:1 - dev-java/asm:9" -RDEPEND=">=virtual/jre-1.8:* - ${CP_DEPEND}" -DEPEND=">=virtual/jdk-1.8:* - ${CP_DEPEND}" - -JAVA_LAUNCHER_FILENAME="${PN}" -JAVA_MAIN_CLASS="javadepchecker.Main" - -src_unpack() { - cp "${FILESDIR}/Main-${PV}.java" Main.java || die -} diff --git a/dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild b/dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild new file mode 100644 index 000000000000..39cd7d500a85 --- /dev/null +++ b/dev-java/java-dep-check/java-dep-check-0.5-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 2016-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Java Dependency checker" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +CP_DEPEND=" + dev-java/commons-cli:1 + dev-java/asm:9" +RDEPEND=">=virtual/jre-1.8:* + ${CP_DEPEND}" +DEPEND=">=virtual/jdk-1.8:* + ${CP_DEPEND}" + +JAVA_LAUNCHER_FILENAME="${PN}" +JAVA_MAIN_CLASS="javadepchecker.Main" + +src_unpack() { + cp "${FILESDIR}/Main-${PV}.java" Main.java || die +} diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest index a3e32ce71897..38f1b9fc7335 100644 --- a/dev-java/snakeyaml/Manifest +++ b/dev-java/snakeyaml/Manifest @@ -1,3 +1,5 @@ DIST snakeyaml-1.33.tar.gz 406196 BLAKE2B 9b7e7d7a5d35d433445737f4b5cc07744e3686a71cc4b9e44ce46153831b76f01da7ef6bc60ea82a7173283a77d0da500bea2bc7ee76bdde4ebda00aa6054aa8 SHA512 ad367d7e7bcb2225094d132df77d91e7401026af02f4ede14a2a4fc5cf78f0cfa1e4400f16f43a669faa2f0e444d36c3745e3c9df3d9114d62fee070c4c99414 +DIST snakeyaml-2.0.tar.gz 405458 BLAKE2B 69d81e0b23080ff86c1f6fe8a924a504d627c353bf9c026703ef54f14e572458e77c501415260667bcb18008ee96ca99cab7ed43c004d36fed781500f09054cf SHA512 ef4da2ae5f5e6cd7b68aabb0d37a4fdbd33be899cd1d4dad3210cc791ca85af57661f623898449841b930eaffc9e61cef337efa4e6371710307ef3758f0af329 EBUILD snakeyaml-1.33.ebuild 2339 BLAKE2B 798becfef801473ced001ec15e00a5ddc799369e5a97eff1140236716fe463d592b68eb0ea9f0b5395b1956575ee0b6e070f631fbe135d546f988d945b574f85 SHA512 a9192e54c120b9469ec55d52fd2cfc7ca84e553da4b93ef6c0b2e4495bf5bbd49a65130fcda7a4f38a5d6cf4deda7d190bc50d65259d183af5d3b93deb8f5c9f +EBUILD snakeyaml-2.0.ebuild 2319 BLAKE2B 7ca6114ab35e0430ea71b39fa6bc7fb924c7345ec1fca00491d2546ac42ce53bb7d2c4640d086023297e4b6ed3963dda90a9afa441445375a704c914b97edddf SHA512 99f72310b5c37023027086e045d03fb8064adf38db4b0e110cf42c0448e5ce9bca652aff9202b66c79bc0c65035c1f3b81db52fd04b8f98e3a44b724e1a5248b MISC metadata.xml 548 BLAKE2B b9d917044a58addef7e75a2714a1a2f70c6ac4db0b30469b93c034b5aca8cd834652c5446b42c99e6785c222667c523b6325341e8f35be342622ad1486411ba6 SHA512 bfb8134a7351f7d0fe4a6433a4655ad8baa207641cb9939591209d05c3caf2d92593891b4b2dced236bb2186d3e410c54ba28682251c5d5f1d5d590e4e94ee61 diff --git a/dev-java/snakeyaml/snakeyaml-2.0.ebuild b/dev-java/snakeyaml/snakeyaml-2.0.ebuild new file mode 100644 index 000000000000..9066dbd63aba --- /dev/null +++ b/dev-java/snakeyaml/snakeyaml-2.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.yaml:snakeyaml:2.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="YAML 1.1 parser and emitter for Java" +HOMEPAGE="https://bitbucket.org/snakeyaml/snakeyaml" +SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz" +S="${WORKDIR}/snakeyaml-snakeyaml-59ddbb3304bb" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# Compile dependencies +# POM: pom.xml +# test? joda-time:joda-time:2.11.2 -> >=dev-java/joda-time-2.11.2:0 +# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4 +# test? org.apache.velocity:velocity-engine-core:2.3 -> >=dev-java/velocity-2.3:0 +# test? org.projectlombok:lombok:1.18.24 -> !!!groupId-not-found!!! + +DEPEND=" + >=virtual/jdk-11:* + test? ( + dev-java/velocity:0 + dev-java/joda-time:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_SRC_DIR="src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,velocity" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +# Workaround for https://bugs.gentoo.org/900433 +# src/main/java9/org/yaml/snakeyaml/internal/Logger.java:16: +# error: duplicate class: org.yaml.snakeyaml.internal.Logger +src_prepare() { + java-pkg-2_src_prepare + mv src/main/java{9,}/module-info.java || die +} + +src_test() { + export EnvironmentKey1="EnvironmentValue1" + export EnvironmentEmpty="" + + # Not packaged org.projectlombok:lombok - https://bugs.gentoo.org/868684 + rm src/test/java/org/yaml/snakeyaml/env/EnvLombokTest.java || die # Tests run: 1 + rm src/test/java/org/yaml/snakeyaml/issues/issue387/YamlExecuteProcessContextTest.java || die # Tests run: 1 + rm src/test/java/org/yaml/snakeyaml/env/ApplicationProperties.java || die # No tests # import lombok. + + # https://bugs.gentoo.org/871744 + pushd src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * -name "*Test.java" \ + ! -name "StressTest.java" \ + ! -name "ParallelTest.java" \ + ! -name "AbstractTest.java" \ + ! -name "PyImportTest.java" \ + ! -name "Fuzzer50355Test.java" \ + ! -name "ContextClassLoaderTest.java" \ + ) + popd + + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + + java-pkg-simple_src_test +} -- cgit v1.2.3