commit: c80052ec99afd0094a05053fc1eeb8970392bd5d
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 06:14:07 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> 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"#<catch/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"#<catch/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
