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>
