Remove unneeded dependencies and use slot deps.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 110 insertions, 5 deletions

diff --git a/dev-java/jax-ws-tools/ChangeLog b/dev-java/jax-ws-tools/ChangeLog
index 09faa2ae37b3..f7f7777a7a1a 100644
--- a/dev-java/jax-ws-tools/ChangeLog
+++ b/dev-java/jax-ws-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jax-ws-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-ws-tools/ChangeLog,v 1.7 2008/05/11 13:41:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-ws-tools/ChangeLog,v 1.8 2008/10/05 11:27:52 betelgeuse Exp $
+
+*jax-ws-tools-2.0.1-r1 (05 Oct 2008)
+
+  05 Oct 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/jax-ws-tools-2.0.1-remove-unused-saaj-import.patch,
+  +jax-ws-tools-2.0.1-r1.ebuild:
+  Remove unneeded dependencies and use slot deps.
 
   11 May 2008; Markus Meier <maekke@gentoo.org> jax-ws-tools-2.0.1.ebuild:
   amd64 stable, bug #214778
diff --git a/dev-java/jax-ws-tools/Manifest b/dev-java/jax-ws-tools/Manifest
index ffe170c4839b..181648259ed4 100644
--- a/dev-java/jax-ws-tools/Manifest
+++ b/dev-java/jax-ws-tools/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 AUX jax-ws-tools-2.0.1-gentoo.patch 1053 RMD160 85bb1c5596947bb05a4bcf9c96ef680702295430 SHA1 da19cd063251da3c4c36b7b4c2f47a3d987a20ed SHA256 44dc21a9e67dce8d2ddb2c439279ad49bef00350ed5d59cc8ee8bdd68566676c
+AUX jax-ws-tools-2.0.1-remove-unused-saaj-import.patch 679 RMD160 8e29ea0314b768e3d1878e594474d16a0ea59b12 SHA1 9a73d49301eba2efe0be33c3ae86a9e97854b3fc SHA256 1db33eb87b6304ee3a0e24a88a409a69e98d44a17f3015887b916643017d3728
 DIST JAXWS2.0.1m1_source_20060817.jar 8993405 RMD160 432cbeba178741e51706cb0f95b4bd82f0a36366 SHA1 e2a32c65913a0a7844be39ad46788b92c24babd5 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865
+EBUILD jax-ws-tools-2.0.1-r1.ebuild 2154 RMD160 9073de6387f595eb474a5d88a586ea5cfd03ab98 SHA1 3295029e1600f5f021d4ebf8d453e4dac0687da6 SHA256 bf2a2ebe87bcc51e331d05d94b7fd805a56327badbba39339d8225a13cce383c
 EBUILD jax-ws-tools-2.0.1.ebuild 2482 RMD160 ae88b55f161b2783d0f6f3ff261e3b71897619dd SHA1 bca31fee304a72875cfc871d75f9faf143b39d36 SHA256 0b211c8f55e7f29324e204a2b318feae1b6354a040f2fa5834fc616bafef6a3d
