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 3B18013877A for ; Wed, 18 Jun 2014 19:31:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0B8CE09C4; Wed, 18 Jun 2014 19:31:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50938E09C3 for ; Wed, 18 Jun 2014 19:31:07 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F4B53400DE for ; Wed, 18 Jun 2014 19:31:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E3975187EB for ; Wed, 18 Jun 2014 19:31:04 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1403119826.e858e365d502c4719567badb170f9b95db00622e.pinkbyte@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: www-client/qupzilla/ X-VCS-Repository: proj/qt X-VCS-Files: www-client/qupzilla/qupzilla-9999.ebuild X-VCS-Directories: www-client/qupzilla/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: e858e365d502c4719567badb170f9b95db00622e X-VCS-Branch: master Date: Wed, 18 Jun 2014 19:31:04 +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: 13003a3c-c288-4652-9d25-059803e8c2a0 X-Archives-Hash: 1f792ff4cb1c5adad8a8cd28836c4634 commit: e858e365d502c4719567badb170f9b95db00622e Author: Sergey Popov gentoo org> AuthorDate: Wed Jun 18 19:30:26 2014 +0000 Commit: Sergey Popov gentoo org> CommitDate: Wed Jun 18 19:30:26 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e858e365 www-client/qupzilla: remove unnecessary locales properly, add check for new/removed locales, fix bug #513674 Package-Manager: portage-2.2.10 --- www-client/qupzilla/qupzilla-9999.ebuild | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/www-client/qupzilla/qupzilla-9999.ebuild b/www-client/qupzilla/qupzilla-9999.ebuild index e10f23a..33f4c69 100644 --- a/www-client/qupzilla/qupzilla-9999.ebuild +++ b/www-client/qupzilla/qupzilla-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 if [[ ${PV} == "9999" ]]; then VCS_ECLASS=git-2 @@ -16,9 +16,7 @@ else S=${WORKDIR}/${MY_P} fi -PLOCALES="cs_CZ de_DE el_GR es_ES es_VE fa_IR fr_FR hu_HU id_ID it_IT ja_JP -ka_GE nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr_BA sr_RS sv_SE uk_UA -zh_CN zh_TW" +PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr@ijekavianlatin sr@ijekavian sr@latin sr sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW" inherit l10n multilib qt4-r2 ${VCS_ECLASS} @@ -38,11 +36,21 @@ DEPEND=" dbus? ( >=dev-qt/qtdbus-4.7:4 )" RDEPEND="${DEPEND}" -DOCS="AUTHORS BUILDING CHANGELOG FAQ README.md" +DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md ) src_prepare() { + rm_loc() { + sed -i -e "/${1}.ts/d" translations/translations.pri || die + rm translations/${1}.ts || die + } # remove outdated copies of localizations: - rm -rf bin/locale || die + rm -r bin/locale || die + # remove empty locale + rm translations/empty.ts || die + + l10n_find_plocales_changes "translations" "" ".ts" + l10n_for_each_disabled_locale_do rm_loc + qt4-r2_src_prepare } src_configure() { @@ -62,9 +70,4 @@ src_configure() { src_install() { qt4-r2_src_install - l10n_for_each_disabled_locale_do rm_loc -} - -rm_loc() { - rm "${D}"/usr/share/${PN}/locale/${1}.qm || die }