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 3BDB0139695 for ; Sun, 18 Jun 2017 12:52:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 678AC23400F; Sun, 18 Jun 2017 12:52:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45ACB23400F for ; Sun, 18 Jun 2017 12:52:46 +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 35D6A34197E for ; Sun, 18 Jun 2017 12:52:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0A097480 for ; Sun, 18 Jun 2017 12:52:43 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1497790350.8b96f0baaa5b81d7711be035f2d7dda484a8e528.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-news/quiterss/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-news/quiterss/quiterss-9999.ebuild X-VCS-Directories: net-news/quiterss/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 8b96f0baaa5b81d7711be035f2d7dda484a8e528 X-VCS-Branch: master Date: Sun, 18 Jun 2017 12:52:43 +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: 6169159f-56e1-4988-9725-9a0f91e8f1dc X-Archives-Hash: 23a8cef644babe1b89e4f23a066196a8 commit: 8b96f0baaa5b81d7711be035f2d7dda484a8e528 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 18 12:52:20 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 18 12:52:30 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b96f0ba net-news/quiterss: sync live ebuild with release Package-Manager: Portage-2.3.5, Repoman-2.3.2 net-news/quiterss/quiterss-9999.ebuild | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild index 9f9841e363a..da7045485e2 100644 --- a/net-news/quiterss/quiterss-9999.ebuild +++ b/net-news/quiterss/quiterss-9999.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PLOCALES="ar bg cs de el_GR es fa fi fr gl he hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ th_TH tr uk vi zh_CN zh_TW" -inherit fdo-mime gnome2-utils l10n qmake-utils +inherit gnome2-utils qmake-utils xdg-utils DESCRIPTION="A Qt-based RSS/Atom feed reader" HOMEPAGE="https://quiterss.org" @@ -28,7 +27,7 @@ RDEPEND=" dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 - dev-qt/qtsingleapplication[X,qt5] + dev-qt/qtsingleapplication[X,qt5(-)] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 @@ -40,24 +39,12 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS CHANGELOG README.md ) -src_prepare() { - default - - my_rm_loc() { - sed -i -e "s:lang/${PN}_${1}.ts::" lang/lang.pri || die - } - - # dedicated english locale file is not installed at all - rm "lang/${PN}_en.ts" || die - - l10n_find_plocales_changes lang ${PN}_ .ts - l10n_for_each_disabled_locale_do my_rm_loc -} - src_configure() { - eqmake5 \ - PREFIX="${EPREFIX}/usr" \ + local myqmakeargs=( + PREFIX="${EPREFIX%/}/usr" SYSTEMQTSA=1 + ) + eqmake5 "${myqmakeargs[@]}" } src_install() { @@ -65,16 +52,12 @@ src_install() { einstalldocs } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { - fdo-mime_desktop_database_update gnome2_icon_cache_update + xdg_desktop_database_update } pkg_postrm() { - fdo-mime_desktop_database_update gnome2_icon_cache_update + xdg_desktop_database_update }