gentoo resync : 02.02.2022

3 files changed, 69 insertions, 52 deletions

diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index dedfe1eb50a1..dda09e2d8ac4 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,5 +1,5 @@
-DIST rssguard-3.9.2.tar.gz 13607587 BLAKE2B 45b3dd406e64bb13a19580255971b0d5eb1fd90d70d8559c736366af7792e7fc0627ee254dce79936ce6a179399271958b7795279a359306e345ec086081fc37 SHA512 30d2524f4ca42d903a047fe39de925268a1aac65192a8b1089b6ec0ec0a9dfef09c535fe391f750149063c06e3275b2632cc2ea2c24ded178760070abcea4958
 DIST rssguard-4.0.4.tar.gz 14433147 BLAKE2B 6453d16cb440117c335d6773e675399ae4bee2d9226a2e920ffd1e10cc2d5025fc4c302357974352fad41f637aa33c3b66af2444d969f5e934d7432a16b7cb24 SHA512 8c69ec372a54e7e1ad4ff15476d2387fc84cd9d29c5031f9e5c18dcdf833781c54417101f252d23868eedc91262a9ac6446eb09104f5707b08fa92342d565481
-EBUILD rssguard-3.9.2.ebuild 1214 BLAKE2B 9cfda6ed8baa35badd04d80a679cc64b18bc29852b6f96d27182ffc537ed3e52a3a5bb3f5c025c74c312ee6a445306f5d23a619807f67262b614b746f784e88d SHA512 c674acf1c20cb8f3ce162b11231d9e42265b818dcfcd46874516571af2e3538c8c5227417271020c5909b1d06e32103d43bf2772e00d51ddc49b45036c33525a
+DIST rssguard-4.1.2.tar.gz 21716383 BLAKE2B 5c8da03cdc563799e569dd8c2170f28c5c627a0452a5d0eb325ebb7c88c352248b13624b46d26e94fe443ef1dd948bd281dedb8dcbb0546a984f56472ba0d216 SHA512 d02c6ec7ba6156b6a40e9ad929dc614b7e4aaeb8dfcfe9002e927a4c446908bcb5f299daa1fc67745fea6ebc4954e54a2c296542044a1b86ae98864d5f25bf39
 EBUILD rssguard-4.0.4.ebuild 1533 BLAKE2B e8191b0f5164da34c2fa49407816688c89e18c116319ddd3adb3448b4fb4343fb36d817444940fe1908aaf65dd7fc5a5580cbeac8b2eeac046447e32ae06cd91 SHA512 e19e71b560de282df64c996a5e293d92f22ac2ddeefc0a0643a00d03e94e1ea3bd78b76c731e2b1a9da4c6c88b15b15c2c8882f6885598d2ce58eb9ca4b4dff6
+EBUILD rssguard-4.1.2.ebuild 1679 BLAKE2B 0f27f6f237d135c077309a473c29af3e254fb87689dcffdeb4579022733b1f72fa26e0271ad67fbdb4285745128c52eca4ea57c5f5197e7faa96c630ba1a7a34 SHA512 f4c5e8a447ce2475d272e81c5142f17915fca91a3b1fd324c37468e42e9247da817266b0485d980bb460138dd2736e5f0f6e1f59c5b699cb6ff4ac58abefc192
 MISC metadata.xml 736 BLAKE2B d607ab8fb90cb5146807e306ba77c4784b4abc4b38e7b55d10b772be9866ea9cd8883e14dd9ebab5e36f44240b4e51802ca2c742c12afb39de61970c9458b356 SHA512 ac0e86dc29d5171dee5eae0d05aa6d7fda1a01dbd5d31314f7d691aec5c77dc150ee8ac6a8239750ca50db08eb18da6d3ff1ede2b8597d38f5b4a1ef79ebd362
diff --git a/net-news/rssguard/rssguard-3.9.2.ebuild b/net-news/rssguard/rssguard-3.9.2.ebuild
deleted file mode 100644
index 36a00b4c4bbb..000000000000
--- a/net-news/rssguard/rssguard-3.9.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 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="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT"
-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
-
-	sed -e 's:lib.path = $$quote($$PREFIX/lib/):lib.path = $$quote($$PREFIX/'$(get_libdir)'/):' \
-		-i pri/install.pri || die
-}
-
-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.1.2.ebuild b/net-news/rssguard/rssguard-4.1.2.ebuild
new file mode 100644
index 000000000000..9dcccc8acdbd
--- /dev/null
+++ b/net-news/rssguard/rssguard-4.1.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN="5.9.0"
+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"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug webengine"
+
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer]
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets(+)] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md resources/docs/Documentation.md )
+
+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 tldts-experimental"
+	fi
+}