public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Manuel Rüger" <mrueg@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kde-l10n/
Date: Mon, 13 Apr 2015 14:18:38 +0000 (UTC)	[thread overview]
Message-ID: <1428934705.ecbbc3d7b659febb9da3aae0d12baa3c4c3a1750.mrueg@gentoo> (raw)

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


             reply	other threads:[~2015-04-13 14:18 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-13 14:18 Manuel Rüger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-10-16 18:44 [gentoo-commits] proj/kde:master commit in: kde-apps/kde-l10n/ Michael Palimaka
2016-10-13  9:05 Johannes Huber
2016-07-13 18:23 Johannes Huber
2016-07-08 17:29 Michael Palimaka
2016-06-26 16:50 Michael Palimaka
2016-04-15 19:06 Johannes Huber
2016-04-08 22:12 Andreas Hüttel
2016-04-07 19:19 Michael Palimaka
2016-04-07 17:01 Michael Palimaka
2016-03-30 16:05 Johannes Huber
2016-03-29 19:23 Alexey Shvetsov
2016-03-20 20:43 Johannes Huber
2015-12-06 15:22 Alexey Shvetsov
2015-09-19 14:05 Manuel Rüger
2015-08-25 22:20 Johannes Huber
2015-08-08 12:28 Johannes Huber
2015-08-01  2:13 Manuel Rüger
2015-06-27 13:53 Manuel Rüger
2015-05-31 19:09 Manuel Rüger
2015-05-27 12:07 Michael Palimaka
2015-05-23 17:16 Michael Palimaka
2015-04-26  2:06 Manuel Rüger
2015-04-26  2:06 Manuel Rüger
2015-04-13 15:22 Manuel Rüger
2015-04-13 15:08 Manuel Rüger
2015-04-13 14:43 Manuel Rüger
2015-04-13 13:23 Manuel Rüger
2015-01-14  0:36 Manuel Rüger
2015-01-14  0:30 Manuel Rüger
2014-12-12 23:08 Manuel Rüger
2014-12-12 20:58 Manuel Rüger
2014-11-24 12:38 Michael Palimaka

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=1428934705.ecbbc3d7b659febb9da3aae0d12baa3c4c3a1750.mrueg@gentoo \
    --to=mrueg@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