From 5a4e533f61fa6f27bfd5eb509a3a611fb6cbbfdd Mon Sep 17 00:00:00 2001 From: Alistair Bush Date: Wed, 18 Apr 2012 12:04:26 +0000 Subject: Version bump and remove myself as maintainer. (Portage version: 2.1.10.56/cvs/Linux x86_64) --- dev-java/java-service-wrapper/ChangeLog | 11 +++- .../java-service-wrapper-3.5.14-as-needed.patch | 62 ++++++++++++++++++++ .../java-service-wrapper-3.5.14.ebuild | 66 ++++++++++++++++++++++ dev-java/java-service-wrapper/metadata.xml | 4 -- 4 files changed, 137 insertions(+), 6 deletions(-) create mode 100644 dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch create mode 100644 dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild (limited to 'dev-java/java-service-wrapper') diff --git a/dev-java/java-service-wrapper/ChangeLog b/dev-java/java-service-wrapper/ChangeLog index 4a0675c15bfa..fbccb77cfbee 100644 --- a/dev-java/java-service-wrapper/ChangeLog +++ b/dev-java/java-service-wrapper/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/java-service-wrapper -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/ChangeLog,v 1.9 2010/01/15 20:12:10 ulm Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/ChangeLog,v 1.10 2012/04/18 12:04:26 ali_bush Exp $ + +*java-service-wrapper-3.5.14 (18 Apr 2012) + + 18 Apr 2012; Alistair Bush + +java-service-wrapper-3.5.14.ebuild, + +files/java-service-wrapper-3.5.14-as-needed.patch, metadata.xml: + version bump and remove myself as maintainer, java herd should maintain. 15 Jan 2010; Ulrich Mueller java-service-wrapper-3.2.3.ebuild: 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 new file mode 100644 index 000000000000..ce5fd4aed26b --- /dev/null +++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-as-needed.patch @@ -0,0 +1,62 @@ +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/java-service-wrapper-3.5.14.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild new file mode 100644 index 000000000000..260678b7e8b0 --- /dev/null +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/java-service-wrapper-3.5.14.ebuild,v 1.1 2012/04/18 12:04:26 ali_bush Exp $ + +EAPI="2" +WANT_ANT_TASKS="ant-nodeps" +JAVA_PKG_IUSE="doc source test" + +inherit base java-pkg-2 java-ant-2 eutils + +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" + +# TODO test with 1.3 +DEPEND=">=virtual/jdk-1.4 + test? ( + dev-java/ant-junit + =dev-java/junit-3* + )" + +S="${WORKDIR}/${MY_P}" + +JAVA_ANT_REWRITE_CLASSPATH="true" + +src_prepare() { + epatch "${FILESDIR}/${PN}-3.5.14-as-needed.patch" + #Reported upstream http://sourceforge.net/tracker2/?func=detail&aid=2299391&group_id=39428&atid=425189 + java-pkg-2_src_prepare +} + +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 doc/{readme.txt,revisions.txt} || die + + use doc && dohtml -r doc/english/ + use doc && java-pkg_dojavadoc api + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/java-service-wrapper/metadata.xml b/dev-java/java-service-wrapper/metadata.xml index f8e2b487f364..1f05146b8ffe 100644 --- a/dev-java/java-service-wrapper/metadata.xml +++ b/dev-java/java-service-wrapper/metadata.xml @@ -2,10 +2,6 @@ java - - ali_bush@gentoo.org - Alistair Bush - The Java Service Wrapper is an application which has evolved out of a desire to solve a number of problems common to many Java applications: -- cgit v1.2.3-65-gdbad