Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/libebook/files/, app-text/libebook/
Date: Thu, 29 Dec 2016 01:42:24
Message-Id: 1482975724.a06c43e79621adb834e423ac7ae95ed4095a4562.asturm@gentoo
1 commit: a06c43e79621adb834e423ac7ae95ed4095a4562
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 29 01:35:05 2016 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 01:42:04 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06c43e7
7
8 app-text/libebook: Fix tests
9
10 Gentoo-bug: 603098
11
12 Thanks to eroen <eroen <AT> occam.eroen.eu> for the patch
13 and taking it upstream.
14
15 Package-Manager: portage-2.3.0
16
17 app-text/libebook/files/libebook-0.1.2-tests.patch | 27 ++++++++++++++++++++++
18 app-text/libebook/libebook-0.1.2-r1.ebuild | 5 +++-
19 2 files changed, 31 insertions(+), 1 deletion(-)
20
21 diff --git a/app-text/libebook/files/libebook-0.1.2-tests.patch b/app-text/libebook/files/libebook-0.1.2-tests.patch
22 new file mode 100644
23 index 00000000..624051a
24 --- /dev/null
25 +++ b/app-text/libebook/files/libebook-0.1.2-tests.patch
26 @@ -0,0 +1,27 @@
27 +From 263d95ce191421a51d4b2d088297700032a8987b Mon Sep 17 00:00:00 2001
28 +From: eroen <eroen@×××××××××××.eu>
29 +Date: Mon, 19 Dec 2016 19:53:15 +0100
30 +Subject: [PATCH] Check for librevenge-stream if tests are enabled
31 +
32 +X-Gentoo-Bug: 603098
33 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=603098
34 +---
35 + configure.ac | 2 ++
36 + 1 file changed, 2 insertions(+)
37 +
38 +diff --git a/configure.ac b/configure.ac
39 +index 6e00ed5..ecbd14b 100644
40 +--- a/configure.ac
41 ++++ b/configure.ac
42 +@@ -357,6 +357,8 @@ AS_IF([test "x$with_tools" = "xyes"],[
43 + PKG_CHECK_MODULES([REVENGE_GENERATORS],[
44 + librevenge-generators-0.0
45 + ])
46 ++])
47 ++AS_IF([test "x$with_tools" = "xyes" || test "x$enable_tests" = "xyes"],[
48 + PKG_CHECK_MODULES([REVENGE_STREAM],[
49 + librevenge-stream-0.0
50 + ])
51 +--
52 +2.11.0
53 +
54
55 diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
56 index 53db1d6..deaff8a 100644
57 --- a/app-text/libebook/libebook-0.1.2-r1.ebuild
58 +++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
59 @@ -35,7 +35,10 @@ RDEPEND="${RDEPEND}"
60
61 S="${WORKDIR}/${MY_P}"
62
63 -PATCHES=( "${FILESDIR}/${P}-boost-1.59-makefile.patch" )
64 +PATCHES=(
65 + "${FILESDIR}/${P}-boost-1.59-makefile.patch"
66 + "${FILESDIR}/${P}-tests.patch"
67 +)
68
69 src_prepare() {
70 default