diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2011-07-02 11:24:14 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2011-07-02 11:24:14 +0000 |
| commit | 15358d905dc02dd76f62e3587861440fb6c51344 (patch) | |
| tree | 4a0f66ea30971c154e52a0ce0a5fb32a8f1cce36 /app-text/libwpd | |
| parent | New ebuild net-misc/dropbox. (diff) | |
| download | gentoo-2-15358d905dc02dd76f62e3587861440fb6c51344.tar.gz gentoo-2-15358d905dc02dd76f62e3587861440fb6c51344.tar.bz2 gentoo-2-15358d905dc02dd76f62e3587861440fb6c51344.zip | |
Skip stream tests when it's disabled, bug #373757 by Nikoli.
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Diffstat (limited to 'app-text/libwpd')
| -rw-r--r-- | app-text/libwpd/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/libwpd/libwpd-0.8.14-r1.ebuild | 9 | ||||
| -rw-r--r-- | app-text/libwpd/libwpd-0.9.1.ebuild | 7 |
3 files changed, 19 insertions, 3 deletions
diff --git a/app-text/libwpd/ChangeLog b/app-text/libwpd/ChangeLog index c392a0ea4cc5..6b94e21aafc7 100644 --- a/app-text/libwpd/ChangeLog +++ b/app-text/libwpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/libwpd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.73 2011/07/01 21:06:25 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.74 2011/07/02 11:24:14 pacho Exp $ + + 02 Jul 2011; Pacho Ramos <pacho@gentoo.org> libwpd-0.8.14-r1.ebuild, + libwpd-0.9.1.ebuild: + Skip stream tests when it's disabled, bug #373757 by Nikoli. 01 Jul 2011; Markos Chandras <hwoarang@gentoo.org> libwpd-0.8.14-r1.ebuild: Stable on amd64 wrt bug #278255 diff --git a/app-text/libwpd/libwpd-0.8.14-r1.ebuild b/app-text/libwpd/libwpd-0.8.14-r1.ebuild index ecc6857cdb38..da0b7f51f6db 100644 --- a/app-text/libwpd/libwpd-0.8.14-r1.ebuild +++ b/app-text/libwpd/libwpd-0.8.14-r1.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-text/libwpd/libwpd-0.8.14-r1.ebuild,v 1.2 2011/07/01 21:06:25 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.8.14-r1.ebuild,v 1.3 2011/07/02 11:24:14 pacho Exp $ EAPI="4" @@ -24,6 +24,13 @@ DEPEND="${RDEPEND} test? ( dev-util/cppunit ) " +src_prepare() { + # Skip stream tests when it's disabled, bug #373757 + if ! use tools; then + sed -i -e '/src\/test/d' Makefile.{am,in} || die + fi +} + src_configure() { econf \ $(use_with doc docs) \ diff --git a/app-text/libwpd/libwpd-0.9.1.ebuild b/app-text/libwpd/libwpd-0.9.1.ebuild index aba673776dd4..a85657282303 100644 --- a/app-text/libwpd/libwpd-0.9.1.ebuild +++ b/app-text/libwpd/libwpd-0.9.1.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-text/libwpd/libwpd-0.9.1.ebuild,v 1.5 2011/05/01 10:04:00 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.1.ebuild,v 1.6 2011/07/02 11:24:14 pacho Exp $ EAPI="4" @@ -30,6 +30,11 @@ src_prepare() { epatch "${FILESDIR}/${P}-gcc46.patch" + # Skip stream tests when it's disabled, bug #373757 + if ! use tools; then + sed -i -e '/src\/test/d' Makefile.{am,in} || die + fi + # Do not build tests if not needed (and no before the lib itself) epatch "${FILESDIR}/${P}-test-build.patch" eautoreconf |