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

Package-Manager: portage-2.1.2.9

5 files changed, 103 insertions, 8 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/Manifest b/dev-java/wsdl4j/Manifest
index 3b0d8fb2908e..e03231fe4dc1 100644
--- a/dev-java/wsdl4j/Manifest
+++ b/dev-java/wsdl4j/Manifest
@@ -1,8 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.6.2-tests-sandbox.patch 548 RMD160 6b3269cab5e24e984d70d26f02c3fb8adbf338f2 SHA1 9b123f257a0e98ab8739b4b9da5c80bca07c204e SHA256 eb4ba587bb3d9125e2982ebbb02add25aacc84d8a795b33f21baae164860dbc3
+MD5 2b2fd4b2784914c53de5fe222bf4afef files/1.6.2-tests-sandbox.patch 548
+RMD160 6b3269cab5e24e984d70d26f02c3fb8adbf338f2 files/1.6.2-tests-sandbox.patch 548
+SHA256 eb4ba587bb3d9125e2982ebbb02add25aacc84d8a795b33f21baae164860dbc3 files/1.6.2-tests-sandbox.patch 548
+DIST jwsdltck-bin-1.2.zip 599377 RMD160 6cce4e7e6e1fd5b9af39d868ad7cfc46f1dc58ec SHA1 72141e514142f3549e7ca1a76211f2c2e40cc8e9 SHA256 e4bd4987a2b437d5d7b0a302165c882db2fe5eed80cbdb5329cb0eaea5b42abb
 DIST wsdl4j-1.4-gentoo.tar.gz 2649972 RMD160 f147e171b1495d0755076b55cad0c45e64acef22 SHA1 c94170257680465b288e6f9296a1fddc117fc966 SHA256 a992ace0ef9c3daa08237153b2154844732936a4f5159ae6ad3db729a86dd545
 DIST wsdl4j-1.5.1-gentoo.tar.bz2 355619 RMD160 eefd9f280e870016176db50e6c0aa2710eab594d SHA1 467f0802149e56d46ebe66cbc0b8742a2f9aa5be SHA256 c8d14c919234a06375beddb8d456863105077b16832d9e71129bcd3d1c619a48
+DIST wsdl4j-src-1.6.2.zip 172400 RMD160 60b0fd243257f323c648b7a8e636b7a5f9f881d3 SHA1 57ab84697d9841df326746196e309b547364e09d SHA256 9fe77f4a71700d005b185049d90c6430d1de50f058485b1b45f0efd767b5fa25
 EBUILD wsdl4j-1.4.ebuild 1094 RMD160 8efac1a746005609084fc40665601389660f71ed SHA1 dd29dbb81d0dff1ae6898dcff29bb1e7b606a8f1 SHA256 0498bfd7356565c300dcbf45e1da8519dd343f249bd1e9c3876517990f0f3ccd
 MD5 c42395b43ca5400f72ed0716daaa1e25 wsdl4j-1.4.ebuild 1094
 RMD160 8efac1a746005609084fc40665601389660f71ed wsdl4j-1.4.ebuild 1094
@@ -15,10 +21,14 @@ EBUILD wsdl4j-1.5.1.ebuild 1013 RMD160 cf653a9ebd8eec4c0e45d144244bcbce14e65e8c
 MD5 10d8881f6d86d389292377b003128b1e wsdl4j-1.5.1.ebuild 1013
 RMD160 cf653a9ebd8eec4c0e45d144244bcbce14e65e8c wsdl4j-1.5.1.ebuild 1013
 SHA256 39773e29bc98b9264800874b3930781fd814c9110d71d77eadd4ee792b359acf wsdl4j-1.5.1.ebuild 1013
-MISC ChangeLog 1909 RMD160 e4287735d639d17d30a45cebfcac5f2fb75e9ee6 SHA1 436271a30b59a806f3dbbe3aa7de0feb1433fe4c SHA256 5b759dbec5288419a3b1b68361359d8f47629ffd845235d440b75c40a673ba80
-MD5 77dd478ca203ba5d8db66550e8d97606 ChangeLog 1909
-RMD160 e4287735d639d17d30a45cebfcac5f2fb75e9ee6 ChangeLog 1909
-SHA256 5b759dbec5288419a3b1b68361359d8f47629ffd845235d440b75c40a673ba80 ChangeLog 1909
+EBUILD wsdl4j-1.6.2.ebuild 1479 RMD160 f9818e012dbeebfbe17f1140f89fba1ed7456ecb SHA1 7c5d6fefc43d129373f04644d13f59588d2f5445 SHA256 f43e542e8c5aa787f3bf6acf45e91d4a8d0333110b181025db460e8b9e8ea919
+MD5 00027a08069754b74f074aa1ce867b32 wsdl4j-1.6.2.ebuild 1479
+RMD160 f9818e012dbeebfbe17f1140f89fba1ed7456ecb wsdl4j-1.6.2.ebuild 1479
+SHA256 f43e542e8c5aa787f3bf6acf45e91d4a8d0333110b181025db460e8b9e8ea919 wsdl4j-1.6.2.ebuild 1479
+MISC ChangeLog 2155 RMD160 7eea27372a3318511f577f33b309ccbd5516ed35 SHA1 980feb88eb7c00271121303b1f0b521d8af64058 SHA256 25dfe0cc2f06934812449932dd520f020aee8bf91c587fecee9f7e9952fbb29a
+MD5 96abbfaca2040f87ae575e55ea8c7eb7 ChangeLog 2155
+RMD160 7eea27372a3318511f577f33b309ccbd5516ed35 ChangeLog 2155
+SHA256 25dfe0cc2f06934812449932dd520f020aee8bf91c587fecee9f7e9952fbb29a ChangeLog 2155
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -32,10 +42,13 @@ SHA256 44df2f517ad36146511f2026f7129e2a1d014640952e74f4d7224c1f7c739f30 files/di
 MD5 1357a0c6dcd5854e751139d0396052b0 files/digest-wsdl4j-1.5.1-r1 262
 RMD160 32d45707248f59cb7b1cc77085f8d06e443be84a files/digest-wsdl4j-1.5.1-r1 262
 SHA256 44df2f517ad36146511f2026f7129e2a1d014640952e74f4d7224c1f7c739f30 files/digest-wsdl4j-1.5.1-r1 262
+MD5 700a9e2458b87504a09aa141131502c6 files/digest-wsdl4j-1.6.2 482
+RMD160 ea2b0f38ddc42bfbf569d8c4991eee8ac8b2afc1 files/digest-wsdl4j-1.6.2 482
+SHA256 04c4707e60c1725d4d06bd36bb09959690057d028efca29789a9645ecf1d189e files/digest-wsdl4j-1.6.2 482
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGab5bcxLzpIGCsLQRAhMhAJ9pqC/uAXkE+9+r2m9js4L1cqFyUgCdHjWc
-lZbXOHyXVpCFJB1oN/YZRWM=
-=VKI3
+iD8DBQFGadcjcxLzpIGCsLQRAsf+AKCOOVAOSU8ODg3/6o72BY9V/GFv2wCfZYYa
+4q6LuWZwx3vO1VVm1mQ7xlM=
+=0z1u
 -----END PGP SIGNATURE-----
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/*
+}