diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-08-20 16:19:10 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-08-20 16:19:10 +0000 |
| commit | c29a937d7a4f78818301d127684d03ba1a6f3c7c (patch) | |
| tree | f27d4eecb69b5fa032795cb9f2c3e56b578c92b0 /dev-db | |
| parent | Dropped ppc-macos keyword, see you in prefix (diff) | |
| download | gentoo-2-c29a937d7a4f78818301d127684d03ba1a6f3c7c.tar.gz gentoo-2-c29a937d7a4f78818301d127684d03ba1a6f3c7c.tar.bz2 gentoo-2-c29a937d7a4f78818301d127684d03ba1a6f3c7c.zip | |
Restrict jdk in DEPEND to 1.4 only for added abstract API in 1.5+, reported by opfer in bug #189277.
(Portage version: 2.1.3.5)
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 | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog index 51da731f6290..840c2af9b15b 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.10 2007/07/12 22:25:17 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.11 2007/08/20 16:19:10 caster Exp $ + + 20 Aug 2007; Vlastimil Babka <caster@gentoo.org> octopus-3.0.1-r1.ebuild: + Restrict jdk in DEPEND to 1.4 only for added abstract API in 1.5+, reported + by opfer in bug #189277. 12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> -octopus-3.0.1.ebuild: Remove generation 1 ebuild. diff --git a/dev-db/octopus/octopus-3.0.1-r1.ebuild b/dev-db/octopus/octopus-3.0.1-r1.ebuild index f99cfe647b66..5678282ea54e 100644 --- a/dev-db/octopus/octopus-3.0.1-r1.ebuild +++ b/dev-db/octopus/octopus-3.0.1-r1.ebuild @@ -1,6 +1,6 @@ # 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.6 2007/07/12 22:23:34 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r1.ebuild,v 1.7 2007/08/20 16:19:10 caster Exp $ JAVA_PKG_IUSE="doc source" @@ -24,11 +24,11 @@ COMMON_DEP=" >=dev-java/ant-core-1.4" # Does not like org.w3c.dom.Node -# from 1.6 +# from 1.5+ RDEPEND=">=virtual/jre-1.4 ${COMMON_DEP}" -DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) +DEPEND="=virtual/jdk-1.4* ${COMMON_DEP}" TOPDIR="${PN}-$(get_version_component_range 1-2)" |