From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SXGT7-00078H-So for garchives@archives.gentoo.org; Wed, 23 May 2012 18:39:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DEB5E0230; Wed, 23 May 2012 18:39:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2E78FE0230 for ; Wed, 23 May 2012 18:39:10 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D9611B4020 for ; Wed, 23 May 2012 18:39:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 361A9E542A for ; Wed, 23 May 2012 18:39:08 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1337798156.4823b771e6bfb368337985f53966592ca068a24a.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild X-VCS-Directories: kde-base/kdeplasma-addons/files/ kde-base/kdeplasma-addons/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 4823b771e6bfb368337985f53966592ca068a24a X-VCS-Branch: master Date: Wed, 23 May 2012 18:39:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 7648bc93-958a-4b8b-99ab-8d761642191b X-Archives-Hash: b8b8ca4047a53e2391dd2d77bdac4b11 commit: 4823b771e6bfb368337985f53966592ca068a24a Author: Michael Palimaka gentoo org> AuthorDate: Wed May 23 18:35:56 2012 +0000 Commit: Michael Palimaka astralcloak net> CommitDate: Wed May 23 18:35:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D4823b771 [kde-base/kdeplasma-addons] Remove patch for issue fixed upstream. For real this time! http://quickgit.kde.org/?p=3Dkdeplasma-addons.git&a=3Dcommit&h=3De6d57b01= 64a95ff66638bde7a8a09961c82da91d (Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit) --- .../kdeplasma-addons-4.6.2-optional-akonadi.patch | 72 --------------= ------ .../kdeplasma-addons-4.8.49.9999.ebuild | 5 -- 2 files changed, 0 insertions(+), 77 deletions(-) diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optio= nal-akonadi.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.= 2-optional-akonadi.patch deleted file mode 100644 index 857e965..0000000 --- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-ako= nadi.patch +++ /dev/null @@ -1,72 +0,0 @@ -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 -=20 - // 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");*/ -=20 - #warning "Pimlibs are not present" -=20 -diff --git a/libs/lancelot-datamodels/MessagesKmail.h b/libs/lancelot-da= tamodels/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: -=20 - void load(); -=20 -+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS - L_Override QString selfShortTitle() const; -=20 - protected Q_SLOTS: - void updateLater(); - void update(); -+#endif -=20 - private: - class Private; -diff --git a/runners/contacts/contactsrunner.cpp b/runners/contacts/cont= actsrunner.cpp -index 2b5f3ec..aa64761 100644 ---- a/runners/contacts/contactsrunner.cpp -+++ b/runners/contacts/contactsrunner.cpp -@@ -23,7 +23,10 @@ - #include - #include - #include -+ -+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS - #include -+#endif - /*#include -=20 - */ -diff --git a/runners/events/events_config.h b/runners/events/events_conf= ig.h -index f73b22b..8bb0148 100644 ---- a/runners/events/events_config.h -+++ b/runners/events/events_config.h -@@ -26,7 +26,9 @@ -=20 - //KDE-Includes - #include -+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS - #include -+#endif -=20 - //Qt -=20 diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuil= d b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild index 6c6acbb..15da7c4 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild @@ -41,11 +41,6 @@ DEPEND=3D"${COMMON_DEPEND} RDEPEND=3D"${COMMON_DEPEND} " =20 -src_prepare() { - use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonad= i.patch" - kde4-base_src_prepare -} - src_configure() { mycmakeargs=3D( -DDBUS_INTERFACES_INSTALL_DIR=3D"${EPREFIX}/usr/share/dbus-1/interface= s/"