gentoo resync : 24.12.2018

5 files changed, 70 insertions, 34 deletions

diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 73fe85ced767..710de48e0b73 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index f0e85dcd2f6e..573c02835a21 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -2,8 +2,10 @@ AUX newsboat-2.11-flags.patch 380 BLAKE2B 2479cfb65282b0cbdbf4d0c6d82257b0025497
 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
 EBUILD newsboat-2.10.2.ebuild 1309 BLAKE2B 219a52879828ddf123aa53d0561b3750725f5448d2ec0920573feebe439551c603d7e91446573e514784518c36cffde6b55390a32930e6368cf689d9c4be83fb SHA512 fdf7433c86e00fdb382a672b72f16d6e8be494a9c8987b232dbb053a0edf28caee3ae0e8513414571f2a5bf5867a383d999d550f1d7003b2c05f7b6aa40499df
 EBUILD newsboat-2.11.1.ebuild 1471 BLAKE2B f25c1a44fbcfe18e15ee6a4e30ed9f20decd7288c72f36c7d16ad246402a45757477bf0ea41f2a638bfd1345c0aeaa6866818b051ef7442693899321772acca6 SHA512 4743303cb04d2525ce1a6fe6a3789fc4dbe847e61826fe7238d1a953ac4f41dda276ef54e20ccfe3ed81caf67a173f99754071606b0d83e5ec544861d9e7c59a
-EBUILD newsboat-2.12.ebuild 1475 BLAKE2B eb9d7ae178454ab4e5e213f3e62bd7cd9d31396a8f21e88496caf8da1ad9ddc3b73ed8361211d1afeb0cc72e2ef7122556b2ef11dd1091ff2a97aef978d2de1b SHA512 560a270a722786d879b7dbcd2099f68cd5acc1e3353bf3f0a15b8520fd28134279e8d942f7cee701170039cc85b2be20e9d75bd4f94ccfb1aaf9d08a8df6e62d
-EBUILD newsboat-9999.ebuild 1475 BLAKE2B eb9d7ae178454ab4e5e213f3e62bd7cd9d31396a8f21e88496caf8da1ad9ddc3b73ed8361211d1afeb0cc72e2ef7122556b2ef11dd1091ff2a97aef978d2de1b SHA512 560a270a722786d879b7dbcd2099f68cd5acc1e3353bf3f0a15b8520fd28134279e8d942f7cee701170039cc85b2be20e9d75bd4f94ccfb1aaf9d08a8df6e62d
+EBUILD newsboat-2.12.ebuild 1254 BLAKE2B dcd0564d36cb18bc47fa52f0fec9728144409f2be497694becaefb7df737cd897bae87d5e9b58c9f598e02deedb70ffba178006cfa2d79975470d18ea91e415b SHA512 122765dd015acae96494bd9224761df6824ffd23dd12d53923cf40ff5010ab8520fa054bf12888c36d1c452013ba052b2f8b577da9e9f23d45ee1f9d8713da16
+EBUILD newsboat-2.13.ebuild 1254 BLAKE2B dcd0564d36cb18bc47fa52f0fec9728144409f2be497694becaefb7df737cd897bae87d5e9b58c9f598e02deedb70ffba178006cfa2d79975470d18ea91e415b SHA512 122765dd015acae96494bd9224761df6824ffd23dd12d53923cf40ff5010ab8520fa054bf12888c36d1c452013ba052b2f8b577da9e9f23d45ee1f9d8713da16
+EBUILD newsboat-9999.ebuild 1254 BLAKE2B dcd0564d36cb18bc47fa52f0fec9728144409f2be497694becaefb7df737cd897bae87d5e9b58c9f598e02deedb70ffba178006cfa2d79975470d18ea91e415b SHA512 122765dd015acae96494bd9224761df6824ffd23dd12d53923cf40ff5010ab8520fa054bf12888c36d1c452013ba052b2f8b577da9e9f23d45ee1f9d8713da16
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/net-news/newsboat/newsboat-2.12.ebuild b/net-news/newsboat/newsboat-2.12.ebuild
index c7cc7bf5863d..ee6c86f08943 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-2.13.ebuild b/net-news/newsboat/newsboat-2.13.ebuild
new file mode 100644
index 000000000000..ee6c86f08943
--- /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
+}
diff --git a/net-news/newsboat/newsboat-9999.ebuild b/net-news/newsboat/newsboat-9999.ebuild
index c7cc7bf5863d..ee6c86f08943 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