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 B31321380DC for ; Wed, 5 Feb 2014 19:24:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DB73E0CC7; Wed, 5 Feb 2014 19:24:06 +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 B416EE0CC7 for ; Wed, 5 Feb 2014 19:24:05 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA1AD33F12F for ; Wed, 5 Feb 2014 19:24:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id BA71C18278 for ; Wed, 5 Feb 2014 19:24:02 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1391628225.c38ade0f1a3406a560245426603f243dac6a5f6a.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/nepomuk/nepomuk-9999.ebuild X-VCS-Directories: kde-base/nepomuk/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: c38ade0f1a3406a560245426603f243dac6a5f6a X-VCS-Branch: master Date: Wed, 5 Feb 2014 19:24:02 +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: df36e234-4ca0-4b9f-a4e8-9ff1fe2c06d5 X-Archives-Hash: c1a3434d7f91ab66c60632ba8016c820 commit: c38ade0f1a3406a560245426603f243dac6a5f6a Author: Michael Palimaka gentoo org> AuthorDate: Wed Feb 5 19:23:45 2014 +0000 Commit: Michael Palimaka gentoo 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 +}