From a911d1c9698b03ba7b7df47676cce40bad545e24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Tue, 26 Jan 2016 19:18:46 +0100 Subject: [PATCH] dev-java/maven-bin: removed dependency on app-eselect/eselect-maven as it will be removed from the tree Package-Manager: portage-2.2.27 --- dev-java/maven-bin/maven-bin-1.1-r3.ebuild | 2 +- dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild | 2 +- dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild | 2 +- dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild | 2 +- dev-java/maven-bin/maven-bin-3.1.1.ebuild | 2 +- dev-java/maven-bin/maven-bin-3.2.5.ebuild | 2 +- dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild | 2 +- dev-java/maven-bin/maven-bin-3.3.9.ebuild | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild index accade5574ea..19ff180b0984 100644 --- a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild +++ b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild @@ -18,7 +18,7 @@ SLOT="1.1" KEYWORDS="amd64 x86" IUSE="" -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )" +DEPEND="app-eselect/eselect-java" RDEPEND=">=virtual/jdk-1.5 ${DEPEND}" diff --git a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild index 12e3c93e731b..b54e5a95e347 100644 --- a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild +++ b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild @@ -19,7 +19,7 @@ SLOT="2.0" KEYWORDS="amd64 x86" IUSE="" -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )" +DEPEND="app-eselect/eselect-java" RDEPEND=">=virtual/jdk-1.4 ${DEPEND}" diff --git a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild index 518e15416594..821d9e4ca160 100644 --- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild +++ b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild @@ -19,7 +19,7 @@ SLOT="2.2" KEYWORDS="amd64 x86" IUSE="" -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )" +DEPEND="app-eselect/eselect-java" RDEPEND=">=virtual/jdk-1.5 ${DEPEND}" diff --git a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild index ccd267a2d11b..c8fe40d4c39a 100644 --- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild +++ b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild @@ -19,7 +19,7 @@ SLOT="3.0" KEYWORDS="amd64 x86" IUSE="" -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )" +DEPEND="app-eselect/eselect-java" RDEPEND=">=virtual/jdk-1.5 ${DEPEND}" diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild index 4184538cd952..231722f3efdc 100644 --- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild +++ b/dev-java/maven-bin/maven-bin-3.1.1.ebuild @@ -24,7 +24,7 @@ KEYWORDS="amd64 ~x86" # - https://bugs.gentoo.org/show_bug.cgi?id=472850 # - https://bugs.gentoo.org/show_bug.cgi?id=477436 # -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven ) +DEPEND="app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild index 601fe9bf10e4..cb45379825de 100644 --- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild +++ b/dev-java/maven-bin/maven-bin-3.2.5.ebuild @@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~x86" # - https://bugs.gentoo.org/show_bug.cgi?id=472850 # - https://bugs.gentoo.org/show_bug.cgi?id=477436 # -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven ) +DEPEND="app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 diff --git a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild index d16cf0c8ee20..c65d45a716dd 100644 --- a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild +++ b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild @@ -40,7 +40,7 @@ CDEPEND=" DEPEND=" ${CDEPEND} - || ( app-eselect/eselect-java app-eselect/eselect-maven ) + app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 ) >=virtual/jdk-1.7" diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.3.9.ebuild index 5961dc8e7348..817aa3298caf 100644 --- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild +++ b/dev-java/maven-bin/maven-bin-3.3.9.ebuild @@ -40,7 +40,7 @@ CDEPEND=" DEPEND=" ${CDEPEND} - || ( app-eselect/eselect-java app-eselect/eselect-maven ) + app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 ) >=virtual/jdk-1.7" -- 2.26.2