From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 116CB138C48 for ; Mon, 13 Apr 2015 15:09:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAF55E087B; Mon, 13 Apr 2015 15:09:03 +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 72B6CE087B for ; Mon, 13 Apr 2015 15:09:03 +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 565C4340ADC for ; Mon, 13 Apr 2015 15:09:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA99715D71 for ; Mon, 13 Apr 2015 15:08:58 +0000 (UTC) From: "Manuel Rüger" 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" Message-ID: <1428937725.fbc140451e2e8a9e2f7f21fe3703d4ae69296895.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: fbc140451e2e8a9e2f7f21fe3703d4ae69296895 X-VCS-Branch: master Date: Mon, 13 Apr 2015 15:08:58 +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: c665343f-eaf8-4e19-b47b-c5132d5f4ea0 X-Archives-Hash: a80ec0bec06a1db1041b478fc2f2bf9d commit: fbc140451e2e8a9e2f7f21fe3703d4ae69296895 Author: Manuel Rüger gentoo org> AuthorDate: Mon Apr 13 15:08:45 2015 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Mon Apr 13 15:08:45 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbc14045 [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 | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 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 cd48f8e..cef5758 100644 --- a/kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild +++ b/kde-apps/kde-l10n/kde-l10n-14.12.3.ebuild @@ -123,16 +123,29 @@ 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, ksysguard, kio-extras, khelpcenter, systemsettings, kinfocenter - sed -i -e '/kdesu/ s/^/#/' -e '/fundamentals/ s/^/#/' -e '/onlinehelp/ s/^/#/' -e '/khelpcenter/ s/^/#/'\ + # Plasma 5.3 + # kdesu, ksysguard, kio-extras, khelpcenter, systemsettings, kinfocenter, kmenuedit, plasma-desktop + sed -i -e '/kdesu/ s/^/#/' -e '/fundamentals/ s/^/#/'\ + -e '/onlinehelp/ s/^/#/' -e '/khelpcenter/ s/^/#/'\ + -e '/knetattach/ s/^/#/'\ "${S}"/${DIR}/4/${LNG}/docs/kde-runtime/CMakeLists.txt - sed -i -e '/ksysguard/ s/^/#/' -e '/systemsettings/ s/^/#/' -e '/kinfocenter/ s/^/#/'\ + sed -i -e '/ksysguard/ s/^/#/' -e '/systemsettings/ s/^/#/'\ + -e '/kinfocenter/ s/^/#/' -e '/kmenuedit/ s/^/#/'\ + -e '/kfontview/ s/^/#/' -e '/plasma-desktop/ s/^/#/'\ "${S}"/${DIR}/4/${LNG}/docs/kde-workspace/CMakeLists.txt - sed -i -e '/kcmcgi/ s/^/#/' -e '/trash/ s/^/#/'\ + sed -i -e '/kcmcgi/ s/^/#/' -e '/trash/ s/^/#/' -e '/bookmarks/ s/^/#/'\ + -e '/cookies/ s/^/#/' -e '/ebrowsing/ s/^/#/' -e '/emoticons/ s/^/#/'\ + -e '/icons/ s/^/#/' -e '/khtml/ s/^/#/' -e '/smb/ s/^/#/'\ + -e '/useragent/ s/^/#/'\ "${S}"/${DIR}/4/${LNG}/docs/kde-runtime/kcontrol/CMakeLists.txt + sed -i -e '/joystick/ s/^/#/' -e '/kcmaccess/ s/^/#/'\ + -e '/kcmstyle/ s/^/#/' -e '/solid-actions/ s/^/#/'\ + -e '/splashscreen/ s/^/#/'\ + "${S}"/${DIR}/4/${LNG}/docs/kde-workspace/kcontrol/CMakeLists.txt + fi fi done