axis compiles fine against the latest slot of dev-java/castor so use that

Package-Manager: portage-2.1.2.7

5 files changed, 115 insertions, 14 deletions

diff --git a/www-servers/axis/ChangeLog b/www-servers/axis/ChangeLog
index 46b16aade3ea..ad315eef5ba4 100644
--- a/www-servers/axis/ChangeLog
+++ b/www-servers/axis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/axis
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.13 2007/05/19 21:01:32 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.14 2007/06/02 17:54:24 betelgeuse Exp $
+
+*axis-1.2_rc2-r2 (02 Jun 2007)
+
+  02 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +axis-1.2_rc2-r2.ebuild:
+  axis compiles fine against the latest slot of dev-java/castor so use that
 
   19 May 2007; Petteri Räty <betelgeuse@gentoo.org> -axis-1.2_rc2.ebuild:
   Remove generation 1 ebuild from the tree so that sun-javamail-bin can be
diff --git a/www-servers/axis/Manifest b/www-servers/axis/Manifest
index a07343b19c5a..6e744256df06 100644
--- a/www-servers/axis/Manifest
+++ b/www-servers/axis/Manifest
@@ -10,21 +10,28 @@ EBUILD axis-1.2_rc2-r1.ebuild 2057 RMD160 1622a5765ceb2645c3e390e1df8fca8dca678a
 MD5 1358efacafd3a4b9378caced998e4619 axis-1.2_rc2-r1.ebuild 2057
 RMD160 1622a5765ceb2645c3e390e1df8fca8dca678af2 axis-1.2_rc2-r1.ebuild 2057
 SHA256 32217d25d55d7e2285862dc134ec8becd8f9354db188aec606cb45f38393e3e8 axis-1.2_rc2-r1.ebuild 2057
-MISC ChangeLog 1968 RMD160 f8845a3ab79107d248f7f0257e9acc62d073c30b SHA1 fabc79d61c139037846ee04dd84254fd3e444105 SHA256 ee43c84eb72fae2fa2f69147038b7bafc1dc644d030942c5e96b773278d63fc6
-MD5 9106ac81073c9815430872929151c3d4 ChangeLog 1968
-RMD160 f8845a3ab79107d248f7f0257e9acc62d073c30b ChangeLog 1968
-SHA256 ee43c84eb72fae2fa2f69147038b7bafc1dc644d030942c5e96b773278d63fc6 ChangeLog 1968
-MISC metadata.xml 746 RMD160 6fc15c34f66c99b8d9a3ff7a11516b970b7d96e9 SHA1 e90694966220f7c260ab294a8dfb7b53c06059c3 SHA256 ac3423452ff29d47ceb84cea5a23682744d89f0e029c3567bbcf8a858106ae5b
-MD5 aa938bc7f143d74b90cfa34d1ac729ad metadata.xml 746
-RMD160 6fc15c34f66c99b8d9a3ff7a11516b970b7d96e9 metadata.xml 746
-SHA256 ac3423452ff29d47ceb84cea5a23682744d89f0e029c3567bbcf8a858106ae5b metadata.xml 746
+EBUILD axis-1.2_rc2-r2.ebuild 2065 RMD160 3b28fe7a1d786d0d52d35846219ca651e6a11e0b SHA1 2cb689c033e0368fd27065337350a0aa2e52c699 SHA256 055c4a4605bb3c73a9d205e1e106de1244a7183264dcc59499d549ca6931c1a6
+MD5 6307aeabe4dd9edb0b5b5041f61e44aa axis-1.2_rc2-r2.ebuild 2065
+RMD160 3b28fe7a1d786d0d52d35846219ca651e6a11e0b axis-1.2_rc2-r2.ebuild 2065
+SHA256 055c4a4605bb3c73a9d205e1e106de1244a7183264dcc59499d549ca6931c1a6 axis-1.2_rc2-r2.ebuild 2065
+MISC ChangeLog 2157 RMD160 15bbb6f4e057dafc01ac428ab14e7927e52f281e SHA1 1016bf32b16e3eaf98ebf2becc5136a39312c7ae SHA256 25b62533d554a2b91bc392417df06b8166cd7764f8b811707430361953b2814a
+MD5 5e4ad661f20eabfdd9cee380cbf3e470 ChangeLog 2157
+RMD160 15bbb6f4e057dafc01ac428ab14e7927e52f281e ChangeLog 2157
+SHA256 25b62533d554a2b91bc392417df06b8166cd7764f8b811707430361953b2814a ChangeLog 2157
+MISC metadata.xml 742 RMD160 8cdf22b8bb2f82933b9c42fb834d0284eab1a708 SHA1 6e907aeb23531d1390c708450bea8699819eaf1d SHA256 332e698c934cea8ec2bb1ad5600bb7edb69298af92ca92085e3bad370be820ff
+MD5 619ccdedd42a6b674672da1f8dd8e520 metadata.xml 742
+RMD160 8cdf22b8bb2f82933b9c42fb834d0284eab1a708 metadata.xml 742
+SHA256 332e698c934cea8ec2bb1ad5600bb7edb69298af92ca92085e3bad370be820ff metadata.xml 742
 MD5 109cde9f8c57337d766394e1b55ede4e files/digest-axis-1.2_rc2-r1 250
 RMD160 643dcf8488bef39724abf63483bd37bcd6bf49c2 files/digest-axis-1.2_rc2-r1 250
 SHA256 2cefc416820596280ba5180969192f8647507a5b5a3573ebcbb8557240d48f37 files/digest-axis-1.2_rc2-r1 250
