Revert "Allow kdeplasma-addons to be build with lancelot without requring akonadi (put it behind a use flag)."

Akonadi and the whole kdepim suite is not available for kde 4.5,
reverting till I get a new patch from the user
This reverts commit 52f3793ec67091edb8dcc277b1582f02f2e9c0b6.

6 files changed, 8 insertions, 122 deletions

diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index 99bb9e8cd5f..16d4411dae9 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -1,10 +1,8 @@
 AUX kdeplasma-addons-4.4.3-cmake.patch 2142 RMD160 42e9dab676b617686ef159752b4643491e0dfdd7 SHA1 2e1e74e01e64f277636b099af2b292af091ec33b SHA256 a19a933f282f1be4ab67949c1de9a4ead8e05d2ff78dafbdd600682f3c8e59b9
 AUX kdeplasma-addons-4.4.74-cmake.patch 2623 RMD160 dd1fc6913c715184fdb4e0681507ad46207f25c5 SHA1 67809abb832d8f4e3f5c521be54bf8eacbd9c0c5 SHA256 d2e3ea559e422cc0fd822f9a014bf2d4621525deb40e86181be65ddc51a1d745
-AUX noakonadi.patch 3692 RMD160 415d9acb24719ef2763005bc9524bcb303291038 SHA1 0edddfc7d64311023bb69e89dd96d4918399c193 SHA256 cfb999b5cfac329509638a9bebbd90fa9a8186c30a570bbcf0f61ac207497a03
 DIST kdeplasma-addons-4.4.92.tar.bz2 1733136 RMD160 1a830a2b726f3ea750210bf1028e273e7f6c0095 SHA1 3ca4c54ed5ec4cefbe014c4aca8cc48ea53fecb0 SHA256 0e8e0956e7484bed59f5d1f5bf011227f791fae4fd5e5ab59132f4764ff3d9e7
-EBUILD kdeplasma-addons-4.4.92.ebuild 2140 RMD160 1f2985069e610034188c50a174fe02e0ff8a057a SHA1 e1c47e0cb8a79c867e858fdb7821fb0bf6ee5aeb SHA256 8a25d336332067ff75fe40c93fe10d8da2eba9b938f59f8ff4e4639beef68c52
-EBUILD kdeplasma-addons-4.4.9999.ebuild 2191 RMD160 98556fe6c74e1f09f30d664ec54a431ff433fa9a SHA1 47809595445e686bb46e64a23772b4ac512cde8e SHA256 8ec25c9fd14b33eb555111b40fc9735cf4ee42713c29b62e7ec44e64152eea83
-EBUILD kdeplasma-addons-4.5.9999.ebuild 2129 RMD160 e31e3b46cff3ed64424bd32fc8b59aa03f7ac936 SHA1 e2ede20d1d85e4c75ba248d723a0eb56f31b11de SHA256 1ecdf69e712cb1296d53b2326f3e83d4e22fd0d7121452aa698cf8f2533743c7
-EBUILD kdeplasma-addons-9999.ebuild 2129 RMD160 e31e3b46cff3ed64424bd32fc8b59aa03f7ac936 SHA1 e2ede20d1d85e4c75ba248d723a0eb56f31b11de SHA256 1ecdf69e712cb1296d53b2326f3e83d4e22fd0d7121452aa698cf8f2533743c7
-MISC diff 925 RMD160 e01bed9d765c2be6887628235c04ac38545f38cf SHA1 421262daa62b00161542f1b3ea9af5e67066845b SHA256 d32bb6ef2397e730447799060d3682499ff68c2b654d069f57e6096154c8d66e
+EBUILD kdeplasma-addons-4.4.92.ebuild 1994 RMD160 0db7c5786ae5dc39b3302849bc4ec15cd8541b38 SHA1 fd616a498a0daff4c88936774cd2ce2f7af0a639 SHA256 373c3a640c41e60cf81baa266420fc89466f200437510d14429a840f10d146b5
+EBUILD kdeplasma-addons-4.4.9999.ebuild 2045 RMD160 f5d9553ff2c24581ce38e0d64377d978feaf9ba3 SHA1 abf7f5c076030fdcfa658e8b80e02d0161e78b1d SHA256 e8b0a92fdece2383c1a3156ccf86d73705a9355db658dab9ac19cdbc30a075eb
+EBUILD kdeplasma-addons-4.5.9999.ebuild 1983 RMD160 de5fbf4af0aae52112e905853bdc439ec41abe0f SHA1 8f6bcc3fa3ae86502cb4875eca5c333ddfe18d88 SHA256 accaa5a9dec476f4996027a4723b0403546fb3f1e96c0e9b595df51fc1473d2e
+EBUILD kdeplasma-addons-9999.ebuild 1983 RMD160 de5fbf4af0aae52112e905853bdc439ec41abe0f SHA1 8f6bcc3fa3ae86502cb4875eca5c333ddfe18d88 SHA256 accaa5a9dec476f4996027a4723b0403546fb3f1e96c0e9b595df51fc1473d2e
 MISC metadata.xml 513 RMD160 c7aded626277a79aa0a0b879476ecb5377f97f86 SHA1 cd2f44eccf545b4232bf77415d6aa5b79015e702 SHA256 f682111bd3c2ed82effd027c8fe51d56704be560452a101db8e3557ef0e0a572
diff --git a/kde-base/kdeplasma-addons/files/noakonadi.patch b/kde-base/kdeplasma-addons/files/noakonadi.patch
deleted file mode 100644
index 2a0a8d3a55b..00000000000
--- a/kde-base/kdeplasma-addons/files/noakonadi.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -rupN kdeplasma-addons-4.4.92_original//applets/lancelot/application/LancelotWindow.cpp kdeplasma-addons-4.4.92//applets/lancelot/application/LancelotWindow.cpp
---- kdeplasma-addons-4.4.92_original//applets/lancelot/application/LancelotWindow.cpp	2010-06-16 14:03:16.000000000 +0200
-+++ kdeplasma-addons-4.4.92//applets/lancelot/application/LancelotWindow.cpp	2010-07-21 21:32:58.226762098 +0200
-@@ -63,7 +63,6 @@
- #include <Lancelot/Models/Runner>
- #include <Lancelot/Models/SystemActions>
- #include <Lancelot/Models/ContactsKopete>
--#include <Lancelot/Models/MessagesKmail>
- #include <Lancelot/Models/BaseMergedModel>
- #include <Lancelot/Models/Logger>
- 
-@@ -565,18 +564,6 @@ void LancelotWindow::setupModels()
- 
-     QString plugins;
- 
--    // Contacts Mail
--    plugins = m_mainConfig.readEntry("mailPlugins", QString());
--    if (plugins.isEmpty()) {
--        m_models["Messages"]          = new Lancelot::Models::MessagesKmail();
--        MergedAddModel(m_modelGroups["ContactsLeft"], "Messages", m_models["Messages"]);
--    } else if (plugins != "disabled") {
--        Lancelot::ActionListModel * model;
--        foreach (const QString &plugin, plugins.split(',')) {
--            model = new Lancelot::PlasmaServiceListModel(plugin);
--            MergedAddModel(m_modelGroups["ContactsLeft"], model->selfTitle(), model);
--        }
--    }
- 
-     // Contacts IM
-     plugins = m_mainConfig.readEntry("imPlugins", QString());
-diff -rupN kdeplasma-addons-4.4.92_original//applets/lancelot/parts/PartsMergedModel.cpp kdeplasma-addons-4.4.92//applets/lancelot/parts/PartsMergedModel.cpp
---- kdeplasma-addons-4.4.92_original//applets/lancelot/parts/PartsMergedModel.cpp	2010-07-06 08:54:40.000000000 +0200
-+++ kdeplasma-addons-4.4.92//applets/lancelot/parts/PartsMergedModel.cpp	2010-07-21 21:30:45.237762305 +0200
-@@ -38,7 +38,6 @@
- #include <Lancelot/Models/Applications>
- #include <Lancelot/Models/Runner>
- #include <Lancelot/Models/ContactsKopete>
--#include <Lancelot/Models/MessagesKmail>
- #include <Lancelot/Models/SystemActions>
- #include <Lancelot/Models/Serializator>
- 
-@@ -289,11 +288,6 @@ bool PartsMergedModel::load(const QStrin
-                         model = new Lancelot::Models::RecentDocuments());
-                 m_models.append(model);
- 
--            } else if (modelID =="Messages") {
--                addModel(modelID, QIcon(), i18n("Unread messages"),
--                        model = new Lancelot::Models::MessagesKmail());
--                m_models.append(model);
--
-             } else if (modelID =="Contacts") {
-                 addModel(modelID, QIcon(), i18n("Online contacts"),
-                         model = new Lancelot::Models::ContactsKopete());
-diff -rupN kdeplasma-addons-4.4.92_original//libs/lancelot-datamodels/CMakeLists.txt kdeplasma-addons-4.4.92//libs/lancelot-datamodels/CMakeLists.txt
---- kdeplasma-addons-4.4.92_original//libs/lancelot-datamodels/CMakeLists.txt	2010-05-27 19:24:02.000000000 +0200
-+++ kdeplasma-addons-4.4.92//libs/lancelot-datamodels/CMakeLists.txt	2010-07-21 21:35:22.407762295 +0200
-@@ -82,7 +82,6 @@ set(lancelot_datamodels_LIB_SRCS
-    FolderModel.cpp
-    AvailableModels.cpp
-    Logger.cpp
--   MessagesKmail.cpp
-    NewDocuments.cpp
-    OpenDocuments.cpp
-    Places.cpp
-@@ -137,7 +136,6 @@ set(lancelot_datamodels_LIB_INCLUDES
-    FolderModel.h
-    AvailableModels.h
-    Logger.h
--   MessagesKmail.h
-    NewDocuments.h
-    OpenDocuments.h
-    Places.h
-@@ -164,7 +162,6 @@ install(FILES
-    Lancelot/Models/FavoriteApplications
-    Lancelot/Models/FolderModel
-    Lancelot/Models/Logger
--   Lancelot/Models/MessagesKmail
-    Lancelot/Models/NewDocuments
-    Lancelot/Models/OpenDocuments
-    Lancelot/Models/Places
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.92.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.92.ebuild
index 74912a92545..0bcdfd0a78c 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.92.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.92.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2 LGPL-2"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="akonadi debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
+IUSE="debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
 
 # krunner is only needed to generate dbus interface for lancelot
 COMMON_DEPEND="
@@ -31,7 +31,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-cpp/eigen:2
-	akonadi? ( kde-base/akonadi )
 "
 # kde-misc/plasmaboard: moved here in 4.3.65
 # kde-misc/qalculate-applet: since 4.4.0
@@ -49,13 +48,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.74-cmake.patch"
 )
 
-src_unpack() {
-	kde4-base_src_unpack
-	if ! use akonadi; then
-		epatch "${FILESDIR}/noakonadi.patch"
-	fi
-}
-
 src_prepare() {
 	find "${S}" -name CMakeLists.txt | \
 		xargs sed -i \
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.9999.ebuild
index 952ec0ff384..66d687eff83 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2 LGPL-2"
 
 KEYWORDS=""
-IUSE="akonadi debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
+IUSE="debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
 
 # krunner is only needed to generate dbus interface for lancelot
 COMMON_DEPEND="
@@ -31,7 +31,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-cpp/eigen:2
-	akonadi? ( kde-base/akonadi )
 "
 # kde-misc/plasmaboard: moved here in 4.3.65
 # kde-misc/qalculate-applet: since 4.4.0
@@ -49,13 +48,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.3-cmake.patch"
 )
 
-src_unpack() {
-	kde4-base_src_unpack
-	if ! use akonadi; then
-		epatch "${FILESDIR}/noakonadi.patch"
-	fi
-}
-
 src_prepare() {
 	sed -e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \
 		-e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.9999.ebuild
index ef2f6b6283f..7f3fe105770 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2 LGPL-2"
 
 KEYWORDS=""
-IUSE="akonadi debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
+IUSE="debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
 
 # krunner is only needed to generate dbus interface for lancelot
 COMMON_DEPEND="
@@ -31,7 +31,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-cpp/eigen:2
-	akonadi? ( kde-base/akonadi )
 "
 # kde-misc/plasmaboard: moved here in 4.3.65
 # kde-misc/qalculate-applet: since 4.4.0
@@ -49,13 +48,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.74-cmake.patch"
 )
 
-src_unpack() {
-	kde4-base_src_unpack
-	if ! use akonadi; then
-		epatch "${FILESDIR}/noakonadi.patch"
-	fi
-}
-
 src_prepare() {
 	find "${S}" -name CMakeLists.txt | \
 		xargs sed -i \
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index ef2f6b6283f..7f3fe105770 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2 LGPL-2"
 
 KEYWORDS=""
-IUSE="akonadi debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
+IUSE="debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
 
 # krunner is only needed to generate dbus interface for lancelot
 COMMON_DEPEND="
@@ -31,7 +31,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-cpp/eigen:2
-	akonadi? ( kde-base/akonadi )
 "
 # kde-misc/plasmaboard: moved here in 4.3.65
 # kde-misc/qalculate-applet: since 4.4.0
@@ -49,13 +48,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.74-cmake.patch"
 )
 
-src_unpack() {
-	kde4-base_src_unpack
-	if ! use akonadi; then
-		epatch "${FILESDIR}/noakonadi.patch"
-	fi
-}
-
 src_prepare() {
 	find "${S}" -name CMakeLists.txt | \
 		xargs sed -i \