public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/calendarjanitor/
Date: Sat,  8 Apr 2017 08:31:17 +0000 (UTC)	[thread overview]
Message-ID: <1491601201.72a6c97b2e98cb864ee5fabcefb67776271d7f81.asturm@gentoo> (raw)

commit:     72a6c97b2e98cb864ee5fabcefb67776271d7f81
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  7 21:35:49 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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
 }


             reply	other threads:[~2017-04-08  8:31 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-08  8:31 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-12 19:30 [gentoo-commits] proj/kde:master commit in: kde-apps/calendarjanitor/ Andreas Sturmlechner
2024-08-21 21:47 Andreas Sturmlechner
2024-08-12 14:23 Andreas Sturmlechner
2022-10-16 11:42 Andreas Sturmlechner
2018-12-12 15:46 Andreas Sturmlechner
2017-04-25 20:58 Andreas Sturmlechner
2016-09-15 18:11 Michael Palimaka
2016-08-31 14:33 Michael Palimaka
2016-05-26 15:08 Michael Palimaka
2016-05-11  9:51 Michael Palimaka
2016-04-24 17:52 Michael Palimaka
2016-04-02 21:55 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1491601201.72a6c97b2e98cb864ee5fabcefb67776271d7f81.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox