Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/devil/, media-libs/devil/files/
Date: Tue, 06 Oct 2015 18:48:28
Message-Id: 1444157288.fab1531be3c5fb51d0058c3b382000d13c3fc985.mr_bones_@gentoo
1 commit: fab1531be3c5fb51d0058c3b382000d13c3fc985
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 6 18:47:54 2015 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 6 18:48:08 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab1531b
7
8 fix tests with patch from Dustin Polke (bug #527270)
9
10 Package-Manager: portage-2.2.20.1
11
12 media-libs/devil/devil-1.7.8-r2.ebuild | 2 +-
13 media-libs/devil/files/devil-1.7.8-fix-test.patch | 10 ++++++++++
14 2 files changed, 11 insertions(+), 1 deletion(-)
15
16 diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
17 index c20974c..43a592e 100644
18 --- a/media-libs/devil/devil-1.7.8-r2.ebuild
19 +++ b/media-libs/devil/devil-1.7.8-r2.ebuild
20 @@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
21 X? ( x11-proto/xextproto )"
22
23 src_prepare() {
24 - epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict}.patch
25 + epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict,fix-test}.patch
26 eautoreconf
27 }
28
29
30 diff --git a/media-libs/devil/files/devil-1.7.8-fix-test.patch b/media-libs/devil/files/devil-1.7.8-fix-test.patch
31 new file mode 100644
32 index 0000000..44af2fc
33 --- /dev/null
34 +++ b/media-libs/devil/files/devil-1.7.8-fix-test.patch
35 @@ -0,0 +1,10 @@
36 +--- a/devil-1.7.8/test/Makefile.am
37 ++++ b/devil-1.7.8/test/Makefile.am
38 +@@ -12,5 +12,6 @@ else
39 + testil_LDADD += ../lib/libIL.la
40 + endif
41 +
42 +-TESTS_ENVIRONMENT = /bin/bash
43 ++TESTS_ENVIRONMENT =
44 + TESTS = $(check_SCRIPTS)
45 ++LOG_COMPILER = $(SHELL)