3 files changed, 17 insertions, 89 deletions
diff --git a/www-servers/axis/ChangeLog b/www-servers/axis/ChangeLog
index 8ebe4d092a34..1352832a6655 100644
--- a/www-servers/axis/ChangeLog
+++ b/www-servers/axis/ChangeLog
@@ -1,6 +1,10 @@
 # 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.20 2007/11/24 19:29:49 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.21 2008/03/22 22:31:00 betelgeuse Exp $
+
+  22 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
+  -axis-1.2_rc2-r2.ebuild:
+  Delete old revision.
 
   24 Nov 2007; Samuli Suominen <drac@gentoo.org> axis-1.2_rc2-r3.ebuild:
   amd64 stable wrt #199264
diff --git a/www-servers/axis/Manifest b/www-servers/axis/Manifest
index 0b43121f18ee..af690006ba6f 100644
--- a/www-servers/axis/Manifest
+++ b/www-servers/axis/Manifest
@@ -1,6 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX axis-1.2-gentoo.patch 2907 RMD160 3397193b83066f3765097f2221feb2ff422e6d3e SHA1 bbf142e26c6ef8c737689eac32bbf48e6cfbeb3f SHA256 b5ddd460fcce1f0baac621f2a745aa59a0a00670759e21628d16a4dcf0e75fcb
 DIST axis-1_2RC2-src.tar.gz 9888710 RMD160 3543f87a148b524ccb2c1f5e71f7a22f6cf5d338 SHA1 b3f5142136790bf4bafe8c47b66b69c46fae5d2c SHA256 58d34b947c524eeb898a76f0d62020377216ee1173d9c62b70d7b5bb87393ce8
-EBUILD axis-1.2_rc2-r2.ebuild 2058 RMD160 4c64f199e8592bdef9a68d254f270143f1365216 SHA1 0904d685a647e526c84b9192f3dff5d7384ef79e SHA256 24b6cfef2610ebefcf9b8addb116a8ee56e809bdab97befd527065764c801bb9
 EBUILD axis-1.2_rc2-r3.ebuild 2059 RMD160 466153f90868e69c5c40aeb64d4113fce56ee10f SHA1 9bcf5b325b9f137f3385b739c63ee2dee638eba4 SHA256 131addfaa00701ed81c175613451355c8ce43732a152f354ac9a7fb5097d3e31
-MISC ChangeLog 2846 RMD160 66ca20b236f7c84a7b8f787bf39670c43f431347 SHA1 5983b1028228b58eccab983808d96a53b589915e SHA256 343fa3b25ccf042ee46886f89f16af42fb925df5a4f310238e37b4adb5087015
+MISC ChangeLog 2956 RMD160 79a70bd23deb10671d25577a59e7e1966543b074 SHA1 8f2d1ad4c5bbb87ff98c3efd06f5b8855c6f9457 SHA256 92fdc58987edae61608521fd57ce058a53f66bffb53440ea94bd1cd92cdc3d56
 MISC metadata.xml 742 RMD160 8cdf22b8bb2f82933b9c42fb834d0284eab1a708 SHA1 6e907aeb23531d1390c708450bea8699819eaf1d SHA256 332e698c934cea8ec2bb1ad5600bb7edb69298af92ca92085e3bad370be820ff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH5YimcxLzpIGCsLQRAoZvAJ4irh+0tPWmP3ynYh9MeWKg4O+RXgCdGDiD
+nFOLfrArnSj6fnwmvpVmiHo=
+=xBB6
+-----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
deleted file mode 100644
index 154cda1ff8f4..000000000000
--- a/www-servers/axis/axis-1.2_rc2-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.3 2007/07/24 08:18:32 opfer 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
-}