From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk/
Date: Wed, 5 Feb 2014 19:24:02 +0000 (UTC) [thread overview]
Message-ID: <1391628225.c38ade0f1a3406a560245426603f243dac6a5f6a.kensington@gentoo> (raw)
commit: c38ade0f1a3406a560245426603f243dac6a5f6a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 19:23:45 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb 5 19:23:45 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c38ade0f
[kde-base/nepomuk] Don't install kio-timeline since it collides with baloo, wrt bug #499504.
Package-Manager: portage-2.2.7
---
kde-base/nepomuk/nepomuk-9999.ebuild | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/kde-base/nepomuk/nepomuk-9999.ebuild b/kde-base/nepomuk/nepomuk-9999.ebuild
index 83be65d..5230eb5 100644
--- a/kde-base/nepomuk/nepomuk-9999.ebuild
+++ b/kde-base/nepomuk/nepomuk-9999.ebuild
@@ -20,3 +20,11 @@ DEPEND="
!kde-misc/nepomukcontroller
"
RDEPEND="${DEPEND}"
+
+src_prepare() {
+ kde4-meta_src_prepare
+
+ # Collides with baloo
+ pushd nepomuk/kioslaves > /dev/null
+ comment_add_subdirectory timeline
+}
next reply other threads:[~2014-02-05 19:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-05 19:24 Michael Palimaka [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-04 23:35 [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk/ Johannes Huber
2014-02-05 19:46 Michael Palimaka
2013-10-06 19:57 Chris Reffett
2013-08-29 15:54 Michael Palimaka
2013-06-11 19:50 Johannes Huber
2013-06-10 17:52 Johannes Huber
2013-04-08 17:30 Michael Palimaka
2012-08-05 5:22 Chris Reffett
2012-07-27 20:52 Andreas Hüttel
2012-06-21 20:20 Andreas Hüttel
2012-06-10 10:30 Andreas Hüttel
2012-06-10 10:07 Andreas Hüttel
2012-05-25 18:20 Johannes Huber
2012-05-25 17:57 Johannes Huber
2012-05-18 20:46 Johannes Huber
2011-12-03 16:44 Andreas Hüttel
2011-12-03 16:44 Andreas Hüttel
2011-09-07 21:43 Alexey Shvetsov
2011-07-14 11:03 Andreas Hüttel
2011-06-29 9:06 Alexey Shvetsov
2011-05-26 1:48 Jonathan Callen
2011-05-23 2:22 Jorge Manuel B. S. Vicetto
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=1391628225.c38ade0f1a3406a560245426603f243dac6a5f6a.kensington@gentoo \
--to=kensington@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