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 40BAE138335 for ; Tue, 11 Dec 2018 07:51:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 195F0E08D1; Tue, 11 Dec 2018 07:51:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC449E08D1 for ; Tue, 11 Dec 2018 07:51:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 671B5335C7B for ; Tue, 11 Dec 2018 07:51:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C7E5463 for ; Tue, 11 Dec 2018 07:51:35 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1544514499.15b382bd8748651965689a498a3e79191471fe8e.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-news/newsboat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-news/newsboat/newsboat-2.12.ebuild net-news/newsboat/newsboat-9999.ebuild X-VCS-Directories: net-news/newsboat/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: 15b382bd8748651965689a498a3e79191471fe8e X-VCS-Branch: master Date: Tue, 11 Dec 2018 07:51:35 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bfbd71f3-9833-4569-8536-f2e8188b5e96 X-Archives-Hash: 3093a4ddea5e7f7a675eb962201ae83c commit: 15b382bd8748651965689a498a3e79191471fe8e Author: Tim Harder gentoo org> AuthorDate: Tue Dec 11 07:35:00 2018 +0000 Commit: Tim Harder gentoo org> CommitDate: Tue Dec 11 07:48:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b382bd net-news/newsboat: use bundled catch headers to simplify/fix tests Closes: https://bugs.gentoo.org/672802 Signed-off-by: Tim Harder gentoo.org> net-news/newsboat/newsboat-2.12.ebuild | 19 +++---------------- net-news/newsboat/newsboat-9999.ebuild | 19 +++---------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/net-news/newsboat/newsboat-2.12.ebuild b/net-news/newsboat/newsboat-2.12.ebuild index c7cc7bf5863..ee6c86f0894 100644 --- a/net-news/newsboat/newsboat-2.12.ebuild +++ b/net-news/newsboat/newsboat-2.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat" LICENSE="MIT" SLOT="0" -IUSE="test" +IUSE="" RDEPEND=" >=dev-db/sqlite-3.5:3 @@ -32,36 +32,23 @@ DEPEND="${RDEPEND} app-text/asciidoc virtual/pkgconfig sys-devel/gettext - test? ( >=dev-cpp/catch-2 ) " PATCHES=( "${FILESDIR}"/${PN}-2.11-flags.patch ) -src_prepare() { - default - - # use system catch - sed -i 's#"3rd-party/catch.hpp"##' test/*.{cpp,h} || die - rm 3rd-party/catch.hpp || die -} - src_configure() { ./config.sh || die } src_compile() { - # update object build deps to use system catch - echo > mk/mk.deps || die - emake depslist - emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" } src_test() { # tests require UTF-8 locale - emake test + emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test # Tests fail if in ${S} rather than in ${S}/test cd "${S}"/test || die ./test || die diff --git a/net-news/newsboat/newsboat-9999.ebuild b/net-news/newsboat/newsboat-9999.ebuild index c7cc7bf5863..ee6c86f0894 100644 --- a/net-news/newsboat/newsboat-9999.ebuild +++ b/net-news/newsboat/newsboat-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat" LICENSE="MIT" SLOT="0" -IUSE="test" +IUSE="" RDEPEND=" >=dev-db/sqlite-3.5:3 @@ -32,36 +32,23 @@ DEPEND="${RDEPEND} app-text/asciidoc virtual/pkgconfig sys-devel/gettext - test? ( >=dev-cpp/catch-2 ) " PATCHES=( "${FILESDIR}"/${PN}-2.11-flags.patch ) -src_prepare() { - default - - # use system catch - sed -i 's#"3rd-party/catch.hpp"##' test/*.{cpp,h} || die - rm 3rd-party/catch.hpp || die -} - src_configure() { ./config.sh || die } src_compile() { - # update object build deps to use system catch - echo > mk/mk.deps || die - emake depslist - emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" } src_test() { # tests require UTF-8 locale - emake test + emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test # Tests fail if in ${S} rather than in ${S}/test cd "${S}"/test || die ./test || die