summaryrefslogtreecommitdiff
path: root/dev-java/java-service-wrapper
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/java-service-wrapper')
-rw-r--r--dev-java/java-service-wrapper/Manifest6
-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
4 files changed, 25 insertions, 25 deletions
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 5bcbc95929e9..bbe4d74ffaea 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,6 +1,6 @@
-AUX java-service-wrapper-3.5.25-as-needed.patch 7033 BLAKE2B dc74a0794917171dd7b84cc54a0f6536ee9a36d5082535219f1ade57f6b1482e6c68ac71b20e1c8c9fd4495ebc246f7680c8a7a567e338b55ce2e8021e164784 SHA512 6fbaead84aec096aec6f05414d0250ab0d2407e09616eb8c0e72a67e61c2b127433f41f89d6513ac55aef43e5427b3cedda841618138e6c1b18d8b26a1e1cf86
-AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 BLAKE2B d1da7d6f8f195d690d687f4d1f48f302b45dd2a12612c75fcce5fae3881469a1dd237baedef5846861deb4c8c697633de3b24598f62ca650deb339f6f2dbb219 SHA512 907f07bcf3debd45d07639ea8b60c21be1190cb7939b28c05eaebdd8713e818402d8da9722be09a7d20fb5598a44d0682bb32a6897b97ef7faf2bd74ca9f8824
+AUX java-service-wrapper-3.5.25-as-needed.patch 7061 BLAKE2B e3dd530192faff52f0580fa6593dbc26314d90dbc2456414e843b2fc041f1f788afd5faaf08411153cac384b8a4325d5b0d6da483ed80fb07698f29cd9284482 SHA512 d79958b7a46e21c7a003c9d4e913f2581ec984f5e8ef1c902f84ae8e83cc2c03a23162ceec1b36e94ba44a35fb2518964831dc74bd548692a07b8a767cbbd803
+AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1260 BLAKE2B 6d48e0ea2537343f76d6c7114c99aba4a9887bfba1b184076f8fae636f3888c8494251d6022946f2632ea24d1cb8b03030caa9de71ae21b8a7f1fc3e9acacf64 SHA512 1581a01ec1e4a352d86939e43e659c86fe8f99420e67ded44ed8ec42462b35a540b7763a8d1c055d8710dae422b8163d8ff650df016779f68ec6672cd8fc1150
AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91
DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
-EBUILD java-service-wrapper-3.5.25-r1.ebuild 1429 BLAKE2B 57c933a9bdc7c7626961a238cca4de56718bd8f0414e1f128dbdd8b91c7512f81203b1316a93d96c6ffb4f48b82c110e232430b4c245f83d9e5027ab78553d71 SHA512 e3f2d6ce64feed5fd416a0000054a727e156a6be5d76d421ee2db756e401aea61389e3c45e571e7c4b259acfb9ace7d5689502c15ce9a4f1617307b3508c9b5b
+EBUILD java-service-wrapper-3.5.25-r2.ebuild 1402 BLAKE2B e3c683aa9f2e18ef85f60d9cdea56cedf23a43ade7b9eafe734fa681a9f8d40447ebb84d92ce753a76c8bd5fb18750b5a650553d88a1bf6520050cfca43a6fc2 SHA512 31c53a9f6c76a1dd679fa353da0e23ce12b4303b94131575a0be1d4e8718e08a90016832c97ee4079d41621accc5914fbc191cc09c6b92afc19dbb9216577210
MISC metadata.xml 639 BLAKE2B 835791890bc6ee84347d2fd82601698b2c1c516b46971df7b567f2000b41ed065bc3bcf3fafb1a97a15ae6ef3c37397580079de48ca56523779f055a99eea8d6 SHA512 4df27ebd9d7503edc1c62e311dbf564bb991963820753df523459baf8e0d65e7464e6b42dbbe1ee6649791c66dae552991eed3cfa1e8e2d100ffe512a8e0df6f
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.2.3 (git 2.25.1) at 2024-11-04 17:25:06 +0000