diff options
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/octopus/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/octopus/octopus-3.0.1-r1.ebuild | 20 |
2 files changed, 17 insertions, 9 deletions
diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog index 52d642fc939c..a0ed8db602b2 100644 --- a/dev-db/octopus/ChangeLog +++ b/dev-db/octopus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/octopus # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.8 2007/02/13 06:27:42 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.9 2007/07/12 22:23:34 betelgeuse Exp $ + + 12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> + octopus-3.0.1-r1.ebuild: + Prefer virtual/jdk-1.5 over 1.4 and use JAVA_PKG_IUSE. 13 Feb 2007; Christian Faulhammer <opfer@gentoo.org> octopus-3.0.1-r1.ebuild: diff --git a/dev-db/octopus/octopus-3.0.1-r1.ebuild b/dev-db/octopus/octopus-3.0.1-r1.ebuild index 432c0ed82f79..f99cfe647b66 100644 --- a/dev-db/octopus/octopus-3.0.1-r1.ebuild +++ b/dev-db/octopus/octopus-3.0.1-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r1.ebuild,v 1.5 2007/02/13 06:27:42 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r1.ebuild,v 1.6 2007/07/12 22:23:34 betelgeuse Exp $ + +JAVA_PKG_IUSE="doc source" inherit versionator java-pkg-2 java-ant-2 @@ -13,19 +15,21 @@ HOMEPAGE="http://octopus.objectweb.org" LICENSE="LGPL-2.1" SLOT="3.0" KEYWORDS="~amd64 x86" -IUSE="doc source" -# Does not like org.w3c.dom.Node -# from 1.6 -RDEPEND="|| ( =virtual/jre-1.4* =virtual/jdk-1.5* ) +IUSE="" +COMMON_DEP=" >=dev-java/xerces-2.7 >=dev-java/log4j-1.2.8 =dev-java/rhino-1.6* dev-java/junit >=dev-java/ant-core-1.4" -DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) - ${RDEPEND} - source? ( app-arch/zip )" +# Does not like org.w3c.dom.Node +# from 1.6 +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" + +DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) + ${COMMON_DEP}" TOPDIR="${PN}-$(get_version_component_range 1-2)" S=${WORKDIR}/${TOPDIR}/Octopus-src |