summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerkan Kaba <serkan@gentoo.org>2010-06-19 08:37:17 +0000
committerSerkan Kaba <serkan@gentoo.org>2010-06-19 08:37:17 +0000
commitc0f54e183ceafd31060d5ddd270ecb16b8951c9b (patch)
tree60790f6eb4e1ab429668eb6d319add6ed110f0ef /dev-java/jnr-netdb
parentVersion bump (diff)
downloadgentoo-2-c0f54e183ceafd31060d5ddd270ecb16b8951c9b.tar.gz
gentoo-2-c0f54e183ceafd31060d5ddd270ecb16b8951c9b.tar.bz2
gentoo-2-c0f54e183ceafd31060d5ddd270ecb16b8951c9b.zip
Workaround tests failure spotted by Thomas Kahle in bug #322739.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jnr-netdb')
-rw-r--r--dev-java/jnr-netdb/ChangeLog5
-rw-r--r--dev-java/jnr-netdb/jnr-netdb-1.0.ebuild12
2 files changed, 13 insertions, 4 deletions
diff --git a/dev-java/jnr-netdb/ChangeLog b/dev-java/jnr-netdb/ChangeLog
index 7f621c827b4a..2c3def34857d 100644
--- a/dev-java/jnr-netdb/ChangeLog
+++ b/dev-java/jnr-netdb/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jnr-netdb
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/ChangeLog,v 1.1 2010/06/04 12:06:13 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/ChangeLog,v 1.2 2010/06/19 08:37:17 serkan Exp $
+
+ 19 Jun 2010; Serkan Kaba <serkan@gentoo.org> jnr-netdb-1.0.ebuild:
+ Workaround tests failure spotted by Thomas Kahle in bug #322739.
*jnr-netdb-1.0 (05 Jun 2010)
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.0.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.0.ebuild
index d4d525c5aad9..3a144e1a5dd8 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.0.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/jnr-netdb-1.0.ebuild,v 1.2 2010/06/04 23:25:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/jnr-netdb-1.0.ebuild,v 1.3 2010/06/19 08:37:17 serkan Exp $
EAPI=3
@@ -24,7 +24,11 @@ RDEPEND=">=virtual/jre-1.5
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
${COMMON_DEP}
- test? ( dev-java/ant-junit4 )"
+ test?
+ (
+ dev-java/ant-junit4
+ dev-java/hamcrest-core
+ )"
src_unpack() {
unpack ${A}
@@ -34,6 +38,7 @@ src_unpack() {
src_prepare() {
mkdir -p lib
find . -iname 'junit*.jar' -delete
+ sed -i -e "s|run.test.classpath=|run.test.classpath=lib/hamcrest-core.jar:|g" nbproject/project.properties
java-pkg_jar-from --into lib jaffl jaffl.jar
}
@@ -44,7 +49,8 @@ EANT_EXTRA_ARGS="-Dreference.jaffl.jar=lib/jaffl.jar \
src_test() {
java-pkg_jar-from --build-only --into lib/junit_4 junit-4 \
junit.jar junit-4.5.jar
-
+ java-pkg_jar-from --build-only --into lib hamcrest-core \
+ hamcrest-core.jar
sed -i -e \
"s_\${file.reference.jffi-complete.jar}_$(java-pkg_getjars --build-only --with-dependencies jaffl)_" \
nbproject/project.properties