diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2004-07-27 16:17:47 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2004-07-27 16:17:47 +0000 |
| commit | 8274fb4af7af266b0aa35e95c6ea718e571a2153 (patch) | |
| tree | fddf8802d4952444f2d79096d2e38fef15534011 /dev-java/xalan | |
| parent | trim old ebuild (Manifest recommit) (diff) | |
| download | gentoo-2-8274fb4af7af266b0aa35e95c6ea718e571a2153.tar.gz gentoo-2-8274fb4af7af266b0aa35e95c6ea718e571a2153.tar.bz2 gentoo-2-8274fb4af7af266b0aa35e95c6ea718e571a2153.zip | |
fix 55252
Diffstat (limited to 'dev-java/xalan')
| -rw-r--r-- | dev-java/xalan/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/xalan/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/xalan/xalan-2.5.2.ebuild | 18 | ||||
| -rw-r--r-- | dev-java/xalan/xalan-2.6.0.ebuild | 15 |
4 files changed, 30 insertions, 13 deletions
diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog index f82211c5a995..ed65d694968d 100644 --- a/dev-java/xalan/ChangeLog +++ b/dev-java/xalan/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/xalan # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.19 2004/07/16 20:08:01 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.20 2004/07/27 16:17:47 axxo Exp $ + + 27 Jul 2004; Thomas Matthijs <axxo@gentoo.org> xalan-2.5.2.ebuild, + xalan-2.6.0.ebuild: + fix 55252 *xalan-2.6.0 (16 Jul 2004) diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest index 83cb038d93e7..7f77dcf95c36 100644 --- a/dev-java/xalan/Manifest +++ b/dev-java/xalan/Manifest @@ -1,5 +1,5 @@ -MD5 cc732854e58be07764318bfe5dcbc90d xalan-2.5.2.ebuild 2166 -MD5 cd8d296e910f06814bccc1ff64721c17 xalan-2.6.0.ebuild 2147 +MD5 47841aed2eebd720272ebc065e3a1b60 xalan-2.5.2.ebuild 2232 +MD5 f257226ffdd7c633defa7c91068519f8 xalan-2.6.0.ebuild 2233 MD5 3452916fd4374de62aea00ed36b492de ChangeLog 3865 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 b0f396922560e5f408cadd099b5fab25 files/digest-xalan-2.5.2 70 diff --git a/dev-java/xalan/xalan-2.5.2.ebuild b/dev-java/xalan/xalan-2.5.2.ebuild index 821d8edb6c4f..d517b20e4265 100644 --- a/dev-java/xalan/xalan-2.5.2.ebuild +++ b/dev-java/xalan/xalan-2.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.5.2.ebuild,v 1.5 2004/06/24 22:45:32 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.5.2.ebuild,v 1.6 2004/07/27 16:17:47 axxo Exp $ inherit java-pkg eutils @@ -20,15 +20,23 @@ DEPEND=">=virtual/jdk-1.3 RDEPEND=">=virtual/jdk-1.3 >=dev-java/xerces-2.6.0" + +can_build_doc() { + if [ `java-config --java-version 2>&1 | grep "1\.4\." | wc -l` -lt 1 ] ; then + return 0 + else + return 1 + fi +} + src_compile() { CLASSPATH=$CLASSPATH:`pwd`/bin/xercesImpl.jar:`pwd`/bin/bsf.jar:`pwd`/src\ ant jar ${myc} || die "build failed" if use doc ; then - if [ `java-config --java-version 2>&1 | grep "1\.4\." | wc -l` -lt 1 ] ; then + if can_build_doc ; then ant javadocs || die "Build Javadocs Failed" else - USE="" einfo " " einfo " 1.4.x JDKs are unable to compile Javadocs at this time. " einfo " " @@ -48,20 +56,18 @@ src_install () { } pkg_postinst() { - if use doc ; then + if use doc && can_build_doc ; then einfo " " einfo " API Documentation is in /usr/share/doc/${PN}-${PV}. " einfo " " einfo " Design documentation can be found online at: " einfo " http://xml.apache.org/xalan-j/design/design2_0_0.html" einfo " " - sleep 5 else einfo " " einfo " Online Documentation: " einfo " http://xml.apache.org/xalan-j/design/design2_0_0.html" einfo " http://xml.apache.org/xalan-j/apidocs/index.html " einfo " " - sleep 5 fi } diff --git a/dev-java/xalan/xalan-2.6.0.ebuild b/dev-java/xalan/xalan-2.6.0.ebuild index 63f2a6e63c3a..5c67c566c6d2 100644 --- a/dev-java/xalan/xalan-2.6.0.ebuild +++ b/dev-java/xalan/xalan-2.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0.ebuild,v 1.1 2004/07/16 20:08:01 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0.ebuild,v 1.2 2004/07/27 16:17:47 axxo Exp $ inherit java-pkg eutils @@ -20,15 +20,22 @@ DEPEND=">=virtual/jdk-1.3 RDEPEND=">=virtual/jdk-1.3 >=dev-java/xerces-2.6.0" +can_build_doc() { + if [ `java-config --java-version 2>&1 | grep "1\.4\." | wc -l` -lt 1 ] ; then + return 0 + else + return 1 + fi +} + src_compile() { CLASSPATH=$CLASSPATH:`pwd`/bin/xercesImpl.jar:`pwd`/bin/bsf.jar:`pwd`/src\ ant jar ${myc} || die "build failed" if use doc ; then - if [ `java-config --java-version 2>&1 | grep "1\.4\." | wc -l` -lt 1 ] ; then + if can_build_doc ; then ant javadocs || die "Build Javadocs Failed" else - USE="" einfo " " einfo " 1.4.x JDKs are unable to compile Javadocs at this time. " einfo " " @@ -48,7 +55,7 @@ src_install () { } pkg_postinst() { - if use doc ; then + if use doc && can_build_doc ; then einfo " " einfo " API Documentation is in /usr/share/doc/${PN}-${PV}. " einfo " " |