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

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64)

2 files changed, 79 insertions, 1 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/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/*
+}