gentoo resync : 01.12.2017

3 files changed, 65 insertions, 20 deletions

diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index cfd7ba86c380..220315f8dec6 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,7 +1,9 @@
 AUX rssguard-3.3.5-deps.patch 886 BLAKE2B 407517f4b89d1667160ca672acd4dca34d1cccfb65a12358d9e9708a9a755310779fd8499856a3d4d8cb949014f59f95b94d302c9cf6844903643d4e9ce4ae8b SHA512 d76996c9cdc214f6f7be125e0e28f6d74cae9b8fc94646c50a139c7a7301d15615a80968246405a67ebbe3fceb0e209c8e986529bf16c43bba669f4f916f9161
 DIST rssguard-3.3.5.tar.gz 5310573 SHA256 c8f9d05d498e63f5654dca2fc27834403d6cd76f078639a5d6e1b2acbc6e81bf SHA512 3d80cffa20f0f5f625907b0245a09ada18d56a190abddf2bcdc9eaa199867e29b68d445e12eec0dc544469e8ead4df2c6753da634346bf60e0913bdae41951be WHIRLPOOL efc16b622f3a0ddccee05c0ff5ba97933b170a8e1b713bf4cd81baeda745e70c88acd34502a372a34df339ab210b929f331609f022be3d5dc88cb9acc74de697
 DIST rssguard-3.4.1.tar.gz 5128550 SHA256 709a92daef6cacb53983b42684f1d60eed3b7462a14403a2dac6cdb299a88bd4 SHA512 0f60bc7f1d000ec8e0f813cccf6235602b9a8f25b833b2bbf094601a0bfdeb5a7dfe7a0745f625812c1509b8489c45141fa51206175968897b394f942f4e6e2c WHIRLPOOL 826db0559456988d2b85da1968863ad39cd4f34a21626db27a2c4a45669e4badb07f160c870dfef36b36f03e57fe5efc12db8e1969ed7f17d87f199f6c3af210
+DIST rssguard-3.5.5.tar.gz 6446094 SHA256 fe79a613d983d552c6b1fac155421969c7db5ff27d404cde20ac21c08388f670 SHA512 4e6512c0d58c678145f63a2a42c43abfe4a6ceb8c9d395aba52228ca3afdaaf3dafdd79ab846dada16963f1be5dd22afb877910acc1425aea037d6fa1fc08996 WHIRLPOOL 5bf6b12eb781da34a1589e488a937e50f5857f020c1a5dd9f3e9d03002638c7510959afc3d3f4dae430ee1da73eeba1c6cf4146b362a668624ed5724cefc425c
 EBUILD rssguard-3.3.5.ebuild 1127 BLAKE2B b62e43c3f16a57b1101ab17b5bb150850a97224b718ebd46fce7bf8dc2b18a5e53a9ecfee61363d4ea650e06ac5efad5503cc06fb7745f1296b201ce2654be27 SHA512 86c81432d5b95ca60ddd4131ad7be3aab952dae9a422b53afbb70e37c824154d2d008bca1ed98dbd5be740cff698c922793e80b5d5ed9a3c3c33c13826dc5636
 EBUILD rssguard-3.4.1.ebuild 1086 BLAKE2B 39305735fac3ec19496fbd07639530d9ba8cde569f9774298b681f138ca91da1f9a68e713e9298158f14a6a6f3a23f2738fa90c2cbe0b51da3788177f42ba67a SHA512 e02f5f9f24b5198b793b319d16d2616e79c02f81d74d8209699801bb64cbf7a958daa02f7d024952bb21984b65d9b568a6280abb65783412017f442c9693c5df
-EBUILD rssguard-9999.ebuild 1068 BLAKE2B 57c9d2df001db145ea0a4f42b3ec04495f9b1ec4c8a0e18726d590e7b2c71c63ac4c5b9f31cc6e35d6514220e501a9fcf842842bf22d4a5f13545f194aab9562 SHA512 f4739ab41949fd1304ae0adbdd4100c171e647f622c059494d928544d65b0d1bd5a72cd69d3dee648ea0ca9f10ab5d080b14dab48b43b92f9a79b29962adc583
+EBUILD rssguard-3.5.5.ebuild 1226 BLAKE2B d8fac15df76f52d6ed4abbeabd6fac1cf078c323c907aa820dc31a39e01e4b65178bcc7479efee7254b4a6f7ff6de0b9997d4f71e91b97be295f0525626c6e8d SHA512 0303e730243ec58d5a2ded5d422682e8ef358a81a8a14afd2cdfb0cbd2c81d5bd99950fe62ee13e3ab60ba2ca4702076b09dbc0bbde19c4c7296664d8993f929
+EBUILD rssguard-9999.ebuild 1211 BLAKE2B 4d73726c9c2a20d27ab660063ee2cb23f666082ed656fec103ae7e1590988e9dba6b641110707ed5f29b7a21a65e42f94fea5e9e1b5016f4a2184fcc64ff4dba SHA512 3142786150353926da88de1b06cc60a029906d860d13ba83441a7ff516f87e6450d4ca44ee2565879718837e7b98a307d71aca21afcec370572f546141a890f5
 MISC metadata.xml 549 BLAKE2B 1234c09aa8567f75c18f24dd092d605befe42ef67e1e488c43353036d3e85e9666cd946f64796be648a02621c666a134845604397c8f016afc41df58bded4613 SHA512 d94106344d205b98b1ae973fe7d159db2ad30437e7ef0e6c3fd6b7dc5fb50fb93567dc4595abcfc81fa0bfbf46c9f7314ff408e050f4999530b68c9c0195311c
diff --git a/net-news/rssguard/rssguard-3.5.5.ebuild b/net-news/rssguard/rssguard-3.5.5.ebuild
new file mode 100644
index 000000000000..ce581c458621
--- /dev/null
+++ b/net-news/rssguard/rssguard-3.5.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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/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-9999.ebuild b/net-news/rssguard/rssguard-9999.ebuild
index 4ca7b2a43990..06be77e74c1c 100644
--- a/net-news/rssguard/rssguard-9999.ebuild
+++ b/net-news/rssguard/rssguard-9999.ebuild
@@ -1,43 +1,40 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit git-r3 qmake-utils
+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/${PN}.git"
+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-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] )
+	>=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-5.6:5
+	>=dev-qt/linguist-tools-${MINQT}
 "
 
-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() {
+	# 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 \