gentoo resync : 08.01.2018

6 files changed, 6 insertions, 152 deletions

diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 86a593b9165d..fddd57e6feb2 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index fa5240c9e012..f430fa32e609 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -1,8 +1,4 @@
-DIST newsboat-2.10.1.tar.xz 326872 BLAKE2B 4dadc82b18f77e6ec0215fcd3648ff584667c6bee6deb3ce06839e31bce1cb52d53ad214144df1a4dfb4bf239d4c15b54960443bff29c0e6da866fc0b8c6be5c SHA512 f2e9e9f60aa3996977fd13cb54140ae035da0ad6e47c6f50646bf0f67e241fe27a7938879a489322a738fbcf34ac21fb899558435e0248b05d469d80e2ab0e1e
 DIST newsboat-2.10.2.tar.xz 334820 BLAKE2B 08f5ee71b86c33c8aef5d2dc510deccefae8161fa1a3453947e94c9aead550468bd43368022ad438d4eb6da5ac18a348f9123489f2275fd8aed91ce40a5e9a32 SHA512 b807e0539bf31a4536af4e933623ec4de974995dda2345178057601aff43081746941d93a26269b6e8b77aee34b50a7c9867f867bed1331fc9a2c381163636fc
-DIST newsboat-2.10.tar.xz 326280 BLAKE2B 6300f25a21f19583552d586e5ed8b63e70e5ffffa4e7be18b72aabdc992f52fb18945285ab77cf9e6a71e36a219cb8ade52ae7763c0981248af78749359b1fd3 SHA512 1d7efacd4614572fed490f828c8e70f31dd7d4897ff882a6a79cfbf8295909e24aabcf39f927bec6842fac9d7beb3ea6f8db34cf54efd29ea8e9188f5a1afe8c
-EBUILD newsboat-2.10.1.ebuild 1378 BLAKE2B 43e5911c677a9a44c200037c0fcb2e17903742184db5c3865768c84d87f43939d930692b10944e486c2dc7b2be6b0765bc46d1e75f0591045f9bcf5d09e6185c SHA512 0e08647560fd9fc50894547a88a8c4c40cdd20866489427100ea61105f6344ff830b67edd5d35d9238407b2008beb89cb14ab053bfcf7a7e8ca4bda8c56b45f6
-EBUILD newsboat-2.10.2.ebuild 1378 BLAKE2B 43e5911c677a9a44c200037c0fcb2e17903742184db5c3865768c84d87f43939d930692b10944e486c2dc7b2be6b0765bc46d1e75f0591045f9bcf5d09e6185c SHA512 0e08647560fd9fc50894547a88a8c4c40cdd20866489427100ea61105f6344ff830b67edd5d35d9238407b2008beb89cb14ab053bfcf7a7e8ca4bda8c56b45f6
-EBUILD newsboat-2.10.ebuild 1378 BLAKE2B 43e5911c677a9a44c200037c0fcb2e17903742184db5c3865768c84d87f43939d930692b10944e486c2dc7b2be6b0765bc46d1e75f0591045f9bcf5d09e6185c SHA512 0e08647560fd9fc50894547a88a8c4c40cdd20866489427100ea61105f6344ff830b67edd5d35d9238407b2008beb89cb14ab053bfcf7a7e8ca4bda8c56b45f6
-EBUILD newsboat-9999.ebuild 1378 BLAKE2B 43e5911c677a9a44c200037c0fcb2e17903742184db5c3865768c84d87f43939d930692b10944e486c2dc7b2be6b0765bc46d1e75f0591045f9bcf5d09e6185c SHA512 0e08647560fd9fc50894547a88a8c4c40cdd20866489427100ea61105f6344ff830b67edd5d35d9238407b2008beb89cb14ab053bfcf7a7e8ca4bda8c56b45f6
+EBUILD newsboat-2.10.2.ebuild 1311 BLAKE2B 6877b5fe86c790d2914793ae851e5f3d152506a6775011ddf7213352599d1fe34b44ccb6cfe7cb481363a259000c5db359c54b9cb03478a730b07529e1bb6ed8 SHA512 cae5d026d15de72b42f49ed0774465e079abbf0b2a2961e743f528c86c29add52e48badfcdb2a50f98bd59f56b06407aef5885be5fed7688cca91d4d0c85fcc9
+EBUILD newsboat-9999.ebuild 1311 BLAKE2B 6877b5fe86c790d2914793ae851e5f3d152506a6775011ddf7213352599d1fe34b44ccb6cfe7cb481363a259000c5db359c54b9cb03478a730b07529e1bb6ed8 SHA512 cae5d026d15de72b42f49ed0774465e079abbf0b2a2961e743f528c86c29add52e48badfcdb2a50f98bd59f56b06407aef5885be5fed7688cca91d4d0c85fcc9
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/net-news/newsboat/newsboat-2.10.1.ebuild b/net-news/newsboat/newsboat-2.10.1.ebuild
deleted file mode 100644
index f0be1cf088bd..000000000000
--- a/net-news/newsboat/newsboat-2.10.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="test"
-
-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}
-	dev-lang/perl
-	virtual/pkgconfig
-	sys-devel/gettext
-	test? (
-		dev-libs/boost
-		sys-devel/bc
-	)
-"
-[[ ${PV} == 9999 ]] && DEPEND+=" app-text/asciidoc"
-
-# tests require network access
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -e 's:-ggdb::' -e 's:-Werror::' -i Makefile || die
-}
-
-src_configure() {
-	./config.sh || die
-}
-
-src_compile() {
-	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	[[ ${PV} == 9999 ]] && emake doc
-}
-
-src_test() {
-	emake 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-2.10.2.ebuild b/net-news/newsboat/newsboat-2.10.2.ebuild
index f0be1cf088bd..ff9f70fe3e5e 100644
--- a/net-news/newsboat/newsboat-2.10.2.ebuild
+++ b/net-news/newsboat/newsboat-2.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,7 @@ RDEPEND="
 	sys-libs/ncurses:0=[unicode]
 "
 DEPEND="${RDEPEND}
+	app-text/asciidoc
 	dev-lang/perl
 	virtual/pkgconfig
 	sys-devel/gettext
@@ -37,7 +38,6 @@ DEPEND="${RDEPEND}
 		sys-devel/bc
 	)
 "
