gentoo resync : 29.12.2022

2 files changed, 8 insertions, 24 deletions

diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 2e4c9d957fcd..dc88265fb7b2 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,5 +1,5 @@
-DIST rssguard-4.1.2.tar.gz 21716383 BLAKE2B 5c8da03cdc563799e569dd8c2170f28c5c627a0452a5d0eb325ebb7c88c352248b13624b46d26e94fe443ef1dd948bd281dedb8dcbb0546a984f56472ba0d216 SHA512 d02c6ec7ba6156b6a40e9ad929dc614b7e4aaeb8dfcfe9002e927a4c446908bcb5f299daa1fc67745fea6ebc4954e54a2c296542044a1b86ae98864d5f25bf39
 DIST rssguard-4.2.1.tar.gz 22541187 BLAKE2B 78cc23a39cd75697b53b4c3b043a63d01b8b4e9a9b1cc3fc3f070487dede8d18a33ca462f806b4bfb6847e015a2bacaa77ce27745a95349fb2c09c72cccde3d2 SHA512 05b69d47b3d679005122e03c404ea26d8779f3905ac05ac0565631135c26c56d21ef2f4b3939af6c191a20727a4416e9669ceb4a001e729ffe45fc351183f53a
-EBUILD rssguard-4.1.2.ebuild 1679 BLAKE2B 0f27f6f237d135c077309a473c29af3e254fb87689dcffdeb4579022733b1f72fa26e0271ad67fbdb4285745128c52eca4ea57c5f5197e7faa96c630ba1a7a34 SHA512 f4c5e8a447ce2475d272e81c5142f17915fca91a3b1fd324c37468e42e9247da817266b0485d980bb460138dd2736e5f0f6e1f59c5b699cb6ff4ac58abefc192
+DIST rssguard-4.2.3.tar.gz 21940720 BLAKE2B fe97fb26261ec0ec06eac305c96317299921492f7796d246a6d4e7348b7dd8c6484cf52bec0bdd032a02a897a0406a73077e7366d601e1ef80b98ce2dac592ad SHA512 0ead2ae8d23d9fc6e7a6d42fd462e36be06a5a28e26398550dfa9cb2b7dd4574f2cb7a881a0d0b6d43bdb219db87cc92af9d5f131429e93f255f17f70dee244d
 EBUILD rssguard-4.2.1.ebuild 1275 BLAKE2B 27a32725328497229c00b0c4a87985c9682ec60babd8cc55069320a40b4ebe65671696a99332d7d6027c594b04d1e1a17daca24cfdeae0f4a33763d6786ba788 SHA512 2d5deab0618c5b8730987536b61bd37e19d30650d162615008806f7426e108ffbe9be205a17ceeffba68c016f0852ae32cae7a329ab9282649ca6ca0c70620e1
+EBUILD rssguard-4.2.3.ebuild 1275 BLAKE2B 27a32725328497229c00b0c4a87985c9682ec60babd8cc55069320a40b4ebe65671696a99332d7d6027c594b04d1e1a17daca24cfdeae0f4a33763d6786ba788 SHA512 2d5deab0618c5b8730987536b61bd37e19d30650d162615008806f7426e108ffbe9be205a17ceeffba68c016f0852ae32cae7a329ab9282649ca6ca0c70620e1
 MISC metadata.xml 736 BLAKE2B d607ab8fb90cb5146807e306ba77c4784b4abc4b38e7b55d10b772be9866ea9cd8883e14dd9ebab5e36f44240b4e51802ca2c742c12afb39de61970c9458b356 SHA512 ac0e86dc29d5171dee5eae0d05aa6d7fda1a01dbd5d31314f7d691aec5c77dc150ee8ac6a8239750ca50db08eb18da6d3ff1ede2b8597d38f5b4a1ef79ebd362
diff --git a/net-news/rssguard/rssguard-4.1.2.ebuild b/net-news/rssguard/rssguard-4.2.3.ebuild
index 9dcccc8acdbd..bb1e5906f153 100644
--- a/net-news/rssguard/rssguard-4.1.2.ebuild
+++ b/net-news/rssguard/rssguard-4.2.3.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-QTMIN="5.9.0"
-inherit flag-o-matic optfeature qmake-utils xdg
+QTMIN="5.10.0"
+inherit cmake optfeature xdg
 
 DESCRIPTION="Simple (yet powerful) feed reader"
 HOMEPAGE="https://github.com/martinrotter/rssguard"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug webengine"
+IUSE="webengine"
 
 BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
 DEPEND="
@@ -32,28 +32,12 @@ 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=.
+	local mycmakeargs=(
+		-DUSE_WEBENGINE=$(usex webengine)
 	)
 
-	# 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
+	cmake_src_configure
 }
 
 pkg_postinst() {