[gentoo-commits] gentoo-x86 commit in eclass: ant-tasks.eclass

[Vlastimil Babka (caster)]

caster      08/12/25 00:39:03

  Modified:             ant-tasks.eclass
  Log:
  Add a blocker on dev-java/ant-tasks for tasks with version >=1.7.1 to solve bug #252324.

Revision  Changes    Path
1.7                  eclass/ant-tasks.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ant-tasks.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ant-tasks.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ant-tasks.eclass?r1=1.6&r2=1.7

Index: ant-tasks.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ant-tasks.eclass	14 Jul 2008 21:38:14 -0000	1.6
+++ ant-tasks.eclass	25 Dec 2008 00:39:03 -0000	1.7
@@ -3,7 +3,7 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Vlastimil Babka <caster@g.o>
-# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.6 2008/07/14 21:38:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.7 2008/12/25 00:39:03 caster Exp $
 
 # we set ant-core dep ourselves, restricted
 JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@@ -104,6 +104,12 @@
 DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER}
 	${RDEPEND}"
 
+# we need direct blockers with old ant-tasks for file collisions - bug #252324
+if version_is_at_least 1.7.1 ; then
+	DEPEND="${DEPEND}
+		!dev-java/ant-tasks"
+fi
+
 # Would run the full ant test suite for every ant task
 RESTRICT="test"