From 3a6d209caa07e3be8e8423251b70c8bbeeedb17f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Apr 2024 00:33:29 +0100 Subject: gentoo auto-resync : 12:04:2024 - 00:33:28 --- dev-java/Manifest.gz | Bin 59492 -> 59492 bytes dev-java/json/Manifest | 4 +-- dev-java/json/json-20240205-r1.ebuild | 62 ++++++++++++++++++++++++++++++++++ dev-java/json/json-20240205.ebuild | 61 --------------------------------- 4 files changed, 64 insertions(+), 63 deletions(-) create mode 100644 dev-java/json/json-20240205-r1.ebuild delete mode 100644 dev-java/json/json-20240205.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 473dfd8421fd..5c16f8446fea 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest index 2cd5bb7327ea..c336f2416348 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1,7 +1,7 @@ DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183 DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284 DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6 -DIST json-path-2.4.0.jar 223186 BLAKE2B b184f1b8241bd9b4c5d10662354f31044ea90bddfa7a08c0c995a02e7e50b04d11076d61af2988c2fee49401ad37593f89dd2dbc0bfa0e1b5b1d0653a592eea1 SHA512 b55b30cf85ca12e6a492fd48d4b6bb0b1f3ba610c195aa1a36eda2a80e24bf7688a6a802362d398108e822f6dcb7b713cf421bb4208897fc4f5cc7b8b9b4c97c +DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a EBUILD json-20231013-r1.ebuild 1494 BLAKE2B 3d43885a8994103e747a25ceb1506b443069e88ebd1bcc14f62d9f67bb6905a09e98c7cea205294f89755f50c292ab558e1dbf4ebb4d01d04a4783a53b5c5901 SHA512 8e790530ae9d77b53b45ee67c68bec7c1f57c448683203d48a91ff688addf7b059e6c69a19d481b1384c4ee92388dac6e4520d5f35b4180c50f79feb67c1fb13 -EBUILD json-20240205.ebuild 1450 BLAKE2B b682a04643b36b2d1406c2c80d9efc44563369be36eca9a9fe62ee2f7de3f4e538a90be53d4848ca8868c5ed66d5435cb8484dc4d2509d9331daf41944826f09 SHA512 a8991b1d043813d1005067e811d33eb6f55c9f4665db7a4c62594ff53296b1371722b4008e7b15977868e14c9c797f288c369b5523db70623b8892ee9f9dfd03 +EBUILD json-20240205-r1.ebuild 1483 BLAKE2B b4c279e5baa9e93de70570cc394d24340bfefd07bdbef1b639557da6f501ed536d8ba6b6229b36f6b279542b30f40367ca563a0110994bf8946353348d6cc2da SHA512 2eb3ca377472c51c337885c41c478cbdce1963d68dd93140147711011ede9563650db58422a21aaf04027dad031d33f4a6b863b487f4fb94b575b24a9d7cde2d MISC metadata.xml 1083 BLAKE2B 9dfa3392b02d2bb6ae3198a884c154a52926de81aead27309fd0bbe25011a1b0ea89c0c7fa3694c56fee4cb339c2fd161384c9d7c780369cc3da4464d3abd40a SHA512 3d0f231f0e67e178f838474e6aa07e88dffc26e26261a49515124c3e68120d323cc1a790be017b082af8f27dd051121750c1e1829e7a2fc2714821caf9a8802b diff --git a/dev-java/json/json-20240205-r1.ebuild b/dev-java/json/json-20240205-r1.ebuild new file mode 100644 index 000000000000..49f6e727afd8 --- /dev/null +++ b/dev-java/json/json-20240205-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.json:json:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A reference implementation of a JSON package in Java" +HOMEPAGE="https://github.com/stleary/JSON-java" +JPV="2.9.0" +SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz + test? ( + https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar + )" +S="${WORKDIR}/JSON-java-${PV}" + +LICENSE="JSON" +SLOT="0" +KEYWORDS="amd64 ~x86" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/asm:9 + dev-java/json-smart:2 + dev-java/mockito:4 + dev-java/slf4j-api:0 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CONTRIBUTING,README,SECURITY}.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.json" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH=" + asm-9 + json-smart-2 + junit-4 + mockito-4 + slf4j-api +" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_SRC_DIR="src/test/java" + +src_test() { + JAVA_TEST_EXTRA_ARGS=( -Xss2M ) + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency + + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${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 +} diff --git a/dev-java/json/json-20240205.ebuild b/dev-java/json/json-20240205.ebuild deleted file mode 100644 index b38dc12dd901..000000000000 --- a/dev-java/json/json-20240205.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.json:json:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A reference implementation of a JSON package in Java" -HOMEPAGE="https://github.com/stleary/JSON-java" -JPV="2.4.0" -SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz - test? ( - https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar - )" -S="${WORKDIR}/JSON-java-${PV}" - -LICENSE="JSON" -SLOT="0" -KEYWORDS="amd64 ~x86" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/asm:9 - dev-java/json-smart:2 - dev-java/mockito:4 - dev-java/slf4j-api:0 - ) -" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( {CONTRIBUTING,README,SECURITY}.md ) - -JAVA_AUTOMATIC_MODULE_NAME="org.json" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH=" - asm-9 - json-smart-2 - junit-4 - mockito-4 - slf4j-api -" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_test() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test compile dependency - - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${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 -} -- cgit v1.2.3