* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/, dev-java/java-service-wrapper/files/
@ 2015-10-16 15:08 Patrice Clement
0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2015-10-16 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 01bc2277306537769a0e5f63f94904a9352be1c1
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 15:06:05 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 15:06:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bc2277
dev-java/java-service-wrapper: Clean up old.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/java-service-wrapper/Manifest | 1 -
.../java-service-wrapper-3.2.3-build.xml.patch | 53 -----------------
.../java-service-wrapper-3.3.1-as-needed.patch | 62 -------------------
.../java-service-wrapper-3.5.14-as-needed.patch | 62 -------------------
...ce-wrapper-3.5.14-gentoo-wrapper-defaults.patch | 22 -------
.../java-service-wrapper-3.5.14-r1.ebuild | 67 ---------------------
.../java-service-wrapper-3.5.25.ebuild | 69 ----------------------
7 files changed, 336 deletions(-)
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index f799fca..1107afd 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,2 +1 @@
-DIST wrapper_3.5.14_src.tar.gz 499693 SHA256 dac159a3e68a54926deaa545b92d1ed54671ccc44a375b38d0fb514e1a846481 SHA512 7787d3edd46f61cbf1d1a175b8994c074b5471a35c0ccb9e5b860e709e5e7d3cbd40282c2ee222e7e8e076f84e3ad5af1019fae069809333ef1ab04f6eea2b26 WHIRLPOOL 30715d5ec3e8fdb15c489bf17112437b151a1bd1cfd2f02c1369c47002aa6aff689ef1c7996170283e5671beeaf8ed36076fac9f752a7956226f85f7e10663c2
DIST wrapper_3.5.25_src.tar.gz 556678 SHA256 3cbecb7f2101eda82125e3649e3245fc1e7b4b4d6501b479990ea8b18ac6450b SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4 WHIRLPOOL d6bcf8aa40525e80e7bfeb927b690cd818c69da276a0d6cfd2b6a37afb88cb0b826485fc25cb76fa89d7c6227e49735f31361641f966944caba5ee2cec44bec0
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch
deleted file mode 100644
index 80d24f7..0000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.2.3-build.xml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- build.xml 2008-02-24 20:10:00.000000000 +1300
-+++ build.xml 2008-02-24 20:17:10.000000000 +1300
-@@ -397,16 +397,6 @@
- <classpath refid="project.class.path"/>
- </javac>
-
-- <!-- compile everything under src/test -->
-- <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
-- deprecation="on"
-- debug="on"
-- optimize="on"
-- source="${javac.target.version}"
-- target="${javac.target.version}">
-- <classpath refid="test.class.path"/>
-- </javac>
--
- <!-- copy resource files to build directory -->
- <copy todir="${build.classes}" >
- <fileset dir="${src.dir}/java" >
-@@ -430,6 +420,24 @@
- <class name="org.tanukisoftware.wrapper.WrapperManager"/>
- </javah>
- </target>
-+
-+ <target name="compile-test" depends="compile-java-warn">
-+ <!-- compile everything under src/test -->
-+ <javac srcdir="${src.dir}/test" destdir="${build.testclasses}"
-+ deprecation="on"
-+ debug="on"
-+ optimize="on"
-+ source="${javac.target.version}"
-+ target="${javac.target.version}">
-+ <classpath refid="test.class.path"/>
-+ <classpath>
-+ <fileset dir="lib">
-+ <include name="**/*.jar"/>
-+ </fileset>
-+ </classpath>
-+ </javac>
-+ </target>
-+
- <target name="msvc-missing" depends="init:msg" if="msvc.missing">
- <condition property="msvc.home.v8_c" value="${msvc.home.v8_64_c}">
- <equals arg1="${bits}" arg2="64"/>
-@@ -636,7 +644,7 @@
- <!-- =================================================================== -->
- <!-- Test Task -->
- <!-- =================================================================== -->
-- <target name="test" depends="jar" description="Runs unit tests">
-+ <target name="test" depends="compile-test,jar" description="Runs unit tests">
- <mkdir dir="${build.tests}"/>
-
- <junit fork="true"
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
deleted file mode 100644
index c61679a..0000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.3.1-as-needed.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make
---- wrapper_3.3.1_src/src/c/Makefile-linux-x86-32.make 2008-08-17 10:40:04.000000000 +0300
-+++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-32.make 2008-11-16 17:31:47.000000000 +0200
-@@ -7,7 +7,7 @@
- # license agreement you entered into with Tanuki Software.
- # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
-
--COMPILE = gcc -O3 -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
-+COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64
-
- INCLUDE=$(JAVA_HOME)/include
-
-@@ -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) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
-
- libwrapper.so: $(libwrapper_so_OBJECTS)
-- ${COMPILE} -lm -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+ ${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
-
- %.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 -Nur wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make
---- wrapper_3.3.1_src/src/c/Makefile-linux-x86-64.make 2008-08-17 10:40:04.000000000 +0300
-+++ wrapper_3.3.1_src_patched/src/c/Makefile-linux-x86-64.make 2008-11-16 17:31:54.000000000 +0200
-@@ -7,7 +7,7 @@
- # license agreement you entered into with Tanuki Software.
- # http://wrapper.tanukisoftware.org/doc/english/licenseOverview.html
-
--COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64
-+COMPILE = $(CC) -fPIC -DLINUX -D_FILE_OFFSET_BITS=64
-
- INCLUDE=$(JAVA_HOME)/include
-
-@@ -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) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
-
- libwrapper.so: $(libwrapper_so_OBJECTS)
-- ${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+ ${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
-
- %.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.14-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
deleted file mode 100644
index ce5fd4a..0000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make
---- wrapper_3.5.14_src/src/c/Makefile-linux-x86-32.make 2012-02-08 21:14:51.000000000 +1300
-+++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-32.make 2012-04-18 23:47:55.000000000 +1200
-@@ -7,7 +7,7 @@
- # license agreement you entered into with Tanuki Software.
- # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-
--COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
-+COMPILE = $(CC) -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
-
- INCLUDE=$(JAVA_HOME)/include
-
-@@ -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) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
-
- libwrapper.so: $(libwrapper_so_OBJECTS)
-- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+ ${COMPILE} $(LDFLAGS) -shared -fPIC -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
-
- %.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 -Naur wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make
---- wrapper_3.5.14_src/src/c/Makefile-linux-x86-64.make 2012-02-08 21:14:51.000000000 +1300
-+++ wrapper_3.5.14_src_patched/src/c/Makefile-linux-x86-64.make 2012-04-18 23:50:06.000000000 +1200
-@@ -7,7 +7,7 @@
- # license agreement you entered into with Tanuki Software.
- # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
-
--COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
-+COMPILE = $(CC) -fPIC -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE
-
- INCLUDE=$(JAVA_HOME)/include
-
-@@ -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) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
-
- libwrapper.so: $(libwrapper_so_OBJECTS)
-- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+ ${COMPILE} $(LDFLAGS) -shared -o $(LIB)/libwrapper.so $(libwrapper_so_OBJECTS) -lm
-
- %.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.14-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch
deleted file mode 100644
index b699273..0000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-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
-+++ b/src/c/wrapper.c
-@@ -4664,7 +4664,7 @@ void checkIfRegularExe(TCHAR** para) {
- 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, TRUE);
-+ replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE, TRUE);
- if (replacePath == TRUE) {
- free(*para);
- *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild
deleted file mode 100644
index 6ffb9ff..0000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-WANT_ANT_TASKS="ant-nodeps"
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-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"
-IUSE=""
-
-RDEPEND="
- >=virtual/jre-1.4"
-DEPEND="
- >=virtual/jdk-1.4
- test? (
- dev-java/ant-junit
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
- #Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
- epatch "${FILESDIR}"/${P}-as-needed.patch
-
- epatch "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch #414027
-}
-
-src_compile() {
- tc-export CC
- BITS="32"
- use amd64 && BITS="64"
- eant -Dbits=${BITS} jar compile-c
- if use doc; then
- javadoc -d api -sourcepath src/java/ -subpackages org \
- || die "javadoc failed"
- fi
-}
-
-src_test() {
- ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
-}
-
-src_install() {
- java-pkg_dojar lib/wrapper.jar
- java-pkg_doso lib/libwrapper.so
-
- dobin bin/wrapper
- dodoc README*.txt || die
- dodoc doc/revisions.txt || die
-
- use doc && java-pkg_dojavadoc api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild
deleted file mode 100644
index c0e1cae..0000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WANT_ANT_TASKS="ant-nodeps"
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-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"
-IUSE=""
-
-RDEPEND="
- >=virtual/jre-1.4"
-DEPEND="
- >=virtual/jdk-1.4
- test? (
- dev-java/ant-junit
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
- #Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189
- epatch "${FILESDIR}"/${P}-as-needed.patch
- epatch "${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch #414027
- epatch "${FILESDIR}"/${P}-testsuite.patch
-
- 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
- javadoc -d api -sourcepath src/java/ -subpackages org \
- || die "javadoc failed"
- fi
-}
-
-src_test() {
- ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
-}
-
-src_install() {
- java-pkg_dojar lib/wrapper.jar
- java-pkg_doso lib/libwrapper.so
-
- dobin bin/wrapper
- dodoc README*.txt || die
- dodoc doc/revisions.txt || die
-
- use doc && java-pkg_dojavadoc api
- use source && java-pkg_dosrc src/java/*
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/, dev-java/java-service-wrapper/files/
@ 2021-05-26 8:43 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2021-05-26 8:43 UTC (permalink / raw
To: gentoo-commits
commit: cacade706b928288bf5c26d007edc04114e3f093
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue May 25 09:48:11 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed May 26 08:41:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cacade70
dev-java/java-service-wrapper: min java 1.8
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20980
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../java-service-wrapper-3.5.25-as-needed.patch | 28 ++++-----
...ce-wrapper-3.5.25-gentoo-wrapper-defaults.patch | 4 +-
.../java-service-wrapper-3.5.25-r2.ebuild | 68 ++++++++++++++++++++++
3 files changed, 84 insertions(+), 16 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 85d3d791199..3eac44c0dc6 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 34e94bb77ed..a859a893bd1 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-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
new file mode 100644
index 00000000000..5ad4333b0e6
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
@@ -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/*
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/, dev-java/java-service-wrapper/files/
@ 2022-08-12 13:21 Arthur Zamarin
0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2022-08-12 13:21 UTC (permalink / raw
To: gentoo-commits
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 <sera@gentoo.org>
-|Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn>
-|
-|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/*
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/, dev-java/java-service-wrapper/files/
@ 2023-09-11 12:32 Florian Schmaus
0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2023-09-11 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 3e54188b375ca5be53aa15fc99ce5e634dad27b8
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr 22 13:48:22 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 12:32:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e54188b
dev-java/java-service-wrapper: do not directly call java-run-tool
Closes: https://bugs.gentoo.org/878869
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
...ce-wrapper-3.5.25-gentoo-wrapper-defaults.patch | 25 ++++++++++++++++++++++
...build => java-service-wrapper-3.5.50-r1.ebuild} | 6 +++++-
2 files changed, 30 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000000000000..135c5a1ae8bf
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
@@ -0,0 +1,25 @@
+|Original version of this patch by Ralph Sennhauser <sera@gentoo.org>
+|Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn>
+|
+|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.
+|
+# https://bugs.gentoo.org/878869
+--- 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/java-service-wrapper-3.5.50.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
similarity index 94%
rename from dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
rename to dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
index 261d3bf92668..8fdfe9ac2063 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,6 +33,10 @@ JAVA_JAR_FILENAME="wrapper.jar"
JAVA_TEST_SRC_DIR="src/test"
JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+PATCHES=(
+ "${FILESDIR}"/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-11 12:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-12 13:21 [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/, dev-java/java-service-wrapper/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2023-09-11 12:32 Florian Schmaus
2021-05-26 8:43 Miroslav Šulc
2015-10-16 15:08 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox