7 files changed, 61 insertions, 131 deletions
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index d7b0126856b4..1e1d14aaa2f0 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
deleted file mode 100644
index bb6d54b7fa24..000000000000
--- a/net-news/quiterss/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST quiterss-0.19.4.tar.gz 3771775 BLAKE2B d1515a13b4b26a9bfae1760d25e1ab28b1ca797806dc49f2826631764755ad61f5ed887a1c17f6728f45b0fd33271f06157acb1a529a628e0a0f5acb436bee23 SHA512 117a83f7ef61907b8625b0da1fbe069974fa06a434040e54c9c90d8ca572dc60aa96c1081dbe3d7110d0c9304fe47dafe1faeedcc45e32bbf638b793eede96da
-EBUILD quiterss-0.19.4.ebuild 1096 BLAKE2B 0a794f25832776a70ca7f556effaff92ab5378b72637467eeb6fc912427763b5b41505104864ee294f79883452c807e02b21de0a68f83979799dcf7f23a3a503 SHA512 a155f9030a48813b6086cf8f2035bf3a2417cba427c44b9409ca7fd3710a38d1fcf7bd4a5678319891c2adc51651fa6444d901304f183b5de8ab30687f47296c
-EBUILD quiterss-9999.ebuild 1098 BLAKE2B 2fbe7d805d2a7bdbe42471f95cdc4b7575f4f2056765bf9fa71e609a16e857c1829e79d0c848798817194a486f46094e885f946882e22e61bcb8cbf6ccde3815 SHA512 24934d5a3c361ecf22ecdb7c02018ea29a73bbb1033fd32e8a1517e6b76a43bd05224319b11c9454fc2438848b4833b11e3c13b01b46728f453d0a45cb8481a0
-MISC metadata.xml 329 BLAKE2B caa7a5bfcbbf62b32546c2a8cb0d3e55b1b1d0371b81505156a566df605e277d9560d900a4d2f945b4d9da99b7898edec3c08264b5628f4d74c9c949f805e455 SHA512 d77d10152c5497c4bb21511bd20b8a122159e048d11d070fffbd2ef5742be3bd0019eafb79a5e828b923b095b8628ff1d65371800ea49dbe6ec6355d1b9a0150
diff --git a/net-news/quiterss/metadata.xml b/net-news/quiterss/metadata.xml
deleted file mode 100644
index 0aa296acab08..000000000000
--- a/net-news/quiterss/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">QuiteRSS/quiterss</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-news/quiterss/quiterss-0.19.4.ebuild b/net-news/quiterss/quiterss-0.19.4.ebuild
deleted file mode 100644
index d77a928c2f35..000000000000
--- a/net-news/quiterss/quiterss-0.19.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Qt-based RSS/Atom feed reader"
-HOMEPAGE="https://quiterss.org"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-db/sqlite-3.11.1:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "s/exists(.git)/0/" -i QuiteRSS.pro || die
-}
-
-src_configure() {
-	local myqmakeargs=(
-		PREFIX="${EPREFIX}/usr"
-		SYSTEMQTSA=1
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild
deleted file mode 100644
index 2563e58e165a..000000000000
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Qt-based RSS/Atom feed reader"
-HOMEPAGE="https://quiterss.org"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-db/sqlite-3.11.1:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "s/exists(.git)/0/" -i QuiteRSS.pro || die
-}
-
-src_configure() {
-	local myqmakeargs=(
-		PREFIX="${EPREFIX}/usr"
-		SYSTEMQTSA=1
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index a7b8ad2d29fb..edbcc9d473b7 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,4 +1,6 @@
 AUX rssguard-3.5.9-qt-5.14.patch 328 BLAKE2B 9a4672518bf6f686573fcfab9c242427a32aaae21faf6de4502eebd88672c1f57bba176f06518ffbd6bcc2138782d30d8f43df23e059ce8bcbd7054d5e0825a6 SHA512 2bbba197e115b302f1f92f805e6494797ef9a2ade4c4a91ca1ec573a3db9b4f412a8caa29ce716f65241f86544bdb70d4708fd2abe33f2621b368fae5792d183
 DIST rssguard-3.5.9.tar.gz 5775322 BLAKE2B f7d91e87b2a55d780bc1eae4f7e55b8059c049d21998f4c2554a84ca1d7b283e3145a556eef77e784d88ae2ad9f016d7b486a12141dceeada69dd1240205de23 SHA512 3a7223767185bf37bef316291b88d60bb2906fdbd0b045aa07c2ca4be19aadaeaa0b8c923f22aaa3483c7db783386744ad1411ad1ab214a8a71ef260948707b9
+DIST rssguard-3.8.3.tar.gz 9865909 BLAKE2B 7afc9dd0cec9ff58164c341f8cb3c6f31608da958a9c64f8099d9ba645cf7bbdaaa76accb3877943eefeb71b9172a13fa43c0ced7d58c6f368cc164e40a5ab39 SHA512 d7c1d18981177880d93bfaf4a87769638804058609f68b8c42db376c4a0e56230b57a29f70054deb30e02634cfa64355ecfe658b5f961a516b990af91c6f3ba8
 EBUILD rssguard-3.5.9-r1.ebuild 1132 BLAKE2B 2b4f9fa38242a61e37d67e60a6978cf5b3f7bc87787d3bcc496311bc04665f2b86fc15dc27cf46f0cd19fd68d42b93ee38046fd2292f430b8f513d1c21e0f0de SHA512 bdc038b4cde3604d4182642240a0196ae56a224fdf28185ee222e74b1ccfa69346096211ab70155fa02ec187c45116640831e75beb6ebca3129a33d2f8d941cd
+EBUILD rssguard-3.8.3.ebuild 1454 BLAKE2B f4ff9629f5f571646a8751006fa5ad23f185ebb176ab4a994e9192e4522afde4c43fa68b8ff0e93000686a46491e02d47d3e2171d70eb4843837878be6f50022 SHA512 b1c608f196735913a5913064fa4a7789c1afa2dbf14deb6e7bfa54817ce0aac655c4f3d21c1c22b363723f98b2dda0506ebc64f9be40a2973180097ac51272c6
 MISC metadata.xml 359 BLAKE2B 39ba3058386b88bd289077c592c99631c58e54a027c00afd6de5d27639019174039038f48323605071f5dc7184686675e337032866ec93fba5d769f975b2d43c SHA512 0a87ec4aa15bdd0932912f519be77ea3c9a524d26847397b0753b7624af73912b46c320c901304b8df128df75f517f7e7d920c87b840fcc31627c5e039700c5e
diff --git a/net-news/rssguard/rssguard-3.8.3.ebuild b/net-news/rssguard/rssguard-3.8.3.ebuild
new file mode 100644
index 000000000000..15b6a7dac1db
--- /dev/null
+++ b/net-news/rssguard/rssguard-3.8.3.ebuild
@@ -0,0 +1,59 @@
+# 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}"
+}