Properly process plugin exclude list, bug 424071

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xB6C5F7DE

4 files changed, 103 insertions, 15 deletions

diff --git a/kde-base/libkipi/ChangeLog b/kde-base/libkipi/ChangeLog
index 531229b99e38..a8802b6fa6e4 100644
--- a/kde-base/libkipi/ChangeLog
+++ b/kde-base/libkipi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkipi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/ChangeLog,v 1.137 2013/02/09 20:12:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/ChangeLog,v 1.138 2013/02/17 20:20:10 dilfridge Exp $
+
+*libkipi-4.10.0-r1 (17 Feb 2013)
+
+  17 Feb 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkipi-4.10.0-r1.ebuild, +files/libkipi-4.10.0-uname.patch:
+  Properly process plugin exclude list, bug 424071
 
   09 Feb 2013; Andreas K. Huettel <dilfridge@gentoo.org> libkipi-4.10.0.ebuild:
   Remove digikam workaround, not needed anymore
diff --git a/kde-base/libkipi/Manifest b/kde-base/libkipi/Manifest
index acb37078c358..bc3b9e1a2403 100644
--- a/kde-base/libkipi/Manifest
+++ b/kde-base/libkipi/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libkipi-4.10.0-uname.patch 2811 SHA256 3744a5932e5389d44d1acec8d8dce89ca9dc2b8ad4ad428183e531df1aa1dc16 SHA512 d584f9bcd95c4fb7a0622da7d6f514a969eaf7172011b4252a126b5ec02f66a0a9bdd83a870ac5db121b93492065b10b17a9f3c62786665bd377a0e03e236dd6 WHIRLPOOL 27d37d2bdf3846e4568c20f3245efd168f45f1ae0cd2be123f2a30765dd83139c036414fe0e00811e59cfb784d300a3e63f15d453fab81bb7ed94f726fb2788b
 DIST libkipi-4.10.0.tar.xz 93652 SHA256 20146038df595777f494a388286e8abe5a7e1a8119b0ecceb68d389596d4abec SHA512 47991d875fbb80aa441584862e034c7d7c422b8616812e10509d058e06f8ba295329e8bd8b555d30836a28dc74f252a3f0820e0372be26a3ae1afce3fcce762d WHIRLPOOL 2e219f170be39ef149fe63b4494abfefcff374d8b1949a6a7ebe7d86a108db3b6fdd3d55173862b8f3c6ea42acf91025e0725b55ac78bd4b59026361a72b8214
 DIST libkipi-4.9.5.tar.xz 76744 SHA256 887f6534d80d89810948699ce1a7fb2de54205c18f4d977bf4ae8d7e6f43aa79 SHA512 e4c7233b9d9ae5b4043711c69dbc56f20ed1ca99a5b2c1d735a6fc88140ec3f27bdf311282f3a57ba982504d03fb799a472d3459ef4bc293428269810594d5a3 WHIRLPOOL f7d8294c4a0cd2c9558de54bb0b5e5a92fbc7dd1dd7627c63c9ee10c7d593f6524c5747dbb594afc47c863c41189349b04edc812396fb41c00f0bcd7a35b82f5
+EBUILD libkipi-4.10.0-r1.ebuild 444 SHA256 f53e21171e65965ed626baa0cbcd1619380ef0202eb020b343cdcf897880c1ae SHA512 c3dee0527fa6ec65a7f15e133ea988c673a8be85f8220f432ffaf88dea3dd25cac4aef94d19b38cf3e74065d3e2df293d05af1af1066b72f7246334cd1dde602 WHIRLPOOL 160891df523308bdaf0b7fb31da2111cabe7da4faa32b1faa9174ce19409fbfd5878b9b33ceb4bf269051e031a2842e3d74c71e0829dbbcaeca512bd7563a320
 EBUILD libkipi-4.10.0.ebuild 389 SHA256 5d8d8171268e49dcf2d05523d0afe2d419eebd98ed63d1694598ac6293f110fb SHA512 80a14f2cfa029dff097a2680a9c8e191d6566b30e35a904101f01199d6a3f5cf18d07ff7a9b4c2649d72663df796a07cd26b1805b55a7da6fb66756a25e83bc0 WHIRLPOOL b1d76dc8dd677cd06aeaffbf0afaa7d18f5a7aba22aba5826db5354025751532aa00a14eb8d274e6ae194af87b8fdd1c4c67d71bc3483cfb98564cda3d8bfe0b
 EBUILD libkipi-4.9.5.ebuild 379 SHA256 9f4ae25684880300bf0e743f342f49a67f1c5d2b396d4f3eacfafa6a040650b1 SHA512 61e8af2062a3eeda779ca22e08577008fdb5631e09f778729b547b9a665b6616ea6169479f4524165391e0341bf2d4dd06aba03ba31116c4f1f77de065315c85 WHIRLPOOL c065e83d57ae340e71fb8f6065e9fec78baac2d576155f3ebe1d1092ed7f1970b3be49191226ce3f250ffd80520d321c5973bbfba995895073f3d788b66e954f
