Added the patches from bugs 151089 and 154421 which fix compile failures with the kdeenablefinal and sametime USE flags respectively. Minor whitespace fixes.

(Portage version: 2.1.3_rc6)
 (Signed Manifest commit)

1 files changed, 30 insertions, 12 deletions

diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index c181c3d85308..773e4aed97a9 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnomemeeting-ekiga.patch 2073 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 SHA1 13cdedb9087de6757a11f8bf03dd2a992ae37ffe SHA256 5f908d8491a286db761d4c7e0bc07da05ad0ec7cc5c94bc69533706bbd8d552c
 MD5 9e1eafd475bca7ccb4c199e2fbdca02a files/gnomemeeting-ekiga.patch 2073
 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 files/gnomemeeting-ekiga.patch 2073
@@ -10,10 +13,18 @@ AUX kopete-0.12_alpha1-xscreensaver.patch 778 RMD160 d188f074982191f6f961c7e32ec
 MD5 638d3cc679fc614b53fbeff0c41aa05c files/kopete-0.12_alpha1-xscreensaver.patch 778
 RMD160 d188f074982191f6f961c7e32ec97a79746e73df files/kopete-0.12_alpha1-xscreensaver.patch 778
 SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d files/kopete-0.12_alpha1-xscreensaver.patch 778
+AUX kopete-3.5.5-enable-final-redefines.patch 4914 RMD160 2e1fd23e99077eca324d9de41280ab3566024a86 SHA1 43b4087efc901d941791e6bbe98526d4538b29c0 SHA256 27058d017ddd9ec96fe992cbd0cdc4a8734c1dc9b17ef7c9b8edb4af29245103
+MD5 645a4334dafb7332377c04f07eb24a84 files/kopete-3.5.5-enable-final-redefines.patch 4914
+RMD160 2e1fd23e99077eca324d9de41280ab3566024a86 files/kopete-3.5.5-enable-final-redefines.patch 4914
+SHA256 27058d017ddd9ec96fe992cbd0cdc4a8734c1dc9b17ef7c9b8edb4af29245103 files/kopete-3.5.5-enable-final-redefines.patch 4914
 AUX kopete-3.5.5-icqfix.patch 749 RMD160 129efdaa2bf0dbf88fe4714b4daab5f3606cbc91 SHA1 f3ef29b821ba5f0b62438a7b78a982625e42bd94 SHA256 e165e409343918ac49da0df867f7df34fffa5adfd550ca3079016d0b576a1987
 MD5 33f9ea10ff35fd56a9f3c4cd2b983583 files/kopete-3.5.5-icqfix.patch 749
 RMD160 129efdaa2bf0dbf88fe4714b4daab5f3606cbc91 files/kopete-3.5.5-icqfix.patch 749
 SHA256 e165e409343918ac49da0df867f7df34fffa5adfd550ca3079016d0b576a1987 files/kopete-3.5.5-icqfix.patch 749
+AUX kopete-3.5.5-status-visibility.patch 539 RMD160 669318d277a3be426dbd5f69f6343ca094617fe5 SHA1 39f950365c1cdfb913f2f638724169d0b8181b6d SHA256 3eefe7817999b69c1936c19a7b45bc08d5b181bc3eef71411004ac29e3cceee9
+MD5 552b91dd1c428574ab3c88086ad20815 files/kopete-3.5.5-status-visibility.patch 539
+RMD160 669318d277a3be426dbd5f69f6343ca094617fe5 files/kopete-3.5.5-status-visibility.patch 539
+SHA256 3eefe7817999b69c1936c19a7b45bc08d5b181bc3eef71411004ac29e3cceee9 files/kopete-3.5.5-status-visibility.patch 539
 AUX kopete-3.5.6-cryptobug.patch 1000 RMD160 dd935e379fe667f032a0256284aa5d40518e0610 SHA1 2e1a229bc4d9b03f48c143e9179b51c7e3393ac0 SHA256 9b6d6a810d19965cc3c2f1fa974edc1e8d7aa73faf0166e95e632d36132e34ff
 MD5 8e2130425d317657b48a60a5475f2182 files/kopete-3.5.6-cryptobug.patch 1000
 RMD160 dd935e379fe667f032a0256284aa5d40518e0610 files/kopete-3.5.6-cryptobug.patch 1000
@@ -26,10 +37,10 @@ DIST kdenetwork-3.5-patchset-01.tar.bz2 2986 RMD160 288113734e7767a7526f4b9311c1
 DIST kdenetwork-3.5.5.tar.bz2 9235564 RMD160 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 SHA1 a95bac9de9770f551870fb73ce456d779ba36878 SHA256 c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f
 DIST kdenetwork-3.5.6.tar.bz2 9245468 RMD160 2f93badae14fab4d7911c74d2f427e85ca104827 SHA1 494c67139415e3b18a1d5d054d872e90b8289832 SHA256 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e
 DIST kdenetwork-3.5.7.tar.bz2 9370098 RMD160 85b2780b411f91afb7e2dd6670500c9046b8b591 SHA1 f5585acd047a85fb512652decd7876a780dc269a SHA256 979d93802693a76e2e4fc0f7bdd4c44bde48296f842619a2b59100d94346d596
-EBUILD kopete-3.5.5-r2.ebuild 4070 RMD160 7a6642d0886cfe8257bb246506576f903eb30501 SHA1 b9ee2968d6c951f35ef9153f361c6b7b6e25e5eb SHA256 6af35c4d7807919b0b1086b1c2fd22906df3400288d9bcce196339084478297c
-MD5 d839a804dc25c7248ab82a64e8b10b77 kopete-3.5.5-r2.ebuild 4070
-RMD160 7a6642d0886cfe8257bb246506576f903eb30501 kopete-3.5.5-r2.ebuild 4070
-SHA256 6af35c4d7807919b0b1086b1c2fd22906df3400288d9bcce196339084478297c kopete-3.5.5-r2.ebuild 4070
+EBUILD kopete-3.5.5-r2.ebuild 4218 RMD160 429f8b080c484aaf5fc60db3c2e816f87188ea2b SHA1 fd7804e3298de23a3db4791864e7203d398cdda8 SHA256 657ad64088f34849885944b457d3eeb536f6d78a63121554ff572901a73ff58c
+MD5 06dce3dd62efa352d519aa3ebaa68665 kopete-3.5.5-r2.ebuild 4218
+RMD160 429f8b080c484aaf5fc60db3c2e816f87188ea2b kopete-3.5.5-r2.ebuild 4218
+SHA256 657ad64088f34849885944b457d3eeb536f6d78a63121554ff572901a73ff58c kopete-3.5.5-r2.ebuild 4218
 EBUILD kopete-3.5.6-r1.ebuild 4227 RMD160 86caccb9fb7afc32ea863271463c669aaacf0e48 SHA1 2f08625a4baf274ee9e38a3c072e9bdcfa1ccf1a SHA256 d5121616156ffbef4b49e45c69e9cf8a7b95e2a591fa86d562732b5ba7bbf042
 MD5 c6f9a4e9310028e9d42e4ce87f4cccf2 kopete-3.5.6-r1.ebuild 4227
 RMD160 86caccb9fb7afc32ea863271463c669aaacf0e48 kopete-3.5.6-r1.ebuild 4227
@@ -38,18 +49,18 @@ EBUILD kopete-3.5.6-r2.ebuild 4277 RMD160 5827365b86fe616cf4b1756bda7ea7ee3054ca
 MD5 9e9a24a57126e08fbe712e3c76a3e092 kopete-3.5.6-r2.ebuild 4277
 RMD160 5827365b86fe616cf4b1756bda7ea7ee3054caf5 kopete-3.5.6-r2.ebuild 4277
 SHA256 1491380f8a3538db747add430715caee3593d425232db3f7d5f4232882e6695d kopete-3.5.6-r2.ebuild 4277
-EBUILD kopete-3.5.6.ebuild 4012 RMD160 fb77a1fa86f56d9e4a012289f6da19dc9daa23de SHA1 31cdfeefda62e60705bd58e06c4f373ad71d16b9 SHA256 6f53da2ff6bc034d71767cb8d629796b4b0fe34304bf3d42551d93a80a0a3925
-MD5 1bddd461ee57bdeae2c465651c9246ec kopete-3.5.6.ebuild 4012
-RMD160 fb77a1fa86f56d9e4a012289f6da19dc9daa23de kopete-3.5.6.ebuild 4012
-SHA256 6f53da2ff6bc034d71767cb8d629796b4b0fe34304bf3d42551d93a80a0a3925 kopete-3.5.6.ebuild 4012
+EBUILD kopete-3.5.6.ebuild 4011 RMD160 e2fcdd7320ccdb9e61d5299452eda787b17a37e9 SHA1 4ff05f8aacf9412937284ed59523a7555394be3f SHA256 4beca63dfce6656996698fdaedb0146272d31255abb8cf21657e4e9f14682006
+MD5 b0d48d6a9d62d7d5932debb8ece821ae kopete-3.5.6.ebuild 4011
+RMD160 e2fcdd7320ccdb9e61d5299452eda787b17a37e9 kopete-3.5.6.ebuild 4011
+SHA256 4beca63dfce6656996698fdaedb0146272d31255abb8cf21657e4e9f14682006 kopete-3.5.6.ebuild 4011
 EBUILD kopete-3.5.7.ebuild 4029 RMD160 9d36741559bda22eb229ed1ed5f8c52dafce0775 SHA1 f73eeffe200b0869034da58b6bf0ea5d22887309 SHA256 1d0f5be0b4c19133c5b45e82c0983ccad3dbcc198e606ba77b7e6ac635d84593
 MD5 a967d60424d43fda0afa27a465ba355e kopete-3.5.7.ebuild 4029
 RMD160 9d36741559bda22eb229ed1ed5f8c52dafce0775 kopete-3.5.7.ebuild 4029
 SHA256 1d0f5be0b4c19133c5b45e82c0983ccad3dbcc198e606ba77b7e6ac635d84593 kopete-3.5.7.ebuild 4029
-MISC ChangeLog 16696 RMD160 ae0e81e215a362dba79aae38f681f93eaa8d0787 SHA1 bda8a5a600bee78f38b9c986f92ee79b133eb3d1 SHA256 d53c63141d55a7fd5f0945a00ce50c4b393f993072422675365d6813b9b1c20e
-MD5 a32b9017899f6cecb5bacdd90e0c0ecf ChangeLog 16696
-RMD160 ae0e81e215a362dba79aae38f681f93eaa8d0787 ChangeLog 16696
-SHA256 d53c63141d55a7fd5f0945a00ce50c4b393f993072422675365d6813b9b1c20e ChangeLog 16696
+MISC ChangeLog 17067 RMD160 b94571d69f98873ad9f2510cbc1519ecd3e191a0 SHA1 c97b31d0fda8d7c9a96e26cbe64318cb1d7af63d SHA256 cd5efa7a7b840cbe2e0c8f08e516ecf65e2334d4bbcc1bb785dacabf450f0a3a
+MD5 f220ef9f399bdc5b9bfd888eee1830d9 ChangeLog 17067
+RMD160 b94571d69f98873ad9f2510cbc1519ecd3e191a0 ChangeLog 17067
+SHA256 cd5efa7a7b840cbe2e0c8f08e516ecf65e2334d4bbcc1bb785dacabf450f0a3a ChangeLog 17067
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -69,3 +80,10 @@ SHA256 ecaf8d329908f4d5793e6d91319908764cafce446759c0f51fe509f877cd8219 files/di
 MD5 f435a29213024913dd173e76822408e0 files/digest-kopete-3.5.7 533
 RMD160 eb1a8bff3d55a0e56642da2e55d5de1dea318fbb files/digest-kopete-3.5.7 533
 SHA256 a8b6c61efc9d4e1936c662475233e93b2b58951ede88b2e620c2598b519455c0 files/digest-kopete-3.5.7 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGkCdlCkvF58q80IkRAnf9AJ0ayITz+Y99Qp7X3iPPp2B6sjQnqwCfVWfC
+8aA333M5uABjRwmFxBGu//g=
+=pXIc
+-----END PGP SIGNATURE-----