Split out junit check so it does not die without test enabled. Fixes bug #376293.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index f41da87ec057a638afb8258a142bade85df21326..57d3f75e014907612c0b7abb99a1d96063ed6ed4 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.45 2011/07/24 21:32:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.46 2011/07/25 07:26:43 scarabeus Exp $
+
+  25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Split out junit check so it does not die without test enabled. Fixes bug
+  #376293.
 
   24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild, +files/libreoffice-svx.patch:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7766b3d54315500a51ac33d0d9917dd01fe5da54..4907e8cb1643710a2f11a2b532ac69dbb91e1ddd 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -206,13 +206,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf
 EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274
-EBUILD libreoffice-3.4.2.2.ebuild 18580 RMD160 e738cb8e67cb9e9138dfc3b41a0f35e647482608 SHA1 251755b2b4192259fbdf1fdbe3879a260640bac9 SHA256 ca189e91e1100408cf23590326173c2624a91ee508cec97eaf13ab167d2d6898
-MISC ChangeLog 9347 RMD160 a4a78f388c61401fff0f3fdb85eec6627db2efcf SHA1 2dc7bf2f1a3503cb558654ab29315d4f31dcaf39 SHA256 c40b286d8125564378fb1fc9d35757ba34b242ce73d7926aa0eceebcc335a85e
+EBUILD libreoffice-3.4.2.2.ebuild 18649 RMD160 52d6b0a10c8fbf717476c7ffa196b345697ddb34 SHA1 0a729386cacc71dde1fedcfc231f3a1e7d153319 SHA256 11c14f75a4db2db813ed12ab5f9b4ed04f4fc0868fc18993a71c8b792c389fc6
+MISC ChangeLog 9519 RMD160 f396bd96c5fa39bf0d30598ade78e3dcce94f18c SHA1 2c8cd13460822032801057c7e4c7feb2c34f3b2e SHA256 9584cdf78cdd658fdd4e8963d60a34a0f6ff184fed6bda8c7a10147ffb2a138b
 MISC metadata.xml 882 RMD160 fec57be29e81f82a00fe1a3792d06bf55094312f SHA1 2256f830fe8568d99a9104a8446dde40259546d0 SHA256 4b55d790375e3eb2cd00a94f2327efccc0a505cb8e3358eb9a15e44f917f5333
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4sj4YACgkQHB6c3gNBRYegxQCgo2Mq/jsqh6Oc2c9I61aOf+vp
-bPgAoKTwwTYZXYQ6lMWoabbw3jPoUIrx
-=ugoO
+iEYEARECAAYFAk4tGr4ACgkQHB6c3gNBRYdygACaAivwed60wC9uPhT4F5WZOyEX
+/foAoKvdjMSobLwMG2hVURGkxYRYvo32
+=5bO8
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index 317017a328f733ba8e51f9d67c7baac308402215..0e552eb0366c8125f26d41a027e94f5fdc6b5f63 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.5 2011/07/24 21:32:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.6 2011/07/25 07:26:43 scarabeus Exp $
 
 EAPI=3
 
@@ -374,8 +374,12 @@ src_configure() {
                        --with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
                        --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
                        --with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
-                       $(use_with test junit $(java-pkg_getjar junit-4 junit.jar))
                "
+               if use test; then
+                       java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
+               else
+                       java_opts+=" --without-junit"
+               fi
        fi
 
        # TODO: create gentoo branding on the about/intro screens