diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-01-27 03:45:20 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-01-27 03:45:20 +0000 |
| commit | 22fa946ccb9aaf588045cfc88d36502b6ea5679a (patch) | |
| tree | 9cd73a6b55680787e78f1d75e7a8b6a49dada77b /dev-java/jax-ws | |
| parent | Remove generation 1 write support from the eclass to make it simpler. The ecl... (diff) | |
| download | gentoo-2-22fa946ccb9aaf588045cfc88d36502b6ea5679a.tar.gz gentoo-2-22fa946ccb9aaf588045cfc88d36502b6ea5679a.tar.bz2 gentoo-2-22fa946ccb9aaf588045cfc88d36502b6ea5679a.zip | |
Building fails with 1.6 so force 1.5 for now. Fixes bug #207633.
(Portage version: 2.1.4)
Diffstat (limited to 'dev-java/jax-ws')
| -rw-r--r-- | dev-java/jax-ws/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/jax-ws/jax-ws-2.0.1.ebuild | 45 |
2 files changed, 29 insertions, 23 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/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/* - } |