Gentoo Archives: gentoo-commits

From: Keri Harris <keri@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/
Date: Thu, 18 Feb 2016 11:19:15
Message-Id: 1455794219.6d8efc3ed4952309620fbd8e4aea2fcaf82b6fc4.keri@gentoo
1 commit: 6d8efc3ed4952309620fbd8e4aea2fcaf82b6fc4
2 Author: Keri Harris <keri <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 18 11:16:59 2016 +0000
4 Commit: Keri Harris <keri <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 18 11:16:59 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d8efc3e
7
8 dev-lang/tuprolog: specify slot deps
9
10 Package-Manager: portage-2.2.26
11
12 dev-lang/tuprolog/tuprolog-2.9.2.ebuild | 16 ++++++++--------
13 1 file changed, 8 insertions(+), 8 deletions(-)
14
15 diff --git a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
16 index c562b3f..10ce06a 100644
17 --- a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
18 +++ b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
19 @@ -16,18 +16,19 @@ KEYWORDS="~amd64 ~x86"
20 IUSE="doc examples test"
21
22 RDEPEND=">=virtual/jdk-1.7:=
23 - >=dev-java/javassist-3"
24 + dev-java/javassist:3"
25
26 DEPEND="${RDEPEND}
27 dev-java/ant-core
28 test? (
29 - dev-java/ant-junit4
30 - dev-java/hamcrest-core
31 + dev-java/ant-junit4:0
32 + dev-java/junit:4
33 + dev-java/hamcrest-core:1.3
34 )"
35
36 S="${WORKDIR}"/${P}
37
38 -EANT_GENTOO_CLASSPATH="javassist-3"
39 +EANT_GENTOO_CLASSPATH="javassist:3"
40
41 src_prepare() {
42 epatch "${FILESDIR}"/${P}-no-ikvm.patch
43 @@ -42,11 +43,10 @@ src_compile() {
44
45 src_test() {
46 cd "${S}"/dist
47 - java-pkg_jar-from junit-4
48 - java-pkg_jar-from hamcrest-core
49 + java-pkg_jar-from junit:4
50 + java-pkg_jar-from hamcrest-core:1.3
51 cd "${S}"
52 - ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
53 - || die "eant test failed"
54 + ANT_TASKS="ant-junit4" eant test || die "eant test failed"
55 }
56
57 src_install() {