Make akonadi and kdepimlibs optional

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 84 insertions, 4 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index b0e3fb96e264..e691e41c626e 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.81 2011/04/12 02:07:56 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.82 2011/04/13 13:02:30 tampakrap Exp $
+
+  13 Apr 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  kdeplasma-addons-4.6.2.ebuild,
+  +files/kdeplasma-addons-4.6.2-optional-akonadi.patch:
+  Make akonadi and kdepimlibs optional
 
   12 Apr 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -files/4.5.0-fix_lancelot.patch, -files/kdeplasma-addons-4.4.74-cmake.patch,
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index 945cc19f2a57..7dd807d35a83 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -1,7 +1,8 @@
 AUX kdeplasma-addons-4.4.3-cmake.patch 2142 RMD160 42e9dab676b617686ef159752b4643491e0dfdd7 SHA1 2e1e74e01e64f277636b099af2b292af091ec33b SHA256 a19a933f282f1be4ab67949c1de9a4ead8e05d2ff78dafbdd600682f3c8e59b9
+AUX kdeplasma-addons-4.6.2-optional-akonadi.patch 1982 RMD160 3f6c7e4356369d1b59bd8c57d91afc4b655ce18c SHA1 01505b07c9fc41628cfcb881364367cab6b3d17a SHA256 c62b36eccb02517561d5ae88e50fbe3029c37b65b1075c1f94ab7d6bb0fd51c9
 DIST kdeplasma-addons-4.4.5.tar.bz2 1651834 RMD160 59d4d1e164db17eff7d22870aff2dddbcc3e2977 SHA1 2b17460fe0c559f6c575a7ccd72357bcc82826d6 SHA256 adbbd5efc53e27c9baee13d01a6b328875c09bfaf9e711e33cc22ef294b32ff3
 DIST kdeplasma-addons-4.6.2.tar.bz2 1912053 RMD160 1b97ddf2c05931bc0eea6fc2f139e86e334a6ce2 SHA1 f888908e937453c9799c6ad71c514a5227e13700 SHA256 c8741cbecb071d2d00c686e48e2076c51d1013efe3ac791b74219f2dd8446a6d
 EBUILD kdeplasma-addons-4.4.5.ebuild 2248 RMD160 b828208d71665a4468383ede099c8d28fdf6f9bc SHA1 1bb4e6d4e348b4eec830c9c44da9e2975719105a SHA256 246c6d561fad222f843374c95fd5cf10c61c46c0647ffa160abf0c47629d3b5f
-EBUILD kdeplasma-addons-4.6.2.ebuild 2266 RMD160 8661927260baa244279d9f438503be46ee7d76a7 SHA1 58afdca7f8737f3e58e3b470750e68eba10ad8de SHA256 2635dfcbd9c21056857a955a81a2474beaa7c1524d1c6449e1fb3626f27fa8cb
-MISC ChangeLog 12115 RMD160 00b92d800c284433e0f3d7c7d28e540af1afda51 SHA1 84f2a0528122370eae92f69332c058c3dca1b635 SHA256 371793801f3612c0603d10f115825eaada2e2b861f022586b718bfec8c5cd2ff
+EBUILD kdeplasma-addons-4.6.2.ebuild 2321 RMD160 72523b710954453be9d488b12e21d3765b8bf9af SHA1 e74830e3642b7c497131832d990a0a3cf7e6feca SHA256 197d38b1160cf5ff32e8fdbea5d693227772ac71389f08326e1d171360a248e3
+MISC ChangeLog 12300 RMD160 05fc8c2fda000d006f213a9d4722d6463b3a2093 SHA1 75a792e84df09c66f61eb1bf6dda08ba0c24d65a SHA256 62700b5f89222971d21973dd48fe7828968f55da1af644b7153aaeda38993cd9
 MISC metadata.xml 590 RMD160 348b8b1bc247366b339794cc2aec564b2226e067 SHA1 677e55796be545f56fc4b7351268fb7aff49aaa9 SHA256 f1b43f2d7869ec912de095ae4cac3d50bcd7cd8295d73f65e57e0ff7d8ca9ea6
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch
new file mode 100644
index 000000000000..857e965cfb4f
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch
@@ -0,0 +1,72 @@
+diff --git a/libs/lancelot-datamodels/MessagesKmail.cpp b/libs/lancelot-datamodels/MessagesKmail.cpp
+index 8fa89e0..f56203d 100644
+--- a/libs/lancelot-datamodels/MessagesKmail.cpp
++++ b/libs/lancelot-datamodels/MessagesKmail.cpp
+@@ -35,10 +35,10 @@
+ #ifndef LANCELOT_DATAMODELS_HAS_PIMLIBS
+ 
+ // just in case messages:
+-I18N_NOOP("Unread messages");
++/*I18N_NOOP("Unread messages");
+ I18N_NOOP("Unable to find Kontact");
+ I18N_NOOP("Start Akonadi server");
+-I18N_NOOP("Akonadi server is not running");
++I18N_NOOP("Akonadi server is not running");*/
+ 
+ #warning "Pimlibs are not present"
+ 
+diff --git a/libs/lancelot-datamodels/MessagesKmail.h b/libs/lancelot-datamodels/MessagesKmail.h
+index 8db2a1c..3dfbd6f 100644
+--- a/libs/lancelot-datamodels/MessagesKmail.h
++++ b/libs/lancelot-datamodels/MessagesKmail.h
+@@ -32,6 +32,7 @@ namespace Models {
+  */
+ class LANCELOT_EXPORT MessagesKmail : public BaseModel {
+     Q_OBJECT
++
+ public:
+     /**
+      * Creates a new MessagesKmail instance
+@@ -52,11 +53,13 @@ protected:
+ 
+     void load();
+ 
++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
+     L_Override QString selfShortTitle() const;
+ 
+ protected Q_SLOTS:
+     void updateLater();
+     void update();
++#endif
+ 
+ private:
+     class Private;
+diff --git a/runners/contacts/contactsrunner.cpp b/runners/contacts/contactsrunner.cpp
+index 2b5f3ec..aa64761 100644
+--- a/runners/contacts/contactsrunner.cpp
++++ b/runners/contacts/contactsrunner.cpp
+@@ -23,7 +23,10 @@
+ #include <KLocale>
+ #include <KIcon>
+ #include <KToolInvocation>
++
++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
+ #include <akonadi/contact/contactdefaultactions.h>
++#endif
+ /*#include <KMimeType>
+ 
+ */
+diff --git a/runners/events/events_config.h b/runners/events/events_config.h
+index f73b22b..8bb0148 100644
+--- a/runners/events/events_config.h
++++ b/runners/events/events_config.h
+@@ -26,7 +26,9 @@
+ 
+ //KDE-Includes
+ #include <KCModule>
++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
+ #include <Akonadi/Collection>
++#endif
+ 
+ //Qt
+ 
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild
index 7e64543bceb1..ae8d805586f1 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild,v 1.2 2011/04/12 02:07:56 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.2.ebuild,v 1.3 2011/04/13 13:02:30 tampakrap Exp $
 
 EAPI=3
 
@@ -49,6 +49,8 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
+PATCHES=( "${FILESDIR}/${P}-optional-akonadi.patch" )
+
 src_prepare() {
 	find "${S}" -name CMakeLists.txt | \
 		xargs sed -i \