| 1 |
commit: 15b382bd8748651965689a498a3e79191471fe8e |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 11 07:35:00 2018 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 11 07:48:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b382bd |
| 7 |
|
| 8 |
net-news/newsboat: use bundled catch headers to simplify/fix tests |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/672802 |
| 11 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
| 12 |
|
| 13 |
net-news/newsboat/newsboat-2.12.ebuild | 19 +++---------------- |
| 14 |
net-news/newsboat/newsboat-9999.ebuild | 19 +++---------------- |
| 15 |
2 files changed, 6 insertions(+), 32 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-news/newsboat/newsboat-2.12.ebuild b/net-news/newsboat/newsboat-2.12.ebuild |
| 18 |
index c7cc7bf5863..ee6c86f0894 100644 |
| 19 |
--- a/net-news/newsboat/newsboat-2.12.ebuild |
| 20 |
+++ b/net-news/newsboat/newsboat-2.12.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2018 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
@@ -18,7 +18,7 @@ HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat" |
| 28 |
|
| 29 |
LICENSE="MIT" |
| 30 |
SLOT="0" |
| 31 |
-IUSE="test" |
| 32 |
+IUSE="" |
| 33 |
|
| 34 |
RDEPEND=" |
| 35 |
>=dev-db/sqlite-3.5:3 |
| 36 |
@@ -32,36 +32,23 @@ DEPEND="${RDEPEND} |
| 37 |
app-text/asciidoc |
| 38 |
virtual/pkgconfig |
| 39 |
sys-devel/gettext |
| 40 |
- test? ( >=dev-cpp/catch-2 ) |
| 41 |
" |
| 42 |
|
| 43 |
PATCHES=( |
| 44 |
"${FILESDIR}"/${PN}-2.11-flags.patch |
| 45 |
) |
| 46 |
|
| 47 |
-src_prepare() { |
| 48 |
- default |
| 49 |
- |
| 50 |
- # use system catch |
| 51 |
- sed -i 's#"3rd-party/catch.hpp"#<catch/catch.hpp>#' test/*.{cpp,h} || die |
| 52 |
- rm 3rd-party/catch.hpp || die |
| 53 |
-} |
| 54 |
- |
| 55 |
src_configure() { |
| 56 |
./config.sh || die |
| 57 |
} |
| 58 |
|
| 59 |
src_compile() { |
| 60 |
- # update object build deps to use system catch |
| 61 |
- echo > mk/mk.deps || die |
| 62 |
- emake depslist |
| 63 |
- |
| 64 |
emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" |
| 65 |
} |
| 66 |
|
| 67 |
src_test() { |
| 68 |
# tests require UTF-8 locale |
| 69 |
- emake test |
| 70 |
+ emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test |
| 71 |
# Tests fail if in ${S} rather than in ${S}/test |
| 72 |
cd "${S}"/test || die |
| 73 |
./test || die |
| 74 |
|
| 75 |
diff --git a/net-news/newsboat/newsboat-9999.ebuild b/net-news/newsboat/newsboat-9999.ebuild |
| 76 |
index c7cc7bf5863..ee6c86f0894 100644 |
| 77 |
--- a/net-news/newsboat/newsboat-9999.ebuild |
| 78 |
+++ b/net-news/newsboat/newsboat-9999.ebuild |
| 79 |
@@ -1,4 +1,4 @@ |
| 80 |
-# Copyright 1999-2018 Gentoo Foundation |
| 81 |
+# Copyright 1999-2018 Gentoo Authors |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
|
| 84 |
EAPI=6 |
| 85 |
@@ -18,7 +18,7 @@ HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat" |
| 86 |
|
| 87 |
LICENSE="MIT" |
| 88 |
SLOT="0" |
| 89 |
-IUSE="test" |
| 90 |
+IUSE="" |
| 91 |
|
| 92 |
RDEPEND=" |
| 93 |
>=dev-db/sqlite-3.5:3 |
| 94 |
@@ -32,36 +32,23 @@ DEPEND="${RDEPEND} |
| 95 |
app-text/asciidoc |
| 96 |
virtual/pkgconfig |
| 97 |
sys-devel/gettext |
| 98 |
- test? ( >=dev-cpp/catch-2 ) |
| 99 |
" |
| 100 |
|
| 101 |
PATCHES=( |
| 102 |
"${FILESDIR}"/${PN}-2.11-flags.patch |
| 103 |
) |
| 104 |
|
| 105 |
-src_prepare() { |
| 106 |
- default |
| 107 |
- |
| 108 |
- # use system catch |
| 109 |
- sed -i 's#"3rd-party/catch.hpp"#<catch/catch.hpp>#' test/*.{cpp,h} || die |
| 110 |
- rm 3rd-party/catch.hpp || die |
| 111 |
-} |
| 112 |
- |
| 113 |
src_configure() { |
| 114 |
./config.sh || die |
| 115 |
} |
| 116 |
|
| 117 |
src_compile() { |
| 118 |
- # update object build deps to use system catch |
| 119 |
- echo > mk/mk.deps || die |
| 120 |
- emake depslist |
| 121 |
- |
| 122 |
emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" |
| 123 |
} |
| 124 |
|
| 125 |
src_test() { |
| 126 |
# tests require UTF-8 locale |
| 127 |
- emake test |
| 128 |
+ emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test |
| 129 |
# Tests fail if in ${S} rather than in ${S}/test |
| 130 |
cd "${S}"/test || die |
| 131 |
./test || die |
Archives