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 4334D139694 for ; Sat, 8 Apr 2017 08:31:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B1FFE0BF6; Sat, 8 Apr 2017 08:31:20 +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 789EBE0BF6 for ; Sat, 8 Apr 2017 08:31:20 +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 9A51634168F for ; Sat, 8 Apr 2017 08:31:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3813E742D for ; Sat, 8 Apr 2017 08:31:17 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1491601201.6030fbef207d9909a9b53078b9fbe824a3ff5fc1.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/konsolekalendar/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/konsolekalendar/konsolekalendar-17.04.49.9999.ebuild kde-apps/konsolekalendar/konsolekalendar-9999.ebuild X-VCS-Directories: kde-apps/konsolekalendar/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6030fbef207d9909a9b53078b9fbe824a3ff5fc1 X-VCS-Branch: master Date: Sat, 8 Apr 2017 08:31:17 +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: e3835950-58fe-4e42-989b-4eab73bb79f9 X-Archives-Hash: 40dabcc1c853a75d13e7360136276ceb commit: 6030fbef207d9909a9b53078b9fbe824a3ff5fc1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 7 21:36:29 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 7 21:40:01 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6030fbef kde-apps/konsolekalendar: Remove colliding calendarjanitor translations Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/konsolekalendar/konsolekalendar-17.04.49.9999.ebuild | 8 +++++++- kde-apps/konsolekalendar/konsolekalendar-9999.ebuild | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/kde-apps/konsolekalendar/konsolekalendar-17.04.49.9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-17.04.49.9999.ebuild index 16dab1145b..f64d77c1b1 100644 --- a/kde-apps/konsolekalendar/konsolekalendar-17.04.49.9999.ebuild +++ b/kde-apps/konsolekalendar/konsolekalendar-17.04.49.9999.ebuild @@ -28,6 +28,12 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { - cmake_comment_add_subdirectory calendarjanitor kde5_src_prepare + + # delete colliding calendarjanitor translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + rm po/*/calendarjanitor.po || die + fi + + cmake_comment_add_subdirectory calendarjanitor } diff --git a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild index 16dab1145b..f64d77c1b1 100644 --- a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild +++ b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild @@ -28,6 +28,12 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { - cmake_comment_add_subdirectory calendarjanitor kde5_src_prepare + + # delete colliding calendarjanitor translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + rm po/*/calendarjanitor.po || die + fi + + cmake_comment_add_subdirectory calendarjanitor }