summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2008-06-03 06:33:33 +0000
committerKeri Harris <keri@gentoo.org>2008-06-03 06:33:33 +0000
commit8a2cffd33bf77aec1da663ced0a96a2fb37f3b8a (patch)
tree02d8fe95c49f5f346bae7bc1f091d499409dd339 /dev-lang/interprolog
parentversion bump (diff)
downloadhistorical-8a2cffd33bf77aec1da663ced0a96a2fb37f3b8a.tar.gz
historical-8a2cffd33bf77aec1da663ced0a96a2fb37f3b8a.tar.bz2
historical-8a2cffd33bf77aec1da663ced0a96a2fb37f3b8a.zip
Fix up deps and javadoc classpath.
Package-Manager: portage-2.1.5.2
Diffstat (limited to 'dev-lang/interprolog')
-rw-r--r--dev-lang/interprolog/ChangeLog6
-rw-r--r--dev-lang/interprolog/Manifest6
-rw-r--r--dev-lang/interprolog/files/build.xml4
-rw-r--r--dev-lang/interprolog/interprolog-2.1.2.ebuild7
4 files changed, 16 insertions, 7 deletions
diff --git a/dev-lang/interprolog/ChangeLog b/dev-lang/interprolog/ChangeLog
index 98099e697c80..6caee38b2755 100644
--- a/dev-lang/interprolog/ChangeLog
+++ b/dev-lang/interprolog/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/interprolog
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/interprolog/ChangeLog,v 1.3 2008/01/10 23:13:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/interprolog/ChangeLog,v 1.4 2008/06/03 06:33:32 keri Exp $
+
+ 03 Jun 2008; keri <keri@gentoo.org> files/build.xml,
+ interprolog-2.1.2.ebuild:
+ Fix ups deps and javadoc classpath.
10 Jan 2008; Vlastimil Babka <caster@gentoo.org> interprolog-2.1.2.ebuild:
Restrict junit dependency.
diff --git a/dev-lang/interprolog/Manifest b/dev-lang/interprolog/Manifest
index 88aeff9a6c01..be20ce6240e6 100644
--- a/dev-lang/interprolog/Manifest
+++ b/dev-lang/interprolog/Manifest
@@ -1,6 +1,6 @@
-AUX build.xml 1422 RMD160 0796fdc4c8ffb7f12df9e6d2f131c3416c1861ee SHA1 8a37999682e85d07a6fe544ff9f899c9aea7ae99 SHA256 fcf497a26f5f3ea7f2428af1ff313fa58f6084b0a425e2fe06892f31b35e3097
+AUX build.xml 1461 RMD160 3aec9cecf26895aa8ebbe041c7ad18cace4fa583 SHA1 e9e755dc9f6a2dbf995f8d4da0093cccdc184c3a SHA256 9e2be8a8900274c5f99ce683762c94d1fbc5a2b69a524f72faccf8537b6dbf4d
AUX interprolog-2.1.2-java1.4.patch 1341 RMD160 623c78417eb28f995c45eb1e75f0fc68ca73fa83 SHA1 ad08b5221711cdc04fb899a96a85c5dda9b31963 SHA256 64e0097816a2a288db96ce0ffd62735ce9425362627dee3bea5ab921193e702d
DIST interprolog212.zip 1066931 RMD160 49ce52cac6e44a7145b081b4826e8bc6f9ee4b37 SHA1 75b776262e0250eda9c508c1423a4c4a676026a3 SHA256 cf5b463576a51624703300a3966f1d3619d1ccd1011b59950b7b37365de8f182
-EBUILD interprolog-2.1.2.ebuild 1200 RMD160 447569f525cb1dcbb94cec13a5103a6068ba2a6b SHA1 f25a2f0951ede96ae4cce6b7ab0d825fb1d9f735 SHA256 d3509e99452631ba40d4132c3d8346659838ef5e3445f9d3d94baf2da6a1826c
-MISC ChangeLog 618 RMD160 29dcdd5cc892e8864ce8c31403e1795c06e63881 SHA1 8d698dab96470629e30268739f1c25c457566b79 SHA256 6b7004a6dc549829eac87ed6ce3ea42a3f429240be88ca2641a8fba850da89f5
+EBUILD interprolog-2.1.2.ebuild 1295 RMD160 9bfe95cb1bec436241080ee841e6973f4de91f33 SHA1 11035ee7385f4496fe6ff8c66bed32231bac733e SHA256 5985b6330c5e978839c9931c3714977d5a27e5084ef330efcf75eadcb87f1fd4
+MISC ChangeLog 738 RMD160 98955b1b3081cb8f074c4da76c70092dfdc9d878 SHA1 de44b88574a984e59b11dd8a3eecee5b32445784 SHA256 1beb4a530a9ea05a40381a2a1fd9045d0248161d420c03b163541cd452be7c04
MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/interprolog/files/build.xml b/dev-lang/interprolog/files/build.xml
index 9cfe5d73a77f..a24536d8936d 100644
--- a/dev-lang/interprolog/files/build.xml
+++ b/dev-lang/interprolog/files/build.xml
@@ -18,7 +18,7 @@
<!-- compile everything -->
<target depends="init" name="compile">
- <javac classpath="${classpath}" deprecation="on" destdir="${build.dir}" encoding="ISO-8859-1" source="1.4" srcdir="${src.dir}" target="1.4"/>
+ <javac classpath="${gentoo.classpath}" deprecation="on" destdir="${build.dir}" encoding="ISO-8859-1" source="1.4" srcdir="${src.dir}" target="1.4"/>
<copy todir="${build.dir}">
<fileset dir="${src.dir}">
<exclude name="**/*.java"/>
@@ -33,7 +33,7 @@
<!-- generate javadocs -->
<target depends="init" name="javadoc">
- <javadoc author="true" destdir="${docs.dir}" encoding="ISO-8859-1" packagenames="com.*" source="1.4" sourcepath="${src.dir}" use="true" version="true" windowtitle="${ant.project.name} API"/>
+ <javadoc classpath="${gentoo.classpath}" author="true" destdir="${docs.dir}" encoding="ISO-8859-1" packagenames="com.*" source="1.4" sourcepath="${src.dir}" use="true" version="true" windowtitle="${ant.project.name} API"/>
</target>
<!-- clean up -->
diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild b/dev-lang/interprolog/interprolog-2.1.2.ebuild
index 0f37e26a2d19..5c4c6aab49e2 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/interprolog/interprolog-2.1.2.ebuild,v 1.3 2008/01/10 23:13:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/interprolog/interprolog-2.1.2.ebuild,v 1.4 2008/06/03 06:33:32 keri Exp $
inherit eutils java-pkg-2 java-ant-2 versionator
@@ -18,9 +18,11 @@ IUSE="doc"
DEPEND=">=virtual/jdk-1.4
app-arch/unzip
+ dev-java/ant-core
=dev-java/junit-3.8*"
RDEPEND=">=virtual/jdk-1.4
+ =dev-java/junit-3.8*
|| (
dev-lang/xsb
dev-lang/swi-prolog
@@ -28,6 +30,8 @@ RDEPEND=">=virtual/jdk-1.4
S="${WORKDIR}"/${MY_P}
+EANT_GENTOO_CLASSPATH="junit"
+
src_unpack() {
unpack ${A}
cd "${S}"
@@ -41,6 +45,7 @@ src_unpack() {
}
src_compile() {
+ java-pkg_jar-from junit
eant jar $(use_doc)
}