| 1 |
betelgeuse 08/09/13 18:33:03 |
| 2 |
|
| 3 |
Modified: ChangeLog netbeans-5.5.1-r1.ebuild |
| 4 |
Log: |
| 5 |
Use JAVA_PKG_NV_DEPEND to work around bug #237580 (java-config not supporting slotted virtuals). |
| 6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.86 dev-util/netbeans/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.86&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?rev=1.86&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/ChangeLog?r1=1.85&r2=1.86 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v |
| 18 |
retrieving revision 1.85 |
| 19 |
retrieving revision 1.86 |
| 20 |
diff -u -r1.85 -r1.86 |
| 21 |
--- ChangeLog 12 Sep 2008 21:37:48 -0000 1.85 |
| 22 |
+++ ChangeLog 13 Sep 2008 18:33:02 -0000 1.86 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for dev-util/netbeans |
| 25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.85 2008/09/12 21:37:48 betelgeuse Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.86 2008/09/13 18:33:02 betelgeuse Exp $ |
| 28 |
+ |
| 29 |
+ 13 Sep 2008; Petteri Räty <betelgeuse@g.o> |
| 30 |
+ netbeans-5.5.1-r1.ebuild: |
| 31 |
+ Use JAVA_PKG_NV_DEPEND to work around bug #237580 (java-config not |
| 32 |
+ supporting slotted virtuals). |
| 33 |
|
| 34 |
12 Sep 2008; Petteri Räty <betelgeuse@g.o> |
| 35 |
netbeans-5.5.1-r1.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.8 dev-util/netbeans/netbeans-5.5.1-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-5.5.1-r1.ebuild?rev=1.8&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-5.5.1-r1.ebuild?rev=1.8&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/netbeans/netbeans-5.5.1-r1.ebuild?r1=1.7&r2=1.8 |
| 44 |
|
| 45 |
Index: netbeans-5.5.1-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5.1-r1.ebuild,v |
| 48 |
retrieving revision 1.7 |
| 49 |
retrieving revision 1.8 |
| 50 |
diff -u -r1.7 -r1.8 |
| 51 |
--- netbeans-5.5.1-r1.ebuild 12 Sep 2008 21:37:48 -0000 1.7 |
| 52 |
+++ netbeans-5.5.1-r1.ebuild 13 Sep 2008 18:33:02 -0000 1.8 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2008 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
EAPI=1 |
| 60 |
JAVA_PKG_IUSE="doc" |
| 61 |
@@ -72,8 +72,12 @@ |
| 62 |
# NOTE: netbeans cannot compile with latest JDK 1.7 |
| 63 |
# Uses internal xerces in Sun JDK |
| 64 |
# https://bugs.gentoo.org/show_bug.cgi?id=220197 |
| 65 |
-DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* ) |
| 66 |
- java-virtuals/jdk-with-com-sun:0 |
| 67 |
+JDK_ATOMS="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* )" |
| 68 |
+# Needed to work around https://bugs.gentoo.org/show_bug.cgi?id=237580 |
| 69 |
+JAVA_PKG_NV_DEPEND="${JDK_ATOMS} |
| 70 |
+ java-virtuals/jdk-with-com-sun" |
| 71 |
+DEPEND="${JDK_ATOMS} |
| 72 |
+ >=java-virtuals/jdk-with-com-sun-20080505-r1:0 |
| 73 |
dev-java/commons-el |
| 74 |
>=dev-java/commons-jxpath-1.1 |
| 75 |
dev-java/glassfish-persistence |
Archives