From 8c364c784966be1700ea39ae45028f3e9be9cae0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Mar 2018 22:40:05 +0100 Subject: gentoo resync : 27.03.2018 --- net-news/newsboat/Manifest | 5 +- net-news/newsboat/files/newsboat-2.11-flags.patch | 14 +++++ net-news/newsboat/newsboat-2.11.ebuild | 73 +++++++++++++++++++++++ net-news/newsboat/newsboat-9999.ebuild | 20 ++++--- 4 files changed, 103 insertions(+), 9 deletions(-) create mode 100644 net-news/newsboat/files/newsboat-2.11-flags.patch create mode 100644 net-news/newsboat/newsboat-2.11.ebuild (limited to 'net-news/newsboat') diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest index 3d48dabfc835..2936ae23d19b 100644 --- a/net-news/newsboat/Manifest +++ b/net-news/newsboat/Manifest @@ -1,4 +1,7 @@ +AUX newsboat-2.11-flags.patch 380 BLAKE2B 2479cfb65282b0cbdbf4d0c6d82257b00254970a6429d388a01b462e4294be2130f9ffebc9380b95d87b4de067768b1b263e28888de88ab48e7497e78d2424f8 SHA512 d031df9800fcbdeddd96b9aaa8fe936f66c35523adee0f1c8e1d08664f6a3ff9e04c606633f2df29fac5ee660b2f11b23c41e63499ad84a528426b9f9b1752b6 DIST newsboat-2.10.2.tar.xz 334820 BLAKE2B 08f5ee71b86c33c8aef5d2dc510deccefae8161fa1a3453947e94c9aead550468bd43368022ad438d4eb6da5ac18a348f9123489f2275fd8aed91ce40a5e9a32 SHA512 b807e0539bf31a4536af4e933623ec4de974995dda2345178057601aff43081746941d93a26269b6e8b77aee34b50a7c9867f867bed1331fc9a2c381163636fc +DIST newsboat-2.11.tar.xz 425912 BLAKE2B 57c61073a08cc09f800cf08544f68f589221d2aa9c5549e0f712914ad0ac43c0e0b95ee9f5fa019f4034d66ba383b10929cb0d01be4dc6b8c29c17f4e477347b SHA512 a82c1ccb53d8be733973c678b0891821a7aec44654b6bfa167253774adbcc6b73e570cd197e2ea038c827719cd1a92d043dfecd0671f32ba51185a87889181f1 EBUILD newsboat-2.10.2.ebuild 1309 BLAKE2B 219a52879828ddf123aa53d0561b3750725f5448d2ec0920573feebe439551c603d7e91446573e514784518c36cffde6b55390a32930e6368cf689d9c4be83fb SHA512 fdf7433c86e00fdb382a672b72f16d6e8be494a9c8987b232dbb053a0edf28caee3ae0e8513414571f2a5bf5867a383d999d550f1d7003b2c05f7b6aa40499df -EBUILD newsboat-9999.ebuild 1311 BLAKE2B 6877b5fe86c790d2914793ae851e5f3d152506a6775011ddf7213352599d1fe34b44ccb6cfe7cb481363a259000c5db359c54b9cb03478a730b07529e1bb6ed8 SHA512 cae5d026d15de72b42f49ed0774465e079abbf0b2a2961e743f528c86c29add52e48badfcdb2a50f98bd59f56b06407aef5885be5fed7688cca91d4d0c85fcc9 +EBUILD newsboat-2.11.ebuild 1465 BLAKE2B 2b12bc538684da8494b78112f32624f423b9957a4c64ff7f8350ab04a074e4df03c1f921acc5718d1e31969646a143f079c544cf923028a2bef7a10d6250d43d SHA512 a2b28e9e34b3bf8c6b09974da0c1941f4626165e0b9dc484dd8a793eb6caeddfef9c9d26f59c2295dd068d10c92c5df07b2021565e41b8351d5c2072178589dc +EBUILD newsboat-9999.ebuild 1471 BLAKE2B f25c1a44fbcfe18e15ee6a4e30ed9f20decd7288c72f36c7d16ad246402a45757477bf0ea41f2a638bfd1345c0aeaa6866818b051ef7442693899321772acca6 SHA512 4743303cb04d2525ce1a6fe6a3789fc4dbe847e61826fe7238d1a953ac4f41dda276ef54e20ccfe3ed81caf67a173f99754071606b0d83e5ec544861d9e7c59a MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6 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 000000000000..bcee380dd304 --- /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-2.11.ebuild b/net-news/newsboat/newsboat-2.11.ebuild new file mode 100644 index 000000000000..ecf68baaf185 --- /dev/null +++ b/net-news/newsboat/newsboat-2.11.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/newsboat/newsboat.git" +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://newsboat.org/releases/${PV}/${P}.tar.xz" +fi + +inherit toolchain-funcs + +DESCRIPTION="An RSS/Atom feed reader for text terminals" +HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat" + +LICENSE="MIT" +SLOT="0" +IUSE="test" + +RDEPEND=" + >=dev-db/sqlite-3.5:3 + >=dev-libs/stfl-0.21 + >=net-misc/curl-7.18.0 + >=dev-libs/json-c-0.11:= + dev-libs/libxml2 + sys-libs/ncurses:0=[unicode] +" +DEPEND="${RDEPEND} + app-text/asciidoc + virtual/pkgconfig + sys-devel/gettext + test? ( >=dev-cpp/catch-2 ) +" + +PATCHES=( + "${FILESDIR}"/${P}-flags.patch +) + +src_prepare() { + default + + # use system catch + sed -i 's#"3rd-party/catch.hpp"##' test/*.cpp || 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 + # Tests fail if in ${S} rather than in ${S}/test + cd "${S}"/test || die + ./test || die +} + +src_install() { + emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install + dodoc CHANGELOG.md README.md TODO +} diff --git a/net-news/newsboat/newsboat-9999.ebuild b/net-news/newsboat/newsboat-9999.ebuild index ff9f70fe3e5e..33b53c619552 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 -- cgit v1.2.3