From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1IvhD5-00077A-BW for garchives@archives.gentoo.org; Fri, 23 Nov 2007 22:41:19 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.2/8.14.0) with SMTP id lANMfHYM006982; Fri, 23 Nov 2007 22:41:17 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.2/8.14.0) with ESMTP id lANMfGL4006977 for ; Fri, 23 Nov 2007 22:41:16 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 383D365070 for ; Fri, 23 Nov 2007 22:41:16 +0000 (UTC) Received: from caster by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1IvhD1-0001Cw-AZ for gentoo-commits@lists.gentoo.org; Fri, 23 Nov 2007 22:41:15 +0000 From: "Vlastimil Babka (caster)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, caster@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-java/xalan: xalan-2.7.0-r4.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: xalan-2.7.0-r4.ebuild ChangeLog X-VCS-Directories: dev-java/xalan X-VCS-Committer: caster X-VCS-Committer-Name: Vlastimil Babka Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Vlastimil Babka Date: Fri, 23 Nov 2007 22:41:15 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: 8a5fb37a-41a1-458e-878f-f74d50c6c163 X-Archives-Hash: bff65d7c70f48310ed43376d4ed7f757 caster 07/11/23 22:41:15 Modified: xalan-2.7.0-r4.ebuild ChangeLog Log: 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) Revision Changes Path 1.3 dev-java/xalan/xalan-2.7.0-r4.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/xalan/xalan-2.7.0-r4.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/xalan/xalan-2.7.0-r4.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/xalan/xalan-2.7.0-r4.ebuild?r1=1.2&r2=1.3 Index: xalan-2.7.0-r4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.0-r4.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xalan-2.7.0-r4.ebuild 23 Nov 2007 16:57:42 -0000 1.2 +++ xalan-2.7.0-r4.ebuild 23 Nov 2007 22:41:14 -0000 1.3 @@ -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 @@ 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 @@ 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 @@ # 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 @@ 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 } 1.74 dev-java/xalan/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/xalan/ChangeLog?rev=1.74&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/xalan/ChangeLog?rev=1.74&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/xalan/ChangeLog?r1=1.73&r2=1.74 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- ChangeLog 23 Nov 2007 16:57:42 -0000 1.73 +++ ChangeLog 23 Nov 2007 22:41:14 -0000 1.74 @@ -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 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 xalan-2.7.0-r4.ebuild: Stable on ppc64; bug #199501 -- gentoo-commits@gentoo.org mailing list