diff options
| -rw-r--r-- | dev-java/commons-collections/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/commons-collections/commons-collections-3.1.ebuild | 7 | ||||
| -rw-r--r-- | dev-java/odmg/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/odmg/odmg-3.0.ebuild | 7 | ||||
| -rw-r--r-- | dev-java/puretls/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/puretls/puretls-0.94_beta4.ebuild | 13 |
6 files changed, 27 insertions, 18 deletions
diff --git a/dev-java/commons-collections/ChangeLog b/dev-java/commons-collections/ChangeLog index cf7c7aada866..6429fc43e97a 100644 --- a/dev-java/commons-collections/ChangeLog +++ b/dev-java/commons-collections/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-collections # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v 1.25 2005/01/01 18:15:23 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v 1.26 2005/01/20 17:05:26 luckyduck Exp $ + + 20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> + commons-collections-3.1.ebuild: + added missing jikes dependency. 18 Dec 2004; Markus Rothe <corsair@gentoo.org> commons-collections-3.1.ebuild: diff --git a/dev-java/commons-collections/commons-collections-3.1.ebuild b/dev-java/commons-collections/commons-collections-3.1.ebuild index 26592fefe4fd..f6653bf16fdc 100644 --- a/dev-java/commons-collections/commons-collections-3.1.ebuild +++ b/dev-java/commons-collections/commons-collections-3.1.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-collections/commons-collections-3.1.ebuild,v 1.5 2005/01/01 18:15:23 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/commons-collections-3.1.ebuild,v 1.6 2005/01/20 17:05:26 luckyduck Exp $ inherit java-pkg eutils @@ -13,8 +13,9 @@ SLOT="0" KEYWORDS="x86 sparc ppc amd64 ~ppc64" IUSE="doc jikes" DEPEND=">=virtual/jdk-1.3 - >=dev-java/ant-1.4" -RDEPEND=">=virtual/jdk-1.3" + >=dev-java/ant-1.4 + jikes? ( dev-java/jikes )" +RDEPEND=">=virtual/jre-1.3" src_compile() { local antflags="jar" diff --git a/dev-java/odmg/ChangeLog b/dev-java/odmg/ChangeLog index a70878b79cec..41bef0a65d74 100644 --- a/dev-java/odmg/ChangeLog +++ b/dev-java/odmg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/odmg -# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/odmg/ChangeLog,v 1.1 2004/10/30 20:39:36 axxo Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/odmg/ChangeLog,v 1.2 2005/01/20 17:02:11 luckyduck Exp $ + + 20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> odmg-3.0.ebuild: + added missing jikes dependency. *odmg-3.0 (30 Oct 2004) diff --git a/dev-java/odmg/odmg-3.0.ebuild b/dev-java/odmg/odmg-3.0.ebuild index 30012f144b88..8cf2494a5a9a 100644 --- a/dev-java/odmg/odmg-3.0.ebuild +++ b/dev-java/odmg/odmg-3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/odmg/odmg-3.0.ebuild,v 1.1 2004/10/30 20:39:36 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/odmg/odmg-3.0.ebuild,v 1.2 2005/01/20 17:02:11 luckyduck Exp $ inherit java-pkg @@ -16,7 +16,8 @@ SLOT="0" KEYWORDS="~x86 ~amd64" RDEPEND=">=virtual/jre-1.3" DEPEND=">=virtual/jdk-1.3 - >=dev-java/ant-core-1.5 " + >=dev-java/ant-core-1.5 + jikes? ( dev-java/jikes )" IUSE="doc jikes" S=${WORKDIR}/${SRC_P} diff --git a/dev-java/puretls/ChangeLog b/dev-java/puretls/ChangeLog index a4c082045c6f..b43c66a97f34 100644 --- a/dev-java/puretls/ChangeLog +++ b/dev-java/puretls/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/puretls # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/ChangeLog,v 1.5 2005/01/03 21:34:25 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/ChangeLog,v 1.6 2005/01/20 17:03:59 luckyduck Exp $ + + 20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> puretls-0.94_beta4.ebuild: + added missing jikes dependency. 03 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> puretls-0.94_beta4.ebuild: Package puretls no longer uses packed jars. Fixes #63266. diff --git a/dev-java/puretls/puretls-0.94_beta4.ebuild b/dev-java/puretls/puretls-0.94_beta4.ebuild index 2746cad692b6..7ff98d2349bc 100644 --- a/dev-java/puretls/puretls-0.94_beta4.ebuild +++ b/dev-java/puretls/puretls-0.94_beta4.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/puretls/puretls-0.94_beta4.ebuild,v 1.5 2005/01/03 21:34:25 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/puretls/puretls-0.94_beta4.ebuild,v 1.6 2005/01/20 17:03:59 luckyduck Exp $ inherit java-pkg @@ -13,7 +13,8 @@ KEYWORDS="~x86 ~amd64" IUSE="doc jikes" DEPEND=">=virtual/jdk-1.4 =dev-java/cryptix-asn1-bin-20011119 - =dev-java/cryptix-3.2.0" + =dev-java/cryptix-3.2.0 + jikes? ( dev-java/jikes )" RDEPEND=">=virtual/jre-1.4" S=${WORKDIR}/${PN}-0.9b4 @@ -31,12 +32,8 @@ src_unpack() { src_compile() { local antflags="compile" - if use doc; then - antflags="${antflags} javadoc" - fi - if use jikes; then - antflags="${antflags} -Dbuild.compiler=jikes" - fi + use doc && antflags="${antflags} javadoc" + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" ant ${antflags} || die "Unable to compile" } |