From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9D48B139085 for ; Thu, 29 Dec 2016 01:42:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB6A2E0C3C; Thu, 29 Dec 2016 01:42:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A1C2E0C3C for ; Thu, 29 Dec 2016 01:42:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D9FD3411B5 for ; Thu, 29 Dec 2016 01:42:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E329A1F02 for ; Thu, 29 Dec 2016 01:42:20 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1482975724.a06c43e79621adb834e423ac7ae95ed4095a4562.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/libebook/files/, app-text/libebook/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/libebook/files/libebook-0.1.2-tests.patch app-text/libebook/libebook-0.1.2-r1.ebuild X-VCS-Directories: app-text/libebook/files/ app-text/libebook/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a06c43e79621adb834e423ac7ae95ed4095a4562 X-VCS-Branch: master Date: Thu, 29 Dec 2016 01:42:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9b0eba8e-3f86-465c-89d5-a63931d9104b X-Archives-Hash: b4002532db54c6e74982ae92abbe914d commit: a06c43e79621adb834e423ac7ae95ed4095a4562 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 29 01:35:05 2016 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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