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/ant-junit/
Date: Wed, 23 Jan 2019 09:10:37
Message-Id: 1548234606.4c81938dbf41204d38c2970427944af3dd2d73f5.fordfrog@gentoo
1 commit: 4c81938dbf41204d38c2970427944af3dd2d73f5
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 23 09:10:06 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 23 09:10:06 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c81938d
7
8 dev-java/ant-junit: added dep on dev-java/junit:0 (bug #513522)
9
10 Package-Manager: Portage-2.3.57, Repoman-2.3.12
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 .../{ant-junit-1.10.5.ebuild => ant-junit-1.10.5-r1.ebuild} | 5 ++++-
14 .../{ant-junit-1.9.13.ebuild => ant-junit-1.9.13-r1.ebuild} | 5 ++++-
15 .../{ant-junit-1.10.5.ebuild => ant-junit-1.9.2-r1.ebuild} | 11 +++++++----
16 3 files changed, 15 insertions(+), 6 deletions(-)
17
18 diff --git a/dev-java/ant-junit/ant-junit-1.10.5.ebuild b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
19 similarity index 90%
20 copy from dev-java/ant-junit/ant-junit-1.10.5.ebuild
21 copy to dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
22 index f61f65337cf..71acf63814d 100644
23 --- a/dev-java/ant-junit/ant-junit-1.10.5.ebuild
24 +++ b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
25 @@ -10,7 +10,10 @@ inherit ant-tasks
26
27 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
28
29 -DEPEND="dev-java/junit:4"
30 +DEPEND="
31 + dev-java/junit:0
32 + dev-java/junit:4
33 +"
34 RDEPEND="${DEPEND}"
35
36 JAVA_ANT_REWRITE_CLASSPATH="true"
37
38 diff --git a/dev-java/ant-junit/ant-junit-1.9.13.ebuild b/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
39 similarity index 90%
40 rename from dev-java/ant-junit/ant-junit-1.9.13.ebuild
41 rename to dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
42 index f61f65337cf..71acf63814d 100644
43 --- a/dev-java/ant-junit/ant-junit-1.9.13.ebuild
44 +++ b/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
45 @@ -10,7 +10,10 @@ inherit ant-tasks
46
47 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
48
49 -DEPEND="dev-java/junit:4"
50 +DEPEND="
51 + dev-java/junit:0
52 + dev-java/junit:4
53 +"
54 RDEPEND="${DEPEND}"
55
56 JAVA_ANT_REWRITE_CLASSPATH="true"
57
58 diff --git a/dev-java/ant-junit/ant-junit-1.10.5.ebuild b/dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild
59 similarity index 80%
60 rename from dev-java/ant-junit/ant-junit-1.10.5.ebuild
61 rename to dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild
62 index f61f65337cf..c5742d40b81 100644
63 --- a/dev-java/ant-junit/ant-junit-1.10.5.ebuild
64 +++ b/dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild
65 @@ -1,16 +1,19 @@
66 # Copyright 1999-2019 Gentoo Authors
67 # Distributed under the terms of the GNU General Public License v2
68
69 -EAPI=6
70 +EAPI="5"
71
72 -ANT_TASK_JDKVER=1.8
73 -ANT_TASK_JREVER=1.8
74 +ANT_TASK_JDKVER=1.5
75 +ANT_TASK_JREVER=1.5
76
77 inherit ant-tasks
78
79 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
80
81 -DEPEND="dev-java/junit:4"
82 +DEPEND="
83 + dev-java/junit:0
84 + dev-java/junit:4
85 +"
86 RDEPEND="${DEPEND}"
87
88 JAVA_ANT_REWRITE_CLASSPATH="true"