From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-792748-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 106EB138C48
for <garchives@archives.gentoo.org>; Mon, 13 Apr 2015 14:18:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 318CBE0949;
Mon, 13 Apr 2015 14:18:46 +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 D4F19E0949
for <gentoo-commits@lists.gentoo.org>; Mon, 13 Apr 2015 14:18:45 +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 1201D340B47
for <gentoo-commits@lists.gentoo.org>; Mon, 13 Apr 2015 14:18:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9874C15D60
for <gentoo-commits@lists.gentoo.org>; Mon, 13 Apr 2015 14:18:38 +0000 (UTC)
From: "Manuel Rüger" <mrueg@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" <mrueg@gentoo.org>
Message-ID: <1428934705.ecbbc3d7b659febb9da3aae0d12baa3c4c3a1750.mrueg@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kde-l10n/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild
X-VCS-Directories: kde-apps/kde-l10n/
X-VCS-Committer: mrueg
X-VCS-Committer-Name: Manuel Rüger
X-VCS-Revision: ecbbc3d7b659febb9da3aae0d12baa3c4c3a1750
X-VCS-Branch: master
Date: Mon, 13 Apr 2015 14:18:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: be80a9b1-8dae-473d-a999-0698071b5e96
X-Archives-Hash: dd6d9d826220e06b46f8e08296b1fc5c
commit: ecbbc3d7b659febb9da3aae0d12baa3c4c3a1750
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 14:18:25 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 14:18:25 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ecbbc3d7
[kde-apps/kde-l10n] Drop files due to collisions with plasma-5.3
Package-Manager: portage-2.2.18
kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild b/kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild
index bab7cae..210bc04 100644
--- a/kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild
@@ -123,9 +123,15 @@ kio_baloosearch,kio_tags,kio_timeline,plasma_runner_baloosearchrunner}.po
# KDE Applications 4
rm -f "${S}"/${DIR}/4/${LNG}/messages/applications/useraccount.po
- # Plasma 5.3 - kdesu
- sed -i -e '/kdesu/ s/^/#/' "${S}"/${DIR}/4/${LNG}/docs/kde-runtime/CMakeLists.txt
- sed -i -e '/ksysguard/ s/^/#/' "${S}"/${DIR}/4/${LNG}/docs/kde-workspace/CMakeLists.txt
+ # Plasma 5.3 - kdesu, ksysguard, kio-extras, khelpcenter, systemsettings
+ sed -i -e '/kdesu/ s/^/#/' -e '/fundamentals/ s/^/#/' -e '/onlinehelp/ s/^/#/' -e '/khelpcenter/ s/^/#/'\
+ "${S}"/${DIR}/4/${LNG}/docs/kde-runtime/CMakeLists.txt
+
+ sed -i -e '/ksysguard/ s/^/#/' -e '/systemsettings/ s/^/#/'\
+ "${S}"/${DIR}/4/${LNG}/docs/kde-workspace/CMakeLists.txt
+
+ sed -i -e '/kcmcgi/ s/^/#/' -e '/trash/ s/^/#/'\
+ "${S}"/${DIR}/4/${LNG}/docs/kde-runtime/kcontrol/CMakeLists.txt
fi
fi