Block app-editor/ng due to file collision. see #295840.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-java/nailgun/ChangeLog b/dev-java/nailgun/ChangeLog
index 91e10f14f32d95e2a0186a398b9036ce48dded63..31247f9506f62fed5003cf5e4e993917bdbd53fd 100644 (file)
--- a/dev-java/nailgun/ChangeLog
+++ b/dev-java/nailgun/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/nailgun
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/ChangeLog,v 1.4 2009/10/25 21:13:55 volkmar Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/ChangeLog,v 1.5 2010/06/26 12:34:31 ali_bush Exp $
+
+  26 Jun 2010; Alistair Bush <ali_bush@gentoo.org> nailgun-0.7.1.ebuild:
+  Block app-editor/ng due to file collision. see #295840.
 
   25 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> nailgun-0.7.1.ebuild:
   Keywording for ppc, bug 270910

diff --git a/dev-java/nailgun/nailgun-0.7.1.ebuild b/dev-java/nailgun/nailgun-0.7.1.ebuild
index 7f3fe5dc662d9659ec554f26770266f78d454afa..38dd55692378d2e1f7c234a121d653fecd5a586b 100644 (file)
--- a/dev-java/nailgun/nailgun-0.7.1.ebuild
+++ b/dev-java/nailgun/nailgun-0.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/nailgun-0.7.1.ebuild,v 1.6 2009/10/25 21:13:55 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nailgun/nailgun-0.7.1.ebuild,v 1.7 2010/06/26 12:34:31 ali_bush Exp $
 
 EAPI="2"
 
@@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="test"
 
-RDEPEND=">=virtual/jre-1.4"
+RDEPEND=">=virtual/jre-1.4
+       !app-editor/ng"
 DEPEND=">=virtual/jdk-1.4
        dev-java/java-getopt:1
        dev-java/bcel:0