Remove or'd dependency on eselect-ecj.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)

5 files changed, 14 insertions, 9 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index 1d8195545941..0d4f1805b20f 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/eclipse-ecj
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.105 2015/05/17 20:10:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.106 2015/06/20 23:27:56 chewi Exp $
+
+  20 Jun 2015; James Le Cuirot <chewi@gentoo.org> eclipse-ecj-3.7.1.ebuild,
+  eclipse-ecj-3.7.2-r1.ebuild, eclipse-ecj-4.2.1.ebuild,
+  eclipse-ecj-4.4.1.ebuild, eclipse-ecj-4.4.2-r1.ebuild:
+  Remove or'd dependency on eselect-ecj.
 
   17 May 2015; Pacho Ramos <pacho@gentoo.org> eclipse-ecj-3.7.2-r1.ebuild:
   ppc64 stable wrt bug #503890
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
index da24d0842c72..708259e87792 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild,v 1.7 2015/05/17 20:10:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild,v 1.8 2015/06/20 23:27:56 chewi Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ SLOT="3.7"
 IUSE="+ant userland_GNU"
 
 COMMON_DEP="
-	|| ( app-eselect/eselect-java app-eselect/eselect-ecj )"
+	app-eselect/eselect-java"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.4"
 DEPEND="${COMMON_DEP}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
index 65ea10d9e3df..24a2eb12fd3a 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild,v 1.6 2015/03/31 18:51:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild,v 1.7 2015/06/20 23:27:56 chewi Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ SLOT="4.2"
 IUSE="+ant userland_GNU"
 
 COMMON_DEP="
-	|| ( app-eselect/eselect-java app-eselect/eselect-ecj )"
+	app-eselect/eselect-java"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.4"
 DEPEND="${COMMON_DEP}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild
index 6bacd465bcde..f0a3d18fe662 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild,v 1.7 2015/03/31 18:51:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild,v 1.8 2015/06/20 23:27:56 chewi Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ SLOT="4.4"
 IUSE="+ant userland_GNU"
 
 COMMON_DEP="
-	|| ( app-eselect/eselect-java app-eselect/eselect-ecj )"
+	app-eselect/eselect-java"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.6"
 DEPEND="${COMMON_DEP}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
index d1434307fbd7..59f431e06084 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild,v 1.2 2015/03/31 18:51:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild,v 1.3 2015/06/20 23:27:56 chewi Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ SLOT="4.4"
 IUSE="+ant"
 
 COMMON_DEP="
-	|| ( app-eselect/eselect-java app-eselect/eselect-ecj )"
+	app-eselect/eselect-java"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.6"
 DEPEND="${COMMON_DEP}