From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 89A55158094 for ; Tue, 5 Jul 2022 12:02:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3A87E0B60; Tue, 5 Jul 2022 12:02:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4C8DFE0B60 for ; Tue, 5 Jul 2022 12:02:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4AF2434180F for ; Tue, 5 Jul 2022 12:02:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D934D501 for ; Tue, 5 Jul 2022 12:02:47 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1657022555.e11afbfd0b521aa9e9849a99429b5c07e76fba49.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/java-service-wrapper/Manifest dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild X-VCS-Directories: dev-java/java-service-wrapper/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: e11afbfd0b521aa9e9849a99429b5c07e76fba49 X-VCS-Branch: master Date: Tue, 5 Jul 2022 12:02:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a48187c9-cb9b-4b36-8f33-19311f957d4c X-Archives-Hash: ab9fd86364ffc94982d13b00a35c561c commit: e11afbfd0b521aa9e9849a99429b5c07e76fba49 Author: matoro users noreply github com> AuthorDate: Wed Jun 29 21:48:52 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Tue Jul 5 12:02:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11afbfd dev-java/java-service-wrapper: add 3.5.50 Replaces as-needed patch with a sed. Also fixes bitness detection to reflect actual use in ant build.xml. Bug: https://bugs.gentoo.org/834926 Closes: https://bugs.gentoo.org/786378 Signed-off-by: matoro users.noreply.github.com> Closes: https://github.com/gentoo/gentoo/pull/26156 Signed-off-by: Florian Schmaus gentoo.org> dev-java/java-service-wrapper/Manifest | 1 + .../java-service-wrapper-3.5.50.ebuild | 88 ++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest index 4d19c3dcacee..684084d87d08 100644 --- a/dev-java/java-service-wrapper/Manifest +++ b/dev-java/java-service-wrapper/Manifest @@ -1 +1,2 @@ DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4 +DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09 diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild new file mode 100644 index 000000000000..7b3ea7c6098b --- /dev/null +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2 +JAVA_TESTING_FRAMEWORKS="junit-4" + +MY_P="wrapper_${PV}_src" +DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon" +HOMEPAGE="https://wrapper.tanukisoftware.org/" +SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz" + +LICENSE="tanuki-community" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=virtual/jre-1.8:*" +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/junit:4 + dev-util/cunit + )" +BDEPEND="virtual/jdk" + +S="${WORKDIR}/${MY_P}" + +JAVA_SRC_DIR="src/java/" +JAVA_JAR_FILENAME="wrapper.jar" +JAVA_TEST_SRC_DIR="src/test" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" + +src_prepare() { + default + + # replaces as-needed.patch + sed -i \ + -e 's/gcc/$(CC)/g' \ + -e 's/$(COMPILE) -pthread/$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread/g' \ + -e 's/${COMPILE} -shared/${COMPILE} $(LDFLAGS) -shared/g' \ + -e 's/$(COMPILE) -c/$(COMPILE) $(CFLAGS) -c/g' \ + -e 's/$(COMPILE) $(DEFS)/$(COMPILE) $(CFLAGS) $(DEFS)/g' \ + -e 's/$(COMPILE) -DCUNIT/$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT/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 + + # enable tests on all platforms + grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make || die + if use test; then + 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)" + [[ "${?}" == "0" ]] || 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 +}