Building fails with 1.6 so force 1.5 for now. Fixes bug #207633.

Package-Manager: portage-2.1.4

3 files changed, 47 insertions, 31 deletions

diff --git a/dev-java/jax-ws/ChangeLog b/dev-java/jax-ws/ChangeLog
index af382a56c608..0903f5893c14 100644
--- a/dev-java/jax-ws/ChangeLog
+++ b/dev-java/jax-ws/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jax-ws
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-ws/ChangeLog,v 1.6 2007/08/19 19:15:09 wltjr Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-ws/ChangeLog,v 1.7 2008/01/27 03:45:20 betelgeuse Exp $
+
+  27 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> jax-ws-2.0.1.ebuild:
+  Building fails with 1.6 so force 1.5 for now. Fixes bug #207633.
 
   19 Aug 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   jax-ws-2.0.1.ebuild:
diff --git a/dev-java/jax-ws/Manifest b/dev-java/jax-ws/Manifest
index a6c3475c55a5..b661b1be7d5c 100644
--- a/dev-java/jax-ws/Manifest
+++ b/dev-java/jax-ws/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jax-ws-2.0.1-gentoo.patch 2689 RMD160 6368c80754c538c02f8592b357ebd7c8f4e80419 SHA1 3cfe7cd807bcbd0090d676f52b76b6bc35e5e0fb SHA256 2ca42ac4b2eb5c03be94fc135edd1736f2a9e4e980098e1feb4dab107bd2601f
 MD5 130efc10fe84adf4ab03e3dbef5cf77c files/jax-ws-2.0.1-gentoo.patch 2689
 RMD160 6368c80754c538c02f8592b357ebd7c8f4e80419 files/jax-ws-2.0.1-gentoo.patch 2689
 SHA256 2ca42ac4b2eb5c03be94fc135edd1736f2a9e4e980098e1feb4dab107bd2601f files/jax-ws-2.0.1-gentoo.patch 2689
 DIST JAXWS2.0.1m1_source_20060817.jar 8993405 RMD160 432cbeba178741e51706cb0f95b4bd82f0a36366 SHA1 e2a32c65913a0a7844be39ad46788b92c24babd5 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865
-EBUILD jax-ws-2.0.1.ebuild 2116 RMD160 77a5c9e79dd58b9ca98d5b6f7b6974ec8d8d9957 SHA1 ff80fdad22d8940aa0d67e5c1d3c4e656bf9c01a SHA256 37aacc7a01e6f1f10727500db082050045c9ec643b3ae55e6f70a73dcf68c801
-MD5 f3430673ff3cde2d4c0a71336d6591ff jax-ws-2.0.1.ebuild 2116
-RMD160 77a5c9e79dd58b9ca98d5b6f7b6974ec8d8d9957 jax-ws-2.0.1.ebuild 2116
-SHA256 37aacc7a01e6f1f10727500db082050045c9ec643b3ae55e6f70a73dcf68c801 jax-ws-2.0.1.ebuild 2116
-MISC ChangeLog 924 RMD160 458c542091b223c9fc26c5619f16bbe4fc395aa4 SHA1 f9ff8bdd8a5045cd2b59f6b0c462aaa0811dd885 SHA256 536b6ab2e826eae5d24a758cfde3d17fb4f5e4f4dc7bf0e7be472dae0960e6d2
-MD5 324c4e7d06d3d876283a08553b0cd577 ChangeLog 924
-RMD160 458c542091b223c9fc26c5619f16bbe4fc395aa4 ChangeLog 924
-SHA256 536b6ab2e826eae5d24a758cfde3d17fb4f5e4f4dc7bf0e7be472dae0960e6d2 ChangeLog 924
+EBUILD jax-ws-2.0.1.ebuild 2236 RMD160 4158a9bcc474073d67957924324a644ee71ea87b SHA1 ff35133414bc2450c915fbd1395be791f7dc4dbb SHA256 53147597e4f7dd4cd680bbace3e62eddcfa05f49cc8f15655f70928a15ff6273
+MD5 f35ba2e0be3b09791d1e43285d92c750 jax-ws-2.0.1.ebuild 2236
+RMD160 4158a9bcc474073d67957924324a644ee71ea87b jax-ws-2.0.1.ebuild 2236
+SHA256 53147597e4f7dd4cd680bbace3e62eddcfa05f49cc8f15655f70928a15ff6273 jax-ws-2.0.1.ebuild 2236
+MISC ChangeLog 1071 RMD160 47928d4002af1c6b001573e0398cdc4edefefdca SHA1 9e203cc43ee232af6fb386526c0b9283c2a90fc0 SHA256 e39af9352ebbc11dce818c2a55acb03b92877c7d113f096c81640bac6a99a50b
+MD5 00decb7c82ed6649c57665e0e4e8085e ChangeLog 1071
+RMD160 47928d4002af1c6b001573e0398cdc4edefefdca ChangeLog 1071
+SHA256 e39af9352ebbc11dce818c2a55acb03b92877c7d113f096c81640bac6a99a50b ChangeLog 1071
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159
 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159
