junit dependency now optional. fixes #75661.

diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog
index 53fcdec3a23db91ced5a1a1113c8730ebd8a7df7..a913b3eeab08bb528376ec50c7d6e2380537de4b 100644 (file)
--- a/dev-java/commons-cli/ChangeLog
+++ b/dev-java/commons-cli/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-cli
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.16 2005/01/01 18:14:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.17 2005/01/03 23:09:04 luckyduck Exp $
+
+  04 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> commons-cli-1.0-r4.ebuild:
+  junit dependency is now optional, controlled by the junit useflag. fixes
+  #75661.
 
   18 Dec 2004; Markus Rothe <corsair@gentoo.org> commons-cli-1.0-r4.ebuild:
   added ~ppc64 to KEYWORDS

diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index dd6ed74a3720662e9dc307d2a5bb0c4fc508df45..c24d15aaee8ad5729ae17140535889e7c2958f6e 100644 (file)
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,5 @@
-MD5 1659a32ae83503c07a2b7efdfb25c937 ChangeLog 2603
-MD5 42b1b6ce95ebfdd377c1f679e70c13bb commons-cli-1.0-r4.ebuild 1485
+MD5 94776a741109e2fd9c60fdb93e49689e commons-cli-1.0-r4.ebuild 1593
+MD5 f08c62979e72bf5a269b7204fcf847d8 ChangeLog 2767
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 b534e655c6a40ff5b01098dddcda205c files/commons-cli-1.0-gentoo.diff 4407
 MD5 8e1e3125e998bf49313b7e5ac3a5b1a0 files/digest-commons-cli-1.0-r4 62

diff --git a/dev-java/commons-cli/commons-cli-1.0-r4.ebuild b/dev-java/commons-cli/commons-cli-1.0-r4.ebuild
index a2112358f011ffe581e4d6dc405d93bbc00ab42a..5ce6c1d23e6b3d0004d76ec7007193c33cdbb8de 100644 (file)
--- a/dev-java/commons-cli/commons-cli-1.0-r4.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r4.ebuild,v 1.6 2005/01/01 18:14:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r4.ebuild,v 1.7 2005/01/03 23:09:04 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -8,11 +8,12 @@ DESCRIPTION="The CLI library provides a simple and easy to use API for working w
 HOMEPAGE="http://jakarta.apache.org/commons/cli/"
 SRC_URI="mirror://apache/jakarta/commons/cli/source/cli-${PV}-src.tar.gz"
 DEPEND=">=virtual/jdk-1.3
-       >=dev-java/ant-1.4
+       junit? ( >=dev-java/junit-3.7 )
+       jikes? ( >=dev-java/jikes-1.21 )
+       >=dev-java/ant-1.6.2"
+RDEPEND=">=virtual/jre-1.3
        >=dev-java/commons-logging-1.0
-       >=dev-java/junit-3.7
        >=dev-java/commons-lang-1.0"
-RDEPEND=">=virtual/jdk-1.3"
 LICENSE="Apache-1.1"
 SLOT="1"
 KEYWORDS="x86 sparc ppc amd64 ~ppc64"
@@ -21,24 +22,36 @@ IUSE="doc jikes junit"
 src_unpack() {
        unpack ${A}
        cd ${S}
+
        epatch ${FILESDIR}/${PN}-${PV}-gentoo.diff || die "patch failed"
        echo "commons-logging.jar=`java-config -p commons-logging`" >> build.properties
        echo "commons-lang.jar=`java-config -p commons-lang`" >> build.properties
-       use junit && echo "junit.jar=`java-config -p junit`" >> build.properties
+       if use junit; then
+               echo "junit.jar=`java-config -p junit`" >> build.properties
+       fi
 }
 
 src_compile() {
        local antflags="jar"
-       use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-       use doc && antflags="${antflags} javadoc"
-       use junit && antflags="${antflags} test"
+       if use doc; then
+               antflags="${antflags} javadoc"
+       fi
+       if use junit; then
+               antflags="${antflags} test"
+       fi
+       if use jikes; then
+               antflags="${antflags} -Dbuild.compiler=jikes"
+       fi
        ant ${antflags} || die "compilation failed"
 }
 
 src_install() {
        mv ${S}/target/${P}.jar ${S}/target/${PN}.jar
        java-pkg_dojar target/${PN}.jar
-       use doc && java-pkg_dohtml -r target/docs/
+
        dodoc README.txt
+       if use doc; then
+               java-pkg_dohtml -r target/docs/
+       fi
 }