commit: a911d1c9698b03ba7b7df47676cce40bad545e24
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 18:18:46 2016 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 18:18:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a911d1c9
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 accade5..19ff180 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 12e3c93..b54e5a9 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 518e154..821d9e4 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 ccd267a..c8fe40d 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 4184538..231722f 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 601fe9b..cb45379 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 d16cf0c..c65d45a 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 5961dc8..817aa32 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"
