commit: 15b382bd8748651965689a498a3e79191471fe8e Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Tue Dec 11 07:35:00 2018 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Tue Dec 11 07:48:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b382bd
net-news/newsboat: use bundled catch headers to simplify/fix tests Closes: https://bugs.gentoo.org/672802 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> net-news/newsboat/newsboat-2.12.ebuild | 19 +++---------------- net-news/newsboat/newsboat-9999.ebuild | 19 +++---------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/net-news/newsboat/newsboat-2.12.ebuild b/net-news/newsboat/newsboat-2.12.ebuild index c7cc7bf5863..ee6c86f0894 100644 --- a/net-news/newsboat/newsboat-2.12.ebuild +++ b/net-news/newsboat/newsboat-2.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"; LICENSE="MIT" SLOT="0" -IUSE="test" +IUSE="" RDEPEND=" >=dev-db/sqlite-3.5:3 @@ -32,36 +32,23 @@ DEPEND="${RDEPEND} app-text/asciidoc virtual/pkgconfig sys-devel/gettext - test? ( >=dev-cpp/catch-2 ) " PATCHES=( "${FILESDIR}"/${PN}-2.11-flags.patch ) -src_prepare() { - default - - # use system catch - sed -i 's#"3rd-party/catch.hpp"#<catch/catch.hpp>#' test/*.{cpp,h} || 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 + emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test # Tests fail if in ${S} rather than in ${S}/test cd "${S}"/test || die ./test || die diff --git a/net-news/newsboat/newsboat-9999.ebuild b/net-news/newsboat/newsboat-9999.ebuild index c7cc7bf5863..ee6c86f0894 100644 --- a/net-news/newsboat/newsboat-9999.ebuild +++ b/net-news/newsboat/newsboat-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"; LICENSE="MIT" SLOT="0" -IUSE="test" +IUSE="" RDEPEND=" >=dev-db/sqlite-3.5:3 @@ -32,36 +32,23 @@ DEPEND="${RDEPEND} app-text/asciidoc virtual/pkgconfig sys-devel/gettext - test? ( >=dev-cpp/catch-2 ) " PATCHES=( "${FILESDIR}"/${PN}-2.11-flags.patch ) -src_prepare() { - default - - # use system catch - sed -i 's#"3rd-party/catch.hpp"#<catch/catch.hpp>#' test/*.{cpp,h} || 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 + emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test # Tests fail if in ${S} rather than in ${S}/test cd "${S}"/test || die ./test || die
