From b6c8fee326d6a1dcc0a304769fceaf4aeb42e56c Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Mon, 14 Sep 2015 22:29:26 -0400
Subject: [PATCH] kdepim-build-include: Simplify decls.

It is not necessary to name module-sets, that's just a convenience, so
remove names from single-module module-sets.

Also while kdesrc-build won't complain if the set's name matches a
module name (or path), that's not really a good idea, so try to make
remaining module-set names distinct.

Note this is a possible behavior change, if you got used to
"kdesrc-build kdepim" building a bunch of other things in addition to
kde/kdepim. My apologies but many users just want to build kdepim the
single repo, you can always copy the old file into a customized
kdesrc-buildrc.
---
 kf5-kdepim-build-include | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/kf5-kdepim-build-include b/kf5-kdepim-build-include
index 24209e7..cad8548 100644
--- a/kf5-kdepim-build-include
+++ b/kf5-kdepim-build-include
@@ -16,31 +16,17 @@
 # tool you can use to validate your change works (or just "kdesrc-build -p
 # your-module" and look for the right branch).
 
-module-set kf5-prison
-    repository kde-projects
-    use-modules prison
-end module-set
-
 module libkolabxml
-  repository https://git.kolab.org/diffusion/LKX/libkolabxml.git
-  cmake-options -DQT5_BUILD=true
-  branch master
+    repository https://git.kolab.org/diffusion/LKX/libkolabxml.git
+    cmake-options -DQT5_BUILD=true
+    branch master
 end module
 
-module-set kdepimlibs
+module-set kde-pimlibs
     repository kde-projects
-    use-modules kdepimlibs
-end module-set
 
-# The PIM Baloo code is now in akonadi-search
-module-set akonadi-search
-    repository kde-projects
-    use-modules akonadi-search
-end module-set
-
-module-set libkgapi
-    repository kde-projects
-    use-modules libkgapi
+    # The PIM Baloo code is now in akonadi-search
+    use-modules prison kdepimlibs akonadi-search libkgapi
 end module-set
 
 module libkolab
@@ -53,13 +39,7 @@ module grantlee
     branch master
 end module
 
-module-set kdepim
-    repository kde-projects
-    use-modules kde/pim kde/kdepim
-end module-set
-
-module-set kdepim-runtime
+module-set kde-pim
     repository kde-projects
-    use-modules kdepim-runtime
+    use-modules kde/pim kde/kdepim kdepim-runtime
 end module-set
-