From be8708090362c01c6111c4b76f1e395c14d86e00 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 13 Aug 2024 11:06:03 +0100 Subject: gentoo auto-resync : 13:08:2024 - 11:06:03 --- dev-java/Manifest.gz | Bin 55159 -> 55157 bytes dev-java/json/Manifest | 4 +- dev-java/json/json-20240205-r1.ebuild | 62 ------------------- dev-java/json/json-20240303.ebuild | 2 +- dev-java/lz4-java/Manifest | 2 +- dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild | 93 ----------------------------- dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild | 93 +++++++++++++++++++++++++++++ 7 files changed, 96 insertions(+), 160 deletions(-) delete mode 100644 dev-java/json/json-20240205-r1.ebuild delete mode 100644 dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild create mode 100644 dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index b725e8eb77a0..2d64512780e8 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 846b3b78e4a2..a559641f469a 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1,6 +1,4 @@ -DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284 DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9 DIST json-path-2.9.0.jar 276633 BLAKE2B bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862 SHA512 9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a -EBUILD json-20240205-r1.ebuild 1478 BLAKE2B 69e06bfe1533edd1d1d140482d4a82611cfc6b400f04e30908a0808ca56194818f015ac14bbfec6b0d4f547c61e3b190ebad965ccc457f18031d29d65a6bc0e4 SHA512 fd0e386ec86aaefe60b2989de9240a15c747290794d30cac3392c591f7cab1bda9ff9d3005133619754cf07034db8db9cb5e0dcc2c36d06639dd2caa086e5aae -EBUILD json-20240303.ebuild 1793 BLAKE2B 29de4eb3152607aa2608f345fcde84031efc8ce46fd86377e76891aab907a7e962ccd9e71774c1e70d6c6a95e7a55fe14368d7bab3ab21cb4d18410b856fd1f7 SHA512 3b19da2cf319d2f47001ea8c492320fd591a10a85517bb9cc75d5a17edff6658e4ac8d0a2bba4fe99c4d89e1de3cbf2a2a4e3b898be86c302626c0792ca383e8 +EBUILD json-20240303.ebuild 1792 BLAKE2B b036e49be8f779de191692dc971693e37df8ccb47bee2ce6f05cfbd567cd9eaca4354a373b0d73b21ca01e624e3d0cf9417d261eaeb98018df25fc61f2940c31 SHA512 5cfbbbcf88c2e4ec5dc745a89dd3ec6c3821a9ad72a81764234dac6b902c6efc5e01f4ffcadfb9a0b0118cdbe4d66c93f742b8f58fe9259b2543b180f36cc072 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 deleted file mode 100644 index 8dcbc599e326..000000000000 --- a/dev-java/json/json-20240205-r1.ebuild +++ /dev/null @@ -1,62 +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.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" - -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-20240303.ebuild b/dev-java/json/json-20240303.ebuild index c53dca8a5657..b039a3797e52 100644 --- a/dev-java/json/json-20240303.ebuild +++ b/dev-java/json/json-20240303.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}" LICENSE="JSON" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/lz4-java/Manifest b/dev-java/lz4-java/Manifest index 0de1b1c55682..bda82fb2081f 100644 --- a/dev-java/lz4-java/Manifest +++ b/dev-java/lz4-java/Manifest @@ -1,4 +1,4 @@ AUX lz4-java-1.8.0-fix-load.patch 894 BLAKE2B 30e0dfc301a4926d1cb8846c4391dacb20d07f2e33f0e36c48efb220acf994c916f9f592f645352102448e4f69652a55eda739faac8f7ba0378abdd3e9c5fc10 SHA512 d7d40e091ee45bb11bcb95f251707d9b1678ff658d02369def9e92114b16b4b21d55953719d35570d78faec561e6eca571d54e7bf9074ac7147b9578ab5e90db DIST lz4-java-1.8.0.tar.gz 1069398 BLAKE2B 02ee363fc42eeeade01f04649416dd874513f4517264c6e1b6474d64e8b81e2ee9ff1f55e51b508608929e8d78cb30e98d929cc4a118c03f86b0e69bae237e8a SHA512 ae78748d984d2ede18018d5e9ae6aee0d5fe6ac8b56d717f863968cfad6e9f85b62305692345ba16002bee68278e87a0364aa98aeb92e2af6dc169e5d5b612d4 -EBUILD lz4-java-1.8.0-r4.ebuild 2536 BLAKE2B 20f328d317b8563eb94c4a9c8570227f022695244341b17556d40c16a54efbba229c5bc6ff2f1bca59cce30966972c82542a7cd37093b36fe237b81119a98c72 SHA512 c9f0dbd27d2585b6976ef76d1a9b187e1d977a1a3e6d9e3b704f3cd24163342a3a6ecda0edbecc1b70edd62fc0fe640b140edad8e2699f47b3f67eb35570daa6 +EBUILD lz4-java-1.8.0-r5.ebuild 2545 BLAKE2B 1c1614ad9e256fe2aff8d94812136b3d9d4b7d93965bc9827346daeea899790f033748a95b24da699025bf87c74c3578ad6450ce05bef1ebc0418ff2634b34ae SHA512 6eccf55957cff94df56bedba39673175ee83a6a43be4b103fdf50904df71a6440b461828069da725e60c04e37e50c3135888ae7342665238e14aa26977760c9c MISC metadata.xml 314 BLAKE2B 029f69d900ca078525f401c897f9ebc3eb63d5fdbc201f8d42cadec684a66d1797fe4217ae4c8e874974fcfe74a2a1c024d7bf8bb165c8a9ec22ea103b11e5d7 SHA512 6a8817e187e78b1f175b35a07c9fa498f4b8af167a971320845148409ba352e5aa560cd907fb7e94336ebda07b7c7b5db407f0e9bdc94356e5d2090ee5f2fc9c diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild deleted file mode 100644 index 9e2b264421f8..000000000000 --- a/dev-java/lz4-java/lz4-java-1.8.0-r4.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 2023-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.lz4:lz4-java:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple toolchain-funcs - -DESCRIPTION="LZ4 compression for Java" -HOMEPAGE="https://github.com/lz4/lz4-java" -SRC_URI="https://github.com/lz4/lz4-java/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=" - app-arch/lz4:= - dev-java/mvel:2.5 - dev-libs/xxhash:0 - >=virtual/jdk-1.8:* - test? ( dev-java/randomized-runner:0 )" -RDEPEND=" - app-arch/lz4:= - >=virtual/jre-1.8:*" - -PATCHES=( "${FILESDIR}/${P}-fix-load.patch" ) - -DOCS=( CHANGES.md README.md ) - -JAVA_AUTOMATIC_MODULE_NAME="org.lz4.java" -JAVA_SRC_DIR=( src/java{,-unsafe} ) -JAVA_TEST_GENTOO_CLASSPATH="junit-4 randomized-runner" -JAVA_TEST_RESOURCE_DIRS="src/test-resources" -JAVA_TEST_SRC_DIR="src/test" - -src_prepare() { - default -} - -src_compile() { - # remove precompiled native libraries - rm -r src/resources || die - - # cannot include template 'decompressor.template': file not found.] - cp src/build/source_templates/* . || die - - einfo "Code generation" - "$(java-config -J)" \ - -Dout.dir="src/java" \ - -cp "$(java-pkg_getjars --build-only mvel-2.5)" \ - org.mvel2.sh.Main \ - src/build/gen_sources.mvel \ - || die - - java-pkg-simple_src_compile - - einfo "Generate headers" # build.xml lines 194-204 - ejavac -h build/jni-headers -classpath "target/classes" \ - src/java/net/jpountz/xxhash/XXHashJNI.java \ - src/java/net/jpountz/lz4/LZ4JNI.java || die - - einfo "Generate native library" - # https://devmanual.gentoo.org/ebuild-writing/functions/src_compile/no-build-system - mkdir -p build/objects/src/jni - mkdir -p build/jni/net/jpountz/util/linux/amd64 - "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ - $(java-pkg_get-jni-cflags) \ - -Ibuild/jni-headers \ - -c -o build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \ - src/jni/net_jpountz_lz4_LZ4JNI.c - "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ - $(java-pkg_get-jni-cflags) \ - -Ibuild/jni-headers \ - -c -o build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o \ - src/jni/net_jpountz_xxhash_XXHashJNI.c - - "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ - -shared \ - -Wl,-soname,liblz4-java.so \ - -o liblz4-java.so \ - build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \ - build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o -llz4 -} - -src_install() { - java-pkg-simple_src_install - java-pkg_doso liblz4-java.so -} diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild new file mode 100644 index 000000000000..1eca00a9a589 --- /dev/null +++ b/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild @@ -0,0 +1,93 @@ +# Copyright 2023-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.lz4:lz4-java:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple toolchain-funcs + +DESCRIPTION="LZ4 compression for Java" +HOMEPAGE="https://github.com/lz4/lz4-java" +SRC_URI="https://github.com/lz4/lz4-java/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +DEPEND=" + app-arch/lz4:= + dev-java/mvel:2.5 + dev-libs/xxhash:0 + >=virtual/jdk-1.8:* + test? ( dev-java/randomized-runner:0 )" +RDEPEND=" + app-arch/lz4:= + >=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}/${P}-fix-load.patch" ) + +DOCS=( CHANGES.md README.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.lz4.java" +JAVA_SRC_DIR=( src/java{,-unsafe} ) +JAVA_TEST_GENTOO_CLASSPATH="junit-4 randomized-runner" +JAVA_TEST_RESOURCE_DIRS="src/test-resources" +JAVA_TEST_SRC_DIR="src/test" + +src_prepare() { + default +} + +src_compile() { + # remove precompiled native libraries + rm -r src/resources || die + + # cannot include template 'decompressor.template': file not found.] + cp src/build/source_templates/* . || die + + einfo "Code generation" + "$(java-config -J)" \ + -Dout.dir="src/java" \ + -cp "$(java-pkg_getjars --build-only mvel-2.5)" \ + org.mvel2.sh.Main \ + src/build/gen_sources.mvel \ + || die + + java-pkg-simple_src_compile + + einfo "Generate headers" # build.xml lines 194-204 + ejavac -h build/jni-headers -classpath "target/classes" \ + src/java/net/jpountz/xxhash/XXHashJNI.java \ + src/java/net/jpountz/lz4/LZ4JNI.java || die + + einfo "Generate native library" + # https://devmanual.gentoo.org/ebuild-writing/functions/src_compile/no-build-system + mkdir -p build/objects/src/jni + mkdir -p build/jni/net/jpountz/util/linux/amd64 + "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ + $(java-pkg_get-jni-cflags) \ + -Ibuild/jni-headers \ + -c -o build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \ + src/jni/net_jpountz_lz4_LZ4JNI.c + "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ + $(java-pkg_get-jni-cflags) \ + -Ibuild/jni-headers \ + -c -o build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o \ + src/jni/net_jpountz_xxhash_XXHashJNI.c + + "$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ + -shared \ + -Wl,-soname,liblz4-java.so \ + -o liblz4-java.so \ + build/objects/src/jni/net_jpountz_lz4_LZ4JNI.o \ + build/objects/src/jni/net_jpountz_xxhash_XXHashJNI.o -llz4 -lxxhash +} + +src_install() { + java-pkg-simple_src_install + java-pkg_doso liblz4-java.so +} -- cgit v1.2.3