Fix jdk/jre dep atoms wrt bug #157197.

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index c4a03a4589bc7eae500c417908be0b43afa12b16..338c6ce4cd3b00d5d6ba0edf480c08be49d71f88 100644 (file)
--- 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/Manifest b/dev-util/netbeans/Manifest
index 9ec27769ca19b21187eb1d7f48e4e1fe96707056..642a5d33bbd696a192a55af2b7ead6053059f7a0 100644 (file)
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -82,18 +82,18 @@ EBUILD netbeans-4.0-r2.ebuild 12158 RMD160 4fa102e403d9e091ebf5f78d3d167883f4a15
 MD5 c91ea133494c3d4da4a923ba735a7e3c netbeans-4.0-r2.ebuild 12158
 RMD160 4fa102e403d9e091ebf5f78d3d167883f4a155ea netbeans-4.0-r2.ebuild 12158
 SHA256 a923be2e401927bbd7a1f073ec1a9786170879269d277f77cf9c29f678bdf975 netbeans-4.0-r2.ebuild 12158
-EBUILD netbeans-5.5-r1.ebuild 12566 RMD160 c59e9bb78e2beee85398eb90706dfddfa5734b20 SHA1 f0bcfdefd7450de9a3ba972e5b4f66059d0579f7 SHA256 6996daf525f4369a3c776c27da169378aa08ff0b996f9de7f52892a05d75b0c5
-MD5 5e1a817f7780922df630bb4e3d74e81a netbeans-5.5-r1.ebuild 12566
-RMD160 c59e9bb78e2beee85398eb90706dfddfa5734b20 netbeans-5.5-r1.ebuild 12566
-SHA256 6996daf525f4369a3c776c27da169378aa08ff0b996f9de7f52892a05d75b0c5 netbeans-5.5-r1.ebuild 12566
+EBUILD netbeans-5.5-r1.ebuild 12565 RMD160 8b20ca98d98fac919d7d4561cb346c6938dbf067 SHA1 1f19d988afd09b11ec8fa9c55a3cdf2f712ba9c9 SHA256 704abc709cb6f4e8686cc685e4008c48c7de6a3b4f0af395704c915577adcfa1
+MD5 e063f40e3a221a151b6cacfea922cf60 netbeans-5.5-r1.ebuild 12565
+RMD160 8b20ca98d98fac919d7d4561cb346c6938dbf067 netbeans-5.5-r1.ebuild 12565
+SHA256 704abc709cb6f4e8686cc685e4008c48c7de6a3b4f0af395704c915577adcfa1 netbeans-5.5-r1.ebuild 12565
 EBUILD netbeans-5.5.ebuild 12040 RMD160 58615616d6c6adfc7942018ad2ae1742fbbe3444 SHA1 dab4495cafde165374b08e2409a099b259b4de7f SHA256 981e9e2beca751d13d5de2d25923f41952e667ebed3ef8ef4cde7055db511e9e
 MD5 64dd8a713504d3253e475306a1cabdc0 netbeans-5.5.ebuild 12040
 RMD160 58615616d6c6adfc7942018ad2ae1742fbbe3444 netbeans-5.5.ebuild 12040
 SHA256 981e9e2beca751d13d5de2d25923f41952e667ebed3ef8ef4cde7055db511e9e netbeans-5.5.ebuild 12040
-MISC ChangeLog 7462 RMD160 e71b7077486b733df465afbd2d8700c7a96fb086 SHA1 f68d6ba3d704c333380700c9cbdd9d2d6906bf71 SHA256 01300d2ae8fb8ddb934dfb4f6a3ce329bb8c8c5889cc4bbf17ca763910314b14
-MD5 e2e72e13370643407f0b565043ecfc12 ChangeLog 7462
-RMD160 e71b7077486b733df465afbd2d8700c7a96fb086 ChangeLog 7462
-SHA256 01300d2ae8fb8ddb934dfb4f6a3ce329bb8c8c5889cc4bbf17ca763910314b14 ChangeLog 7462
+MISC ChangeLog 7579 RMD160 06d71a4d5e37c63fb0e3b5a99b8124f47d6a5671 SHA1 8e949ce9ab6810e73308594284b642cd5aac2068 SHA256 958028a780beba246d618bc6ec8eb640facca7e235d1585f1961a731bdd9c0ef
+MD5 797259b12f541a1bb6a9658a606e77d6 ChangeLog 7579
+RMD160 06d71a4d5e37c63fb0e3b5a99b8124f47d6a5671 ChangeLog 7579
+SHA256 958028a780beba246d618bc6ec8eb640facca7e235d1585f1961a731bdd9c0ef ChangeLog 7579
 MISC metadata.xml 1237 RMD160 83495b588f0cedfe35669e4ab6d44d12f2e026f2 SHA1 b6f667a9aa69cf56d639149476fd54a532ae7188 SHA256 34bb370e7dbf14e39fcdf259db781bacd7484158b845bf6a1087d826845cda11
 MD5 c106aa59ce9920ea675aab4342118df8 metadata.xml 1237
 RMD160 83495b588f0cedfe35669e4ab6d44d12f2e026f2 metadata.xml 1237

diff --git a/dev-util/netbeans/netbeans-5.5-r1.ebuild b/dev-util/netbeans/netbeans-5.5-r1.ebuild
index 52dc5c5cc0a3c20fdaf67501206d70edfc9f5b89..7fae83e5a292a311fc6e90ab9dfb07f144b24acc 100644 (file)
--- 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