kde-apps/kopete: Fix configure w/ KDE4_QGpgme

Update gpgme++ and qgpgme references.

3 files changed, 64 insertions, 2 deletions

diff --git a/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch b/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch
new file mode 100644
index 00000000000..59e2a3752e2
--- /dev/null
+++ b/kde-apps/kopete/files/kopete-17.04.0-kde4qgpgme.patch
@@ -0,0 +1,56 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,8 +98,8 @@
+ macro_optional_find_package(QJSON)
+ macro_log_feature(QJSON_FOUND "QJSON" "JSON handling library for Qt" "http://qjson.sourceforge.net/" FALSE "" "Required for the Jabber protocol")
+ 
+-macro_optional_find_package(QGpgme)
+-macro_log_feature(QGPGME_FOUND "QGpgme" "QGpgME library (from kdepimlibs)" "http://www.kde.org/" FALSE "" "Required for the Cryptography plugin")
++macro_optional_find_package(KDE4_QGpgme)
++macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgme" "KDE4_QGpgME library (from kdepimlibs)" "http://www.kde.org/" FALSE "" "Required for the Cryptography plugin")
+ 
+ macro_optional_find_package(Sqlite)
+ macro_log_feature(SQLITE_FOUND "Sqlite" "SQLite is a Binary-Database" "http://www.sqlite.org/" FALSE "" "Required for the Statistic plugin")
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -74,6 +74,6 @@
+ if (WITH_otr AND LIBOTR_FOUND)
+   add_subdirectory ( otr )
+ endif (WITH_otr AND LIBOTR_FOUND)
+-if (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND)
++if (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND)
+   add_subdirectory ( cryptography )
+-endif (WITH_cryptography AND KLEOPATRA_FOUND AND QGPGME_FOUND)
++endif (WITH_cryptography AND KLEOPATRA_FOUND AND KDE4_QGPGME_FOUND)
+--- a/plugins/cryptography/CMakeLists.txt
++++ b/plugins/cryptography/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ 
+ kde4_add_plugin(kopete_cryptography ${kopete_cryptography_PART_SRCS})
+ 
+-target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY}  ${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(kopete_cryptography ${QT_QTGUI_LIBRARY}  ${KDE4_KDECORE_LIBS} kopete ${KLEOPATRA_LIBRARIES} ${KDE4_KABC_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+ 
+ install(TARGETS kopete_cryptography  DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+--- a/plugins/cryptography/cryptographyplugin.cpp
++++ b/plugins/cryptography/cryptographyplugin.cpp
+@@ -52,12 +52,12 @@
+ #include <kleo/signjob.h>
+ #include <kleo/keylistjob.h>
+ #include <kleo/job.h>
+-#include <gpgme++/decryptionresult.h>
+-#include <gpgme++/verificationresult.h>
+-#include <gpgme++/keylistresult.h>
+-#include <gpgme++/signingresult.h>
+-#include <gpgme++/encryptionresult.h>
+-#include <gpgme++/key.h>
++#include <kde4_gpgme++/decryptionresult.h>
++#include <kde4_gpgme++/verificationresult.h>
++#include <kde4_gpgme++/keylistresult.h>
++#include <kde4_gpgme++/signingresult.h>
++#include <kde4_gpgme++/encryptionresult.h>
++#include <kde4_gpgme++/key.h>
+ 
+ // kabc stuff
+ #include <kabc/addressbook.h>
diff --git a/kde-apps/kopete/kopete-17.04.49.9999.ebuild b/kde-apps/kopete/kopete-17.04.49.9999.ebuild
index d51b05e7897..fde591c1fcd 100644
--- a/kde-apps/kopete/kopete-17.04.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-17.04.49.9999.ebuild
@@ -64,7 +64,7 @@ testbed winpopup +xmpp yahoo zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
-	$(add_kdeapps_dep kdepimlibs)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.10_p20160611)
 	dev-libs/libpcre
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	kde-frameworks/kdelibs:4[zeroconf?]
@@ -106,6 +106,7 @@ COMMONDEPEND="
 	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
+	!=kde-apps/kdepimlibs-4.14.11_pre20160211*
 	jingle? ( media-libs/speex )
 	latex? (
 		virtual/imagemagick-tools
@@ -119,6 +120,8 @@ DEPEND="${COMMONDEPEND}
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-17.04.0-kde4qgpgme.patch" )
+
 src_configure() {
 	local x x2
 	# Handle common stuff
diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index d51b05e7897..fde591c1fcd 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -64,7 +64,7 @@ testbed winpopup +xmpp yahoo zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
-	$(add_kdeapps_dep kdepimlibs)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.10_p20160611)
 	dev-libs/libpcre
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	kde-frameworks/kdelibs:4[zeroconf?]
@@ -106,6 +106,7 @@ COMMONDEPEND="
 	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
+	!=kde-apps/kdepimlibs-4.14.11_pre20160211*
 	jingle? ( media-libs/speex )
 	latex? (
 		virtual/imagemagick-tools
@@ -119,6 +120,8 @@ DEPEND="${COMMONDEPEND}
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-17.04.0-kde4qgpgme.patch" )
+
 src_configure() {
 	local x x2
 	# Handle common stuff