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 36C0D138CD1 for ; Wed, 27 May 2015 12:07:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2411EE0884; Wed, 27 May 2015 12:07:43 +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 91924E0886 for ; Wed, 27 May 2015 12:07:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B6C4340DA0 for ; Wed, 27 May 2015 12:07:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31B1EA10 for ; Wed, 27 May 2015 12:07:40 +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: <1432728424.d6beae6e7da83ab630a6588f8a756a1735a27701.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kde4-l10n/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild X-VCS-Directories: kde-apps/kde4-l10n/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: d6beae6e7da83ab630a6588f8a756a1735a27701 X-VCS-Branch: master Date: Wed, 27 May 2015 12:07:40 +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: 05cb5a93-bc63-468e-94a7-4569f4cfee0c X-Archives-Hash: 63d4dc3efad89042ade893516c7723b1 commit: d6beae6e7da83ab630a6588f8a756a1735a27701 Author: Andreas Sturmlechner gmail com> AuthorDate: Mon May 25 17:25:49 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed May 27 12:07:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d6beae6e [kde-apps/kde4-l10n] Improve legacy messages handling Package-Manager: portage-2.2.18 kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild index 9833f20..8f5a8c4 100644 --- a/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild +++ b/kde-apps/kde4-l10n/kde4-l10n-15.04.1.ebuild @@ -82,6 +82,9 @@ src_prepare() { # Drop translations that get installed with plasma 5 and kde apps 5 packages if use minimal; then einfo "Removing paths from ${LNG}" + if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then + rm -rf "${KMNAME}-${LNG}-${LV}" + fi # Remove dirs while read path; do @@ -99,8 +102,10 @@ src_prepare() { else if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then # Merge legacy localisation - find "${KMNAME}-${LNG}-${LV}" -name "*.po" | while read file; \ - do cp -rn "${file}" "${file/${LV}/${PV}/4/${LNG}}"; done + for path in $(find "${KMNAME}-${LNG}-${LV}" -name "*.po"); do + cp -rn "${path}" "${path/${LV}/${PV}/4/${LNG}}" || die + done + rm -rf "${KMNAME}-${LNG}-${LV}" fi fi fi