gentoo resync : 10.09.2021

8 files changed, 102 insertions, 76 deletions

diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 4b2b0d70d219..3e605198f119 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index 978f1bf042b3..f44fa5a48419 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -143,6 +143,6 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wyz-0.2.0.crate 12926 BLAKE2B dd4de5ec403e57d8362a15efea78e5217164dfd6b22c16458ffff8722e8cd3f28b567a2b9b1bc2774d6c8ba153d37e350929e98b38c82d022f7890052da30e37 SHA512 3a16c3e81d3595ddf1e7816e698eb4d07c7455dec579fd5e97b5d8b77e626cda52f3cdaee71e234e5e500a7ac58b9d1d5f12b17264686f3f225d5e5b0d315de7
 DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
-EBUILD newsboat-2.21-r1.ebuild 2709 BLAKE2B ad38277177f9361b3acb8ba6e345d7609062086c2219e714aa1e2d165fdb43c97324f035db80540d52d46df7380de2d5f029034ab618e69d8442a5b6b959b62d SHA512 eed7e51415d32a9cff1275751fc74f9f0a9dbc4506824b8d6bb0128c98d25568e2cca02436782c8c40f7bd24d65460367efa730ab1dcf0e04e064838160f0ae5
-EBUILD newsboat-2.23-r1.ebuild 3151 BLAKE2B 72fdd754e3a98633c6f90454dd375d112d65dfd097994a146c0d656fd19782691c136fd7e980077d7a47c54b3aa4f2250d7d75fdd3596bf9770d28e4cee86e20 SHA512 0fe5ef3858d909ee17a6ac5334f8b4cc3ba8012f8bbbecfcbe7df9d56223458a76e88c36364c23ad0cae95bd0fd5704f90f515d5214a6cb557059de024435253
+EBUILD newsboat-2.21-r1.ebuild 2743 BLAKE2B ab40560ff4959acc9d238fbba3d1958755ad93d477b6862f558bf6f28cd2e7ee1f01a3cd98012f2a69692a916b6be422792a7f6262d6c966bf92c75b0226a0c8 SHA512 5c5cf8fabe819e3845a6083ea19db350ab62bc6c4ef92e007bccceeb70de76df3e02bb34578a878b70b25daed330b44e976a2261eb7854cfe24b5dadb50ccbb0
+EBUILD newsboat-2.23-r1.ebuild 3183 BLAKE2B f316bf9971d77f716ef11155e040800d04563627e3e0f41b3f85a8950d00e71ad265d17e2acbb073f79e5f127c6502e1f7eb7d2b08753fdbf4bdaa9db97e9e5f SHA512 3d211311802d85ef12f22d4a2e871d8571110c1478eefb8f670690d0a8378dc2eb56de1c7477198097ef47355436f31d174587eda5a6c0e4ab5056790c803962
 MISC metadata.xml 215 BLAKE2B 936d37ef66986b32cf36792a6e24253e879e02aacddfc3c3fbba0ff7951e761a2db63a0c344c512315b3845f6e9a9116effa985de44cfcaf22f7bf432533a5fb SHA512 13b907fe919da35e8fe030dcfcfcb4feb35b802e9c4a8721aa36454648f8f8c15e80ffaecd795c9ca8b4a6bd4a0650b6c548fed935b601569c1ac243eb0724f1
