summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2012-06-29 11:48:28 +0000
committerAlfredo Tupone <tupone@gentoo.org>2012-06-29 11:48:28 +0000
commitad4713a4b656a80cb3b1e0a07051e5d23b193306 (patch)
tree8c1b5a61c07a4b473e6df45b27870f9e9b69494c /media-libs
parentdev-python/bitarray: Moved from sci overlay (diff)
downloadgentoo-2-ad4713a4b656a80cb3b1e0a07051e5d23b193306.tar.gz
gentoo-2-ad4713a4b656a80cb3b1e0a07051e5d23b193306.tar.bz2
gentoo-2-ad4713a4b656a80cb3b1e0a07051e5d23b193306.zip
Fix test failing with VERBOSE. Bug #423301
(Portage version: 2.1.11.3/cvs/Linux i686)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/cal3d/ChangeLog6
-rw-r--r--media-libs/cal3d/cal3d-0.11.0-r1.ebuild5
-rw-r--r--media-libs/cal3d/files/cal3d-0.11.0-verbose.patch11
3 files changed, 19 insertions, 3 deletions
diff --git a/media-libs/cal3d/ChangeLog b/media-libs/cal3d/ChangeLog
index f7094b257bea..65bd62677b4f 100644
--- a/media-libs/cal3d/ChangeLog
+++ b/media-libs/cal3d/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/cal3d
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cal3d/ChangeLog,v 1.34 2012/06/13 04:45:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cal3d/ChangeLog,v 1.35 2012/06/29 11:48:28 tupone Exp $
+
+ 29 Jun 2012; Tupone Alfredo <tupone@gentoo.org> cal3d-0.11.0-r1.ebuild,
+ +files/cal3d-0.11.0-verbose.patch:
+ Fix test failing with VERBOSE. Bug #423301 by Diego Elio Pettenò
13 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> cal3d-0.11.0-r1.ebuild:
move vars into src_prepare
diff --git a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
index 4b01b1dc99ba..766c9bc1bdc4 100644
--- a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
+++ b/media-libs/cal3d/cal3d-0.11.0-r1.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/media-libs/cal3d/cal3d-0.11.0-r1.ebuild,v 1.11 2012/06/13 04:45:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cal3d/cal3d-0.11.0-r1.ebuild,v 1.12 2012/06/29 11:48:28 tupone Exp $
EAPI=2
inherit eutils base autotools
@@ -23,7 +23,8 @@ RDEPEND=""
src_prepare() {
DOCS=( AUTHORS ChangeLog README TODO )
use doc && HTML_DOCS=( docs/html/api docs/html/guide )
- PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
+ PATCHES=( "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-verbose.patch )
base_src_prepare
if use doc; then
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch b/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
new file mode 100644
index 000000000000..a6dfbd677bff
--- /dev/null
+++ b/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
@@ -0,0 +1,11 @@
+--- tests/run.in.old 2012-06-29 13:27:55.413765822 +0200
++++ tests/run.in 2012-06-29 13:29:02.092084095 +0200
+@@ -43,7 +43,7 @@
+ exit 1
+ ;;
+ esac
+- $VERBOSE cal3d_converter ${srcdir}/cal3d_converter/base.x$ext
++ : cal3d_converter ${srcdir}/cal3d_converter/base.x$ext
+ ../src/cal3d_converter ${srcdir}/cal3d_converter/base.x$ext base.c$ext
+ ../src/cal3d_converter base.c$ext 01.x$ext
+ ../src/cal3d_converter 01.x$ext 01.c$ext