Version bump and remove myself as maintainer.

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

5 files changed, 142 insertions, 18 deletions

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 <ali_bush@gentoo.org>
+  +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 <ulm@gentoo.org>
   java-service-wrapper-3.2.3.ebuild:
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 021430429449..b5e8fa0770aa 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX java-service-wrapper-3.2.3-build.xml.patch 2150 RMD160 00633e650d5a523f4ee92fb7908afa35e0d81b45 SHA1 f34c0ccd01aedc42aca381101420d8fc433ea86b SHA256 0a24d546abcf7d87cf766bb4a4b35fbf5e66a35be8e625f9e45f82aba78763bd
 AUX java-service-wrapper-3.3.1-as-needed.patch 2780 RMD160 e5ba72c08dd9611b45dd9d01a782b1d8bf69744d SHA1 ad4d41ca6882ad9e02d4a3625c4c0b1b72675131 SHA256 6db5fa17dd160827b1120ec12dfc2a19d8e01d62a9be0f506753b1004d482062
+AUX java-service-wrapper-3.5.14-as-needed.patch 2965 RMD160 f6f23bc3ee2b0f06ec601c5b52b22e57ef14925e SHA1 56f20d4c2b7ffcb99af1d1eb97932b645deb42b5 SHA256 6e3d892b2d2b493ece893bc1b3d98939be3efd689edf75ef9a85ed1c05fc7715
 DIST wrapper_3.2.3_src.tar.gz 3409483 RMD160 6638c8a1aef81f6b9c7dea006d185f08709c738d SHA1 92b5e7efab1f3341cd47170cba1d4d8b1ba3c766 SHA256 7e57b0103959fe3566def64b1dd3fef6537032a7e4b2a7811594f1db7d9f5859
 DIST wrapper_3.3.1_src.zip 381967 RMD160 009021f9d007ca025caf1f917ea9c96aa3dde4f5 SHA1 68331f9049ec456fe04996a25152e307cf1bd58e SHA256 5d3090c235e93bf5f502edd191b5aeb5d611743e8a4d1908fe308917ef601594
 DIST wrapper_3.3.3_src.tar.gz 300817 RMD160 bcf776f85c419169f49a32688df4e318c07a7127 SHA1 37e9f7454f975e9ea40db519e7e32917d1299e28 SHA256 63a39aa218c1a8146f75b98cf232396ed89c2ea09a395a5b83bc6ce306ce64fc
+DIST wrapper_3.5.14_src.tar.gz 499693 RMD160 a9a40a5c7366ad4556bf950d4fe8c75c47e484e1 SHA1 19f31c105f28c29443ab1d551182600ba2eba2f5 SHA256 dac159a3e68a54926deaa545b92d1ed54671ccc44a375b38d0fb514e1a846481
 EBUILD java-service-wrapper-3.2.3.ebuild 1787 RMD160 fb88af90cd9d9da4d8e8ffa96babeff298138299 SHA1 d448f850a83b2ba44d33fa192c19560162e3d2ae SHA256 635f5371652d2c311bc46170a97b330adb3bf176ab968135af345879d2113f16
 EBUILD java-service-wrapper-3.3.1.ebuild 1656 RMD160 71138b87d439340c0e86bc4a2f5eb110a43a5879 SHA1 371fddf7bfcbe832b13f3f7f1a5bc8bc4c3e1ea1 SHA256 9abe036bb7b84c9464287b888c03136252de83469f527a68cb9fb93eba13ea94
 EBUILD java-service-wrapper-3.3.3.ebuild 1622 RMD160 640e943588ef0f07f6d8bf4740661a2c7b3f68f7 SHA1 8e764cb4bf71dc2e28a9a59706284790befda593 SHA256 85a4dc8aace3463b9b8de94d3f8d0c5891e527d05195383fc9f36989ecf77f66
-MISC ChangeLog 1946 RMD160 e577ad8aee64f53d86780c8b99bde5ffbbfb1d66 SHA1 2e184a48e9eb84d0b667b3430e6e913b225ddd5a SHA256 e06043ce49373a5189f9bbf323f0b2cdcfb75fa1e21158e6920dcefc5e85b8b6
-MISC metadata.xml 678 RMD160 7e5baa9bf71b0ae917d38506aa43ac224ea71f67 SHA1 d6e69438e3ca142e53b7ed78e13c3d59eb797df9 SHA256 66efe3088c28882763a88af92caac086fa1ebfbde847433080861b54592d7a07
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktQzMwACgkQOeoy/oIi7uyTHACfUKeizOgcwqIhbRgyIUkEhp2i
-FVEAoKE5S2HSn1Tep8JLZygWvW0Vn4VQ
-=dxXA
------END PGP SIGNATURE-----
+EBUILD java-service-wrapper-3.5.14.ebuild 1622 RMD160 bea8421d1d911608a5946331a746858aed3ff73d SHA1 22b4cdccbc1b10b29c2a0e5b0e112763a16d8624 SHA256 1e50386515d9ad8920fb00d5f313e1d5598c22f9d8ded2215c79e3d2c9ad9b53
+MISC ChangeLog 2230 RMD160 d45521297d5ecb77b55ffe8694b1d01b2cc75830 SHA1 e7817a6a384fb95e6d355b0771ed8da16b31546d SHA256 b938254a839196e053b28365091c6730cd37c29da07a3e0df78c3889d20138e3
+MISC metadata.xml 583 RMD160 0fc89555a402d63bf2ea65e1dae494a5f5e5edd2 SHA1 28a596f0ee68180bc0d97577bd8e81dbdc83a09c SHA256 d2ae88aa8f29a39b6e9da1f04bfa383f454414c16680b866c8bc4622cd9efd18
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 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
-	<maintainer>
-		<email>ali_bush@gentoo.org</email>
-		<name>Alistair Bush</name>
-	</maintainer>
 	<longdescription lang="en">
 		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: