summaryrefslogtreecommitdiffstats
path: root/trinity-base/kopete
diff options
context:
space:
mode:
authorChris <xchrisx@uber.space>2019-12-31 17:21:13 +0100
committerChris <xchrisx@uber.space>2019-12-31 17:21:13 +0100
commit55d2aaa4eb5201ac97e269fc141e4ee1778379b8 (patch)
tree810ece5e004aa9e97e26a1ad988ed52552175fb6 /trinity-base/kopete
parent644110a847c5911c2eb04eb53c93031740561efc (diff)
downloadtde-packaging-gentoo-55d2aaa4eb5201ac97e269fc141e4ee1778379b8.tar.gz
tde-packaging-gentoo-55d2aaa4eb5201ac97e269fc141e4ee1778379b8.zip
Clean up and fix TDE Gentoo overlay.
- Remove old v3.5.13 ebuilds and eclasses - Change repo URL to official TGW - Remove old HAL and traces (TDEHW is used now) - Make split between TDE applications and tdebase consistent - Move TQt into own category (for users filtering dev-qt/ out) - Change to new TQTDIR var - Move away from virtual/pam dependency - Change to use new xorg-proto dependency - Some cosmetic fixes and removal of unneeded files - Remove some now obsolete patches - Change to clean 9999 naming scheme for anything - Add some potential workaround for newer portage versions - Add own README ... thanks to Aggi from IRC for some fixes too. Signed-off-by: Chris <xchrisx@uber.space>
Diffstat (limited to 'trinity-base/kopete')
-rw-r--r--trinity-base/kopete/Manifest1
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0001-f61f5c1-deleted-forgotten-files-for-commit-6e76ea67.patch6
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0002-f604b5b-fix-build-errors.patch51
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0003-e96ccab-added-xmms-support-to-cmake.patch42
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0004-e0fdfd9-fix-unwanted-rename-icon-with-automake.patch13
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0005-df8b5e2-fix-inadvertent-tq-changes.patch180
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0006-bd6aa1a-fix-inadvertent-tqt-changes.patch37
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0007-a2b3834-fix-various-cmake-build-issues.patch98
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0008-98c9c87-add-missing-file-from-previous-commit-10026753.patch28
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0009-81ace9c-fix-inadvertent-tq-changes.patch15
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0010-6f85c0c-fix-references-to-user-profile-directory.patch39
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0011-631f957-remove-nuisance-unsermake-warning-with-automake.patch12
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0012-4387c55-fix-inadvertent-tq-changes.patch75
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.1-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch373
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.2-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch450
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.3-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch454
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0014-265c466-added-test-of-the-presence-libgadu-with-automake.patch21
-rw-r--r--trinity-base/kopete/files/kopete-3.5.13.1-patches/0015-1bf5123-remove-unnecessary-language.patch34
-rw-r--r--trinity-base/kopete/kopete-3.5.13.1.ebuild114
19 files changed, 0 insertions, 2043 deletions
diff --git a/trinity-base/kopete/Manifest b/trinity-base/kopete/Manifest
deleted file mode 100644
index 1d49700d..00000000
--- a/trinity-base/kopete/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdenetwork-3.5.13.1.tar.gz 8794225 SHA256 21e69e8cb2550561c26913a5cccdc376115f50cffd43f9a94f7a660a303f46f9 SHA512 b3189a9f5e9cddd130b24a82b95ef90db1ec3c7afa280a46101ba7cbf6f9d92f60a536401f648a96459ba87f70ede5f7ae4affe894515a8e858b40ee79cb1b69 WHIRLPOOL de678ab30e3aa8dc3068c895fd000fdab1bc046e272273bf44196a198210efab82ddde3c5e0ffaa863061e9c56e3a8a68ca2f8f03cd77136755f66688f878c65
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0001-f61f5c1-deleted-forgotten-files-for-commit-6e76ea67.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0001-f61f5c1-deleted-forgotten-files-for-commit-6e76ea67.patch
deleted file mode 100644
index a5a7fb59..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0001-f61f5c1-deleted-forgotten-files-for-commit-6e76ea67.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-diff --git a/kopete/styles/Gaim/Contents/Resources/Footer.html b/kopete/styles/Gaim/Contents/Resources/Footer.html
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/kopete/styles/Gaim/Contents/Resources/Header.html b/kopete/styles/Gaim/Contents/Resources/Header.html
-deleted file mode 100644
-index e69de29..0000000
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0002-f604b5b-fix-build-errors.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0002-f604b5b-fix-build-errors.patch
deleted file mode 100644
index 90b116c3..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0002-f604b5b-fix-build-errors.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/kioslave/CMakeLists.txt
-index 6c691ae..9539457 100644
---- a/kopete/protocols/jabber/kioslave/CMakeLists.txt
-+++ b/kopete/protocols/jabber/kioslave/CMakeLists.txt
-@@ -37,6 +37,6 @@ tde_add_kpart( kio_jabberdisco AUTOMOC
- LINK
- jabberclient-static idn
- iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
-- qca-static cutestuff_network-static cutestuff_util-static kio-shared idn
-+ qca-static cutestuff_network-static cutestuff_util-static kio-shared
- DESTINATION ${PLUGIN_INSTALL_DIR}
- )
-diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
-index 9fb5a92..984e843 100644
---- a/kopete/protocols/sms/services/smsclient.cpp
-+++ b/kopete/protocols/sms/services/smsclient.cpp
-@@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg)
- m_msg = msg;
-
- KConfigGroup* c = m_account->configGroup();
-- TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName");
-+ TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"));
-
- if (provider.isNull())
- {
-@@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg)
- return;
- }
-
-- TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName");
-+ TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"));
- if (programName.isNull())
- programName = "/usr/bin/sms_client";
-
-@@ -97,14 +97,14 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent)
- prefWidget->configDir->setMode(KFile::Directory);
- TQString configDir;
- if (m_account)
-- configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir");
-+ configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"));
- if (configDir.isNull())
- configDir = "/etc/sms";
- prefWidget->configDir->setURL(configDir);
-
- TQString programName;
- if (m_account)
-- programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName");
-+ programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"));
- if (programName.isNull())
- programName = "/usr/bin/sms_client";
- prefWidget->program->setURL(programName);
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0003-e96ccab-added-xmms-support-to-cmake.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0003-e96ccab-added-xmms-support-to-cmake.patch
deleted file mode 100644
index 3fb2a2ea..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0003-e96ccab-added-xmms-support-to-cmake.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/kopete/plugins/nowlistening/CMakeLists.txt b/kopete/plugins/nowlistening/CMakeLists.txt
-index b1b6b19..a236a7e 100644
---- a/kopete/plugins/nowlistening/CMakeLists.txt
-+++ b/kopete/plugins/nowlistening/CMakeLists.txt
-@@ -9,6 +9,8 @@
- #
- #################################################
-
-+include( ConfigureChecks.cmake )
-+
- include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}
-@@ -16,6 +18,7 @@ include_directories(
- ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-+ ${XMMS_INCLUDES}
- )
-
- link_directories(
-@@ -38,7 +41,7 @@ tde_add_kpart( kopete_nowlistening AUTOMOC
- nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp
- nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp
- nlamarok.cpp nlkaffeine.cpp
-- LINK kopete-shared
-+ LINK kopete-shared ${XMMS_LIBS}
- DESTINATION ${PLUGIN_INSTALL_DIR}
- )
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2601743..86199c1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,6 +48,7 @@ option( WITH_JINGLE "Enable jingle support (kopete)" OFF )
- option( WITH_SPEEX "Enable speex support (for jingle)" OFF )
- option( WITH_WEBCAM "Enable webcam support (kopete/msn)" OFF )
- option( WITH_GSM "Enable GSM SMS support (kopete/sms)" OFF )
-+option( WITH_XMMS "Enable XMMS support (kopete/nowlistening)" OFF )
- option( WITH_ARTS "Enable aRts support" OFF )
- option( WITH_SLP "Enable OpenSLP support (krdc, krfb)" OFF )
-
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0004-e0fdfd9-fix-unwanted-rename-icon-with-automake.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0004-e0fdfd9-fix-unwanted-rename-icon-with-automake.patch
deleted file mode 100644
index 88346c85..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0004-e0fdfd9-fix-unwanted-rename-icon-with-automake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kopete/icons/Makefile.am b/kopete/icons/Makefile.am
-index a4b97f0..f3e403d 100644
---- a/kopete/icons/Makefile.am
-+++ b/kopete/icons/Makefile.am
-@@ -1 +1,8 @@
- KDE_ICON=AUTO
-+
-+install-data-local:
-+ if test -e $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_http/ws.png; then \
-+ mv $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_http/ws.png \
-+ $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_http-ws.png; \
-+ rmdir $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_http; \
-+ fi
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0005-df8b5e2-fix-inadvertent-tq-changes.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0005-df8b5e2-fix-inadvertent-tq-changes.patch
deleted file mode 100644
index 968ffaf4..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0005-df8b5e2-fix-inadvertent-tq-changes.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff --git a/kopete/libkopete/tests/create_test.rb b/kopete/libkopete/tests/create_test.rb
-index ba6e0c2..7951bf3 100755
---- a/kopete/libkopete/tests/create_test.rb
-+++ b/kopete/libkopete/tests/create_test.rb
-@@ -37,7 +37,7 @@ fileCpp.gsub!(/template/, className.downcase.gsub(/::/,""))
- fileCpp.gsub!(/Template/, className.gsub(/::/,""))
- fileCpp.gsub!(/some requirement/, className + " class.")
-
--makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../tqmock/libkopete_tqmock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n"
-+makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../mock/libkopete_mock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n"
- makefileAm.gsub!(/template/, className.downcase.gsub(/::/,""))
-
- hNew = hBase.gsub(/template/, className.downcase.gsub(/::/,""))
-diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
-index bfd9e39..57908e4 100644
---- a/kopete/libkopete/tests/kopetemessage_test.cpp
-+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
-@@ -29,11 +29,11 @@
- #include <kdebug.h>
-
- #include "kopetemessage_test.h"
--#include "kopeteaccount_tqmock.h"
--#include "kopeteprotocol_tqmock.h"
--#include "kopetecontact_tqmock.h"
--#include "kopetemetacontact_tqmock.h"
--#include "kopeteaccount_tqmock.h"
-+#include "kopeteaccount_mock.h"
-+#include "kopeteprotocol_mock.h"
-+#include "kopetecontact_mock.h"
-+#include "kopetemetacontact_mock.h"
-+#include "kopeteaccount_mock.h"
-
- using namespace KUnitTest;
-
-diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp
-index 8beb6e8..7d46fc3 100644
---- a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp
-+++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp
-@@ -1,5 +1,5 @@
- /*
-- Account tqmock object class
-+ Account mock object class
-
- Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
-
-@@ -15,9 +15,9 @@
- *************************************************************************
- */
-
--#include "kopeteaccount_tqmock.h"
-+#include "kopeteaccount_mock.h"
- #include "kopetemetacontact.h"
--#include "kopeteaccount_tqmock.h"
-+#include "kopeteaccount_mock.h"
-
- namespace Kopete
- {
-diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.h b/kopete/libkopete/tests/mock/kopeteaccount_mock.h
-index be4f281..039632f 100644
---- a/kopete/libkopete/tests/mock/kopeteaccount_mock.h
-+++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.h
-@@ -1,5 +1,5 @@
- /*
-- Account tqmock object class
-+ Account mock object class
-
- Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
-
-diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp
-index 43a5b81..ea90bee 100644
---- a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp
-+++ b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp
-@@ -1,5 +1,5 @@
- /*
-- Contact tqmock object class
-+ Contact mock object class
-
- Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
-
-@@ -15,7 +15,7 @@
- *************************************************************************
- */
-
--#include "kopetecontact_tqmock.h"
-+#include "kopetecontact_mock.h"
-
- namespace Kopete
- {
-diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.h b/kopete/libkopete/tests/mock/kopetecontact_mock.h
-index aba361a..00ec878 100644
---- a/kopete/libkopete/tests/mock/kopetecontact_mock.h
-+++ b/kopete/libkopete/tests/mock/kopetecontact_mock.h
-@@ -1,5 +1,5 @@
- /*
-- Contact tqmock object class
-+ Contact mock object class
-
- Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
-
-diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.cpp b/kopete/libkopete/tests/mock/kopetemessage_mock.cpp
-index 66f325e..a3e543e 100644
---- a/kopete/libkopete/tests/mock/kopetemessage_mock.cpp
-+++ b/kopete/libkopete/tests/mock/kopetemessage_mock.cpp
-@@ -1,5 +1,5 @@
- /*
-- Message tqmock object class
-+ Message mock object class
-
- Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
-
-@@ -15,6 +15,6 @@
- *************************************************************************
- */
-
--#include "kopetemessage_tqmock.h"
-+#include "kopetemessage_mock.h"
-
-
-diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.h b/kopete/libkopete/tests/mock/kopetemessage_mock.h
-index f8677ee..1345e92 100644
---- a/kopete/libkopete/tests/mock/kopetemessage_mock.h
-+++ b/kopete/libkopete/tests/mock/kopetemessage_mock.h
-@@ -1,5 +1,5 @@
- /*
-- Message tqmock object class
-+ Message mock object class
-
- Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
-
-diff --git a/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp b/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp
-index e9cc95a..32f0fe1 100644
---- a/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp
-+++ b/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp
-@@ -15,6 +15,6 @@
- *************************************************************************
- */
-
--#include "kopetemetacontact_tqmock.h"
-+#include "kopetemetacontact_mock.h"
-
-
-diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
-index 97bcfee..d9ae1d3 100644
---- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
-+++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
-@@ -1,5 +1,5 @@
- /*
-- Protocol tqmock object class
-+ Protocol mock object class
-
- Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
-
-@@ -15,7 +15,7 @@
- *************************************************************************
- */
-
--#include "kopeteprotocol_tqmock.h"
-+#include "kopeteprotocol_mock.h"
-
- namespace Kopete
- {
-@@ -44,6 +44,6 @@ KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *acc
- return 0L;
- }
-
--} // end ns tqmock
-+} // end ns mock
- } // end ns test
- } // end ns kopete
-diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
-index d2ad36f..db40740 100644
---- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
-+++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
-@@ -1,5 +1,5 @@
- /*
-- Protocol tqmock object class
-+ Protocol mock object class
-
- Copyright (c) 2005 by Duncan Mac-Vicar Prett <duncan@kde.org>
-
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0006-bd6aa1a-fix-inadvertent-tqt-changes.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0006-bd6aa1a-fix-inadvertent-tqt-changes.patch
deleted file mode 100644
index 8cb91742..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0006-bd6aa1a-fix-inadvertent-tqt-changes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h
-index 8c37b0c..7a3a906 100644
---- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h
-+++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h
-@@ -21,7 +21,7 @@
-
- /**
- * This task watch for incoming Jingle session and notify manager.
-- * It is declared in the header to be "tqmoc"-able.
-+ * It is declared in the header to be "moc"-able.
- */
- class JingleWatchSessionTask : public XMPP::Task
- {
-diff --git a/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp b/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp
-index 8532fd4..b76a283 100644
---- a/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp
-+++ b/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp
-@@ -1,5 +1,5 @@
- /*
-- * all_tqmocs.cpp - #include all .tqmoc files in this directory
-+ * all_mocs.cpp - #include all .moc files in this directory
- * Copyright (C) 2004 Richard Smith
- *
- * This library is free software; you can redistribute it and/or
-diff --git a/kopete/protocols/msn/msnaccount.h b/kopete/protocols/msn/msnaccount.h
-index 31ae451..d35f23e 100644
---- a/kopete/protocols/msn/msnaccount.h
-+++ b/kopete/protocols/msn/msnaccount.h
-@@ -135,7 +135,7 @@ private slots:
- void slotOpenInbox();
- void slotChangePublicName();
-
--//#if !defined NDEBUG //(Stupid tqmoc which don't see when he don't need to slot this slot)
-+//#if !defined NDEBUG //(Stupid moc which don't see when he don't need to slot this slot)
- /**
- * Show simple debugging aid
- */
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0007-a2b3834-fix-various-cmake-build-issues.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0007-a2b3834-fix-various-cmake-build-issues.patch
deleted file mode 100644
index a6355caf..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0007-a2b3834-fix-various-cmake-build-issues.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/kopete/kopete/kconf_update/CMakeLists.txt b/kopete/kopete/kconf_update/CMakeLists.txt
-index 1317d82..967b8ef 100644
---- a/kopete/kopete/kconf_update/CMakeLists.txt
-+++ b/kopete/kopete/kconf_update/CMakeLists.txt
-@@ -39,7 +39,7 @@ install( PROGRAMS
-
- ##### kopete_account_kconf_update (executable) ##
-
--tde_add_executable( kopete_account_kconf_update
-+tde_add_executable( "kopete-account-kconf_update"
- SOURCES kopete-account-kconf_update.cpp
- LINK ${TQT_LIBRARIES}
- DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
-@@ -48,7 +48,7 @@ tde_add_executable( kopete_account_kconf_update
-
- ##### kopete_pluginloader2_kconf_update (executable)
-
--tde_add_executable( kopete_pluginloader2_kconf_update
-+tde_add_executable( "kopete-pluginloader2-kconf_update"
- SOURCES kopete-pluginloader2.cpp
- LINK ${TQT_LIBRARIES}
- DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
-@@ -57,7 +57,7 @@ tde_add_executable( kopete_pluginloader2_kconf_update
-
- ##### kopete_nameTracking_kconf_update (executable)
-
--tde_add_executable( kopete_nameTracking_kconf_update
-+tde_add_executable( "kopete-nameTracking-kconf_update"
- SOURCES kopete-nameTracking.cpp
- LINK kdecore-shared
- DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
-diff --git a/kopete/libkopete/CMakeLists.txt b/kopete/libkopete/CMakeLists.txt
-index bbed254..d012c2a 100644
---- a/kopete/libkopete/CMakeLists.txt
-+++ b/kopete/libkopete/CMakeLists.txt
-@@ -49,7 +49,7 @@ install( FILES
- kopetetransfermanager.h kopeteuiglobal.h kabcpersistence.h
- managedconnectionaccount.h kopetenotifydataobject.h
- kopeteversion.h kopeteprefs.h kopetepicture.h webcamwidget.h
-- kopetepluginmanager.h
-+ kopetepluginmanager.h kopeteblacklister.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kopete )
-
-
-diff --git a/kopete/libkopete/avdevice/CMakeLists.txt b/kopete/libkopete/avdevice/CMakeLists.txt
-index 8e37773..2a8b817 100644
---- a/kopete/libkopete/avdevice/CMakeLists.txt
-+++ b/kopete/libkopete/avdevice/CMakeLists.txt
-@@ -40,7 +40,7 @@ tde_add_library( kopete_videodevice SHARED AUTOMOC
- videocontrol.cpp videodevice.cpp videodevicemodelpool.cpp
- videodevicepool.cpp videoinput.cpp bayer.cpp
- sonix_compress.cpp
-- VERSION 1.0.0
-+ VERSION 0.0.0
- LINK kdecore-shared
- DESTINATION ${LIB_INSTALL_DIR}
- )
-diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/kioslave/CMakeLists.txt
-index 9539457..24b4ce8 100644
---- a/kopete/protocols/jabber/kioslave/CMakeLists.txt
-+++ b/kopete/protocols/jabber/kioslave/CMakeLists.txt
-@@ -35,8 +35,8 @@ install( FILES jabberdisco.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
- tde_add_kpart( kio_jabberdisco AUTOMOC
- SOURCES jabberdisco.cpp
- LINK
-- jabberclient-static idn
-+ jabberclient-static
- iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
-- qca-static cutestuff_network-static cutestuff_util-static kio-shared
-+ qca-static cutestuff_network-static cutestuff_util-static kio-shared idn
- DESTINATION ${PLUGIN_INSTALL_DIR}
- )
-diff --git a/kopete/protocols/meanwhile/CMakeLists.txt b/kopete/protocols/meanwhile/CMakeLists.txt
-index 994f6e3..198dfaa 100644
---- a/kopete/protocols/meanwhile/CMakeLists.txt
-+++ b/kopete/protocols/meanwhile/CMakeLists.txt
-@@ -35,9 +35,9 @@ link_directories(
- install( FILES kopete_meanwhile.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-
-
--##### new_target0 (module) #######################
-+##### kopete_meanwhile (module) #######################
-
--tde_add_kpart( new_target0 AUTOMOC
-+tde_add_kpart( kopete_meanwhile AUTOMOC
- SOURCES
- meanwhileprotocol.cpp meanwhileaddcontactpage.cpp
- meanwhileeditaccountwidget.cpp meanwhileaccount.cpp
-diff --git a/kopete/protocols/msn/webcam/libmimic/CMakeLists.txt b/kopete/protocols/msn/webcam/libmimic/CMakeLists.txt
-index d98fc83..5a34066 100644
---- a/kopete/protocols/msn/webcam/libmimic/CMakeLists.txt
-+++ b/kopete/protocols/msn/webcam/libmimic/CMakeLists.txt
-@@ -20,4 +20,5 @@ tde_add_library( mimic STATIC_PIC
- SOURCES
- mimic.c encode.c decode.c bitstring.c vlc_common.c vlc_encode.c
- vlc_decode.c fdct_quant.c idct_dequant.c colorspace.c deblock.c
-+ LINK ${GLIB2_LIBRARIES}
- )
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0008-98c9c87-add-missing-file-from-previous-commit-10026753.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0008-98c9c87-add-missing-file-from-previous-commit-10026753.patch
deleted file mode 100644
index a23146a0..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0008-98c9c87-add-missing-file-from-previous-commit-10026753.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/kopete/plugins/nowlistening/ConfigureChecks.cmake b/kopete/plugins/nowlistening/ConfigureChecks.cmake
-new file mode 100644
-index 0000000..0780035
---- /dev/null
-+++ b/kopete/plugins/nowlistening/ConfigureChecks.cmake
-@@ -0,0 +1,22 @@
-+#################################################
-+#
-+# (C) 2012 Slavek Banko
-+# slavek (DOT) banko (AT) axis.cz
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+# xmms
-+if( WITH_XMMS )
-+ find_program( XMMS_CONFIG xmms-config )
-+ if( XMMS_CONFIG )
-+ set( HAVE_XMMS 1 )
-+ EXEC_PROCESS( COMMAND ${XMMS_CONFIG} --cflags OUTPUT_VARIABLE XMMS_INCLUDES )
-+ EXEC_PROCESS( COMMAND ${XMMS_CONFIG} --libs OUTPUT_VARIABLE XMMS_LIBS )
-+ else( )
-+ tde_message_fatal( "xmms is required, but was not found on your system" )
-+ endif( )
-+endif( )
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0009-81ace9c-fix-inadvertent-tq-changes.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0009-81ace9c-fix-inadvertent-tq-changes.patch
deleted file mode 100644
index d778c7fc..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0009-81ace9c-fix-inadvertent-tq-changes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/kopete/kopete.api b/kopete/kopete.api
-index 04084b8..95a196a 100644
---- a/kopete/kopete.api
-+++ b/kopete/kopete.api
-@@ -59,8 +59,8 @@ WARN_LOGFILE =
- INPUT = libkopete libkopete/ui
- FILE_PATTERNS = *.h
- RECURSIVE = NO
--EXCLUDE_PATTERNS = *.tqmoc.* \
-- tqmoc* \
-+EXCLUDE_PATTERNS = *.moc.* \
-+ moc* \
- *.all_cpp.* \
- *unload.* \
- */test/* \
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0010-6f85c0c-fix-references-to-user-profile-directory.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0010-6f85c0c-fix-references-to-user-profile-directory.patch
deleted file mode 100644
index f4d41447..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0010-6f85c0c-fix-references-to-user-profile-directory.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/kopete/kopete/chatwindow/kopetechatwindowstyle.h b/kopete/kopete/chatwindow/kopetechatwindowstyle.h
-index 38c5f35..aa6f73a 100644
---- a/kopete/kopete/chatwindow/kopetechatwindowstyle.h
-+++ b/kopete/kopete/chatwindow/kopetechatwindowstyle.h
-@@ -65,7 +65,7 @@ public:
- /**
- * Get the style path.
- * The style path points to the directory where the style is located.
-- * ex: ~/.kde/share/apps/kopete/styles/StyleName/
-+ * ex: ~/.trinity/share/apps/kopete/styles/StyleName/
- *
- * @return the style path based.
- */
-diff --git a/kopete/libkopete/kopetepicture.h b/kopete/libkopete/kopetepicture.h
-index 46e7a7c..a681e7c 100644
---- a/kopete/libkopete/kopetepicture.h
-+++ b/kopete/libkopete/kopetepicture.h
-@@ -41,7 +41,7 @@ namespace Kopete
- * You can only use an TQImage and a image path to create/update
- * the picture.
- * If the picture doesn't exist as a file, it generate a local
-- * copy into ~/.kde/share/apps/kopete/metacontactpicturecache
-+ * copy into ~/.trinity/share/apps/kopete/metacontactpicturecache
- *
- * This class is implicitly shared, so don't use it as a pointer.
- *
-diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
-index 677ed1d..2bf748c 100644
---- a/kopete/plugins/history/converter.cpp
-+++ b/kopete/plugins/history/converter.cpp
-@@ -45,7 +45,7 @@ void HistoryPlugin::convertOldHistory()
-
-
- TQString kopetedir=locateLocal( "data", TQString::fromLatin1( "kopete"));
-- TQDir d( kopetedir ); //d should point to ~/.kde/share/apps/kopete/
-+ TQDir d( kopetedir ); //d should point to ~/.trinity/share/apps/kopete/
-
- d.setFilter( TQDir::Dirs );
-
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0011-631f957-remove-nuisance-unsermake-warning-with-automake.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0011-631f957-remove-nuisance-unsermake-warning-with-automake.patch
deleted file mode 100644
index ea1a6526..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0011-631f957-remove-nuisance-unsermake-warning-with-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am b/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am
-index 56be2c4..8e89a08 100644
---- a/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am
-+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am
-@@ -1,6 +1,6 @@
- # The only Q_OBJECT lines are in securestream.{h,cpp} and we deal with them below.
- # Give metasources a file with no Q_OBJECT line to stop unsermake assuming we want METASOURCES = AUTO
--METASOURCES = ignore_this_warning.moc
-+METASOURCES = AUTO
-
- noinst_LTLIBRARIES = libiris_xmpp_core.la
- AM_CPPFLAGS = $(IDN_CFLAGS)
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0012-4387c55-fix-inadvertent-tq-changes.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0012-4387c55-fix-inadvertent-tq-changes.patch
deleted file mode 100644
index dc437b27..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0012-4387c55-fix-inadvertent-tq-changes.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.h b/kopete/libkopete/tests/mock/kopeteaccount_mock.h
-index 039632f..2d30f8f 100644
---- a/kopete/libkopete/tests/mock/kopeteaccount_mock.h
-+++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.h
-@@ -15,8 +15,8 @@
- *************************************************************************
- */
-
--#ifndef _KOPETEACCOUNT_TQMOCK_H_
--#define _KOPETEACCOUNT_TQMOCK_H_
-+#ifndef _KOPETEACCOUNT_MOCK_H_
-+#define _KOPETEACCOUNT_MOCK_H_
-
- #include "kopeteaccount.h"
-
-diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.h b/kopete/libkopete/tests/mock/kopetecontact_mock.h
-index 00ec878..e25844d 100644
---- a/kopete/libkopete/tests/mock/kopetecontact_mock.h
-+++ b/kopete/libkopete/tests/mock/kopetecontact_mock.h
-@@ -15,8 +15,8 @@
- *************************************************************************
- */
-
--#ifndef _KOPETECONTACT_TQMOCK_H_
--#define _KOPETECONTACT_TQMOCK_H_
-+#ifndef _KOPETECONTACT_MOCK_H_
-+#define _KOPETECONTACT_MOCK_H_
-
- #include "kopetecontact.h"
-
-diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.h b/kopete/libkopete/tests/mock/kopetemessage_mock.h
-index 1345e92..13c9257 100644
---- a/kopete/libkopete/tests/mock/kopetemessage_mock.h
-+++ b/kopete/libkopete/tests/mock/kopetemessage_mock.h
-@@ -15,8 +15,8 @@
- *************************************************************************
- */
-
--#ifndef _KOPETEMESSAGE_TQMOCK_H_
--#define _KOPETEMESSAGE_TQMOCK_H_
-+#ifndef _KOPETEMESSAGE_MOCK_H_
-+#define _KOPETEMESSAGE_MOCK_H_
-
- #include "kopetemessage.h"
-
-diff --git a/kopete/libkopete/tests/mock/kopetemetacontact_mock.h b/kopete/libkopete/tests/mock/kopetemetacontact_mock.h
-index 2fa6d8c..f331171 100644
---- a/kopete/libkopete/tests/mock/kopetemetacontact_mock.h
-+++ b/kopete/libkopete/tests/mock/kopetemetacontact_mock.h
-@@ -15,8 +15,8 @@
- *************************************************************************
- */
-
--#ifndef _KOPETEMETACONTACT_TQMOCK_H_
--#define _KOPETEMETACONTACT_TQMOCK_H_
-+#ifndef _KOPETEMETACONTACT_MOCK_H_
-+#define _KOPETEMETACONTACT_MOCK_H_
-
- #include "kopetemetacontact.h"
-
-diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
-index db40740..d250279 100644
---- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
-+++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
-@@ -15,8 +15,8 @@
- *************************************************************************
- */
-
--#ifndef _KOPETEPROTOCOL_TQMOCK_H_
--#define _KOPETEPROTOCOL_TQMOCK_H_
-+#ifndef _KOPETEPROTOCOL_MOCK_H_
-+#define _KOPETEPROTOCOL_MOCK_H_
-
- #include "kopeteprotocol.h"
-
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.1-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.1-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch
deleted file mode 100644
index dcf95d82..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.1-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch
+++ /dev/null
@@ -1,373 +0,0 @@
-diff --git a/kopete/ChangeLog b/kopete/ChangeLog
-index 5339291..9b94a50 100644
---- a/kopete/ChangeLog
-+++ b/kopete/ChangeLog
-@@ -143,7 +143,7 @@
- * Rearrange the yahoo message parsing a bit so we do it all before we
- create the KopeteMessage object for it.
-
-- Workaround gaim's bugginess when sending URLs so that there
-+ Workaround pidgin's bugginess when sending URLs so that there
- aren't parse errors. (#87190)
-
- 2004-08-14 14:22 Matt Rogers <matt.rogers@kdemail.net>
-diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp
-index 68a31fb..237122c 100644
---- a/kopete/protocols/groupwise/gwprotocol.cpp
-+++ b/kopete/protocols/groupwise/gwprotocol.cpp
-@@ -5,7 +5,7 @@
-
- Based on Testbed
- Copyright (c) 2003 by Will Stephenson <will@stevello.free-online.co.uk>
-- rtfizeTest from nm_rtfize_text, from Gaim src/protocols/novell/nmuser.c
-+ rtfizeTest from nm_rtfize_text, from Pidgin src/protocols/novell/nmuser.c
- Copyright (c) 2004 Novell, Inc. All Rights Reserved
-
- Kopete (c) 2002-2003 by the Kopete developers <kopete-devel@kde.org>
-@@ -178,7 +178,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain )
- "{\\colortbl ;\\red0\\green0\\blue0;}\n"
- "\\uc1\\cf1\\f0\\fs18 %1\\par\n}");
- TQString outputText; // output text
-- TQCString plainUtf8 = plain.utf8(); // encoded as UTF8, because that's what this encoding algorithm, taken from Gaim's Novell plugin
-+ TQCString plainUtf8 = plain.utf8(); // encoded as UTF8, because that's what this encoding algorithm, taken from Pidgin's Novell plugin
- uint index = 0; // current char to transcode
- while ( index < plainUtf8.length() )
- {
-diff --git a/kopete/protocols/groupwise/gwprotocol.h b/kopete/protocols/groupwise/gwprotocol.h
-index 95105f1..b73406c 100644
---- a/kopete/protocols/groupwise/gwprotocol.h
-+++ b/kopete/protocols/groupwise/gwprotocol.h
-@@ -5,7 +5,7 @@
-
- Based on Testbed
- Copyright (c) 2003 by Will Stephenson <will@stevello.free-online.co.uk>
-- rtfizeTest from nm_rtfize_text, from Gaim src/protocols/novell/nmuser.c
-+ rtfizeTest from nm_rtfize_text, from Pidgin src/protocols/novell/nmuser.c
- Copyright (c) 2004 Novell, Inc. All Rights Reserved
-
- Kopete (c) 2002-2003 by the Kopete developers <kopete-devel@kde.org>
-diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
-index 449adfe..9e7a131 100644
---- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
-+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
-@@ -5,7 +5,7 @@
- Copyright (c) 2004 SUSE Linux AG http://www.suse.com
-
- Based on Iris, Copyright (C) 2003 Justin Karneges
-- url_escape_string from Gaim src/protocols/novell/nmconn.c
-+ url_escape_string from Pidgin src/protocols/novell/nmconn.c
- Copyright (c) 2004 Novell, Inc. All Rights Reserved
-
- Kopete (c) 2002-2004 by the Kopete developers <kopete-devel@kde.org>
-@@ -273,11 +273,11 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth )
- TQDataStream dout( bytesOut, IO_WriteOnly );
- dout.setByteOrder( TQDataStream::LittleEndian );
-
-- // these fields are ignored by Gaim's novell
-+ // these fields are ignored by Pidgin's novell
- if ( field->type() == NMFIELD_TYPE_BINARY || field->method() == NMFIELD_METHOD_IGNORE )
- continue;
-
-- // GAIM writes these tags to the secure socket separately - if we can't connect, check here
-+ // PIDGIN writes these tags to the secure socket separately - if we can't connect, check here
- // NM Protocol 1 writes them in an apparently arbitrary order
- // tag
- //dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) );
-diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
-index 93ce7c9..7532706 100644
---- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
-+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
-@@ -177,7 +177,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
- case ContactAdd: //104
- case ReceiveFile: //109
- case ConferenceRename: //116
-- // unhandled because unhandled in Gaim
-+ // unhandled because unhandled in Pidgin
- break;
- /* GW7 */
- case ReceivedBroadcast: //122
-diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
-index f39c2ec..1034b22 100644
---- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
-+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
-@@ -4,7 +4,7 @@
- Copyright (c) 2004 SUSE Linux AG http://www.suse.com
-
- Based on Iris, Copyright (C) 2003 Justin Karneges
-- encode_method from Gaim src/protocols/novell/nmconn.c
-+ encode_method from Pidgin src/protocols/novell/nmconn.c
- Copyright (c) 2004 Novell, Inc. All Rights Reserved
-
- Kopete (c) 2002-2004 by the Kopete developers <kopete-devel@kde.org>
-diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
-index 2b77e33..1ef621d 100644
---- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
-+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
-@@ -35,7 +35,7 @@ void GetStatusTask::userDN( const TQString & dn )
- m_userDN = dn;
- // set up Transfer
- Field::FieldList lst;
-- // changed from USERID to DN as per Gaim/GWIM
-+ // changed from USERID to DN as per Pidgin/GWIM
- lst.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, m_userDN ) );
- createTransfer( "getstatus", lst );
- }
-diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
-index fdf1173..7180b4d 100644
---- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
-+++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp
-@@ -31,7 +31,7 @@ SendMessageTask::~SendMessageTask()
-
- void SendMessageTask::message( const TQStringList & recipientDNList, const OutgoingMessage & msg )
- {
-- // Assumes the conference is instantiated, unlike Gaim's nm_send_message
-+ // Assumes the conference is instantiated, unlike Pidgin's nm_send_message
- Field::FieldList lst, tmp, msgBodies;
- // list containing GUID
- tmp.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, msg.guid ) );
-diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
-index c18c907..75bcdd0 100644
---- a/kopete/protocols/jabber/jabberchatsession.cpp
-+++ b/kopete/protocols/jabber/jabberchatsession.cpp
-@@ -287,7 +287,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat
- TQString xhtmlBody = message.escapedBody();
-
- // According to JEP-0071 8.9 it is only RECOMMANDED to replace \n with <br/>
-- // which mean that some implementation (gaim 2 beta) may still think that \n are linebreak.
-+ // which mean that some implementation (pidgin 2 beta) may still think that \n are linebreak.
- // and considered the fact that KTextEditor generate a well indented XHTML, we need to remove all \n from it
- // see Bug 121627
- // Anyway, theses client that do like that are *WRONG* considreded the example of jep-71 where there are lot of
-diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
-index cab9312..c6e6324 100644
---- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
-+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
-@@ -119,7 +119,7 @@ public:
- status_.find("Auto Status") != std::string::npos)
- return STR_EMPTY;
- }
-- if (jid_.resource().find("Gaim") != std::string::npos) {
-+ if (jid_.resource().find("Pidgin") != std::string::npos) {
- if (status_ == "Sorry, I ran out for a bit!")
- return STR_EMPTY;
- }
-diff --git a/kopete/protocols/meanwhile/README b/kopete/protocols/meanwhile/README
-index 5c77dbf..4730c3f 100644
---- a/kopete/protocols/meanwhile/README
-+++ b/kopete/protocols/meanwhile/README
-@@ -9,7 +9,7 @@ To INSTALL
- installing libmeanwhile
- =======================
- from http://meanwhile.sf.net - use version 0.3
--Refer to INSTALL in the meanwhile code. Run configure without specifying the --with_gaim_src
-+Refer to INSTALL in the meanwhile code. Run configure without specifying the --with_pidgin_src
- # autogen.sh
- # ./configure --prefix=/usr
- # make
-diff --git a/kopete/protocols/msn/ReleaseNotes b/kopete/protocols/msn/ReleaseNotes
-index 3a2b2f6..1a36724 100644
---- a/kopete/protocols/msn/ReleaseNotes
-+++ b/kopete/protocols/msn/ReleaseNotes
-@@ -23,7 +23,7 @@ release:
- internally a group ID is used. Kopete currently uses the name as a unique
- identifier, however, and will likely get a bit confused by this. If you
- do experience problems, you could join both groups using another MSN
-- client, like the official client, Trillian or Gaim as a workaround.
-+ client, like the official client, Trillian or Pidgin as a workaround.
-
- - Kopete contacts can be at Top-Level and in no groups. MSN doesn't
- support this freature. The kopete's contact list can differe from server
-diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
-index 6c4aa9c..c4dcabf 100644
---- a/kopete/protocols/msn/msnaccount.cpp
-+++ b/kopete/protocols/msn/msnaccount.cpp
-@@ -1178,7 +1178,7 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co
-
- /**
- * This code should open a chatwindow when a socket is open
-- * It has been disabled because gaim open switchboeard too often
-+ * It has been disabled because pidgin open switchboeard too often
- *
- * the solution is to open the window only when the contact start typing
- * see MSNChatSession::receivedTypingMsg
-diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
-index 7d67876..3298e46 100644
---- a/kopete/protocols/msn/msnswitchboardsocket.cpp
-+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
-@@ -695,7 +695,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
- }
- }
-
-- // User-Agent is not a official flag, but GAIM has it
-+ // User-Agent is not a official flag, but PIDGIN has it
- TQString UA;
- if( config->readBoolEntry("SendClientInfo", true) )
- {
-diff --git a/kopete/protocols/oscar/liboscar/TODO b/kopete/protocols/oscar/liboscar/TODO
-index 1ec9be9..ed14e15 100644
---- a/kopete/protocols/oscar/liboscar/TODO
-+++ b/kopete/protocols/oscar/liboscar/TODO
-@@ -17,7 +17,7 @@ Misc. Before Merge things
- Direct Connections
- ====================================
- When/If we get around to it. Matt knows absolutely nothing about direct connections and the only online source of documentation is no longer online. :(
--This will definately be one of those things we have to dissect gaim for. :/
-+This will definately be one of those things we have to dissect pidgin for. :/
-
-
- SNAC 0x15 parsing
-diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.cpp b/kopete/protocols/oscar/liboscar/buddyicontask.cpp
-index c75a592..c766148 100644
---- a/kopete/protocols/oscar/liboscar/buddyicontask.cpp
-+++ b/kopete/protocols/oscar/liboscar/buddyicontask.cpp
-@@ -137,7 +137,7 @@ void BuddyIconTask::sendIcon()
- m_seq = client()->snacSequence();
- SNAC s = { 0x0010, 0x0002, 0x0000, m_seq };
- Buffer* b = new Buffer;
-- b->addWord( 1 ); //gaim hard codes it, so will we
-+ b->addWord( 1 ); //pidgin hard codes it, so will we
- b->addWord( m_iconLength );
- b->addString( m_icon );
- Transfer* t = createTransfer( f, s, b );
-diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
-index 3004af0..4a34ae2 100644
---- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
-+++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
-@@ -115,7 +115,7 @@ void ChatNavServiceTask::onGo()
-
- void ChatNavServiceTask::createRoom( WORD exchange, const TQString& name )
- {
-- //most of this comes from gaim. thanks to them for figuring it out
-+ //most of this comes from pidgin. thanks to them for figuring it out
- TQString cookie = "create"; //hardcoded, seems to be ignored by AOL
- TQString lang = "en";
- TQString charset = "us-ascii";
-diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp
-index 2a4d96f..e3c2642 100644
---- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp
-+++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp
-@@ -7,7 +7,7 @@
- Based on code Copyright (c) 2004 SuSE Linux AG http://www.suse.com
-
- Based on Iris, Copyright (C) 2003 Justin Karneges
-- url_escape_string from Gaim src/protocols/novell/nmconn.c
-+ url_escape_string from Pidgin src/protocols/novell/nmconn.c
- Copyright (c) 2004 Novell, Inc. All Rights Reserved
-
- Kopete (c) 2002-2004 by the Kopete developers <kopete-devel@kde.org>
-diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
-index 1b8cbfb..df1a819 100644
---- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
-+++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
-@@ -141,7 +141,7 @@ void SendMessageTask::addChannel1Data( Buffer* b )
- {
- Buffer tlv2buffer;
-
-- //Send features TLV using data from gaim. Features are different
-+ //Send features TLV using data from pidgin. Features are different
- //depending on whether we're ICQ or AIM
- if ( client()->isIcq() )
- {
-@@ -266,7 +266,7 @@ void SendMessageTask::addRendezvousMessageData( Buffer* b )
- b->addLEWord( 0x001B ); // length of this data segment, always 27
-
- // protocol version
-- // miranda,licq use 8, gaim,icq5 use 9, icq2003b uses 10.
-+ // miranda,licq use 8, pidgin,icq5 use 9, icq2003b uses 10.
- // 9 seems to make things a litle difficult, 10 seems a little more like 8, but still more difficult
- b->addLEWord( 0x0008 ); // so stick with 8 for now :)
-
-diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp
-index 8a1b6c4..f873702 100644
---- a/kopete/protocols/oscar/liboscar/userdetails.cpp
-+++ b/kopete/protocols/oscar/liboscar/userdetails.cpp
-@@ -363,7 +363,7 @@ void UserDetails::detectClient()
- clientMatched=true; // default case will set it to false again if we did not find anything
- switch (m_dcLastInfoUpdateTime)
- {
-- case 0xFFFFFFFFL: //gaim behaves like official AIM so we can't detect them, only look for miranda
-+ case 0xFFFFFFFFL: //pidgin behaves like official AIM so we can't detect them, only look for miranda
- {
- if (m_dcLastExtStatusUpdateTime & 0x80000000)
- m_clientName=TQString::fromLatin1("Miranda alpha");
-@@ -439,9 +439,9 @@ void UserDetails::detectClient()
- m_clientName=TQString::fromLatin1("ICQ2go");
- }
- }
-- else if (hasCap(CAP_BUDDYICON)) // only gaim seems to advertize this on ICQ
-+ else if (hasCap(CAP_BUDDYICON)) // only pidgin seems to advertize this on ICQ
- {
-- m_clientName = TQString::fromLatin1("Gaim");
-+ m_clientName = TQString::fromLatin1("Pidgin");
- }
- else if (hasCap(CAP_XTRAZ))
- {
-diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.c b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
-index a97e7be..b3a1f9f 100644
---- a/kopete/protocols/yahoo/libkyahoo/libyahoo.c
-+++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
-@@ -4,10 +4,10 @@
- * Some code copyright (C) 2002, Philip S Tellis <philip . tellis AT gmx . net>
- *
- * Much of this code was taken and adapted from the yahoo module for
-- * gaim released under the GNU GPL. This code is also released under the
-+ * pidgin released under the GNU GPL. This code is also released under the
- * GNU GPL.
- *
-- * This code is derivitive of Gaim <http://gaim.sourceforge.net>
-+ * This code is derivitive of Pidgin <http://pidgin.sourceforge.net>
- * copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
- * 1998-1999, Adam Fritzler <afritz@marko.net>
- * 1998-2002, Rob Flynn <rob@marko.net>
-diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.h b/kopete/protocols/yahoo/libkyahoo/libyahoo.h
-index b15f57a..e9cad06 100644
---- a/kopete/protocols/yahoo/libkyahoo/libyahoo.h
-+++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.h
-@@ -4,10 +4,10 @@
- * Some code copyright (C) 2002, Philip S Tellis <philip . tellis AT gmx . net>
- *
- * Much of this code was taken and adapted from the yahoo module for
-- * gaim released under the GNU GPL. This code is also released under the
-+ * pidgin released under the GNU GPL. This code is also released under the
- * GNU GPL.
- *
-- * This code is derivitive of Gaim <http://gaim.sourceforge.net>
-+ * This code is derivitive of Pidgin <http://pidgin.sourceforge.net>
- * copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
- * 1998-1999, Adam Fritzler <afritz@marko.net>
- * 1998-2002, Rob Flynn <rob@marko.net>
-diff --git a/kopete/protocols/yahoo/libkyahoo/yahoo_fn.c b/kopete/protocols/yahoo/libkyahoo/yahoo_fn.c
-index 5671289..72cebd2 100644
---- a/kopete/protocols/yahoo/libkyahoo/yahoo_fn.c
-+++ b/kopete/protocols/yahoo/libkyahoo/yahoo_fn.c
-@@ -1,5 +1,5 @@
- /*
-- * gaim
-+ * pidgin
- *
- * Some code copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
- * libfaim code copyright 1998, 1999 Adam Fritzler <afritz@auk.cx>
-diff --git a/kopete/protocols/yahoo/libkyahoo/yahoo_fn.h b/kopete/protocols/yahoo/libkyahoo/yahoo_fn.h
-index c4b34c8..fc9d68e 100644
---- a/kopete/protocols/yahoo/libkyahoo/yahoo_fn.h
-+++ b/kopete/protocols/yahoo/libkyahoo/yahoo_fn.h
-@@ -1,5 +1,5 @@
- /*
-- * gaim
-+ * pidgin
- *
- * Copyright (C) 2003
- *
-diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
-index 7cc330f..a38fecc 100644
---- a/kopete/protocols/yahoo/yahooaccount.cpp
-+++ b/kopete/protocols/yahoo/yahooaccount.cpp
-@@ -174,7 +174,7 @@ TQString YahooAccount::stripMsgColorCodes(const TQString& msg)
- filteredMsg.replace( "\033[4m", "<u>" );
- filteredMsg.replace( "\033[x4m", "</u>" );
-
-- //GAIM doesn't check for ^[[3m. Does this ever get sent?
-+ //PIDGIN doesn't check for ^[[3m. Does this ever get sent?
- filteredMsg.replace( "\033[3m", "<i>" );
- filteredMsg.replace( "\033[x3m", "</i>" );
-
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.2-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.2-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch
deleted file mode 100644
index ffd36628..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.2-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch
+++ /dev/null
@@ -1,450 +0,0 @@
-diff --git a/kopete/styles/CMakeLists.txt b/kopete/styles/CMakeLists.txt
-index a98079a..7a4653e 100644
---- a/kopete/styles/CMakeLists.txt
-+++ b/kopete/styles/CMakeLists.txt
-@@ -15,4 +15,4 @@ add_subdirectory( Clean )
- add_subdirectory( Clear )
- add_subdirectory( Konqi )
- add_subdirectory( Retropete )
--add_subdirectory( Gaim )
-+add_subdirectory( Pidgin )
-diff --git a/kopete/styles/Gaim/CMakeLists.txt b/kopete/styles/Gaim/CMakeLists.txt
-deleted file mode 100644
-index f08e42e..0000000
---- a/kopete/styles/Gaim/CMakeLists.txt
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#################################################
--#
--# (C) 2010-2011 Serghei Amelian
--# serghei (DOT) amelian (AT) gmail.com
--#
--# Improvements and feedback are welcome
--#
--# This file is released under GPL >= 2
--#
--#################################################
--
--add_subdirectory( Contents )
-diff --git a/kopete/styles/Gaim/CREDITS b/kopete/styles/Gaim/CREDITS
-deleted file mode 100644
-index 4e52378..0000000
---- a/kopete/styles/Gaim/CREDITS
-+++ /dev/null
-@@ -1,7 +0,0 @@
--Original textonly Style for Adium written by Mark Fickett
--http://www.adiumxtras.com/index.php?a=xtras&xtra_id=44
--
--Modified justtext Style for Adium written by Huw Rowlands
--http://www.adiumxtras.com/index.php?a=xtras&xtra_id=990
--
--Modified Gaim Style for Kopete written by Thanos Kyritsis
-diff --git a/kopete/styles/Gaim/Contents/CMakeLists.txt b/kopete/styles/Gaim/Contents/CMakeLists.txt
-deleted file mode 100644
-index 88724a1..0000000
---- a/kopete/styles/Gaim/Contents/CMakeLists.txt
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#################################################
--#
--# (C) 2010-2011 Serghei Amelian
--# serghei (DOT) amelian (AT) gmail.com
--#
--# Improvements and feedback are welcome
--#
--# This file is released under GPL >= 2
--#
--#################################################
--
--add_subdirectory( Resources )
-diff --git a/kopete/styles/Gaim/Contents/Info.plist b/kopete/styles/Gaim/Contents/Info.plist
-deleted file mode 100644
-index c5fb682..0000000
---- a/kopete/styles/Gaim/Contents/Info.plist
-+++ /dev/null
-@@ -1,31 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
-- "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
--<plist version="1.0">
--<dict>
-- <key>CFBundleDevelopmentRegion</key>
-- <string>English</string>
-- <key>CFBundleGetInfoString</key>
-- <string>Gaim Kopete chat Style</string>
-- <key>CFBundleIdentifier</key>
-- <string>Kopete.Gaim.style</string>
-- <key>CFBundleInfoDictionaryVersion</key>
-- <string>1.0</string>
-- <key>CFBundleName</key>
-- <string>Gaim</string>
-- <key>CFBundlePackageType</key>
-- <string>KopeteChatStyle</string>
-- <key>DefaultBackgroundColor</key>
-- <string>FFFFFF</string>
-- <key>DefaultFontFamily</key>
-- <string>DejaVu Sans Mono</string>
-- <key>DefaultFontSize</key>
-- <integer>12</integer>
-- <key>DisableCustomBackground</key>
-- <false/>
-- <key>DisplayNameForNoVariant</key>
-- <string>grays</string>
-- <key>ShowsUserIcons</key>
-- <false/>
--</dict>
--</plist>
-diff --git a/kopete/styles/Gaim/Contents/Makefile.am b/kopete/styles/Gaim/Contents/Makefile.am
-deleted file mode 100644
-index 6940fe8..0000000
---- a/kopete/styles/Gaim/Contents/Makefile.am
-+++ /dev/null
-@@ -1 +0,0 @@
--SUBDIRS = Resources
-\ No newline at end of file
-diff --git a/kopete/styles/Gaim/Contents/Resources/CMakeLists.txt b/kopete/styles/Gaim/Contents/Resources/CMakeLists.txt
-deleted file mode 100644
-index f212a87..0000000
---- a/kopete/styles/Gaim/Contents/Resources/CMakeLists.txt
-+++ /dev/null
-@@ -1,18 +0,0 @@
--#################################################
--#
--# (C) 2010-2011 Serghei Amelian
--# serghei (DOT) amelian (AT) gmail.com
--#
--# Improvements and feedback are welcome
--#
--# This file is released under GPL >= 2
--#
--#################################################
--
--add_subdirectory( Incoming )
--add_subdirectory( Outgoing )
--add_subdirectory( Variants )
--
--install( FILES
-- main.css Footer.html Header.html Status.html
-- DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources )
-diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html b/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html
-deleted file mode 100644
-index 0f2993c..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html
-+++ /dev/null
-@@ -1,6 +0,0 @@
--<div class="KopeteMessage" style="direction: %messageDirection%;">
-- <span style="color:%senderColor%;s"><span class="inActionTime">(%time{%H:%M:%S}%) </span>
-- <span class="inActionMetacontact">%sender%:&nbsp;</span></span>
-- <span class="inActionMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
--</div>
--<div id="insert"></div>
-diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/CMakeLists.txt b/kopete/styles/Gaim/Contents/Resources/Incoming/CMakeLists.txt
-deleted file mode 100644
-index f4a2302..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Incoming/CMakeLists.txt
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#################################################
--#
--# (C) 2010-2011 Serghei Amelian
--# serghei (DOT) amelian (AT) gmail.com
--#
--# Improvements and feedback are welcome
--#
--# This file is released under GPL >= 2
--#
--#################################################
--
--install( FILES
-- Action.html Content.html NextContent.html
-- DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources/Incoming )
-diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html b/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html
-deleted file mode 100644
-index 89d07c9..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html
-+++ /dev/null
-@@ -1,6 +0,0 @@
--<div class="KopeteMessage" style="direction: %messageDirection%;">
-- <span style="color:%senderColor%;"><span class="inContentTime">(%time{%H:%M:%S}%) </span>
-- <span class="inMetacontact">%sender%:&nbsp;</span></span>
-- <span class="IncomingMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
--</div>
--<div id="insert"></div>
-diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/Makefile.am b/kopete/styles/Gaim/Contents/Resources/Incoming/Makefile.am
-deleted file mode 100644
-index dea2810..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Incoming/Makefile.am
-+++ /dev/null
-@@ -1,4 +0,0 @@
--style_DATA = Action.html Content.html NextContent.html
--styledir = $(kde_datadir)/kopete/styles/Gaim/Contents/Resources/Incoming
--
--EXTRA_DIST = $(style_DATA)
-\ No newline at end of file
-diff --git a/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html b/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html
-deleted file mode 100644
-index 89d07c9..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html
-+++ /dev/null
-@@ -1,6 +0,0 @@
--<div class="KopeteMessage" style="direction: %messageDirection%;">
-- <span style="color:%senderColor%;"><span class="inContentTime">(%time{%H:%M:%S}%) </span>
-- <span class="inMetacontact">%sender%:&nbsp;</span></span>
-- <span class="IncomingMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
--</div>
--<div id="insert"></div>
-diff --git a/kopete/styles/Gaim/Contents/Resources/Makefile.am b/kopete/styles/Gaim/Contents/Resources/Makefile.am
-deleted file mode 100644
-index 75c9567..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Makefile.am
-+++ /dev/null
-@@ -1,5 +0,0 @@
--SUBDIRS = Incoming Outgoing Variants
--style_DATA = main.css Footer.html Header.html Status.html
--styledir = $(kde_datadir)/kopete/styles/Gaim/Contents/Resources
--
--EXTRA_DIST = $(style_DATA)
-\ No newline at end of file
-diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html b/kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html
-deleted file mode 100644
-index a7d6ef0..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html
-+++ /dev/null
-@@ -1,6 +0,0 @@
--<div class="KopeteMessage" style="direction: %messageDirection%;">
-- <span style="color:%senderColor%;"><span class="outActionTime">(%time{%H:%M:%S}%) </span>
-- <span class="outActionMetacontact">%sender%:&nbsp;</span></span>
-- <span class="outActionMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
--</div>
--<div id="insert"></div>
-diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/CMakeLists.txt b/kopete/styles/Gaim/Contents/Resources/Outgoing/CMakeLists.txt
-deleted file mode 100644
-index 32d0ae5..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Outgoing/CMakeLists.txt
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#################################################
--#
--# (C) 2010-2011 Serghei Amelian
--# serghei (DOT) amelian (AT) gmail.com
--#
--# Improvements and feedback are welcome
--#
--# This file is released under GPL >= 2
--#
--#################################################
--
--install( FILES
-- Action.html Content.html NextContent.html
-- DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources/Outgoing )
-diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html b/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html
-deleted file mode 100644
-index 9ea2bb6..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html
-+++ /dev/null
-@@ -1,6 +0,0 @@
--<div class="KopeteMessage" style="direction: %messageDirection%;">
-- <span style="color:%senderColor%;"><span class="outContentTime">(%time{%H:%M:%S}%) </span>
-- <span class="outMetacontact">%sender%:&nbsp;</span></span>
-- <span class="OutgoingMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
--</div>
--<div id="insert"></div>
-diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.am b/kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.am
-deleted file mode 100644
-index ce2edce..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.am
-+++ /dev/null
-@@ -1,4 +0,0 @@
--style_DATA = Action.html Content.html NextContent.html
--styledir = $(kde_datadir)/kopete/styles/Gaim/Contents/Resources/Outgoing
--
--EXTRA_DIST = $(style_DATA)
-diff --git a/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html b/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html
-deleted file mode 100644
-index 9ea2bb6..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html
-+++ /dev/null
-@@ -1,6 +0,0 @@
--<div class="KopeteMessage" style="direction: %messageDirection%;">
-- <span style="color:%senderColor%;"><span class="outContentTime">(%time{%H:%M:%S}%) </span>
-- <span class="outMetacontact">%sender%:&nbsp;</span></span>
-- <span class="OutgoingMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
--</div>
--<div id="insert"></div>
-diff --git a/kopete/styles/Gaim/Contents/Resources/Status.html b/kopete/styles/Gaim/Contents/Resources/Status.html
-deleted file mode 100644
-index 4858785..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Status.html
-+++ /dev/null
-@@ -1,5 +0,0 @@
--<div class="KopeteMessage" style="direction: %messageDirection%;">
-- <span class="InternalTime">(%time{%H:%M:%S}%) </span>
-- <span class="InternalDelim">#&nbsp;</span>
-- <span class="InternalMessage">%message%</span>
--</div>
-diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/CMakeLists.txt b/kopete/styles/Gaim/Contents/Resources/Variants/CMakeLists.txt
-deleted file mode 100644
-index fda3022..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Variants/CMakeLists.txt
-+++ /dev/null
-@@ -1,14 +0,0 @@
--#################################################
--#
--# (C) 2010-2011 Serghei Amelian
--# serghei (DOT) amelian (AT) gmail.com
--#
--# Improvements and feedback are welcome
--#
--# This file is released under GPL >= 2
--#
--#################################################
--
--install( FILES
-- No-Colors.css Name-Colors.css Status-Colors.css Contact-Colors.css
-- DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Gaim/Contents/Resources/Variants )
-diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css b/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css
-deleted file mode 100644
-index 7a85556..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css
-+++ /dev/null
-@@ -1,10 +0,0 @@
--
--@import url(../main.css);
--
--.inContentTime, .inMetacontact {
-- color: inherit;
--}
--
--.outContentTime, .outMetacontact {
-- color: inherit;
--}
-\ No newline at end of file
-diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/Makefile.am b/kopete/styles/Gaim/Contents/Resources/Variants/Makefile.am
-deleted file mode 100644
-index bdd4856..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Variants/Makefile.am
-+++ /dev/null
-@@ -1,4 +0,0 @@
--style_DATA = No-Colors.css Name-Colors.css Status-Colors.css Contact-Colors.css
--styledir = $(kde_datadir)/kopete/styles/Gaim/Contents/Resources/Variants
--
--EXTRA_DIST = $(style_DATA)
-\ No newline at end of file
-diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css b/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css
-deleted file mode 100644
-index f9fce97..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css
-+++ /dev/null
-@@ -1,13 +0,0 @@
--@import url(../main.css);
--
--.inActionTime, .inActionMetacontact, .inActionMessage {
-- color: #000000;
--}
--
--.outActionTime, .outActionMetacontact, .outActionMessage {
-- color: #000000;
--}
--
--.InternalTime, .InternalDelim, .InternalMessage {
-- color: #000000;
--}
-\ No newline at end of file
-diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css b/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css
-deleted file mode 100644
-index d847a19..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css
-+++ /dev/null
-@@ -1,22 +0,0 @@
--@import url(../main.css);
--
--.inContentTime, .inMetacontact {
-- color: #000000;
--}
--
--.outContentTime, .outMetacontact {
-- color: #000000;
--}
--
--.inActionTime, .inActionMetacontact, .inActionMessage {
-- color: #000000;
--}
--
--.outActionTime, .outActionMetacontact, .outActionMessage {
-- color: #000000;
--}
--
--.InternalTime, .InternalDelim, .InternalMessage {
-- color: #000000;
--}
--
-diff --git a/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css b/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css
-deleted file mode 100644
-index 373f6d7..0000000
---- a/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css
-+++ /dev/null
-@@ -1,9 +0,0 @@
--@import url(../main.css);
--
--.inContentTime, .inMetacontact {
-- color: #000000;
--}
--
--.outContentTime, .outMetacontact {
-- color: #000000;
--}
-\ No newline at end of file
-diff --git a/kopete/styles/Gaim/Contents/Resources/main.css b/kopete/styles/Gaim/Contents/Resources/main.css
-deleted file mode 100644
-index 393d2f1..0000000
---- a/kopete/styles/Gaim/Contents/Resources/main.css
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* textonly by Mark Fickett, 2004. Poke/edit/maul, but leave credit - think GPL */
--/* Generally: naib.webhop.org Adium-related: naib.webhop.org/~markfickett/adium */
--
--body {
-- background: #ffffff;
--}
--
--div {
-- overflow: auto;
--}
--
--a:link { text-decoration: none; }
--a:visited { text-decoration: none; }
--a:hover { text-decoration: underline; }
--a:active { text-decoration: none; }
--
--.inMetacontact, .outMetacontact, .inActionMetacontact, .outActionMetacontact, .InternalDelim {
-- font-weight: bold;
--}
--
--.inContentTime, .inMetacontact {
-- color: #a82f2f;
--}
--
--.outContentTime, .outMetacontact {
-- color: #16569e;
--}
--
--.inActionTime, .inActionMetacontact, .inActionMessage {
-- color: green;
--}
--
--.outActionTime, .outActionMetacontact, .outActionMessage {
-- color: green;
--}
--
--.InternalTime, .InternalDelim, .InternalMessage {
-- color: #9400d3;
--}
--
-diff --git a/kopete/styles/Gaim/Makefile.am b/kopete/styles/Gaim/Makefile.am
-deleted file mode 100644
-index 331c9b5..0000000
---- a/kopete/styles/Gaim/Makefile.am
-+++ /dev/null
-@@ -1 +0,0 @@
--SUBDIRS = Contents
-\ No newline at end of file
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.3-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.3-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch
deleted file mode 100644
index 418fd412..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0013.3-412a55a-update-kopete-references-of-gaim-to-pidgin-resolve-bug-865.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-diff --git a/kopete/styles/Makefile.am b/kopete/styles/Makefile.am
-index 39e20e7..3d7bcf0 100644
---- a/kopete/styles/Makefile.am
-+++ b/kopete/styles/Makefile.am
-@@ -1,2 +1,2 @@
--SUBDIRS = Kopete Hacker Clean Clear Konqi Retropete Gaim
-+SUBDIRS = Kopete Hacker Clean Clear Konqi Retropete Pidgin
-
-diff --git a/kopete/styles/Pidgin/CMakeLists.txt b/kopete/styles/Pidgin/CMakeLists.txt
-new file mode 100644
-index 0000000..f08e42e
---- /dev/null
-+++ b/kopete/styles/Pidgin/CMakeLists.txt
-@@ -0,0 +1,12 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+add_subdirectory( Contents )
-diff --git a/kopete/styles/Pidgin/CREDITS b/kopete/styles/Pidgin/CREDITS
-new file mode 100644
-index 0000000..ee91cc7
---- /dev/null
-+++ b/kopete/styles/Pidgin/CREDITS
-@@ -0,0 +1,7 @@
-+Original textonly Style for Adium written by Mark Fickett
-+http://www.adiumxtras.com/index.php?a=xtras&xtra_id=44
-+
-+Modified justtext Style for Adium written by Huw Rowlands
-+http://www.adiumxtras.com/index.php?a=xtras&xtra_id=990
-+
-+Modified Pidgin Style for Kopete written by Thanos Kyritsis
-diff --git a/kopete/styles/Pidgin/Contents/CMakeLists.txt b/kopete/styles/Pidgin/Contents/CMakeLists.txt
-new file mode 100644
-index 0000000..88724a1
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/CMakeLists.txt
-@@ -0,0 +1,12 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+add_subdirectory( Resources )
-diff --git a/kopete/styles/Pidgin/Contents/Info.plist b/kopete/styles/Pidgin/Contents/Info.plist
-new file mode 100644
-index 0000000..87cd60e
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Info.plist
-@@ -0,0 +1,31 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
-+ "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+ <key>CFBundleDevelopmentRegion</key>
-+ <string>English</string>
-+ <key>CFBundleGetInfoString</key>
-+ <string>Pidgin Kopete chat Style</string>
-+ <key>CFBundleIdentifier</key>
-+ <string>Kopete.Pidgin.style</string>
-+ <key>CFBundleInfoDictionaryVersion</key>
-+ <string>1.0</string>
-+ <key>CFBundleName</key>
-+ <string>Pidgin</string>
-+ <key>CFBundlePackageType</key>
-+ <string>KopeteChatStyle</string>
-+ <key>DefaultBackgroundColor</key>
-+ <string>FFFFFF</string>
-+ <key>DefaultFontFamily</key>
-+ <string>DejaVu Sans Mono</string>
-+ <key>DefaultFontSize</key>
-+ <integer>12</integer>
-+ <key>DisableCustomBackground</key>
-+ <false/>
-+ <key>DisplayNameForNoVariant</key>
-+ <string>grays</string>
-+ <key>ShowsUserIcons</key>
-+ <false/>
-+</dict>
-+</plist>
-diff --git a/kopete/styles/Pidgin/Contents/Makefile.am b/kopete/styles/Pidgin/Contents/Makefile.am
-new file mode 100644
-index 0000000..6940fe8
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Makefile.am
-@@ -0,0 +1 @@
-+SUBDIRS = Resources
-\ No newline at end of file
-diff --git a/kopete/styles/Pidgin/Contents/Resources/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/CMakeLists.txt
-new file mode 100644
-index 0000000..1ab98d5
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/CMakeLists.txt
-@@ -0,0 +1,18 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+add_subdirectory( Incoming )
-+add_subdirectory( Outgoing )
-+add_subdirectory( Variants )
-+
-+install( FILES
-+ main.css Footer.html Header.html Status.html
-+ DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources )
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Footer.html b/kopete/styles/Pidgin/Contents/Resources/Footer.html
-new file mode 100644
-index 0000000..e69de29
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Header.html b/kopete/styles/Pidgin/Contents/Resources/Header.html
-new file mode 100644
-index 0000000..e69de29
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html b/kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html
-new file mode 100644
-index 0000000..0f2993c
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/Action.html
-@@ -0,0 +1,6 @@
-+<div class="KopeteMessage" style="direction: %messageDirection%;">
-+ <span style="color:%senderColor%;s"><span class="inActionTime">(%time{%H:%M:%S}%) </span>
-+ <span class="inActionMetacontact">%sender%:&nbsp;</span></span>
-+ <span class="inActionMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
-+</div>
-+<div id="insert"></div>
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Incoming/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/Incoming/CMakeLists.txt
-new file mode 100644
-index 0000000..6ff0e0d
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/CMakeLists.txt
-@@ -0,0 +1,14 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES
-+ Action.html Content.html NextContent.html
-+ DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources/Incoming )
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html b/kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html
-new file mode 100644
-index 0000000..89d07c9
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/Content.html
-@@ -0,0 +1,6 @@
-+<div class="KopeteMessage" style="direction: %messageDirection%;">
-+ <span style="color:%senderColor%;"><span class="inContentTime">(%time{%H:%M:%S}%) </span>
-+ <span class="inMetacontact">%sender%:&nbsp;</span></span>
-+ <span class="IncomingMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
-+</div>
-+<div id="insert"></div>
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Incoming/Makefile.am b/kopete/styles/Pidgin/Contents/Resources/Incoming/Makefile.am
-new file mode 100644
-index 0000000..7cd3902
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/Makefile.am
-@@ -0,0 +1,4 @@
-+style_DATA = Action.html Content.html NextContent.html
-+styledir = $(kde_datadir)/kopete/styles/Pidgin/Contents/Resources/Incoming
-+
-+EXTRA_DIST = $(style_DATA)
-\ No newline at end of file
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Incoming/NextContent.html b/kopete/styles/Pidgin/Contents/Resources/Incoming/NextContent.html
-new file mode 100644
-index 0000000..89d07c9
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Incoming/NextContent.html
-@@ -0,0 +1,6 @@
-+<div class="KopeteMessage" style="direction: %messageDirection%;">
-+ <span style="color:%senderColor%;"><span class="inContentTime">(%time{%H:%M:%S}%) </span>
-+ <span class="inMetacontact">%sender%:&nbsp;</span></span>
-+ <span class="IncomingMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
-+</div>
-+<div id="insert"></div>
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Makefile.am b/kopete/styles/Pidgin/Contents/Resources/Makefile.am
-new file mode 100644
-index 0000000..f350045
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Makefile.am
-@@ -0,0 +1,5 @@
-+SUBDIRS = Incoming Outgoing Variants
-+style_DATA = main.css Footer.html Header.html Status.html
-+styledir = $(kde_datadir)/kopete/styles/Pidgin/Contents/Resources
-+
-+EXTRA_DIST = $(style_DATA)
-\ No newline at end of file
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html
-new file mode 100644
-index 0000000..a7d6ef0
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Action.html
-@@ -0,0 +1,6 @@
-+<div class="KopeteMessage" style="direction: %messageDirection%;">
-+ <span style="color:%senderColor%;"><span class="outActionTime">(%time{%H:%M:%S}%) </span>
-+ <span class="outActionMetacontact">%sender%:&nbsp;</span></span>
-+ <span class="outActionMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
-+</div>
-+<div id="insert"></div>
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Outgoing/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/Outgoing/CMakeLists.txt
-new file mode 100644
-index 0000000..68bcd9c
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/CMakeLists.txt
-@@ -0,0 +1,14 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES
-+ Action.html Content.html NextContent.html
-+ DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources/Outgoing )
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html
-new file mode 100644
-index 0000000..9ea2bb6
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Content.html
-@@ -0,0 +1,6 @@
-+<div class="KopeteMessage" style="direction: %messageDirection%;">
-+ <span style="color:%senderColor%;"><span class="outContentTime">(%time{%H:%M:%S}%) </span>
-+ <span class="outMetacontact">%sender%:&nbsp;</span></span>
-+ <span class="OutgoingMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
-+</div>
-+<div id="insert"></div>
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Outgoing/Makefile.am b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Makefile.am
-new file mode 100644
-index 0000000..85a558d
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/Makefile.am
-@@ -0,0 +1,4 @@
-+style_DATA = Action.html Content.html NextContent.html
-+styledir = $(kde_datadir)/kopete/styles/Pidgin/Contents/Resources/Outgoing
-+
-+EXTRA_DIST = $(style_DATA)
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html b/kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html
-new file mode 100644
-index 0000000..9ea2bb6
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Outgoing/NextContent.html
-@@ -0,0 +1,6 @@
-+<div class="KopeteMessage" style="direction: %messageDirection%;">
-+ <span style="color:%senderColor%;"><span class="outContentTime">(%time{%H:%M:%S}%) </span>
-+ <span class="outMetacontact">%sender%:&nbsp;</span></span>
-+ <span class="OutgoingMessage" style="background-color: %textbackgroundcolor{#4386cf}%;">%message%</span>
-+</div>
-+<div id="insert"></div>
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Status.html b/kopete/styles/Pidgin/Contents/Resources/Status.html
-new file mode 100644
-index 0000000..4858785
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Status.html
-@@ -0,0 +1,5 @@
-+<div class="KopeteMessage" style="direction: %messageDirection%;">
-+ <span class="InternalTime">(%time{%H:%M:%S}%) </span>
-+ <span class="InternalDelim">#&nbsp;</span>
-+ <span class="InternalMessage">%message%</span>
-+</div>
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/CMakeLists.txt b/kopete/styles/Pidgin/Contents/Resources/Variants/CMakeLists.txt
-new file mode 100644
-index 0000000..4976ef9
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/CMakeLists.txt
-@@ -0,0 +1,14 @@
-+#################################################
-+#
-+# (C) 2010-2011 Serghei Amelian
-+# serghei (DOT) amelian (AT) gmail.com
-+#
-+# Improvements and feedback are welcome
-+#
-+# This file is released under GPL >= 2
-+#
-+#################################################
-+
-+install( FILES
-+ No-Colors.css Name-Colors.css Status-Colors.css Contact-Colors.css
-+ DESTINATION ${DATA_INSTALL_DIR}/kopete/styles/Pidgin/Contents/Resources/Variants )
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css
-new file mode 100644
-index 0000000..7a85556
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Contact-Colors.css
-@@ -0,0 +1,10 @@
-+
-+@import url(../main.css);
-+
-+.inContentTime, .inMetacontact {
-+ color: inherit;
-+}
-+
-+.outContentTime, .outMetacontact {
-+ color: inherit;
-+}
-\ No newline at end of file
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/Makefile.am b/kopete/styles/Pidgin/Contents/Resources/Variants/Makefile.am
-new file mode 100644
-index 0000000..5bbbc31
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Makefile.am
-@@ -0,0 +1,4 @@
-+style_DATA = No-Colors.css Name-Colors.css Status-Colors.css Contact-Colors.css
-+styledir = $(kde_datadir)/kopete/styles/Pidgin/Contents/Resources/Variants
-+
-+EXTRA_DIST = $(style_DATA)
-\ No newline at end of file
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/Name-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/Name-Colors.css
-new file mode 100644
-index 0000000..f9fce97
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Name-Colors.css
-@@ -0,0 +1,13 @@
-+@import url(../main.css);
-+
-+.inActionTime, .inActionMetacontact, .inActionMessage {
-+ color: #000000;
-+}
-+
-+.outActionTime, .outActionMetacontact, .outActionMessage {
-+ color: #000000;
-+}
-+
-+.InternalTime, .InternalDelim, .InternalMessage {
-+ color: #000000;
-+}
-\ No newline at end of file
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css
-new file mode 100644
-index 0000000..d847a19
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/No-Colors.css
-@@ -0,0 +1,22 @@
-+@import url(../main.css);
-+
-+.inContentTime, .inMetacontact {
-+ color: #000000;
-+}
-+
-+.outContentTime, .outMetacontact {
-+ color: #000000;
-+}
-+
-+.inActionTime, .inActionMetacontact, .inActionMessage {
-+ color: #000000;
-+}
-+
-+.outActionTime, .outActionMetacontact, .outActionMessage {
-+ color: #000000;
-+}
-+
-+.InternalTime, .InternalDelim, .InternalMessage {
-+ color: #000000;
-+}
-+
-diff --git a/kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css b/kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css
-new file mode 100644
-index 0000000..373f6d7
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/Variants/Status-Colors.css
-@@ -0,0 +1,9 @@
-+@import url(../main.css);
-+
-+.inContentTime, .inMetacontact {
-+ color: #000000;
-+}
-+
-+.outContentTime, .outMetacontact {
-+ color: #000000;
-+}
-\ No newline at end of file
-diff --git a/kopete/styles/Pidgin/Contents/Resources/main.css b/kopete/styles/Pidgin/Contents/Resources/main.css
-new file mode 100644
-index 0000000..393d2f1
---- /dev/null
-+++ b/kopete/styles/Pidgin/Contents/Resources/main.css
-@@ -0,0 +1,40 @@
-+/* textonly by Mark Fickett, 2004. Poke/edit/maul, but leave credit - think GPL */
-+/* Generally: naib.webhop.org Adium-related: naib.webhop.org/~markfickett/adium */
-+
-+body {
-+ background: #ffffff;
-+}
-+
-+div {
-+ overflow: auto;
-+}
-+
-+a:link { text-decoration: none; }
-+a:visited { text-decoration: none; }
-+a:hover { text-decoration: underline; }
-+a:active { text-decoration: none; }
-+
-+.inMetacontact, .outMetacontact, .inActionMetacontact, .outActionMetacontact, .InternalDelim {
-+ font-weight: bold;
-+}
-+
-+.inContentTime, .inMetacontact {
-+ color: #a82f2f;
-+}
-+
-+.outContentTime, .outMetacontact {
-+ color: #16569e;
-+}
-+
-+.inActionTime, .inActionMetacontact, .inActionMessage {
-+ color: green;
-+}
-+
-+.outActionTime, .outActionMetacontact, .outActionMessage {
-+ color: green;
-+}
-+
-+.InternalTime, .InternalDelim, .InternalMessage {
-+ color: #9400d3;
-+}
-+
-diff --git a/kopete/styles/Pidgin/Makefile.am b/kopete/styles/Pidgin/Makefile.am
-new file mode 100644
-index 0000000..331c9b5
---- /dev/null
-+++ b/kopete/styles/Pidgin/Makefile.am
-@@ -0,0 +1 @@
-+SUBDIRS = Contents
-\ No newline at end of file
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0014-265c466-added-test-of-the-presence-libgadu-with-automake.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0014-265c466-added-test-of-the-presence-libgadu-with-automake.patch
deleted file mode 100644
index 1c5de852..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0014-265c466-added-test-of-the-presence-libgadu-with-automake.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/kopete/protocols/configure.in.in b/kopete/protocols/configure.in.in
-index 0008f19..7a96cc9 100644
---- a/kopete/protocols/configure.in.in
-+++ b/kopete/protocols/configure.in.in
-@@ -27,6 +27,16 @@ fi
- dnl This may need a test still for compatibility
- COMPILE_GADU=true
- use_libgadu_copy=
-+if test "$with_external_libgadu" != "no" ; then
-+ # Check and setup for libgadu
-+ KDE_PKG_CHECK_MODULES(LIBGG, libgadu, [have_libgg=yes], [have_libgg=no])
-+ if test "x$have_libgg" = "xno"; then
-+ COMPILE_GADU=
-+ AC_MSG_RESULT([not found])
-+ else
-+ AC_MSG_RESULT([found])
-+ fi
-+fi
-
- AC_SUBST(LIBGG_INCLUDES)
- AC_SUBST(LIBGG_LIBS)
diff --git a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0015-1bf5123-remove-unnecessary-language.patch b/trinity-base/kopete/files/kopete-3.5.13.1-patches/0015-1bf5123-remove-unnecessary-language.patch
deleted file mode 100644
index a5f9cb40..00000000
--- a/trinity-base/kopete/files/kopete-3.5.13.1-patches/0015-1bf5123-remove-unnecessary-language.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/kopete/protocols/gadu/gadudccserver.cpp b/kopete/protocols/gadu/gadudccserver.cpp
-index 6e6c370..13d61b3 100644
---- a/kopete/protocols/gadu/gadudccserver.cpp
-+++ b/kopete/protocols/gadu/gadudccserver.cpp
-@@ -159,7 +159,7 @@ GaduDCCServer::watcher() {
-
- dccEvent = gg_dcc_watch_fd( dccSock );
- if ( ! dccEvent ) {
-- // connection is fucked
-+ // connection is bad
- // we should try to reenable it
- // closeDCC();
- return;
-diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp
-index 7ec8d2a..75e7174 100644
---- a/kopete/protocols/gadu/gadudcctransaction.cpp
-+++ b/kopete/protocols/gadu/gadudcctransaction.cpp
-@@ -324,14 +324,14 @@ GaduDCCTransaction::watcher() {
-
- dccEvent = gg_dcc_watch_fd( dccSock_ );
- if ( ! dccEvent ) {
-- // connection is fucked
-+ // connection is bad
- closeDCC();
- return;
- }
- switch ( dccEvent->type ) {
- case GG_EVENT_DCC_CLIENT_ACCEPT:
- kdDebug(14100) << " GG_EVENT_DCC_CLIENT_ACCEPT " << endl;
-- // check dccsock->peer_uin, if unknown, fuck it;
-+ // check dccsock->peer_uin, if unknown, oh well;
-
- // is it for us ?
- account = gaduDCC_->account( dccSock_->uin );
diff --git a/trinity-base/kopete/kopete-3.5.13.1.ebuild b/trinity-base/kopete/kopete-3.5.13.1.ebuild
deleted file mode 100644
index 6f3d1fb8..00000000
--- a/trinity-base/kopete/kopete-3.5.13.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdenetwork"
-
-inherit trinity-meta
-
-DESCRIPTION="Trinity multi-protocol IM client"
-KEYWORDS="amd64 x86"
-
-IUSE="jingle gsmlib netmeeting speex kernel_linux"
-PLUGINS="latex autoreplace history contactnotes crypt connectionstatus
- translator nowlistening webpresence texteffect highlight alias
- motionautoaway netmeeting addbookmarks statistics smpppdcs"
-PROTOCOLS="gadu groupwise irc xmpp oscar msn sms sametime winpopup yahoo"
-# unsupported USE="v4l2 opengl xscreensaver ssl emoticons-manager "
-# USE=xmms works only with xmms1
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-REQUIRED_USE="
- jingle? ( xmpp )
- gsmlib? ( sms )
- netmeeting? ( msn )
- speex? ( jingle xmpp )"
-
-# MISSING BOTH_DEPEND
-# x11-libs/libXrender
-# xmpp? ( net-dns/libidn )
-# kernel_linux? ( virtual/opengl )
-# opengl? ( dev-qt/qt-meta[opengl] )
-# xscreensaver? ( x11-libs/libXScrnSaver )
-# xmpp|groupwice? =app-crypt/qca-1.0*
-BOTH_DEPEND="
- jingle? ( dev-libs/glib:2 )
- netmeeting? ( dev-libs/glib:2 )
- webpresence? (
- dev-libs/libxml2
- dev-libs/libxslt )
- jingle? (
- dev-libs/expat
- speex? ( >=media-libs/speex-1.1.6 )
- )
- gsmlib? ( app-mobilephone/gsmlib )
- gadu? ( net-libs/libgadu )
- sametime? ( net-libs/meanwhile )
- media-libs/libv4l
-"
-
-# MISSING DEPEND
-# x11-proto/videoproto
-# kernel_linux? (
-# x11-libs/libXv
-# )
-# xscreensaver? ( x11-proto/scrnsaverproto )
-DEPEND="${BOTH_DEPEND}
- kernel_linux? (
- virtual/os-headers
- )
-"
-
-# MISSING RDEPEND
-# netmeeting? ( net-voip/ekiga )
-# ssl? ( =app-crypt/qca-tls-1.0* )
-RDEPEND="${BOTH_DEPEND}
- crypt? ( app-crypt/gnupg )
- latex? (
- media-gfx/imagemagick
- virtual/latex-base )
- sms? ( !gsmlib? ( || (
- app-mobilephone/smsclient
- app-mobilephone/smssend ) ) )
-"
-
-PATCHES=( "${FILESDIR}/${P}-patches" )
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_with jingle JINGLE)
- $(cmake-utils_use_with gsmlib GSM)
- $(cmake-utils_use_with netmeeting WEBCAM)
- $(cmake-utils_use_with speex SPEEX)
-
- $(cmake-utils_use_build latex KOPETE_PLUGIN_LATEX)
- $(cmake-utils_use_build autoreplace KOPETE_PLUGIN_AUTOREPLACE)
- $(cmake-utils_use_build history KOPETE_PLUGIN_HISTORY)
- $(cmake-utils_use_build contactnotes KOPETE_PLUGIN_CONTACTNOTES)
- $(cmake-utils_use_build crypt KOPETE_PLUGIN_CRYPTOGRAPHY)
- $(cmake-utils_use_build connectionstatus KOPETE_PLUGIN_CONNECTIONSTATUS)
- $(cmake-utils_use_build translator KOPETE_PLUGIN_TRANSLATOR)
- $(cmake-utils_use_build nowlistening KOPETE_PLUGIN_NOWLISTENING)
- $(cmake-utils_use_build webpresence KOPETE_PLUGIN_WEBPRESENCE)
- $(cmake-utils_use_build texteffect KOPETE_PLUGIN_TEXTEFFECT)
- $(cmake-utils_use_build highlight KOPETE_PLUGIN_HIGHLIGHT)
- $(cmake-utils_use_build alias KOPETE_PLUGIN_ALIAS)
- $(cmake-utils_use_build motionautoaway KOPETE_PLUGIN_MOTIONAUTOAWAY)
- $(cmake-utils_use_build netmeeting KOPETE_PLUGIN_NETMEETING)
- $(cmake-utils_use_build addbookmarks KOPETE_PLUGIN_ADDBOOKMARKS)
- $(cmake-utils_use_build statistics KOPETE_PLUGIN_STATISTICS)
- $(cmake-utils_use_build smpppdcs KOPETE_PLUGIN_SMPPPDCS)
-
- $(cmake-utils_use_build gadu KOPETE_PROTOCOL_GADU)
- $(cmake-utils_use_build groupwise KOPETE_PROTOCOL_GROUPWISE)
- $(cmake-utils_use_build irc KOPETE_PROTOCOL_IRC)
- $(cmake-utils_use_build xmpp KOPETE_PROTOCOL_JABBER)
- $(cmake-utils_use_build oscar KOPETE_PROTOCOL_OSCAR)
- $(cmake-utils_use_build msn KOPETE_PROTOCOL_MSN)
- $(cmake-utils_use_build sms KOPETE_PROTOCOL_SMS)
- $(cmake-utils_use_build sametime KOPETE_PROTOCOL_MEANWHILE)
- $(cmake-utils_use_build winpopup KOPETE_PROTOCOL_WINPOPUP)
- $(cmake-utils_use_build yahoo KOPETE_PROTOCOL_YAHOO)
- )
-
- trinity-meta_src_configure
-}