summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2019-01-23 10:10:06 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2019-01-23 10:10:06 +0100
commit4c81938dbf41204d38c2970427944af3dd2d73f5 (patch)
tree341f10a19dfc62098063a159bfa766608ea60a05
parentdev-java/java-sdk-docs-11.0.1: not available at upstream anymore (diff)
downloadgentoo-4c81938dbf41204d38c2970427944af3dd2d73f5.tar.gz
gentoo-4c81938dbf41204d38c2970427944af3dd2d73f5.tar.bz2
gentoo-4c81938dbf41204d38c2970427944af3dd2d73f5.zip
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@gentoo.org>
-rw-r--r--dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild (renamed from dev-java/ant-junit/ant-junit-1.10.5.ebuild)5
-rw-r--r--dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild (renamed from dev-java/ant-junit/ant-junit-1.9.13.ebuild)5
-rw-r--r--dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild24
3 files changed, 32 insertions, 2 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
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
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.9.2-r1.ebuild b/dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild
new file mode 100644
index 00000000000..c5742d40b81
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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:0
+ dev-java/junit:4
+"
+RDEPEND="${DEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit-4"
+
+src_compile() {
+ eant jar-junit
+}