-[[ ${PV} == 9999 ]] && DEPEND+=" app-text/asciidoc"
 
 # tests require network access
 RESTRICT="test"
@@ -54,7 +54,6 @@ src_configure() {
 
 src_compile() {
 	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	[[ ${PV} == 9999 ]] && emake doc
 }
 
 src_test() {
diff --git a/net-news/newsboat/newsboat-2.10.ebuild b/net-news/newsboat/newsboat-2.10.ebuild
deleted file mode 100644
index f0be1cf088bd..000000000000
--- a/net-news/newsboat/newsboat-2.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="test"
-
-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}
-	dev-lang/perl
-	virtual/pkgconfig
-	sys-devel/gettext
-	test? (
-		dev-libs/boost
-		sys-devel/bc
-	)
-"
-[[ ${PV} == 9999 ]] && DEPEND+=" app-text/asciidoc"
-
-# tests require network access
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -e 's:-ggdb::' -e 's:-Werror::' -i Makefile || die
-}
-
-src_configure() {
-	./config.sh || die
-}
-
-src_compile() {
-	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	[[ ${PV} == 9999 ]] && emake doc
-}
-
-src_test() {
-	emake 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 f0be1cf088bd..ff9f70fe3e5e 100644
--- a/net-news/newsboat/newsboat-9999.ebuild
+++ b/net-news/newsboat/newsboat-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,7 @@ RDEPEND="
 	sys-libs/ncurses:0=[unicode]
 "
 DEPEND="${RDEPEND}
+	app-text/asciidoc
 	dev-lang/perl
 	virtual/pkgconfig
 	sys-devel/gettext
@@ -37,7 +38,6 @@ DEPEND="${RDEPEND}
 		sys-devel/bc
 	)
 "
-[[ ${PV} == 9999 ]] && DEPEND+=" app-text/asciidoc"
 
 # tests require network access
 RESTRICT="test"
@@ -54,7 +54,6 @@ src_configure() {
 
 src_compile() {
 	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	[[ ${PV} == 9999 ]] && emake doc
 }
 
 src_test() {