From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 356B0138255 for ; Wed, 11 May 2016 18:46:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44C6621C012; Wed, 11 May 2016 18:46:29 +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 7B49921C012 for ; Wed, 11 May 2016 18:46:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C094340831 for ; Wed, 11 May 2016 18:46:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78F8632E for ; Wed, 11 May 2016 18:46:24 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1462992376.18b100d83c4889a74fd56a926b644348a4a9964f.pesa@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: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 18b100d83c4889a74fd56a926b644348a4a9964f X-VCS-Branch: master Date: Wed, 11 May 2016 18:46:24 +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: 1764c301-d9ab-4c9e-88ef-356e0714c8a7 X-Archives-Hash: ada6e36528a1ee29cb6c141c45e5a3b0 commit: 18b100d83c4889a74fd56a926b644348a4a9964f Author: Davide Pesavento gentoo org> AuthorDate: Wed May 11 18:38:44 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed May 11 18:46:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b100d8 net-news/quiterss: sync live ebuild with 0.18.4 Package-Manager: portage-2.2.28 net-news/quiterss/quiterss-9999.ebuild | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild index b2ece10..f223b2a 100644 --- a/net-news/quiterss/quiterss-9999.ebuild +++ b/net-news/quiterss/quiterss-9999.ebuild @@ -4,7 +4,8 @@ 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 eutils l10n fdo-mime gnome2-utils qmake-utils + +inherit fdo-mime gnome2-utils l10n qmake-utils DESCRIPTION="A Qt-based RSS/Atom feed reader" HOMEPAGE="https://quiterss.org" @@ -19,13 +20,12 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="debug phonon +qt4 qt5" -REQUIRED_USE="^^ ( qt4 qt5 )" +IUSE="phonon qt5" -RDEPEND=">=dev-db/sqlite-3.10.0:3 - dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?] - qt4? ( dev-qt/qtcore:4 +RDEPEND=">=dev-db/sqlite-3.11.1:3 + !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 + dev-qt/qtsingleapplication[X,qt4(+)] dev-qt/qtsql:4[sqlite] dev-qt/qtwebkit:4 phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) ) @@ -34,6 +34,7 @@ RDEPEND=">=dev-db/sqlite-3.10.0:3 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 + dev-qt/qtsingleapplication[X,qt5(-)] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 @@ -44,23 +45,30 @@ 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 } - default - # dedicated english locale file is not installed at all rm "lang/${PN}_en.ts" || die - l10n_find_plocales_changes "lang" "${PN}_" '.ts' + l10n_find_plocales_changes lang ${PN}_ .ts l10n_for_each_disabled_locale_do my_rm_loc } src_configure() { - use qt4 && eqmake4 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1 \ - $(usex phonon '' 'DISABLE_PHONON=1') - use qt5 && eqmake5 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1 + local myqmakeargs=( + PREFIX="${EPREFIX}/usr" + SYSTEMQTSA=1 + ) + if use qt5; then + eqmake5 "${myqmakeargs[@]}" + else + eqmake4 "${myqmakeargs[@]}" \ + $(usex phonon '' 'DISABLE_PHONON=1') + fi } src_install() {