diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-09-13 18:33:02 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-09-13 18:33:02 +0000 |
| commit | 2925acb277f1535564521afa8f323d30640c57d0 (patch) | |
| tree | 20f1e5befebbf515bbb1f13a508ab7c772b408d9 /dev-util | |
| parent | Mark stable. (diff) | |
| download | gentoo-2-2925acb277f1535564521afa8f323d30640c57d0.tar.gz gentoo-2-2925acb277f1535564521afa8f323d30640c57d0.tar.bz2 gentoo-2-2925acb277f1535564521afa8f323d30640c57d0.zip | |
Use JAVA_PKG_NV_DEPEND to work around bug #237580 (java-config not supporting slotted virtuals).
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/netbeans/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/netbeans/netbeans-5.5.1-r1.ebuild | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index 61530ce9eefc..9b8c99bbc262 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/netbeans # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.85 2008/09/12 21:37:48 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.86 2008/09/13 18:33:02 betelgeuse Exp $ + + 13 Sep 2008; Petteri Räty <betelgeuse@gentoo.org> + netbeans-5.5.1-r1.ebuild: + Use JAVA_PKG_NV_DEPEND to work around bug #237580 (java-config not + supporting slotted virtuals). 12 Sep 2008; Petteri Räty <betelgeuse@gentoo.org> netbeans-5.5.1-r1.ebuild: diff --git a/dev-util/netbeans/netbeans-5.5.1-r1.ebuild b/dev-util/netbeans/netbeans-5.5.1-r1.ebuild index b4c86ca566ca..b60535a004df 100644 --- a/dev-util/netbeans/netbeans-5.5.1-r1.ebuild +++ b/dev-util/netbeans/netbeans-5.5.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5.1-r1.ebuild,v 1.7 2008/09/12 21:37:48 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5.1-r1.ebuild,v 1.8 2008/09/13 18:33:02 betelgeuse Exp $ EAPI=1 JAVA_PKG_IUSE="doc" @@ -72,8 +72,12 @@ RDEPEND=">=virtual/jre-1.5 # NOTE: netbeans cannot compile with latest JDK 1.7 # Uses internal xerces in Sun JDK # https://bugs.gentoo.org/show_bug.cgi?id=220197 -DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* ) - java-virtuals/jdk-with-com-sun:0 +JDK_ATOMS="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* )" +# Needed to work around https://bugs.gentoo.org/show_bug.cgi?id=237580 +JAVA_PKG_NV_DEPEND="${JDK_ATOMS} + java-virtuals/jdk-with-com-sun" +DEPEND="${JDK_ATOMS} + >=java-virtuals/jdk-with-com-sun-20080505-r1:0 dev-java/commons-el >=dev-java/commons-jxpath-1.1 dev-java/glassfish-persistence |