public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/libebook/files/, app-text/libebook/
Date: Thu, 29 Dec 2016 01:42:20 +0000 (UTC)	[thread overview]
Message-ID: <1482975724.a06c43e79621adb834e423ac7ae95ed4095a4562.asturm@gentoo> (raw)

commit:     a06c43e79621adb834e423ac7ae95ed4095a4562
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 01:35:05 2016 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 01:42:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06c43e7

app-text/libebook: Fix tests

Gentoo-bug: 603098

Thanks to eroen <eroen <AT> occam.eroen.eu> for the patch
and taking it upstream.

Package-Manager: portage-2.3.0

 app-text/libebook/files/libebook-0.1.2-tests.patch | 27 ++++++++++++++++++++++
 app-text/libebook/libebook-0.1.2-r1.ebuild         |  5 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app-text/libebook/files/libebook-0.1.2-tests.patch b/app-text/libebook/files/libebook-0.1.2-tests.patch
new file mode 100644
index 00000000..624051a
--- /dev/null
+++ b/app-text/libebook/files/libebook-0.1.2-tests.patch
@@ -0,0 +1,27 @@
+From 263d95ce191421a51d4b2d088297700032a8987b Mon Sep 17 00:00:00 2001
+From: eroen <eroen@occam.eroen.eu>
+Date: Mon, 19 Dec 2016 19:53:15 +0100
+Subject: [PATCH] Check for librevenge-stream if tests are enabled
+
+X-Gentoo-Bug: 603098
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=603098
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 6e00ed5..ecbd14b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -357,6 +357,8 @@ AS_IF([test "x$with_tools" = "xyes"],[
+     PKG_CHECK_MODULES([REVENGE_GENERATORS],[
+         librevenge-generators-0.0
+     ])
++])
++AS_IF([test "x$with_tools" = "xyes" || test "x$enable_tests" = "xyes"],[
+     PKG_CHECK_MODULES([REVENGE_STREAM],[
+         librevenge-stream-0.0
+     ])
+-- 
+2.11.0
+

diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
index 53db1d6..deaff8a 100644
--- a/app-text/libebook/libebook-0.1.2-r1.ebuild
+++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
@@ -35,7 +35,10 @@ RDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${P}-boost-1.59-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-boost-1.59-makefile.patch"
+	"${FILESDIR}/${P}-tests.patch"
+)
 
 src_prepare() {
 	default


             reply	other threads:[~2016-12-29  1:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-29  1:42 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-10-31 11:16 [gentoo-commits] repo/gentoo:master commit in: app-text/libebook/files/, app-text/libebook/ David Seifert
2016-02-26 14:01 Andreas Hüttel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1482975724.a06c43e79621adb834e423ac7ae95ed4095a4562.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox