From 4d9c100b5e5aa2bd8b61900bf5aa9e4c77bad1f3 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 26 May 2021 13:43:26 +0000 Subject: Adding metadata --- .../java-service-wrapper-3.5.25-as-needed.patch | 28 ++++----- ...ce-wrapper-3.5.25-gentoo-wrapper-defaults.patch | 4 +- .../java-service-wrapper-3.5.25-r1.ebuild | 68 ---------------------- .../java-service-wrapper-3.5.25-r2.ebuild | 68 ++++++++++++++++++++++ 4 files changed, 84 insertions(+), 84 deletions(-) delete mode 100644 dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild create mode 100644 dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild (limited to 'dev-java/java-service-wrapper') diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch index 85d3d791199e..3eac44c0dc6c 100644 --- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch +++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch @@ -1,7 +1,7 @@ https://bugs.gentoo.org/622806 https://sourceforge.net/p/wrapper/patches/25/ ---- src/c/Makefile-linux-armel-32.make.old 2014-07-21 10:48:31.000000000 +0200 -+++ src/c/Makefile-linux-armel-32.make 2014-07-21 10:50:11.000000000 +0200 +--- a/src/c/Makefile-linux-armel-32.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ b/src/c/Makefile-linux-armel-32.make 2014-07-21 10:50:11.000000000 +0200 @@ -33,14 +33,14 @@ if test ! -d .deps; then mkdir .deps; fi @@ -21,8 +21,8 @@ https://sourceforge.net/p/wrapper/patches/25/ @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- src/c/Makefile-linux-armhf-32.make.old 2014-07-21 10:48:31.000000000 +0200 -+++ src/c/Makefile-linux-armhf-32.make 2014-07-21 10:51:05.000000000 +0200 +--- a/src/c/Makefile-linux-armhf-32.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ b/src/c/Makefile-linux-armhf-32.make 2014-07-21 10:51:05.000000000 +0200 @@ -33,14 +33,14 @@ if test ! -d .deps; then mkdir .deps; fi @@ -42,8 +42,8 @@ https://sourceforge.net/p/wrapper/patches/25/ @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- src/c/Makefile-linux-ia-64.make.old 2014-07-21 10:48:31.000000000 +0200 -+++ src/c/Makefile-linux-ia-64.make 2014-07-21 10:51:37.000000000 +0200 +--- a/src/c/Makefile-linux-ia-64.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ b/src/c/Makefile-linux-ia-64.make 2014-07-21 10:51:37.000000000 +0200 @@ -33,14 +33,14 @@ if test ! -d .deps; then mkdir .deps; fi @@ -63,8 +63,8 @@ https://sourceforge.net/p/wrapper/patches/25/ @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- src/c/Makefile-linux-ppc-32.make.old 2014-07-21 10:48:31.000000000 +0200 -+++ src/c/Makefile-linux-ppc-32.make 2014-07-21 10:52:05.000000000 +0200 +--- a/src/c/Makefile-linux-ppc-32.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ b/src/c/Makefile-linux-ppc-32.make 2014-07-21 10:52:05.000000000 +0200 @@ -33,14 +33,14 @@ if test ! -d .deps; then mkdir .deps; fi @@ -84,8 +84,8 @@ https://sourceforge.net/p/wrapper/patches/25/ @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- src/c/Makefile-linux-ppc-64.make.old 2014-07-21 10:48:31.000000000 +0200 -+++ src/c/Makefile-linux-ppc-64.make 2014-07-21 10:52:45.000000000 +0200 +--- a/src/c/Makefile-linux-ppc-64.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ b/src/c/Makefile-linux-ppc-64.make 2014-07-21 10:52:45.000000000 +0200 @@ -33,14 +33,14 @@ if test ! -d .deps; then mkdir .deps; fi @@ -105,8 +105,8 @@ https://sourceforge.net/p/wrapper/patches/25/ @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- src/c/Makefile-linux-x86-32.make.old 2014-07-21 10:48:31.000000000 +0200 -+++ src/c/Makefile-linux-x86-32.make 2014-07-21 10:53:39.000000000 +0200 +--- a/src/c/Makefile-linux-x86-32.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ b/src/c/Makefile-linux-x86-32.make 2014-07-21 10:53:39.000000000 +0200 @@ -36,17 +36,17 @@ if test ! -d .deps; then mkdir .deps; fi @@ -130,8 +130,8 @@ https://sourceforge.net/p/wrapper/patches/25/ @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- src/c/Makefile-linux-x86-64.make.old 2014-07-21 10:48:31.000000000 +0200 -+++ src/c/Makefile-linux-x86-64.make 2014-07-21 10:54:16.000000000 +0200 +--- a/src/c/Makefile-linux-x86-64.make.old 2014-07-21 10:48:31.000000000 +0200 ++++ b/src/c/Makefile-linux-x86-64.make 2014-07-21 10:54:16.000000000 +0200 @@ -36,17 +36,17 @@ if test ! -d .deps; then mkdir .deps; fi diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch index 34e94bb77ed6..a859a893bd1c 100644 --- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch +++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch @@ -11,8 +11,8 @@ | symbolic link. | ---- src/c/wrapper.c.old 2014-07-21 09:12:55.000000000 +0200 -+++ src/c/wrapper.c 2014-07-21 09:13:22.000000000 +0200 +--- a/src/c/wrapper.c.old 2014-07-21 09:12:55.000000000 +0200 ++++ b/src/c/wrapper.c 2014-07-21 09:13:22.000000000 +0200 @@ -4908,7 +4908,7 @@ if (!path) { log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para); diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild deleted file mode 100644 index 3357c265306f..000000000000 --- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source test" -inherit epatch java-pkg-2 java-ant-2 toolchain-funcs - -MY_PN="wrapper" -MY_P="${MY_PN}_${PV}_src" -DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon" -HOMEPAGE="http://wrapper.tanukisoftware.org/" -SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz" - -LICENSE="tanuki-community" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - >=virtual/jre-1.4" -DEPEND=" - >=virtual/jdk-1.4 - test? ( - dev-java/ant-junit:0 - )" - -S="${WORKDIR}/${MY_P}" - -JAVA_ANT_REWRITE_CLASSPATH="true" - -PATCHES=( - "${FILESDIR}"/${P}-as-needed.patch - "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch - "${FILESDIR}"/${P}-testsuite.patch -) - -java_prepare() { - epatch "${PATCHES[@]}" - - cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make" -} - -src_compile() { - tc-export CC - BITS="32" - use amd64 && BITS="64" - eant -Dbits=${BITS} jar compile-c - if use doc; then - ejavadoc -d api -sourcepath src/java/ -subpackages org \ - || die "javadoc failed" - fi -} - -src_test() { - ANT_TASKS="ant-junit" eant -Dbits="${BITS}" test -} - -src_install() { - java-pkg_dojar lib/wrapper.jar - java-pkg_doso lib/libwrapper.so - - dobin bin/wrapper - dodoc README*.txt - dodoc doc/revisions.txt - - use doc && java-pkg_dojavadoc api - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild new file mode 100644 index 000000000000..5ad4333b0e62 --- /dev/null +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" +inherit java-pkg-2 java-ant-2 toolchain-funcs + +MY_PN="wrapper" +MY_P="${MY_PN}_${PV}_src" +DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon" +HOMEPAGE="http://wrapper.tanukisoftware.org/" +SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz" + +LICENSE="tanuki-community" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + virtual/jre:1.8" +DEPEND=" + virtual/jdk:1.8 + test? ( + dev-java/ant-junit:0 + )" + +S="${WORKDIR}/${MY_P}" + +JAVA_ANT_REWRITE_CLASSPATH="true" + +PATCHES=( + "${FILESDIR}"/${P}-as-needed.patch + "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch + "${FILESDIR}"/${P}-testsuite.patch +) + +src_prepare() { + default + + cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make" +} + +src_compile() { + tc-export CC + BITS="32" + use amd64 && BITS="64" + eant -Dbits=${BITS} jar compile-c + if use doc; then + ejavadoc -d api -sourcepath src/java/ -subpackages org \ + || die "javadoc failed" + fi +} + +src_test() { + ANT_TASKS="ant-junit" eant -Dbits="${BITS}" test +} + +src_install() { + java-pkg_dojar lib/wrapper.jar + java-pkg_doso lib/libwrapper.so + + dobin bin/wrapper + dodoc README*.txt + dodoc doc/revisions.txt + + use doc && java-pkg_dojavadoc api + use source && java-pkg_dosrc src/java/* +} -- cgit v1.3.1