diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2010-06-26 12:34:31 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2010-06-26 12:34:31 +0000 |
| commit | d2555902617082c8398d9a0a2f4f78f6ebbf507b (patch) | |
| tree | 66d495a444b944e0e6f56d0fc8c5e1585035d1d1 /dev-java/nailgun | |
| parent | ppc stable #320467 (diff) | |
| download | gentoo-2-d2555902617082c8398d9a0a2f4f78f6ebbf507b.tar.gz gentoo-2-d2555902617082c8398d9a0a2f4f78f6ebbf507b.tar.bz2 gentoo-2-d2555902617082c8398d9a0a2f4f78f6ebbf507b.zip | |
Block app-editor/ng due to file collision. see #295840.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/nailgun')
| -rw-r--r-- | dev-java/nailgun/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/nailgun/nailgun-0.7.1.ebuild | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/nailgun/ChangeLog b/dev-java/nailgun/ChangeLog index 91e10f14f32d..31247f9506f6 100644 --- 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 7f3fe5dc662d..38dd55692378 100644 --- 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 |