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 35BBA138334 for ; Sat, 4 May 2019 04:08:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC365E082B; Sat, 4 May 2019 04:08:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 AD5AFE082B for ; Sat, 4 May 2019 04:08:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A4D48343460 for ; Sat, 4 May 2019 04:08:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 016F8560 for ; Sat, 4 May 2019 04:08:26 +0000 (UTC) From: "Markus Meier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markus Meier" Message-ID: <1556942893.29225397e9119c4665ae85952d5c172efda9c501.maekke@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/darktable/darktable-2.6.1.ebuild media-gfx/darktable/darktable-2.6.2.ebuild media-gfx/darktable/darktable-9999.ebuild X-VCS-Directories: media-gfx/darktable/ X-VCS-Committer: maekke X-VCS-Committer-Name: Markus Meier X-VCS-Revision: 29225397e9119c4665ae85952d5c172efda9c501 X-VCS-Branch: master Date: Sat, 4 May 2019 04:08:26 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2011508c-1683-4221-b0ae-95bc82afbd19 X-Archives-Hash: 542431db2238e363ad0bd78308942f34 commit: 29225397e9119c4665ae85952d5c172efda9c501 Author: Markus Meier gentoo org> AuthorDate: Sat May 4 04:08:13 2019 +0000 Commit: Markus Meier gentoo org> CommitDate: Sat May 4 04:08:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29225397 media-gfx/darktable: fix language file removal, bug #681146 don't try to remove translations when USE=nls is disabled Signed-off-by: Markus Meier gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 media-gfx/darktable/darktable-2.6.1.ebuild | 12 +++++++----- media-gfx/darktable/darktable-2.6.2.ebuild | 14 ++++++++------ media-gfx/darktable/darktable-9999.ebuild | 12 +++++++----- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/media-gfx/darktable/darktable-2.6.1.ebuild b/media-gfx/darktable/darktable-2.6.1.ebuild index 9aad79d520f..6a8e3830f4d 100644 --- a/media-gfx/darktable/darktable-2.6.1.ebuild +++ b/media-gfx/darktable/darktable-2.6.1.ebuild @@ -111,11 +111,13 @@ src_install() { cmake-utils_src_install use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf - for lang in ${LANGS} ; do - if ! use l10n_${lang}; then - rm -r "${ED}"/usr/share/locale/${lang/-/_} || die - fi - done + if use nls ; then + for lang in ${LANGS} ; do + if ! use l10n_${lang}; then + rm -r "${ED}"/usr/share/locale/${lang/-/_} || die + fi + done + fi if use pax_kernel && use opencl ; then pax-mark Cm "${ED}"/usr/bin/${PN} || die diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild index 16cb27650ab..48d249ae730 100644 --- a/media-gfx/darktable/darktable-2.6.2.ebuild +++ b/media-gfx/darktable/darktable-2.6.2.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P LICENSE="GPL-3 CC-BY-3.0" SLOT="0" KEYWORDS="~amd64 ~x86" -LANGS=" ca de es fi fr hu ja nb nl pl pt-BR ru sl" +LANGS=" ca cs de es fi fr hu ja nb nl pl pt-BR ru sl" # TODO add lua once dev-lang/lua-5.2 is unmasked IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr pax_kernel webp @@ -111,11 +111,13 @@ src_install() { cmake-utils_src_install use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf - for lang in ${LANGS} ; do - if ! use l10n_${lang}; then - rm -r "${ED}"/usr/share/locale/${lang/-/_} || die - fi - done + if use nls ; then + for lang in ${LANGS} ; do + if ! use l10n_${lang}; then + rm -r "${ED}"/usr/share/locale/${lang/-/_} || die + fi + done + fi if use pax_kernel && use opencl ; then pax-mark Cm "${ED}"/usr/bin/${PN} || die diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild index 891596c86e8..6357db9016d 100644 --- a/media-gfx/darktable/darktable-9999.ebuild +++ b/media-gfx/darktable/darktable-9999.ebuild @@ -103,11 +103,13 @@ src_install() { cmake-utils_src_install use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf - for lang in ${LANGS} ; do - if ! use l10n_${lang}; then - rm -r "${ED}"/usr/share/locale/${lang/-/_} || die - fi - done + if use nls ; then + for lang in ${LANGS} ; do + if ! use l10n_${lang}; then + rm -r "${ED}"/usr/share/locale/${lang/-/_} || die + fi + done + fi if use pax_kernel && use opencl ; then pax-mark Cm "${ED}"/usr/bin/${PN} || die