Use slot 3 of commons-httpclient.

Package-Manager: portage-2.1.3_rc8

4 files changed, 109 insertions, 8 deletions

diff --git a/www-servers/axis/ChangeLog b/www-servers/axis/ChangeLog
index ad315eef5ba4..8fdba96a5a57 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.14 2007/06/02 17:54:24 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.15 2007/07/22 10:20:40 betelgeuse Exp $
+
+*axis-1.2_rc2-r3 (22 Jul 2007)
+
+  22 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +axis-1.2_rc2-r3.ebuild:
+  Use slot 3 of commons-httpclient.
 
 *axis-1.2_rc2-r2 (02 Jun 2007)
 
diff --git a/www-servers/axis/Manifest b/www-servers/axis/Manifest
index 6e744256df06..aedc14aba1f8 100644
--- a/www-servers/axis/Manifest
+++ b/www-servers/axis/Manifest
@@ -14,10 +14,14 @@ EBUILD axis-1.2_rc2-r2.ebuild 2065 RMD160 3b28fe7a1d786d0d52d35846219ca651e6a11e
 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
+EBUILD axis-1.2_rc2-r3.ebuild 2067 RMD160 f19d4f3a34c8052bbc0750f52ac3c87db881a149 SHA1 83a787273a0ecba5a67136291b582c60743ffa52 SHA256 c1f8d320882d7636fd37d8ca4ce4ef751274f23be599e136f1d5a3b8786f8ed2
+MD5 f2f2dddc2e4f7dc7a95fd1ae10eb24f2 axis-1.2_rc2-r3.ebuild 2067
+RMD160 f19d4f3a34c8052bbc0750f52ac3c87db881a149 axis-1.2_rc2-r3.ebuild 2067
+SHA256 c1f8d320882d7636fd37d8ca4ce4ef751274f23be599e136f1d5a3b8786f8ed2 axis-1.2_rc2-r3.ebuild 2067
+MISC ChangeLog 2306 RMD160 1eae23670a53638f15bd4e9818be573fbb347b32 SHA1 e71221b3d6826971712e46652b4defdc4d07d312 SHA256 f92ff06f513d8c72f14badcf22b7d5fddc16c0e090258cc5ba019659df613f88
+MD5 67e9afab0fcbce3dc1e9e808512885a1 ChangeLog 2306
+RMD160 1eae23670a53638f15bd4e9818be573fbb347b32 ChangeLog 2306
+SHA256 f92ff06f513d8c72f14badcf22b7d5fddc16c0e090258cc5ba019659df613f88 ChangeLog 2306
 MISC metadata.xml 742 RMD160 8cdf22b8bb2f82933b9c42fb834d0284eab1a708 SHA1 6e907aeb23531d1390c708450bea8699819eaf1d SHA256 332e698c934cea8ec2bb1ad5600bb7edb69298af92ca92085e3bad370be820ff
 MD5 619ccdedd42a6b674672da1f8dd8e520 metadata.xml 742
 RMD160 8cdf22b8bb2f82933b9c42fb834d0284eab1a708 metadata.xml 742
@@ -28,10 +32,13 @@ SHA256 2cefc416820596280ba5180969192f8647507a5b5a3573ebcbb8557240d48f37 files/di
 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
+MD5 109cde9f8c57337d766394e1b55ede4e files/digest-axis-1.2_rc2-r3 250
+RMD160 643dcf8488bef39724abf63483bd37bcd6bf49c2 files/digest-axis-1.2_rc2-r3 250
+SHA256 2cefc416820596280ba5180969192f8647507a5b5a3573ebcbb8557240d48f37 files/digest-axis-1.2_rc2-r3 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGYa7ScxLzpIGCsLQRAl8JAKCdg6zt6GpjtyWB2ElLEqoLEii1hgCfQFLt
-2riKG7AWge6ftgk+0e2/o2k=
-=0lwh
+iD8DBQFGoy92cxLzpIGCsLQRAowDAJ9aAd6KyDO0zURHbPBlTwyug0phEgCeIPmz
+sZzj42if6Sr0ZLPXuP8fAqA=
+=+6Hc
 -----END PGP SIGNATURE-----
diff --git a/www-servers/axis/axis-1.2_rc2-r3.ebuild b/www-servers/axis/axis-1.2_rc2-r3.ebuild
new file mode 100644
index 000000000000..d61e51327f6f
--- /dev/null
+++ b/www-servers/axis/axis-1.2_rc2-r3.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-r3.ebuild,v 1.1 2007/07/22 10:20:40 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-3*
+		>=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-3
+	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-r3 b/www-servers/axis/files/digest-axis-1.2_rc2-r3
new file mode 100644
index 000000000000..798d83ec9502
--- /dev/null
+++ b/www-servers/axis/files/digest-axis-1.2_rc2-r3
@@ -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