[gentoo-commits] repo/gentoo:master commit in: net-news/newsboat/

[Tim Harder]

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

[Tim Harder]

commit: eef5863bf57858328ffe3cc8ee558548e8e9ea67
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 07:46:11 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 07:48:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef5863b

net-news/newsboat: version bump to 2.13

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

net-news/newsboat/Manifest | 1 +
net-news/newsboat/newsboat-2.13.ebuild | 60 ++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)

diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index a6a8a7e6871..1a82c390906 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -1,3 +1,4 @@
DIST newsboat-2.10.2.tar.xz 334820 BLAKE2B 08f5ee71b86c33c8aef5d2dc510deccefae8161fa1a3453947e94c9aead550468bd43368022ad438d4eb6da5ac18a348f9123489f2275fd8aed91ce40a5e9a32 SHA512 b807e0539bf31a4536af4e933623ec4de974995dda2345178057601aff43081746941d93a26269b6e8b77aee34b50a7c9867f867bed1331fc9a2c381163636fc
DIST newsboat-2.11.1.tar.xz 426056 BLAKE2B e13778dcd9fa4d821e4578ddb16193ede13cbb67d1a363deebede018ec9cc00f9ddfb2c86445ada2c3debe60af64923eaba2296ccbd1ffe8f31488d02b9cbc3b SHA512 265b83828eb3da6e61b14b6d16012baf3de147b777fa09a8cad0e76d4cf54677389bf89abf10f94a644def57f41694869a6ea07465e7cc97ec12df74d939bb5a
DIST newsboat-2.12.tar.xz 442132 BLAKE2B 74fc543ee5f0de274f7a6adee6102b190ce9288ceee5824704ac5605f82fdb729fa351699052579c1fff160ef9ef7b97da4c35b30c6acf548b930d91e1088d7f SHA512 211024288c58ac467e1953f2cd6e7cf1cf7d36ae3d1051d8845692a016232a7662b4b6a816663bd0a2a911c89198fac56e674dbca20df45bcbd7f2cbccbce311
+DIST newsboat-2.13.tar.xz 460076 BLAKE2B e86fd3e3da8336527f3fd53e663f547a6066bfd1659bf83354a01139a9f6481afda893046faa1729cdfe03b19080032c70575cdcfd13b15aad40f2af808e2f6e SHA512 f7ce9717540e1c38809a44d531d28b26d5f9759479d311c127adec1ed6f3f6e8ad68799559ed31e9ecde7a988a683b0c9f58ff10e8dd4b2de60d75b7f8efe3da

diff --git a/net-news/newsboat/newsboat-2.13.ebuild b/net-news/newsboat/newsboat-2.13.ebuild
new file mode 100644
index 00000000000..ee6c86f0894
--- /dev/null
+++ b/net-news/newsboat/newsboat-2.13.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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=""
+
+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
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.11-flags.patch
+)
+
+src_configure() {
+ ./config.sh || die
+}
+
+src_compile() {
+ emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+src_test() {
+ # tests require UTF-8 locale
+ 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
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
+ dodoc CHANGELOG.md README.md TODO
+}