gentoo resync : 22.10.2018

5 files changed, 3 insertions, 106 deletions

diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index acc84a54a97a..8db814e9e3ce 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 945df4977483..bb457e618292 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,9 +1,5 @@
 AUX rssguard-3.3.5-deps.patch 886 BLAKE2B 407517f4b89d1667160ca672acd4dca34d1cccfb65a12358d9e9708a9a755310779fd8499856a3d4d8cb949014f59f95b94d302c9cf6844903643d4e9ce4ae8b SHA512 d76996c9cdc214f6f7be125e0e28f6d74cae9b8fc94646c50a139c7a7301d15615a80968246405a67ebbe3fceb0e209c8e986529bf16c43bba669f4f916f9161
-DIST rssguard-3.3.5.tar.gz 5310573 BLAKE2B 113f6149e646a90750a10b1bbb1ef649153df903cee4b03ee325bf8595a783052a9a8df37524fb34bb4838c4a5334e5eccee416bb24811a2f60c2582ad10eb35 SHA512 3d80cffa20f0f5f625907b0245a09ada18d56a190abddf2bcdc9eaa199867e29b68d445e12eec0dc544469e8ead4df2c6753da634346bf60e0913bdae41951be
-DIST rssguard-3.4.1.tar.gz 5128550 BLAKE2B 43f4e1dbe5fe40b69dcad98b48b088811a8d9d80f1b11ec66466d2fbbe82ace6cc12e3117e9ab4e37ebbf06aab89c1ab80d17ccdb82febae9a2a509da66ac52f SHA512 0f60bc7f1d000ec8e0f813cccf6235602b9a8f25b833b2bbf094601a0bfdeb5a7dfe7a0745f625812c1509b8489c45141fa51206175968897b394f942f4e6e2c
 DIST rssguard-3.5.5.tar.gz 6446094 BLAKE2B 81a862f25f2c3029d4453faf03ddcfac1cd420a430acafff75bf15132d080b726910da82d1b7422f383eaec8b40a3956d7ad91d9368d9bd68fabcb9940dc3ad2 SHA512 4e6512c0d58c678145f63a2a42c43abfe4a6ceb8c9d395aba52228ca3afdaaf3dafdd79ab846dada16963f1be5dd22afb877910acc1425aea037d6fa1fc08996
-EBUILD rssguard-3.3.5.ebuild 1127 BLAKE2B b62e43c3f16a57b1101ab17b5bb150850a97224b718ebd46fce7bf8dc2b18a5e53a9ecfee61363d4ea650e06ac5efad5503cc06fb7745f1296b201ce2654be27 SHA512 86c81432d5b95ca60ddd4131ad7be3aab952dae9a422b53afbb70e37c824154d2d008bca1ed98dbd5be740cff698c922793e80b5d5ed9a3c3c33c13826dc5636
-EBUILD rssguard-3.4.1.ebuild 1086 BLAKE2B 39305735fac3ec19496fbd07639530d9ba8cde569f9774298b681f138ca91da1f9a68e713e9298158f14a6a6f3a23f2738fa90c2cbe0b51da3788177f42ba67a SHA512 e02f5f9f24b5198b793b319d16d2616e79c02f81d74d8209699801bb64cbf7a958daa02f7d024952bb21984b65d9b568a6280abb65783412017f442c9693c5df
-EBUILD rssguard-3.5.5.ebuild 1226 BLAKE2B d8fac15df76f52d6ed4abbeabd6fac1cf078c323c907aa820dc31a39e01e4b65178bcc7479efee7254b4a6f7ff6de0b9997d4f71e91b97be295f0525626c6e8d SHA512 0303e730243ec58d5a2ded5d422682e8ef358a81a8a14afd2cdfb0cbd2c81d5bd99950fe62ee13e3ab60ba2ca4702076b09dbc0bbde19c4c7296664d8993f929
+EBUILD rssguard-3.5.5.ebuild 1255 BLAKE2B 3269ea0df4be234f889f9cb66807e07a637933fb9523361702b0562428bd7668b7dd48e1ebb819554b607203c7d631d8beeabf1d034df564e2b5ca99ae83b01d SHA512 de67c9de714966c491ba02435e221eac6db3ba666117074fcb7ae51810ec5a7190510deca5140807c3588eefa266349fa11f4cb452759a13f0a1cc5d770f0178
 EBUILD rssguard-9999.ebuild 1211 BLAKE2B 4d73726c9c2a20d27ab660063ee2cb23f666082ed656fec103ae7e1590988e9dba6b641110707ed5f29b7a21a65e42f94fea5e9e1b5016f4a2184fcc64ff4dba SHA512 3142786150353926da88de1b06cc60a029906d860d13ba83441a7ff516f87e6450d4ca44ee2565879718837e7b98a307d71aca21afcec370572f546141a890f5
 MISC metadata.xml 359 BLAKE2B 39ba3058386b88bd289077c592c99631c58e54a027c00afd6de5d27639019174039038f48323605071f5dc7184686675e337032866ec93fba5d769f975b2d43c SHA512 0a87ec4aa15bdd0932912f519be77ea3c9a524d26847397b0753b7624af73912b46c320c901304b8df128df75f517f7e7d920c87b840fcc31627c5e039700c5e
diff --git a/net-news/rssguard/rssguard-3.3.5.ebuild b/net-news/rssguard/rssguard-3.3.5.ebuild
deleted file mode 100644
index c7ba435e5114..000000000000
--- a/net-news/rssguard/rssguard-3.3.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=dev-qt/qtsql-5.6:5
-	>=dev-qt/qtwidgets-5.6:5
-	>=dev-qt/qtxml-5.6:5
-	webengine? ( >=dev-qt/qtwebengine-5.6:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-5.6:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-deps.patch" )
-
-src_prepare() {
-	default
-
-	# remove bundled qtbase translations
-	rm localization/qtbase* || die
-	sed -i -e "s|localization/qtbase-[a-z][a-z].ts||g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		CONFIG+=$(usex debug debug release) \
-		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.4.1.ebuild b/net-news/rssguard/rssguard-3.4.1.ebuild
deleted file mode 100644
index 8f2495596002..000000000000
--- a/net-news/rssguard/rssguard-3.4.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=dev-qt/qtsql-5.6:5
-	>=dev-qt/qtwidgets-5.6:5
-	>=dev-qt/qtxml-5.6:5
-	webengine? ( >=dev-qt/qtwebengine-5.6:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-5.6:5
-"
-
-src_prepare() {
-	default
-
-	# remove bundled qtbase translations
-	rm -v localization/qtbase* || die
-	sed -i -e "s|localization/qtbase_[a-z][a-z].ts||g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		CONFIG+=$(usex debug debug release) \
-		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.5.ebuild b/net-news/rssguard/rssguard-3.5.5.ebuild
index ce581c458621..7d8229bd3313 100644
--- a/net-news/rssguard/rssguard-3.5.5.ebuild
+++ b/net-news/rssguard/rssguard-3.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ 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}