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

Package-Manager: portage-2.1.3.19

4 files changed, 37 insertions, 17 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/Manifest b/dev-java/xalan/Manifest
index 831549f581e7..74b244932473 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,16 +1,17 @@
+DIST xalan-j_2_7_0-bin.tar.gz 13516702 RMD160 54257bca9b2b2cfb86fd6974f0e8f6ec20f7d47f SHA1 cf88e553e8fa5b69df93bae06edb29952dac596a SHA256 878c8eb6eee1551ae430c2dba05426329856ffc0413b2017dd2d4ee648c5c5f7
 DIST xalan-j_2_7_0-src.tar.gz 6264659 RMD160 50d612f8750b6a2173883401b8566f700dcfb9f8 SHA1 d77adca82934b188c625b1f72aee715ab2b4348f SHA256 210843fb672b0c44138797d9d11b61c2f538b89400ce8be1f230cd666f70bb02
 EBUILD xalan-2.7.0-r3.ebuild 1730 RMD160 976b17608cd99caf5b2077fd8cafbce1ec9f6334 SHA1 9d714d3252c60eaeb15120901c2154fa3dec07fc SHA256 d247e1d62d9bc3afc61305e81ca7f866a033a311a9c19cdd2fc6ec2a8e3be922
 MD5 7f7cef4adb7ea8d5ec1ae1c81d55c3fa xalan-2.7.0-r3.ebuild 1730
 RMD160 976b17608cd99caf5b2077fd8cafbce1ec9f6334 xalan-2.7.0-r3.ebuild 1730
 SHA256 d247e1d62d9bc3afc61305e81ca7f866a033a311a9c19cdd2fc6ec2a8e3be922 xalan-2.7.0-r3.ebuild 1730
-EBUILD xalan-2.7.0-r4.ebuild 2448 RMD160 b26cc27d16e7d363d9d9fb292deb285c9acefb9e SHA1 86ba5673aa00de2fd46a81a8c39dcb1b7f502fe2 SHA256 8a369383da0cca00a021b615044b0c611fe6c17d62e20bb13f092985e93ab55b
-MD5 3818d22036f73b54d92ab37d55e3aef1 xalan-2.7.0-r4.ebuild 2448
-RMD160 b26cc27d16e7d363d9d9fb292deb285c9acefb9e xalan-2.7.0-r4.ebuild 2448
-SHA256 8a369383da0cca00a021b615044b0c611fe6c17d62e20bb13f092985e93ab55b xalan-2.7.0-r4.ebuild 2448
-MISC ChangeLog 10652 RMD160 be536dadfda12641f457d1157eb9a6c9be30585f SHA1 a5641852e90b255c0822f4c465af5cf7ff2e0d79 SHA256 7cb714f128d6404a7c788b0c1d1aefa147dfcae1e57e68c338eca00619277711
-MD5 0f526b284d98b6c43269ee7dda5afbc7 ChangeLog 10652
-RMD160 be536dadfda12641f457d1157eb9a6c9be30585f ChangeLog 10652
-SHA256 7cb714f128d6404a7c788b0c1d1aefa147dfcae1e57e68c338eca00619277711 ChangeLog 10652
+EBUILD xalan-2.7.0-r4.ebuild 2677 RMD160 041880123e32af1530367e613ef9b756007f28e0 SHA1 071d0218e88a4c65944c829245d0490f810627c7 SHA256 ce599b3800a7aaef4556ce24bc428a9e2b778d9f2531e87783ff5ff4dc824b0a
+MD5 345fd934f5c9219c4448acc8b82071d7 xalan-2.7.0-r4.ebuild 2677
+RMD160 041880123e32af1530367e613ef9b756007f28e0 xalan-2.7.0-r4.ebuild 2677
+SHA256 ce599b3800a7aaef4556ce24bc428a9e2b778d9f2531e87783ff5ff4dc824b0a xalan-2.7.0-r4.ebuild 2677
+MISC ChangeLog 10874 RMD160 fe59d8f91830c01eb9f72bd53f0261abf74719a1 SHA1 3e7e4383479dae7e373a061c979a8bd2a926d5cd SHA256 c6e702cbe5ca1b2fbdcd4a76e10a233355a79254d101af0f8af744cf186b6ea6
+MD5 f151e8afbaefd6d51dc848c1d074b070 ChangeLog 10874
+RMD160 fe59d8f91830c01eb9f72bd53f0261abf74719a1 ChangeLog 10874
+SHA256 c6e702cbe5ca1b2fbdcd4a76e10a233355a79254d101af0f8af744cf186b6ea6 ChangeLog 10874
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -18,6 +19,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 c4bd9e033dfd12f166e9f103104a8698 files/digest-xalan-2.7.0-r3 256
 RMD160 cdcdaca8b15cee6d71534b1b9b6398e38178a190 files/digest-xalan-2.7.0-r3 256
 SHA256 3943b42e6cc9e9628b9b73eba240913afb4d499eb35b2654e8b6514b808f72d5 files/digest-xalan-2.7.0-r3 256
-MD5 c4bd9e033dfd12f166e9f103104a8698 files/digest-xalan-2.7.0-r4 256
-RMD160 cdcdaca8b15cee6d71534b1b9b6398e38178a190 files/digest-xalan-2.7.0-r4 256
-SHA256 3943b42e6cc9e9628b9b73eba240913afb4d499eb35b2654e8b6514b808f72d5 files/digest-xalan-2.7.0-r4 256
+MD5 f2814f7b8f25e3693492221e8b9e38dd files/digest-xalan-2.7.0-r4 515
+RMD160 1eb8f6e1667c93b97aecac9e236709c8d5d13efa files/digest-xalan-2.7.0-r4 515
+SHA256 8dc552116e1d2eb21e5873c1393e632b3dc8d86e20eb39ee087e5d0b8814f05e files/digest-xalan-2.7.0-r4 515
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
 }