| 1 |
commit: c80052ec99afd0094a05053fc1eeb8970392bd5d |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 27 06:14:07 2018 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 27 06:27:37 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80052ec |
| 7 |
|
| 8 |
net-news/newsboat: version bump to 2.11 |
| 9 |
|
| 10 |
net-news/newsboat/Manifest | 1 + |
| 11 |
net-news/newsboat/files/newsboat-2.11-flags.patch | 14 ++++++++++++++ |
| 12 |
.../{newsboat-9999.ebuild => newsboat-2.11.ebuild} | 20 ++++++++++++-------- |
| 13 |
net-news/newsboat/newsboat-9999.ebuild | 20 ++++++++++++-------- |
| 14 |
4 files changed, 39 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest |
| 17 |
index 45c0b831e4d..47ea0f9b00f 100644 |
| 18 |
--- a/net-news/newsboat/Manifest |
| 19 |
+++ b/net-news/newsboat/Manifest |
| 20 |
@@ -1 +1,2 @@ |
| 21 |
DIST newsboat-2.10.2.tar.xz 334820 BLAKE2B 08f5ee71b86c33c8aef5d2dc510deccefae8161fa1a3453947e94c9aead550468bd43368022ad438d4eb6da5ac18a348f9123489f2275fd8aed91ce40a5e9a32 SHA512 b807e0539bf31a4536af4e933623ec4de974995dda2345178057601aff43081746941d93a26269b6e8b77aee34b50a7c9867f867bed1331fc9a2c381163636fc |
| 22 |
+DIST newsboat-2.11.tar.xz 425912 BLAKE2B 57c61073a08cc09f800cf08544f68f589221d2aa9c5549e0f712914ad0ac43c0e0b95ee9f5fa019f4034d66ba383b10929cb0d01be4dc6b8c29c17f4e477347b SHA512 a82c1ccb53d8be733973c678b0891821a7aec44654b6bfa167253774adbcc6b73e570cd197e2ea038c827719cd1a92d043dfecd0671f32ba51185a87889181f1 |
| 23 |
|
| 24 |
diff --git a/net-news/newsboat/files/newsboat-2.11-flags.patch b/net-news/newsboat/files/newsboat-2.11-flags.patch |
| 25 |
new file mode 100644 |
| 26 |
index 00000000000..bcee380dd30 |
| 27 |
--- /dev/null |
| 28 |
+++ b/net-news/newsboat/files/newsboat-2.11-flags.patch |
| 29 |
@@ -0,0 +1,14 @@ |
| 30 |
+--- newsboat-2.11/Makefile |
| 31 |
++++ newsboat-2.11/Makefile |
| 32 |
+@@ -18,9 +18,9 @@ |
| 33 |
+ DEFINES+=-DGIT_HASH=\"$(GIT_HASH)\" |
| 34 |
+ endif |
| 35 |
+ |
| 36 |
+-WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code |
| 37 |
++WARNFLAGS=-Wall -Wextra -Wunreachable-code |
| 38 |
+ INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss |
| 39 |
+-BARE_CXXFLAGS=-std=c++11 -O2 -ggdb $(INCLUDES) |
| 40 |
++BARE_CXXFLAGS=-std=c++11 $(INCLUDES) |
| 41 |
+ LDFLAGS+=-L. |
| 42 |
+ |
| 43 |
+ PACKAGE=newsboat |
| 44 |
|
| 45 |
diff --git a/net-news/newsboat/newsboat-9999.ebuild b/net-news/newsboat/newsboat-2.11.ebuild |
| 46 |
similarity index 78% |
| 47 |
copy from net-news/newsboat/newsboat-9999.ebuild |
| 48 |
copy to net-news/newsboat/newsboat-2.11.ebuild |
| 49 |
index ff9f70fe3e5..ecf68baaf18 100644 |
| 50 |
--- a/net-news/newsboat/newsboat-9999.ebuild |
| 51 |
+++ b/net-news/newsboat/newsboat-2.11.ebuild |
| 52 |
@@ -30,22 +30,21 @@ RDEPEND=" |
| 53 |
" |
| 54 |
DEPEND="${RDEPEND} |
| 55 |
app-text/asciidoc |
| 56 |
- dev-lang/perl |
| 57 |
virtual/pkgconfig |
| 58 |
sys-devel/gettext |
| 59 |
- test? ( |
| 60 |
- dev-libs/boost |
| 61 |
- sys-devel/bc |
| 62 |
- ) |
| 63 |
+ test? ( >=dev-cpp/catch-2 ) |
| 64 |
" |
| 65 |
|
| 66 |
-# tests require network access |
| 67 |
-RESTRICT="test" |
| 68 |
+PATCHES=( |
| 69 |
+ "${FILESDIR}"/${P}-flags.patch |
| 70 |
+) |
| 71 |
|
| 72 |
src_prepare() { |
| 73 |
default |
| 74 |
|
| 75 |
- sed -e 's:-ggdb::' -e 's:-Werror::' -i Makefile || die |
| 76 |
+ # use system catch |
| 77 |
+ sed -i 's#"3rd-party/catch.hpp"#<catch/catch.hpp>#' test/*.cpp || die |
| 78 |
+ rm 3rd-party/catch.hpp || die |
| 79 |
} |
| 80 |
|
| 81 |
src_configure() { |
| 82 |
@@ -53,10 +52,15 @@ src_configure() { |
| 83 |
} |
| 84 |
|
| 85 |
src_compile() { |
| 86 |
+ # update object build deps to use system catch |
| 87 |
+ echo > mk/mk.deps || die |
| 88 |
+ emake depslist |
| 89 |
+ |
| 90 |
emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" |
| 91 |
} |
| 92 |
|
| 93 |
src_test() { |
| 94 |
+ # tests require UTF-8 locale |
| 95 |
emake test |
| 96 |
# Tests fail if in ${S} rather than in ${S}/test |
| 97 |
cd "${S}"/test || die |
| 98 |
|
| 99 |
diff --git a/net-news/newsboat/newsboat-9999.ebuild b/net-news/newsboat/newsboat-9999.ebuild |
| 100 |
index ff9f70fe3e5..33b53c61955 100644 |
| 101 |
--- a/net-news/newsboat/newsboat-9999.ebuild |
| 102 |
+++ b/net-news/newsboat/newsboat-9999.ebuild |
| 103 |
@@ -30,22 +30,21 @@ RDEPEND=" |
| 104 |
" |
| 105 |
DEPEND="${RDEPEND} |
| 106 |
app-text/asciidoc |
| 107 |
- dev-lang/perl |
| 108 |
virtual/pkgconfig |
| 109 |
sys-devel/gettext |
| 110 |
- test? ( |
| 111 |
- dev-libs/boost |
| 112 |
- sys-devel/bc |
| 113 |
- ) |
| 114 |
+ test? ( >=dev-cpp/catch-2 ) |
| 115 |
" |
| 116 |
|
| 117 |
-# tests require network access |
| 118 |
-RESTRICT="test" |
| 119 |
+PATCHES=( |
| 120 |
+ "${FILESDIR}"/${PN}-2.11-flags.patch |
| 121 |
+) |
| 122 |
|
| 123 |
src_prepare() { |
| 124 |
default |
| 125 |
|
| 126 |
- sed -e 's:-ggdb::' -e 's:-Werror::' -i Makefile || die |
| 127 |
+ # use system catch |
| 128 |
+ sed -i 's#"3rd-party/catch.hpp"#<catch/catch.hpp>#' test/*.cpp || die |
| 129 |
+ rm 3rd-party/catch.hpp || die |
| 130 |
} |
| 131 |
|
| 132 |
src_configure() { |
| 133 |
@@ -53,10 +52,15 @@ src_configure() { |
| 134 |
} |
| 135 |
|
| 136 |
src_compile() { |
| 137 |
+ # update object build deps to use system catch |
| 138 |
+ echo > mk/mk.deps || die |
| 139 |
+ emake depslist |
| 140 |
+ |
| 141 |
emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" |
| 142 |
} |
| 143 |
|
| 144 |
src_test() { |
| 145 |
+ # tests require UTF-8 locale |
| 146 |
emake test |
| 147 |
# Tests fail if in ${S} rather than in ${S}/test |
| 148 |
cd "${S}"/test || die |
Archives