From 4c81938dbf41204d38c2970427944af3dd2d73f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Wed, 23 Jan 2019 10:10:06 +0100 Subject: [PATCH] dev-java/ant-junit: added dep on dev-java/junit:0 (bug #513522) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.57, Repoman-2.3.12 Signed-off-by: Miroslav Å ulc --- ...10.5.ebuild => ant-junit-1.10.5-r1.ebuild} | 5 +++- ...9.13.ebuild => ant-junit-1.9.13-r1.ebuild} | 5 +++- dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild | 24 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) rename dev-java/ant-junit/{ant-junit-1.10.5.ebuild => ant-junit-1.10.5-r1.ebuild} (90%) rename dev-java/ant-junit/{ant-junit-1.9.13.ebuild => ant-junit-1.9.13-r1.ebuild} (90%) create mode 100644 dev-java/ant-junit/ant-junit-1.9.2-r1.ebuild 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% rename from dev-java/ant-junit/ant-junit-1.10.5.ebuild rename to dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild index f61f65337cf9..71acf63814d5 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 f61f65337cf9..71acf63814d5 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 000000000000..c5742d40b81d --- /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 +} -- 2.26.2