diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-25 07:26:43 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-25 07:26:43 +0000 |
| commit | c6c19a9a213d0764b40e954e5d6147bb225dea95 (patch) | |
| tree | af9b7374364485652ed3b950be2e1ac82d8fb18a /app-office | |
| parent | Version bump (diff) | |
| download | gentoo-2-c6c19a9a213d0764b40e954e5d6147bb225dea95.tar.gz gentoo-2-c6c19a9a213d0764b40e954e5d6147bb225dea95.tar.bz2 gentoo-2-c6c19a9a213d0764b40e954e5d6147bb225dea95.zip | |
Split out junit check so it does not die without test enabled. Fixes bug #376293.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.2.2.ebuild | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index f41da87ec057..57d3f75e0149 100644 --- 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/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild index 317017a328f7..0e552eb0366c 100644 --- 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 |