Bump to 3.3.1. See #236856. Thanks a lot to tommy@gentoo.org

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 82 insertions, 2 deletions

diff --git a/dev-java/java-service-wrapper/ChangeLog b/dev-java/java-service-wrapper/ChangeLog
index 29fd9e0b22ec..1c4c33178cb2 100644
--- a/dev-java/java-service-wrapper/ChangeLog
+++ b/dev-java/java-service-wrapper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/java-service-wrapper
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/ChangeLog,v 1.4 2008/09/06 21:49:43 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/ChangeLog,v 1.5 2008/09/07 07:35:33 ali_bush Exp $
+
+  07 Sep 2008; Alistair Bush <ali_bush@gentoo.org>
+  +java-service-wrapper-3.3.1.ebuild:
+  Bump to 3.3.1. See #236856. Thanks a lot to tommy@gentoo.org
 
   06 Sep 2008; Alistair Bush <ali_bush@gentoo.org>
   -java-service-wrapper-3.3.1.ebuild:
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index cdc2d6c067ef..8343979364f5 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,5 +1,7 @@
 AUX java-service-wrapper-3.2.3-build.xml.patch 2150 RMD160 00633e650d5a523f4ee92fb7908afa35e0d81b45 SHA1 f34c0ccd01aedc42aca381101420d8fc433ea86b SHA256 0a24d546abcf7d87cf766bb4a4b35fbf5e66a35be8e625f9e45f82aba78763bd
 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
 EBUILD java-service-wrapper-3.2.3.ebuild 1809 RMD160 276e290a8881e19ce0e7a076905d79f5d1c37561 SHA1 ddcfcc81b06f3a6c2c3c68e10200af8c89f1a288 SHA256 4b90ce51611acebac20b39f1bceb45eb44f26d78582ed01f428fe36f5a79a18a
-MISC ChangeLog 1009 RMD160 5193d9ca961eadb77a99476721d7bdf101993e05 SHA1 64d11e961d0fa3361263a88294b645203c408a7b SHA256 032dd1eb6e41bbb70301373b72c1b264e769eaf2cbd4589f181e0fe32f26081a
+EBUILD java-service-wrapper-3.3.1.ebuild 1792 RMD160 21dd6e27f1f4bb85a1fbb45e0face5ddc0a94a8d SHA1 2e81766120dead2157d83c6320bfe57c263d01ac SHA256 f5911e1507cb5b97aee727b7073dd0bb12c0078b8f70c3d7075a4fdc3dd5648d
+MISC ChangeLog 1162 RMD160 8de74cdc8798b697bc0d0ffbf4d044a3feebe3ab SHA1 b9d7d2745e1437a956e50894157392d0a7a97ce2 SHA256 6ca5669103bed97b65fa6c37ddfeceacaa9056241035897359cb900f91717a38
 MISC metadata.xml 678 RMD160 7e5baa9bf71b0ae917d38506aa43ac224ea71f67 SHA1 d6e69438e3ca142e53b7ed78e13c3d59eb797df9 SHA256 66efe3088c28882763a88af92caac086fa1ebfbde847433080861b54592d7a07
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild
new file mode 100644
index 000000000000..2b638b1bb61f
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.3.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2008 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.3.1.ebuild,v 1.3 2008/09/07 07:35:33 ali_bush Exp $
+
+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}.zip"
+
+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}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	BITS="32"
+	use amd64 && BITS="64"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# TODO file upstream
+
+	use x86 && sed -i -e 's|gcc -O3 -Wall --pedantic|$(CC) $(CFLAGS) -fPIC|g' \
+		"src/c/Makefile-linux-x86-${BITS}.make"
+	use amd64 && sed -i -e 's|gcc -O3 -fPIC -Wall --pedantic|$(CC) $(CFLAGS) -fPIC|g' \
+		"src/c/Makefile-linux-x86-${BITS}.make"
+}
+
+src_compile() {
+	tc-export CC
+	eant -Dbits=${BITS} jar compile-c $(use_doc -Djdoc.dir=api)
+}
+
+src_test() {
+	mkdir -p lib
+	java-pkg_jar-from --build-only --into lib junit
+
+	local gentoocp="gentoo.classpath=$(java-pkg_getjars --build-only junit)"
+
+	ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" "${gentoocp}" test
+}
+
+src_install() {
+	java-pkg_dojar lib/wrapper.jar
+	java-pkg_doso lib/libwrapper.so
+
+	dobin bin/wrapper
+	dodoc doc/{readme.txt,revisions.txt}
+
+	use doc && dohtml -r doc/english/
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}