commit: e4f5ffd1632245e5846a4f99e3a814f831b0591a Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Aug 12 12:20:40 2022 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Aug 12 13:21:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f5ffd1
dev-java/java-service-wrapper: drop 3.5.25-r2 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/26834 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-java/java-service-wrapper/Manifest | 1 - .../java-service-wrapper-3.5.25-as-needed.patch | 157 --------------------- ...ce-wrapper-3.5.25-gentoo-wrapper-defaults.patch | 25 ---- .../java-service-wrapper-3.5.25-testsuite.patch | 12 -- .../java-service-wrapper-3.5.25-r2.ebuild | 68 --------- 5 files changed, 263 deletions(-) diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest index 684084d87d08..36956ebce1ae 100644 --- a/dev-java/java-service-wrapper/Manifest +++ b/dev-java/java-service-wrapper/Manifest @@ -1,2 +1 @@ -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/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 deleted file mode 100644 index 3eac44c0dc6c..000000000000 --- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch +++ /dev/null @@ -1,157 +0,0 @@ -https://bugs.gentoo.org/622806 -https://sourceforge.net/p/wrapper/patches/25/ ---- 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 - - wrapper: $(wrapper_SOURCE) -- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper - - libwrapper.so: $(libwrapper_so_OBJECTS) -- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so - - %.o: %.c -- @echo '$(COMPILE) -c $<'; \ -- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< -+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ -+ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- 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 - - wrapper: $(wrapper_SOURCE) -- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper - - libwrapper.so: $(libwrapper_so_OBJECTS) -- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so - - %.o: %.c -- @echo '$(COMPILE) -c $<'; \ -- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< -+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ -+ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- 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 - - wrapper: $(wrapper_SOURCE) -- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper - - libwrapper.so: $(libwrapper_so_OBJECTS) -- ${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -+ ${COMPILE} $(LDFLAGS) -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so - - %.o: %.c -- @echo '$(COMPILE) -c $<'; \ -- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< -+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ -+ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- 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 - - wrapper: $(wrapper_SOURCE) -- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper - - libwrapper.so: $(libwrapper_so_OBJECTS) -- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so - - %.o: %.c -- @echo '$(COMPILE) -c $<'; \ -- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< -+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ -+ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- 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 - - wrapper: $(wrapper_SOURCE) -- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper - - libwrapper.so: $(libwrapper_so_OBJECTS) -- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so - - %.o: %.c -- @echo '$(COMPILE) -c $<'; \ -- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< -+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ -+ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- 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 - - wrapper: $(wrapper_SOURCE) -- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper - - testsuite: $(testsuite_SOURCE) -- $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite -+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite - - libwrapper.so: $(libwrapper_so_OBJECTS) -- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so - - %.o: %.c -- @echo '$(COMPILE) -c $<'; \ -- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< -+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ -+ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ---- 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 - - wrapper: $(wrapper_SOURCE) -- $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper - - testsuite: $(testsuite_SOURCE) -- $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite -+ $(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite - - libwrapper.so: $(libwrapper_so_OBJECTS) -- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -+ ${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so - - %.o: %.c -- @echo '$(COMPILE) -c $<'; \ -- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< -+ @echo '$(COMPILE) $(CFLAGS) -c $<'; \ -+ $(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ 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 deleted file mode 100644 index a859a893bd1c..000000000000 --- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch +++ /dev/null @@ -1,25 +0,0 @@ -|Original version of this patch by Ralph Sennhauser <[email protected]> -|Updated version for 3.5.25 by tomboy64 <[email protected]> -| -|Added in 3.5.4, make false default for Gentoo -| -|* Add a new wrapper.java.command.resolve property to control whether or not the -| Wrapper tries to resolve any symbolic links in the Java command, specified -| with the wrapper.java.command property. Historically, it has always done so, -| but some jvm started applications like run-java-tool on Gentoo will fail if -| it is run directly as they have a check to make sure it is launched via a -| symbolic link. -| - ---- 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); - } else { -- replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE); -+ replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE); - if (replacePath == TRUE) { - free(*para); - *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR)); - diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch deleted file mode 100644 index d279cdf0f4ea..000000000000 --- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make ---- wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make 2014-09-06 00:06:05.730644375 +0200 -+++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make 2014-09-06 00:06:51.130013387 +0200 -@@ -23,7 +23,7 @@ - LIB = ../../lib - TEST = ../../test - --all: init wrapper libwrapper.so testsuite -+all: init wrapper libwrapper.so - - clean: - rm -f *.o 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 deleted file mode 100644 index e09f0c051ef4..000000000000 --- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 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 ~arm 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/* -}
