From f8ca23f9f6e4a55e4195e553ca2f3e7dd425f51c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Aug 2022 20:22:37 +0100 Subject: gentoo auto-resync : 12:08:2022 - 20:22:37 --- dev-java/java-service-wrapper/Manifest | 5 - .../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, 267 deletions(-) delete mode 100644 dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch delete mode 100644 dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch delete mode 100644 dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch delete 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/Manifest b/dev-java/java-service-wrapper/Manifest index 9f132c3dc749..5f5a8511bb39 100644 --- a/dev-java/java-service-wrapper/Manifest +++ b/dev-java/java-service-wrapper/Manifest @@ -1,8 +1,3 @@ -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 DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09 -EBUILD java-service-wrapper-3.5.25-r2.ebuild 1407 BLAKE2B e05a6930c0ee852a43df15a7cadc1011663ab8db7849e45461a3d0fd1db43b379e254f1fcae482451a85c067eed0c851fe923c7dbd0c6785cb3adce9d92b9953 SHA512 60b08f6ce759bb8a724b1c50d5dd1e5aa8ca76ce95602dfae7c21d6567d9ff9719d5528e0d715842158f2f2f7c4f3147b7f646247cd4538e42eb0954ae98c705 EBUILD java-service-wrapper-3.5.50.ebuild 2302 BLAKE2B 4a6c238518571f013e8ddd5d7f4346c0617cb307db33bd55563f93539d056b88f1c2ef0d740e3b8942c58b2a706586887d1d37a068564f3412f308025caade18 SHA512 c777594a5b2367af1be7b15192a62ed4e95e5f1b0e0cf728990da345049bc78707f0829b5791cfeef3570a8583c3427278947f045aabc803185ef6531db06af5 MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1 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 -|Updated version for 3.5.25 by tomboy64 -| -|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/* -} -- cgit v1.2.3