From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 123E3139082 for ; Wed, 29 Nov 2017 23:20:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99169E0D49; Wed, 29 Nov 2017 23:19:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 763C4E0D49 for ; Wed, 29 Nov 2017 23:19:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 26C9E340988 for ; Wed, 29 Nov 2017 23:19:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32B65AC23 for ; Wed, 29 Nov 2017 23:19:54 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1511997560.41a54521bd78bd8d90e9cca129208ce9060b3b5c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-news/rssguard/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-news/rssguard/rssguard-9999.ebuild X-VCS-Directories: net-news/rssguard/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 41a54521bd78bd8d90e9cca129208ce9060b3b5c X-VCS-Branch: master Date: Wed, 29 Nov 2017 23:19:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2a0f1366-dcf1-4ff9-b440-9dbdbe479b06 X-Archives-Hash: 22f4f2291f62abcd1185ad8feca0ce72 commit: 41a54521bd78bd8d90e9cca129208ce9060b3b5c Author: soredake krutt org> AuthorDate: Tue Nov 28 09:06:24 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 29 23:19:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a54521 net-news/rssguard: update live version Closes: https://github.com/gentoo/gentoo/pull/6115 net-news/rssguard/rssguard-9999.ebuild | 35 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/net-news/rssguard/rssguard-9999.ebuild b/net-news/rssguard/rssguard-9999.ebuild index 4ca7b2a4399..06be77e74c1 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 \