-MISC ChangeLog 1064 RMD160 23f3a9722236529a0aec85786b96afb3d560a5d0 SHA1 be8bf7e03a6fe3639dd93fd36fdef49ae72804a9 SHA256 6f70fade4a9cb62df95e87a6afd498e25554fb18c35882e0501fbb09a49794c0
+MISC ChangeLog 1304 RMD160 adc19c3d04e94cbe89a6eea64d9ff38d8ab147a0 SHA1 cbecdd95a75728823e0e3350b6bdc869f9f9926c SHA256 7df2064a9d5bd03cf4cfda7fd24378fc1c73eca4b2d4f60cbc2d189826cbd918
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgm98kACgkQkKaRLQcq0GJx3gCfdiPNe8JBnTo4tfNIoNV01teZ
-mZcAn32/soIAoJrF601alAsWniJlv3bp
-=NhQc
+iEYEARECAAYFAkjopL8ACgkQcxLzpIGCsLTQGACfaNtWDYd81j/A2wPY2FT+nMfY
+bY0An0ZTKhIoKN/RykTtl/vKEcjCW3sw
+=9v3y
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jax-ws-tools/files/jax-ws-tools-2.0.1-remove-unused-saaj-import.patch b/dev-java/jax-ws-tools/files/jax-ws-tools-2.0.1-remove-unused-saaj-import.patch
new file mode 100644
index 000000000000..ee4ff8f324be
--- /dev/null
+++ b/dev-java/jax-ws-tools/files/jax-ws-tools-2.0.1-remove-unused-saaj-import.patch
@@ -0,0 +1,11 @@
+diff -ur jaxws-si.old/src/tools/wscompile/src/com/sun/tools/ws/util/xml/XmlUtil.java jaxws-si/src/tools/wscompile/src/com/sun/tools/ws/util/xml/XmlUtil.java
+--- jaxws-si.old/src/tools/wscompile/src/com/sun/tools/ws/util/xml/XmlUtil.java	2008-10-05 12:32:27.000000000 +0300
++++ jaxws-si/src/tools/wscompile/src/com/sun/tools/ws/util/xml/XmlUtil.java	2008-10-05 12:32:42.000000000 +0300
+@@ -44,7 +44,6 @@
+ import org.w3c.dom.NodeList;

+ import org.w3c.dom.Text;

+ 

+-import com.sun.xml.messaging.saaj.util.ByteInputStream;

+ import com.sun.tools.ws.util.WSDLParseException;

+ import com.sun.xml.ws.util.xml.NamedNodeMapIterator;

+ import com.sun.xml.ws.util.xml.NodeListIterator;

diff --git a/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild b/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..5e29a3a61dc1
--- /dev/null
+++ b/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-ws-tools/jax-ws-tools-2.0.1-r1.ebuild,v 1.1 2008/10/05 11:27:52 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Reference implementation of the Java API for XML Web Services"
+HOMEPAGE="http://jax-ws.dev.java.net/"
+DATE="20060817"
+MY_P="JAXWS${PV}m1_source_${DATE}.jar"
+SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
+
+LICENSE="CDDL"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/istack-commons-runtime:0
+	dev-java/istack-commons-tools:0
+	dev-java/jaxb:2
+	dev-java/jaxb-tools:2
+	dev-java/txw2-runtime:0
+	dev-java/jsr173:0
+	>=dev-java/jsr181-1.0:0
+	dev-java/jax-ws-api:2
+	dev-java/jax-ws:2
+	dev-java/codemodel:2
+	dev-java/apt-mirror:0"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/jaxws-si"
+
+src_unpack() {
+	echo "A" | java -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+
+	unpack ./jaxws-src.zip || die "unzip failed"
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jarfrom istack-commons-runtime
+	java-pkg_jarfrom istack-commons-tools
+	java-pkg_jarfrom jaxb-2
+	java-pkg_jarfrom jaxb-tools-2
+	java-pkg_jarfrom txw2-runtime
+	java-pkg_jarfrom jsr173
+	java-pkg_jarfrom jsr181
+	java-pkg_jarfrom jax-ws-api-2
+	java-pkg_jarfrom jax-ws-2
+	java-pkg_jarfrom codemodel-2
+	java-pkg_jarfrom apt-mirror
+	java-pkg_jarfrom --build-only ant-core
+	ln -s $(java-config --tools) || die
+
+	cp \
+		"${S}"/src/tools/wscompile/build/gen-src/com/sun/tools/ws/resources/*.java \
+		"${S}"/src/tools/wscompile/src/com/sun/tools/ws/resources/ || die "cp failed"
+
+	find "${S}/src/" -name '*.java' -exec \
+		sed -i -e \
+			's,com.sun.org.apache.xml.internal.resolver,org.apache.xml.resolver,g' \
+			{} \;
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-remove-unused-saaj-import.patch"
+
+}
+
+EANT_BUILD_TARGET="build"
+
+src_install() {
+
+	java-pkg_dojar jax-ws-tools.jar
+
+	use source && java-pkg_dosrc src/tools/wscompile/src/*
+
+}