[gentoo-commits] proj/kde:master commit in: kde-apps/calendarjanitor/

[Michael Palimaka]

commit:     fb6905408ba20140176d73f1612d6fd8ec856596
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Sep 15 18:02:25 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 18:11:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb690540

kde-apps/calendarjanitor: Fix file collision

console.categories currently only has an entry for konsolekalendar.

Gentoo-bug: 593886

Package-Manager: portage-2.3.0

 kde-apps/calendarjanitor/calendarjanitor-16.08.49.9999.ebuild | 3 ++-
 kde-apps/calendarjanitor/calendarjanitor-9999.ebuild          | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-apps/calendarjanitor/calendarjanitor-16.08.49.9999.ebuild 
b/kde-apps/calendarjanitor/calendarjanitor-16.08.49.9999.ebuild
index 3a3d95b..4ebbb23 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-16.08.49.9999.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-16.08.49.9999.ebuild
@@ -9,7 +9,7 @@ KDE_TEST="false"
 KMNAME="kdepim"
 inherit kde5
 
-DESCRIPTION="A tool to scan calendar data for buggy instances"
+DESCRIPTION="Tool to scan calendar data for buggy instances"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 
@@ -37,5 +37,6 @@ fi
 
 src_prepare() {
        cmake_comment_add_subdirectory konsolekalendar
+       sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
        kde5_src_prepare
 }

diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild 
b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
index b78b1da..884e9ff 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
@@ -31,5 +31,6 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
        cmake_comment_add_subdirectory doc konsolekalendar
+       sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
        kde5_src_prepare
 }