Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dev-java/java-service-wrapper: min java 1.8 #20980

Closed
wants to merge 1 commit into from
Closed

dev-java/java-service-wrapper: min java 1.8 #20980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
68 changes: 68 additions & 0 deletions dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/*
}