summaryrefslogtreecommitdiff
path: root/dev-java/java-service-wrapper
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2021-05-26 13:43:26 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2021-05-26 13:43:26 +0000
commit4d9c100b5e5aa2bd8b61900bf5aa9e4c77bad1f3 (patch)
tree90ee005d6677b2607c2b7a53f3643e667b5ad05e /dev-java/java-service-wrapper
parentc87b0e7b0951859468975121d4ec4b4eb666fb40 (diff)
downloadbaldeagleos-repo-4d9c100b5e5aa2bd8b61900bf5aa9e4c77bad1f3.tar.gz
baldeagleos-repo-4d9c100b5e5aa2bd8b61900bf5aa9e4c77bad1f3.tar.xz
baldeagleos-repo-4d9c100b5e5aa2bd8b61900bf5aa9e4c77bad1f3.zip
Adding metadata
Diffstat (limited to 'dev-java/java-service-wrapper')
-rw-r--r--dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch28
-rw-r--r--dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch4
-rw-r--r--dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild (renamed from dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild)12
3 files changed, 22 insertions, 22 deletions
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-r2.ebuild
index 3357c265306f..5ad4333b0e62 100644
--- 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-r2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit epatch java-pkg-2 java-ant-2 toolchain-funcs
+inherit java-pkg-2 java-ant-2 toolchain-funcs
MY_PN="wrapper"
MY_P="${MY_PN}_${PV}_src"
@@ -17,9 +17,9 @@ SLOT="0"
KEYWORDS="amd64 x86"
RDEPEND="
- >=virtual/jre-1.4"
+ virtual/jre:1.8"
DEPEND="
- >=virtual/jdk-1.4
+ virtual/jdk:1.8
test? (
dev-java/ant-junit:0
)"
@@ -34,8 +34,8 @@ PATCHES=(
"${FILESDIR}"/${P}-testsuite.patch
)
-java_prepare() {
- epatch "${PATCHES[@]}"
+src_prepare() {
+ default
cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
}
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-02 10:37:16 +0000