From: Vlastimil Babka Date: Wed, 10 Jan 2007 11:19:38 +0000 (+0000) Subject: Build xslt engine without xalan dependency - it's using generic implementation that... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1975033abcb6ce613a41c3c5c8b4350d9d4a9e92;p=gentoo.git Build xslt engine without xalan dependency - it's using generic implementation that's part of JDK 1.4+. Package-Manager: portage-2.1.2_rc4-r7 --- diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog index ce771313a090..4ec6bf589568 100644 --- a/dev-java/bsf/ChangeLog +++ b/dev-java/bsf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/bsf # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.34 2007/01/09 00:20:27 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.35 2007/01/10 11:19:38 caster Exp $ + +*bsf-2.3.0-r5 (10 Jan 2007) + + 10 Jan 2007; Vlastimil Babka +bsf-2.3.0-r5.ebuild: + Build xslt engine without xalan dependency - it's using generic + implementation that's part of JDK 1.4+. 09 Jan 2007; Vlastimil Babka bsf-2.3.0-r4.ebuild: Removed xalan dependency (it's optional)to prevent circular deps reported diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest index 1676abad176b..72d4cf1fc237 100644 --- a/dev-java/bsf/Manifest +++ b/dev-java/bsf/Manifest @@ -20,10 +20,14 @@ EBUILD bsf-2.3.0-r4.ebuild 1661 RMD160 2193c8a9deb1930f79f89a12bdb421541738a01b MD5 4dcf081e5a43ae0c7a27c65ac14fd7bf bsf-2.3.0-r4.ebuild 1661 RMD160 2193c8a9deb1930f79f89a12bdb421541738a01b bsf-2.3.0-r4.ebuild 1661 SHA256 71aed65c12dc47e2e644fdb74d3668d9e84b8c779458c39233bba212e5b70158 bsf-2.3.0-r4.ebuild 1661 -MISC ChangeLog 4181 RMD160 ec8e88de45cd7d4d5b707f0d3c7ba7849ea35bbb SHA1 fe0c35b3cd0fd50f4ec2fe690fc0ba7195e92cf0 SHA256 4a1c203aa7b5cd4312cac322147de14415271f530a7cd6c170491a098249b9c9 -MD5 1f36391f8db55ea44eeb5fc70481d620 ChangeLog 4181 -RMD160 ec8e88de45cd7d4d5b707f0d3c7ba7849ea35bbb ChangeLog 4181 -SHA256 4a1c203aa7b5cd4312cac322147de14415271f530a7cd6c170491a098249b9c9 ChangeLog 4181 +EBUILD bsf-2.3.0-r5.ebuild 1780 RMD160 275dcd0fc366e9e7270d1e1daa9327efbe0cfb55 SHA1 fb8c8eae50bfe07c894f4b7a995a7bf820d9c12b SHA256 11e3853bb3babd88a84f76d39d25eeb47bb6b0dee8cffac026b73114a54780fa +MD5 d863b6b061f24cd89e632dc8d0dd0e38 bsf-2.3.0-r5.ebuild 1780 +RMD160 275dcd0fc366e9e7270d1e1daa9327efbe0cfb55 bsf-2.3.0-r5.ebuild 1780 +SHA256 11e3853bb3babd88a84f76d39d25eeb47bb6b0dee8cffac026b73114a54780fa bsf-2.3.0-r5.ebuild 1780 +MISC ChangeLog 4392 RMD160 9ca13b0d3d2c44897c66a5ffe9d0377062aeb680 SHA1 9c1b8effd3391a50a517cc12b24efca5b00daca0 SHA256 f5b743e2a0d6778bcf82f75e6c87becaf2c65dfb7d3b923af3ba684921d06687 +MD5 9c2043036e36be39abc631d46017b340 ChangeLog 4392 +RMD160 9ca13b0d3d2c44897c66a5ffe9d0377062aeb680 ChangeLog 4392 +SHA256 f5b743e2a0d6778bcf82f75e6c87becaf2c65dfb7d3b923af3ba684921d06687 ChangeLog 4392 MISC metadata.xml 829 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e SHA1 b4c3798c8d0e0ce8dd99884e47f15a7a09be2aba SHA256 12ff3afd1cc82efa3392c06b9bc411bd50318d1b2180b9765d723a51a7922e10 MD5 2a5c0decd09ba5a48289b129458bf44c metadata.xml 829 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e metadata.xml 829 @@ -37,3 +41,6 @@ SHA256 86c62d16b61f6ffbea891ea0403e91b69d2c423d209d14a10f3434b46d07eb0c files/di MD5 acc51178000478a121155b2958e2d811 files/digest-bsf-2.3.0-r4 491 RMD160 82ebc43e7da7ba54c8c82c7ab2bfcd1661e5f3fb files/digest-bsf-2.3.0-r4 491 SHA256 86c62d16b61f6ffbea891ea0403e91b69d2c423d209d14a10f3434b46d07eb0c files/digest-bsf-2.3.0-r4 491 +MD5 acc51178000478a121155b2958e2d811 files/digest-bsf-2.3.0-r5 491 +RMD160 82ebc43e7da7ba54c8c82c7ab2bfcd1661e5f3fb files/digest-bsf-2.3.0-r5 491 +SHA256 86c62d16b61f6ffbea891ea0403e91b69d2c423d209d14a10f3434b46d07eb0c files/digest-bsf-2.3.0-r5 491 diff --git a/dev-java/bsf/bsf-2.3.0-r5.ebuild b/dev-java/bsf/bsf-2.3.0-r5.ebuild new file mode 100644 index 000000000000..9413c505be23 --- /dev/null +++ b/dev-java/bsf/bsf-2.3.0-r5.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r5.ebuild,v 1.1 2007/01/10 11:19:38 caster Exp $ + +inherit java-pkg-2 eutils java-ant-2 + +DESCRIPTION="Bean Script Framework" +HOMEPAGE="http://jakarta.apache.org/bsf/" +SRC_URI="http://cvs.apache.org/dist/jakarta/${PN}/v${PV}rc1/src/${PN}-src-${PV}.tar.gz + mirror://gentoo/bsf-rhino-1.5.patch.bz2" +LICENSE="Apache-1.1" +SLOT="2.3" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="doc jython rhino source" + +COMMON_DEP=" + jython? ( >=dev-java/jython-2.1-r5 ) + rhino? ( =dev-java/rhino-1.5* ) + =dev-java/servletapi-2.3*" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.4 + dev-java/ant-core + source? ( app-arch/zip ) + ${COMMON_DEP}" + +src_unpack() { + unpack ${A} + + epatch "${WORKDIR}/bsf-rhino-1.5.patch" + epatch "${FILESDIR}/${P}-classpath.patch" + epatch "${FILESDIR}/${P}-no-autodetection.patch" +} + +src_compile() { + local cp + # it checks for xalan but uses generic XSLT, part of JDK 1.4+ + # see bug #161011 for more info + local antflags="-Dxalan.present=true" + if use rhino; then + antflags="${antflags} -Drhino.present=true" + cp="${cp}:$(java-pkg_getjars rhino-1.5)" + fi + if use jython; then + antflags="${antflags} -Djython.present=true" + cp="${cp}:$(java-pkg_getjars jython)" + fi + + cd ${S}/src/taglib + eant -Dservlet.jar="$(java-pkg_getjars servletapi-2.3)" compile + + cd ${S}/src + eant -Dgentoo.classpath=${cp} ${antflags} compile $(use_doc javadocs) +} + +src_install() { + java-pkg_dojar src/build/lib/bsf.jar + + use doc && java-pkg_dohtml -r src/build/javadocs/* + if use source; then + java-pkg_dosrc src/bsf/src/* src/bsf_debug/src/* + java-pkg_dosrc src/jsdb/src/* src/taglib/src/org + fi +} diff --git a/dev-java/bsf/files/digest-bsf-2.3.0-r5 b/dev-java/bsf/files/digest-bsf-2.3.0-r5 new file mode 100644 index 000000000000..3c966492a8ca --- /dev/null +++ b/dev-java/bsf/files/digest-bsf-2.3.0-r5 @@ -0,0 +1,6 @@ +MD5 db5d0f665631f91a13d721f8756df36f bsf-rhino-1.5.patch.bz2 10818 +RMD160 18d4d1f4153855679766c1b60679459c2937797b bsf-rhino-1.5.patch.bz2 10818 +SHA256 62afe966897b6f136a6f38f61a8959871c48ef8552a12fd96ce22c0dfab5d9ad bsf-rhino-1.5.patch.bz2 10818 +MD5 78bae3747ca5734bb7554eed6868b7da bsf-src-2.3.0.tar.gz 1035181 +RMD160 24d378bca1f68950b9b2699192c3138fb2bff7e4 bsf-src-2.3.0.tar.gz 1035181 +SHA256 ed0caf3567d7c084f21c0f0ce38077384c8e4afc80a1df7a2095a53ada777503 bsf-src-2.3.0.tar.gz 1035181