[gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/

[Tomas Chvatal]

commit:     c0469ddf885006c36d84b235cd5ab6666997c9b4
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 15:12:58 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat May  7 15:12:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c0469ddf

[kde-base/kdeplasma-addons] Move semantic-desktop patch here from main tree.

---
 .../kdeplasma-addons-4.6.2-optional-akonadi.patch  |   72 ++++++++++++++++++++
 .../kdeplasma-addons-4.6.9999.ebuild               |    7 ++-
 .../kdeplasma-addons/kdeplasma-addons-9999.ebuild  |    7 ++-
 3 files changed, 84 insertions(+), 2 deletions(-)

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 0000000..857e965
--- /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.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
index 11636ba..9697f76 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.3.ebuild,v 1.1 2011/05/07 10:48:00 scarabeus Exp $
 
 EAPI=4
 
@@ -49,6 +49,11 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
+src_prepare() {
+	use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
+	kde4-base_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 11636ba..9697f76 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.3.ebuild,v 1.1 2011/05/07 10:48:00 scarabeus Exp $
 
 EAPI=4
 
@@ -49,6 +49,11 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
+src_prepare() {
+	use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
+	kde4-base_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"