diff options
author | Vlastimil Babka <caster@gentoo.org> | 2006-12-05 11:29:36 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2006-12-05 11:29:36 +0000 |
commit | 402417561554b2072c8e0cbd612ef4dad7444bb9 (patch) | |
tree | 4bb84e12f9ad6a9ace3cf2ed3e2b645144940749 /dev-util/netbeans | |
parent | stable x86, security bug #156693 (diff) | |
download | gentoo-2-402417561554b2072c8e0cbd612ef4dad7444bb9.tar.gz gentoo-2-402417561554b2072c8e0cbd612ef4dad7444bb9.tar.bz2 gentoo-2-402417561554b2072c8e0cbd612ef4dad7444bb9.zip |
Fix jdk/jre dep atoms wrt bug #157197.
(Portage version: 2.1.2_rc2-r5)
Diffstat (limited to 'dev-util/netbeans')
-rw-r--r-- | dev-util/netbeans/ChangeLog | 5 | ||||
-rw-r--r-- | dev-util/netbeans/netbeans-5.5-r1.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index c4a03a4589bc..338c6ce4cd3b 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/netbeans # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.41 2006/11/30 16:03:05 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.42 2006/12/05 11:29:36 caster Exp $ + + 05 Dec 2006; Vlastimil Babka <caster@gentoo.org> netbeans-5.5-r1.ebuild: + Fix jdk/jre dep atoms wrt bug #157197. 30 Nov 2006; Vlastimil Babka <caster@gentoo.org> netbeans-4.0-r2.ebuild: Update xerces dep for upcoming 2.6 slotmove. diff --git a/dev-util/netbeans/netbeans-5.5-r1.ebuild b/dev-util/netbeans/netbeans-5.5-r1.ebuild index 52dc5c5cc0a3..7fae83e5a292 100644 --- a/dev-util/netbeans/netbeans-5.5-r1.ebuild +++ b/dev-util/netbeans/netbeans-5.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r1.ebuild,v 1.1 2006/12/05 05:00:46 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r1.ebuild,v 1.2 2006/12/05 11:29:36 caster Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -48,7 +48,7 @@ SLOT="5.5" KEYWORDS="~amd64 ~x86" IUSE="debug doc" -RDEPEND=">=virtual/jre-1.5* +RDEPEND=">=virtual/jre-1.5 dev-java/antlr dev-java/commons-el =dev-java/commons-beanutils-1.6* @@ -82,7 +82,7 @@ RDEPEND=">=virtual/jre-1.5* =www-servers/tomcat-5.5* " DEPEND="${RDEPEND} - >=virtual/jdk-1.5* + >=virtual/jdk-1.5 >=dev-java/ant-1.6.2 dev-util/pmd dev-libs/libxslt |