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 63926139694 for ; Sat, 8 Apr 2017 08:31:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A011E21C039; Sat, 8 Apr 2017 08:31:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 8122221C039 for ; Sat, 8 Apr 2017 08:31:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7879F34168A 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 24F12742C 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.72a6c97b2e98cb864ee5fabcefb67776271d7f81.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/calendarjanitor/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/calendarjanitor/calendarjanitor-17.04.49.9999.ebuild kde-apps/calendarjanitor/calendarjanitor-9999.ebuild X-VCS-Directories: kde-apps/calendarjanitor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 72a6c97b2e98cb864ee5fabcefb67776271d7f81 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: 82a2179f-a87f-4524-85b1-d06f193b3b9a X-Archives-Hash: c089304262b49f67c8a046693fabab95 commit: 72a6c97b2e98cb864ee5fabcefb67776271d7f81 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 7 21:35:49 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=72a6c97b kde-apps/calendarjanitor: Remove colliding konsolekalendar translations Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/calendarjanitor/calendarjanitor-17.04.49.9999.ebuild | 9 ++++++++- kde-apps/calendarjanitor/calendarjanitor-9999.ebuild | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/kde-apps/calendarjanitor/calendarjanitor-17.04.49.9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-17.04.49.9999.ebuild index c86dd1fc0d..415cde54be 100644 --- a/kde-apps/calendarjanitor/calendarjanitor-17.04.49.9999.ebuild +++ b/kde-apps/calendarjanitor/calendarjanitor-17.04.49.9999.ebuild @@ -27,7 +27,14 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { + kde5_src_prepare + cmake_comment_add_subdirectory doc konsolekalendar sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die - kde5_src_prepare + + # delete colliding konsolekalendar translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + rm po/*/konsolekalendar.po || die + rm -rf po/*/docs/konsolekalendar || die + fi } diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild index c86dd1fc0d..415cde54be 100644 --- a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild +++ b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild @@ -27,7 +27,14 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { + kde5_src_prepare + cmake_comment_add_subdirectory doc konsolekalendar sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die - kde5_src_prepare + + # delete colliding konsolekalendar translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + rm po/*/konsolekalendar.po || die + rm -rf po/*/docs/konsolekalendar || die + fi }