commit: 4c81938dbf41204d38c2970427944af3dd2d73f5
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 23 09:10:06 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 09:10:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c81938d
dev-java/ant-junit: added dep on dev-java/junit:0 (bug #513522)
Package-Manager: Portage-2.3.57, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../{ant-junit-1.10.5.ebuild => ant-junit-1.10.5-r1.ebuild} | 5 ++++-
.../{ant-junit-1.9.13.ebuild => ant-junit-1.9.13-r1.ebuild} | 5 ++++-
.../{ant-junit-1.10.5.ebuild => ant-junit-1.9.2-r1.ebuild} | 11 +++++++----
3 files changed, 15 insertions(+), 6 deletions(-)
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
similarity index 90%
copy from dev-java/ant-junit/ant-junit-1.10.5.ebuild
copy to dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
index f61f65337cf..71acf63814d 100644
--- a/dev-java/ant-junit/ant-junit-1.10.5.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
@@ -10,7 +10,10 @@ inherit ant-tasks
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-DEPEND="dev-java/junit:4"
+DEPEND="
+ dev-java/junit:0
+ dev-java/junit:4
+"
RDEPEND="${DEPEND}"
JAVA_ANT_REWRITE_CLASSPATH="true"
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
similarity index 90%
rename from dev-java/ant-junit/ant-junit-1.9.13.ebuild
rename to dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
index f61f65337cf..71acf63814d 100644
--- a/dev-java/ant-junit/ant-junit-1.9.13.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
@@ -10,7 +10,10 @@ inherit ant-tasks
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-DEPEND="dev-java/junit:4"
+DEPEND="
+ dev-java/junit:0
+ dev-java/junit:4
+"
RDEPEND="${DEPEND}"
JAVA_ANT_REWRITE_CLASSPATH="true"
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
similarity index 80%
rename from dev-java/ant-junit/ant-junit-1.10.5.ebuild
rename to dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild
index f61f65337cf..c5742d40b81 100644
--- a/dev-java/ant-junit/ant-junit-1.10.5.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild
@@ -1,16 +1,19 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="5"
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
+ANT_TASK_JDKVER=1.5
+ANT_TASK_JREVER=1.5
inherit ant-tasks
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-DEPEND="dev-java/junit:4"
+DEPEND="
+ dev-java/junit:0
+ dev-java/junit:4
+"
RDEPEND="${DEPEND}"
JAVA_ANT_REWRITE_CLASSPATH="true"