+MD5 109cde9f8c57337d766394e1b55ede4e files/digest-axis-1.2_rc2-r2 250
+RMD160 643dcf8488bef39724abf63483bd37bcd6bf49c2 files/digest-axis-1.2_rc2-r2 250
+SHA256 2cefc416820596280ba5180969192f8647507a5b5a3573ebcbb8557240d48f37 files/digest-axis-1.2_rc2-r2 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGT2W0cxLzpIGCsLQRApVVAKCCggQZzfpXeLt3Oww99jFmuJe7igCfe9Js
-faJkC7VYtN81nQeZFVXd0TY=
-=4YuG
+iD8DBQFGYa7ScxLzpIGCsLQRAl8JAKCdg6zt6GpjtyWB2ElLEqoLEii1hgCfQFLt
+2riKG7AWge6ftgk+0e2/o2k=
+=0lwh
 -----END PGP SIGNATURE-----
diff --git a/www-servers/axis/axis-1.2_rc2-r2.ebuild b/www-servers/axis/axis-1.2_rc2-r2.ebuild
new file mode 100644
index 000000000000..c4bb25cfc8fd
--- /dev/null
+++ b/www-servers/axis/axis-1.2_rc2-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/axis-1.2_rc2-r2.ebuild,v 1.1 2007/06/02 17:54:24 betelgeuse Exp $
+
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="${PV//./_}"
+MY_PV="${MY_PV/_rc2/RC2}"
+MY_P="${PN}-${MY_PV}"
+SRCFILE="${MY_P}-src.tar.gz"
+DESCRIPTION="Apache Axis SOAP implementation"
+HOMEPAGE="http://ws.apache.org/axis/"
+SRC_URI="mirror://apache/ws/${PN}/${MY_PV}/${SRCFILE}"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+COMMON_DEPEND="
+		=dev-java/servletapi-2.4*
+		dev-java/commons-logging
+		dev-java/commons-discovery
+		dev-java/log4j
+		dev-java/wsdl4j
+		>=dev-java/xerces-2.7
+		=dev-java/rhino-1.5*
+		>=dev-java/castor-1.0
+		>=dev-java/sun-jimi-1.0
+		=dev-java/commons-httpclient-2*
+		>=dev-java/bsf-2.3
+		dev-java/sun-jaf
+		dev-java/sun-javamail"
+RDEPEND="
+		>=virtual/jre-1.4
+		${COMMON_DEPEND}"
+DEPEND="=virtual/jdk-1.4*
+		${COMMON_DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/axis-1.2-gentoo.patch"
+
+	find . -name "*.jar" -exec rm -v {} \;
+
+	cd "${S}/lib"
+	java-pkg_jar-from commons-discovery
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from log4j
+	java-pkg_jar-from wsdl4j
+	java-pkg_jar-from sun-jaf
+	java-pkg_jar-from servletapi-2.4
+	java-pkg_jar-from sun-javamail
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from sun-jimi
+	java-pkg_jar-from castor-1.0
+	java-pkg_jar-from commons-httpclient
+	java-pkg_jar-from bsf-2.3
+}
+
+src_compile() {
+	local antflags="compile -Ddeprecation=false -Dbase.path=/opt"
+	use debug && antflags="${antflags} -Ddebug=on"
+	use !debug && antflags="${antflags} -Ddebug=off"
+	# has prebuild javadocs
+	eant ${antflags}
+}
+
+src_install() {
+	java-pkg_dojar build/lib/axis*.jar
+	java-pkg_dojar build/lib/jaxrpc.jar
+	java-pkg_dojar build/lib/saaj.jar
+
+	dohtml release-notes.html changelog.html || die
+	if use doc; then
+		java-pkg_dohtml -r docs/*
+		dosym /usr/share/doc/${PF}/html/{apiDocs,api} || die
+	fi
+}
diff --git a/www-servers/axis/files/digest-axis-1.2_rc2-r2 b/www-servers/axis/files/digest-axis-1.2_rc2-r2
new file mode 100644
index 000000000000..798d83ec9502
--- /dev/null
+++ b/www-servers/axis/files/digest-axis-1.2_rc2-r2
@@ -0,0 +1,3 @@
+MD5 a5424fcb51e2f3e9ad53db2186185ad6 axis-1_2RC2-src.tar.gz 9888710
+RMD160 3543f87a148b524ccb2c1f5e71f7a22f6cf5d338 axis-1_2RC2-src.tar.gz 9888710
+SHA256 58d34b947c524eeb898a76f0d62020377216ee1173d9c62b70d7b5bb87393ce8 axis-1_2RC2-src.tar.gz 9888710
diff --git a/www-servers/axis/metadata.xml b/www-servers/axis/metadata.xml
index 44b5c227d518..d75e8a6c1c56 100644
--- a/www-servers/axis/metadata.xml
+++ b/www-servers/axis/metadata.xml
@@ -8,6 +8,6 @@ Apache Axis is an implementation of the SOAP ("Simple Object Access Protocol") s
 
 From the draft W3C specification:
 
-    SOAP is a lightweight protocol for exchange of information in a decentralized, distributed environment. It is an XML based protocol that consists of three parts: an envelope that defines a framework for describing what is in a message and how to process it, a set of encoding rules for expressing instances of application-defined datatypes, and a convention for representing remote procedure calls and responses.
+SOAP is a lightweight protocol for exchange of information in a decentralized, distributed environment. It is an XML based protocol that consists of three parts: an envelope that defines a framework for describing what is in a message and how to process it, a set of encoding rules for expressing instances of application-defined datatypes, and a convention for representing remote procedure calls and responses.
 </longdescription>
 </pkgmetadata>