public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kactivitymanagerd/
Date: Tue, 29 Mar 2016 17:38:11 +0000 (UTC)	[thread overview]
Message-ID: <1459273079.f098244606d733ce8304ad0d521a65d46f812728.johu@gentoo> (raw)

commit:     f098244606d733ce8304ad0d521a65d46f812728
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 17:37:59 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 17:37:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f0982446

kde-plasma/kactivitymanagerd: Fix file collision

With kde-plasma/plasma-desktop.

Package-Manager: portage-2.2.28

 kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild
index aa10894..5be6b8c 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1.ebuild
@@ -32,3 +32,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.54
 "
+
+src_install() {
+	kde5_src_install
+	# File collisions with kde-plasma/plasma-desktop...
+	rm -r "${ED}"usr/share/locale
+}


             reply	other threads:[~2016-03-29 17:38 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-29 17:38 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-01-15 12:30 [gentoo-commits] proj/kde:master commit in: kde-plasma/kactivitymanagerd/ Andreas Sturmlechner
2020-04-18 21:14 Andreas Sturmlechner
2018-05-06  8:46 Andreas Sturmlechner
2018-05-06  8:46 Andreas Sturmlechner
2018-05-06  8:46 Andreas Sturmlechner
2017-05-26 18:33 Andreas Sturmlechner
2016-12-09  8:16 Johannes Huber
2016-12-08 12:01 Johannes Huber
2016-11-02 12:08 Johannes Huber
2016-07-18 19:41 Johannes Huber
2016-05-18 13:25 Johannes Huber
2016-04-06 14:31 Michael Palimaka
2016-03-29 19:29 Johannes Huber
2016-03-29 12:27 Johannes Huber
2016-03-23 17:47 Michael Palimaka
2016-03-23 17:47 Michael Palimaka
2016-03-23 15:51 Johannes Huber
2016-03-20 20:43 Johannes Huber
2016-03-13 16:50 Michael Palimaka
2016-02-17 14:36 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=1459273079.f098244606d733ce8304ad0d521a65d46f812728.johu@gentoo \
    --to=johu@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