6 files changed, 29 insertions, 19 deletions
diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog
index d40e18d237e8..f002e60c3201 100644
--- a/dev-java/xalan/ChangeLog
+++ b/dev-java/xalan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xalan
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.13 2003/10/04 01:14:37 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.14 2003/12/16 03:37:21 strider Exp $
+
+*xalan-2.5.2 (15 Dec 2003)
+
+  15 Dec 2003; Adrian Almenar <strider@gentoo.org> xalan-2.4.1-r2.ebuild,
+  xalan-2.5.1.ebuild, xalan-2.5.2.ebuild:
+  Updated to latest version ~arch masked. Moved to stable on ppc and sparc.
 
   03 Oct 2003; Adrian Almenar <strider@gentoo.org> xalan-2.4.1-r2.ebuild,
   xalan-2.5.1.ebuild:
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index 860676bd54d5..03f9fcea8d5b 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,9 +1,6 @@
-MD5 24e273d83432fcf0bef18c6b6089a914 xalan-2.5.2.ebuild 2096
-MD5 861fe70ef85d6df55373fa751864b1d2 .xalan-2.5.2.ebuild.swp 12288
-MD5 56e1807f8e835bd655ea0a79bf419779 xalan-2.5.1.ebuild 2066
-MD5 59a1ea7dd0481e0e81ba7821fa07c805 xalan-2.4.1-r2.ebuild 2056
-MD5 ddfadf2aff37503f279bc0733c16685b ChangeLog 3227
+MD5 64e4a4b8a86589a1e8856c46f882bb4c xalan-2.5.2.ebuild 2171
+MD5 e92db0fbc5aeefaa8874e21743ce59da xalan-2.5.1.ebuild 2066
+MD5 202b30e9ab37206b9a971dcf0b8cfbc6 ChangeLog 3448
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 832600384d5a9df2244b080466928487 files/digest-xalan-2.4.1-r2 135
 MD5 a5b1a9afb2526d14b26feb7bec99bcc6 files/digest-xalan-2.5.1 70
 MD5 b0f396922560e5f408cadd099b5fab25 files/digest-xalan-2.5.2 70
diff --git a/dev-java/xalan/files/digest-xalan-2.4.1-r2 b/dev-java/xalan/files/digest-xalan-2.4.1-r2
deleted file mode 100644
index fcfd6c387c13..000000000000
--- a/dev-java/xalan/files/digest-xalan-2.4.1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3a3822d535d094042793c2b73d4aa2e9 /xalan-2.4.1-r2.ebuild 1981
-MD5 099c829fde4191d59120e91d4a821875 xalan-j_2_4_1-src.tar.gz 4868084
diff --git a/dev-java/xalan/files/digest-xalan-2.5.2 b/dev-java/xalan/files/digest-xalan-2.5.2
new file mode 100644
index 000000000000..817a4e345460
--- /dev/null
+++ b/dev-java/xalan/files/digest-xalan-2.5.2
@@ -0,0 +1 @@
+MD5 97dcc0514df7f791e28b5c744a55068c xalan-j_2_5_2-src.tar.gz 5738033
diff --git a/dev-java/xalan/xalan-2.5.1.ebuild b/dev-java/xalan/xalan-2.5.1.ebuild
index f23acf5d5185..62e87ed710d0 100644
--- a/dev-java/xalan/xalan-2.5.1.ebuild
+++ b/dev-java/xalan/xalan-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.5.1.ebuild,v 1.3 2003/10/04 01:14:37 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.5.1.ebuild,v 1.4 2003/12/16 03:37:22 strider Exp $
 
 MY_P=${PN}-j_${PV//./_}
 
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.3
 	>=dev-java/xerces-2.3.0"
 RDEPEND="$DEPEND"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
+KEYWORDS="x86 sparc ppc"
 IUSE="doc"
 
 src_compile() {
diff --git a/dev-java/xalan/xalan-2.4.1-r2.ebuild b/dev-java/xalan/xalan-2.5.2.ebuild
index aa1f4e78f930..52926a3a1220 100644
--- a/dev-java/xalan/xalan-2.4.1-r2.ebuild
+++ b/dev-java/xalan/xalan-2.5.2.ebuild
@@ -1,19 +1,25 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.4.1-r2.ebuild,v 1.2 2003/10/04 01:14:37 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.5.2.ebuild,v 1.1 2003/12/16 03:37:22 strider Exp $
 
-S=${WORKDIR}/${PN}-j_2_4_1
+inherit java-pkg eutils
+
+IUSE="doc"
+
+MY_P=${PN}-j_${PV//./_}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="XSLT processor"
 HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
-SRC_URI="http://xml.apache.org/dist/xalan-j/${PN}-j_2_4_1-src.tar.gz"
+SRC_URI="mirror://apache/xml/xalan-j/source/${MY_P}-src.tar.gz"
+
 LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc"
+
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.5.2
-	>=dev-java/xerces-2.3.0"
+	>=dev-java/xerces-2.6.0"
 RDEPEND="$DEPEND"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE="doc"
 
 src_compile() {
 	CLASSPATH=$CLASSPATH:`pwd`/bin/xercesImpl.jar:`pwd`/bin/bsf.jar:`pwd`/src\
@@ -32,10 +38,12 @@ src_compile() {
 }
 
 src_install () {
-	dojar build/xalan.jar
+	java-pkg_dojar build/*.jar
 	dohtml readme.html
 
 	if [ -n "`use doc`" ] ; then
+		dodir /usr/share/doc/${P}
+		dodoc TODO STATUS README LICENSE ISSUES
 		dohtml -r build/docs/*
 	fi
 }