@@ -18,3 +21,10 @@ SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb metadata
 MD5 e964e6d4ee79b70dbbd6eeaec446f438 files/digest-jax-ws-2.0.1 280
 RMD160 fb3efd1999c57c21ee20701275f830d9de08ceea files/digest-jax-ws-2.0.1 280
 SHA256 40754afb909153a2e40229ccd2b666a902a01e5ffce75df5290e704f95422651 files/digest-jax-ws-2.0.1 280
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHm/6UcxLzpIGCsLQRAi+5AJwKooZ6sBN+F+Jvi0n9XT008kFe3gCdGNkC
+944aV0jhq0rmyzq1gdiJh20=
+=Si75
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jax-ws/jax-ws-2.0.1.ebuild b/dev-java/jax-ws/jax-ws-2.0.1.ebuild
index e95dbdf7e51c..17f1bd8f5ee0 100644
--- a/dev-java/jax-ws/jax-ws-2.0.1.ebuild
+++ b/dev-java/jax-ws/jax-ws-2.0.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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/jax-ws-2.0.1.ebuild,v 1.5 2007/08/19 19:15:09 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-ws/jax-ws-2.0.1.ebuild,v 1.6 2008/01/27 03:45:20 betelgeuse Exp $
 
+EAPI=1
 JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 java-ant-2 eutils
@@ -17,24 +18,28 @@ SLOT="2"
 KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE=""
 
-COMMON_DEP="dev-java/istack-commons-runtime
-	=dev-java/jax-ws-api-2*
-	=dev-java/jaxb-2*
-	dev-java/jsr173
+COMMON_DEP="dev-java/istack-commons-runtime:0
+	dev-java/jax-ws-api:2
+	dev-java/jaxb:2
+	dev-java/jsr173:0
 	>=dev-java/jsr181-1.0
-	dev-java/jsr250
-	=dev-java/sun-httpserver-bin-2*
-	dev-java/jsr67
-	dev-java/saaj
-	dev-java/sjsxp
-	dev-java/stax-ex
-	dev-java/sun-jaf
-	dev-java/txw2-runtime
-	dev-java/xmlstreambuffer
-	dev-java/xml-commons-resolver"
-DEPEND=">=virtual/jdk-1.5
+	dev-java/jsr250:0
+	dev-java/sun-httpserver-bin:2
+	dev-java/jsr67:0
+	dev-java/saaj:0
+	dev-java/sjsxp:0
+	dev-java/stax-ex:0
+	dev-java/sun-jaf:0
+	dev-java/txw2-runtime:0
+	dev-java/xmlstreambuffer:0
+	dev-java/xml-commons-resolver:0"
+
+# abstract interface problems with 1.5
+# https://bugs.gentoo.org/show_bug.cgi?id=207633
+DEPEND="=virtual/jdk-1.5*
 	app-arch/unzip
 	${COMMON_DEP}"
+
 RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
 
@@ -65,8 +70,8 @@ src_unpack() {
 	java-pkg_jarfrom xmlstreambuffer
 
 	cp \
-		${S}/src/rt/build/gen-src/com/sun/xml/ws/resources/*.java \
-		${S}/src/rt/src/com/sun/xml/ws/resources/ || die "cp failed"
+		"${S}"/src/rt/build/gen-src/com/sun/xml/ws/resources/*.java \
+		"${S}"/src/rt/src/com/sun/xml/ws/resources/ || die "cp failed"
 
 	find "${S}/src/" -name '*.java' -exec \
 		sed -i -e \
@@ -81,9 +86,7 @@ src_unpack() {
 EANT_BUILD_TARGET="build"
 
 src_install() {
-
 	java-pkg_dojar jax-ws.jar
 
 	use source && java-pkg_dosrc src/rt/src/*
-
 }