Just disable junit completely, it is just acting weird all the time.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8EEE3BE8)

3 files changed, 9 insertions, 17 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index ed01dfb52376..f2dd96d65b04 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.402 2012/11/21 15:45:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.403 2012/11/23 18:46:09 scarabeus Exp $
+
+  23 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Just disable junit completely, it is just acting weird all the time.
 
   21 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
   Berkdb is gone from master.
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 3c3e83cc605e..a5dc9177e158 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.32 2012/11/16 18:30:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.33 2012/11/23 18:46:09 scarabeus Exp $
 
 EAPI=4
 
@@ -206,7 +206,6 @@ DEPEND="${COMMON_DEPEND}
 	java? (
 		>=virtual/jdk-1.6
 		>=dev-java/ant-core-1.7
-		test? ( dev-java/junit:4 )
 	)
 	odk? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
@@ -378,6 +377,7 @@ src_configure() {
 		# hsqldb: system one is too new
 		# saxon: system one does not work properly
 		java_opts="
+			--without-junit
 			--without-system-hsqldb
 			--without-system-saxon
 			--with-ant-home="${ANT_HOME}"
@@ -401,12 +401,6 @@ src_configure() {
 				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
 			"
 		fi
-
-		if use test; then
-			java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
-		else
-			java_opts+=" --without-junit"
-		fi
 	fi
 
 	if use branding; then
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 7f360528d16d..4a25f4fd0555 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.131 2012/11/21 15:45:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.132 2012/11/23 18:46:09 scarabeus Exp $
 
 EAPI=4
 
@@ -210,7 +210,6 @@ DEPEND="${COMMON_DEPEND}
 	java? (
 		>=virtual/jdk-1.6
 		>=dev-java/ant-core-1.7
-		test? ( dev-java/junit:4 )
 	)
 	odk? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
@@ -376,6 +375,7 @@ src_configure() {
 	if use java; then
 		# hsqldb: system one is too new
 		java_opts="
+			--without-junit
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
 			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
@@ -398,12 +398,6 @@ src_configure() {
 				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
 			"
 		fi
-
-		if use test; then
-			java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
-		else
-			java_opts+=" --without-junit"
-		fi
 	fi
 
 	if use branding; then