Version bump. Patch the build.xml so that the tests don't require write access to the JDK directory.

(Portage version: 2.1.2.9)

4 files changed, 83 insertions, 1 deletions

diff --git a/dev-java/wsdl4j/ChangeLog b/dev-java/wsdl4j/ChangeLog
index 6960440dc0e5..6b9968866e99 100644
--- a/dev-java/wsdl4j/ChangeLog
+++ b/dev-java/wsdl4j/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/wsdl4j
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/ChangeLog,v 1.11 2007/06/08 20:38:47 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/ChangeLog,v 1.12 2007/06/08 22:24:27 betelgeuse Exp $
+
+*wsdl4j-1.6.2 (08 Jun 2007)
+
+  08 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.6.2-tests-sandbox.patch, +wsdl4j-1.6.2.ebuild:
+  Version bump. Patch the build.xml so that the tests don't require write
+  access to the JDK directory.
 
   08 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> wsdl4j-1.5.1-r1.ebuild:
   Use java-pkg_dojavadoc, add src_test and general ebuild cleanup.
diff --git a/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch b/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch
new file mode 100644
index 000000000000..7901a11a6fc0
--- /dev/null
+++ b/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch
@@ -0,0 +1,11 @@
+diff -ur wsdl4j-1_6_2.old/build.xml wsdl4j-1_6_2/build.xml
+--- wsdl4j-1_6_2.old/build.xml	2007-06-09 01:12:11.000000000 +0300
++++ wsdl4j-1_6_2/build.xml	2007-06-09 01:13:09.000000000 +0300
+@@ -279,6 +279,7 @@
+   <target name="test" depends="compile" if="junit.present">
+     <junit printsummary="on">
+       <sysproperty key="jwsdltck_home" value="./test"/>
++	  <sysproperty key="java.home" value="${temp.dir}"/>
+       <sysproperty key="javax.wsdl.factory.WSDLFactoryCandidate"
+                    value="com.ibm.wsdl.factory.WSDLFactoryImpl"/>
+ 
diff --git a/dev-java/wsdl4j/files/digest-wsdl4j-1.6.2 b/dev-java/wsdl4j/files/digest-wsdl4j-1.6.2
new file mode 100644
index 000000000000..2cdb0dac0ced
--- /dev/null
+++ b/dev-java/wsdl4j/files/digest-wsdl4j-1.6.2
@@ -0,0 +1,6 @@
+MD5 3c699df7e5b601098566e5fed3342717 jwsdltck-bin-1.2.zip 599377
+RMD160 6cce4e7e6e1fd5b9af39d868ad7cfc46f1dc58ec jwsdltck-bin-1.2.zip 599377
+SHA256 e4bd4987a2b437d5d7b0a302165c882db2fe5eed80cbdb5329cb0eaea5b42abb jwsdltck-bin-1.2.zip 599377
+MD5 46825152eda7b8674ac62c28736c24d8 wsdl4j-src-1.6.2.zip 172400
+RMD160 60b0fd243257f323c648b7a8e636b7a5f9f881d3 wsdl4j-src-1.6.2.zip 172400
+SHA256 9fe77f4a71700d005b185049d90c6430d1de50f058485b1b45f0efd767b5fa25 wsdl4j-src-1.6.2.zip 172400
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
new file mode 100644
index 000000000000..76533250e32d
--- /dev/null
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild,v 1.1 2007/06/08 22:24:27 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit versionator java-pkg-2 java-ant-2
+
+DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)"
+HOMEPAGE="http://wsdl4j.sourceforge.net"
+
+TCK="jwsdltck"
+TCK_V="1.2"
+
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip
+	test? ( mirror://sourceforge/${TCK}/${TCK}-bin-${TCK_V}.zip )"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/junit )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${PN}-$(replace_all_version_separators _)"
+TCK_S="${WORKDIR}/${TCK}-$(replace_all_version_separators _ ${TCK_V})"
+
+src_unpack() {
+	unpack ${A}
+	if use test; then
+		rm -v "${TCK_S}"/lib/*.jar || die
+		epatch "${FILESDIR}/1.6.2-tests-sandbox.patch"
+	fi
+}
+
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadocs"
+
+src_test() {
+	ln -s "${TCK_S}" test
+	cd "${TCK_S}"
+	java-ant_rewrite-classpath
+	local junit="$(java-pkg_getjars junit)"
+	eant -Dbuild.lib="${S}/test/lib" compile \
+		-Dgentoo.classpath="${S}/build/lib/${PN}.jar:${junit}"
+	cd "${S}"
+	mkdir "${T}/lib"
+	ANT_TASKS="ant-junit" eant test -Dtemp.dir="${T}"
+}
+
+src_install() {
+	java-pkg_dojar build/lib/*.jar
+
+	use doc && java-pkg_dojavadoc build/javadocs/
+	use source && java-pkg_dosrc src/*
+}