From 5d8ffbc273ca664e15618d557ced3e02de1a884b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Jul 2024 12:24:47 +0100 Subject: gentoo auto-resync : 07:07:2024 - 12:24:46 --- dev-java/Manifest.gz | Bin 55192 -> 55193 bytes dev-java/java-service-wrapper/Manifest | 1 + .../java-service-wrapper-3.5.50-r2.ebuild | 94 +++++++++++++++++++++ dev-java/json/Manifest | 2 + dev-java/json/json-20240303.ebuild | 81 ++++++++++++++++++ 5 files changed, 178 insertions(+) create mode 100644 dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild create mode 100644 dev-java/json/json-20240303.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index f266b5e2003a..1a0c6ef79e61 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest index 67dbab84be84..f140fb992acd 100644 --- a/dev-java/java-service-wrapper/Manifest +++ b/dev-java/java-service-wrapper/Manifest @@ -1,4 +1,5 @@ AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1292 BLAKE2B 192bb8dc9deb6d39131b4af992dc3e906fcf6d6d21e4d2edcb5e4aea9169c01dff273643c196b47c1f118b44e38083c1092f71e49e5502936945d51cf4c4c8b5 SHA512 075434a9a2067593332f7b0827dcc077102fb1c1ca11347ed3e2d62e499f6022c1948feaa3be66b17891e539c12a77d98bc292ac143bc5acdf387bd1e3ec399f DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09 EBUILD java-service-wrapper-3.5.50-r1.ebuild 2388 BLAKE2B f157561b01c9cbd75bc5f4327bdaa1eafb7fc445b024cf75c81c4f01cad3229cc4f542e8c3e932b188c03a09c23ca434536a0f5c83ead8ae3ccde3180add7fef SHA512 8a00fdb945e8cd0053daa3546c56e8000600f4bc81fe8c7fa25206b8d55f68c391e309f4c7a8f504844d8da5d9310324c0751aaa849a3dd99c1b9e7dfcda88dc +EBUILD java-service-wrapper-3.5.50-r2.ebuild 2403 BLAKE2B 1a592cd6c11e0d26d7e98dd0b9d57048fc56008a0ffd231beb43ee6244662752c7e33b883c2e469f596316d7fbcb5435b27fef7f05e0529df496657ff169ee81 SHA512 bcb2f9b0463031960c0b9b0c501d813dc9c6d457aa62317419c21c4423ab82c3573b669b7dea84293c362b3d53aa85e352b3fcbd647b4684e2731c664dbb1f33 MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1 diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild new file mode 100644 index 000000000000..7d8fc6989375 --- /dev/null +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple toolchain-funcs + +DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon" +HOMEPAGE="https://wrapper.tanukisoftware.com" +SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz" +S="${WORKDIR}/wrapper_${PV}_src" + +LICENSE="tanuki-community" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +RESTRICT="!test? ( test )" + +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/junit:4 + dev-util/cunit + ) +" +BDEPEND=">=dev-java/ant-1.10.14-r3:0" + +JAVA_SRC_DIR="src/java/" +JAVA_JAR_FILENAME="wrapper.jar" +JAVA_TEST_SRC_DIR="src/test" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" + +PATCHES=( + "${FILESDIR}"/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch +) + +src_prepare() { + default #780585 + + # replaces as-needed.patch + sed -i \ + -e 's/gcc -O3/$(CC)/g' \ + -e 's/ -pthread/ $(CFLAGS) $(LDFLAGS) -pthread/g' \ + -e 's/ -shared/ $(LDFLAGS) -shared/g' \ + -e 's/$(TEST)\/testsuite/testsuite/g' \ + src/c/Makefile-*.make || die + + cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make" + java-pkg-2_src_prepare + + # disable tests by default (they are only enabled by default on amd64) + sed -e "s/\(all: init wrapper libwrapper.so\) testsuite/\1/g" \ + -i src/c/Makefile-linux-x86-64.make || die + + # re-enable tests on all platforms if requested + if use test; then + grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make + assert + echo 'all: testsuite' | tee -a src/c/Makefile-*.make + assert + fi +} + +src_compile() { + tc-export CC + + pushd "${T}" || die + echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \ + > GetArchDataModel.java || die + ejavac GetArchDataModel.java + local BITS + BITS="$(java GetArchDataModel)" || die "Failed to identify sun.arch.data.model property" + popd || die + eant -Dbits="${BITS}" compile-c + + java-pkg-simple_src_compile +} + +src_test() { + src/c/testsuite --basic || die + java-pkg-simple_src_test +} + +src_install() { + java-pkg-simple_src_install + java-pkg_doso lib/libwrapper.so + + dobin bin/wrapper + dodoc README*.txt + dodoc doc/revisions.txt +} diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest index c336f2416348..85b679a1e05e 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1,7 +1,9 @@ DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183 DIST json-20240205.tar.gz 245788 BLAKE2B 2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df SHA512 55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284 +DIST json-20240303.tar.gz 245665 BLAKE2B 3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89 SHA512 22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d496666412516afc9 DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6 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-r1.ebuild 1483 BLAKE2B b4c279e5baa9e93de70570cc394d24340bfefd07bdbef1b639557da6f501ed536d8ba6b6229b36f6b279542b30f40367ca563a0110994bf8946353348d6cc2da SHA512 2eb3ca377472c51c337885c41c478cbdce1963d68dd93140147711011ede9563650db58422a21aaf04027dad031d33f4a6b863b487f4fb94b575b24a9d7cde2d +EBUILD json-20240303.ebuild 1798 BLAKE2B 845d148da3c08e05aa42dabae863c96d43f2086e0b237d9a4a20714738438351e81e418b88e3b9a0fa9bd0c4d199c6c1749a35d0ccb339d01c4785d10c7a6ee3 SHA512 f693bf2b5e425947e9ff628ccc5188811fc1e876490e18403cc0c6a4e4865ed3d065d152559e13872e2dd6ed07ff207f52320107b45c116cafcf88aec7759827 MISC metadata.xml 1083 BLAKE2B 9dfa3392b02d2bb6ae3198a884c154a52926de81aead27309fd0bbe25011a1b0ea89c0c7fa3694c56fee4cb339c2fd161384c9d7c780369cc3da4464d3abd40a SHA512 3d0f231f0e67e178f838474e6aa07e88dffc26e26261a49515124c3e68120d323cc1a790be017b082af8f27dd051121750c1e1829e7a2fc2714821caf9a8802b diff --git a/dev-java/json/json-20240303.ebuild b/dev-java/json/json-20240303.ebuild new file mode 100644 index 000000000000..5e807e77efd0 --- /dev/null +++ b/dev-java/json/json-20240303.ebuild @@ -0,0 +1,81 @@ +# 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 check-reqs + +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" + +check_env() { + if use test; then + # this is needed only for tests + CHECKREQS_MEMORY="2048M" + check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + check_env +} + +pkg_setup() { + check_env + java-pkg-2_pkg_setup +} + +src_test() { + # setting Xms for bug #930723 + # gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m" + JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}" + 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