gentoo resync : 15.01.2020

5 files changed, 65 insertions, 96 deletions

diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index e299965dc344..93a46946c9da 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,4 +1,4 @@
-DIST rssguard-3.5.5.tar.gz 6446094 BLAKE2B 81a862f25f2c3029d4453faf03ddcfac1cd420a430acafff75bf15132d080b726910da82d1b7422f383eaec8b40a3956d7ad91d9368d9bd68fabcb9940dc3ad2 SHA512 4e6512c0d58c678145f63a2a42c43abfe4a6ceb8c9d395aba52228ca3afdaaf3dafdd79ab846dada16963f1be5dd22afb877910acc1425aea037d6fa1fc08996
-EBUILD rssguard-3.5.5.ebuild 1255 BLAKE2B 3269ea0df4be234f889f9cb66807e07a637933fb9523361702b0562428bd7668b7dd48e1ebb819554b607203c7d631d8beeabf1d034df564e2b5ca99ae83b01d SHA512 de67c9de714966c491ba02435e221eac6db3ba666117074fcb7ae51810ec5a7190510deca5140807c3588eefa266349fa11f4cb452759a13f0a1cc5d770f0178
-EBUILD rssguard-9999.ebuild 1211 BLAKE2B 4d73726c9c2a20d27ab660063ee2cb23f666082ed656fec103ae7e1590988e9dba6b641110707ed5f29b7a21a65e42f94fea5e9e1b5016f4a2184fcc64ff4dba SHA512 3142786150353926da88de1b06cc60a029906d860d13ba83441a7ff516f87e6450d4ca44ee2565879718837e7b98a307d71aca21afcec370572f546141a890f5
+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
+EBUILD rssguard-3.5.9-r1.ebuild 1121 BLAKE2B fac4fed81e00e3b0954bb4d4dafcfcfec4ccee434777d4911c82dcb50d140f1476d60c992d64aa02cd24454010f383b0efd7e42cacc4cde1c67422616eaca334 SHA512 652cd14b22fc73ec13e3460e5e7a8a7c1ed12695526790d962fd360824edde9f4e8ebac7468187911533d00bcb127f1060e7d978fc3c167d5ad90f113fe675f4
 MISC metadata.xml 359 BLAKE2B 39ba3058386b88bd289077c592c99631c58e54a027c00afd6de5d27639019174039038f48323605071f5dc7184686675e337032866ec93fba5d769f975b2d43c SHA512 0a87ec4aa15bdd0932912f519be77ea3c9a524d26847397b0753b7624af73912b46c320c901304b8df128df75f517f7e7d920c87b840fcc31627c5e039700c5e
diff --git a/net-news/rssguard/files/rssguard-3.5.9-qt-5.14.patch b/net-news/rssguard/files/rssguard-3.5.9-qt-5.14.patch
new file mode 100644
index 000000000000..c1d9a8ccb5fe
--- /dev/null
+++ b/net-news/rssguard/files/rssguard-3.5.9-qt-5.14.patch
@@ -0,0 +1,10 @@
+--- a/src/gui/messagepreviewer.cpp	2019-06-04 13:16:48.000000000 +0200
++++ b/src/gui/messagepreviewer.cpp	2020-01-05 17:26:13.405430006 +0100
+@@ -9,6 +9,7 @@
+ #include "network-web/webfactory.h"
+ #include "services/abstract/serviceroot.h"
+ 
++#include <QKeyEvent>
+ #include <QScrollBar>
+ #include <QToolBar>
+ #include <QToolTip>
diff --git a/net-news/rssguard/rssguard-3.5.5.ebuild b/net-news/rssguard/rssguard-3.5.5.ebuild
deleted file mode 100644
index 7d8229bd3313..000000000000
--- a/net-news/rssguard/rssguard-3.5.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="A 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"
-MINQT="5.8:5"
-
-RDEPEND="
-	>=dev-qt/qtcore-${MINQT}
-	>=dev-qt/qtgui-${MINQT}
-	>=dev-qt/qtnetwork-${MINQT}
-	>=dev-qt/qtconcurrent-${MINQT}
-	>=dev-qt/qtsql-${MINQT}
-	>=dev-qt/qtwidgets-${MINQT}
-	>=dev-qt/qtxml-${MINQT}
-	webengine? ( >=dev-qt/qtwebengine-${MINQT}[widgets] )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-${MINQT}
-"
-
-src_configure() {
-	# needed after 8eb640b6f2e140e7c5a1adbe5532cf3662d850b5
-	"$(qt5_get_bindir)/lrelease" rssguard.pro || die "lrelease failed"
-	# 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) \
-		LRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" \
-		PREFIX="${EPREFIX}"/usr \
-		INSTALL_ROOT=.
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/net-news/rssguard/rssguard-3.5.9-r1.ebuild b/net-news/rssguard/rssguard-3.5.9-r1.ebuild
new file mode 100644
index 000000000000..d7491fc3d340
--- /dev/null
+++ b/net-news/rssguard/rssguard-3.5.9-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic xdg-utils qmake-utils
+
+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
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" )
+
+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) \
+		PREFIX="${EPREFIX}"/usr \
+		INSTALL_ROOT=.
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-news/rssguard/rssguard-9999.ebuild b/net-news/rssguard/rssguard-9999.ebuild
deleted file mode 100644
index 06be77e74c1c..000000000000
--- a/net-news/rssguard/rssguard-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic git-r3 qmake-utils
-
-DESCRIPTION="A tiny RSS and Atom feed reader"
-HOMEPAGE="https://github.com/martinrotter/rssguard"
-EGIT_REPO_URI="https://github.com/martinrotter/rssguard.git"
-EGIT_SUBMODULES=()
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug webengine"
-MINQT="5.8:5"
-
-RDEPEND="
-	>=dev-qt/qtcore-${MINQT}
-	>=dev-qt/qtgui-${MINQT}
-	>=dev-qt/qtnetwork-${MINQT}
-	>=dev-qt/qtsql-${MINQT}
-	>=dev-qt/qtwidgets-${MINQT}
-	>=dev-qt/qtxml-${MINQT}
-	webengine? ( >=dev-qt/qtwebengine-${MINQT}[widgets] )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-${MINQT}
-"
-
-src_configure() {
-	# needed after 8eb640b6f2e140e7c5a1adbe5532cf3662d850b5
-	"$(qt5_get_bindir)/lrelease" rssguard.pro || die "lrelease failed"
-	# 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) \
-		LRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" \
-		PREFIX="${EPREFIX}"/usr \
-		INSTALL_ROOT=.
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}