-MISC ChangeLog 16231 SHA256 3f02ac60c5e5f122178dedc3ea7d59df5ef5664e5aca321a09f132d89b37c3cd SHA512 b880d85a038ef803b5b09749b3b208f74ab7a78cd376e6b8d83533027e427db6fe8115759aa0584d08a67f51d433e0a543bab11522b35f523238f101cf767b36 WHIRLPOOL f560d97092607f232c6e6185160d294df5329fca13cd75084660533a4187413deaa9f034409179f0aa490a822c166c9794bb91f6b82656ddc36d11bd700576d8
+MISC ChangeLog 16438 SHA256 d33ccfcada167b4bf6e8da2b049a003a5bd1681b1e4120f877a31eb31847f580 SHA512 360cfec7081ba00dce3acef85c7213d31b1ec7fff1a6053c314998904a3cdcfdc0cb78641cda5d6fc2918f04002e7d2db5baa17b75f32b9bfeba056d50292b03 WHIRLPOOL 8faa5fe1736dfa2bd7046f8ae458c8933caf65ddf73366bc9ae11aa828428774de03edad1dd4cff3170551f1d104c4e4eb1d4c0b701a70c96ac6ccf20ad8677a
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFq3OAAoJENwGBM22xffeTggP/37GpE/mFLTP7K8pouyHuLK1
-wALio7EbWIHCUb88cmzt5t74CW/H4jJstf+/Mb2xBFfU3VN1lAZyIGWCBKWo2u9G
-LbkfYij7Na043eU9ZXpYv2uNAdRshF/XY7cADxuT8LXGF0ES8L4uiMYEQ3ZH49gD
-DKXEGpyW5sGsAHk2PhBRQjJXYPkIcaNoe1LH29s+Kn8IBdKhiCTm8/E5MF1MU6UR
-eGryWQqaNjcVB0wtOkhwQy1KQbeu3an558xo5z7Btuf8nqg3QKcE2YzJAl+H8VzB
-DUmt8Sq2x5YUJIo5xMxHkuVwqrgCOGp3/4CONBooPA6rdCIJkQytGfO+mg0lZBxe
-mkB6FHtLew5SmyTcAMVG+uLW1VhorUxNRPuDP2KKoXw8voZM3hfjifLyWf8CDCi8
-hAPuStyaHsVpIijcj/HT5/Dk64TEVsJdLlP4qhO9E4bvr/NQ8bBZI/Vq/WODNpRa
-v/OjGRsWIZqsGYzRTpfZMUfNx5IQgFHJY5wu54AmbE06M/VQ0a1VefjvjiVC4TT2
-AOTA79SzlHrEqke3wV5I7SIDoWpLC2974zI1eGJ5Lm56vdIdz7hqbGXZ8g3YXi1w
-vbvr1gb23XOd7EZMOia/tNHVuO6I448aOO0dSbrSUGEXsElhg9EB0mSvKT3wHBmO
-+oJ7OZSY/43eE7gmYl88
-=wTQT
+iQIcBAEBCAAGBQJRITuQAAoJENwGBM22xffeakEQAJgjIfP6xy01SW4Scut3Fk6L
+/fzDWUonLev6+t6KdG6UJ5l85OSuNvr5XaCuT+6PcNycmK2z/84PjXmEx3uADPtx
+CYCgQVMUmGx+vh9B5WJi7UHi1J1rC3JxLXvPaBx0BGjMXlp1nQf5rXHl/TAnCyF/
+sOmoVWkDdM1lL5a2GVoGDgBngvU2UUttOXsVDJgindus6DyqnGVVbEQImfuxrYjB
+GzHy8jQeQ+Pcv45GLUtmqMXt/5dY/sN9Tx4rmhkucLq8ncYo0sU9WHPmqlOxwmR/
+pDwMJxY8QkJrntMs9dgMZAYsC4hYMFtj4V0UPmzQp9o8oLD3EpJC+fmMwsOyPpok
+gL/GUJmsqw588SaBMTAcGvfWUZK94ipMjATr9b0j1LnVWsbb1ciWf9F9hYEYRb4Q
+PKzQ+6KfFtmACDRq7iI6cn/Ar38A+pql8Gf+0xgDz5dnRPt9uIak84u1XBtbNtO7
+Qp9AFtV1tNcSUnz31g+X7l5JPrXhy+AGbErmEb0M8x0DMT5JBPVn1ypEc9wjPvNV
+x0IwILT3jCllldJq9beKdIfAjxwk03N+lp65ZrgH3aDbIvj0oYe0wXnjPmRTm6bR
+rwhRN6EAvtYuTu6fHORjRWdO7OZwTKbCYKi4Lq+cfZNl1OHcM60+jNHfcMxLzs3L
+i1D2XLTZc1opxFvEZVcK
+=Wl38
 -----END PGP SIGNATURE-----
