@@ -, +, @@
app-crypt/gpgme[cxx,qt5]
---
...mlibs-4.14.10-gpgme++_and_qgpgme_renaming.patch | 334 ++++++++++++++++
.../files/kdepimlibs-4.14.10-gpgme-1.8.patch | 439 +++++++++++++++++++++
...1_pre20160211-gpgme++_and_qgpgme_renaming.patch | 333 ++++++++++++++++
.../kdepimlibs-4.14.11_pre20160211-gpgme-1.8.patch | 439 +++++++++++++++++++++
kde-apps/kdepimlibs/kdepimlibs-4.14.10-r4.ebuild | 73 ++++
.../kdepimlibs-4.14.11_pre20160211-r4.ebuild | 77 ++++
6 files changed, 1695 insertions(+)
create mode 100644 kde-apps/kdepimlibs/files/kdepimlibs-4.14.10-gpgme++_and_qgpgme_renaming.patch
create mode 100644 kde-apps/kdepimlibs/files/kdepimlibs-4.14.10-gpgme-1.8.patch
create mode 100644 kde-apps/kdepimlibs/files/kdepimlibs-4.14.11_pre20160211-gpgme++_and_qgpgme_renaming.patch
create mode 100644 kde-apps/kdepimlibs/files/kdepimlibs-4.14.11_pre20160211-gpgme-1.8.patch
create mode 100644 kde-apps/kdepimlibs/kdepimlibs-4.14.10-r4.ebuild
create mode 100644 kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r4.ebuild
--- a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10-gpgme++_and_qgpgme_renaming.patch
+++ a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10-gpgme++_and_qgpgme_renaming.patch
@@ -0,0 +1,334 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -74,7 +74,7 @@
+ find_package(Gpgme REQUIRED)
+ # configure macros
+ if (GPGME_FOUND)
+- include (gpgme++/ConfigureChecks.cmake)
++ include (kde4_gpgme++/ConfigureChecks.cmake)
+ endif()
+
+ if (NOT KDEPIM_ONLY_KLEO)
+@@ -139,8 +139,8 @@
+ ############### Now, we add the KDEPIMLibs components ###############
+ # These targets will always be built
+ add_subdirectory(cmake)
+-add_subdirectory(gpgme++)
+-add_subdirectory(qgpgme)
++add_subdirectory(kde4_gpgme++)
++add_subdirectory(kde4_qgpgme)
+
+ if (NOT KDEPIM_ONLY_KLEO)
+ add_subdirectory(kabc)
+--- /KdepimLibsConfig.cmake.in
++++ /KdepimLibsConfig.cmake.in
+@@ -75,7 +75,6 @@
+ _kdepimlibs_set_lib_vars(AKONADI_NOTES akonadi-notes)
+ _kdepimlibs_set_lib_vars(AKONADI_SOCIALUTILS akonadi-socialutils)
+ _kdepimlibs_set_lib_vars(AKONADI_XML akonadi-xml)
+-_kdepimlibs_set_lib_vars(GPGMEPP gpgmepp)
+ _kdepimlibs_set_lib_vars(KABC kabc)
+ _kdepimlibs_set_lib_vars(KALARMCAL kalarmcal)
+ if (NOT KDEPIMLIBS_NO_KCAL)
+@@ -85,6 +84,8 @@
+ endif()
+ _kdepimlibs_set_lib_vars(KCALCORE kcalcore)
+ _kdepimlibs_set_lib_vars(KCALUTILS kcalutils)
++_kdepimlibs_set_lib_vars(KDE4_GPGMEPP kde4_gpgmepp)
++_kdepimlibs_set_lib_vars(KDE4_QGPGME kde4_qgpgme)
+ _kdepimlibs_set_lib_vars(KHOLIDAYS kholidays)
+ _kdepimlibs_set_lib_vars(KIMAP kimap)
+ _kdepimlibs_set_lib_vars(KLDAP kldap)
+@@ -101,5 +102,4 @@
+ _kdepimlibs_set_lib_vars(KXMLRPCCLIENT kxmlrpcclient)
+ _kdepimlibs_set_lib_vars(MAILTRANSPORT mailtransport)
+ _kdepimlibs_set_lib_vars(MICROBLOG microblog)
+-_kdepimlibs_set_lib_vars(QGPGME qgpgme)
+ _kdepimlibs_set_lib_vars(SYNDICATION syndication)
+--- /Mainpage.dox
++++ /Mainpage.dox
+@@ -73,7 +73,7 @@
+ * - microblog.
+ * A library for microblogging.
+ *
+- * - QGpgME.
++ * - QGpgME.
+ * A C++ wrapper for gpgme.
+ *
+ * - syndication.
+--- /cmake/modules/FindKDE4_QGpgme.cmake
++++ /cmake/modules/FindKDE4_QGpgme.cmake
+@@ -1,9 +1,9 @@
+-# - Try to find the QGpgME library
++# - Try to find the KDE4_QGpgME library
+ # Once done this will define
+ #
+-# QGPGME_FOUND
+-# QGPGME_LIBRARIES
+-# QGPGME_INCLUDE_DIR
++# KDE4_QGPGME_FOUND
++# KDE4_QGPGME_LIBRARIES
++# KDE4_QGPGME_INCLUDE_DIR
+
+ # What we do here is a bit simplictic, but it's no worse than what
+ # people were using in kdepim up to now...
+@@ -12,25 +12,25 @@
+
+ if(GPGME_FOUND)
+
+- find_library(_QGPGME_EXTRA_LIBRARY gpgme++
++ find_library(_KDE4_QGPGME_EXTRA_LIBRARY kde4_gpgme++
+ HINTS ${GPGME_LIBRARY_DIR})
+
+- find_library(QGPGME_LIBRARY qgpgme
++ find_library(KDE4_QGPGME_LIBRARY kde4_qgpgme
+ HINTS ${GPGME_LIBRARY_DIR})
+
+- if (QGPGME_LIBRARY)
++ if (KDE4_QGPGME_LIBRARY)
+ # get the libdirectory and then go one up
+- get_filename_component(_QGPGME_PREFIX "${QGPGME_LIBRARY}" PATH)
+- get_filename_component(_QGPGME_PREFIX "${_QGPGME_PREFIX}" PATH)
+- find_path(QGPGME_INCLUDE_DIR qgpgme/qgpgme_export.h
+- HINTS "${_QGPGME_PREFIX}/include" )
++ get_filename_component(_KDE4_QGPGME_PREFIX "${KDE4_QGPGME_LIBRARY}" PATH)
++ get_filename_component(_KDE4_QGPGME_PREFIX "${_KDE4_QGPGME_PREFIX}" PATH)
++ find_path(KDE4_QGPGME_INCLUDE_DIR kde4_qgpgme/qgpgme_export.h
++ HINTS "${_KDE4_QGPGME_PREFIX}/include" )
+ endif()
+
+- set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES})
++ set(KDE4_QGPGME_LIBRARIES ${KDE4_QGPGME_LIBRARY} ${_KDE4_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES})
+
+ endif()
+
+ include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(QGpgme DEFAULT_MSG QGPGME_LIBRARY QGPGME_INCLUDE_DIR _QGPGME_EXTRA_LIBRARY)
++find_package_handle_standard_args(KDE4_QGpgme DEFAULT_MSG KDE4_QGPGME_LIBRARY KDE4_QGPGME_INCLUDE_DIR _KDE4_QGPGME_EXTRA_LIBRARY)
+
+-mark_as_advanced(QGPGME_LIBRARY _QGPGME_EXTRA_LIBRARY QGPGME_INCLUDE_DIR)
++mark_as_advanced(KDE4_QGPGME_LIBRARY _KDE4_QGPGME_EXTRA_LIBRARY KDE4_QGPGME_INCLUDE_DIR)
+--- /kde4_gpgme++/CMakeLists.txt
++++ /kde4_gpgme++/CMakeLists.txt
+@@ -1,5 +1,5 @@
+-project( gpgmepp )
+-#KDE4_NO_ENABLE_FINAL(gpgmepp)
++project( kde4_gpgmepp )
++#KDE4_NO_ENABLE_FINAL(kde4_gpgmepp)
+ if (MINGW)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mms-bitfields")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mms-bitfields")
+@@ -15,7 +15,7 @@
+ ## Unix: gpgme
+ ## We're building corresponding gpgme++ flavours
+
+-set(gpgme_LIB_SRCS
++set(kde4_gpgme_LIB_SRCS
+ exception.cpp
+ context.cpp key.cpp
+ trustitem.cpp
+@@ -43,36 +43,37 @@
+ configuration.cpp
+ )
+
+-set( _gpgmepp_version 2.8.0 )
+-set( _gpgmepp_soversion 2 )
++set( _kde4_gpgmepp_version 2.8.0 )
++set( _kde4_gpgmepp_soversion 2 )
+
+ set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ${Boost_INCLUDE_DIR} )
+
+ if ( GPGME_VANILLA_FOUND )
+- add_library( gpgmepp ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_vanilla.cpp )
+- generate_export_header(gpgmepp EXPORT_FILE_NAME gpgme++_export.h)
++ add_library( kde4_gpgmepp ${LIBRARY_TYPE} ${kde4_gpgme_LIB_SRCS} context_vanilla.cpp )
++ generate_export_header(kde4_gpgmepp BASE_NAME gpgmepp EXPORT_FILE_NAME gpgme++_export.h)
+
+- target_link_libraries( gpgmepp ${GPGME_VANILLA_LIBRARIES} )
+- set_target_properties( gpgmepp PROPERTIES
+- VERSION ${_gpgmepp_version}
+- SOVERSION ${_gpgmepp_soversion}
+- OUTPUT_NAME gpgme++
++ target_link_libraries( kde4_gpgmepp ${GPGME_VANILLA_LIBRARIES} )
++ set_target_properties( kde4_gpgmepp PROPERTIES
++ VERSION ${_kde4_gpgmepp_version}
++ SOVERSION ${_kde4_gpgmepp_soversion}
++ OUTPUT_NAME kde4_gpgme++
+ )
+- get_target_property( GPGMEPP_VANILLA_LIBRARY gpgmepp LOCATION )
+- install(TARGETS gpgmepp EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
++ get_target_property( GPGMEPP_VANILLA_LIBRARY kde4_gpgmepp LOCATION )
++ install(TARGETS kde4_gpgmepp EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
+
+ endif()
+
+ if ( GPGME_GLIB_FOUND )
+- add_library( gpgmepp-glib ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_glib.cpp )
+- target_link_libraries( gpgmepp-glib ${GPGME_GLIB_LIBRARIES} )
+- set_target_properties( gpgmepp-glib PROPERTIES
+- VERSION ${_gpgmepp_version}
+- SOVERSION ${_gpgmepp_soversion}
+- OUTPUT_NAME gpgme++-glib DEFINE_SYMBOL gpgmepp_EXPORTS
++ add_library( kde4_gpgmepp-glib ${LIBRARY_TYPE} ${kde4_gpgme_LIB_SRCS} context_glib.cpp )
++ target_link_libraries( kde4_gpgmepp-glib ${GPGME_GLIB_LIBRARIES} )
++ set_target_properties( kde4_gpgmepp-glib PROPERTIES
++ VERSION ${_kde4_gpgmepp_version}
++ SOVERSION ${_kde4_gpgmepp_soversion}
++ OUTPUT_NAME kde4_gpgme++-glib
++ DEFINE_SYMBOL kde4_gpgmepp_EXPORTS
+ )
+- get_target_property( GPGMEPP_GLIB_LIBRARY gpgmepp LOCATION )
+- install(TARGETS gpgmepp-glib EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
++ get_target_property( GPGMEPP_GLIB_LIBRARY kde4_gpgmepp-glib LOCATION )
++ install(TARGETS kde4_gpgmepp-glib EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ endif()
+
+ # this writes way too much, but do we care?
+@@ -102,7 +103,7 @@
+ gpgagentgetinfoassuantransaction.h
+ configuration.h
+ ${CMAKE_CURRENT_BINARY_DIR}/gpgme++_export.h vfsmountresult.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++ COMPONENT Devel
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kde4_gpgme++ COMPONENT Devel
+ )
+
+ install(
+@@ -110,6 +111,6 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppConfig.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppLibraryDepends.cmake
+ DESTINATION
+- ${LIB_INSTALL_DIR}/gpgmepp )
++ ${LIB_INSTALL_DIR}/kde4_gpgmepp )
+
+ endif()
+--- /kde4_gpgme++/interfaces/CMakeLists.txt
++++ /kde4_gpgme++/interfaces/CMakeLists.txt
+@@ -4,5 +4,5 @@
+ passphraseprovider.h
+ progressprovider.h
+ assuantransaction.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++/interfaces COMPONENT Devel)
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kde4_gpgme++/interfaces COMPONENT Devel)
+
+--- /kde4_qgpgme/CMakeLists.txt
++++ /kde4_qgpgme/CMakeLists.txt
+@@ -1,16 +1,16 @@
+
+ set( _any_gpgme_found false )
+
+-set( _qgpgme_version 1.0.1 )
+-set( _qgpgme_soversion 1 )
++set( _kde4_qgpgme_version 1.0.1 )
++set( _kde4_qgpgme_soversion 1 )
+
+ if ( WIN32 AND GPGME_VANILLA_FOUND )
+
+ # on Windows, we require gpgme(-vanilla), which is thread-safe
+
+ set( _any_gpgme_found true )
+- set( _qgpgme_libgpgme gpgmepp )
+- #set( _qgpgme_extra_src eventloopinteractor_win.cpp )
++ set( _kde4_qgpgme_libgpgme kde4_gpgmepp )
++ #set( _kde4_qgpgme_extra_src eventloopinteractor_win.cpp )
+
+ endif()
+
+@@ -19,9 +19,9 @@
+ # on Unix, we require gpgme(-vanilla), which is thread-safe
+
+ set( _any_gpgme_found true )
+- set( _qgpgme_libgpgme gpgmepp )
+- set( _qgpgme_extra_src eventloopinteractor.cpp eventloopinteractor_unix.cpp )
+- set( _qgpgme_extra_headers eventloopinteractor.h )
++ set( _kde4_qgpgme_libgpgme kde4_gpgmepp )
++ set( _kde4_qgpgme_extra_src eventloopinteractor.cpp eventloopinteractor_unix.cpp )
++ set( _kde4_qgpgme_extra_headers eventloopinteractor.h )
+
+ endif()
+
+@@ -33,27 +33,27 @@
+
+ add_subdirectory( tests )
+
+- set( qgpgme_LIB_SRCS
++ set( kde4_qgpgme_LIB_SRCS
+ dataprovider.cpp
+- ${_qgpgme_extra_src}
++ ${_kde4_qgpgme_extra_src}
+ )
+
+- add_library( qgpgme ${LIBRARY_TYPE} ${qgpgme_LIB_SRCS} )
+- generate_export_header(qgpgme)
++ add_library( kde4_qgpgme ${LIBRARY_TYPE} ${kde4_qgpgme_LIB_SRCS} )
++ generate_export_header(kde4_qgpgme BASE_NAME qgpgme)
+
+- target_link_libraries( qgpgme ${QT_QTCORE_LIBRARY} ${_qgpgme_libgpgme} )
++ target_link_libraries( kde4_qgpgme ${QT_QTCORE_LIBRARY} ${_kde4_qgpgme_libgpgme} )
+
+- set_target_properties( qgpgme PROPERTIES
+- VERSION ${_qgpgme_version}
+- SOVERSION ${_qgpgme_soversion}
++ set_target_properties( kde4_qgpgme PROPERTIES
++ VERSION ${_kde4_qgpgme_version}
++ SOVERSION ${_kde4_qgpgme_soversion}
+ )
+
+- install( TARGETS qgpgme EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
++ install( TARGETS kde4_qgpgme EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install( FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/qgpgme_export.h
+- ${_qgpgme_extra_headers}
++ ${_kde4_qgpgme_extra_headers}
+ dataprovider.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme COMPONENT Devel )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kde4_qgpgme COMPONENT Devel )
+
+ endif()
+--- /kde4_qgpgme/Mainpage.dox
++++ /kde4_qgpgme/Mainpage.dox
+@@ -1 +1 @@
+-// DOXYGEN_REFERENCES = gpgme++
++// DOXYGEN_REFERENCES = kde4_gpgme++
+--- /kde4_qgpgme/tests/CMakeLists.txt
++++ /kde4_qgpgme/tests/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ if ( GPGME_VANILLA_FOUND )
+- set( _qgpgme_libgpgme gpgmepp )
++ set( _kde4_qgpgme_libgpgme kde4_gpgmepp )
+ endif()
+
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+@@ -10,7 +10,7 @@
+
+ ########### next target ###############
+
+-set( qgpgme_TESTS
++set( kde4_qgpgme_TESTS
+ dataprovidertest
+ installtest
+ # PORT ME AWAY FROM EVENT LOOPS
+@@ -20,17 +20,17 @@
+ #gpgadduseridtest
+ )
+
+-foreach( _qgpgme_test ${qgpgme_TESTS} )
+- kde4_add_executable( "${_qgpgme_test}" TEST "${_qgpgme_test}.cpp" )
++foreach( _kde4_qgpgme_test ${kde4_qgpgme_TESTS} )
++ kde4_add_executable( "${_kde4_qgpgme_test}" TEST "${_kde4_qgpgme_test}.cpp" )
+ if (WIN32) # what's up?
+- target_link_libraries( "${_qgpgme_test}" qgpgme ${_qgpgme_libgpgme} ${_gpgme_vanilla_library} ${_gpg_error_library} ${QT_QTCORE_LIBRARY} )
++ target_link_libraries( "${_kde4_qgpgme_test}" kde4_qgpgme ${_kde4_qgpgme_libgpgme} ${_gpgme_vanilla_library} ${_gpg_error_library} ${QT_QTCORE_LIBRARY} )
+ else()
+- target_link_libraries( "${_qgpgme_test}" qgpgme ${_qgpgme_libgpgme} gpgme gpg-error ${QT_QTCORE_LIBRARY} )
++ target_link_libraries( "${_kde4_qgpgme_test}" kde4_qgpgme ${_kde4_qgpgme_libgpgme} gpgme gpg-error ${QT_QTCORE_LIBRARY} )
+ endif()
+-endforeach( _qgpgme_test )
++endforeach( _kde4_qgpgme_test )
+
+ ########### next target ###############
+
+ # PORT ME AWAY FROM EVENT LOOPS
+ #kde4_add_executable(editinteractortest TEST editinteractortest.cpp)
+-#target_link_libraries(editinteractortest qgpgme ${QT_QTGUI_LIBRARY})
++#target_link_libraries(editinteractortest kde4_qgpgme ${QT_QTGUI_LIBRARY})
--- a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10-gpgme-1.8.patch
+++ a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10-gpgme-1.8.patch
@@ -0,0 +1,439 @@
+--- /cmake/modules/FindGpgme.cmake
++++ /cmake/modules/FindGpgme.cmake
+@@ -2,23 +2,18 @@
+ #
+ # Algorithm:
+ # - Windows:
+-# On Windows, there's three gpgme variants: gpgme{,-glib,-qt}.
++# On Windows, there are two gpgme variants: gpgme{,-glib}.
+ # - The variant used determines the event loop integration possible:
+ # - gpgme: no event loop integration possible, only synchronous operations supported
+ # - gpgme-glib: glib event loop integration possible, only asynchronous operations supported
+-# - gpgme-qt: qt event loop integration possible, only asynchronous operations supported
+-# - GPGME_{VANILLA,GLIB,QT}_{FOUND,LIBRARIES} will be set for each of the above
++# - GPGME_{VANILLA,GLIB}_{FOUND,LIBRARIES} will be set for each of the above
+ # - GPGME_INCLUDES is the same for all of the above
+ # - GPGME_FOUND is set if any of the above was found
+ # - *nix:
+-# There's also three variants: gpgme{,-pthread,-pth}.
+-# - The variant used determines the multithreaded use possible:
+-# - gpgme: no multithreading support available
+-# - gpgme-pthread: multithreading available using POSIX threads
+-# - gpgme-pth: multithreading available using GNU PTH (cooperative multithreading)
+-# - GPGME_{VANILLA,PTH,PTHREAD}_{FOUND,LIBRARIES} will be set for each of the above
+-# - GPGME_INCLUDES is the same for all of the above
+-# - GPGME_FOUND is set if any of the above was found
++# There is one variant: gpgme.
++# - GPGME_VANILLA_{FOUND,LIBRARIES}
++# - GPGME_INCLUDES
++# - GPGME_FOUND is set if gpgme was found
+ #
+ # GPGME_LIBRARY_DIR - the directory where the libraries are located
+
+@@ -54,7 +49,7 @@
+ # don't require 2.6.3 but 2.6.2, we can't use it. Alex
+ set( _seem_to_have_cached_gpgme false )
+ if ( GPGME_INCLUDES )
+- if ( GPGME_VANILLA_LIBRARIES OR GPGME_QT_LIBRARIES OR GPGME_GLIB_LIBRARIES )
++ if ( GPGME_VANILLA_LIBRARIES OR GPGME_GLIB_LIBRARIES )
+ set( _seem_to_have_cached_gpgme true )
+ endif()
+ endif()
+@@ -63,11 +58,10 @@
+
+ macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND )
+ macro_bool_to_bool( GPGME_GLIB_LIBRARIES GPGME_GLIB_FOUND )
+- macro_bool_to_bool( GPGME_QT_LIBRARIES GPGME_QT_FOUND )
+ # this would have been preferred:
+ #set( GPGME_*_FOUND macro_bool_to_bool(GPGME_*_LIBRARIES) )
+
+- if ( GPGME_VANILLA_FOUND OR GPGME_GLIB_FOUND OR GPGME_QT_FOUND )
++ if ( GPGME_VANILLA_FOUND OR GPGME_GLIB_FOUND )
+ set( GPGME_FOUND true )
+ else()
+ set( GPGME_FOUND false )
+@@ -84,7 +78,6 @@
+ set( GPGME_FOUND false )
+ set( GPGME_VANILLA_FOUND false )
+ set( GPGME_GLIB_FOUND false )
+- set( GPGME_QT_FOUND false )
+
+ find_path( GPGME_INCLUDES gpgme.h
+ ${CMAKE_INCLUDE_PATH}
+@@ -103,12 +96,6 @@
+ ${CMAKE_INSTALL_PREFIX}/lib
+ )
+
+- find_library( _gpgme_qt_library NAMES gpgme-qt libgpgme-qt gpgme-qt-11 libgpgme-qt-11
+- PATHS
+- ${CMAKE_LIBRARY_PATH}
+- ${CMAKE_INSTALL_PREFIX}/lib
+- )
+-
+ find_library( _gpg_error_library NAMES gpg-error libgpg-error gpg-error-0 libgpg-error-0
+ PATHS
+ ${CMAKE_LIBRARY_PATH}
+@@ -129,24 +116,11 @@
+ set( GPGME_FOUND true )
+ endif()
+
+- if ( _gpgme_qt_library AND _gpg_error_library )
+- set( GPGME_QT_LIBRARIES ${_gpgme_qt_library} ${_gpg_error_library} )
+- set( GPGME_QT_FOUND true )
+- set( GPGME_FOUND true )
+- endif()
+-
+ endif()
+
+- # these are Unix-only:
+- set( GPGME_PTHREAD_FOUND false )
+- set( GPGME_PTH_FOUND false )
+- set( HAVE_GPGME_PTHREAD 0 )
+- set( HAVE_GPGME_PTH 0 )
+-
+ macro_bool_to_01( GPGME_FOUND HAVE_GPGME )
+ macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA )
+ macro_bool_to_01( GPGME_GLIB_FOUND HAVE_GPGME_GLIB )
+- macro_bool_to_01( GPGME_QT_FOUND HAVE_GPGME_QT )
+
+ else() # not WIN32
+
+@@ -156,7 +130,7 @@
+ # see WIN32 case for an explanation of what this does:
+ set( _seem_to_have_cached_gpgme false )
+ if ( GPGME_INCLUDES )
+- if ( GPGME_VANILLA_LIBRARIES OR GPGME_PTHREAD_LIBRARIES OR GPGME_PTH_LIBRARIES )
++ if ( GPGME_VANILLA_LIBRARIES )
+ set( _seem_to_have_cached_gpgme true )
+ endif()
+ endif()
+@@ -164,10 +138,8 @@
+ if ( _seem_to_have_cached_gpgme )
+
+ macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND )
+- macro_bool_to_bool( GPGME_PTHREAD_LIBRARIES GPGME_PTHREAD_FOUND )
+- macro_bool_to_bool( GPGME_PTH_LIBRARIES GPGME_PTH_FOUND )
+
+- if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
++ if ( GPGME_VANILLA_FOUND )
+ set( GPGME_FOUND true )
+ else()
+ set( GPGME_FOUND false )
+@@ -177,8 +149,6 @@
+
+ set( GPGME_FOUND false )
+ set( GPGME_VANILLA_FOUND false )
+- set( GPGME_PTHREAD_FOUND false )
+- set( GPGME_PTH_FOUND false )
+
+ find_program( _GPGMECONFIG_EXECUTABLE NAMES gpgme-config )
+
+@@ -189,8 +159,8 @@
+
+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION )
+
+- set( _GPGME_MIN_VERSION "1.1.7" )
+- if( ${GPGME_VERSION} VERSION_GREATER ${_GPGME_MIN_VERSION} )
++ set( _GPGME_MIN_VERSION "1.8.0" )
++ if( NOT ${GPGME_VERSION} VERSION_LESS ${_GPGME_MIN_VERSION} )
+ set( _GPGME_INSTALLED_VERSION_OK TRUE )
+ endif()
+
+@@ -207,24 +177,14 @@
+ set( _gpgme_config_vanilla_libs )
+ endif()
+
+- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
+- if ( _ret )
+- set( _gpgme_config_pthread_libs )
+- endif()
+-
+- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth --libs OUTPUT_VARIABLE _gpgme_config_pth_libs RETURN_VALUE _ret )
+- if ( _ret )
+- set( _gpgme_config_pth_libs )
+- endif()
+-
+ # append -lgpg-error to the list of libraries, if necessary
+- foreach ( _flavour vanilla pthread pth )
++ foreach ( _flavour vanilla )
+ if ( _gpgme_config_${_flavour}_libs AND NOT _gpgme_config_${_flavour}_libs MATCHES "lgpg-error" )
+ set( _gpgme_config_${_flavour}_libs "${_gpgme_config_${_flavour}_libs} -lgpg-error" )
+ endif()
+ endforeach()
+
+- if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs OR _gpgme_config_pth_libs )
++ if ( _gpgme_config_vanilla_libs )
+
+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _GPGME_CFLAGS )
+
+@@ -233,7 +193,7 @@
+ string( REGEX REPLACE " *-I" ";" GPGME_INCLUDES "${_GPGME_CFLAGS}" )
+ endif()
+
+- foreach ( _flavour vanilla pthread pth )
++ foreach ( _flavour vanilla )
+ if ( _gpgme_config_${_flavour}_libs )
+
+ set( _gpgme_library_dirs )
+@@ -291,13 +251,11 @@
+ endforeach( _flavour )
+
+ # ensure that they are cached
+- # This comment above doesn't make sense, the four following lines seem to do nothing. Alex
++ # This comment above doesn't make sense, the two following lines seem to do nothing. Alex
+ set( GPGME_INCLUDES ${GPGME_INCLUDES} )
+ set( GPGME_VANILLA_LIBRARIES ${GPGME_VANILLA_LIBRARIES} )
+- set( GPGME_PTHREAD_LIBRARIES ${GPGME_PTHREAD_LIBRARIES} )
+- set( GPGME_PTH_LIBRARIES ${GPGME_PTH_LIBRARIES} )
+
+- if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
++ if ( GPGME_VANILLA_FOUND )
+ set( GPGME_FOUND true )
+ else()
+ set( GPGME_FOUND false )
+@@ -313,14 +271,10 @@
+
+ # these are Windows-only:
+ set( GPGME_GLIB_FOUND false )
+- set( GPGME_QT_FOUND false )
+ set( HAVE_GPGME_GLIB 0 )
+- set( HAVE_GPGME_QT 0 )
+
+ macro_bool_to_01( GPGME_FOUND HAVE_GPGME )
+ macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA )
+- macro_bool_to_01( GPGME_PTHREAD_FOUND HAVE_GPGME_PTHREAD )
+- macro_bool_to_01( GPGME_PTH_FOUND HAVE_GPGME_PTH )
+
+ endif() # WIN32 | Unix
+
+@@ -335,20 +289,8 @@
+ set( _gpgme_flavours "${_gpgme_flavours} Glib" )
+ endif()
+
+-if ( GPGME_QT_FOUND )
+- set( _gpgme_flavours "${_gpgme_flavours} Qt" )
+-endif()
+-
+-if ( GPGME_PTHREAD_FOUND )
+- set( _gpgme_flavours "${_gpgme_flavours} pthread" )
+-endif()
+-
+-if ( GPGME_PTH_FOUND )
+- set( _gpgme_flavours "${_gpgme_flavours} pth" )
+-endif()
+-
+ # determine the library in one of the found flavours, can be reused e.g. by FindQgpgme.cmake, Alex
+-foreach(_currentFlavour vanilla glib qt pth pthread)
++foreach(_currentFlavour vanilla glib)
+ if(NOT GPGME_LIBRARY_DIR)
+ get_filename_component(GPGME_LIBRARY_DIR "${_gpgme_${_currentFlavour}_lib}" PATH)
+ endif()
+--- /cmake/modules/FindQGpgme.cmake
++++ /cmake/modules/FindQGpgme.cmake
+@@ -12,13 +12,8 @@
+
+ if(GPGME_FOUND)
+
+- if ( WIN32 )
+- find_library(_QGPGME_EXTRA_LIBRARY gpgme++
+- HINTS ${GPGME_LIBRARY_DIR})
+- else ( WIN32 )
+- find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread
+- HINTS ${GPGME_LIBRARY_DIR})
+- endif()
++ find_library(_QGPGME_EXTRA_LIBRARY gpgme++
++ HINTS ${GPGME_LIBRARY_DIR})
+
+ find_library(QGPGME_LIBRARY qgpgme
+ HINTS ${GPGME_LIBRARY_DIR})
+@@ -31,11 +26,7 @@
+ HINTS "${_QGPGME_PREFIX}/include" )
+ endif()
+
+- if ( WIN32 )
+- set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES} ${GPGME_QT_LIBRARIES})
+- else ( WIN32 )
+- set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_PTHREAD_LIBRARIES})
+- endif()
++ set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES})
+
+ endif()
+
+--- /gpgme++/CMakeLists.txt
++++ /gpgme++/CMakeLists.txt
+@@ -10,9 +10,9 @@
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-gpgme++.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gpgme++.h )
+
+-## gpgme comes in three flavours on each of the platforms:
+-## Windows: gpgme, gpgme-glib, gpgme-qt
+-## Unix: gpgme, gpgme-pthread, gpgme-pth
++## gpgme comes in these flavours on each of the platforms:
++## Windows: gpgme, gpgme-glib
++## Unix: gpgme
+ ## We're building corresponding gpgme++ flavours
+
+ set(gpgme_LIB_SRCS
+@@ -75,47 +75,6 @@
+ install(TARGETS gpgmepp-glib EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ endif()
+
+-
+-if ( GPGME_QT_FOUND )
+- add_library( gpgmepp-qt ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_qt.cpp )
+- target_link_libraries( gpgmepp-qt ${GPGME_QT_LIBRARIES} )
+- if(WIN32)
+- target_link_libraries( gpgmepp-qt ${GPGME_VANILLA_LIBRARIES} )
+- endif()
+- set_target_properties( gpgmepp-qt PROPERTIES
+- VERSION ${_gpgmepp_version}
+- SOVERSION ${_gpgmepp_soversion}
+- OUTPUT_NAME gpgme++-qt DEFINE_SYMBOL gpgmepp_EXPORTS
+- )
+- get_target_property( GPGMEPP_QT_LIBRARY gpgmepp LOCATION )
+- install(TARGETS gpgmepp-qt EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+-endif()
+-
+-
+-if ( GPGME_PTHREAD_FOUND )
+- add_library( gpgmepp-pthread ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_vanilla.cpp )
+- target_link_libraries( gpgmepp-pthread ${GPGME_PTHREAD_LIBRARIES} )
+- set_target_properties( gpgmepp-pthread PROPERTIES
+- VERSION ${_gpgmepp_version}
+- SOVERSION ${_gpgmepp_soversion}
+- OUTPUT_NAME gpgme++-pthread DEFINE_SYMBOL gpgmepp_EXPORTS
+- )
+- get_target_property( GPGMEPP_PTHREAD_LIBRARY gpgmepp LOCATION )
+- install(TARGETS gpgmepp-pthread EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+-endif()
+-
+-if ( GPGME_PTH_FOUND )
+- add_library( gpgmepp-pth ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_vanilla.cpp )
+- target_link_libraries( gpgmepp-pth ${GPGME_PTH_LIBRARIES} )
+- set_target_properties( gpgmepp-pth PROPERTIES
+- VERSION ${_gpgmepp_version}
+- SOVERSION ${_gpgmepp_soversion}
+- OUTPUT_NAME gpgme++-pth DEFINE_SYMBOL gpgmepp_EXPORTS
+- )
+- get_target_property( GPGMEPP_PTH_LIBRARY gpgmepp LOCATION )
+- install(TARGETS gpgmepp-pth EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+-endif()
+-
+ # this writes way too much, but do we care?
+ EXPORT_LIBRARY_DEPENDENCIES( ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppLibraryDepends.cmake )
+
+--- /gpgme++/GpgmeppConfig.cmake.in
++++ /gpgme++/GpgmeppConfig.cmake.in
+@@ -7,21 +7,6 @@
+ set( GPGMEPP_VANILLA_LIBRARIES "@GPGMEPP_VANILLA_LIBRARY@" )
+ endif()
+
+-set( GPGMEPP_PTHREAD_FOUND @HAVE_GPGME_PTHREAD@ )
+-if ( GPGMEPP_PTHREAD_FOUND )
+- set( GPGMEPP_PTHREAD_LIBRARIES "@GPGMEPP_PTHREAD_LIBRARY@" )
+-endif()
+-
+-set( GPGMEPP_PTH_FOUND @HAVE_GPGME_PTH@ )
+-if ( GPGMEPP_PTH_FOUND )
+- set( GPGMEPP_PTH_LIBRARIES "@GPGMEPP_PTH_LIBRARY@" )
+-endif()
+-
+-set( GPGMEPP_QT_FOUND @HAVE_GPGME_QT@ )
+-if ( GPGMEPP_QT_FOUND )
+- set( GPGMEPP_QT_LIBRARIES "@GPGMEPP_QT_LIBRARY@" )
+-endif()
+-
+ set( GPGMEPP_GLIB_FOUND @HAVE_GPGME_GLIB@ )
+ if ( GPGMEPP_GLIB_FOUND )
+ set( GPGMEPP_GLIB_LIBRARIES "@GPGMEPP_GLIB_LIBRARY@" )
+--- /gpgme++/context_qt.cpp
++++ /gpgme++/context_qt.cpp
+@@ -1,43 +0,0 @@
+-/*
+- context_qt.cpp - wraps a gpgme key context, gpgme-qt-specific functions
+- Copyright (C) 2007 Klarälvdalens Datakonsult AB
+-
+- This file is part of GPGME++.
+-
+- GPGME++ is free software; you can redistribute it and/or
+- modify it under the terms of the GNU Library General Public
+- License as published by the Free Software Foundation; either
+- version 2 of the License, or (at your option) any later version.
+-
+- GPGME++ is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public License
+- along with GPGME++; see the file COPYING.LIB. If not, write to the
+- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- Boston, MA 02110-1301, USA.
+-*/
+-
+-#include
+-
+-#include
+-
+-#ifdef HAVE_GPGME_GET_FDPTR
+-extern "C" QIODevice * gpgme_get_fdptr( int );
+-#endif
+-
+-GIOChannel * GpgME::getGIOChannel( int ) {
+- return 0;
+-}
+-
+-QIODevice * GpgME::getQIODevice( int fd ) {
+-#ifdef HAVE_GPGME_GET_FDPTR
+- return gpgme_get_fdptr( fd );
+-#else
+- (void)fd;
+- return 0;
+-#endif
+-}
+-
+--- /qgpgme/CMakeLists.txt
++++ /qgpgme/CMakeLists.txt
+@@ -6,8 +6,7 @@
+
+ if ( WIN32 AND GPGME_VANILLA_FOUND )
+
+- # on Windows, we require gpgme(-vanilla), which is thread-safe,
+- # and we don't provide gpgme-qt support
++ # on Windows, we require gpgme(-vanilla), which is thread-safe
+
+ set( _any_gpgme_found true )
+ set( _qgpgme_libgpgme gpgmepp )
+@@ -15,14 +14,12 @@
+
+ endif()
+
+-if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
++if ( NOT WIN32 AND GPGME_VANILLA_FOUND )
+
+- # on Unix, we requrie gpgme-pthread (for convenience, since vanilla
+- # gpgme isn't thread-aware, and we don't want to restrict clients
+- # of qgpgme to non-threaded useage of gpgme)
++ # on Unix, we require gpgme(-vanilla), which is thread-safe
+
+ set( _any_gpgme_found true )
+- set( _qgpgme_libgpgme gpgmepp-pthread )
++ set( _qgpgme_libgpgme gpgmepp )
+ set( _qgpgme_extra_src eventloopinteractor.cpp eventloopinteractor_unix.cpp )
+ set( _qgpgme_extra_headers eventloopinteractor.h )
+
+--- /qgpgme/tests/CMakeLists.txt
++++ /qgpgme/tests/CMakeLists.txt
+@@ -1,11 +1,7 @@
+-if ( WIN32 AND GPGME_VANILLA_FOUND )
++if ( GPGME_VANILLA_FOUND )
+ set( _qgpgme_libgpgme gpgmepp )
+ endif()
+
+-if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
+- set( _qgpgme_libgpgme gpgmepp-pthread )
+-endif()
+-
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ include_directories( ${GPGME_INCLUDES} )
+ include_directories( ${Boost_INCLUDE_DIR} )
--- a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11_pre20160211-gpgme++_and_qgpgme_renaming.patch
+++ a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11_pre20160211-gpgme++_and_qgpgme_renaming.patch
@@ -0,0 +1,333 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -75,7 +75,7 @@
+ find_package(Gpgme REQUIRED)
+ # configure macros
+ if (GPGME_FOUND)
+- include (gpgme++/ConfigureChecks.cmake)
++ include (kde4_gpgme++/ConfigureChecks.cmake)
+ endif()
+
+ if (NOT KDEPIM_ONLY_KLEO)
+@@ -140,8 +140,8 @@
+ ############### Now, we add the KDEPIMLibs components ###############
+ # These targets will always be built
+ add_subdirectory(cmake)
+-add_subdirectory(gpgme++)
+-add_subdirectory(qgpgme)
++add_subdirectory(kde4_gpgme++)
++add_subdirectory(kde4_qgpgme)
+
+ if (NOT KDEPIM_ONLY_KLEO)
+ add_subdirectory(kabc)
+--- /KdepimLibsConfig.cmake.in
++++ /KdepimLibsConfig.cmake.in
+@@ -75,7 +75,6 @@
+ _kdepimlibs_set_lib_vars(AKONADI_NOTES akonadi-notes)
+ _kdepimlibs_set_lib_vars(AKONADI_SOCIALUTILS akonadi-socialutils)
+ _kdepimlibs_set_lib_vars(AKONADI_XML akonadi-xml)
+-_kdepimlibs_set_lib_vars(GPGMEPP gpgmepp)
+ _kdepimlibs_set_lib_vars(KABC kabc)
+ _kdepimlibs_set_lib_vars(KALARMCAL kalarmcal)
+ if (NOT KDEPIMLIBS_NO_KCAL)
+@@ -85,6 +84,8 @@
+ endif()
+ _kdepimlibs_set_lib_vars(KCALCORE kcalcore)
+ _kdepimlibs_set_lib_vars(KCALUTILS kcalutils)
++_kdepimlibs_set_lib_vars(KDE4_GPGMEPP kde4_gpgmepp)
++_kdepimlibs_set_lib_vars(KDE4_QGPGME kde4_qgpgme)
+ _kdepimlibs_set_lib_vars(KHOLIDAYS kholidays)
+ _kdepimlibs_set_lib_vars(KIMAP kimap)
+ _kdepimlibs_set_lib_vars(KLDAP kldap)
+@@ -101,5 +102,4 @@
+ _kdepimlibs_set_lib_vars(KXMLRPCCLIENT kxmlrpcclient)
+ _kdepimlibs_set_lib_vars(MAILTRANSPORT mailtransport)
+ _kdepimlibs_set_lib_vars(MICROBLOG microblog)
+-_kdepimlibs_set_lib_vars(QGPGME qgpgme)
+ _kdepimlibs_set_lib_vars(SYNDICATION syndication)
+--- /Mainpage.dox
++++ /Mainpage.dox
+@@ -73,7 +73,7 @@
+ * - microblog.
+ * A library for microblogging.
+ *
+- * - QGpgME.
++ * - QGpgME.
+ * A C++ wrapper for gpgme.
+ *
+ * - syndication.
+--- /cmake/modules/FindKDE4_QGpgme.cmake
++++ /cmake/modules/FindKDE4_QGpgme.cmake
+@@ -1,9 +1,9 @@
+-# - Try to find the QGpgME library
++# - Try to find the KDE4_QGpgME library
+ # Once done this will define
+ #
+-# QGPGME_FOUND
+-# QGPGME_LIBRARIES
+-# QGPGME_INCLUDE_DIR
++# KDE4_QGPGME_FOUND
++# KDE4_QGPGME_LIBRARIES
++# KDE4_QGPGME_INCLUDE_DIR
+
+ # What we do here is a bit simplictic, but it's no worse than what
+ # people were using in kdepim up to now...
+@@ -12,25 +12,25 @@
+
+ if(GPGME_FOUND)
+
+- find_library(_QGPGME_EXTRA_LIBRARY gpgme++
++ find_library(_KDE4_QGPGME_EXTRA_LIBRARY kde4_gpgme++
+ HINTS ${GPGME_LIBRARY_DIR})
+
+- find_library(QGPGME_LIBRARY qgpgme
++ find_library(KDE4_QGPGME_LIBRARY kde4_qgpgme
+ HINTS ${GPGME_LIBRARY_DIR})
+
+- if (QGPGME_LIBRARY)
++ if (KDE4_QGPGME_LIBRARY)
+ # get the libdirectory and then go one up
+- get_filename_component(_QGPGME_PREFIX "${QGPGME_LIBRARY}" PATH)
+- get_filename_component(_QGPGME_PREFIX "${_QGPGME_PREFIX}" PATH)
+- find_path(QGPGME_INCLUDE_DIR qgpgme/qgpgme_export.h
+- HINTS "${_QGPGME_PREFIX}/include" )
++ get_filename_component(_KDE4_QGPGME_PREFIX "${KDE4_QGPGME_LIBRARY}" PATH)
++ get_filename_component(_KDE4_QGPGME_PREFIX "${_KDE4_QGPGME_PREFIX}" PATH)
++ find_path(KDE4_QGPGME_INCLUDE_DIR kde4_qgpgme/qgpgme_export.h
++ HINTS "${_KDE4_QGPGME_PREFIX}/include" )
+ endif()
+
+- set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES})
++ set(KDE4_QGPGME_LIBRARIES ${KDE4_QGPGME_LIBRARY} ${_KDE4_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES})
+
+ endif()
+
+ include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(QGpgme DEFAULT_MSG QGPGME_LIBRARY QGPGME_INCLUDE_DIR _QGPGME_EXTRA_LIBRARY)
++find_package_handle_standard_args(KDE4_QGpgme DEFAULT_MSG KDE4_QGPGME_LIBRARY KDE4_QGPGME_INCLUDE_DIR _KDE4_QGPGME_EXTRA_LIBRARY)
+
+-mark_as_advanced(QGPGME_LIBRARY _QGPGME_EXTRA_LIBRARY QGPGME_INCLUDE_DIR)
++mark_as_advanced(KDE4_QGPGME_LIBRARY _KDE4_QGPGME_EXTRA_LIBRARY KDE4_QGPGME_INCLUDE_DIR)
+--- /kde4_gpgme++/CMakeLists.txt
++++ /kde4_gpgme++/CMakeLists.txt
+@@ -1,5 +1,5 @@
+-project( gpgmepp )
+-#KDE4_NO_ENABLE_FINAL(gpgmepp)
++project( kde4_gpgmepp )
++#KDE4_NO_ENABLE_FINAL(kde4_gpgmepp)
+ if (MINGW)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mms-bitfields")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mms-bitfields")
+@@ -15,7 +15,7 @@
+ ## Unix: gpgme
+ ## We're building corresponding gpgme++ flavours
+
+-set(gpgme_LIB_SRCS
++set(kde4_gpgme_LIB_SRCS
+ exception.cpp
+ context.cpp key.cpp
+ trustitem.cpp
+@@ -43,36 +43,37 @@
+ configuration.cpp
+ )
+
+-set( _gpgmepp_version 2.8.0 )
+-set( _gpgmepp_soversion 2 )
++set( _kde4_gpgmepp_version 2.8.0 )
++set( _kde4_gpgmepp_soversion 2 )
+
+ set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ${Boost_INCLUDE_DIR} )
+
+ if ( GPGME_VANILLA_FOUND )
+- add_library( gpgmepp ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_vanilla.cpp )
+- generate_export_header(gpgmepp EXPORT_FILE_NAME gpgme++_export.h)
++ add_library( kde4_gpgmepp ${LIBRARY_TYPE} ${kde4_gpgme_LIB_SRCS} context_vanilla.cpp )
++ generate_export_header(kde4_gpgmepp BASE_NAME gpgmepp EXPORT_FILE_NAME gpgme++_export.h)
+
+- target_link_libraries( gpgmepp LINK_PRIVATE ${GPGME_VANILLA_LIBRARIES} )
+- set_target_properties( gpgmepp PROPERTIES
+- VERSION ${_gpgmepp_version}
+- SOVERSION ${_gpgmepp_soversion}
+- OUTPUT_NAME gpgme++
++ target_link_libraries( kde4_gpgmepp LINK_PRIVATE ${GPGME_VANILLA_LIBRARIES} )
++ set_target_properties( kde4_gpgmepp PROPERTIES
++ VERSION ${_kde4_gpgmepp_version}
++ SOVERSION ${_kde4_gpgmepp_soversion}
++ OUTPUT_NAME kde4_gpgme++
+ )
+- set(GPGMEPP_VANILLA_LIBRARY ${LIBRARY_OUTPUT_PATH}/libgpgmepp.so)
+- install(TARGETS gpgmepp EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
++ set(GPGMEPP_VANILLA_LIBRARY ${LIBRARY_OUTPUT_PATH}/libkde4_gpgme++.so)
++ install(TARGETS kde4_gpgmepp EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
+
+ endif()
+
+ if ( GPGME_GLIB_FOUND )
+- add_library( gpgmepp-glib ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_glib.cpp )
+- target_link_libraries( gpgmepp-glib LINK_PRIVATE ${GPGME_GLIB_LIBRARIES} )
+- set_target_properties( gpgmepp-glib PROPERTIES
+- VERSION ${_gpgmepp_version}
+- SOVERSION ${_gpgmepp_soversion}
+- OUTPUT_NAME gpgme++-glib DEFINE_SYMBOL gpgmepp_EXPORTS
++ add_library( kde4_gpgmepp-glib ${LIBRARY_TYPE} ${kde4_gpgme_LIB_SRCS} context_glib.cpp )
++ target_link_libraries( kde4_gpgmepp-glib LINK_PRIVATE ${GPGME_GLIB_LIBRARIES} )
++ set_target_properties( kde4_gpgmepp-glib PROPERTIES
++ VERSION ${_kde4_gpgmepp_version}
++ SOVERSION ${_kde4_gpgmepp_soversion}
++ OUTPUT_NAME kde4_gpgme++-glib
++ DEFINE_SYMBOL kde4_gpgmepp_EXPORTS
+ )
+- set(GPGMEPP_GLIB_LIBRARY ${LIBRARY_OUTPUT_PATH}/libgpgmepp.so)
+- install(TARGETS gpgmepp-glib EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
++ set(GPGMEPP_GLIB_LIBRARY ${LIBRARY_OUTPUT_PATH}/libkde4_gpgme++-glib.so)
++ install(TARGETS kde4_gpgmepp-glib EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ endif()
+
+
+@@ -100,13 +101,13 @@
+ gpgagentgetinfoassuantransaction.h
+ configuration.h
+ ${CMAKE_CURRENT_BINARY_DIR}/gpgme++_export.h vfsmountresult.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++ COMPONENT Devel
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kde4_gpgme++ COMPONENT Devel
+ )
+
+ install(
+ FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppConfig.cmake
+ DESTINATION
+- ${LIB_INSTALL_DIR}/gpgmepp )
++ ${LIB_INSTALL_DIR}/kde4_gpgmepp )
+
+ endif()
+--- /kde4_gpgme++/interfaces/CMakeLists.txt
++++ /kde4_gpgme++/interfaces/CMakeLists.txt
+@@ -4,5 +4,5 @@
+ passphraseprovider.h
+ progressprovider.h
+ assuantransaction.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++/interfaces COMPONENT Devel)
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kde4_gpgme++/interfaces COMPONENT Devel)
+
+--- /kde4_qgpgme/CMakeLists.txt
++++ /kde4_qgpgme/CMakeLists.txt
+@@ -1,16 +1,16 @@
+
+ set( _any_gpgme_found false )
+
+-set( _qgpgme_version 1.0.1 )
+-set( _qgpgme_soversion 1 )
++set( _kde4_qgpgme_version 1.0.1 )
++set( _kde4_qgpgme_soversion 1 )
+
+ if ( WIN32 AND GPGME_VANILLA_FOUND )
+
+ # on Windows, we require gpgme(-vanilla), which is thread-safe
+
+ set( _any_gpgme_found true )
+- set( _qgpgme_libgpgme gpgmepp )
+- #set( _qgpgme_extra_src eventloopinteractor_win.cpp )
++ set( _kde4_qgpgme_libgpgme kde4_gpgmepp )
++ #set( _kde4_qgpgme_extra_src eventloopinteractor_win.cpp )
+
+ endif()
+
+@@ -19,9 +19,9 @@
+ # on Unix, we require gpgme(-vanilla), which is thread-safe
+
+ set( _any_gpgme_found true )
+- set( _qgpgme_libgpgme gpgmepp )
+- set( _qgpgme_extra_src eventloopinteractor.cpp eventloopinteractor_unix.cpp )
+- set( _qgpgme_extra_headers eventloopinteractor.h )
++ set( _kde4_qgpgme_libgpgme kde4_gpgmepp )
++ set( _kde4_qgpgme_extra_src eventloopinteractor.cpp eventloopinteractor_unix.cpp )
++ set( _kde4_qgpgme_extra_headers eventloopinteractor.h )
+
+ endif()
+
+@@ -33,27 +33,27 @@
+
+ add_subdirectory( tests )
+
+- set( qgpgme_LIB_SRCS
++ set( kde4_qgpgme_LIB_SRCS
+ dataprovider.cpp
+- ${_qgpgme_extra_src}
++ ${_kde4_qgpgme_extra_src}
+ )
+
+- add_library( qgpgme ${LIBRARY_TYPE} ${qgpgme_LIB_SRCS} )
+- generate_export_header(qgpgme)
++ add_library( kde4_qgpgme ${LIBRARY_TYPE} ${kde4_qgpgme_LIB_SRCS} )
++ generate_export_header(kde4_qgpgme BASE_NAME qgpgme)
+
+- target_link_libraries( qgpgme LINK_PRIVATE ${QT_QTCORE_LIBRARY} ${_qgpgme_libgpgme} )
++ target_link_libraries( kde4_qgpgme LINK_PRIVATE ${QT_QTCORE_LIBRARY} ${_kde4_qgpgme_libgpgme} )
+
+- set_target_properties( qgpgme PROPERTIES
+- VERSION ${_qgpgme_version}
+- SOVERSION ${_qgpgme_soversion}
++ set_target_properties( kde4_qgpgme PROPERTIES
++ VERSION ${_kde4_qgpgme_version}
++ SOVERSION ${_kde4_qgpgme_soversion}
+ )
+
+- install( TARGETS qgpgme EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
++ install( TARGETS kde4_qgpgme EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install( FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/qgpgme_export.h
+- ${_qgpgme_extra_headers}
++ ${_kde4_qgpgme_extra_headers}
+ dataprovider.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme COMPONENT Devel )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kde4_qgpgme COMPONENT Devel )
+
+ endif()
+--- /kde4_qgpgme/Mainpage.dox
++++ /kde4_qgpgme/Mainpage.dox
+@@ -1 +1 @@
+-// DOXYGEN_REFERENCES = gpgme++
++// DOXYGEN_REFERENCES = kde4_gpgme++
+--- /kde4_qgpgme/tests/CMakeLists.txt
++++ /kde4_qgpgme/tests/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ if ( GPGME_VANILLA_FOUND )
+- set( _qgpgme_libgpgme gpgmepp )
++ set( _kde4_qgpgme_libgpgme kde4_gpgmepp )
+ endif()
+
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+@@ -10,7 +10,7 @@
+
+ ########### next target ###############
+
+-set( qgpgme_TESTS
++set( kde4_qgpgme_TESTS
+ dataprovidertest
+ installtest
+ # PORT ME AWAY FROM EVENT LOOPS
+@@ -20,17 +20,17 @@
+ #gpgadduseridtest
+ )
+
+-foreach( _qgpgme_test ${qgpgme_TESTS} )
+- kde4_add_executable( "${_qgpgme_test}" TEST "${_qgpgme_test}.cpp" )
++foreach( _kde4_qgpgme_test ${kde4_qgpgme_TESTS} )
++ kde4_add_executable( "${_kde4_qgpgme_test}" TEST "${_kde4_qgpgme_test}.cpp" )
+ if (WIN32) # what's up?
+- target_link_libraries( "${_qgpgme_test}" qgpgme ${_qgpgme_libgpgme} ${_gpgme_vanilla_library} ${_gpg_error_library} ${QT_QTCORE_LIBRARY} )
++ target_link_libraries( "${_kde4_qgpgme_test}" kde4_qgpgme ${_kde4_qgpgme_libgpgme} ${_gpgme_vanilla_library} ${_gpg_error_library} ${QT_QTCORE_LIBRARY} )
+ else()
+- target_link_libraries( "${_qgpgme_test}" qgpgme ${_qgpgme_libgpgme} gpgme gpg-error ${QT_QTCORE_LIBRARY} )
++ target_link_libraries( "${_kde4_qgpgme_test}" kde4_qgpgme ${_kde4_qgpgme_libgpgme} gpgme gpg-error ${QT_QTCORE_LIBRARY} )
+ endif()
+-endforeach( _qgpgme_test )
++endforeach( _kde4_qgpgme_test )
+
+ ########### next target ###############
+
+ # PORT ME AWAY FROM EVENT LOOPS
+ #kde4_add_executable(editinteractortest TEST editinteractortest.cpp)
+-#target_link_libraries(editinteractortest qgpgme ${QT_QTGUI_LIBRARY})
++#target_link_libraries(editinteractortest kde4_qgpgme ${QT_QTGUI_LIBRARY})
--- a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11_pre20160211-gpgme-1.8.patch
+++ a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11_pre20160211-gpgme-1.8.patch
@@ -0,0 +1,439 @@
+--- /cmake/modules/FindGpgme.cmake
++++ /cmake/modules/FindGpgme.cmake
+@@ -2,23 +2,18 @@
+ #
+ # Algorithm:
+ # - Windows:
+-# On Windows, there's three gpgme variants: gpgme{,-glib,-qt}.
++# On Windows, there are two gpgme variants: gpgme{,-glib}.
+ # - The variant used determines the event loop integration possible:
+ # - gpgme: no event loop integration possible, only synchronous operations supported
+ # - gpgme-glib: glib event loop integration possible, only asynchronous operations supported
+-# - gpgme-qt: qt event loop integration possible, only asynchronous operations supported
+-# - GPGME_{VANILLA,GLIB,QT}_{FOUND,LIBRARIES} will be set for each of the above
++# - GPGME_{VANILLA,GLIB}_{FOUND,LIBRARIES} will be set for each of the above
+ # - GPGME_INCLUDES is the same for all of the above
+ # - GPGME_FOUND is set if any of the above was found
+ # - *nix:
+-# There's also three variants: gpgme{,-pthread,-pth}.
+-# - The variant used determines the multithreaded use possible:
+-# - gpgme: no multithreading support available
+-# - gpgme-pthread: multithreading available using POSIX threads
+-# - gpgme-pth: multithreading available using GNU PTH (cooperative multithreading)
+-# - GPGME_{VANILLA,PTH,PTHREAD}_{FOUND,LIBRARIES} will be set for each of the above
+-# - GPGME_INCLUDES is the same for all of the above
+-# - GPGME_FOUND is set if any of the above was found
++# There is one variant: gpgme.
++# - GPGME_VANILLA_{FOUND,LIBRARIES}
++# - GPGME_INCLUDES
++# - GPGME_FOUND is set if gpgme was found
+ #
+ # GPGME_LIBRARY_DIR - the directory where the libraries are located
+
+@@ -54,7 +49,7 @@
+ # don't require 2.6.3 but 2.6.2, we can't use it. Alex
+ set( _seem_to_have_cached_gpgme false )
+ if ( GPGME_INCLUDES )
+- if ( GPGME_VANILLA_LIBRARIES OR GPGME_QT_LIBRARIES OR GPGME_GLIB_LIBRARIES )
++ if ( GPGME_VANILLA_LIBRARIES OR GPGME_GLIB_LIBRARIES )
+ set( _seem_to_have_cached_gpgme true )
+ endif()
+ endif()
+@@ -63,11 +58,10 @@
+
+ macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND )
+ macro_bool_to_bool( GPGME_GLIB_LIBRARIES GPGME_GLIB_FOUND )
+- macro_bool_to_bool( GPGME_QT_LIBRARIES GPGME_QT_FOUND )
+ # this would have been preferred:
+ #set( GPGME_*_FOUND macro_bool_to_bool(GPGME_*_LIBRARIES) )
+
+- if ( GPGME_VANILLA_FOUND OR GPGME_GLIB_FOUND OR GPGME_QT_FOUND )
++ if ( GPGME_VANILLA_FOUND OR GPGME_GLIB_FOUND )
+ set( GPGME_FOUND true )
+ else()
+ set( GPGME_FOUND false )
+@@ -84,7 +78,6 @@
+ set( GPGME_FOUND false )
+ set( GPGME_VANILLA_FOUND false )
+ set( GPGME_GLIB_FOUND false )
+- set( GPGME_QT_FOUND false )
+
+ find_path( GPGME_INCLUDES gpgme.h
+ ${CMAKE_INCLUDE_PATH}
+@@ -103,12 +96,6 @@
+ ${CMAKE_INSTALL_PREFIX}/lib
+ )
+
+- find_library( _gpgme_qt_library NAMES gpgme-qt libgpgme-qt gpgme-qt-11 libgpgme-qt-11
+- PATHS
+- ${CMAKE_LIBRARY_PATH}
+- ${CMAKE_INSTALL_PREFIX}/lib
+- )
+-
+ find_library( _gpg_error_library NAMES gpg-error libgpg-error gpg-error-0 libgpg-error-0
+ PATHS
+ ${CMAKE_LIBRARY_PATH}
+@@ -129,24 +116,11 @@
+ set( GPGME_FOUND true )
+ endif()
+
+- if ( _gpgme_qt_library AND _gpg_error_library )
+- set( GPGME_QT_LIBRARIES ${_gpgme_qt_library} ${_gpg_error_library} )
+- set( GPGME_QT_FOUND true )
+- set( GPGME_FOUND true )
+- endif()
+-
+ endif()
+
+- # these are Unix-only:
+- set( GPGME_PTHREAD_FOUND false )
+- set( GPGME_PTH_FOUND false )
+- set( HAVE_GPGME_PTHREAD 0 )
+- set( HAVE_GPGME_PTH 0 )
+-
+ macro_bool_to_01( GPGME_FOUND HAVE_GPGME )
+ macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA )
+ macro_bool_to_01( GPGME_GLIB_FOUND HAVE_GPGME_GLIB )
+- macro_bool_to_01( GPGME_QT_FOUND HAVE_GPGME_QT )
+
+ else() # not WIN32
+
+@@ -156,7 +130,7 @@
+ # see WIN32 case for an explanation of what this does:
+ set( _seem_to_have_cached_gpgme false )
+ if ( GPGME_INCLUDES )
+- if ( GPGME_VANILLA_LIBRARIES OR GPGME_PTHREAD_LIBRARIES OR GPGME_PTH_LIBRARIES )
++ if ( GPGME_VANILLA_LIBRARIES )
+ set( _seem_to_have_cached_gpgme true )
+ endif()
+ endif()
+@@ -164,10 +138,8 @@
+ if ( _seem_to_have_cached_gpgme )
+
+ macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND )
+- macro_bool_to_bool( GPGME_PTHREAD_LIBRARIES GPGME_PTHREAD_FOUND )
+- macro_bool_to_bool( GPGME_PTH_LIBRARIES GPGME_PTH_FOUND )
+
+- if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
++ if ( GPGME_VANILLA_FOUND )
+ set( GPGME_FOUND true )
+ else()
+ set( GPGME_FOUND false )
+@@ -177,8 +149,6 @@
+
+ set( GPGME_FOUND false )
+ set( GPGME_VANILLA_FOUND false )
+- set( GPGME_PTHREAD_FOUND false )
+- set( GPGME_PTH_FOUND false )
+
+ find_program( _GPGMECONFIG_EXECUTABLE NAMES gpgme-config )
+
+@@ -189,8 +159,8 @@
+
+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION )
+
+- set( _GPGME_MIN_VERSION "1.1.7" )
+- if( ${GPGME_VERSION} VERSION_GREATER ${_GPGME_MIN_VERSION} )
++ set( _GPGME_MIN_VERSION "1.8.0" )
++ if( NOT ${GPGME_VERSION} VERSION_LESS ${_GPGME_MIN_VERSION} )
+ set( _GPGME_INSTALLED_VERSION_OK TRUE )
+ endif()
+
+@@ -207,24 +177,14 @@
+ set( _gpgme_config_vanilla_libs )
+ endif()
+
+- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
+- if ( _ret )
+- set( _gpgme_config_pthread_libs )
+- endif()
+-
+- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth --libs OUTPUT_VARIABLE _gpgme_config_pth_libs RETURN_VALUE _ret )
+- if ( _ret )
+- set( _gpgme_config_pth_libs )
+- endif()
+-
+ # append -lgpg-error to the list of libraries, if necessary
+- foreach ( _flavour vanilla pthread pth )
++ foreach ( _flavour vanilla )
+ if ( _gpgme_config_${_flavour}_libs AND NOT _gpgme_config_${_flavour}_libs MATCHES "lgpg-error" )
+ set( _gpgme_config_${_flavour}_libs "${_gpgme_config_${_flavour}_libs} -lgpg-error" )
+ endif()
+ endforeach()
+
+- if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs OR _gpgme_config_pth_libs )
++ if ( _gpgme_config_vanilla_libs )
+
+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _GPGME_CFLAGS )
+
+@@ -233,7 +193,7 @@
+ string( REGEX REPLACE " *-I" ";" GPGME_INCLUDES "${_GPGME_CFLAGS}" )
+ endif()
+
+- foreach ( _flavour vanilla pthread pth )
++ foreach ( _flavour vanilla )
+ if ( _gpgme_config_${_flavour}_libs )
+
+ set( _gpgme_library_dirs )
+@@ -291,13 +251,11 @@
+ endforeach( _flavour )
+
+ # ensure that they are cached
+- # This comment above doesn't make sense, the four following lines seem to do nothing. Alex
++ # This comment above doesn't make sense, the two following lines seem to do nothing. Alex
+ set( GPGME_INCLUDES ${GPGME_INCLUDES} )
+ set( GPGME_VANILLA_LIBRARIES ${GPGME_VANILLA_LIBRARIES} )
+- set( GPGME_PTHREAD_LIBRARIES ${GPGME_PTHREAD_LIBRARIES} )
+- set( GPGME_PTH_LIBRARIES ${GPGME_PTH_LIBRARIES} )
+
+- if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
++ if ( GPGME_VANILLA_FOUND )
+ set( GPGME_FOUND true )
+ else()
+ set( GPGME_FOUND false )
+@@ -313,14 +271,10 @@
+
+ # these are Windows-only:
+ set( GPGME_GLIB_FOUND false )
+- set( GPGME_QT_FOUND false )
+ set( HAVE_GPGME_GLIB 0 )
+- set( HAVE_GPGME_QT 0 )
+
+ macro_bool_to_01( GPGME_FOUND HAVE_GPGME )
+ macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA )
+- macro_bool_to_01( GPGME_PTHREAD_FOUND HAVE_GPGME_PTHREAD )
+- macro_bool_to_01( GPGME_PTH_FOUND HAVE_GPGME_PTH )
+
+ endif() # WIN32 | Unix
+
+@@ -335,20 +289,8 @@
+ set( _gpgme_flavours "${_gpgme_flavours} Glib" )
+ endif()
+
+-if ( GPGME_QT_FOUND )
+- set( _gpgme_flavours "${_gpgme_flavours} Qt" )
+-endif()
+-
+-if ( GPGME_PTHREAD_FOUND )
+- set( _gpgme_flavours "${_gpgme_flavours} pthread" )
+-endif()
+-
+-if ( GPGME_PTH_FOUND )
+- set( _gpgme_flavours "${_gpgme_flavours} pth" )
+-endif()
+-
+ # determine the library in one of the found flavours, can be reused e.g. by FindQgpgme.cmake, Alex
+-foreach(_currentFlavour vanilla glib qt pth pthread)
++foreach(_currentFlavour vanilla glib)
+ if(NOT GPGME_LIBRARY_DIR)
+ get_filename_component(GPGME_LIBRARY_DIR "${_gpgme_${_currentFlavour}_lib}" PATH)
+ endif()
+--- /cmake/modules/FindQGpgme.cmake
++++ /cmake/modules/FindQGpgme.cmake
+@@ -12,13 +12,8 @@
+
+ if(GPGME_FOUND)
+
+- if ( WIN32 )
+- find_library(_QGPGME_EXTRA_LIBRARY gpgme++
+- HINTS ${GPGME_LIBRARY_DIR})
+- else ( WIN32 )
+- find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread
+- HINTS ${GPGME_LIBRARY_DIR})
+- endif()
++ find_library(_QGPGME_EXTRA_LIBRARY gpgme++
++ HINTS ${GPGME_LIBRARY_DIR})
+
+ find_library(QGPGME_LIBRARY qgpgme
+ HINTS ${GPGME_LIBRARY_DIR})
+@@ -31,11 +26,7 @@
+ HINTS "${_QGPGME_PREFIX}/include" )
+ endif()
+
+- if ( WIN32 )
+- set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES} ${GPGME_QT_LIBRARIES})
+- else ( WIN32 )
+- set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_PTHREAD_LIBRARIES})
+- endif()
++ set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES})
+
+ endif()
+
+--- /gpgme++/CMakeLists.txt
++++ /gpgme++/CMakeLists.txt
+@@ -10,9 +10,9 @@
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-gpgme++.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gpgme++.h )
+
+-## gpgme comes in three flavours on each of the platforms:
+-## Windows: gpgme, gpgme-glib, gpgme-qt
+-## Unix: gpgme, gpgme-pthread, gpgme-pth
++## gpgme comes in these flavours on each of the platforms:
++## Windows: gpgme, gpgme-glib
++## Unix: gpgme
+ ## We're building corresponding gpgme++ flavours
+
+ set(gpgme_LIB_SRCS
+@@ -76,47 +76,6 @@
+ endif()
+
+
+-if ( GPGME_QT_FOUND )
+- add_library( gpgmepp-qt ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_qt.cpp )
+- target_link_libraries( gpgmepp-qt LINK_PRIVATE ${GPGME_QT_LIBRARIES} )
+- if(WIN32)
+- target_link_libraries( gpgmepp-qt LINK_PRIVATE ${GPGME_VANILLA_LIBRARIES} )
+- endif()
+- set_target_properties( gpgmepp-qt PROPERTIES
+- VERSION ${_gpgmepp_version}
+- SOVERSION ${_gpgmepp_soversion}
+- OUTPUT_NAME gpgme++-qt DEFINE_SYMBOL gpgmepp_EXPORTS
+- )
+- set(GPGMEPP_QT_LIBRARY ${LIBRARY_OUTPUT_PATH}/libgpgmepp.so)
+- install(TARGETS gpgmepp-qt EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+-endif()
+-
+-
+-if ( GPGME_PTHREAD_FOUND )
+- add_library( gpgmepp-pthread ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_vanilla.cpp )
+- target_link_libraries( gpgmepp-pthread LINK_PRIVATE ${GPGME_PTHREAD_LIBRARIES} )
+- set_target_properties( gpgmepp-pthread PROPERTIES
+- VERSION ${_gpgmepp_version}
+- SOVERSION ${_gpgmepp_soversion}
+- OUTPUT_NAME gpgme++-pthread DEFINE_SYMBOL gpgmepp_EXPORTS
+- )
+- set(GPGMEPP_PTHREAD_LIBRARY ${LIBRARY_OUTPUT_PATH}/libgpgmepp.so)
+- install(TARGETS gpgmepp-pthread EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+-endif()
+-
+-if ( GPGME_PTH_FOUND )
+- add_library( gpgmepp-pth ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_vanilla.cpp )
+- target_link_libraries( gpgmepp-pth LINK_PRIVATE ${GPGME_PTH_LIBRARIES} )
+- set_target_properties( gpgmepp-pth PROPERTIES
+- VERSION ${_gpgmepp_version}
+- SOVERSION ${_gpgmepp_soversion}
+- OUTPUT_NAME gpgme++-pth DEFINE_SYMBOL gpgmepp_EXPORTS
+- )
+- set(GPGMEPP_PTH_LIBRARY ${LIBRARY_OUTPUT_PATH}/libgpgmepp.so)
+- install(TARGETS gpgmepp-pth EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+-endif()
+-
+-
+ ########### install files ###############
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GpgmeppConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppConfig.cmake @ONLY )
+--- /gpgme++/GpgmeppConfig.cmake.in
++++ /gpgme++/GpgmeppConfig.cmake.in
+@@ -5,21 +5,6 @@
+ set( GPGMEPP_VANILLA_LIBRARIES "@GPGMEPP_VANILLA_LIBRARY@" )
+ endif()
+
+-set( GPGMEPP_PTHREAD_FOUND @HAVE_GPGME_PTHREAD@ )
+-if ( GPGMEPP_PTHREAD_FOUND )
+- set( GPGMEPP_PTHREAD_LIBRARIES "@GPGMEPP_PTHREAD_LIBRARY@" )
+-endif()
+-
+-set( GPGMEPP_PTH_FOUND @HAVE_GPGME_PTH@ )
+-if ( GPGMEPP_PTH_FOUND )
+- set( GPGMEPP_PTH_LIBRARIES "@GPGMEPP_PTH_LIBRARY@" )
+-endif()
+-
+-set( GPGMEPP_QT_FOUND @HAVE_GPGME_QT@ )
+-if ( GPGMEPP_QT_FOUND )
+- set( GPGMEPP_QT_LIBRARIES "@GPGMEPP_QT_LIBRARY@" )
+-endif()
+-
+ set( GPGMEPP_GLIB_FOUND @HAVE_GPGME_GLIB@ )
+ if ( GPGMEPP_GLIB_FOUND )
+ set( GPGMEPP_GLIB_LIBRARIES "@GPGMEPP_GLIB_LIBRARY@" )
+--- /gpgme++/context_qt.cpp
++++ /gpgme++/context_qt.cpp
+@@ -1,43 +0,0 @@
+-/*
+- context_qt.cpp - wraps a gpgme key context, gpgme-qt-specific functions
+- Copyright (C) 2007 Klarälvdalens Datakonsult AB
+-
+- This file is part of GPGME++.
+-
+- GPGME++ is free software; you can redistribute it and/or
+- modify it under the terms of the GNU Library General Public
+- License as published by the Free Software Foundation; either
+- version 2 of the License, or (at your option) any later version.
+-
+- GPGME++ is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU Library General Public License for more details.
+-
+- You should have received a copy of the GNU Library General Public License
+- along with GPGME++; see the file COPYING.LIB. If not, write to the
+- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- Boston, MA 02110-1301, USA.
+-*/
+-
+-#include
+-
+-#include
+-
+-#ifdef HAVE_GPGME_GET_FDPTR
+-extern "C" QIODevice * gpgme_get_fdptr( int );
+-#endif
+-
+-GIOChannel * GpgME::getGIOChannel( int ) {
+- return 0;
+-}
+-
+-QIODevice * GpgME::getQIODevice( int fd ) {
+-#ifdef HAVE_GPGME_GET_FDPTR
+- return gpgme_get_fdptr( fd );
+-#else
+- (void)fd;
+- return 0;
+-#endif
+-}
+-
+--- /qgpgme/CMakeLists.txt
++++ /qgpgme/CMakeLists.txt
+@@ -6,8 +6,7 @@
+
+ if ( WIN32 AND GPGME_VANILLA_FOUND )
+
+- # on Windows, we require gpgme(-vanilla), which is thread-safe,
+- # and we don't provide gpgme-qt support
++ # on Windows, we require gpgme(-vanilla), which is thread-safe
+
+ set( _any_gpgme_found true )
+ set( _qgpgme_libgpgme gpgmepp )
+@@ -15,14 +14,12 @@
+
+ endif()
+
+-if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
++if ( NOT WIN32 AND GPGME_VANILLA_FOUND )
+
+- # on Unix, we requrie gpgme-pthread (for convenience, since vanilla
+- # gpgme isn't thread-aware, and we don't want to restrict clients
+- # of qgpgme to non-threaded useage of gpgme)
++ # on Unix, we require gpgme(-vanilla), which is thread-safe
+
+ set( _any_gpgme_found true )
+- set( _qgpgme_libgpgme gpgmepp-pthread )
++ set( _qgpgme_libgpgme gpgmepp )
+ set( _qgpgme_extra_src eventloopinteractor.cpp eventloopinteractor_unix.cpp )
+ set( _qgpgme_extra_headers eventloopinteractor.h )
+
+--- /qgpgme/tests/CMakeLists.txt
++++ /qgpgme/tests/CMakeLists.txt
+@@ -1,11 +1,7 @@
+-if ( WIN32 AND GPGME_VANILLA_FOUND )
++if ( GPGME_VANILLA_FOUND )
+ set( _qgpgme_libgpgme gpgmepp )
+ endif()
+
+-if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
+- set( _qgpgme_libgpgme gpgmepp-pthread )
+-endif()
+-
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ include_directories( ${GPGME_INCLUDES} )
+ include_directories( ${Boost_INCLUDE_DIR} )
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r4.ebuild
+++ a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+ >=app-crypt/gpgme-1.8.0
+ >=dev-libs/boost-1.35.0-r5:=
+ dev-libs/cyrus-sasl
+ dev-libs/libgpg-error
+ >=dev-libs/libical-0.48-r2:=
+ >=dev-libs/qjson-0.8.1
+ kde-apps/akonadi:4
+ media-libs/phonon[qt4]
+ x11-misc/shared-mime-info
+ prison? ( kde-frameworks/prison:4 )
+ ldap? ( net-nds/openldap )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.14.11-boostincludes.patch"
+ "${FILESDIR}/${PN}-CVE-2016-7966-r1.patch"
+)
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-gpgme-1.8.patch"
+
+ # Avoid file collisions with >=app-crypt/gpgme-1.7.0[cxx,qt5].
+ mv gpgme++ kde4_gpgme++ || die
+ mv qgpgme kde4_qgpgme || die
+ mv cmake/modules/FindQGpgme.cmake cmake/modules/FindKDE4_QGpgme.cmake || die
+ find kde4_gpgme++ kde4_qgpgme "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ eapply "${FILESDIR}/${P}-gpgme++_and_qgpgme_renaming.patch"
+
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_doc=$(usex handbook)
+ $(cmake-utils_use_find_package ldap Ldap)
+ $(cmake-utils_use_find_package prison Prison)
+ )
+
+ kde4-base_src_configure
+}
+
+src_install() {
+ kde4-base_src_install
+
+ # Collides with net-im/choqok
+ rm "${ED}"usr/share/apps/cmake/modules/FindQtOAuth.cmake || die
+
+ # contains constants/defines only
+ QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
+}
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r4.ebuild
+++ a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps"
+COMMIT_ID="a791b69599c3571ff2f4b1cc9033d8fb30f1bc33"
+SRC_URI="https://quickgit.kde.org/?p=kdepimlibs.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+ >=app-crypt/gpgme-1.8.0
+ >=dev-libs/boost-1.35.0-r5:=
+ dev-libs/cyrus-sasl
+ dev-libs/libgpg-error
+ >=dev-libs/libical-0.48-r2:=
+ >=dev-libs/qjson-0.8.1
+ kde-apps/akonadi:4
+ media-libs/phonon[qt4]
+ x11-misc/shared-mime-info
+ prison? ( kde-frameworks/prison:4 )
+ ldap? ( net-nds/openldap )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.14.11-boostincludes.patch"
+ "${FILESDIR}/${PN}-CVE-2016-7966-r1.patch"
+)
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-gpgme-1.8.patch"
+
+ # Avoid file collisions with >=app-crypt/gpgme-1.7.0[cxx,qt5].
+ mv gpgme++ kde4_gpgme++ || die
+ mv qgpgme kde4_qgpgme || die
+ mv cmake/modules/FindQGpgme.cmake cmake/modules/FindKDE4_QGpgme.cmake || die
+ find kde4_gpgme++ kde4_qgpgme "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ eapply "${FILESDIR}/${P}-gpgme++_and_qgpgme_renaming.patch"
+
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_doc=$(usex handbook)
+ $(cmake-utils_use_find_package ldap Ldap)
+ $(cmake-utils_use_find_package prison Prison)
+ )
+
+ kde4-base_src_configure
+}
+
+src_install() {
+ kde4-base_src_install
+
+ # Collides with net-im/choqok
+ rm "${ED}"usr/share/apps/cmake/modules/FindQtOAuth.cmake || die
+
+ # contains constants/defines only
+ QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
+}
--
>=kde-apps/kdepimlibs-4.14.10-r3
---
...0211-update_gpgme++_and_qgpgme_references.patch | 348 +++++++++++++++++++++
...6.01-update_gpgme++_and_qgpgme_references.patch | 254 +++++++++++++++
.../kaddressbook-4.14.11_pre20160211-r1.ebuild | 76 +++++
.../kaddressbook-4.4.2016.01-r1.ebuild | 75 +++++
4 files changed, 753 insertions(+)
create mode 100644 kde-apps/kaddressbook/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/kaddressbook/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211-r1.ebuild
create mode 100644 kde-apps/kaddressbook/kaddressbook-4.4.2016.01-r1.ebuild
--- a/kde-apps/kaddressbook/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kaddressbook/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,348 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -153,8 +153,8 @@
+
+ # If the KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -175,8 +175,8 @@
+ find_package(ZLIB)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
+
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgMe library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ find_package(Grantlee 0.4.0 QUIET CONFIG)
+ set_package_properties(Grantlee PROPERTIES DESCRIPTION "The Grantlee Template System" URL "http://www.gitorious.org/grantlee/pages/Home" TYPE REQUIRED PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." )
+@@ -253,13 +253,13 @@
+ add_subdirectory(messagelist)
+ add_subdirectory(templateparser)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif()
+ endif()
+
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(messagecomposer)
+ add_subdirectory(pimcommon)
+--- /examples/etm_usage/CMakeLists.txt
++++ /examples/etm_usage/CMakeLists.txt
+@@ -45,7 +45,7 @@
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KABC_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBSS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -28,8 +28,8 @@
+ add_subdirectory(icons)
+ add_subdirectory(printing)
+ add_subdirectory(tests)
+-if(QGPGME_FOUND)
+- add_definitions(-DQGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
++ add_definitions(-DKDE4_QGPGME_FOUND)
+ endif()
+
+ set(kaddressbook_sendmail_SRCS
+@@ -166,8 +166,8 @@
+ add_subdirectory(gravatar/autotests)
+ add_subdirectory(gravatar/tests)
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ if(PRISON_FOUND)
+@@ -200,8 +200,8 @@
+ grantleetheme
+ )
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
++++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
+@@ -26,12 +26,12 @@
+
+ #include
+
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ #include
+ #include
+ #include
+ #include
+-#endif // QGPGME_FOUND
++#endif // KDE4_QGPGME_FOUND
+
+ #include
+
+@@ -409,7 +409,7 @@
+
+ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
+ {
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
+ ( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
+ if ( fingerprint.isEmpty() ) {
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${CMAKE_SOURCE_DIR}/mobile/lib
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES}
+ )
+
+@@ -367,7 +367,7 @@
+ target_link_libraries(kleopatra_bin
+ ${_kleopatra_extra_libs}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,6 +21,6 @@
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
+
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ target_link_libraries(kwatchgnupg
+ ${KDE4_KDEUI_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -62,7 +62,7 @@
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ ########### next target ###############
+@@ -100,13 +100,13 @@
+ if(WIN32)
+ target_link_libraries(test_uiserver
+ ${ASSUAN_VANILLA_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ws2_32
+ )
+ else()
+ target_link_libraries(test_uiserver
+ ${ASSUAN_PTHREAD_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endif()
+
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -315,7 +315,7 @@
+ ${KDEPIMLIBS_KRESOURCES_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ksieve
+ ksieveui
+ kpgp
+--- /kmail/kcm_kpimidentities/CMakeLists.txt
++++ /kmail/kcm_kpimidentities/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
+ kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
+ target_link_libraries(kcm_kpimidentities
+- ${KDEPIMLIBS_GPGMEPP_LIBS}
++ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ )
+
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory(kmail)
+ endif()
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -104,7 +104,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ kleo
+ ${KDE4_KDECORE_LIBS}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTGUI_LIBRARY} )
+ endif ()
+
+@@ -25,7 +25,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -35,7 +35,7 @@
+
+ kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
+
+-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+ endif ()
+
+ ########### next target ###############
+@@ -45,7 +45,7 @@
+
+ kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
+
+-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -63,7 +63,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messagecomposer/CMakeLists.txt
++++ /messagecomposer/CMakeLists.txt
+@@ -123,7 +123,7 @@
+
+ kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
+ target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
++ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
+
+ set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+--- /messagecomposer/tests/CMakeLists.txt
++++ /messagecomposer/tests/CMakeLists.txt
+@@ -41,7 +41,7 @@
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endmacro()
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -206,7 +206,7 @@
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+ ${KDE4_KDEUI_LIBS}
+ ${KDE4_KPRINTUTILS_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${_mailwebview_lib}
+ ${Grantlee_CORE_LIBRARIES}
+ ${KDE4_KNEWSTUFF3_LIBS}
+--- /messageviewer/tests/CMakeLists.txt
++++ /messageviewer/tests/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ target_link_libraries( ${_name}
+ messageviewer
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
+--- /templateparser/CMakeLists.txt
++++ /templateparser/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ kleo
+ kpgp
+ pimcommon
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTWEBKIT_LIBRARY}
+ )
+ set_target_properties(templateparser PROPERTIES
+--- /templateparser/tests/CMakeLists.txt
++++ /templateparser/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ kleo
+ templateparser
+ messageviewer
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
--- a/kde-apps/kaddressbook/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kaddressbook/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,254 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -70,8 +70,8 @@
+
+ # The KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -96,8 +96,8 @@
+ find_package(Strigi)
+ macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
+
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" FALSE "" "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ set(SDO_MIN_VERSION 0.2)
+ set(SOPRANO_MIN_VERSION 2.3.70)
+@@ -188,12 +188,12 @@
+ add_subdirectory(messagecore)
+ add_subdirectory(messagelist)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if (Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(wizards)
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(kmail)
+
+@@ -214,7 +214,7 @@
+ # include( SopranoAddOntology )
+ # add_subdirectory( ontologies )
+ # add_subdirectory( nepomuk_email_feeder )
+- endif(QGPGME_FOUND)
++ endif(KDE4_QGPGME_FOUND)
+
+ if(KDEPIM_BUILD_EVERYTHING)
+ macro_optional_add_subdirectory(knode)
+@@ -254,13 +254,13 @@
+ macro_optional_add_subdirectory(doc)
+
+
+-# We really want to encourage users to enable/install QGpgME from kdepimlibs
+-if(NOT QGPGME_FOUND)
+- # Users must be aware that QGpgMe is really needed
+- message(STATUS "*** WARNING: QGpgME is not installed on your system ***")
++# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
++if(NOT KDE4_QGPGME_FOUND)
++ # Users must be aware that KDE4_QGpgMe is really needed
++ message(STATUS "*** WARNING: KDE4_QGpgME is not installed on your system ***")
+ message(STATUS "*** It is required if you want to use KMail, KOrganizer or Kleopatra ***")
+ message(STATUS "*** You are really encouraged to install it ***")
+-endif(NOT QGPGME_FOUND)
++endif(NOT KDE4_QGPGME_FOUND)
+ # All done, let's display what we found...
+ macro_display_feature_log()
+
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -19,7 +19,7 @@
+
+ target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
+ akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
+- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
++ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -5,9 +5,9 @@
+ add_subdirectory( common )
+ add_subdirectory( interfaces )
+ add_subdirectory( printing )
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ add_subdirectory( editors )
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ add_subdirectory( views )
+ add_subdirectory( features )
+ add_subdirectory( kcmconfigs )
+--- /kaddressbook/xxport/CMakeLists.txt
++++ /kaddressbook/xxport/CMakeLists.txt
+@@ -22,7 +22,7 @@
+
+
+ ########### next target ###############
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
+
+
+@@ -30,10 +30,10 @@
+
+
+
+-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+
+ install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+
+ ########### next target ###############
+
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${CMAKE_SOURCE_DIR}/libkleo
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES} )
+ if (USABLE_ASSUAN_FOUND)
+ if (ASSUAN2_FOUND)
+@@ -321,7 +321,7 @@
+ set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
++target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
+ if ( USABLE_ASSUAN_FOUND )
+ target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
+ ENDIF ( USABLE_ASSUAN_FOUND )
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
++target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -40,7 +40,7 @@
+ add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
+ add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
+ kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
+-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -67,9 +67,9 @@
+ endif ( ASSUAN2_FOUND )
+
+ if(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
++ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
+ else(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
++ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
+ endif(WIN32)
+ if (KDEPIM_ONLY_KLEO)
+ install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -371,7 +371,7 @@
+ ${KDE4_KPARTS_LIBRARY}
+ ${KDE4_KRESOURCES_LIBRARY}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ mimelib
+ ksieve
+ kpgp
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory( kmail )
+ endif(BUILD_kmail)
+@@ -15,7 +15,7 @@
+ add_subdirectory( specialdates )
+ add_subdirectory( planner )
+ endif()
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ if (BUILD_knotes)
+ add_subdirectory( knotes )
+ endif (BUILD_knotes)
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -99,7 +99,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -54,7 +54,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -58,7 +58,7 @@
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
+ ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
+- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
++ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
+ )
+
+ include_directories(
--- a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211-r1.ebuild
+++ a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book"
+HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
+COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
+SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r4)
+ $(add_kdeapps_dep kdepim-common-libs)
+ dev-libs/grantlee:0
+ !kde-base/contactthemeeditor
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+ grantleeeditor/contactthemeeditor
+ plugins/kaddressbook/
+ plugins/ktexteditor/
+"
+KMCOMPILEONLY="
+ grantleetheme/
+ kaddressbookgrantlee/
+"
+KMEXTRACTONLY="
+ akonadi_next/
+ calendarsupport/
+ grantleeeditor/grantleethemeeditor/
+ libkleo/
+ pimcommon/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
+ echo
+ elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
+ echo
+ fi
+}
--- a/kde-apps/kaddressbook/kaddressbook-4.4.2016.01-r1.ebuild
+++ a/kde-apps/kaddressbook/kaddressbook-4.4.2016.01-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book (noakonadi branch)"
+HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs '' 4.14.10-r4)
+ $(add_kdeapps_dep libkdepim '' 4.4.2015)
+ $(add_kdeapps_dep libkleo '' 4.4.2015)
+ kde-frameworks/kdelibs:4
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+ plugins/kaddressbook/
+ plugins/ktexteditor/
+"
+KMEXTRACTONLY="
+ libkleo/
+"
+
+KMLOADLIBS="libkdepim"
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+}
+
+src_install() {
+ kde4-meta_src_install
+
+ # file collision with kde-apps/kdepimlibs-4.14.9
+ rm -f "${ED}usr/share/kde4/servicetypes/kaddressbookimprotocol.desktop" || die
+
+ # install additional headers needed by kresources
+ insinto "${KDEDIR}"/include/${PN}
+ doins "${CMAKE_BUILD_DIR}"/${PN}/common/*.h
+ doins "${S}"/${PN}/common/*.h
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
+ echo
+ elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
+ echo
+ fi
+}
--
>=kde-apps/kdepimlibs-4.14.11_pre20160211-r3
---
...0211-update_gpgme++_and_qgpgme_references.patch | 348 +++++++++++++++++++++
...depim-common-libs-4.14.11_pre20160211-r2.ebuild | 113 +++++++
2 files changed, 461 insertions(+)
create mode 100644 kde-apps/kdepim-common-libs/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r2.ebuild
--- a/kde-apps/kdepim-common-libs/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kdepim-common-libs/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,348 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -153,8 +153,8 @@
+
+ # If the KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -175,8 +175,8 @@
+ find_package(ZLIB)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
+
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgMe library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ find_package(Grantlee 0.4.0 QUIET CONFIG)
+ set_package_properties(Grantlee PROPERTIES DESCRIPTION "The Grantlee Template System" URL "http://www.gitorious.org/grantlee/pages/Home" TYPE REQUIRED PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." )
+@@ -253,13 +253,13 @@
+ add_subdirectory(messagelist)
+ add_subdirectory(templateparser)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif()
+ endif()
+
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(messagecomposer)
+ add_subdirectory(pimcommon)
+--- /examples/etm_usage/CMakeLists.txt
++++ /examples/etm_usage/CMakeLists.txt
+@@ -45,7 +45,7 @@
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KABC_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBSS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -28,8 +28,8 @@
+ add_subdirectory(icons)
+ add_subdirectory(printing)
+ add_subdirectory(tests)
+-if(QGPGME_FOUND)
+- add_definitions(-DQGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
++ add_definitions(-DKDE4_QGPGME_FOUND)
+ endif()
+
+ set(kaddressbook_sendmail_SRCS
+@@ -166,8 +166,8 @@
+ add_subdirectory(gravatar/autotests)
+ add_subdirectory(gravatar/tests)
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ if(PRISON_FOUND)
+@@ -200,8 +200,8 @@
+ grantleetheme
+ )
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
++++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
+@@ -26,12 +26,12 @@
+
+ #include
+
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ #include
+ #include
+ #include
+ #include
+-#endif // QGPGME_FOUND
++#endif // KDE4_QGPGME_FOUND
+
+ #include
+
+@@ -409,7 +409,7 @@
+
+ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
+ {
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
+ ( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
+ if ( fingerprint.isEmpty() ) {
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${CMAKE_SOURCE_DIR}/mobile/lib
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES}
+ )
+
+@@ -367,7 +367,7 @@
+ target_link_libraries(kleopatra_bin
+ ${_kleopatra_extra_libs}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,6 +21,6 @@
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
+
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ target_link_libraries(kwatchgnupg
+ ${KDE4_KDEUI_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -62,7 +62,7 @@
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ ########### next target ###############
+@@ -100,13 +100,13 @@
+ if(WIN32)
+ target_link_libraries(test_uiserver
+ ${ASSUAN_VANILLA_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ws2_32
+ )
+ else()
+ target_link_libraries(test_uiserver
+ ${ASSUAN_PTHREAD_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endif()
+
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -315,7 +315,7 @@
+ ${KDEPIMLIBS_KRESOURCES_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ksieve
+ ksieveui
+ kpgp
+--- /kmail/kcm_kpimidentities/CMakeLists.txt
++++ /kmail/kcm_kpimidentities/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
+ kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
+ target_link_libraries(kcm_kpimidentities
+- ${KDEPIMLIBS_GPGMEPP_LIBS}
++ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ )
+
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory(kmail)
+ endif()
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -104,7 +104,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ kleo
+ ${KDE4_KDECORE_LIBS}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTGUI_LIBRARY} )
+ endif ()
+
+@@ -25,7 +25,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -35,7 +35,7 @@
+
+ kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
+
+-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+ endif ()
+
+ ########### next target ###############
+@@ -45,7 +45,7 @@
+
+ kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
+
+-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -63,7 +63,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messagecomposer/CMakeLists.txt
++++ /messagecomposer/CMakeLists.txt
+@@ -123,7 +123,7 @@
+
+ kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
+ target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
++ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
+
+ set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+--- /messagecomposer/tests/CMakeLists.txt
++++ /messagecomposer/tests/CMakeLists.txt
+@@ -41,7 +41,7 @@
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endmacro()
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -206,7 +206,7 @@
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+ ${KDE4_KDEUI_LIBS}
+ ${KDE4_KPRINTUTILS_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${_mailwebview_lib}
+ ${Grantlee_CORE_LIBRARIES}
+ ${KDE4_KNEWSTUFF3_LIBS}
+--- /messageviewer/tests/CMakeLists.txt
++++ /messageviewer/tests/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ target_link_libraries( ${_name}
+ messageviewer
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
+--- /templateparser/CMakeLists.txt
++++ /templateparser/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ kleo
+ kpgp
+ pimcommon
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTWEBKIT_LIBRARY}
+ )
+ set_target_properties(templateparser PROPERTIES
+--- /templateparser/tests/CMakeLists.txt
++++ /templateparser/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ kleo
+ templateparser
+ messageviewer
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
--- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r2.ebuild
+++ a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+KMNOMODULE="true"
+WEBKIT_REQUIRED="always"
+inherit kde4-meta
+
+DESCRIPTION="Common libraries for KDE PIM apps"
+COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
+SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug google"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r4)
+ app-crypt/gpgme
+ dev-libs/grantlee:0
+ kde-apps/akonadi:4
+ kde-frameworks/baloo:4
+ google? ( $(add_kdeapps_dep libkgapi '' 2.2.0) )
+"
+RDEPEND="${DEPEND}
+ !kde-apps/libkdepim:4
+ !kde-apps/libkleo:4
+ !kde-apps/libkpgp:4
+ !> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+ sed -e '/folderarchiveagent.desktop/d' \
+ -i agents/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package google LibKGAPI2)
+ )
+
+ kde4-meta_src_configure
+}
--
>=kde-apps/kdepimlibs-4.14.10-r3
---
...6.01-update_gpgme++_and_qgpgme_references.patch | 254 +++++++++++++++++++++
.../kdepim-wizards-4.4.2016.01-r1.ebuild | 57 +++++
2 files changed, 311 insertions(+)
create mode 100644 kde-apps/kdepim-wizards/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01-r1.ebuild
--- a/kde-apps/kdepim-wizards/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kdepim-wizards/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,254 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -70,8 +70,8 @@
+
+ # The KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -96,8 +96,8 @@
+ find_package(Strigi)
+ macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
+
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" FALSE "" "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ set(SDO_MIN_VERSION 0.2)
+ set(SOPRANO_MIN_VERSION 2.3.70)
+@@ -188,12 +188,12 @@
+ add_subdirectory(messagecore)
+ add_subdirectory(messagelist)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if (Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(wizards)
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(kmail)
+
+@@ -214,7 +214,7 @@
+ # include( SopranoAddOntology )
+ # add_subdirectory( ontologies )
+ # add_subdirectory( nepomuk_email_feeder )
+- endif(QGPGME_FOUND)
++ endif(KDE4_QGPGME_FOUND)
+
+ if(KDEPIM_BUILD_EVERYTHING)
+ macro_optional_add_subdirectory(knode)
+@@ -254,13 +254,13 @@
+ macro_optional_add_subdirectory(doc)
+
+
+-# We really want to encourage users to enable/install QGpgME from kdepimlibs
+-if(NOT QGPGME_FOUND)
+- # Users must be aware that QGpgMe is really needed
+- message(STATUS "*** WARNING: QGpgME is not installed on your system ***")
++# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
++if(NOT KDE4_QGPGME_FOUND)
++ # Users must be aware that KDE4_QGpgMe is really needed
++ message(STATUS "*** WARNING: KDE4_QGpgME is not installed on your system ***")
+ message(STATUS "*** It is required if you want to use KMail, KOrganizer or Kleopatra ***")
+ message(STATUS "*** You are really encouraged to install it ***")
+-endif(NOT QGPGME_FOUND)
++endif(NOT KDE4_QGPGME_FOUND)
+ # All done, let's display what we found...
+ macro_display_feature_log()
+
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -19,7 +19,7 @@
+
+ target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
+ akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
+- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
++ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -5,9 +5,9 @@
+ add_subdirectory( common )
+ add_subdirectory( interfaces )
+ add_subdirectory( printing )
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ add_subdirectory( editors )
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ add_subdirectory( views )
+ add_subdirectory( features )
+ add_subdirectory( kcmconfigs )
+--- /kaddressbook/xxport/CMakeLists.txt
++++ /kaddressbook/xxport/CMakeLists.txt
+@@ -22,7 +22,7 @@
+
+
+ ########### next target ###############
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
+
+
+@@ -30,10 +30,10 @@
+
+
+
+-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+
+ install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+
+ ########### next target ###############
+
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${CMAKE_SOURCE_DIR}/libkleo
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES} )
+ if (USABLE_ASSUAN_FOUND)
+ if (ASSUAN2_FOUND)
+@@ -321,7 +321,7 @@
+ set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
++target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
+ if ( USABLE_ASSUAN_FOUND )
+ target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
+ ENDIF ( USABLE_ASSUAN_FOUND )
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
++target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -40,7 +40,7 @@
+ add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
+ add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
+ kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
+-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -67,9 +67,9 @@
+ endif ( ASSUAN2_FOUND )
+
+ if(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
++ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
+ else(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
++ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
+ endif(WIN32)
+ if (KDEPIM_ONLY_KLEO)
+ install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -371,7 +371,7 @@
+ ${KDE4_KPARTS_LIBRARY}
+ ${KDE4_KRESOURCES_LIBRARY}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ mimelib
+ ksieve
+ kpgp
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory( kmail )
+ endif(BUILD_kmail)
+@@ -15,7 +15,7 @@
+ add_subdirectory( specialdates )
+ add_subdirectory( planner )
+ endif()
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ if (BUILD_knotes)
+ add_subdirectory( knotes )
+ endif (BUILD_knotes)
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -99,7 +99,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -54,7 +54,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -58,7 +58,7 @@
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
+ ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
+- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
++ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
+ )
+
+ include_directories(
--- a/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01-r1.ebuild
+++ a/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+KMMODULE="wizards"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM wizards (noakonadi branch)"
+HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
+IUSE="debug"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs '' 4.14.10-r4)
+ $(add_kdeapps_dep kdepim-kresources '' 4.4.2015)
+ $(add_kdeapps_dep libkdepim '' 4.4.2015)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+ kmail/
+ knotes/
+ kresources/groupwise/
+ kresources/kolab/
+ kresources/slox/
+"
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabcsloxprefs.h,kcalsloxprefs.h} \
+ kresources/slox/ \
+ || die "Failed to link extra_headers."
+ ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
+ kresources/groupwise/ \
+ || die "Failed to link extra_headers."
+
+ kde4-meta_src_prepare
+}
--
>=kde-apps/kdepimlibs-4.14.10-r3
---
...0211-update_gpgme++_and_qgpgme_references.patch | 348 +++++++++++++++++++++
...6.01-update_gpgme++_and_qgpgme_references.patch | 254 +++++++++++++++
.../kleopatra-4.14.11_pre20160211-r2.ebuild | 67 ++++
kde-apps/kleopatra/kleopatra-4.4.2016.01-r2.ebuild | 73 +++++
4 files changed, 742 insertions(+)
create mode 100644 kde-apps/kleopatra/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/kleopatra/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r2.ebuild
create mode 100644 kde-apps/kleopatra/kleopatra-4.4.2016.01-r2.ebuild
--- a/kde-apps/kleopatra/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kleopatra/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,348 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -153,8 +153,8 @@
+
+ # If the KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -175,8 +175,8 @@
+ find_package(ZLIB)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
+
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgMe library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ find_package(Grantlee 0.4.0 QUIET CONFIG)
+ set_package_properties(Grantlee PROPERTIES DESCRIPTION "The Grantlee Template System" URL "http://www.gitorious.org/grantlee/pages/Home" TYPE REQUIRED PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." )
+@@ -253,13 +253,13 @@
+ add_subdirectory(messagelist)
+ add_subdirectory(templateparser)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif()
+ endif()
+
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(messagecomposer)
+ add_subdirectory(pimcommon)
+--- /examples/etm_usage/CMakeLists.txt
++++ /examples/etm_usage/CMakeLists.txt
+@@ -45,7 +45,7 @@
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KABC_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBSS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -28,8 +28,8 @@
+ add_subdirectory(icons)
+ add_subdirectory(printing)
+ add_subdirectory(tests)
+-if(QGPGME_FOUND)
+- add_definitions(-DQGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
++ add_definitions(-DKDE4_QGPGME_FOUND)
+ endif()
+
+ set(kaddressbook_sendmail_SRCS
+@@ -166,8 +166,8 @@
+ add_subdirectory(gravatar/autotests)
+ add_subdirectory(gravatar/tests)
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ if(PRISON_FOUND)
+@@ -200,8 +200,8 @@
+ grantleetheme
+ )
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
++++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
+@@ -26,12 +26,12 @@
+
+ #include
+
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ #include
+ #include
+ #include
+ #include
+-#endif // QGPGME_FOUND
++#endif // KDE4_QGPGME_FOUND
+
+ #include
+
+@@ -409,7 +409,7 @@
+
+ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
+ {
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
+ ( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
+ if ( fingerprint.isEmpty() ) {
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${CMAKE_SOURCE_DIR}/mobile/lib
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES}
+ )
+
+@@ -367,7 +367,7 @@
+ target_link_libraries(kleopatra_bin
+ ${_kleopatra_extra_libs}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,6 +21,6 @@
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
+
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ target_link_libraries(kwatchgnupg
+ ${KDE4_KDEUI_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -62,7 +62,7 @@
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ ########### next target ###############
+@@ -100,13 +100,13 @@
+ if(WIN32)
+ target_link_libraries(test_uiserver
+ ${ASSUAN_VANILLA_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ws2_32
+ )
+ else()
+ target_link_libraries(test_uiserver
+ ${ASSUAN_PTHREAD_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endif()
+
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -315,7 +315,7 @@
+ ${KDEPIMLIBS_KRESOURCES_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ksieve
+ ksieveui
+ kpgp
+--- /kmail/kcm_kpimidentities/CMakeLists.txt
++++ /kmail/kcm_kpimidentities/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
+ kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
+ target_link_libraries(kcm_kpimidentities
+- ${KDEPIMLIBS_GPGMEPP_LIBS}
++ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ )
+
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory(kmail)
+ endif()
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -104,7 +104,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ kleo
+ ${KDE4_KDECORE_LIBS}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTGUI_LIBRARY} )
+ endif ()
+
+@@ -25,7 +25,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -35,7 +35,7 @@
+
+ kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
+
+-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+ endif ()
+
+ ########### next target ###############
+@@ -45,7 +45,7 @@
+
+ kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
+
+-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -63,7 +63,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messagecomposer/CMakeLists.txt
++++ /messagecomposer/CMakeLists.txt
+@@ -123,7 +123,7 @@
+
+ kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
+ target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
++ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
+
+ set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+--- /messagecomposer/tests/CMakeLists.txt
++++ /messagecomposer/tests/CMakeLists.txt
+@@ -41,7 +41,7 @@
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endmacro()
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -206,7 +206,7 @@
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+ ${KDE4_KDEUI_LIBS}
+ ${KDE4_KPRINTUTILS_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${_mailwebview_lib}
+ ${Grantlee_CORE_LIBRARIES}
+ ${KDE4_KNEWSTUFF3_LIBS}
+--- /messageviewer/tests/CMakeLists.txt
++++ /messageviewer/tests/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ target_link_libraries( ${_name}
+ messageviewer
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
+--- /templateparser/CMakeLists.txt
++++ /templateparser/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ kleo
+ kpgp
+ pimcommon
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTWEBKIT_LIBRARY}
+ )
+ set_target_properties(templateparser PROPERTIES
+--- /templateparser/tests/CMakeLists.txt
++++ /templateparser/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ kleo
+ templateparser
+ messageviewer
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
--- a/kde-apps/kleopatra/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kleopatra/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,254 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -70,8 +70,8 @@
+
+ # The KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -96,8 +96,8 @@
+ find_package(Strigi)
+ macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
+
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" FALSE "" "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ set(SDO_MIN_VERSION 0.2)
+ set(SOPRANO_MIN_VERSION 2.3.70)
+@@ -188,12 +188,12 @@
+ add_subdirectory(messagecore)
+ add_subdirectory(messagelist)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if (Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(wizards)
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(kmail)
+
+@@ -214,7 +214,7 @@
+ # include( SopranoAddOntology )
+ # add_subdirectory( ontologies )
+ # add_subdirectory( nepomuk_email_feeder )
+- endif(QGPGME_FOUND)
++ endif(KDE4_QGPGME_FOUND)
+
+ if(KDEPIM_BUILD_EVERYTHING)
+ macro_optional_add_subdirectory(knode)
+@@ -254,13 +254,13 @@
+ macro_optional_add_subdirectory(doc)
+
+
+-# We really want to encourage users to enable/install QGpgME from kdepimlibs
+-if(NOT QGPGME_FOUND)
+- # Users must be aware that QGpgMe is really needed
+- message(STATUS "*** WARNING: QGpgME is not installed on your system ***")
++# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
++if(NOT KDE4_QGPGME_FOUND)
++ # Users must be aware that KDE4_QGpgMe is really needed
++ message(STATUS "*** WARNING: KDE4_QGpgME is not installed on your system ***")
+ message(STATUS "*** It is required if you want to use KMail, KOrganizer or Kleopatra ***")
+ message(STATUS "*** You are really encouraged to install it ***")
+-endif(NOT QGPGME_FOUND)
++endif(NOT KDE4_QGPGME_FOUND)
+ # All done, let's display what we found...
+ macro_display_feature_log()
+
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -19,7 +19,7 @@
+
+ target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
+ akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
+- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
++ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -5,9 +5,9 @@
+ add_subdirectory( common )
+ add_subdirectory( interfaces )
+ add_subdirectory( printing )
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ add_subdirectory( editors )
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ add_subdirectory( views )
+ add_subdirectory( features )
+ add_subdirectory( kcmconfigs )
+--- /kaddressbook/xxport/CMakeLists.txt
++++ /kaddressbook/xxport/CMakeLists.txt
+@@ -22,7 +22,7 @@
+
+
+ ########### next target ###############
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
+
+
+@@ -30,10 +30,10 @@
+
+
+
+-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+
+ install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+
+ ########### next target ###############
+
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${CMAKE_SOURCE_DIR}/libkleo
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES} )
+ if (USABLE_ASSUAN_FOUND)
+ if (ASSUAN2_FOUND)
+@@ -321,7 +321,7 @@
+ set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
++target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
+ if ( USABLE_ASSUAN_FOUND )
+ target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
+ ENDIF ( USABLE_ASSUAN_FOUND )
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
++target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -40,7 +40,7 @@
+ add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
+ add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
+ kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
+-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -67,9 +67,9 @@
+ endif ( ASSUAN2_FOUND )
+
+ if(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
++ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
+ else(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
++ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
+ endif(WIN32)
+ if (KDEPIM_ONLY_KLEO)
+ install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -371,7 +371,7 @@
+ ${KDE4_KPARTS_LIBRARY}
+ ${KDE4_KRESOURCES_LIBRARY}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ mimelib
+ ksieve
+ kpgp
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory( kmail )
+ endif(BUILD_kmail)
+@@ -15,7 +15,7 @@
+ add_subdirectory( specialdates )
+ add_subdirectory( planner )
+ endif()
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ if (BUILD_knotes)
+ add_subdirectory( knotes )
+ endif (BUILD_knotes)
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -99,7 +99,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -54,7 +54,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -58,7 +58,7 @@
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
+ ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
+- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
++ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
+ )
+
+ include_directories(
--- a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r2.ebuild
+++ a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="Kleopatra - KDE X.509 key manager"
+HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra/"
+COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
+SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r4)
+ $(add_kdeapps_dep kdepim-common-libs)
+ >=app-crypt/gpgme-1.3.2
+ dev-libs/boost:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+"
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+"
+
+KMEXTRACTONLY="
+ libkleo/
+"
+
+PATCHES=( "${FILESDIR}/${PN}-install-headers.patch" )
+
+src_unpack() {
+ if use handbook; then
+ KMEXTRA="
+ doc/kwatchgnupg
+ "
+ fi
+
+ kde4-meta_src_unpack
+}
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+}
--- a/kde-apps/kleopatra/kleopatra-4.4.2016.01-r2.ebuild
+++ a/kde-apps/kleopatra/kleopatra-4.4.2016.01-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="Kleopatra - KDE X.509 key manager (noakonadi branch)"
+HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ app-crypt/gpgme
+ >=dev-libs/libassuan-2.0.0
+ dev-libs/libgpg-error
+ $(add_kdeapps_dep kdepimlibs '' 4.14.10-r4)
+ $(add_kdeapps_dep libkdepim '' 4.4.2015)
+ $(add_kdeapps_dep libkleo '' 4.4.2015)
+"
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+"
+
+RESTRICT=test
+# bug 399431
+
+KMEXTRACTONLY="
+ libkleo
+"
+KMLOADLIBS="libkleo"
+
+src_unpack() {
+ if use handbook; then
+ KMEXTRA="
+ doc/kwatchgnupg
+ "
+ fi
+
+ kde4-meta_src_unpack
+}
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DWITH_QGPGME=ON
+ )
+
+ kde4-meta_src_configure
+}
--
>=kde-apps/kdepimlibs-4.14.10-r3
---
...0211-update_gpgme++_and_qgpgme_references.patch | 348 +++++++++++++++++++++
...6.01-update_gpgme++_and_qgpgme_references.patch | 254 +++++++++++++++
kde-apps/kmail/kmail-4.14.11_pre20160211-r2.ebuild | 130 ++++++++
kde-apps/kmail/kmail-4.4.2016.01-r2.ebuild | 96 ++++++
4 files changed, 828 insertions(+)
create mode 100644 kde-apps/kmail/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/kmail/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/kmail/kmail-4.14.11_pre20160211-r2.ebuild
create mode 100644 kde-apps/kmail/kmail-4.4.2016.01-r2.ebuild
--- a/kde-apps/kmail/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kmail/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,348 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -153,8 +153,8 @@
+
+ # If the KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -175,8 +175,8 @@
+ find_package(ZLIB)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
+
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgMe library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ find_package(Grantlee 0.4.0 QUIET CONFIG)
+ set_package_properties(Grantlee PROPERTIES DESCRIPTION "The Grantlee Template System" URL "http://www.gitorious.org/grantlee/pages/Home" TYPE REQUIRED PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." )
+@@ -253,13 +253,13 @@
+ add_subdirectory(messagelist)
+ add_subdirectory(templateparser)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif()
+ endif()
+
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(messagecomposer)
+ add_subdirectory(pimcommon)
+--- /examples/etm_usage/CMakeLists.txt
++++ /examples/etm_usage/CMakeLists.txt
+@@ -45,7 +45,7 @@
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KABC_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBSS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -28,8 +28,8 @@
+ add_subdirectory(icons)
+ add_subdirectory(printing)
+ add_subdirectory(tests)
+-if(QGPGME_FOUND)
+- add_definitions(-DQGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
++ add_definitions(-DKDE4_QGPGME_FOUND)
+ endif()
+
+ set(kaddressbook_sendmail_SRCS
+@@ -166,8 +166,8 @@
+ add_subdirectory(gravatar/autotests)
+ add_subdirectory(gravatar/tests)
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ if(PRISON_FOUND)
+@@ -200,8 +200,8 @@
+ grantleetheme
+ )
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
++++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
+@@ -26,12 +26,12 @@
+
+ #include
+
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ #include
+ #include
+ #include
+ #include
+-#endif // QGPGME_FOUND
++#endif // KDE4_QGPGME_FOUND
+
+ #include
+
+@@ -409,7 +409,7 @@
+
+ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
+ {
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
+ ( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
+ if ( fingerprint.isEmpty() ) {
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${CMAKE_SOURCE_DIR}/mobile/lib
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES}
+ )
+
+@@ -367,7 +367,7 @@
+ target_link_libraries(kleopatra_bin
+ ${_kleopatra_extra_libs}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,6 +21,6 @@
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
+
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ target_link_libraries(kwatchgnupg
+ ${KDE4_KDEUI_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -62,7 +62,7 @@
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ ########### next target ###############
+@@ -100,13 +100,13 @@
+ if(WIN32)
+ target_link_libraries(test_uiserver
+ ${ASSUAN_VANILLA_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ws2_32
+ )
+ else()
+ target_link_libraries(test_uiserver
+ ${ASSUAN_PTHREAD_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endif()
+
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -315,7 +315,7 @@
+ ${KDEPIMLIBS_KRESOURCES_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ksieve
+ ksieveui
+ kpgp
+--- /kmail/kcm_kpimidentities/CMakeLists.txt
++++ /kmail/kcm_kpimidentities/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
+ kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
+ target_link_libraries(kcm_kpimidentities
+- ${KDEPIMLIBS_GPGMEPP_LIBS}
++ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ )
+
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory(kmail)
+ endif()
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -104,7 +104,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ kleo
+ ${KDE4_KDECORE_LIBS}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTGUI_LIBRARY} )
+ endif ()
+
+@@ -25,7 +25,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -35,7 +35,7 @@
+
+ kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
+
+-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+ endif ()
+
+ ########### next target ###############
+@@ -45,7 +45,7 @@
+
+ kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
+
+-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -63,7 +63,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messagecomposer/CMakeLists.txt
++++ /messagecomposer/CMakeLists.txt
+@@ -123,7 +123,7 @@
+
+ kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
+ target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
++ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
+
+ set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+--- /messagecomposer/tests/CMakeLists.txt
++++ /messagecomposer/tests/CMakeLists.txt
+@@ -41,7 +41,7 @@
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endmacro()
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -206,7 +206,7 @@
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+ ${KDE4_KDEUI_LIBS}
+ ${KDE4_KPRINTUTILS_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${_mailwebview_lib}
+ ${Grantlee_CORE_LIBRARIES}
+ ${KDE4_KNEWSTUFF3_LIBS}
+--- /messageviewer/tests/CMakeLists.txt
++++ /messageviewer/tests/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ target_link_libraries( ${_name}
+ messageviewer
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
+--- /templateparser/CMakeLists.txt
++++ /templateparser/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ kleo
+ kpgp
+ pimcommon
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTWEBKIT_LIBRARY}
+ )
+ set_target_properties(templateparser PROPERTIES
+--- /templateparser/tests/CMakeLists.txt
++++ /templateparser/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ kleo
+ templateparser
+ messageviewer
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
--- a/kde-apps/kmail/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kmail/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,254 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -70,8 +70,8 @@
+
+ # The KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -96,8 +96,8 @@
+ find_package(Strigi)
+ macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
+
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" FALSE "" "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ set(SDO_MIN_VERSION 0.2)
+ set(SOPRANO_MIN_VERSION 2.3.70)
+@@ -188,12 +188,12 @@
+ add_subdirectory(messagecore)
+ add_subdirectory(messagelist)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if (Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(wizards)
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(kmail)
+
+@@ -214,7 +214,7 @@
+ # include( SopranoAddOntology )
+ # add_subdirectory( ontologies )
+ # add_subdirectory( nepomuk_email_feeder )
+- endif(QGPGME_FOUND)
++ endif(KDE4_QGPGME_FOUND)
+
+ if(KDEPIM_BUILD_EVERYTHING)
+ macro_optional_add_subdirectory(knode)
+@@ -254,13 +254,13 @@
+ macro_optional_add_subdirectory(doc)
+
+
+-# We really want to encourage users to enable/install QGpgME from kdepimlibs
+-if(NOT QGPGME_FOUND)
+- # Users must be aware that QGpgMe is really needed
+- message(STATUS "*** WARNING: QGpgME is not installed on your system ***")
++# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
++if(NOT KDE4_QGPGME_FOUND)
++ # Users must be aware that KDE4_QGpgMe is really needed
++ message(STATUS "*** WARNING: KDE4_QGpgME is not installed on your system ***")
+ message(STATUS "*** It is required if you want to use KMail, KOrganizer or Kleopatra ***")
+ message(STATUS "*** You are really encouraged to install it ***")
+-endif(NOT QGPGME_FOUND)
++endif(NOT KDE4_QGPGME_FOUND)
+ # All done, let's display what we found...
+ macro_display_feature_log()
+
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -19,7 +19,7 @@
+
+ target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
+ akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
+- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
++ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -5,9 +5,9 @@
+ add_subdirectory( common )
+ add_subdirectory( interfaces )
+ add_subdirectory( printing )
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ add_subdirectory( editors )
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ add_subdirectory( views )
+ add_subdirectory( features )
+ add_subdirectory( kcmconfigs )
+--- /kaddressbook/xxport/CMakeLists.txt
++++ /kaddressbook/xxport/CMakeLists.txt
+@@ -22,7 +22,7 @@
+
+
+ ########### next target ###############
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
+
+
+@@ -30,10 +30,10 @@
+
+
+
+-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+
+ install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+
+ ########### next target ###############
+
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${CMAKE_SOURCE_DIR}/libkleo
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES} )
+ if (USABLE_ASSUAN_FOUND)
+ if (ASSUAN2_FOUND)
+@@ -321,7 +321,7 @@
+ set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
++target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
+ if ( USABLE_ASSUAN_FOUND )
+ target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
+ ENDIF ( USABLE_ASSUAN_FOUND )
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
++target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -40,7 +40,7 @@
+ add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
+ add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
+ kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
+-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -67,9 +67,9 @@
+ endif ( ASSUAN2_FOUND )
+
+ if(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
++ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
+ else(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
++ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
+ endif(WIN32)
+ if (KDEPIM_ONLY_KLEO)
+ install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -371,7 +371,7 @@
+ ${KDE4_KPARTS_LIBRARY}
+ ${KDE4_KRESOURCES_LIBRARY}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ mimelib
+ ksieve
+ kpgp
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory( kmail )
+ endif(BUILD_kmail)
+@@ -15,7 +15,7 @@
+ add_subdirectory( specialdates )
+ add_subdirectory( planner )
+ endif()
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ if (BUILD_knotes)
+ add_subdirectory( knotes )
+ endif (BUILD_knotes)
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -99,7 +99,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -54,7 +54,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -58,7 +58,7 @@
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
+ ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
+- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
++ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
+ )
+
+ include_directories(
--- a/kde-apps/kmail/kmail-4.14.11_pre20160211-r2.ebuild
+++ a/kde-apps/kmail/kmail-4.14.11_pre20160211-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+VIRTUALX_REQUIRED="test"
+WEBKIT_REQUIRED="always"
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="Email component of Kontact, the integrated personal information manager of KDE"
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
+COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
+SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r4)
+ $(add_kdeapps_dep kdepim-common-libs)
+ $(add_kdeapps_dep korganizer)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+# bug 393147
+
+KMEXTRACTONLY="
+ agents/folderarchiveagent.desktop
+ agents/sendlateragent/
+ akonadi_next/
+ calendarviews/
+ grantleeeditor/grantleethemeeditor/
+ kdgantt2/
+ korganizer/
+ kresources/
+ libkdepimdbusinterfaces/
+ libkleo/
+ libkpgp/
+"
+KMCOMPILEONLY="
+ calendarsupport/
+ grantleetheme/
+ incidenceeditor-ng/
+ kaddressbookgrantlee/
+ mailcommon/
+ mailimporter/
+ messagecomposer/
+ messagecore/
+ messagelist/
+ messageviewer/
+ mailcommon/
+ mailimporter/
+ noteshared/
+ pimcommon/
+ templateparser/
+"
+KMEXTRA="
+ agents/archivemailagent/
+ agents/followupreminderagent/
+ agents/mailfilteragent/
+ grantleeeditor/headerthemeeditor/
+ importwizard/
+ kmailcvt/
+ ksendemail/
+ libksieve/
+ mboximporter/
+ pimsettingexporter/
+ plugins/messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+}
+
+src_compile() {
+ kde4-meta_src_compile kmail_xml
+ kde4-meta_src_compile
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
+ echo
+ elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
+ echo
+ fi
+ if ! has_version kde-apps/kleopatra:${SLOT}; then
+ echo
+ elog "For certificate management and the gnupg log viewer, please install kde-apps/kleopatra:${SLOT}"
+ echo
+ fi
+
+ if has_version "kde-apps/akonadi[sqlite]"; then
+ ewarn
+ ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
+ ewarn "user configuration. This is the backend recommended by KDE upstream."
+ ewarn "Reports indicate that kde-apps/kmail-4.10 does not work properly with the sqlite"
+ ewarn "backend anymore."
+ if has_version "kde-apps/akonadi[-mysql]"; then
+ ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD kde-apps/akonadi WITH mysql USEFLAG ENABLED."
+ fi
+ ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+ ewarn
+ fi
+}
--- a/kde-apps/kmail/kmail-4.4.2016.01-r2.ebuild
+++ a/kde-apps/kmail/kmail-4.4.2016.01-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="Email component of Kontact (noakonadi branch)"
+HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs '' 4.14.10-r4)
+ $(add_kdeapps_dep libkdepim '' 4.4.11.1-r1)
+ $(add_kdeapps_dep libkleo '' 4.4.2015)
+ $(add_kdeapps_dep libkpgp '' 4.4.2015)
+ kde-frameworks/kdelibs:4
+"
+RDEPEND="${DEPEND}
+ !>=kde-apps/kdepimlibs-4.14.11_pre20160211
+"
+
+KMEXTRACTONLY="
+ korganizer/org.kde.Korganizer.Calendar.xml
+ libkleo/
+ libkpgp/
+"
+KMEXTRA="
+ kmailcvt/
+ ksendemail/
+ libksieve/
+ messagecore/
+ messagelist/
+ messageviewer/
+ mimelib/
+ plugins/kmail/
+"
+KMLOADLIBS="libkdepim"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.9-nodbus.patch"
+)
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DWITH_IndicateQt=OFF
+ )
+
+ kde4-meta_src_configure
+}
+
+src_compile() {
+ kde4-meta_src_compile kmail_xml
+ kde4-meta_src_compile
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
+ echo
+ elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
+ echo
+ fi
+ if ! has_version kde-apps/kleopatra:${SLOT}; then
+ echo
+ elog "For certificate management and the gnupg log viewer, please install kde-apps/kleopatra:${SLOT}"
+ echo
+ fi
+}
--
>=kde-apps/kdepimlibs-4.14.11_pre20160211-r3
---
...0211-update_gpgme++_and_qgpgme_references.patch | 348 +++++++++++++++++++++
.../konsolekalendar-4.14.11_pre20160211-r1.ebuild | 72 +++++
2 files changed, 420 insertions(+)
create mode 100644 kde-apps/konsolekalendar/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211-r1.ebuild
--- a/kde-apps/konsolekalendar/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/konsolekalendar/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,348 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -153,8 +153,8 @@
+
+ # If the KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -175,8 +175,8 @@
+ find_package(ZLIB)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
+
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgMe library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ find_package(Grantlee 0.4.0 QUIET CONFIG)
+ set_package_properties(Grantlee PROPERTIES DESCRIPTION "The Grantlee Template System" URL "http://www.gitorious.org/grantlee/pages/Home" TYPE REQUIRED PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." )
+@@ -253,13 +253,13 @@
+ add_subdirectory(messagelist)
+ add_subdirectory(templateparser)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif()
+ endif()
+
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(messagecomposer)
+ add_subdirectory(pimcommon)
+--- /examples/etm_usage/CMakeLists.txt
++++ /examples/etm_usage/CMakeLists.txt
+@@ -45,7 +45,7 @@
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KABC_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBSS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -28,8 +28,8 @@
+ add_subdirectory(icons)
+ add_subdirectory(printing)
+ add_subdirectory(tests)
+-if(QGPGME_FOUND)
+- add_definitions(-DQGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
++ add_definitions(-DKDE4_QGPGME_FOUND)
+ endif()
+
+ set(kaddressbook_sendmail_SRCS
+@@ -166,8 +166,8 @@
+ add_subdirectory(gravatar/autotests)
+ add_subdirectory(gravatar/tests)
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ if(PRISON_FOUND)
+@@ -200,8 +200,8 @@
+ grantleetheme
+ )
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
++++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
+@@ -26,12 +26,12 @@
+
+ #include
+
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ #include
+ #include
+ #include
+ #include
+-#endif // QGPGME_FOUND
++#endif // KDE4_QGPGME_FOUND
+
+ #include
+
+@@ -409,7 +409,7 @@
+
+ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
+ {
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
+ ( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
+ if ( fingerprint.isEmpty() ) {
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${CMAKE_SOURCE_DIR}/mobile/lib
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES}
+ )
+
+@@ -367,7 +367,7 @@
+ target_link_libraries(kleopatra_bin
+ ${_kleopatra_extra_libs}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,6 +21,6 @@
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
+
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ target_link_libraries(kwatchgnupg
+ ${KDE4_KDEUI_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -62,7 +62,7 @@
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ ########### next target ###############
+@@ -100,13 +100,13 @@
+ if(WIN32)
+ target_link_libraries(test_uiserver
+ ${ASSUAN_VANILLA_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ws2_32
+ )
+ else()
+ target_link_libraries(test_uiserver
+ ${ASSUAN_PTHREAD_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endif()
+
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -315,7 +315,7 @@
+ ${KDEPIMLIBS_KRESOURCES_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ksieve
+ ksieveui
+ kpgp
+--- /kmail/kcm_kpimidentities/CMakeLists.txt
++++ /kmail/kcm_kpimidentities/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
+ kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
+ target_link_libraries(kcm_kpimidentities
+- ${KDEPIMLIBS_GPGMEPP_LIBS}
++ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ )
+
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory(kmail)
+ endif()
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -104,7 +104,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ kleo
+ ${KDE4_KDECORE_LIBS}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTGUI_LIBRARY} )
+ endif ()
+
+@@ -25,7 +25,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -35,7 +35,7 @@
+
+ kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
+
+-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+ endif ()
+
+ ########### next target ###############
+@@ -45,7 +45,7 @@
+
+ kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
+
+-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -63,7 +63,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messagecomposer/CMakeLists.txt
++++ /messagecomposer/CMakeLists.txt
+@@ -123,7 +123,7 @@
+
+ kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
+ target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
++ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
+
+ set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+--- /messagecomposer/tests/CMakeLists.txt
++++ /messagecomposer/tests/CMakeLists.txt
+@@ -41,7 +41,7 @@
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endmacro()
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -206,7 +206,7 @@
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+ ${KDE4_KDEUI_LIBS}
+ ${KDE4_KPRINTUTILS_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${_mailwebview_lib}
+ ${Grantlee_CORE_LIBRARIES}
+ ${KDE4_KNEWSTUFF3_LIBS}
+--- /messageviewer/tests/CMakeLists.txt
++++ /messageviewer/tests/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ target_link_libraries( ${_name}
+ messageviewer
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
+--- /templateparser/CMakeLists.txt
++++ /templateparser/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ kleo
+ kpgp
+ pimcommon
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTWEBKIT_LIBRARY}
+ )
+ set_target_properties(templateparser PROPERTIES
+--- /templateparser/tests/CMakeLists.txt
++++ /templateparser/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ kleo
+ templateparser
+ messageviewer
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
--- a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211-r1.ebuild
+++ a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="A command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
+SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r4)
+ $(add_kdeapps_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMCOMPILEONLY="
+ calendarsupport/
+ grantleetheme/
+ incidenceeditor-ng/
+ kaddressbookgrantlee/
+ mailcommon/
+ messagecore/
+ messageviewer/
+ pimcommon/
+ templateparser/
+"
+KMEXTRACTONLY="
+ akonadi_next/
+ agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
+ calendarviews/
+ kdgantt2/
+ korganizer/data/org.kde.Korganizer.Calendar.xml
+ mailimporter/
+ messagecomposer/
+ libkdepimdbusinterfaces/
+ libkleo/
+ libkpgp/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+}
--
>=kde-apps/kdepimlibs-4.14.10-r3
---
...0211-update_gpgme++_and_qgpgme_references.patch | 348 +++++++++++++++++++++
...6.01-update_gpgme++_and_qgpgme_references.patch | 254 +++++++++++++++
.../kontact/kontact-4.14.11_pre20160211-r1.ebuild | 76 +++++
kde-apps/kontact/kontact-4.4.2016.01-r1.ebuild | 73 +++++
4 files changed, 751 insertions(+)
create mode 100644 kde-apps/kontact/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/kontact/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/kontact/kontact-4.14.11_pre20160211-r1.ebuild
create mode 100644 kde-apps/kontact/kontact-4.4.2016.01-r1.ebuild
--- a/kde-apps/kontact/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kontact/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,348 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -153,8 +153,8 @@
+
+ # If the KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -175,8 +175,8 @@
+ find_package(ZLIB)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
+
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgMe library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ find_package(Grantlee 0.4.0 QUIET CONFIG)
+ set_package_properties(Grantlee PROPERTIES DESCRIPTION "The Grantlee Template System" URL "http://www.gitorious.org/grantlee/pages/Home" TYPE REQUIRED PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." )
+@@ -253,13 +253,13 @@
+ add_subdirectory(messagelist)
+ add_subdirectory(templateparser)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif()
+ endif()
+
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(messagecomposer)
+ add_subdirectory(pimcommon)
+--- /examples/etm_usage/CMakeLists.txt
++++ /examples/etm_usage/CMakeLists.txt
+@@ -45,7 +45,7 @@
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KABC_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBSS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -28,8 +28,8 @@
+ add_subdirectory(icons)
+ add_subdirectory(printing)
+ add_subdirectory(tests)
+-if(QGPGME_FOUND)
+- add_definitions(-DQGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
++ add_definitions(-DKDE4_QGPGME_FOUND)
+ endif()
+
+ set(kaddressbook_sendmail_SRCS
+@@ -166,8 +166,8 @@
+ add_subdirectory(gravatar/autotests)
+ add_subdirectory(gravatar/tests)
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ if(PRISON_FOUND)
+@@ -200,8 +200,8 @@
+ grantleetheme
+ )
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
++++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
+@@ -26,12 +26,12 @@
+
+ #include
+
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ #include
+ #include
+ #include
+ #include
+-#endif // QGPGME_FOUND
++#endif // KDE4_QGPGME_FOUND
+
+ #include
+
+@@ -409,7 +409,7 @@
+
+ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
+ {
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
+ ( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
+ if ( fingerprint.isEmpty() ) {
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${CMAKE_SOURCE_DIR}/mobile/lib
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES}
+ )
+
+@@ -367,7 +367,7 @@
+ target_link_libraries(kleopatra_bin
+ ${_kleopatra_extra_libs}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,6 +21,6 @@
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
+
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ target_link_libraries(kwatchgnupg
+ ${KDE4_KDEUI_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -62,7 +62,7 @@
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ ########### next target ###############
+@@ -100,13 +100,13 @@
+ if(WIN32)
+ target_link_libraries(test_uiserver
+ ${ASSUAN_VANILLA_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ws2_32
+ )
+ else()
+ target_link_libraries(test_uiserver
+ ${ASSUAN_PTHREAD_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endif()
+
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -315,7 +315,7 @@
+ ${KDEPIMLIBS_KRESOURCES_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ksieve
+ ksieveui
+ kpgp
+--- /kmail/kcm_kpimidentities/CMakeLists.txt
++++ /kmail/kcm_kpimidentities/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
+ kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
+ target_link_libraries(kcm_kpimidentities
+- ${KDEPIMLIBS_GPGMEPP_LIBS}
++ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ )
+
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory(kmail)
+ endif()
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -104,7 +104,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ kleo
+ ${KDE4_KDECORE_LIBS}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTGUI_LIBRARY} )
+ endif ()
+
+@@ -25,7 +25,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -35,7 +35,7 @@
+
+ kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
+
+-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+ endif ()
+
+ ########### next target ###############
+@@ -45,7 +45,7 @@
+
+ kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
+
+-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -63,7 +63,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messagecomposer/CMakeLists.txt
++++ /messagecomposer/CMakeLists.txt
+@@ -123,7 +123,7 @@
+
+ kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
+ target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
++ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
+
+ set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+--- /messagecomposer/tests/CMakeLists.txt
++++ /messagecomposer/tests/CMakeLists.txt
+@@ -41,7 +41,7 @@
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endmacro()
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -206,7 +206,7 @@
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+ ${KDE4_KDEUI_LIBS}
+ ${KDE4_KPRINTUTILS_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${_mailwebview_lib}
+ ${Grantlee_CORE_LIBRARIES}
+ ${KDE4_KNEWSTUFF3_LIBS}
+--- /messageviewer/tests/CMakeLists.txt
++++ /messageviewer/tests/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ target_link_libraries( ${_name}
+ messageviewer
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
+--- /templateparser/CMakeLists.txt
++++ /templateparser/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ kleo
+ kpgp
+ pimcommon
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTWEBKIT_LIBRARY}
+ )
+ set_target_properties(templateparser PROPERTIES
+--- /templateparser/tests/CMakeLists.txt
++++ /templateparser/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ kleo
+ templateparser
+ messageviewer
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
--- a/kde-apps/kontact/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kontact/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,254 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -70,8 +70,8 @@
+
+ # The KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -96,8 +96,8 @@
+ find_package(Strigi)
+ macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
+
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" FALSE "" "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ set(SDO_MIN_VERSION 0.2)
+ set(SOPRANO_MIN_VERSION 2.3.70)
+@@ -188,12 +188,12 @@
+ add_subdirectory(messagecore)
+ add_subdirectory(messagelist)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if (Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(wizards)
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(kmail)
+
+@@ -214,7 +214,7 @@
+ # include( SopranoAddOntology )
+ # add_subdirectory( ontologies )
+ # add_subdirectory( nepomuk_email_feeder )
+- endif(QGPGME_FOUND)
++ endif(KDE4_QGPGME_FOUND)
+
+ if(KDEPIM_BUILD_EVERYTHING)
+ macro_optional_add_subdirectory(knode)
+@@ -254,13 +254,13 @@
+ macro_optional_add_subdirectory(doc)
+
+
+-# We really want to encourage users to enable/install QGpgME from kdepimlibs
+-if(NOT QGPGME_FOUND)
+- # Users must be aware that QGpgMe is really needed
+- message(STATUS "*** WARNING: QGpgME is not installed on your system ***")
++# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
++if(NOT KDE4_QGPGME_FOUND)
++ # Users must be aware that KDE4_QGpgMe is really needed
++ message(STATUS "*** WARNING: KDE4_QGpgME is not installed on your system ***")
+ message(STATUS "*** It is required if you want to use KMail, KOrganizer or Kleopatra ***")
+ message(STATUS "*** You are really encouraged to install it ***")
+-endif(NOT QGPGME_FOUND)
++endif(NOT KDE4_QGPGME_FOUND)
+ # All done, let's display what we found...
+ macro_display_feature_log()
+
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -19,7 +19,7 @@
+
+ target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
+ akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
+- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
++ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -5,9 +5,9 @@
+ add_subdirectory( common )
+ add_subdirectory( interfaces )
+ add_subdirectory( printing )
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ add_subdirectory( editors )
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ add_subdirectory( views )
+ add_subdirectory( features )
+ add_subdirectory( kcmconfigs )
+--- /kaddressbook/xxport/CMakeLists.txt
++++ /kaddressbook/xxport/CMakeLists.txt
+@@ -22,7 +22,7 @@
+
+
+ ########### next target ###############
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
+
+
+@@ -30,10 +30,10 @@
+
+
+
+-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+
+ install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+
+ ########### next target ###############
+
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${CMAKE_SOURCE_DIR}/libkleo
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES} )
+ if (USABLE_ASSUAN_FOUND)
+ if (ASSUAN2_FOUND)
+@@ -321,7 +321,7 @@
+ set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
++target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
+ if ( USABLE_ASSUAN_FOUND )
+ target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
+ ENDIF ( USABLE_ASSUAN_FOUND )
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
++target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -40,7 +40,7 @@
+ add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
+ add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
+ kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
+-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -67,9 +67,9 @@
+ endif ( ASSUAN2_FOUND )
+
+ if(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
++ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
+ else(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
++ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
+ endif(WIN32)
+ if (KDEPIM_ONLY_KLEO)
+ install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -371,7 +371,7 @@
+ ${KDE4_KPARTS_LIBRARY}
+ ${KDE4_KRESOURCES_LIBRARY}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ mimelib
+ ksieve
+ kpgp
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory( kmail )
+ endif(BUILD_kmail)
+@@ -15,7 +15,7 @@
+ add_subdirectory( specialdates )
+ add_subdirectory( planner )
+ endif()
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ if (BUILD_knotes)
+ add_subdirectory( knotes )
+ endif (BUILD_knotes)
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -99,7 +99,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -54,7 +54,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -58,7 +58,7 @@
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
+ ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
+- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
++ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
+ )
+
+ include_directories(
--- a/kde-apps/kontact/kontact-4.14.11_pre20160211-r1.ebuild
+++ a/kde-apps/kontact/kontact-4.14.11_pre20160211-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="KDE personal information manager"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
+SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r4)
+ $(add_kdeapps_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
+KMSAVELIBS="true"
+
+# We remove plugins that are related to external kdepim programs. This way
+# kontact doesn't have to depend on all programs it has plugins for.
+# kcontactmanager gone from kdesvn
+#
+KMEXTRACTONLY="
+ kontact/plugins/akregator/
+ kontact/plugins/kaddressbook/
+ kontact/plugins/kjots/
+ kontact/plugins/kmail/
+ kontact/plugins/knode/
+ kontact/plugins/knotes/
+ kontact/plugins/korganizer/
+ kontact/plugins/ktimetracker/
+ kontact/plugins/planner/
+ kontact/plugins/specialdates/
+ libkdepimdbusinterfaces/
+"
+
+src_unpack() {
+ if use handbook; then
+ KMEXTRA+="
+ doc/kontact-admin/
+ "
+ fi
+
+ kde4-meta_src_unpack
+}
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+}
--- a/kde-apps/kontact/kontact-4.4.2016.01-r1.ebuild
+++ a/kde-apps/kontact/kontact-4.4.2016.01-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="KDE personal information manager (noakonadi branch)"
+HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs '' 4.14.10-r4)
+ $(add_kdeapps_dep libkdepim '' 4.4.2015)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="libkdepim"
+KMSAVELIBS="true"
+
+# We remove plugins that are related to external kdepim programs. This way
+# kontact doesn't have to depend on all programs it has plugins for.
+# kcontactmanager gone from kdesvn
+#
+# xml targets from kmail/ are being uncommented by kde4-meta.eclass
+KMEXTRACTONLY="
+ kmail/
+ kontact/plugins/akregator/
+ kontact/plugins/kaddressbook/
+ kontact/plugins/kjots/
+ kontact/plugins/kmail/
+ kontact/plugins/knode/
+ kontact/plugins/knotes/
+ kontact/plugins/korganizer/
+ kontact/plugins/ktimetracker/
+ kontact/plugins/planner/
+ kontact/plugins/specialdates/
+"
+
+src_unpack() {
+ if use handbook; then
+ KMEXTRA+="
+ doc/kontact-admin/
+ "
+ fi
+
+ kde4-meta_src_unpack
+}
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+}
--
>=kde-apps/kdepimlibs-4.14.10-r3
---
...0211-update_gpgme++_and_qgpgme_references.patch | 348 +++++++++++++++++++++
...6.01-update_gpgme++_and_qgpgme_references.patch | 254 +++++++++++++++
.../korganizer-4.14.11_pre20160211-r1.ebuild | 111 +++++++
.../korganizer/korganizer-4.4.2016.01-r1.ebuild | 80 +++++
4 files changed, 793 insertions(+)
create mode 100644 kde-apps/korganizer/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/korganizer/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/korganizer/korganizer-4.14.11_pre20160211-r1.ebuild
create mode 100644 kde-apps/korganizer/korganizer-4.4.2016.01-r1.ebuild
--- a/kde-apps/korganizer/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/korganizer/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,348 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -153,8 +153,8 @@
+
+ # If the KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -175,8 +175,8 @@
+ find_package(ZLIB)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
+
+- find_package(QGpgme)
+- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgMe library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ set_package_properties(KDE4_QGpgme PROPERTIES DESCRIPTION "The KDE4_QGpgME library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ find_package(Grantlee 0.4.0 QUIET CONFIG)
+ set_package_properties(Grantlee PROPERTIES DESCRIPTION "The Grantlee Template System" URL "http://www.gitorious.org/grantlee/pages/Home" TYPE REQUIRED PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." )
+@@ -253,13 +253,13 @@
+ add_subdirectory(messagelist)
+ add_subdirectory(templateparser)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif()
+ endif()
+
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(messagecomposer)
+ add_subdirectory(pimcommon)
+--- /examples/etm_usage/CMakeLists.txt
++++ /examples/etm_usage/CMakeLists.txt
+@@ -45,7 +45,7 @@
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KABC_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBSS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+- ${KDEPIMLIBS_QGPGME_LIBS}
++ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
+ akonadi_next
+ kdepim
+ kleo
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -28,8 +28,8 @@
+ add_subdirectory(icons)
+ add_subdirectory(printing)
+ add_subdirectory(tests)
+-if(QGPGME_FOUND)
+- add_definitions(-DQGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
++ add_definitions(-DKDE4_QGPGME_FOUND)
+ endif()
+
+ set(kaddressbook_sendmail_SRCS
+@@ -166,8 +166,8 @@
+ add_subdirectory(gravatar/autotests)
+ add_subdirectory(gravatar/tests)
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ if(PRISON_FOUND)
+@@ -200,8 +200,8 @@
+ grantleetheme
+ )
+
+-if(QGPGME_FOUND)
+- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
++if(KDE4_QGPGME_FOUND)
++ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
+ endif()
+
+ install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
++++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
+@@ -26,12 +26,12 @@
+
+ #include
+
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ #include
+ #include
+ #include
+ #include
+-#endif // QGPGME_FOUND
++#endif // KDE4_QGPGME_FOUND
+
+ #include
+
+@@ -409,7 +409,7 @@
+
+ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
+ {
+-#ifdef QGPGME_FOUND
++#ifdef KDE4_QGPGME_FOUND
+ const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
+ ( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
+ if ( fingerprint.isEmpty() ) {
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${CMAKE_SOURCE_DIR}/mobile/lib
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES}
+ )
+
+@@ -367,7 +367,7 @@
+ target_link_libraries(kleopatra_bin
+ ${_kleopatra_extra_libs}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${KDE4_KDEUI_LIBS}
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,6 +21,6 @@
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
+
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ target_link_libraries(kwatchgnupg
+ ${KDE4_KDEUI_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -62,7 +62,7 @@
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ ########### next target ###############
+@@ -100,13 +100,13 @@
+ if(WIN32)
+ target_link_libraries(test_uiserver
+ ${ASSUAN_VANILLA_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ws2_32
+ )
+ else()
+ target_link_libraries(test_uiserver
+ ${ASSUAN_PTHREAD_LIBRARIES}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endif()
+
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -315,7 +315,7 @@
+ ${KDEPIMLIBS_KRESOURCES_LIBS}
+ ${KDE4_KCMUTILS_LIBS}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ksieve
+ ksieveui
+ kpgp
+--- /kmail/kcm_kpimidentities/CMakeLists.txt
++++ /kmail/kcm_kpimidentities/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
+ kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
+ target_link_libraries(kcm_kpimidentities
+- ${KDEPIMLIBS_GPGMEPP_LIBS}
++ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ )
+
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory(kmail)
+ endif()
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -104,7 +104,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ kleo
+ ${KDE4_KDECORE_LIBS}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTGUI_LIBRARY} )
+ endif ()
+
+@@ -25,7 +25,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -35,7 +35,7 @@
+
+ kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
+
+-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+ endif ()
+
+ ########### next target ###############
+@@ -45,7 +45,7 @@
+
+ kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
+
+-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -63,7 +63,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messagecomposer/CMakeLists.txt
++++ /messagecomposer/CMakeLists.txt
+@@ -123,7 +123,7 @@
+
+ kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
+ target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
++ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
+
+ set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+--- /messagecomposer/tests/CMakeLists.txt
++++ /messagecomposer/tests/CMakeLists.txt
+@@ -41,7 +41,7 @@
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${KDE4_KDEUI_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ )
+ endmacro()
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -206,7 +206,7 @@
+ ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+ ${KDE4_KDEUI_LIBS}
+ ${KDE4_KPRINTUTILS_LIBS}
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${_mailwebview_lib}
+ ${Grantlee_CORE_LIBRARIES}
+ ${KDE4_KNEWSTUFF3_LIBS}
+--- /messageviewer/tests/CMakeLists.txt
++++ /messageviewer/tests/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ target_link_libraries( ${_name}
+ messageviewer
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
+--- /templateparser/CMakeLists.txt
++++ /templateparser/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ kleo
+ kpgp
+ pimcommon
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTWEBKIT_LIBRARY}
+ )
+ set_target_properties(templateparser PROPERTIES
+--- /templateparser/tests/CMakeLists.txt
++++ /templateparser/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ kleo
+ templateparser
+ messageviewer
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ ${QT_QTTEST_LIBRARY}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
--- a/kde-apps/korganizer/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/korganizer/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,254 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -70,8 +70,8 @@
+
+ # The KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -96,8 +96,8 @@
+ find_package(Strigi)
+ macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
+
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" FALSE "" "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ set(SDO_MIN_VERSION 0.2)
+ set(SOPRANO_MIN_VERSION 2.3.70)
+@@ -188,12 +188,12 @@
+ add_subdirectory(messagecore)
+ add_subdirectory(messagelist)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if (Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(wizards)
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(kmail)
+
+@@ -214,7 +214,7 @@
+ # include( SopranoAddOntology )
+ # add_subdirectory( ontologies )
+ # add_subdirectory( nepomuk_email_feeder )
+- endif(QGPGME_FOUND)
++ endif(KDE4_QGPGME_FOUND)
+
+ if(KDEPIM_BUILD_EVERYTHING)
+ macro_optional_add_subdirectory(knode)
+@@ -254,13 +254,13 @@
+ macro_optional_add_subdirectory(doc)
+
+
+-# We really want to encourage users to enable/install QGpgME from kdepimlibs
+-if(NOT QGPGME_FOUND)
+- # Users must be aware that QGpgMe is really needed
+- message(STATUS "*** WARNING: QGpgME is not installed on your system ***")
++# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
++if(NOT KDE4_QGPGME_FOUND)
++ # Users must be aware that KDE4_QGpgMe is really needed
++ message(STATUS "*** WARNING: KDE4_QGpgME is not installed on your system ***")
+ message(STATUS "*** It is required if you want to use KMail, KOrganizer or Kleopatra ***")
+ message(STATUS "*** You are really encouraged to install it ***")
+-endif(NOT QGPGME_FOUND)
++endif(NOT KDE4_QGPGME_FOUND)
+ # All done, let's display what we found...
+ macro_display_feature_log()
+
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -19,7 +19,7 @@
+
+ target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
+ akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
+- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
++ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -5,9 +5,9 @@
+ add_subdirectory( common )
+ add_subdirectory( interfaces )
+ add_subdirectory( printing )
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ add_subdirectory( editors )
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ add_subdirectory( views )
+ add_subdirectory( features )
+ add_subdirectory( kcmconfigs )
+--- /kaddressbook/xxport/CMakeLists.txt
++++ /kaddressbook/xxport/CMakeLists.txt
+@@ -22,7 +22,7 @@
+
+
+ ########### next target ###############
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
+
+
+@@ -30,10 +30,10 @@
+
+
+
+-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+
+ install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+
+ ########### next target ###############
+
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${CMAKE_SOURCE_DIR}/libkleo
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES} )
+ if (USABLE_ASSUAN_FOUND)
+ if (ASSUAN2_FOUND)
+@@ -321,7 +321,7 @@
+ set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
++target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
+ if ( USABLE_ASSUAN_FOUND )
+ target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
+ ENDIF ( USABLE_ASSUAN_FOUND )
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
++target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -40,7 +40,7 @@
+ add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
+ add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
+ kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
+-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -67,9 +67,9 @@
+ endif ( ASSUAN2_FOUND )
+
+ if(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
++ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
+ else(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
++ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
+ endif(WIN32)
+ if (KDEPIM_ONLY_KLEO)
+ install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -371,7 +371,7 @@
+ ${KDE4_KPARTS_LIBRARY}
+ ${KDE4_KRESOURCES_LIBRARY}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ mimelib
+ ksieve
+ kpgp
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory( kmail )
+ endif(BUILD_kmail)
+@@ -15,7 +15,7 @@
+ add_subdirectory( specialdates )
+ add_subdirectory( planner )
+ endif()
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ if (BUILD_knotes)
+ add_subdirectory( knotes )
+ endif (BUILD_knotes)
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -99,7 +99,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -54,7 +54,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -58,7 +58,7 @@
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
+ ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
+- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
++ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
+ )
+
+ include_directories(
--- a/kde-apps/korganizer/korganizer-4.14.11_pre20160211-r1.ebuild
+++ a/kde-apps/korganizer/korganizer-4.14.11_pre20160211-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="Personal Organizer by KDE"
+HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
+COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
+SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r4)
+ $(add_kdeapps_dep kdepim-common-libs)
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+ $(add_kdeapps_dep ktimezoned '' 4.14.3)
+"
+
+RESTRICT="test"
+# bug 393135
+
+KMLOADLIBS="kdepim-common-libs"
+
+KMEXTRA="
+ korgac/
+"
+KMEXTRACTONLY="
+ agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
+ akonadi_next/
+ calendarviews/
+ kdgantt2/
+ kmail/
+ knode/org.kde.knode.xml
+ libkdepimdbusinterfaces/
+ libkleo/
+ libkpgp/
+ mailimporter/
+ messagecomposer/
+"
+KMCOMPILEONLY="
+ calendarsupport/
+ grantleetheme/
+ incidenceeditor-ng/
+ kaddressbookgrantlee/
+ mailcommon/
+ messagecore/
+ messageviewer/
+ pimcommon/
+ templateparser/
+"
+
+src_unpack() {
+ if use kontact; then
+ KMEXTRA="${KMEXTRA}
+ kontact/plugins/planner/
+ kontact/plugins/specialdates/
+ "
+ fi
+
+ kde4-meta_src_unpack
+}
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ use handbook && epatch "${FILESDIR}/${PN}-4.14.10-handbook.patch"
+
+ kde4-meta_src_prepare
+}
+
+src_install() {
+ kde4-meta_src_install
+ # colliding with kdepim-common-libs
+ rm -rf "${ED}"usr/share/kde4/servicetypes/calendarplugin.desktop || die
+ rm -rf "${ED}"usr/share/kde4/servicetypes/calendardecoration.desktop || die
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
+ echo
+ elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
+ echo
+ fi
+}
--- a/kde-apps/korganizer/korganizer-4.4.2016.01-r1.ebuild
+++ a/kde-apps/korganizer/korganizer-4.4.2016.01-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="A Personal Organizer for KDE (noakonadi branch)"
+HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs '' 4.14.10-r4)
+ $(add_kdeapps_dep libkdepim '' 4.4.2015)
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+ $(add_kdeapps_dep ktimezoned '' 4.14.3)
+"
+
+KMLOADLIBS="libkdepim"
+KMEXTRA="kdgantt1"
+
+# xml targets from kmail are being uncommented by kde4-meta.eclass
+KMEXTRACTONLY="
+ kmail/
+ knode/org.kde.knode.xml
+ kaddressbook/org.kde.KAddressbook.Core.xml
+"
+
+# bug 378151
+RESTRICT=test
+
+src_unpack() {
+ if use kontact; then
+ KMEXTRA="${KMEXTRA}
+ kontact/plugins/planner/
+ kontact/plugins/specialdates/
+ "
+ fi
+
+ kde4-meta_src_unpack
+}
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ use handbook && epatch "${FILESDIR}/${PN}-4.4.2015.06-handbook.patch"
+
+ kde4-meta_src_prepare
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
+ echo
+ elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
+ echo
+ fi
+}
--
>=kde-apps/kdepimlibs-4.14.10-r3
---
...6.01-update_gpgme++_and_qgpgme_references.patch | 254 +++++++++++++++++++++
kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild | 45 ++++
2 files changed, 299 insertions(+)
create mode 100644 kde-apps/libkleo/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
create mode 100644 kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild
--- a/kde-apps/libkleo/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/libkleo/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,254 @@
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -70,8 +70,8 @@
+
+ # The KDEPIM_ONLY_KLEO option is true
+ if(KDEPIM_ONLY_KLEO)
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
+@@ -96,8 +96,8 @@
+ find_package(Strigi)
+ macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
+
+- find_package(QGpgme)
+- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
++ find_package(KDE4_QGpgme)
++ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" FALSE "" "KDE4_QGpgME is required to build KMail, KOrganizer and Kleopatra")
+
+ set(SDO_MIN_VERSION 0.2)
+ set(SOPRANO_MIN_VERSION 2.3.70)
+@@ -188,12 +188,12 @@
+ add_subdirectory(messagecore)
+ add_subdirectory(messagelist)
+
+- if(QGPGME_FOUND)
++ if(KDE4_QGPGME_FOUND)
+ if (Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(kleopatra)
+ endif(Boost_TOPOLOGICAL_SORT_DIR)
+ macro_optional_add_subdirectory(wizards)
+- # The following components depend on QGpgME.
++ # The following components depend on KDE4_QGpgME.
+ add_subdirectory(messageviewer)
+ macro_optional_add_subdirectory(kmail)
+
+@@ -214,7 +214,7 @@
+ # include( SopranoAddOntology )
+ # add_subdirectory( ontologies )
+ # add_subdirectory( nepomuk_email_feeder )
+- endif(QGPGME_FOUND)
++ endif(KDE4_QGPGME_FOUND)
+
+ if(KDEPIM_BUILD_EVERYTHING)
+ macro_optional_add_subdirectory(knode)
+@@ -254,13 +254,13 @@
+ macro_optional_add_subdirectory(doc)
+
+
+-# We really want to encourage users to enable/install QGpgME from kdepimlibs
+-if(NOT QGPGME_FOUND)
+- # Users must be aware that QGpgMe is really needed
+- message(STATUS "*** WARNING: QGpgME is not installed on your system ***")
++# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
++if(NOT KDE4_QGPGME_FOUND)
++ # Users must be aware that KDE4_QGpgMe is really needed
++ message(STATUS "*** WARNING: KDE4_QGpgME is not installed on your system ***")
+ message(STATUS "*** It is required if you want to use KMail, KOrganizer or Kleopatra ***")
+ message(STATUS "*** You are really encouraged to install it ***")
+-endif(NOT QGPGME_FOUND)
++endif(NOT KDE4_QGPGME_FOUND)
+ # All done, let's display what we found...
+ macro_display_feature_log()
+
+--- /examples/mailreader/CMakeLists.txt
++++ /examples/mailreader/CMakeLists.txt
+@@ -19,7 +19,7 @@
+
+ target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
+ akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
+- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
++ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
+ )
+
+ install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- /kaddressbook/CMakeLists.txt
++++ /kaddressbook/CMakeLists.txt
+@@ -5,9 +5,9 @@
+ add_subdirectory( common )
+ add_subdirectory( interfaces )
+ add_subdirectory( printing )
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ add_subdirectory( editors )
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ add_subdirectory( views )
+ add_subdirectory( features )
+ add_subdirectory( kcmconfigs )
+--- /kaddressbook/xxport/CMakeLists.txt
++++ /kaddressbook/xxport/CMakeLists.txt
+@@ -22,7 +22,7 @@
+
+
+ ########### next target ###############
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
+
+
+@@ -30,10 +30,10 @@
+
+
+
+-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
++target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
+
+ install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+
+ ########### next target ###############
+
+--- /kleopatra/CMakeLists.txt
++++ /kleopatra/CMakeLists.txt
+@@ -25,7 +25,7 @@
+ ${CMAKE_SOURCE_DIR}/libkleo
+ ${CMAKE_SOURCE_DIR}/libkdepim
+ ${Boost_INCLUDE_DIR}
+- ${QGPGME_INCLUDES}
++ ${KDE4_QGPGME_INCLUDE_DIR}
+ ${GPGME_INCLUDES} )
+ if (USABLE_ASSUAN_FOUND)
+ if (ASSUAN2_FOUND)
+@@ -321,7 +321,7 @@
+ set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
++target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} ${_kleopatra_libkdepim_LIBS})
+ if ( USABLE_ASSUAN_FOUND )
+ target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
+ ENDIF ( USABLE_ASSUAN_FOUND )
+--- /kleopatra/kgpgconf/CMakeLists.txt
++++ /kleopatra/kgpgconf/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
+
+ kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
+-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
+
+ install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/kwatchgnupg/CMakeLists.txt
++++ /kleopatra/kwatchgnupg/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+
+-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
++target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
+
+ install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- /kleopatra/tests/CMakeLists.txt
++++ /kleopatra/tests/CMakeLists.txt
+@@ -40,7 +40,7 @@
+ add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
+ add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
+ kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
+-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+@@ -67,9 +67,9 @@
+ endif ( ASSUAN2_FOUND )
+
+ if(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
++ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
+ else(WIN32)
+- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
++ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
+ endif(WIN32)
+ if (KDEPIM_ONLY_KLEO)
+ install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- /kmail/CMakeLists.txt
++++ /kmail/CMakeLists.txt
+@@ -371,7 +371,7 @@
+ ${KDE4_KPARTS_LIBRARY}
+ ${KDE4_KRESOURCES_LIBRARY}
+ kleo
+- ${QGPGME_LIBRARIES}
++ ${KDE4_QGPGME_LIBRARIES}
+ mimelib
+ ksieve
+ kpgp
+--- /kontact/plugins/CMakeLists.txt
++++ /kontact/plugins/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
+
+-if(QGPGME_FOUND)
++if(KDE4_QGPGME_FOUND)
+ if(BUILD_kmail)
+ add_subdirectory( kmail )
+ endif(BUILD_kmail)
+@@ -15,7 +15,7 @@
+ add_subdirectory( specialdates )
+ add_subdirectory( planner )
+ endif()
+-endif(QGPGME_FOUND)
++endif(KDE4_QGPGME_FOUND)
+ if (BUILD_knotes)
+ add_subdirectory( knotes )
+ endif (BUILD_knotes)
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -99,7 +99,7 @@
+ )
+
+ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
+-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
++set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
+ if ( NOT KDEPIM_ONLY_KLEO )
+ set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
+ set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
+--- /libkleo/tests/CMakeLists.txt
++++ /libkleo/tests/CMakeLists.txt
+@@ -18,7 +18,7 @@
+
+ kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
+
+-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+
+ ########### next target ###############
+@@ -54,7 +54,7 @@
+
+ kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
+
+-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
++target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
+
+ ########### next target ###############
+
+--- /messageviewer/CMakeLists.txt
++++ /messageviewer/CMakeLists.txt
+@@ -58,7 +58,7 @@
+ ${KDEPIMLIBS_KMIME_LIBS}
+ ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
+ ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
+- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
++ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
+ )
+
+ include_directories(
--- a/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild
+++ a/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE library for encryption handling"
+HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ app-crypt/gpgme
+ $(add_kdeapps_dep kdepimlibs '' 4.14.10-r4)
+"
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+"
+
+KMSAVELIBS="true"
+KMEXTRACTONLY="kleopatra/"
+
+strip_patch_hunks_for_nonexistent_files() {
+ local input_file="$1"
+ local output_file="$2"
+
+ local line changed_file
+ while IFS=$'\n' read -r line; do
+ [[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
+ if [[ -f "${changed_file}" ]]; then
+ echo "${line}" >> "${output_file}" || die "Writing to '${output_file}' failed"
+ fi
+ done < "${input_file}" || die "Reading from '${input_file}' failed"
+}
+
+src_prepare() {
+ find "(" -name "*.cpp" -o -name "*.h" ")" -exec \
+ sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + || die
+ strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+ eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
+
+ kde4-meta_src_prepare
+}
--
cryptography plugin
---
.../libkleo-4.4.2016.01-install_headers.patch | 69 ++++++++++++++++++++++
kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild | 2 +
2 files changed, 71 insertions(+)
create mode 100644 kde-apps/libkleo/files/libkleo-4.4.2016.01-install_headers.patch
--- a/kde-apps/libkleo/files/libkleo-4.4.2016.01-install_headers.patch
+++ a/kde-apps/libkleo/files/libkleo-4.4.2016.01-install_headers.patch
@@ -0,0 +1,69 @@
+Install headers needed by Kopete's cryptography plugin.
+
+--- /libkleo/CMakeLists.txt
++++ /libkleo/CMakeLists.txt
+@@ -118,3 +118,64 @@
+ install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc )
++
++install( FILES
++ kleo/abstractimportjob.h
++ kleo/adduseridjob.h
++ kleo/changeexpiryjob.h
++ kleo/changeownertrustjob.h
++ kleo/cryptobackend.h
++ kleo/cryptobackendfactory.h
++ kleo/cryptoconfig.h
++ kleo/cryptplug.h
++ kleo/cryptplugfactory.h
++ kleo/cryptplugwrapper.h
++ kleo/cryptplugwrapperlist.h
++ kleo/decryptjob.h
++ kleo/decryptverifyjob.h
++ kleo/deletejob.h
++ kleo/dn.h
++ kleo/downloadjob.h
++ kleo/encryptjob.h
++ kleo/enum.h
++ kleo/exportjob.h
++ kleo/hierarchicalkeylistjob.h
++ kleo/importfromkeyserverjob.h
++ kleo/importjob.h
++ kleo/job.h
++ kleo/kconfigbasedkeyfilter.h
++ kleo/keyfilter.h
++ kleo/keyfiltermanager.h
++ kleo/keygenerationjob.h
++ kleo/keylistjob.h
++ kleo/kleo_export.h
++ kleo/multideletejob.h
++ kleo/oidmap.h
++ kleo/refreshkeysjob.h
++ kleo/signencryptjob.h
++ kleo/signjob.h
++ kleo/signkeyjob.h
++ kleo/specialjob.h
++ kleo/verifydetachedjob.h
++ kleo/verifyopaquejob.h
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel)
++
++install ( FILES
++ ui/adddirectoryservicedialogimpl.h
++ ui/backendconfigwidget.h
++ ui/cryptoconfigdialog.h
++ ui/cryptoconfigmodule.h
++ ui/cryptoconfigmodule_p.h
++ ui/directoryserviceswidget.h
++ ui/dnattributeorderconfigwidget.h
++ ui/filenamerequester.h
++ ui/kdhorizontalline.h
++ ui/keyapprovaldialog.h
++ ui/keylistview.h
++ ui/keyrequester.h
++ ui/keyselectiondialog.h
++ ui/messagebox.h
++ ui/messagebox_p.h
++ ui/progressbar.h
++ ui/progressdialog.h
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel)
--- a/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild
+++ a/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild
@@ -22,6 +22,8 @@ RDEPEND="${DEPEND}
KMSAVELIBS="true"
KMEXTRACTONLY="kleopatra/"
+PATCHES=( "${FILESDIR}/${P}-install_headers.patch" )
+
strip_patch_hunks_for_nonexistent_files() {
local input_file="$1"
local output_file="$2"
--
---
kde-apps/kopete/kopete-16.12.2-r3.ebuild | 165 +++++++++++++++++++++++++++++++
kde-apps/kopete/metadata.xml | 1 +
2 files changed, 166 insertions(+)
create mode 100644 kde-apps/kopete/kopete-16.12.2-r3.ebuild
--- a/kde-apps/kopete/kopete-16.12.2-r3.ebuild
+++ a/kde-apps/kopete/kopete-16.12.2-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug ssl v4l"
+
+# tests hang, last checked for 4.2.96
+RESTRICT+=" test"
+
+# Available plugins
+#
+# addbookmarks: NO DEPS
+# alias: NO DEPS (disabled upstream)
+# autoreplace: NO DEPS
+# contactnotes: NO DEPS
+# cryptography: kde-apps/kdepim-common-libs:4 or kde-apps/libkleo:4
+# highlight: NO DEPS
+# history: NO DEPS
+# latex: virtual/latex as RDEPEND
+# nowlistening: NO DEPS
+# otr: libotr
+# pipes: NO DEPS
+# privacy: NO DEPS
+# statistics: dev-db/sqlite:3
+# texteffect: NO DEPS
+# translator: NO DEPS
+# urlpicpreview: NO DEPS
+# webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes cryptography +highlight
++history latex +nowlistening otr +pipes +privacy +statistics +texteffect
++translator +urlpicpreview webpresence"
+
+# Available protocols
+#
+# gadu: net-libs/libgadu @since 4.3
+# groupwise: app-crypt/qca:2
+# irc: NO DEPS, probably will fail so inform user about it
+# xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+# jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+# meanwhile: net-libs/meanwhile
+# oscar: NO DEPS
+# telepathy: net-libs/decibel
+# testbed: NO DEPS
+# winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+# yahoo: media-libs/jasper
+# zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
+testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+# telepathy: net-libs/decibel
+# irc: NO DEPS
+# msn: net-libs/libmsn
+# qq: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+ $(add_kdeapps_dep kdepimlibs)
+ dev-libs/libpcre
+ >=dev-qt/qtgui-4.4.0:4[mng]
+ kde-frameworks/kdelibs:4[zeroconf?]
+ media-libs/phonon[qt4]
+ media-libs/qimageblitz
+ !aqua? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ )
+ cryptography? (
+ || (
+ $(add_kdeapps_dep kdepim-common-libs)
+ $(add_kdeapps_dep libkleo '' 4.4.2016.01-r1)
+ )
+ )
+ gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+ groupwise? ( app-crypt/qca:2[qt4(+)] )
+ jingle? (
+ dev-libs/expat
+ dev-libs/openssl:0
+ >=media-libs/mediastreamer-2.3.0
+ media-libs/speex
+ net-libs/libsrtp:=
+ net-libs/ortp:=
+ )
+ meanwhile? ( net-libs/meanwhile )
+ otr? ( >=net-libs/libotr-4.0.0 )
+ statistics? ( dev-db/sqlite:3 )
+ v4l? ( media-libs/libv4l )
+ webpresence? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ )
+ xmpp? (
+ app-crypt/qca:2[qt4(+)]
+ dev-libs/qjson
+ net-dns/libidn
+ sys-libs/zlib
+ )
+ yahoo? ( media-libs/jasper )
+"
+RDEPEND="${COMMONDEPEND}
+ latex? (
+ virtual/imagemagick-tools
+ virtual/latex-base
+ )
+ ssl? ( app-crypt/qca:2[ssl] )
+ winpopup? ( net-fs/samba )
+"
+DEPEND="${COMMONDEPEND}
+ jingle? ( dev-libs/jsoncpp )
+ !aqua? ( x11-proto/scrnsaverproto )
+"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2017-5593.patch" )
+
+src_configure() {
+ local x x2
+ # Handle common stuff
+ local mycmakeargs=(
+ -DWITH_GOOGLETALK=$(usex jingle)
+ -DWITH_LiboRTP=$(usex jingle)
+ -DWITH_Mediastreamer=$(usex jingle)
+ -DWITH_Speex=$(usex jingle)
+ -DDISABLE_VIDEOSUPPORT=$(usex !v4l)
+ )
+ # enable protocols
+ for x in ${PROTOCOLS}; do
+ case ${x/+/} in
+ zeroconf) x2=bonjour ;;
+ xmpp) x2=jabber ;;
+ *) x2=${x/+/} ;;
+ esac
+ mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
+ done
+
+ mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF -DWITH_sms=OFF )
+
+ # enable plugins
+ for x in ${PLUGINS}; do
+ mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
+ done
+
+ kde4-base_src_configure
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ if ! use ssl; then
+ if use xmpp ; then # || use irc; then
+ if ! has_version "app-crypt/qca:2[ssl]" ; then
+ elog "In order to use ssl in xmpp you'll need to"
+ elog "install app-crypt/qca package with USE=ssl."
+ fi
+ fi
+ fi
+}
--- a/kde-apps/kopete/metadata.xml
+++ a/kde-apps/kopete/metadata.xml
@@ -6,6 +6,7 @@
Automatically add incoming urls to bookmarks.
Automatically replace selected text
Enables writing personal notes for contacts.
+ Enable cryptography plugin
Allows you to specify highlights on specific events.
Enables saving chat history.
Embed latex formatted text into messages.
--
>=kde-apps/kdepimlibs-4.14.10-r3
---
...12.0-update_gpgme++_and_qgpgme_references.patch | 56 ++++++++++++++++++++++
kde-apps/kopete/kopete-16.12.2-r3.ebuild | 7 ++-
2 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 kde-apps/kopete/files/kopete-16.12.0-update_gpgme++_and_qgpgme_references.patch
--- a/kde-apps/kopete/files/kopete-16.12.0-update_gpgme++_and_qgpgme_references.patch
+++ a/kde-apps/kopete/files/kopete-16.12.0-update_gpgme++_and_qgpgme_references.patch
@@ -0,0 +1,56 @@
+--- /CMakeLists.txt
++++ /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")
+--- /plugins/CMakeLists.txt
++++ /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)
+--- /plugins/cryptography/CMakeLists.txt
++++ /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})
+
+--- /plugins/cryptography/cryptographyplugin.cpp
++++ /plugins/cryptography/cryptographyplugin.cpp
+@@ -52,12 +52,12 @@
+ #include
+ #include
+ #include
+-#include
+-#include
+-#include
+-#include
+-#include
+-#include
++#include
++#include
++#include
++#include
++#include
++#include
+
+ // kabc stuff
+ #include
--- a/kde-apps/kopete/kopete-16.12.2-r3.ebuild
+++ a/kde-apps/kopete/kopete-16.12.2-r3.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-r4)
dev-libs/libpcre
>=dev-qt/qtgui-4.4.0:4[mng]
kde-frameworks/kdelibs:4[zeroconf?]
@@ -119,7 +119,10 @@ DEPEND="${COMMONDEPEND}
!aqua? ( x11-proto/scrnsaverproto )
"
-PATCHES=( "${FILESDIR}/${P}-CVE-2017-5593.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-CVE-2017-5593.patch"
+ "${FILESDIR}/${PN}-16.12.0-update_gpgme++_and_qgpgme_references.patch"
+)
src_configure() {
local x x2
--
>=app-crypt/gpgme-1.7.0
---
app-office/kmymoney/kmymoney-4.8.0-r1.ebuild | 86 ++++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
create mode 100644 app-office/kmymoney/kmymoney-4.8.0-r1.ebuild
--- a/app-office/kmymoney/kmymoney-4.8.0-r1.ebuild
+++ a/app-office/kmymoney/kmymoney-4.8.0-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr gl
+hu it kk nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde4-base
+
+DESCRIPTION="Personal finance manager by KDE"
+HOMEPAGE="https://kmymoney.org/"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug calendar doc hbci ofx pim quotes weboob"
+
+COMMON_DEPEND="
+ >=app-crypt/gpgme-1.7.0[cxx]
+ =net-libs/aqbanking-5.5.1
+ >=sys-libs/gwenhywfar-4.15.3[qt4]
+ )
+ ofx? ( >=dev-libs/libofx-0.9.4 )
+ pim? ( $(add_kdeapps_dep kdepimlibs) )
+ weboob? ( www-client/weboob )
+"
+RDEPEND="${COMMON_DEPEND}
+ quotes? ( dev-perl/Finance-Quote )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-tests.patch"
+ "${FILESDIR}/${P}-alkimia-detect.patch"
+ "${FILESDIR}/${P}-fix-csvdialog.patch"
+ "${FILESDIR}/${P}-soversion.patch"
+ "${FILESDIR}/${P}-gpgmepp.patch"
+ "${FILESDIR}/${P}-kdepimlibs-optional.patch"
+)
+
+src_prepare() {
+ kde4-base_src_prepare
+
+ # don't install as executable
+ sed -i kmymoney/CMakeLists.txt \
+ -e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_QT_DESIGNER=OFF
+ -DENABLE_LIBICAL=$(usex calendar)
+ -DUSE_DEVELOPER_DOC=$(usex doc)
+ -DENABLE_KBANKING=$(usex hbci)
+ -DENABLE_LIBOFX=$(usex ofx)
+ $(cmake-utils_use_find_package pim KdepimLibs)
+ -DENABLE_WEBOOB=$(usex weboob)
+ )
+ kde4-base_src_configure
+}
+
+src_compile() {
+ kde4-base_src_compile
+ use doc && kde4-base_src_compile apidoc
+}
+
+src_install() {
+ use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
+ kde4-base_src_install
+}
--
pushd/popd to /dev/null
---
kde-apps/kdepim-kresources/kdepim-kresources-4.4.2016.01.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/kde-apps/kdepim-kresources/kdepim-kresources-4.4.2016.01.ebuild
+++ a/kde-apps/kdepim-kresources/kdepim-kresources-4.4.2016.01.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
KMNAME="kdepim"
KMMODULE="kresources"
@@ -31,10 +31,10 @@ KMLOADLIBS="libkdepim"
src_prepare() {
local kconfig_compiler="${EKDEDIR}/bin/kconfig_compiler"
- pushd kaddressbook/common
+ pushd kaddressbook/common > /dev/null
# create the kabprefs_base.h file
"${kconfig_compiler}" kaddressbook.kcfg kabprefs_base.kcfgc
- popd
+ popd > /dev/null
kde4-meta_src_prepare
}
--
kde-apps/kdepimlibs
---
app-crypt/gpgme/gpgme-1.8.0-r3.ebuild | 105 ++++++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
create mode 100644 app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
--- a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
+++ a/app-crypt/gpgme/gpgme-1.8.0-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 eutils flag-o-matic qmake-utils
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs cxx python qt5"
+
+COMMON_DEPEND="app-crypt/gnupg
+ >=dev-libs/libassuan-2.0.2
+ >=dev-libs/libgpg-error-1.11
+ python? ( ${PYTHON_DEPS} )
+ qt5? ( dev-qt/qtcore:5 )"
+ #doc? ( app-doc/doxygen[dot] )
+DEPEND="${COMMON_DEPEND}
+ python? ( dev-lang/swig )
+ qt5? ( dev-qt/qttest:5 )"
+RDEPEND="${COMMON_DEPEND}
+ cxx? (
+ !kde-apps/gpgmepp
+ ! /dev/null || die
+ distutils-r1_src_${EBUILD_PHASE}
+ popd > /dev/null
+ fi
+}
+
+src_prepare() {
+ default
+ do_python
+}
+
+src_configure() {
+ local languages=()
+ use common-lisp && languages+=( "cl" )
+ use cxx && languages+=( "cpp" )
+ if use qt5; then
+ languages+=( "qt" )
+ #use doc ||
+ export DOXYGEN=true
+ export MOC="$(qt5_get_bindir)/moc"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # FIXME: I don't know how to select on C++11 (libc++) here, but
+ # I do know all Darwin users are using C++11. This should also
+ # apply to GCC 4.7+ with libc++, and basically anyone targetting
+ # it.
+
+ # The C-standard doesn't define strdup, and C++11 drops it
+ # resulting in an implicit declaration of strdup error. Since
+ # it is in POSIX raise the feature set to that.
+ append-cxxflags -D_POSIX_C_SOURCE=200112L
+ fi
+
+ econf \
+ --enable-languages="${languages[*]}" \
+ $(use_enable static-libs static)
+
+ use python && make -C lang/python prepare
+
+ do_python
+}
+
+src_compile() {
+ default
+ do_python
+}
+
+src_install() {
+ default
+ do_python
+ prune_libtool_files
+
+ # backward compatibility for gentoo
+ # in the past we had slots
+ dodir /usr/include/gpgme
+ dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
--