gentoo auto-resync : 13:01:2023 - 17:49:18

3 files changed, 64 insertions, 53 deletions

diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 5f4a6fb0c4b9..596b7ed41330 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,7 +1,7 @@
-DIST rssguard-4.2.1.tar.gz 22541187 BLAKE2B 78cc23a39cd75697b53b4c3b043a63d01b8b4e9a9b1cc3fc3f070487dede8d18a33ca462f806b4bfb6847e015a2bacaa77ce27745a95349fb2c09c72cccde3d2 SHA512 05b69d47b3d679005122e03c404ea26d8779f3905ac05ac0565631135c26c56d21ef2f4b3939af6c191a20727a4416e9669ceb4a001e729ffe45fc351183f53a
 DIST rssguard-4.2.3.tar.gz 21940720 BLAKE2B fe97fb26261ec0ec06eac305c96317299921492f7796d246a6d4e7348b7dd8c6484cf52bec0bdd032a02a897a0406a73077e7366d601e1ef80b98ce2dac592ad SHA512 0ead2ae8d23d9fc6e7a6d42fd462e36be06a5a28e26398550dfa9cb2b7dd4574f2cb7a881a0d0b6d43bdb219db87cc92af9d5f131429e93f255f17f70dee244d
 DIST rssguard-4.2.5.tar.gz 22004006 BLAKE2B dc8dea6956a0d538cec5759e94246fc6f5314e6a5fd1ff4315cbf626568d8c817a6a4c378ca9275156d55f88e304d7db8afb0be952c68efef5acb8c8ba0f0a24 SHA512 2fc2a08226d41567db4758aaddeb533e6a4e96923b4df663080dd83dee3bae587ea6a8d06eb26788173c34b11f92859547bacc26465cdfbf2a9297de910c5b98
-EBUILD rssguard-4.2.1.ebuild 1275 BLAKE2B 27a32725328497229c00b0c4a87985c9682ec60babd8cc55069320a40b4ebe65671696a99332d7d6027c594b04d1e1a17daca24cfdeae0f4a33763d6786ba788 SHA512 2d5deab0618c5b8730987536b61bd37e19d30650d162615008806f7426e108ffbe9be205a17ceeffba68c016f0852ae32cae7a329ab9282649ca6ca0c70620e1
+DIST rssguard-4.2.7.tar.gz 22029315 BLAKE2B d57fe65c064dcf1ab4b1d6edac127c20a4b0ac0af17bd2b2abe3fc285ab43dd4212c1ec01e97ba8326879df2fb56dfe1046ab02008ae044ab5353ffe3a67542b SHA512 5b50609ebf24d6fe8a494b53aefa0c4a5831461e16157813049f5086c0258e880777d8e4bc8ebe48ac3cb57f858b8630263aa6417d7f8bd6885bbea1e7bf2e32
 EBUILD rssguard-4.2.3.ebuild 1275 BLAKE2B 27a32725328497229c00b0c4a87985c9682ec60babd8cc55069320a40b4ebe65671696a99332d7d6027c594b04d1e1a17daca24cfdeae0f4a33763d6786ba788 SHA512 2d5deab0618c5b8730987536b61bd37e19d30650d162615008806f7426e108ffbe9be205a17ceeffba68c016f0852ae32cae7a329ab9282649ca6ca0c70620e1
 EBUILD rssguard-4.2.5.ebuild 1436 BLAKE2B 0a72d2d259f3f711803e33cfaf6db20633f81efa8283dc5868e893ec2a404cebc6a145eb95c9ac64a94269ae21e1315a929e49abf5008749516f5aa8cb9051d0 SHA512 7ac905e8a765fc37e451a048947f372f3397ec040b1dd71dfa19f251baacb5bbcc433ef80863a667f3f5f929af3a9a36a03602ab5568487d2f85a12d5c986ae4
+EBUILD rssguard-4.2.7.ebuild 1407 BLAKE2B e1c1060fa194cfec496b77db50a3ffffb5aae3eda720500c8044e9819f35f0934a6f405e4459f340ce1b4bd23e4e79eab287bea09c372d3b67c072740599c914 SHA512 63d8289f69cc8c2c778e33383604a7a0d3eb6fabf7d8974db1ce16b33ace94f8351b218c7a6bc111bba39d60afaaadd89b6a2fe3aa4bdd419374a6e1ee50b974
 MISC metadata.xml 851 BLAKE2B b08c14b280f9f2cd5d9abac10cc245d142b9096ef27d0b92c359680ad765101fdcfb2b4c3611be2103932a68ddf92f760ddd626598f8de161ea2f12ba70ff757 SHA512 452267a102e27a8f65a4490f1301a9380aba9ceaa168972b55517cf2a4fcb4669459240ed8ccf90c78696b423d12cc79b904499dd67670439e4ed0663ff11ad8
diff --git a/net-news/rssguard/rssguard-4.2.1.ebuild b/net-news/rssguard/rssguard-4.2.1.ebuild
deleted file mode 100644
index bb1e5906f153..000000000000
--- a/net-news/rssguard/rssguard-4.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN="5.10.0"
-inherit cmake optfeature 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="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_configure() {
-	local mycmakeargs=(
-		-DUSE_WEBENGINE=$(usex webengine)
-	)
-
-	cmake_src_configure
-}
-
-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
-}
diff --git a/net-news/rssguard/rssguard-4.2.7.ebuild b/net-news/rssguard/rssguard-4.2.7.ebuild
new file mode 100644
index 000000000000..e624e3da3001
--- /dev/null
+++ b/net-news/rssguard/rssguard-4.2.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature 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="mysql qt6 +sqlite webengine"
+REQUIRED_USE="|| ( mysql sqlite )"
+
+BDEPEND="
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+DEPEND="
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5[gstreamer]
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsql:5[mysql?,sqlite?]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		webengine? ( dev-qt/qtwebengine:5[widgets(+)] )
+	)
+	qt6? (
+		dev-qt/qtbase:6[dbus,gui,mysql?,network,sql,sqlite?,ssl,widgets]
+		dev-qt/qtdeclarative:6
+		dev-qt/qtmultimedia:6[gstreamer]
+		dev-qt/qt5compat:6
+		media-libs/libglvnd
+		webengine? ( dev-qt/qtwebengine:6[widgets(+)] )
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md resources/docs/Documentation.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=$(usex qt6)
+		-DUSE_WEBENGINE=$(usex webengine)
+		-DNO_UPDATE_CHECK=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "ad blocking functionality" net-libs/nodejs[npm]
+}