diff --git a/kde-base/libkipi/files/libkipi-4.10.0-uname.patch b/kde-base/libkipi/files/libkipi-4.10.0-uname.patch
new file mode 100644
index 000000000000..68cb96aa47a3
--- /dev/null
+++ b/kde-base/libkipi/files/libkipi-4.10.0-uname.patch
@@ -0,0 +1,67 @@
+commit 0e25e3ee73cf4048b6d97ccc496bad5b1a1fd577
+Author: Victor Dodon <dodonvictor@gmail.com>
+Date:   Mon Jan 28 10:57:46 2013 +0200
+
+    Check the untranslatedGenericName service property when loading plugins
+    
+    BUGS: 302740
+    CCMAIL: dilfridge@gentoo.org
+    CCMAIL: caulier.gilles@gmail.com
+
+diff --git a/libkipi/pluginloader.cpp b/libkipi/pluginloader.cpp
+index 496970b..5b27c63 100644
+--- a/libkipi/pluginloader.cpp
++++ b/libkipi/pluginloader.cpp
+@@ -15,7 +15,7 @@
+  *         <a href="mailto:andi dot clemens at googlemail dot com">andi dot clemens at googlemail dot com</a>
+  * @author Copyright (C) 2009      by Aleix Pol Gonzalez
+  *         <a href="mailto:aleixpol at kde dot org">aleixpol at kde dot org</a>
+- * @author Copyright (C) 2012 by Victor Dodon
++ * @author Copyright (C) 2012-2013 by Victor Dodon
+  *         <a href="mailto:dodonvictor at gmail dot com">dodonvictor at gmail dot com</a>
+  *
+  * This program is free software; you can redistribute it
+@@ -304,19 +304,20 @@ void PluginLoader::init()
+     {
+         KService::Ptr service   = *iter;
+         QString name            = service->name();
++        QString uname           = service->untranslatedGenericName();
+         QString library         = service->library();
+         QStringList reqFeatures = service->property(QString::fromLatin1("X-KIPI-ReqFeatures")).toStringList();
+         int binVersion          = service->property(QString::fromLatin1("X-KIPI-BinaryVersion")).toInt();
+ 
+-        if (library.isEmpty() || name.isEmpty())
++        if (library.isEmpty() || uname.isEmpty())
+         {
+             kWarning(51001) << "Plugin had an empty name or library file - this should not happen.";
+             continue;
+         }
+ 
+-        if (d->ignoredPlugins.contains(name))
++        if (d->ignoredPlugins.contains(uname))
+         {
+-            kDebug(51001) << "Plugin " << name << " is in the ignore list from host application";
++            kDebug(51001) << "Plugin " << name << " (generic name: " << uname << ") is in the ignore list from host application";
+             continue;
+         }
+ 
+@@ -343,7 +344,7 @@ void PluginLoader::init()
+             }
+         }
+ 
+-        bool load = group.readEntry(name, true);
++        bool load = group.readEntry(uname, true);
+ 
+         if (!appHasAllReqFeatures)
+         {
+diff --git a/tests/kxmlhelloworld/plugin/kipiplugin_kxmlhelloworld.desktop.cmake b/tests/kxmlhelloworld/plugin/kipiplugin_kxmlhelloworld.desktop.cmake
+index 386e5cd..6a072df 100644
+--- a/tests/kxmlhelloworld/plugin/kipiplugin_kxmlhelloworld.desktop.cmake
++++ b/tests/kxmlhelloworld/plugin/kipiplugin_kxmlhelloworld.desktop.cmake
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++UntranslatedGenericName=KXMLHelloWorld
+ Name=KXMLHelloWorld
+ Name[ca]=KXMLHelloWorld
+ Name[da]=KXMLHelloWorld
diff --git a/kde-base/libkipi/libkipi-4.10.0-r1.ebuild b/kde-base/libkipi/libkipi-4.10.0-r1.ebuild
new file mode 100644
index 000000000000..584771e95536
--- /dev/null
+++ b/kde-base/libkipi/libkipi-4.10.0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkipi/libkipi-4.10.0-r1.ebuild,v 1.1 2013/02/17 20:20:10 dilfridge Exp $
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="A library for image plugins accross KDE applications."
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+PATCHES=( "${FILESDIR}/${PN}-4.10.0-uname.patch" )