Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/maven-bin/
Date: Tue, 26 Jan 2016 18:19:11
Message-Id: 1453832326.a911d1c9698b03ba7b7df47676cce40bad545e24.fordfrog@gentoo
1 commit: a911d1c9698b03ba7b7df47676cce40bad545e24
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 26 18:18:46 2016 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 26 18:18:46 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a911d1c9
7
8 dev-java/maven-bin: removed dependency on app-eselect/eselect-maven as it will be removed from the tree
9
10 Package-Manager: portage-2.2.27
11
12 dev-java/maven-bin/maven-bin-1.1-r3.ebuild | 2 +-
13 dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild | 2 +-
14 dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild | 2 +-
15 dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild | 2 +-
16 dev-java/maven-bin/maven-bin-3.1.1.ebuild | 2 +-
17 dev-java/maven-bin/maven-bin-3.2.5.ebuild | 2 +-
18 dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild | 2 +-
19 dev-java/maven-bin/maven-bin-3.3.9.ebuild | 2 +-
20 8 files changed, 8 insertions(+), 8 deletions(-)
21
22 diff --git a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
23 index accade5..19ff180 100644
24 --- a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
25 +++ b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
26 @@ -18,7 +18,7 @@ SLOT="1.1"
27 KEYWORDS="amd64 x86"
28 IUSE=""
29
30 -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
31 +DEPEND="app-eselect/eselect-java"
32 RDEPEND=">=virtual/jdk-1.5
33 ${DEPEND}"
34
35
36 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
37 index 12e3c93..b54e5a9 100644
38 --- a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
39 +++ b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
40 @@ -19,7 +19,7 @@ SLOT="2.0"
41 KEYWORDS="amd64 x86"
42 IUSE=""
43
44 -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
45 +DEPEND="app-eselect/eselect-java"
46 RDEPEND=">=virtual/jdk-1.4
47 ${DEPEND}"
48
49
50 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
51 index 518e154..821d9e4 100644
52 --- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
53 +++ b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
54 @@ -19,7 +19,7 @@ SLOT="2.2"
55 KEYWORDS="amd64 x86"
56 IUSE=""
57
58 -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
59 +DEPEND="app-eselect/eselect-java"
60 RDEPEND=">=virtual/jdk-1.5
61 ${DEPEND}"
62
63
64 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
65 index ccd267a..c8fe40d 100644
66 --- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
67 +++ b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
68 @@ -19,7 +19,7 @@ SLOT="3.0"
69 KEYWORDS="amd64 x86"
70 IUSE=""
71
72 -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
73 +DEPEND="app-eselect/eselect-java"
74 RDEPEND=">=virtual/jdk-1.5
75 ${DEPEND}"
76
77
78 diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
79 index 4184538..231722f 100644
80 --- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild
81 +++ b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
82 @@ -24,7 +24,7 @@ KEYWORDS="amd64 ~x86"
83 # - https://bugs.gentoo.org/show_bug.cgi?id=472850
84 # - https://bugs.gentoo.org/show_bug.cgi?id=477436
85 #
86 -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
87 +DEPEND="app-eselect/eselect-java
88 || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
89 dev-java/aopalliance:1
90 dev-java/avalon-framework:4.1
91
92 diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
93 index 601fe9b..cb45379 100644
94 --- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
95 +++ b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
96 @@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~x86"
97 # - https://bugs.gentoo.org/show_bug.cgi?id=472850
98 # - https://bugs.gentoo.org/show_bug.cgi?id=477436
99 #
100 -DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
101 +DEPEND="app-eselect/eselect-java
102 || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
103 dev-java/aopalliance:1
104 dev-java/avalon-framework:4.1
105
106 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
107 index d16cf0c..c65d45a 100644
108 --- a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
109 +++ b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
110 @@ -40,7 +40,7 @@ CDEPEND="
111
112 DEPEND="
113 ${CDEPEND}
114 - || ( app-eselect/eselect-java app-eselect/eselect-maven )
115 + app-eselect/eselect-java
116 || ( dev-java/commons-logging:0 dev-java/log4j:0 )
117 >=virtual/jdk-1.7"
118
119
120 diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
121 index 5961dc8..817aa32 100644
122 --- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild
123 +++ b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
124 @@ -40,7 +40,7 @@ CDEPEND="
125
126 DEPEND="
127 ${CDEPEND}
128 - || ( app-eselect/eselect-java app-eselect/eselect-maven )
129 + app-eselect/eselect-java
130 || ( dev-java/commons-logging:0 dev-java/log4j:0 )
131 >=virtual/jdk-1.7"