Stop building javadoc from source because it needs excessive amounts of RAM+swap. Download and install them from the binary xalan distribution.

(Portage version: 2.1.3.19)

3 files changed, 25 insertions, 6 deletions

diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog
index 695082825be3..0f8d128502f6 100644
--- a/dev-java/xalan/ChangeLog
+++ b/dev-java/xalan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xalan
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.73 2007/11/23 16:57:42 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.74 2007/11/23 22:41:14 caster Exp $
+
+  23 Nov 2007; Vlastimil Babka <caster@gentoo.org> xalan-2.7.0-r4.ebuild:
+  Stop building javadoc from source because it needs excessive amounts of
+  RAM+swap. Download and install them from the binary xalan distribution.
 
   23 Nov 2007; Markus Rothe <corsair@gentoo.org> xalan-2.7.0-r4.ebuild:
   Stable on ppc64; bug #199501
diff --git a/dev-java/xalan/files/digest-xalan-2.7.0-r4 b/dev-java/xalan/files/digest-xalan-2.7.0-r4
index ac01d5350285..b3c07b1e227a 100644
--- a/dev-java/xalan/files/digest-xalan-2.7.0-r4
+++ b/dev-java/xalan/files/digest-xalan-2.7.0-r4
@@ -1,3 +1,6 @@
+MD5 d526d0848c88607ce4e3a0a4edb75d50 xalan-j_2_7_0-bin.tar.gz 13516702
+RMD160 54257bca9b2b2cfb86fd6974f0e8f6ec20f7d47f xalan-j_2_7_0-bin.tar.gz 13516702
+SHA256 878c8eb6eee1551ae430c2dba05426329856ffc0413b2017dd2d4ee648c5c5f7 xalan-j_2_7_0-bin.tar.gz 13516702
 MD5 7859a78a5564cae42c933adcbbecdd01 xalan-j_2_7_0-src.tar.gz 6264659
 RMD160 50d612f8750b6a2173883401b8566f700dcfb9f8 xalan-j_2_7_0-src.tar.gz 6264659
 SHA256 210843fb672b0c44138797d9d11b61c2f538b89400ce8be1f230cd666f70bb02 xalan-j_2_7_0-src.tar.gz 6264659
diff --git a/dev-java/xalan/xalan-2.7.0-r4.ebuild b/dev-java/xalan/xalan-2.7.0-r4.ebuild
index 58edb1ad6830..d5932dc70176 100644
--- a/dev-java/xalan/xalan-2.7.0-r4.ebuild
+++ b/dev-java/xalan/xalan-2.7.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.0-r4.ebuild,v 1.2 2007/11/23 16:57:42 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.0-r4.ebuild,v 1.3 2007/11/23 22:41:14 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -9,9 +9,12 @@ inherit java-pkg-2 java-ant-2 eutils versionator
 MY_PN="${PN}-j"
 MY_PV="$(replace_all_version_separators _)"
 MY_P="${MY_PN}_${MY_PV}"
+SRC_DIST="${MY_P}-src.tar.gz"
+BIN_DIST="${MY_P}-bin.tar.gz"
 DESCRIPTION="Apache's XSLT processor for transforming XML documents into HTML, text, or other XML document types."
 HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
-SRC_URI="mirror://apache/xml/${MY_PN}/source/${MY_P}-src.tar.gz"
+SRC_URI="mirror://apache/xml/${MY_PN}/source/${SRC_DIST}
+	doc? ( mirror://apache/xml/${MY_PN}/binaries/${BIN_DIST} )"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ppc64 ~x86 ~x86-fbsd"
@@ -31,7 +34,13 @@ DEPEND=">=virtual/jdk-1.4
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
-	unpack ${A}
+	unpack "${SRC_DIST}"
+	if use doc; then
+		mkdir bin || die
+		cd bin
+		unpack ${BIN_DIST} || die
+		cd ..
+	fi
 	cd "${S}"
 
 	# disable building of serializer.jar
@@ -56,7 +65,7 @@ src_unpack() {
 # When version bumping Xalan make sure that the installed jar
 # does not bunled .class files from dependencies
 src_compile() {
-	eant jar $(use_doc javadocs -Dbuild.apidocs=build/docs/api) \
+	eant jar
 		-Dxsltc.bcel_jar.not_needed=true \
 		-Dxsltc.runtime_jar.not_needed=true \
 		-Dxsltc.regexp_jar.not_needed=true
@@ -71,6 +80,9 @@ src_install() {
 	java-pkg_regjar $(java-pkg_getjar xalan-serializer serializer.jar)
 
 	java-pkg_dolauncher ${PN} --main org.apache.xalan.xslt.Process
-	use doc && java-pkg_dojavadoc build/docs/api
+	newdoc ${PN}.README.txt README || die
+	if use doc; then
+		java-pkg_dohtml -r "${WORKDIR}"/bin/${MY_P}/docs/* || die
+	fi
 	use source && java-pkg_dosrc src/org
 }