[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/

["Michael Weber" <xmw@gentoo.org>]

commit:     ceed09475c17126515be605f700f9bb3c540bd1f
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 10:37:16 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 10:37:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceed0947

media-gfx/zbar: Fix USE=java tests.

Closes: https://bugs.gentoo.org/629078
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index b31650273b5..186a80e32cc 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -36,7 +36,9 @@ CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.4 )"
 DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.4 )
+	java? ( >=virtual/jdk-1.4
+		test? ( dev-java/junit:4
+			dev-java/hamcrest-core:1.3 ) )
 	test? ( ${PYTHON_DEPS} )
 	app-arch/unzip
 	sys-devel/gettext
@@ -83,6 +85,11 @@ multilib_src_configure() {
 	if multilib_is_native_abi && use java; then
 		export JAVACFLAGS="$(java-pkg_javac-args)"
 		export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+		if use test ; then # bug 629078
+			java-pkg_append_ CLASSPATH .
+			java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
+			java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
+		fi
 	fi
 
 	append-cppflags -DNDEBUG