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 C9E571382C5 for ; Tue, 27 Mar 2018 06:28:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84525E09F0; Tue, 27 Mar 2018 06:28:33 +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 41CDBE09F0 for ; Tue, 27 Mar 2018 06:28:32 +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 C45D3335C60 for ; Tue, 27 Mar 2018 06:28:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22CD525C for ; Tue, 27 Mar 2018 06:28:30 +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: <1522132057.c80052ec99afd0094a05053fc1eeb8970392bd5d.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-news/newsboat/files/, net-news/newsboat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-news/newsboat/Manifest net-news/newsboat/files/newsboat-2.11-flags.patch net-news/newsboat/newsboat-2.11.ebuild net-news/newsboat/newsboat-9999.ebuild X-VCS-Directories: net-news/newsboat/files/ net-news/newsboat/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: c80052ec99afd0094a05053fc1eeb8970392bd5d X-VCS-Branch: master Date: Tue, 27 Mar 2018 06:28:30 +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: f34b76b2-bdd1-471c-a2d2-c5f979fe5421 X-Archives-Hash: d979ba15b52a63fc8daecc6e1a4f664e commit: c80052ec99afd0094a05053fc1eeb8970392bd5d Author: Tim Harder gentoo org> AuthorDate: Tue Mar 27 06:14:07 2018 +0000 Commit: Tim Harder gentoo org> CommitDate: Tue Mar 27 06:27:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80052ec net-news/newsboat: version bump to 2.11 net-news/newsboat/Manifest | 1 + net-news/newsboat/files/newsboat-2.11-flags.patch | 14 ++++++++++++++ .../{newsboat-9999.ebuild => newsboat-2.11.ebuild} | 20 ++++++++++++-------- net-news/newsboat/newsboat-9999.ebuild | 20 ++++++++++++-------- 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest index 45c0b831e4d..47ea0f9b00f 100644 --- a/net-news/newsboat/Manifest +++ b/net-news/newsboat/Manifest @@ -1 +1,2 @@ DIST newsboat-2.10.2.tar.xz 334820 BLAKE2B 08f5ee71b86c33c8aef5d2dc510deccefae8161fa1a3453947e94c9aead550468bd43368022ad438d4eb6da5ac18a348f9123489f2275fd8aed91ce40a5e9a32 SHA512 b807e0539bf31a4536af4e933623ec4de974995dda2345178057601aff43081746941d93a26269b6e8b77aee34b50a7c9867f867bed1331fc9a2c381163636fc +DIST newsboat-2.11.tar.xz 425912 BLAKE2B 57c61073a08cc09f800cf08544f68f589221d2aa9c5549e0f712914ad0ac43c0e0b95ee9f5fa019f4034d66ba383b10929cb0d01be4dc6b8c29c17f4e477347b SHA512 a82c1ccb53d8be733973c678b0891821a7aec44654b6bfa167253774adbcc6b73e570cd197e2ea038c827719cd1a92d043dfecd0671f32ba51185a87889181f1 diff --git a/net-news/newsboat/files/newsboat-2.11-flags.patch b/net-news/newsboat/files/newsboat-2.11-flags.patch new file mode 100644 index 00000000000..bcee380dd30 --- /dev/null +++ b/net-news/newsboat/files/newsboat-2.11-flags.patch @@ -0,0 +1,14 @@ +--- newsboat-2.11/Makefile ++++ newsboat-2.11/Makefile +@@ -18,9 +18,9 @@ + DEFINES+=-DGIT_HASH=\"$(GIT_HASH)\" + endif + +-WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code ++WARNFLAGS=-Wall -Wextra -Wunreachable-code + INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss +-BARE_CXXFLAGS=-std=c++11 -O2 -ggdb $(INCLUDES) ++BARE_CXXFLAGS=-std=c++11 $(INCLUDES) + LDFLAGS+=-L. + + PACKAGE=newsboat diff --git a/net-news/newsboat/newsboat-9999.ebuild b/net-news/newsboat/newsboat-2.11.ebuild similarity index 78% copy from net-news/newsboat/newsboat-9999.ebuild copy to net-news/newsboat/newsboat-2.11.ebuild index ff9f70fe3e5..ecf68baaf18 100644 --- a/net-news/newsboat/newsboat-9999.ebuild +++ b/net-news/newsboat/newsboat-2.11.ebuild @@ -30,22 +30,21 @@ RDEPEND=" " DEPEND="${RDEPEND} app-text/asciidoc - dev-lang/perl virtual/pkgconfig sys-devel/gettext - test? ( - dev-libs/boost - sys-devel/bc - ) + test? ( >=dev-cpp/catch-2 ) " -# tests require network access -RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${P}-flags.patch +) src_prepare() { default - sed -e 's:-ggdb::' -e 's:-Werror::' -i Makefile || die + # use system catch + sed -i 's#"3rd-party/catch.hpp"##' test/*.cpp || die + rm 3rd-party/catch.hpp || die } src_configure() { @@ -53,10 +52,15 @@ src_configure() { } 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 # Tests fail if in ${S} rather than in ${S}/test cd "${S}"/test || die diff --git a/net-news/newsboat/newsboat-9999.ebuild b/net-news/newsboat/newsboat-9999.ebuild index ff9f70fe3e5..33b53c61955 100644 --- a/net-news/newsboat/newsboat-9999.ebuild +++ b/net-news/newsboat/newsboat-9999.ebuild @@ -30,22 +30,21 @@ RDEPEND=" " DEPEND="${RDEPEND} app-text/asciidoc - dev-lang/perl virtual/pkgconfig sys-devel/gettext - test? ( - dev-libs/boost - sys-devel/bc - ) + test? ( >=dev-cpp/catch-2 ) " -# tests require network access -RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${PN}-2.11-flags.patch +) src_prepare() { default - sed -e 's:-ggdb::' -e 's:-Werror::' -i Makefile || die + # use system catch + sed -i 's#"3rd-party/catch.hpp"##' test/*.cpp || die + rm 3rd-party/catch.hpp || die } src_configure() { @@ -53,10 +52,15 @@ src_configure() { } 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 # Tests fail if in ${S} rather than in ${S}/test cd "${S}"/test || die