diff --git a/net-news/newsboat/newsboat-2.21-r1.ebuild b/net-news/newsboat/newsboat-2.21-r1.ebuild
index 8dfbd5280859..397b0a78a39f 100644
--- a/net-news/newsboat/newsboat-2.21-r1.ebuild
+++ b/net-news/newsboat/newsboat-2.21-r1.ebuild
@@ -128,12 +128,12 @@ src_configure() {
 
 src_compile() {
 	export CARGO_HOME="${ECARGO_HOME}"
-	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	emake prefix="/usr" CC="$(tc-getCC)" 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
+	emake CC="${tc-getCC}" 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.23-r1.ebuild b/net-news/newsboat/newsboat-2.23-r1.ebuild
index 3fb11d1cb45f..9f76edd6c281 100644
--- a/net-news/newsboat/newsboat-2.23-r1.ebuild
+++ b/net-news/newsboat/newsboat-2.23-r1.ebuild
@@ -122,7 +122,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 RDEPEND="
 	>=dev-db/sqlite-3.5:3
@@ -154,12 +154,12 @@ src_configure() {
 
 src_compile() {
 	export CARGO_HOME="${ECARGO_HOME}"
-	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	emake prefix="/usr" CC="$(tc-getCC)" 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
+	emake CC="${tc-getCC}" 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/rssguard/Manifest b/net-news/rssguard/Manifest
index 518b43457bfb..332d29cff579 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,5 +1,5 @@
-DIST rssguard-3.8.3.tar.gz 9865909 BLAKE2B 7afc9dd0cec9ff58164c341f8cb3c6f31608da958a9c64f8099d9ba645cf7bbdaaa76accb3877943eefeb71b9172a13fa43c0ced7d58c6f368cc164e40a5ab39 SHA512 d7c1d18981177880d93bfaf4a87769638804058609f68b8c42db376c4a0e56230b57a29f70054deb30e02634cfa64355ecfe658b5f961a516b990af91c6f3ba8
 DIST rssguard-3.9.2.tar.gz 13607587 BLAKE2B 45b3dd406e64bb13a19580255971b0d5eb1fd90d70d8559c736366af7792e7fc0627ee254dce79936ce6a179399271958b7795279a359306e345ec086081fc37 SHA512 30d2524f4ca42d903a047fe39de925268a1aac65192a8b1089b6ec0ec0a9dfef09c535fe391f750149063c06e3275b2632cc2ea2c24ded178760070abcea4958
-EBUILD rssguard-3.8.3.ebuild 1454 BLAKE2B f4ff9629f5f571646a8751006fa5ad23f185ebb176ab4a994e9192e4522afde4c43fa68b8ff0e93000686a46491e02d47d3e2171d70eb4843837878be6f50022 SHA512 b1c608f196735913a5913064fa4a7789c1afa2dbf14deb6e7bfa54817ce0aac655c4f3d21c1c22b363723f98b2dda0506ebc64f9be40a2973180097ac51272c6
+DIST rssguard-4.0.1.tar.gz 14417555 BLAKE2B 14689444eefefe0827d22a6886cd422fcbbbace83125fd28599fd17e2762d63f5e5d8b1b472de46282e7471d84195fb56594f9669bcd1432f595f354268241ad SHA512 1c791a85cf3b43737c5232dd4c63855bf8d6ad324c799d1abbfc0aa9392b0af3bfef6221d31b6ded5b512bec9c8ad82b2fbcd10330c7768420432363517709eb
 EBUILD rssguard-3.9.2.ebuild 1214 BLAKE2B 9cfda6ed8baa35badd04d80a679cc64b18bc29852b6f96d27182ffc537ed3e52a3a5bb3f5c025c74c312ee6a445306f5d23a619807f67262b614b746f784e88d SHA512 c674acf1c20cb8f3ce162b11231d9e42265b818dcfcd46874516571af2e3538c8c5227417271020c5909b1d06e32103d43bf2772e00d51ddc49b45036c33525a
-MISC metadata.xml 359 BLAKE2B 39ba3058386b88bd289077c592c99631c58e54a027c00afd6de5d27639019174039038f48323605071f5dc7184686675e337032866ec93fba5d769f975b2d43c SHA512 0a87ec4aa15bdd0932912f519be77ea3c9a524d26847397b0753b7624af73912b46c320c901304b8df128df75f517f7e7d920c87b840fcc31627c5e039700c5e
+EBUILD rssguard-4.0.1.ebuild 2000 BLAKE2B ffd1d91fc5eb3314f452d840198fa50242aa36956f199b66e615f0f931ed169f495d345bc892afdadf889ad35972ad255baacb98baf585a1eaa8a128a85244a0 SHA512 d6b8d8fb7c99a304cfc1d01a5701884ce750a2a9fff560801a932f72d99e9d2a7ce2314b527e28a7b5e747f12a806e796602eb1e09ba72c4a2774303c1aa8d68
+MISC metadata.xml 735 BLAKE2B 35d20ce92b5d3a05b555d071d442249d43e87ed26f09df52c75477b5651d5ec26a7cce3a5b2ea3d9aeb00dd72b0e1bdbefb6d9002f075003d136b396f0d96421 SHA512 551e042ab43e3cf718fb16a53410794811457393759a9481d6bb748c0c65f1dce43d33438b61bc876ba71db1aba1830f8e4f316999499fe64581db3c16c658e7
diff --git a/net-news/rssguard/metadata.xml b/net-news/rssguard/metadata.xml
index 0728c0b6e44e..b6c063572f39 100644
--- a/net-news/rssguard/metadata.xml
+++ b/net-news/rssguard/metadata.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">martinrotter/rssguard</remote-id>
-	</upstream>
-	<use>
-		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
-	</use>
+<!-- maintainer-needed -->
+<upstream>
+	<maintainer>
+		<name>Martin Rotter</name>
+		<email>rotter.martinos@gmail.com</email>
+	</maintainer>
+	<remote-id type="github">martinrotter/rssguard</remote-id>
+	<bugs-to>https://github.com/martinrotter/rssguard/issues</bugs-to>
+</upstream>
+<use>
+	<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
+</use>
+<longdescription>
+	RSS Guard is simple (yet powerful) feed reader. It is able to fetch the
+	most known feed formats, including RSS/RDF and ATOM. RSS Guard is
+	developed on top of the Qt library.
+</longdescription>
 </pkgmetadata>
diff --git a/net-news/rssguard/rssguard-3.8.3.ebuild b/net-news/rssguard/rssguard-3.8.3.ebuild
deleted file mode 100644
index 15b6a7dac1db..000000000000
--- a/net-news/rssguard/rssguard-3.8.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Tiny RSS and Atom feed reader"
-HOMEPAGE="https://github.com/martinrotter/rssguard"
-SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug webengine"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtdeclarative:5
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	ebegin 'Sedding pri/install.pri to install to $(get_libdir)'
-	if grep -q 'lib.path = $$quote($$PREFIX/lib/)' pri/install.pri; then
-		sed -i \
-			-e 's:lib.path = $$quote($$PREFIX/lib/):lib.path = $$quote($$PREFIX/'$(get_libdir)'/):' \
-			pri/install.pri || die
-		eend
-	else
-		eend 1
-		eerror 'grep for lib.path = $$quote($$PREFIX/lib/) failed'
-		die 'find out what changed and update the ebuild'
-	fi
-}
-
-src_configure() {
-	# CONFIG+=ltcg is needed because of https://github.com/martinrotter/rssguard/issues/156
-	eqmake5 \
-		CONFIG+=$(usex debug debug release) \
-		$(is-flagq -flto* && echo "CONFIG+=ltcg") \
-		USE_WEBENGINE=$(usex webengine true false) \
-		PREFIX="${EPREFIX}"/usr \
-		INSTALL_ROOT=.
-}
-
-src_install() {
-	emake -j1 install INSTALL_ROOT="${D}"
-}
diff --git a/net-news/rssguard/rssguard-4.0.1.ebuild b/net-news/rssguard/rssguard-4.0.1.ebuild
new file mode 100644
index 000000000000..d78e81920014
--- /dev/null
+++ b/net-news/rssguard/rssguard-4.0.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic optfeature qmake-utils xdg
+
+DESCRIPTION="Simple (yet powerful) feed reader"
+HOMEPAGE="https://github.com/martinrotter/rssguard"
+SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug webengine"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	webengine? ( dev-qt/qtwebengine:5[widgets(+)] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md resources/docs/Documentation.md )
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 4.0; then
+		ewarn "RSS Guard 4.x is NOT backwards compatible with 3.x line."
+		ewarn "You have to either export your feeds in OPML format or"
+		ewarn "manually update your database.db file to 4.x.x format:"
+		ewarn "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#migrating-user-data-from-392-to-4xx"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -e 's:$$PREFIX/lib:$$PREFIX/'$(get_libdir)':' -i pri/install.pri || die
+}
+
+src_configure() {
+	eqmake5_args=(
+		CONFIG+=$(usex debug debug release)
+		USE_WEBENGINE=$(usex webengine true false)
+		PREFIX="${EPREFIX}"/usr
+		INSTALL_ROOT=.
+	)
+
+	# https://github.com/martinrotter/rssguard/issues/156
+	is-flagq "-flto*" && eqmake5_args+=( CONFIG+=ltcg )
+
+	eqmake5 "${eqmake5_args[@]}"
+}
+
+src_install() {
+	emake -j1 install INSTALL_ROOT="${D}"
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use webengine; then
+		optfeature "ad blocking functionality" net-libs/nodejs[npm]
+		elog "Adblocker module requires additional npm modules to be installed:"
+		elog "npm i -g @cliqz/adblocker concat-stream tldts-experimental node-fetch"
+	fi
+}