| 1 |
sera 12/06/01 12:19:42 |
| 2 |
|
| 3 |
Modified: ChangeLog ant-tasks.eclass |
| 4 |
Log: |
| 5 |
Don't assinging RDEPEND to DEPEND and vise versa. JRE in DEPEND confuses VM switching code. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.281 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.281&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.281&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.280&r2=1.281 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.280 |
| 18 |
retrieving revision 1.281 |
| 19 |
diff -u -r1.280 -r1.281 |
| 20 |
--- ChangeLog 30 May 2012 15:25:08 -0000 1.280 |
| 21 |
+++ ChangeLog 1 Jun 2012 12:19:42 -0000 1.281 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.280 2012/05/30 15:25:08 slyfox Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.281 2012/06/01 12:19:42 sera Exp $ |
| 27 |
+ |
| 28 |
+ 01 Jun 2012; Ralph Sennhauser <sera@g.o> ant-tasks.eclass: |
| 29 |
+ Don't assinging RDEPEND to DEPEND and vise versa. JRE in DEPEND confuses VM |
| 30 |
+ switching code. |
| 31 |
|
| 32 |
30 May 2012; Sergei Trofimovich <slyfox@g.o> darcs.eclass: |
| 33 |
Use 'darcs get --lazy' instead of 'darcs get --partial' (gone in darcs-2.8). |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.13 eclass/ant-tasks.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.13&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.13&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?r1=1.12&r2=1.13 |
| 42 |
|
| 43 |
Index: ant-tasks.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v |
| 46 |
retrieving revision 1.12 |
| 47 |
retrieving revision 1.13 |
| 48 |
diff -u -r1.12 -r1.13 |
| 49 |
--- ant-tasks.eclass 30 May 2012 08:21:18 -0000 1.12 |
| 50 |
+++ ant-tasks.eclass 1 Jun 2012 12:19:42 -0000 1.13 |
| 51 |
@@ -3,7 +3,7 @@ |
| 52 |
# Copyright 1999-2012 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License, v2 or later |
| 54 |
# Author Vlastimil Babka <caster@g.o> |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.12 2012/05/30 08:21:18 sera Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.13 2012/06/01 12:19:42 sera Exp $ |
| 57 |
|
| 58 |
# we set ant-core dep ourselves, restricted |
| 59 |
JAVA_ANT_DISABLE_ANT_CORE_DEP=true |
| 60 |
@@ -117,16 +117,13 @@ |
| 61 |
DEPEND="${RDEPEND}" |
| 62 |
|
| 63 |
if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then |
| 64 |
- RDEPEND=">=virtual/jre-${ANT_TASK_JREVER} |
| 65 |
- ${DEPEND}" |
| 66 |
- DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER} |
| 67 |
- ${RDEPEND}" |
| 68 |
+ RDEPEND+=" >=virtual/jre-${ANT_TASK_JREVER}" |
| 69 |
+ DEPEND+=" >=virtual/jdk-${ANT_TASK_JDKVER}" |
| 70 |
fi |
| 71 |
|
| 72 |
# we need direct blockers with old ant-tasks for file collisions - bug #252324 |
| 73 |
if version_is_at_least 1.7.1 ; then |
| 74 |
- DEPEND="${DEPEND} |
| 75 |
- !dev-java/ant-tasks" |
| 76 |
+ DEPEND+=" !dev-java/ant-tasks" |
| 77 |
fi |
| 78 |
|
| 79 |
# Would run the full ant test suite for every ant task |
Archives