Remove old.

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

4 files changed, 7 insertions, 421 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 59a15c8ac185..d9f219beb993 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.146 2012/09/03 13:29:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.147 2012/09/03 13:59:39 johu Exp $
+
+  03 Sep 2012; Johannes Huber <johu@gentoo.org>
+  -files/kdeplasma-addons-4.6.2-optional-akonadi.patch,
+  -files/kdeplasma-addons-4.7.3-knowledge.patch,
+  -files/kdeplasma-addons-4.8.0-ibus141.patch:
+  Remove old.
 
   03 Sep 2012; Johannes Huber <johu@gentoo.org> -kdeplasma-addons-4.7.4.ebuild:
   Remove KDE SC 4.7.4
@@ -669,4 +675,3 @@
   02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   +metadata.xml, +kdeplasma-addons-4.1.2.ebuild:
   Add kde-4.1.2 into the tree from the kde-testing overlay.
-
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
deleted file mode 100644
index 857e965cfb4f..000000000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.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
- 
- // 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/files/kdeplasma-addons-4.7.3-knowledge.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch
deleted file mode 100644
index 3a7f89f852ee..000000000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN kdeplasma-addons-4.7.3.orig/applets/CMakeLists.txt kdeplasma-addons-4.7.3/applets/CMakeLists.txt
---- kdeplasma-addons-4.7.3.orig/applets/CMakeLists.txt	2011-10-02 15:26:40.000000000 +0200
-+++ kdeplasma-addons-4.7.3/applets/CMakeLists.txt	2011-11-20 18:05:27.833155727 +0100
-@@ -26,7 +26,6 @@
- add_subdirectory(kolourpicker)
- add_subdirectory(konqprofiles)
- add_subdirectory(konsoleprofiles)
--add_subdirectory(knowledgebase)
- add_subdirectory(life)
- add_subdirectory(luna)
- add_subdirectory(magnifique)
-@@ -34,6 +33,7 @@
- add_subdirectory(notes)
- add_subdirectory(nowplaying)
- if(LIBATTICA_FOUND)
-+  add_subdirectory(knowledgebase)
-   add_subdirectory(community)
-   add_subdirectory(social-news)
- endif(LIBATTICA_FOUND)
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.8.0-ibus141.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.8.0-ibus141.patch
deleted file mode 100644
index 94521be6b252..000000000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.8.0-ibus141.patch
+++ /dev/null
@@ -1,328 +0,0 @@
-commit c36d480a2b1867fffc553ccbeb55bef5d6a0d72e
-Author: Weng Xuetian <wengxt@gmail.com>
-Date:   Sun Feb 12 19:54:39 2012 +0800
-
-    backport: ibus 1.4.1 compatible.
-
-diff --git a/applets/kimpanel/backend/ibus/panel.c b/applets/kimpanel/backend/ibus/panel.c
-index 9ec68cf..b917c89 100644
---- a/applets/kimpanel/backend/ibus/panel.c
-+++ b/applets/kimpanel/backend/ibus/panel.c
-@@ -1,6 +1,6 @@
- /*
-  *  This file is part of KIMToy, an input method frontend for KDE
-- *  Copyright (C) 2011 Ni Hui <shuizhuyuanluo@126.com>
-+ *  Copyright (C) 2011-2012 Ni Hui <shuizhuyuanluo@126.com>
-  *
-  *  This program is free software; you can redistribute it and/or
-  *  modify it under the terms of the GNU General Public License as
-@@ -28,6 +28,9 @@
- #endif
- #include "panel.h"
- 
-+#ifndef DBUS_ERROR_FAILED
-+#define DBUS_ERROR_FAILED "org.freedesktop.DBus.Error.Failed"
-+#endif /* DBUS_ERROR_FAILED */
- #define _UNUSED(x) ((void) x)
- 
- typedef struct _IBusPanelImpanelClass IBusPanelImpanelClass;
-@@ -236,6 +239,7 @@ ibus_property_args_to_propstr (const char *key,
-                                char *propstr)
- {
-     static const char pre[] = "/IBus/";
-+    propstr[0] = '\0';
-     strcat(propstr, pre);
-     strcat(propstr, key);
-     strcat(propstr, prop_sep);
-@@ -250,11 +254,19 @@ static void
- ibus_property_to_propstr (IBusProperty *property,
-                           char *propstr)
- {
-+#if !IBUS_CHECK_VERSION(1,3,99)
-     ibus_property_args_to_propstr(property->key,
-                                   property->label->text,
-                                   property->icon,
-                                   property->tooltip->text,
-                                   propstr);
-+#else
-+    ibus_property_args_to_propstr(ibus_property_get_key (property),
-+                                  ibus_text_get_text (ibus_property_get_label (property)),
-+                                  ibus_property_get_icon (property),
-+                                  ibus_text_get_text (ibus_property_get_tooltip (property)),
-+                                  propstr);
-+#endif
- }
- 
- static void
-@@ -266,6 +278,7 @@ ibus_engine_desc_args_to_propstr (const char *name,
-                                   char *propstr)
- {
-     static const char pre[] = "/IBus/Engine/";
-+    propstr[0] = '\0';
-     strcat(propstr, pre);
-     strcat(propstr, name);
-     strcat(propstr, prop_sep);
-@@ -502,48 +515,34 @@ ibus_panel_impanel_init (IBusPanelImpanel *impanel)
-                                impanel, NULL);
- 
-     // some custom property
--    impanel->logo_prop = (IBusProperty *)malloc(sizeof(IBusProperty));
--    memset(impanel->logo_prop, 0, sizeof(IBusProperty));
--    impanel->logo_prop->key = strdup("Logo");
--    impanel->logo_prop->icon = strdup("ibus");
--    impanel->logo_prop->label = (IBusText *)malloc(sizeof(IBusText));
--    memset(impanel->logo_prop->label, 0, sizeof(IBusText));
--    impanel->logo_prop->label->text = strdup("IBus");
--    impanel->logo_prop->tooltip = (IBusText *)malloc(sizeof(IBusText));
--    memset(impanel->logo_prop->tooltip, 0, sizeof(IBusText));
--    impanel->logo_prop->tooltip->text = strdup("IBus input method");
--    impanel->about_prop = (IBusProperty *)malloc(sizeof(IBusProperty));
--    memset(impanel->about_prop, 0, sizeof(IBusProperty));
--    impanel->about_prop->key = strdup("About");
--    impanel->about_prop->icon = strdup("ibus-help");
--    impanel->about_prop->label = (IBusText *)malloc(sizeof(IBusText));
--    memset(impanel->about_prop->label, 0, sizeof(IBusText));
--    impanel->about_prop->label->text = strdup("IBus intelligent input bus");
--    impanel->about_prop->tooltip = (IBusText *)malloc(sizeof(IBusText));
--    memset(impanel->about_prop->tooltip, 0, sizeof(IBusText));
--    impanel->about_prop->tooltip->text = strdup("IBus is an intelligent input bus for Linux/Unix.\n\n"
--                                                "Huang Peng <shawn.p.huang@gmail.com>");
-+    impanel->logo_prop = ibus_property_new ("Logo",
-+                                            PROP_TYPE_NORMAL,
-+                                            ibus_text_new_from_string ("IBus"),
-+                                            "ibus",
-+                                            ibus_text_new_from_string ("IBus input method"),
-+                                            FALSE,
-+                                            FALSE,
-+                                            PROP_STATE_UNCHECKED,
-+                                            NULL);
-+
-+    impanel->about_prop = ibus_property_new ("About",
-+                                             PROP_TYPE_NORMAL,
-+                                             ibus_text_new_from_string ("IBus intelligent input bus"),
-+                                             "ibus-help",
-+                                             ibus_text_new_from_string ("IBus is an intelligent input bus for Linux/Unix.\n\n"
-+                                                                        "Huang Peng <shawn.p.huang@gmail.com>"),
-+                                             FALSE,
-+                                             FALSE,
-+                                             PROP_STATE_UNCHECKED,
-+                                             NULL);
- }
- 
- static void
- ibus_panel_impanel_destroy (IBusPanelImpanel *impanel)
- {
--    // free custom property
--    free(impanel->logo_prop->key);
--    free(impanel->logo_prop->icon);
--    free(impanel->logo_prop->label->text);
--    free(impanel->logo_prop->label);
--    free(impanel->logo_prop->tooltip->text);
--    free(impanel->logo_prop->tooltip);
--    free(impanel->logo_prop);
-+    g_object_unref (impanel->logo_prop);
-     impanel->logo_prop = NULL;
--    free(impanel->about_prop->key);
--    free(impanel->about_prop->icon);
--    free(impanel->about_prop->label->text);
--    free(impanel->about_prop->label);
--    free(impanel->about_prop->tooltip->text);
--    free(impanel->about_prop->tooltip);
--    free(impanel->about_prop);
-+    g_object_unref (impanel->about_prop);
-     impanel->about_prop = NULL;
- 
-     g_bus_unown_name (owner_id);
-@@ -584,8 +583,7 @@ ibus_panel_impanel_focus_in (IBusPanelService *panel,
- //     fprintf(stderr, "enable %d %s\n", enable, input_context_path);
- 
-     if (enable == 0) {
--        free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon);
--        IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup("ibus");
-+        ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, "ibus");
-     }
-     else {
-         IBusEngineDesc *engine_desc = ibus_input_context_get_engine(ic);
-@@ -600,11 +598,10 @@ ibus_panel_impanel_focus_in (IBusPanelService *panel,
- #endif
-         }
- 
--        free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon);
- #if !IBUS_CHECK_VERSION(1,3,99)
--        IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(engine_desc->icon);
-+        ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, engine_desc->icon);
- #else
--        IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(ibus_engine_desc_get_icon(engine_desc));
-+        ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, ibus_engine_desc_get_icon (engine_desc));
- #endif
-     }
- 
-@@ -654,41 +651,28 @@ ibus_panel_impanel_register_properties (IBusPanelService *panel,
- {
-     IBusProperty* property = NULL;
-     guint i = 0;
--    char *logo_propstr;
--    char *about_propstr;
--    char *need_free[32] = {NULL};// WARNING enough large I think --- nihui
-+    char propstr[512];
- 
-     GVariantBuilder builder;
-     g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
- 
--    logo_propstr = (char*)malloc(512 * sizeof(char));
--    logo_propstr[0] = '\0';
--    ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->logo_prop, logo_propstr);
--    g_variant_builder_add (&builder, "s", logo_propstr);
-+    ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->logo_prop, propstr);
-+    g_variant_builder_add (&builder, "s", propstr);
- 
-     while ( ( property = ibus_prop_list_get( prop_list, i ) ) != NULL ) {
--        need_free[i] = (char*)malloc(512 * sizeof(char));
--        need_free[i][0] = '\0';
--        ibus_property_to_propstr(property, need_free[i]);
--        g_variant_builder_add (&builder, "s", need_free[i]);
-+        ibus_property_to_propstr(property, propstr);
-+        g_variant_builder_add (&builder, "s", propstr);
-         ++i;
-     }
- 
--    about_propstr = (char*)malloc(512 * sizeof(char));
--    about_propstr[0] = '\0';
--    ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->about_prop, about_propstr);
--    g_variant_builder_add (&builder, "s", about_propstr);
-+    ibus_property_to_propstr(IBUS_PANEL_IMPANEL (panel)->about_prop, propstr);
-+    g_variant_builder_add (&builder, "s", propstr);
- 
-     g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn,
-                                    NULL, "/kimpanel", "org.kde.kimpanel.inputmethod", "RegisterProperties",
-                                    g_variant_new ("(as)", &builder),
-                                    NULL);
- 
--    free(logo_propstr);
--    free(about_propstr);
--    for (i = 0; i < 32; ++i) {
--        free(need_free[i]);
--    }
- #if !IBUS_CHECK_VERSION(1,3,99)
-     _UNUSED(error);
-     return TRUE;
-@@ -738,7 +722,11 @@ ibus_panel_impanel_update_auxiliary_text (IBusPanelService *panel,
-                                           gboolean          visible)
- #endif
- {
--    gchar* t = text->text;
-+#if !IBUS_CHECK_VERSION(1,3,99)
-+    const gchar* t = text->text;
-+#else
-+    const gchar* t = ibus_text_get_text (text);
-+#endif
-     const gchar *attr = "";
- 
-     g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn,
-@@ -792,7 +780,7 @@ ibus_panel_impanel_update_lookup_table (IBusPanelService *panel,
-     guint i;
- 
-     gchar label[16][4];// WARNING large enough I think --- nihui
--    gchar *candidate;
-+    const gchar *candidate;
- 
-     GVariantBuilder builder_labels;
-     GVariantBuilder builder_candidates;
-@@ -808,7 +796,11 @@ ibus_panel_impanel_update_lookup_table (IBusPanelService *panel,
- //         label = ibus_lookup_table_get_label(lookup_table, i)->text;
-         g_variant_builder_add (&builder_labels, "s", label[i-start]);
- 
--        candidate = ibus_lookup_table_get_candidate(lookup_table, i)->text;
-+#if !IBUS_CHECK_VERSION(1,3,99)
-+        candidate = ibus_lookup_table_get_candidate (lookup_table, i)->text;
-+#else
-+        candidate = ibus_text_get_text (ibus_lookup_table_get_candidate (lookup_table, i));
-+#endif
-         g_variant_builder_add (&builder_candidates, "s", candidate);
- 
-         g_variant_builder_add (&builder_attrs, "s", attr);
-@@ -858,7 +850,11 @@ ibus_panel_impanel_update_preedit_text (IBusPanelService *panel,
-                                         gboolean          visible)
- #endif
- {
--    gchar* t = text->text;
-+#if !IBUS_CHECK_VERSION(1,3,99)
-+    const gchar* t = text->text;
-+#else
-+    const gchar* t = ibus_text_get_text (text);
-+#endif
-     const gchar *attr = "";
- 
-     g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn,
-@@ -1181,8 +1177,7 @@ ibus_panel_impanel_state_changed (IBusPanelService *panel)
-     gboolean enable = ibus_input_context_is_enabled(IBUS_PANEL_IMPANEL (panel)->input_context);
- 
-     if (enable == 0) {
--        free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon);
--        IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup("ibus");
-+        ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, "ibus");
-     }
-     else {
-         IBusEngineDesc *engine_desc = ibus_input_context_get_engine(IBUS_PANEL_IMPANEL (panel)->input_context);
-@@ -1194,11 +1189,10 @@ ibus_panel_impanel_state_changed (IBusPanelService *panel)
- #endif
-         }
- 
--        free(IBUS_PANEL_IMPANEL (panel)->logo_prop->icon);
- #if !IBUS_CHECK_VERSION(1,3,99)
--        IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(engine_desc->icon);
-+        ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, engine_desc->icon);
- #else
--        IBUS_PANEL_IMPANEL (panel)->logo_prop->icon = strdup(ibus_engine_desc_get_icon(engine_desc));
-+        ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, ibus_engine_desc_get_icon (engine_desc));
- #endif
-     }
- 
-@@ -1239,9 +1233,7 @@ ibus_panel_impanel_exec_dialog (IBusPanelService *panel)
- static void
- ibus_panel_impanel_exec_menu (IBusPanelService *panel)
- {
--    guint i = 0;
--    char *disable_propstr;
--    char *need_free[64] = {NULL};// WARNING enough large I think --- nihui
-+    char propstr[512];
- 
-     GVariantBuilder builder;
-     g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
-@@ -1253,32 +1245,23 @@ ibus_panel_impanel_exec_menu (IBusPanelService *panel)
-         engine_desc = (IBusEngineDesc *)(node->data);
-         node = g_list_next (node);
- 
--        need_free[i] = (char*)malloc(512 * sizeof(char));
--        need_free[i][0] = '\0';
--        ibus_engine_desc_to_propstr(engine_desc, need_free[i]);
--        g_variant_builder_add (&builder, "s", need_free[i]);
--        ++i;
-+        ibus_engine_desc_to_propstr(engine_desc, propstr);
-+        g_variant_builder_add (&builder, "s", propstr);
-     }
- 
--    disable_propstr = (char*)malloc(512 * sizeof(char));
--    disable_propstr[0] = '\0';
-     ibus_engine_desc_args_to_propstr("None",
-                                      NULL,
-                                      "Disable",
-                                      "ibus",
-                                      "",
--                                     disable_propstr);
-+                                     propstr);
- 
--    g_variant_builder_add (&builder, "s", disable_propstr);
-+    g_variant_builder_add (&builder, "s", propstr);
- 
-     g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn,
-                                    NULL, "/kimpanel", "org.kde.kimpanel.inputmethod", "ExecMenu",
-                                    g_variant_new ("(as)", &builder),
-                                    NULL);
--
--    for (i = 0; i < 64; ++i) {
--        free(need_free[i]);
--    }
- }
- 
- IBusPanelImpanel *