[gentoo-proxy-maint] [PATCH] net-news/rssguard: drop 4.0.4, add 4.2.0

[gentoo-proxy-maint] [PATCH] net-news/rssguard: drop 4.0.4, add 4.2.0

[Anna Vyalkova]

New version uses CMake instead of qmake.

Signed-off-by: Anna Vyalkova <cyber+gentoo@sysrq.in>
---
 net-news/rssguard/Manifest              |  2 +-
 net-news/rssguard/rssguard-4.0.4.ebuild | 66 -------------------------
 net-news/rssguard/rssguard-4.2.0.ebuild | 51 +++++++++++++++++++
 3 files changed, 52 insertions(+), 67 deletions(-)
 delete mode 100644 net-news/rssguard/rssguard-4.0.4.ebuild
 create mode 100644 net-news/rssguard/rssguard-4.2.0.ebuild

diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 28e95e1fd39..0ef016c2d95 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,2 +1,2 @@
-DIST rssguard-4.0.4.tar.gz 14433147 BLAKE2B 6453d16cb440117c335d6773e675399ae4bee2d9226a2e920ffd1e10cc2d5025fc4c302357974352fad41f637aa33c3b66af2444d969f5e934d7432a16b7cb24 SHA512 8c69ec372a54e7e1ad4ff15476d2387fc84cd9d29c5031f9e5c18dcdf833781c54417101f252d23868eedc91262a9ac6446eb09104f5707b08fa92342d565481
 DIST rssguard-4.1.2.tar.gz 21716383 BLAKE2B 5c8da03cdc563799e569dd8c2170f28c5c627a0452a5d0eb325ebb7c88c352248b13624b46d26e94fe443ef1dd948bd281dedb8dcbb0546a984f56472ba0d216 SHA512 d02c6ec7ba6156b6a40e9ad929dc614b7e4aaeb8dfcfe9002e927a4c446908bcb5f299daa1fc67745fea6ebc4954e54a2c296542044a1b86ae98864d5f25bf39
+DIST rssguard-4.2.0.tar.gz 22541400 BLAKE2B 59d347f5ceb75269044c0a5655a168606322878277c19cd500d39b8c130329aad3b04c3ff114026c4d2ec7e846c1454189593f6658279267e3e3488df9ce038b SHA512 5e6aabe20d10e84cb20ef7b244ea1045b6547ffe05c159a2c157549f1f8701149480ad933bd99c8f43ee6aef918ff8f488b44e6a6ceba485d5f2f08875c2677d
diff --git a/net-news/rssguard/rssguard-4.0.4.ebuild b/net-news/rssguard/rssguard-4.0.4.ebuild
deleted file mode 100644
index 9fbe9cc1ee9..00000000000
--- a/net-news/rssguard/rssguard-4.0.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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"
-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 )
-
-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
-}
diff --git a/net-news/rssguard/rssguard-4.2.0.ebuild b/net-news/rssguard/rssguard-4.2.0.ebuild
new file mode 100644
index 00000000000..bb1e5906f15
--- /dev/null
+++ b/net-news/rssguard/rssguard-4.2.0.ebuild
@@ -0,0 +1,51 @@
+# 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
+}
-- 
2.35.1

[gentoo-proxy-maint] [PATCH v2] net-news/rssguard: drop 4.0.4, add 4.2.1

[Anna Vyalkova]

New version uses CMake instead of qmake.

Signed-off-by: Anna Vyalkova <cyber+gentoo@sysrq.in>
---
 net-news/rssguard/Manifest              |  2 +-
 net-news/rssguard/rssguard-4.0.4.ebuild | 66 -------------------------
 net-news/rssguard/rssguard-4.2.1.ebuild | 51 +++++++++++++++++++
 3 files changed, 52 insertions(+), 67 deletions(-)
 delete mode 100644 net-news/rssguard/rssguard-4.0.4.ebuild
 create mode 100644 net-news/rssguard/rssguard-4.2.1.ebuild

diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 28e95e1fd39..80064be0914 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,2 +1,2 @@
-DIST rssguard-4.0.4.tar.gz 14433147 BLAKE2B 6453d16cb440117c335d6773e675399ae4bee2d9226a2e920ffd1e10cc2d5025fc4c302357974352fad41f637aa33c3b66af2444d969f5e934d7432a16b7cb24 SHA512 8c69ec372a54e7e1ad4ff15476d2387fc84cd9d29c5031f9e5c18dcdf833781c54417101f252d23868eedc91262a9ac6446eb09104f5707b08fa92342d565481
 DIST rssguard-4.1.2.tar.gz 21716383 BLAKE2B 5c8da03cdc563799e569dd8c2170f28c5c627a0452a5d0eb325ebb7c88c352248b13624b46d26e94fe443ef1dd948bd281dedb8dcbb0546a984f56472ba0d216 SHA512 d02c6ec7ba6156b6a40e9ad929dc614b7e4aaeb8dfcfe9002e927a4c446908bcb5f299daa1fc67745fea6ebc4954e54a2c296542044a1b86ae98864d5f25bf39
+DIST rssguard-4.2.1.tar.gz 22541187 BLAKE2B 78cc23a39cd75697b53b4c3b043a63d01b8b4e9a9b1cc3fc3f070487dede8d18a33ca462f806b4bfb6847e015a2bacaa77ce27745a95349fb2c09c72cccde3d2 SHA512 05b69d47b3d679005122e03c404ea26d8779f3905ac05ac0565631135c26c56d21ef2f4b3939af6c191a20727a4416e9669ceb4a001e729ffe45fc351183f53a
diff --git a/net-news/rssguard/rssguard-4.0.4.ebuild b/net-news/rssguard/rssguard-4.0.4.ebuild
deleted file mode 100644
index 9fbe9cc1ee9..00000000000
--- a/net-news/rssguard/rssguard-4.0.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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"
-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 )
-
-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
-}
diff --git a/net-news/rssguard/rssguard-4.2.1.ebuild b/net-news/rssguard/rssguard-4.2.1.ebuild
new file mode 100644
index 00000000000..bb1e5906f15
--- /dev/null
+++ b/net-news/rssguard/rssguard-4.2.1.ebuild
@@ -0,0 +1,51 @@
+# 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
+}
-- 
2.35.1

Re: [gentoo-proxy-maint] [PATCH v2] net-news/rssguard: drop 4.0.4, add 4.2.1

[Ionen Wolkens]

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

On Wed, Mar 23, 2022 at 04:44:28PM +0500, Anna Vyalkova wrote:
> New version uses CMake instead of qmake.
> 
> Signed-off-by: Anna Vyalkova <cyber+gentoo@sysrq.in>
> ---
>  net-news/rssguard/Manifest              |  2 +-
>  net-news/rssguard/rssguard-4.0.4.ebuild | 66 -------------------------
>  net-news/rssguard/rssguard-4.2.1.ebuild | 51 +++++++++++++++++++
>  3 files changed, 52 insertions(+), 67 deletions(-)
>  delete mode 100644 net-news/rssguard/rssguard-4.0.4.ebuild
>  create mode 100644 net-news/rssguard/rssguard-4.2.1.ebuild

Merged[1] as-is, thanks.

(sorry if receive duplicate mail, mis-sent the first one)

[1] https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5289c66d9966179b925e69c0e2388d68239875bd
-- 
ionen

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]