Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/java-service-wrapper/
Date: Sun, 04 Nov 2018 15:17:01
Message-Id: 1541344593.7a885481c1c4ea358ea4e7ba9c8b4eb378a4e1aa.pacho@gentoo
1 commit: 7a885481c1c4ea358ea4e7ba9c8b4eb378a4e1aa
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 4 14:53:08 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 4 15:16:33 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a885481
7
8 dev-java/java-service-wrapper: Stop using ant-nodeps
9
10 Bug: https://bugs.gentoo.org/466558
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 .../java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild | 8 +++-----
15 1 file changed, 3 insertions(+), 5 deletions(-)
16
17 diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
18 index bb42be142af..661ff489372 100644
19 --- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
20 +++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
21 @@ -1,9 +1,7 @@
22 -# Copyright 1999-2014 Gentoo Foundation
23 +# Copyright 1999-2018 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=5
27 -
28 -WANT_ANT_TASKS="ant-nodeps"
29 JAVA_PKG_IUSE="doc source test"
30
31 inherit eutils java-pkg-2 java-ant-2
32 @@ -24,7 +22,7 @@ RDEPEND="
33 DEPEND="
34 >=virtual/jdk-1.4
35 test? (
36 - dev-java/ant-junit
37 + dev-java/ant-junit:0
38 )"
39
40 S="${WORKDIR}/${MY_P}"
41 @@ -55,7 +53,7 @@ src_compile() {
42 }
43
44 src_test() {
45 - ANT_TASKS="ant-junit ant-nodeps" eant -Dbits="${BITS}" test
46 + ANT_TASKS="ant-junit" eant -Dbits="${BITS}" test
47 }
48
49 src_install() {