From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-692801-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id C9F2A1381FA
	for <garchives@archives.gentoo.org>; Tue,  6 May 2014 15:04:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A967AE0B10;
	Tue,  6 May 2014 15:04:49 +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 2539EE0B10
	for <gentoo-commits@lists.gentoo.org>; Tue,  6 May 2014 15:04:49 +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 16E2D33FC39
	for <gentoo-commits@lists.gentoo.org>; Tue,  6 May 2014 15:04:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by spoonbill.gentoo.org (Postfix) with ESMTP id 9B2D81818D
	for <gentoo-commits@lists.gentoo.org>; Tue,  6 May 2014 15:04:45 +0000 (UTC)
From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" <dilfridge@gentoo.org>
Message-ID: <1399388611.43802b32ddc425dd0846298edf179a32bbeff56e.dilfridge@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/baloo/files/, kde-base/baloo/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-base/baloo/baloo-4.13.49.9999.ebuild kde-base/baloo/baloo-4.9999.ebuild kde-base/baloo/files/baloo-4.13.0-nokcm.patch kde-base/baloo/metadata.xml
X-VCS-Directories: kde-base/baloo/files/ kde-base/baloo/
X-VCS-Committer: dilfridge
X-VCS-Committer-Name: Andreas Hüttel
X-VCS-Revision: 43802b32ddc425dd0846298edf179a32bbeff56e
X-VCS-Branch: master
Date: Tue,  6 May 2014 15:04:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: df8b8454-f7f5-40d2-b187-78d13f54c093
X-Archives-Hash: 7534243c43993840ff172fa407e511f8

commit:     43802b32ddc425dd0846298edf179a32bbeff56e
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 15:03:31 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue May  6 15:03:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=43802b32

[kde-base/baloo] use alternate configuration module by default

Package-Manager: portage-2.2.8-r1

---
 kde-base/baloo/baloo-4.13.49.9999.ebuild      | 12 ++++++++++--
 kde-base/baloo/baloo-4.9999.ebuild            | 12 ++++++++++--
 kde-base/baloo/files/baloo-4.13.0-nokcm.patch | 11 +++++++++++
 kde-base/baloo/metadata.xml                   |  3 +++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/kde-base/baloo/baloo-4.13.49.9999.ebuild b/kde-base/baloo/baloo-4.13.49.9999.ebuild
index 095e00a..7e41536 100644
--- a/kde-base/baloo/baloo-4.13.49.9999.ebuild
+++ b/kde-base/baloo/baloo-4.13.49.9999.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="Next generation of the Nepomuk project"
 KEYWORDS=""
-IUSE="debug"
+IUSE="debug +alternatekcm"
 
 DEPEND="
 	$(add_kdebase_dep kdepimlibs)
@@ -18,6 +18,14 @@ DEPEND="
 	sys-apps/attr
 	!<kde-base/nepomuk-4.12.50
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+"
+PDEPEND="alternatekcm? ( kde-misc/baloo-kcmadv )"
 
 RESTRICT="test"
+
+src_prepare() {
+	kde4-base_src_prepare
+	use alternatekcm && epatch "${FILESDIR}/${PN}-4.13.0-nokcm.patch"
+}

diff --git a/kde-base/baloo/baloo-4.9999.ebuild b/kde-base/baloo/baloo-4.9999.ebuild
index 095e00a..7e41536 100644
--- a/kde-base/baloo/baloo-4.9999.ebuild
+++ b/kde-base/baloo/baloo-4.9999.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="Next generation of the Nepomuk project"
 KEYWORDS=""
-IUSE="debug"
+IUSE="debug +alternatekcm"
 
 DEPEND="
 	$(add_kdebase_dep kdepimlibs)
@@ -18,6 +18,14 @@ DEPEND="
 	sys-apps/attr
 	!<kde-base/nepomuk-4.12.50
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+"
+PDEPEND="alternatekcm? ( kde-misc/baloo-kcmadv )"
 
 RESTRICT="test"
+
+src_prepare() {
+	kde4-base_src_prepare
+	use alternatekcm && epatch "${FILESDIR}/${PN}-4.13.0-nokcm.patch"
+}

diff --git a/kde-base/baloo/files/baloo-4.13.0-nokcm.patch b/kde-base/baloo/files/baloo-4.13.0-nokcm.patch
new file mode 100644
index 0000000..7690b40
--- /dev/null
+++ b/kde-base/baloo/files/baloo-4.13.0-nokcm.patch
@@ -0,0 +1,11 @@
+diff -ruN baloo-4.13.0.orig/src/file/CMakeLists.txt baloo-4.13.0/src/file/CMakeLists.txt
+--- baloo-4.13.0.orig/src/file/CMakeLists.txt	2014-04-15 18:30:06.000000000 +0200
++++ baloo-4.13.0/src/file/CMakeLists.txt	2014-05-04 02:58:00.312192920 +0200
+@@ -66,6 +66,6 @@
+ add_subdirectory(autotest)
+ add_subdirectory(tests)
+ add_subdirectory(extractor)
+-add_subdirectory(kcm)
++#add_subdirectory(kcm)
+ add_subdirectory(inotify)
+ add_subdirectory(cleaner)

diff --git a/kde-base/baloo/metadata.xml b/kde-base/baloo/metadata.xml
index a23f444..64a27d2 100644
--- a/kde-base/baloo/metadata.xml
+++ b/kde-base/baloo/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+        <use>
+                <flag name="alternatekcm">Use the alternate Systemsettings module by Lindsay Mathieson for better configurability</flag>
+        </use>
 </pkgmetadata>