summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-09-08 13:25:41 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-09-08 13:25:41 +0000
commit0d88240af5eceb3b3b5febc91a6032fe937e65da (patch)
treeacba737b26070ae759b7a04c737d8f16035185c6
parentRemove old. (diff)
downloadhistorical-0d88240af5eceb3b3b5febc91a6032fe937e65da.tar.gz
historical-0d88240af5eceb3b3b5febc91a6032fe937e65da.tar.bz2
historical-0d88240af5eceb3b3b5febc91a6032fe937e65da.zip
Fixed tests.
Package-Manager: portage-2.2.1/cvs/Linux x86_64 Manifest-Sign-Key: 0x6D34E57D
-rw-r--r--dev-java/jansi/ChangeLog5
-rw-r--r--dev-java/jansi/Manifest20
-rw-r--r--dev-java/jansi/jansi-1.11-r1.ebuild14
3 files changed, 23 insertions, 16 deletions
diff --git a/dev-java/jansi/ChangeLog b/dev-java/jansi/ChangeLog
index b98100492fb7..5fd451adc9d8 100644
--- a/dev-java/jansi/ChangeLog
+++ b/dev-java/jansi/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jansi
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jansi/ChangeLog,v 1.6 2013/08/17 09:26:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jansi/ChangeLog,v 1.7 2013/09/08 13:25:35 tomwij Exp $
+
+ 08 Sep 2013; Tom Wijsman <TomWij@gentoo.org> jansi-1.11-r1.ebuild:
+ Fixed tests.
*jansi-1.11-r1 (17 Aug 2013)
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index 8402a9de5063..cf691d578a45 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -5,18 +5,18 @@ AUX jansi-1.11-build.xml 14529 SHA256 95644be8bfa231b5f30137f46c6a13e32585058a0c
DIST jansi-1.1-sources.jar 18401 SHA256 c347970cb7e74832ddc7a37966ec9e1697965200eaaadcf4f1f3f407ad965ce4 SHA512 6f731c3e87b3662ce03a951bea837aa02822cb21ad477e458f8a6ce11b6943fba88d5b6c3786bf47fb9e48d4d30debb4527812fa6c58fe973244ace459b6031d WHIRLPOOL 532adaac74483967079676569c446cfe903a7b22dabffddd4be69dac0c7c4c45ea9bad21fcd5658f5768be68650fe971773a549bcbb6973768a0cd912ba00329
DIST jansi-1.11.tar.gz 252095 SHA256 e5c7bd4d9ccba7a2f191380111960c7bd699a7ffee370891b2ef7f905047cccf SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1 WHIRLPOOL 30bc2f3bcf1f74ed5b939e9cfb2c16e54f41e679a97c9983643207b264ddd8fdaf9a898c188f12ea2e84742c45942946f59dda97de1b76f39da050329ef91c24
EBUILD jansi-1.1.ebuild 1159 SHA256 0e3f68065e29d6a2959cac153bfcdf146b05c44ba2b74ab3c16707327c39a6f0 SHA512 85ef13a1d752f30829f0bcb16ee3327107066c1ca6c53653d19aad084608cbbfcc4fd5bd557452243aaffad417a0bec368cfca42b3f4e1bd51706a637fe95f98 WHIRLPOOL c063b7e18a94ecb2e8b28a496bb60e8485460fffc73132b6fe3efc640d4a04c0c783190dad06d6e0bc9394ada6b682ce88b36501419b35e9aba2b4355a77d83d
-EBUILD jansi-1.11-r1.ebuild 1225 SHA256 cc2cbc37efd9cbb1b2c25d632e9aacde5ff71871f0d98853af423fd45cd21360 SHA512 b10ad47291db3b5d87d044086d36004a5f1085a633b246d0903986f4c30feeb7d9017c4445d7bfa8b97d3e383bc46580c6986b74fa8e953120a57c800fa4e4e6 WHIRLPOOL 4467242aa2a40e3b34ebcd534e0bd79ee9343a1ed532538fba0fed40034217519709ac1fbe18dd627a59efe44abcd31440941e4592fbadda926e8e9e2b6f5064
+EBUILD jansi-1.11-r1.ebuild 1259 SHA256 866d73a8db085cee331c4c5db474aebccc531d3e060f49535f12e06c4a13e1c6 SHA512 1ce59085e5902533e9fc6c733539adfda5c02f818673df8b6d528206b5270fc039d19bc7fbf5faad0fd0dc364147da5a7a9e014a77583322080debc876fd123c WHIRLPOOL 9e73a364cd6680ffb6c02b80574b970d62bb46b2e753d64be0b821eec6563d0df97ee28d4c581915b234927e1aa273fdc8903161f733e99c62eaff9348db2479
EBUILD jansi-1.11.ebuild 1219 SHA256 cf6ffdb98d64ccaa7a9b6e0ac312773933b41007d95133de5f317126fe336b8c SHA512 0d5578a8ed6b59da687baaba46a3ec38a1093300900cc489874c832f5a0a13b9edf78dd210a9d57fdb102f126ba90dee912872bcdf173137f7b01700cd269722 WHIRLPOOL eb9e0561c905713b04794b924bc5ac2ec5ed85a1baecfd4c6d548754ae3b1021faf77b0f0628785130ce4547c640facae0264cecd7a28d32363b3186b27f7fbb
-MISC ChangeLog 1077 SHA256 7d6909b85520e0ddec1318bf45ee18c4cad4ae9d8cad1f9cfd1dd1512e27343f SHA512 144416d4eb764b207c4f531283e18a05cc77d78e81d93576c3fccd0716c8d2826e6214e7568fbac846fa6d90ddad06a5ed046d9db30626d073ae1c159fff49c5 WHIRLPOOL 58b635b780e116e01153b185fda27403a869d9f45be2c5196e9b7799b90fd3b9f746b61a42f877abbedfb1f748caada659dbd558530b9c8f686f885f5af64879
+MISC ChangeLog 1162 SHA256 d059f6eef4d778712767a6b89da5ab90b1faf5e564b528ccb2d464b23bd1ceb2 SHA512 bc62e1cc56d8c6e320340c27c8818dd0413aebb4df9dd0b45d1dae24046e31dbe3add6d380016090aa9bea9b92b08f12fb5255627163f8496c1adb381ffc90d8 WHIRLPOOL 0ae2dc1312b31adf2dbc4c15621beb93371b6cf83a60b1b14366f9baaefd76d148872b52b7649a3551a1adff2d390527f70e4e42cdfaa0f21649e6f37df961fa
MISC metadata.xml 332 SHA256 900b8a1f44679cd57b91d489e1a03eb29c39a97fa0498364c8033e423094a66e SHA512 85155e8ed53a32294f8fb1042f6a60d9e14ab959b2b44c98e809008bb035707394b9d626bd36b5d27cd72d1467cb2a934ae7787f87cb157fb6e65885f9816619 WHIRLPOOL 7f6f2f2df84ba835ad23a568ac3d2965dfec505d8ea87da72fda2fd68f160b3ad9e1ff1e2fcc1c6e90036c14d6b8327a82a3f933232e8e56b3483326ef30da3a
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
-iQEcBAEBCAAGBQJSD0HjAAoJEJWyH81tNOV9zc4IALLTaNb9fgB5zhAm10tRBsdL
-km0RZ8l3ZNsUp7Qz0nLCZQKNPeCq16/UpxDwyZaegwL9KMotO4tmNUp8kzCeuO2J
-Rwem1ycoXVC+LsA91GrZp71qEpLqjP9sGJ4a0ngxmn8My/BYTiFBMZN9BxSxLxnx
-9FsJLgpxgglafXWBuPbeEC/0ctUhNknaUMVKsurkt5cDu9WJ8qPMC/BamuK6e/Y8
-XBRR9ZzY70/bzDTSuaTtOoKB/hw0qs5m/ls1carXcA0gD45ZWm0vejOFZbtypgkd
-8dFOdFQuLRxwTM7BEbajv0BtoWJ8xh0baHZzDh9haxU8pBTZeiMgH8ubaXHrDrk=
-=4iG3
+iQEcBAEBCAAGBQJSLHm0AAoJEJWyH81tNOV9gDMH/06Js6YNDtswyKjVqXA/9WtG
+Mc6LzuJFG+hbRasVvE3uQ6OttquVtZoFxxk4iu4pEyRhgDh8MDHBTBDt4NtzJOCO
+AX5xqnji7tyBapj7+K4+7p5qDthUuIAGifSNvxynnYay7wUp4lBPU0pRWosyWyny
+rZEDBOeBU9DKMlqmn2HCwNyNlIXmEGw+V9HxxY/pA5ZkISCxr64gIUQgNSQrxzBV
+sqsPQP2nZ3cWXtH1MHoxd1NGp8hxS2bwTb+IJGHodnEGJBs0cjy6U22EA3NZ1ZEO
+4YegTo3ydCQuh+pXf5emO9wgpvpLCzr3xEwpzYcGPrQA8maYRIgBFmvmtS4Xj9g=
+=rxm7
-----END PGP SIGNATURE-----
diff --git a/dev-java/jansi/jansi-1.11-r1.ebuild b/dev-java/jansi/jansi-1.11-r1.ebuild
index 022510bdb4e6..72e72301cffb 100644
--- a/dev-java/jansi/jansi-1.11-r1.ebuild
+++ b/dev-java/jansi/jansi-1.11-r1.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jansi/jansi-1.11-r1.ebuild,v 1.1 2013/08/17 09:26:50 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jansi/jansi-1.11-r1.ebuild,v 1.2 2013/09/08 13:25:35 tomwij Exp $
EAPI="5"
-# TODO: Get tests (misses junit jar) and doc (missing classpath entries) working.
+# TODO: Get doc (missing classpath entries) working.
JAVA_PKG_IUSE="source test"
-RESTRICT="test"
inherit vcs-snapshot java-pkg-2 java-ant-2
@@ -21,7 +20,10 @@ KEYWORDS="~amd64 ~x86"
CDEPEND="dev-java/jansi-native:0"
DEPEND="${CDEPEND}
- test? ( dev-java/junit:4 )
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/junit:4
+ )
>=virtual/jdk-1.5"
RDEPEND="${CDEPEND}
@@ -37,9 +39,11 @@ java_prepare() {
cp "${FILESDIR}"/${P}-build.xml build.xml || die
}
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
+EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
src_test() {
+ EANT_EXTRA_ARGS="-Djunit.present=true"
+
java-pkg-2_src_test
}