Don't resolve symlinks to run-java-tool. #414027

Drop base.eclass, bump EAPI and use java_prepare.

(Portage version: 2.1.10.57/cvs/Linux x86_64)

3 files changed, 99 insertions, 1 deletions

diff --git a/dev-java/java-service-wrapper/ChangeLog b/dev-java/java-service-wrapper/ChangeLog
index e9bcf2c10dd0..e0f7aed0a098 100644
--- a/dev-java/java-service-wrapper/ChangeLog
+++ b/dev-java/java-service-wrapper/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/java-service-wrapper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/ChangeLog,v 1.11 2012/04/20 10:17:12 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-service-wrapper/ChangeLog,v 1.12 2012/05/03 19:05:39 sera Exp $
+
+*java-service-wrapper-3.5.14-r1 (03 May 2012)
+
+  03 May 2012; Ralph Sennhauser <sera@gentoo.org>
+  +java-service-wrapper-3.5.14-r1.ebuild,
+  +files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch:
+  Don't resolve symlinks to run-java-tool. #414027
+  Drop base.eclass, bump EAPI and use java_prepare.
 
   20 Apr 2012; Alistair Bush <ali_bush@gentoo.org>
   java-service-wrapper-3.5.14.ebuild:
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
new file mode 100644
index 000000000000..b69927384dd2
--- /dev/null
+++ b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.14-gentoo-wrapper-defaults.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..2aaf57bbbcdd
--- /dev/null
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.14-r1.ebuild
@@ -0,0 +1,68 @@
+# 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-r1.ebuild,v 1.1 2012/05/03 19:05:39 sera Exp $
+
+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 && dohtml -r doc/english/
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/java/*
+}