Attachment #466084 for bug #611818

View | Details | Raw Unified | Return to bug 611818 | Differences between
Collapse All | Expand All




--- /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 @@
  * - <a href="microblog/html/index.html"><b>microblog</b></a>.
  *   <i>A library for microblogging.</i>
  *
- * - <a href="qgpgme/html/index.html"><b>QGpgME</b></a>.
+ * - <a href="kde4_qgpgme/html/index.html"><b>QGpgME</b></a>.
  *   <i>A C++ wrapper for gpgme.</i>
  *
  * - <a href="syndication/html/index.html"><b>syndication</b></a>.
--- /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})




--- /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 <config-gpgme++.h>
-
-#include <gpgme++/global.h>
-
-#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} )




--- /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 @@
  * - <a href="microblog/html/index.html"><b>microblog</b></a>.
  *   <i>A library for microblogging.</i>
  *
- * - <a href="qgpgme/html/index.html"><b>QGpgME</b></a>.
+ * - <a href="kde4_qgpgme/html/index.html"><b>QGpgME</b></a>.
  *   <i>A C++ wrapper for gpgme.</i>
  *
  * - <a href="syndication/html/index.html"><b>syndication</b></a>.
--- /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})




--- /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 <config-gpgme++.h>
-
-#include <gpgme++/global.h>
-
-#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} )




# 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/libgpg-error
	>=dev-libs/libical-0.48-r2:=
	dev-libs/cyrus-sasl
	>=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')"
}




# 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/libgpg-error
	>=dev-libs/libical-0.48-r2:=
	dev-libs/cyrus-sasl
	>=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')"
}
references for compatibility with >=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




--- /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 <kaddressbookgrantlee/widget/grantleecontactviewer.h>
 
-#ifdef QGPGME_FOUND
+#ifdef KDE4_QGPGME_FOUND
 #include <kde4_gpgme++/context.h>
 #include <kde4_gpgme++/data.h>
 #include <kde4_gpgme++/key.h>
 #include <kde4_qgpgme/dataprovider.h>
-#endif // QGPGME_FOUND
+#endif // KDE4_QGPGME_FOUND
 
 #include <KABC/VCardConverter>
 
@@ -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}




--- /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(




# 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-r3)
	$(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
}




# 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-r3)
	$(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
}
references for compatibility with
>=kde-apps/kdepimlibs-4.14.11_pre20160211-r3.
--
...0211-update_gpgme++_and_qgpgme_references.patch | 348 +++++++++++++++++++++
...depim-common-libs-4.14.11_pre20160211-r1.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-r1.ebuild




--- /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 <kaddressbookgrantlee/widget/grantleecontactviewer.h>
 
-#ifdef QGPGME_FOUND
+#ifdef KDE4_QGPGME_FOUND
 #include <kde4_gpgme++/context.h>
 #include <kde4_gpgme++/data.h>
 #include <kde4_gpgme++/key.h>
 #include <kde4_qgpgme/dataprovider.h>
-#endif // QGPGME_FOUND
+#endif // KDE4_QGPGME_FOUND
 
 #include <KABC/VCardConverter>
 
@@ -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}




# 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-r3)
	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
	!<kde-apps/kaddressbook-4.11.50:4
	!kde-apps/kdepim-wizards:4
	!<kde-apps/kmail-4.14.5:4
	!<kde-apps/korganizer-4.5.67:4
	$(add_kdeapps_dep kdepim-runtime)
	app-crypt/gnupg
"

RESTRICT="test"
# bug 393131

KMEXTRA="
	agents/sendlateragent/
	akonadi_next/
	calendarsupport/
	calendarviews/
	composereditor-ng/
	grantleeeditor/grantleethemeeditor/
	grantleetheme/
	incidenceeditor-ng/
	libkdepim/
	libkdepimdbusinterfaces/
	libkleo/
	libkpgp/
	kaddressbookgrantlee/
	kdgantt2/
	mailcommon/
	mailimporter/
	messagecomposer/
	messagecore/
	messagelist/
	messageviewer/
	noteshared/
	pimcommon/
	templateparser/
"
KMEXTRACTONLY="
	agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
	kleopatra/
	kmail/
	knode/org.kde.knode.xml
	korgac/org.kde.korganizer.KOrgac.xml
	korganizer/data/org.kde.korganizer.Korganizer.xml
	korganizer/data/org.kde.Korganizer.Calendar.xml
"
KMSAVELIBS="true"

PATCHES=(
	"${FILESDIR}/install-composereditorng.patch"
	"${FILESDIR}/${PN}-install-headers.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
	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
}
references for compatibility with >=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




--- /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(




# 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-r3)
	$(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
}
references for compatibility with >=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-r1.ebuild        |  67 ++++
kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.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-r1.ebuild
create mode 100644 kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild




--- /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 <kaddressbookgrantlee/widget/grantleecontactviewer.h>
 
-#ifdef QGPGME_FOUND
+#ifdef KDE4_QGPGME_FOUND
 #include <kde4_gpgme++/context.h>
 #include <kde4_gpgme++/data.h>
 #include <kde4_gpgme++/key.h>
 #include <kde4_qgpgme/dataprovider.h>
-#endif // QGPGME_FOUND
+#endif // KDE4_QGPGME_FOUND
 
 #include <KABC/VCardConverter>
 
@@ -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}




--- /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(




# 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-r3)
	$(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
}




# 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-r3)
	$(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
}
for compatibility with >=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-r1.ebuild | 130 ++++++++
kde-apps/kmail/kmail-4.4.2016.01-r1.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-r1.ebuild
create mode 100644 kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild




--- /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 <kaddressbookgrantlee/widget/grantleecontactviewer.h>
 
-#ifdef QGPGME_FOUND
+#ifdef KDE4_QGPGME_FOUND
 #include <kde4_gpgme++/context.h>
 #include <kde4_gpgme++/data.h>
 #include <kde4_gpgme++/key.h>
 #include <kde4_qgpgme/dataprovider.h>
-#endif // QGPGME_FOUND
+#endif // KDE4_QGPGME_FOUND
 
 #include <KABC/VCardConverter>
 
@@ -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}




--- /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(




# 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-r3)
	$(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
}




# 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-r3)
	$(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
}
references for compatibility with
>=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




--- /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 <kaddressbookgrantlee/widget/grantleecontactviewer.h>
 
-#ifdef QGPGME_FOUND
+#ifdef KDE4_QGPGME_FOUND
 #include <kde4_gpgme++/context.h>
 #include <kde4_gpgme++/data.h>
 #include <kde4_gpgme++/key.h>
 #include <kde4_qgpgme/dataprovider.h>
-#endif // QGPGME_FOUND
+#endif // KDE4_QGPGME_FOUND
 
 #include <KABC/VCardConverter>
 
@@ -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}




# 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-r3)
	$(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
}
for compatibility with >=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




--- /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 <kaddressbookgrantlee/widget/grantleecontactviewer.h>
 
-#ifdef QGPGME_FOUND
+#ifdef KDE4_QGPGME_FOUND
 #include <kde4_gpgme++/context.h>
 #include <kde4_gpgme++/data.h>
 #include <kde4_gpgme++/key.h>
 #include <kde4_qgpgme/dataprovider.h>
-#endif // QGPGME_FOUND
+#endif // KDE4_QGPGME_FOUND
 
 #include <KABC/VCardConverter>
 
@@ -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}




--- /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(




# 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-r3)
	$(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
}




# 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-r3)
	$(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
}
references for compatibility with >=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




--- /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 <kaddressbookgrantlee/widget/grantleecontactviewer.h>
 
-#ifdef QGPGME_FOUND
+#ifdef KDE4_QGPGME_FOUND
 #include <kde4_gpgme++/context.h>
 #include <kde4_gpgme++/data.h>
 #include <kde4_gpgme++/key.h>
 #include <kde4_qgpgme/dataprovider.h>
-#endif // QGPGME_FOUND
+#endif // KDE4_QGPGME_FOUND
 
 #include <KABC/VCardConverter>
 
@@ -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}




--- /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(




# 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-r3)
	$(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
}




# 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-r3)
	$(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
}
for compatibility with >=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




--- /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(




# 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-r3)
"
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     |  4 ++
2 files changed, 73 insertions(+)
create mode 100644 kde-apps/libkleo/files/libkleo-4.4.2016.01-install_headers.patch




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)




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




# 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
}




		<flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag>
		<flag name="autoreplace">Automatically replace selected text</flag>
		<flag name="contactnotes">Enables writing personal notes for contacts.</flag>
		<flag name="cryptography">Enable cryptography plugin</flag>
		<flag name="highlight">Allows you to specify highlights on specific events.</flag>
		<flag name="history">Enables saving chat history.</flag>
		<flag name="latex">Embed latex formatted text into messages.</flag>
- 
for compatibility with >=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




--- /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 <kleo/signjob.h>
 #include <kleo/keylistjob.h>
 #include <kleo/job.h>
-#include <gpgme++/decryptionresult.h>
-#include <gpgme++/verificationresult.h>
-#include <gpgme++/keylistresult.h>
-#include <gpgme++/signingresult.h>
-#include <gpgme++/encryptionresult.h>
-#include <gpgme++/key.h>
+#include <kde4_gpgme++/decryptionresult.h>
+#include <kde4_gpgme++/verificationresult.h>
+#include <kde4_gpgme++/keylistresult.h>
+#include <kde4_gpgme++/signingresult.h>
+#include <kde4_gpgme++/encryptionresult.h>
+#include <kde4_gpgme++/key.h>
 
 // kabc stuff
 #include <kabc/addressbook.h>




IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"

COMMONDEPEND="
	$(add_kdeapps_dep kdepimlibs '' 4.14.10-r3)
	dev-libs/libpcre
	>=dev-qt/qtgui-4.4.0:4[mng]
	kde-frameworks/kdelibs:4[zeroconf?]

	!aqua? ( x11-proto/scrnsaverproto )
"

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




# 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]
	<app-office/libalkimia-6.0.0
	dev-libs/gmp:0=
	dev-libs/libgpg-error
	x11-misc/shared-mime-info
	calendar? ( dev-libs/libical:= )
	hbci? (
		>=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
}
of pushd and popd to /dev/null.
--
kde-apps/kdepim-kresources/kdepim-kresources-4.4.2016.01.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)




# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI=6

KMNAME="kdepim"
KMMODULE="kresources"

src_prepare() {
	local kconfig_compiler="${EKDEDIR}/bin/kconfig_compiler"

	pushd kaddressbook/common > /dev/null
	# create the kabprefs_base.h file
	"${kconfig_compiler}" kaddressbook.kcfg kabprefs_base.kcfgc
	popd > /dev/null

	kde4-meta_src_prepare
}
- 
kde-apps/kdepimlibs.
--
app-crypt/gpgme/gpgme-1.8.0-r3.ebuild | 104 ++++++++++++++++++++++++++++++++++
1 file changed, 104 insertions(+)
create mode 100644 app-crypt/gpgme/gpgme-1.8.0-r3.ebuild




# 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
		!<kde-apps/kdepimlibs-4.14.10-r3:4
		!=kde-apps/kdepimlibs-4.14.11_pre20160211:4
		!=kde-apps/kdepimlibs-4.14.11_pre20160211-r1:4
		!=kde-apps/kdepimlibs-4.14.11_pre20160211-r2:4
	)"

REQUIRED_USE="qt5? ( cxx )"

PATCHES=(
	"${FILESDIR}"/${PN}-1.1.8-et_EE.patch
	"${FILESDIR}"/${P}-cmake.patch
)

do_python() {
	if use python; then
		pushd lang/python > /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
}

Return to bug 611818

Line 0 Link Here

(-)a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10-gpgme++_and_qgpgme_renaming.patch (+334 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -74,7 +74,7 @@
		4	find_package(Gpgme REQUIRED)
		5	# configure macros
		6	if (GPGME_FOUND)
		7	- include (gpgme++/ConfigureChecks.cmake)
		8	+ include (kde4_gpgme++/ConfigureChecks.cmake)
		9	endif()
		10
		11	if (NOT KDEPIM_ONLY_KLEO)
		12	@@ -139,8 +139,8 @@
		13	############### Now, we add the KDEPIMLibs components ###############
		14	# These targets will always be built
		15	add_subdirectory(cmake)
		16	-add_subdirectory(gpgme++)
		17	-add_subdirectory(qgpgme)
		18	+add_subdirectory(kde4_gpgme++)
		19	+add_subdirectory(kde4_qgpgme)
		20
		21	if (NOT KDEPIM_ONLY_KLEO)
		22	add_subdirectory(kabc)
		23	--- /KdepimLibsConfig.cmake.in
		24	+++ /KdepimLibsConfig.cmake.in
		25	@@ -75,7 +75,6 @@
		26	_kdepimlibs_set_lib_vars(AKONADI_NOTES akonadi-notes)
		27	_kdepimlibs_set_lib_vars(AKONADI_SOCIALUTILS akonadi-socialutils)
		28	_kdepimlibs_set_lib_vars(AKONADI_XML akonadi-xml)
		29	-_kdepimlibs_set_lib_vars(GPGMEPP gpgmepp)
		30	_kdepimlibs_set_lib_vars(KABC kabc)
		31	_kdepimlibs_set_lib_vars(KALARMCAL kalarmcal)
		32	if (NOT KDEPIMLIBS_NO_KCAL)
		33	@@ -85,6 +84,8 @@
		34	endif()
		35	_kdepimlibs_set_lib_vars(KCALCORE kcalcore)
		36	_kdepimlibs_set_lib_vars(KCALUTILS kcalutils)
		37	+_kdepimlibs_set_lib_vars(KDE4_GPGMEPP kde4_gpgmepp)
		38	+_kdepimlibs_set_lib_vars(KDE4_QGPGME kde4_qgpgme)
		39	_kdepimlibs_set_lib_vars(KHOLIDAYS kholidays)
		40	_kdepimlibs_set_lib_vars(KIMAP kimap)
		41	_kdepimlibs_set_lib_vars(KLDAP kldap)
		42	@@ -101,5 +102,4 @@
		43	_kdepimlibs_set_lib_vars(KXMLRPCCLIENT kxmlrpcclient)
		44	_kdepimlibs_set_lib_vars(MAILTRANSPORT mailtransport)
		45	_kdepimlibs_set_lib_vars(MICROBLOG microblog)
		46	-_kdepimlibs_set_lib_vars(QGPGME qgpgme)
		47	_kdepimlibs_set_lib_vars(SYNDICATION syndication)
		48	--- /Mainpage.dox
		49	+++ /Mainpage.dox
		50	@@ -73,7 +73,7 @@
		51	* - <a href="microblog/html/index.html"><b>microblog</b></a>.
		52	* <i>A library for microblogging.</i>
		53	*
		54	- * - <a href="qgpgme/html/index.html"><b>QGpgME</b></a>.
		55	+ * - <a href="kde4_qgpgme/html/index.html"><b>QGpgME</b></a>.
		56	* <i>A C++ wrapper for gpgme.</i>
		57	*
		58	* - <a href="syndication/html/index.html"><b>syndication</b></a>.
		59	--- /cmake/modules/FindKDE4_QGpgme.cmake
		60	+++ /cmake/modules/FindKDE4_QGpgme.cmake
		61	@@ -1,9 +1,9 @@
		62	-# - Try to find the QGpgME library
		63	+# - Try to find the KDE4_QGpgME library
		64	# Once done this will define
65	#
66	-# QGPGME_FOUND
67	-# QGPGME_LIBRARIES
68	-# QGPGME_INCLUDE_DIR
69	+# KDE4_QGPGME_FOUND
70	+# KDE4_QGPGME_LIBRARIES
71	+# KDE4_QGPGME_INCLUDE_DIR
72
73	# What we do here is a bit simplictic, but it's no worse than what
74	# people were using in kdepim up to now...
75	@@ -12,25 +12,25 @@
76
77	if(GPGME_FOUND)
78
79	- find_library(_QGPGME_EXTRA_LIBRARY gpgme++
80	+ find_library(_KDE4_QGPGME_EXTRA_LIBRARY kde4_gpgme++
81	HINTS ${GPGME_LIBRARY_DIR})
82
83	- find_library(QGPGME_LIBRARY qgpgme
84	+ find_library(KDE4_QGPGME_LIBRARY kde4_qgpgme
85	HINTS ${GPGME_LIBRARY_DIR})
86
87	- if (QGPGME_LIBRARY)
88	+ if (KDE4_QGPGME_LIBRARY)
89	# get the libdirectory and then go one up
90	- get_filename_component(_QGPGME_PREFIX "${QGPGME_LIBRARY}" PATH)
91	- get_filename_component(_QGPGME_PREFIX "${_QGPGME_PREFIX}" PATH)
92	- find_path(QGPGME_INCLUDE_DIR qgpgme/qgpgme_export.h
93	- HINTS "${_QGPGME_PREFIX}/include" )
94	+ get_filename_component(_KDE4_QGPGME_PREFIX "${KDE4_QGPGME_LIBRARY}" PATH)
95	+ get_filename_component(_KDE4_QGPGME_PREFIX "${_KDE4_QGPGME_PREFIX}" PATH)
96	+ find_path(KDE4_QGPGME_INCLUDE_DIR kde4_qgpgme/qgpgme_export.h
97	+ HINTS "${_KDE4_QGPGME_PREFIX}/include" )
98	endif()
99
100	- set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES})
101	+ set(KDE4_QGPGME_LIBRARIES ${KDE4_QGPGME_LIBRARY} ${_KDE4_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES})
102
103	endif()
104
105	include(FindPackageHandleStandardArgs)
106	-find_package_handle_standard_args(QGpgme DEFAULT_MSG QGPGME_LIBRARY QGPGME_INCLUDE_DIR _QGPGME_EXTRA_LIBRARY)
107	+find_package_handle_standard_args(KDE4_QGpgme DEFAULT_MSG KDE4_QGPGME_LIBRARY KDE4_QGPGME_INCLUDE_DIR _KDE4_QGPGME_EXTRA_LIBRARY)
108
109	-mark_as_advanced(QGPGME_LIBRARY _QGPGME_EXTRA_LIBRARY QGPGME_INCLUDE_DIR)
110	+mark_as_advanced(KDE4_QGPGME_LIBRARY _KDE4_QGPGME_EXTRA_LIBRARY KDE4_QGPGME_INCLUDE_DIR)
111	--- /kde4_gpgme++/CMakeLists.txt
112	+++ /kde4_gpgme++/CMakeLists.txt
113	@@ -1,5 +1,5 @@
114	-project( gpgmepp )
115	-#KDE4_NO_ENABLE_FINAL(gpgmepp)
116	+project( kde4_gpgmepp )
117	+#KDE4_NO_ENABLE_FINAL(kde4_gpgmepp)
118	if (MINGW)
119	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mms-bitfields")
120	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mms-bitfields")
121	@@ -15,7 +15,7 @@
122	## Unix: gpgme
123	## We're building corresponding gpgme++ flavours
124
125	-set(gpgme_LIB_SRCS
126	+set(kde4_gpgme_LIB_SRCS
127	exception.cpp
128	context.cpp key.cpp
129	trustitem.cpp
130	@@ -43,36 +43,37 @@
131	configuration.cpp
132	)
133
134	-set( _gpgmepp_version 2.8.0 )
135	-set( _gpgmepp_soversion 2 )
136	+set( _kde4_gpgmepp_version 2.8.0 )
137	+set( _kde4_gpgmepp_soversion 2 )
138
139	set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ${Boost_INCLUDE_DIR} )
140
141	if ( GPGME_VANILLA_FOUND )
142	- add_library( gpgmepp ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_vanilla.cpp )
143	- generate_export_header(gpgmepp EXPORT_FILE_NAME gpgme++_export.h)
144	+ add_library( kde4_gpgmepp ${LIBRARY_TYPE} ${kde4_gpgme_LIB_SRCS} context_vanilla.cpp )
145	+ generate_export_header(kde4_gpgmepp BASE_NAME gpgmepp EXPORT_FILE_NAME gpgme++_export.h)
146
147	- target_link_libraries( gpgmepp ${GPGME_VANILLA_LIBRARIES} )
148	- set_target_properties( gpgmepp PROPERTIES
149	- VERSION ${_gpgmepp_version}
150	- SOVERSION ${_gpgmepp_soversion}
151	- OUTPUT_NAME gpgme++
152	+ target_link_libraries( kde4_gpgmepp ${GPGME_VANILLA_LIBRARIES} )
153	+ set_target_properties( kde4_gpgmepp PROPERTIES
154	+ VERSION ${_kde4_gpgmepp_version}
155	+ SOVERSION ${_kde4_gpgmepp_soversion}
156	+ OUTPUT_NAME kde4_gpgme++
157	)
158	- get_target_property( GPGMEPP_VANILLA_LIBRARY gpgmepp LOCATION )
159	- install(TARGETS gpgmepp EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
160	+ get_target_property( GPGMEPP_VANILLA_LIBRARY kde4_gpgmepp LOCATION )
161	+ install(TARGETS kde4_gpgmepp EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
162
163	endif()
164
165	if ( GPGME_GLIB_FOUND )
166	- add_library( gpgmepp-glib ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_glib.cpp )
167	- target_link_libraries( gpgmepp-glib ${GPGME_GLIB_LIBRARIES} )
168	- set_target_properties( gpgmepp-glib PROPERTIES
169	- VERSION ${_gpgmepp_version}
170	- SOVERSION ${_gpgmepp_soversion}
171	- OUTPUT_NAME gpgme++-glib DEFINE_SYMBOL gpgmepp_EXPORTS
172	+ add_library( kde4_gpgmepp-glib ${LIBRARY_TYPE} ${kde4_gpgme_LIB_SRCS} context_glib.cpp )
173	+ target_link_libraries( kde4_gpgmepp-glib ${GPGME_GLIB_LIBRARIES} )
174	+ set_target_properties( kde4_gpgmepp-glib PROPERTIES
175	+ VERSION ${_kde4_gpgmepp_version}
176	+ SOVERSION ${_kde4_gpgmepp_soversion}
177	+ OUTPUT_NAME kde4_gpgme++-glib
178	+ DEFINE_SYMBOL kde4_gpgmepp_EXPORTS
179	)
180	- get_target_property( GPGMEPP_GLIB_LIBRARY gpgmepp LOCATION )
181	- install(TARGETS gpgmepp-glib EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
182	+ get_target_property( GPGMEPP_GLIB_LIBRARY kde4_gpgmepp-glib LOCATION )
183	+ install(TARGETS kde4_gpgmepp-glib EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
184	endif()
185
186	# this writes way too much, but do we care?
187	@@ -102,7 +103,7 @@
188	gpgagentgetinfoassuantransaction.h
189	configuration.h
190	${CMAKE_CURRENT_BINARY_DIR}/gpgme++_export.h vfsmountresult.h
191	- DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++ COMPONENT Devel
192	+ DESTINATION ${INCLUDE_INSTALL_DIR}/kde4_gpgme++ COMPONENT Devel
193	)
194
195	install(
196	@@ -110,6 +111,6 @@
197	${CMAKE_CURRENT_BINARY_DIR}/GpgmeppConfig.cmake
198	${CMAKE_CURRENT_BINARY_DIR}/GpgmeppLibraryDepends.cmake
199	DESTINATION
200	- ${LIB_INSTALL_DIR}/gpgmepp )
201	+ ${LIB_INSTALL_DIR}/kde4_gpgmepp )
202
203	endif()
204	--- /kde4_gpgme++/interfaces/CMakeLists.txt
205	+++ /kde4_gpgme++/interfaces/CMakeLists.txt
206	@@ -4,5 +4,5 @@
207	passphraseprovider.h
208	progressprovider.h
209	assuantransaction.h
210	- DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++/interfaces COMPONENT Devel)
211	+ DESTINATION ${INCLUDE_INSTALL_DIR}/kde4_gpgme++/interfaces COMPONENT Devel)
212
213	--- /kde4_qgpgme/CMakeLists.txt
214	+++ /kde4_qgpgme/CMakeLists.txt
215	@@ -1,16 +1,16 @@
216
217	set( _any_gpgme_found false )
218
219	-set( _qgpgme_version 1.0.1 )
220	-set( _qgpgme_soversion 1 )
221	+set( _kde4_qgpgme_version 1.0.1 )
222	+set( _kde4_qgpgme_soversion 1 )
223
224	if ( WIN32 AND GPGME_VANILLA_FOUND )
225
226	# on Windows, we require gpgme(-vanilla), which is thread-safe
227
228	set( _any_gpgme_found true )
229	- set( _qgpgme_libgpgme gpgmepp )
230	- #set( _qgpgme_extra_src eventloopinteractor_win.cpp )
231	+ set( _kde4_qgpgme_libgpgme kde4_gpgmepp )
232	+ #set( _kde4_qgpgme_extra_src eventloopinteractor_win.cpp )
233
234	endif()
235
236	@@ -19,9 +19,9 @@
237	# on Unix, we require gpgme(-vanilla), which is thread-safe
238
239	set( _any_gpgme_found true )
240	- set( _qgpgme_libgpgme gpgmepp )
241	- set( _qgpgme_extra_src eventloopinteractor.cpp eventloopinteractor_unix.cpp )
242	- set( _qgpgme_extra_headers eventloopinteractor.h )
243	+ set( _kde4_qgpgme_libgpgme kde4_gpgmepp )
244	+ set( _kde4_qgpgme_extra_src eventloopinteractor.cpp eventloopinteractor_unix.cpp )
245	+ set( _kde4_qgpgme_extra_headers eventloopinteractor.h )
246
247	endif()
248
249	@@ -33,27 +33,27 @@
250
251	add_subdirectory( tests )
252
253	- set( qgpgme_LIB_SRCS
254	+ set( kde4_qgpgme_LIB_SRCS
255	dataprovider.cpp
256	- ${_qgpgme_extra_src}
257	+ ${_kde4_qgpgme_extra_src}
258	)
259
260	- add_library( qgpgme ${LIBRARY_TYPE} ${qgpgme_LIB_SRCS} )
261	- generate_export_header(qgpgme)
262	+ add_library( kde4_qgpgme ${LIBRARY_TYPE} ${kde4_qgpgme_LIB_SRCS} )
263	+ generate_export_header(kde4_qgpgme BASE_NAME qgpgme)
264
265	- target_link_libraries( qgpgme ${QT_QTCORE_LIBRARY} ${_qgpgme_libgpgme} )
266	+ target_link_libraries( kde4_qgpgme ${QT_QTCORE_LIBRARY} ${_kde4_qgpgme_libgpgme} )
267
268	- set_target_properties( qgpgme PROPERTIES
269	- VERSION ${_qgpgme_version}
270	- SOVERSION ${_qgpgme_soversion}
271	+ set_target_properties( kde4_qgpgme PROPERTIES
272	+ VERSION ${_kde4_qgpgme_version}
273	+ SOVERSION ${_kde4_qgpgme_soversion}
274	)
275
276	- install( TARGETS qgpgme EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
277	+ install( TARGETS kde4_qgpgme EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
278
279	install( FILES
280	${CMAKE_CURRENT_BINARY_DIR}/qgpgme_export.h
281	- ${_qgpgme_extra_headers}
282	+ ${_kde4_qgpgme_extra_headers}
283	dataprovider.h
284	- DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme COMPONENT Devel )
285	+ DESTINATION ${INCLUDE_INSTALL_DIR}/kde4_qgpgme COMPONENT Devel )
286
287	endif()
288	--- /kde4_qgpgme/Mainpage.dox
289	+++ /kde4_qgpgme/Mainpage.dox
290	@@ -1 +1 @@
291	-// DOXYGEN_REFERENCES = gpgme++
292	+// DOXYGEN_REFERENCES = kde4_gpgme++
293	--- /kde4_qgpgme/tests/CMakeLists.txt
294	+++ /kde4_qgpgme/tests/CMakeLists.txt
295	@@ -1,5 +1,5 @@
296	if ( GPGME_VANILLA_FOUND )
297	- set( _qgpgme_libgpgme gpgmepp )
298	+ set( _kde4_qgpgme_libgpgme kde4_gpgmepp )
299	endif()
300
301	set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
302	@@ -10,7 +10,7 @@
303
304	########### next target ###############
305
306	-set( qgpgme_TESTS
307	+set( kde4_qgpgme_TESTS
308	dataprovidertest
309	installtest
310	# PORT ME AWAY FROM EVENT LOOPS
311	@@ -20,17 +20,17 @@
312	#gpgadduseridtest
313	)
314
315	-foreach( _qgpgme_test ${qgpgme_TESTS} )
316	- kde4_add_executable( "${_qgpgme_test}" TEST "${_qgpgme_test}.cpp" )
317	+foreach( _kde4_qgpgme_test ${kde4_qgpgme_TESTS} )
318	+ kde4_add_executable( "${_kde4_qgpgme_test}" TEST "${_kde4_qgpgme_test}.cpp" )
319	if (WIN32) # what's up?
320	- target_link_libraries( "${_qgpgme_test}" qgpgme ${_qgpgme_libgpgme} ${_gpgme_vanilla_library} ${_gpg_error_library} ${QT_QTCORE_LIBRARY} )
321	+ target_link_libraries( "${_kde4_qgpgme_test}" kde4_qgpgme ${_kde4_qgpgme_libgpgme} ${_gpgme_vanilla_library} ${_gpg_error_library} ${QT_QTCORE_LIBRARY} )
322	else()
323	- target_link_libraries( "${_qgpgme_test}" qgpgme ${_qgpgme_libgpgme} gpgme gpg-error ${QT_QTCORE_LIBRARY} )
324	+ target_link_libraries( "${_kde4_qgpgme_test}" kde4_qgpgme ${_kde4_qgpgme_libgpgme} gpgme gpg-error ${QT_QTCORE_LIBRARY} )
325	endif()
326	-endforeach( _qgpgme_test )
327	+endforeach( _kde4_qgpgme_test )
328
329	########### next target ###############
330
331	# PORT ME AWAY FROM EVENT LOOPS
332	#kde4_add_executable(editinteractortest TEST editinteractortest.cpp)
333	-#target_link_libraries(editinteractortest qgpgme ${QT_QTGUI_LIBRARY})
334	+#target_link_libraries(editinteractortest kde4_qgpgme ${QT_QTGUI_LIBRARY})

Line 0 Link Here

(-)a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10-gpgme-1.8.patch (+439 lines)
		1	--- /cmake/modules/FindGpgme.cmake
		2	+++ /cmake/modules/FindGpgme.cmake
		3	@@ -2,23 +2,18 @@
		4	#
		5	# Algorithm:
		6	# - Windows:
		7	-# On Windows, there's three gpgme variants: gpgme{,-glib,-qt}.
		8	+# On Windows, there are two gpgme variants: gpgme{,-glib}.
		9	# - The variant used determines the event loop integration possible:
		10	# - gpgme: no event loop integration possible, only synchronous operations supported
		11	# - gpgme-glib: glib event loop integration possible, only asynchronous operations supported
		12	-# - gpgme-qt: qt event loop integration possible, only asynchronous operations supported
		13	-# - GPGME_{VANILLA,GLIB,QT}_{FOUND,LIBRARIES} will be set for each of the above
		14	+# - GPGME_{VANILLA,GLIB}_{FOUND,LIBRARIES} will be set for each of the above
		15	# - GPGME_INCLUDES is the same for all of the above
		16	# - GPGME_FOUND is set if any of the above was found
		17	# - *nix:
		18	-# There's also three variants: gpgme{,-pthread,-pth}.
		19	-# - The variant used determines the multithreaded use possible:
		20	-# - gpgme: no multithreading support available
		21	-# - gpgme-pthread: multithreading available using POSIX threads
		22	-# - gpgme-pth: multithreading available using GNU PTH (cooperative multithreading)
		23	-# - GPGME_{VANILLA,PTH,PTHREAD}_{FOUND,LIBRARIES} will be set for each of the above
		24	-# - GPGME_INCLUDES is the same for all of the above
		25	-# - GPGME_FOUND is set if any of the above was found
		26	+# There is one variant: gpgme.
		27	+# - GPGME_VANILLA_{FOUND,LIBRARIES}
		28	+# - GPGME_INCLUDES
		29	+# - GPGME_FOUND is set if gpgme was found
		30	#
		31	# GPGME_LIBRARY_DIR - the directory where the libraries are located
		32
		33	@@ -54,7 +49,7 @@
		34	# don't require 2.6.3 but 2.6.2, we can't use it. Alex
		35	set( _seem_to_have_cached_gpgme false )
		36	if ( GPGME_INCLUDES )
		37	- if ( GPGME_VANILLA_LIBRARIES OR GPGME_QT_LIBRARIES OR GPGME_GLIB_LIBRARIES )
		38	+ if ( GPGME_VANILLA_LIBRARIES OR GPGME_GLIB_LIBRARIES )
		39	set( _seem_to_have_cached_gpgme true )
		40	endif()
		41	endif()
		42	@@ -63,11 +58,10 @@
		43
		44	macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND )
		45	macro_bool_to_bool( GPGME_GLIB_LIBRARIES GPGME_GLIB_FOUND )
		46	- macro_bool_to_bool( GPGME_QT_LIBRARIES GPGME_QT_FOUND )
		47	# this would have been preferred:
		48	#set( GPGME__FOUND macro_bool_to_bool(GPGME__LIBRARIES) )
		49
		50	- if ( GPGME_VANILLA_FOUND OR GPGME_GLIB_FOUND OR GPGME_QT_FOUND )
		51	+ if ( GPGME_VANILLA_FOUND OR GPGME_GLIB_FOUND )
		52	set( GPGME_FOUND true )
		53	else()
		54	set( GPGME_FOUND false )
		55	@@ -84,7 +78,6 @@
		56	set( GPGME_FOUND false )
		57	set( GPGME_VANILLA_FOUND false )
		58	set( GPGME_GLIB_FOUND false )
		59	- set( GPGME_QT_FOUND false )
		60
		61	find_path( GPGME_INCLUDES gpgme.h
		62	${CMAKE_INCLUDE_PATH}
		63	@@ -103,12 +96,6 @@
		64	${CMAKE_INSTALL_PREFIX}/lib
65	)
66
67	- find_library( _gpgme_qt_library NAMES gpgme-qt libgpgme-qt gpgme-qt-11 libgpgme-qt-11
68	- PATHS
69	- ${CMAKE_LIBRARY_PATH}
70	- ${CMAKE_INSTALL_PREFIX}/lib
71	- )
72	-
73	find_library( _gpg_error_library NAMES gpg-error libgpg-error gpg-error-0 libgpg-error-0
74	PATHS
75	${CMAKE_LIBRARY_PATH}
76	@@ -129,24 +116,11 @@
77	set( GPGME_FOUND true )
78	endif()
79
80	- if ( _gpgme_qt_library AND _gpg_error_library )
81	- set( GPGME_QT_LIBRARIES ${_gpgme_qt_library} ${_gpg_error_library} )
82	- set( GPGME_QT_FOUND true )
83	- set( GPGME_FOUND true )
84	- endif()
85	-
86	endif()
87
88	- # these are Unix-only:
89	- set( GPGME_PTHREAD_FOUND false )
90	- set( GPGME_PTH_FOUND false )
91	- set( HAVE_GPGME_PTHREAD 0 )
92	- set( HAVE_GPGME_PTH 0 )
93	-
94	macro_bool_to_01( GPGME_FOUND HAVE_GPGME )
95	macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA )
96	macro_bool_to_01( GPGME_GLIB_FOUND HAVE_GPGME_GLIB )
97	- macro_bool_to_01( GPGME_QT_FOUND HAVE_GPGME_QT )
98
99	else() # not WIN32
100
101	@@ -156,7 +130,7 @@
102	# see WIN32 case for an explanation of what this does:
103	set( _seem_to_have_cached_gpgme false )
104	if ( GPGME_INCLUDES )
105	- if ( GPGME_VANILLA_LIBRARIES OR GPGME_PTHREAD_LIBRARIES OR GPGME_PTH_LIBRARIES )
106	+ if ( GPGME_VANILLA_LIBRARIES )
107	set( _seem_to_have_cached_gpgme true )
108	endif()
109	endif()
110	@@ -164,10 +138,8 @@
111	if ( _seem_to_have_cached_gpgme )
112
113	macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND )
114	- macro_bool_to_bool( GPGME_PTHREAD_LIBRARIES GPGME_PTHREAD_FOUND )
115	- macro_bool_to_bool( GPGME_PTH_LIBRARIES GPGME_PTH_FOUND )
116
117	- if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
118	+ if ( GPGME_VANILLA_FOUND )
119	set( GPGME_FOUND true )
120	else()
121	set( GPGME_FOUND false )
122	@@ -177,8 +149,6 @@
123
124	set( GPGME_FOUND false )
125	set( GPGME_VANILLA_FOUND false )
126	- set( GPGME_PTHREAD_FOUND false )
127	- set( GPGME_PTH_FOUND false )
128
129	find_program( _GPGMECONFIG_EXECUTABLE NAMES gpgme-config )
130
131	@@ -189,8 +159,8 @@
132
133	exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION )
134
135	- set( _GPGME_MIN_VERSION "1.1.7" )
136	- if( ${GPGME_VERSION} VERSION_GREATER ${_GPGME_MIN_VERSION} )
137	+ set( _GPGME_MIN_VERSION "1.8.0" )
138	+ if( NOT ${GPGME_VERSION} VERSION_LESS ${_GPGME_MIN_VERSION} )
139	set( _GPGME_INSTALLED_VERSION_OK TRUE )
140	endif()
141
142	@@ -207,24 +177,14 @@
143	set( _gpgme_config_vanilla_libs )
144	endif()
145
146	- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
147	- if ( _ret )
148	- set( _gpgme_config_pthread_libs )
149	- endif()
150	-
151	- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth --libs OUTPUT_VARIABLE _gpgme_config_pth_libs RETURN_VALUE _ret )
152	- if ( _ret )
153	- set( _gpgme_config_pth_libs )
154	- endif()
155	-
156	# append -lgpg-error to the list of libraries, if necessary
157	- foreach ( _flavour vanilla pthread pth )
158	+ foreach ( _flavour vanilla )
159	if ( _gpgme_config_${_flavour}_libs AND NOT _gpgme_config_${_flavour}_libs MATCHES "lgpg-error" )
160	set( _gpgme_config_${_flavour}_libs "${_gpgme_config_${_flavour}_libs} -lgpg-error" )
161	endif()
162	endforeach()
163
164	- if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs OR _gpgme_config_pth_libs )
165	+ if ( _gpgme_config_vanilla_libs )
166
167	exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _GPGME_CFLAGS )
168
169	@@ -233,7 +193,7 @@
170	string( REGEX REPLACE " *-I" ";" GPGME_INCLUDES "${_GPGME_CFLAGS}" )
171	endif()
172
173	- foreach ( _flavour vanilla pthread pth )
174	+ foreach ( _flavour vanilla )
175	if ( _gpgme_config_${_flavour}_libs )
176
177	set( _gpgme_library_dirs )
178	@@ -291,13 +251,11 @@
179	endforeach( _flavour )
180
181	# ensure that they are cached
182	- # This comment above doesn't make sense, the four following lines seem to do nothing. Alex
183	+ # This comment above doesn't make sense, the two following lines seem to do nothing. Alex
184	set( GPGME_INCLUDES ${GPGME_INCLUDES} )
185	set( GPGME_VANILLA_LIBRARIES ${GPGME_VANILLA_LIBRARIES} )
186	- set( GPGME_PTHREAD_LIBRARIES ${GPGME_PTHREAD_LIBRARIES} )
187	- set( GPGME_PTH_LIBRARIES ${GPGME_PTH_LIBRARIES} )
188
189	- if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
190	+ if ( GPGME_VANILLA_FOUND )
191	set( GPGME_FOUND true )
192	else()
193	set( GPGME_FOUND false )
194	@@ -313,14 +271,10 @@
195
196	# these are Windows-only:
197	set( GPGME_GLIB_FOUND false )
198	- set( GPGME_QT_FOUND false )
199	set( HAVE_GPGME_GLIB 0 )
200	- set( HAVE_GPGME_QT 0 )
201
202	macro_bool_to_01( GPGME_FOUND HAVE_GPGME )
203	macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA )
204	- macro_bool_to_01( GPGME_PTHREAD_FOUND HAVE_GPGME_PTHREAD )
205	- macro_bool_to_01( GPGME_PTH_FOUND HAVE_GPGME_PTH )
206
207	endif() # WIN32 \| Unix
208
209	@@ -335,20 +289,8 @@
210	set( _gpgme_flavours "${_gpgme_flavours} Glib" )
211	endif()
212
213	-if ( GPGME_QT_FOUND )
214	- set( _gpgme_flavours "${_gpgme_flavours} Qt" )
215	-endif()
216	-
217	-if ( GPGME_PTHREAD_FOUND )
218	- set( _gpgme_flavours "${_gpgme_flavours} pthread" )
219	-endif()
220	-
221	-if ( GPGME_PTH_FOUND )
222	- set( _gpgme_flavours "${_gpgme_flavours} pth" )
223	-endif()
224	-
225	# determine the library in one of the found flavours, can be reused e.g. by FindQgpgme.cmake, Alex
226	-foreach(_currentFlavour vanilla glib qt pth pthread)
227	+foreach(_currentFlavour vanilla glib)
228	if(NOT GPGME_LIBRARY_DIR)
229	get_filename_component(GPGME_LIBRARY_DIR "${_gpgme_${_currentFlavour}_lib}" PATH)
230	endif()
231	--- /cmake/modules/FindQGpgme.cmake
232	+++ /cmake/modules/FindQGpgme.cmake
233	@@ -12,13 +12,8 @@
234
235	if(GPGME_FOUND)
236
237	- if ( WIN32 )
238	- find_library(_QGPGME_EXTRA_LIBRARY gpgme++
239	- HINTS ${GPGME_LIBRARY_DIR})
240	- else ( WIN32 )
241	- find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread
242	- HINTS ${GPGME_LIBRARY_DIR})
243	- endif()
244	+ find_library(_QGPGME_EXTRA_LIBRARY gpgme++
245	+ HINTS ${GPGME_LIBRARY_DIR})
246
247	find_library(QGPGME_LIBRARY qgpgme
248	HINTS ${GPGME_LIBRARY_DIR})
249	@@ -31,11 +26,7 @@
250	HINTS "${_QGPGME_PREFIX}/include" )
251	endif()
252
253	- if ( WIN32 )
254	- set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES} ${GPGME_QT_LIBRARIES})
255	- else ( WIN32 )
256	- set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_PTHREAD_LIBRARIES})
257	- endif()
258	+ set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES})
259
260	endif()
261
262	--- /gpgme++/CMakeLists.txt
263	+++ /gpgme++/CMakeLists.txt
264	@@ -10,9 +10,9 @@
265
266	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-gpgme++.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gpgme++.h )
267
268	-## gpgme comes in three flavours on each of the platforms:
269	-## Windows: gpgme, gpgme-glib, gpgme-qt
270	-## Unix: gpgme, gpgme-pthread, gpgme-pth
271	+## gpgme comes in these flavours on each of the platforms:
272	+## Windows: gpgme, gpgme-glib
273	+## Unix: gpgme
274	## We're building corresponding gpgme++ flavours
275
276	set(gpgme_LIB_SRCS
277	@@ -75,47 +75,6 @@
278	install(TARGETS gpgmepp-glib EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
279	endif()
280
281	-
282	-if ( GPGME_QT_FOUND )
283	- add_library( gpgmepp-qt ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_qt.cpp )
284	- target_link_libraries( gpgmepp-qt ${GPGME_QT_LIBRARIES} )
285	- if(WIN32)
286	- target_link_libraries( gpgmepp-qt ${GPGME_VANILLA_LIBRARIES} )
287	- endif()
288	- set_target_properties( gpgmepp-qt PROPERTIES
289	- VERSION ${_gpgmepp_version}
290	- SOVERSION ${_gpgmepp_soversion}
291	- OUTPUT_NAME gpgme++-qt DEFINE_SYMBOL gpgmepp_EXPORTS
292	- )
293	- get_target_property( GPGMEPP_QT_LIBRARY gpgmepp LOCATION )
294	- install(TARGETS gpgmepp-qt EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
295	-endif()
296	-
297	-
298	-if ( GPGME_PTHREAD_FOUND )
299	- add_library( gpgmepp-pthread ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_vanilla.cpp )
300	- target_link_libraries( gpgmepp-pthread ${GPGME_PTHREAD_LIBRARIES} )
301	- set_target_properties( gpgmepp-pthread PROPERTIES
302	- VERSION ${_gpgmepp_version}
303	- SOVERSION ${_gpgmepp_soversion}
304	- OUTPUT_NAME gpgme++-pthread DEFINE_SYMBOL gpgmepp_EXPORTS
305	- )
306	- get_target_property( GPGMEPP_PTHREAD_LIBRARY gpgmepp LOCATION )
307	- install(TARGETS gpgmepp-pthread EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
308	-endif()
309	-
310	-if ( GPGME_PTH_FOUND )
311	- add_library( gpgmepp-pth ${LIBRARY_TYPE} ${gpgme_LIB_SRCS} context_vanilla.cpp )
312	- target_link_libraries( gpgmepp-pth ${GPGME_PTH_LIBRARIES} )
313	- set_target_properties( gpgmepp-pth PROPERTIES
314	- VERSION ${_gpgmepp_version}
315	- SOVERSION ${_gpgmepp_soversion}
316	- OUTPUT_NAME gpgme++-pth DEFINE_SYMBOL gpgmepp_EXPORTS
317	- )
318	- get_target_property( GPGMEPP_PTH_LIBRARY gpgmepp LOCATION )
319	- install(TARGETS gpgmepp-pth EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
320	-endif()
321	-
322	# this writes way too much, but do we care?
323	EXPORT_LIBRARY_DEPENDENCIES( ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppLibraryDepends.cmake )
324
325	--- /gpgme++/GpgmeppConfig.cmake.in
326	+++ /gpgme++/GpgmeppConfig.cmake.in
327	@@ -7,21 +7,6 @@
328	set( GPGMEPP_VANILLA_LIBRARIES "@GPGMEPP_VANILLA_LIBRARY@" )
329	endif()
330
331	-set( GPGMEPP_PTHREAD_FOUND @HAVE_GPGME_PTHREAD@ )
332	-if ( GPGMEPP_PTHREAD_FOUND )
333	- set( GPGMEPP_PTHREAD_LIBRARIES "@GPGMEPP_PTHREAD_LIBRARY@" )
334	-endif()
335	-
336	-set( GPGMEPP_PTH_FOUND @HAVE_GPGME_PTH@ )
337	-if ( GPGMEPP_PTH_FOUND )
338	- set( GPGMEPP_PTH_LIBRARIES "@GPGMEPP_PTH_LIBRARY@" )
339	-endif()
340	-
341	-set( GPGMEPP_QT_FOUND @HAVE_GPGME_QT@ )
342	-if ( GPGMEPP_QT_FOUND )
343	- set( GPGMEPP_QT_LIBRARIES "@GPGMEPP_QT_LIBRARY@" )
344	-endif()
345	-
346	set( GPGMEPP_GLIB_FOUND @HAVE_GPGME_GLIB@ )
347	if ( GPGMEPP_GLIB_FOUND )
348	set( GPGMEPP_GLIB_LIBRARIES "@GPGMEPP_GLIB_LIBRARY@" )
349	--- /gpgme++/context_qt.cpp
350	+++ /gpgme++/context_qt.cpp
351	@@ -1,43 +0,0 @@
352	-/*
353	- context_qt.cpp - wraps a gpgme key context, gpgme-qt-specific functions
354	- Copyright (C) 2007 Klarälvdalens Datakonsult AB
355	-
356	- This file is part of GPGME++.
357	-
358	- GPGME++ is free software; you can redistribute it and/or
359	- modify it under the terms of the GNU Library General Public
360	- License as published by the Free Software Foundation; either
361	- version 2 of the License, or (at your option) any later version.
362	-
363	- GPGME++ is distributed in the hope that it will be useful,
364	- but WITHOUT ANY WARRANTY; without even the implied warranty of
365	- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
366	- GNU Library General Public License for more details.
367	-
368	- You should have received a copy of the GNU Library General Public License
369	- along with GPGME++; see the file COPYING.LIB. If not, write to the
370	- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
371	- Boston, MA 02110-1301, USA.
372	-*/
373	-
374	-#include <config-gpgme++.h>
375	-
376	-#include <gpgme++/global.h>
377	-
378	-#ifdef HAVE_GPGME_GET_FDPTR
379	-extern "C" QIODevice * gpgme_get_fdptr( int );
380	-#endif
381	-
382	-GIOChannel * GpgME::getGIOChannel( int ) {
383	- return 0;
384	-}
385	-
386	-QIODevice * GpgME::getQIODevice( int fd ) {
387	-#ifdef HAVE_GPGME_GET_FDPTR
388	- return gpgme_get_fdptr( fd );
389	-#else
390	- (void)fd;
391	- return 0;
392	-#endif
393	-}
394	-
395	--- /qgpgme/CMakeLists.txt
396	+++ /qgpgme/CMakeLists.txt
397	@@ -6,8 +6,7 @@
398
399	if ( WIN32 AND GPGME_VANILLA_FOUND )
400
401	- # on Windows, we require gpgme(-vanilla), which is thread-safe,
402	- # and we don't provide gpgme-qt support
403	+ # on Windows, we require gpgme(-vanilla), which is thread-safe
404
405	set( _any_gpgme_found true )
406	set( _qgpgme_libgpgme gpgmepp )
407	@@ -15,14 +14,12 @@
408
409	endif()
410
411	-if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
412	+if ( NOT WIN32 AND GPGME_VANILLA_FOUND )
413
414	- # on Unix, we requrie gpgme-pthread (for convenience, since vanilla
415	- # gpgme isn't thread-aware, and we don't want to restrict clients
416	- # of qgpgme to non-threaded useage of gpgme)
417	+ # on Unix, we require gpgme(-vanilla), which is thread-safe
418
419	set( _any_gpgme_found true )
420	- set( _qgpgme_libgpgme gpgmepp-pthread )
421	+ set( _qgpgme_libgpgme gpgmepp )
422	set( _qgpgme_extra_src eventloopinteractor.cpp eventloopinteractor_unix.cpp )
423	set( _qgpgme_extra_headers eventloopinteractor.h )
424
425	--- /qgpgme/tests/CMakeLists.txt
426	+++ /qgpgme/tests/CMakeLists.txt
427	@@ -1,11 +1,7 @@
428	-if ( WIN32 AND GPGME_VANILLA_FOUND )
429	+if ( GPGME_VANILLA_FOUND )
430	set( _qgpgme_libgpgme gpgmepp )
431	endif()
432
433	-if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
434	- set( _qgpgme_libgpgme gpgmepp-pthread )
435	-endif()
436	-
437	set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
438	include_directories( ${GPGME_INCLUDES} )
439	include_directories( ${Boost_INCLUDE_DIR} )

Line 0 Link Here

(-)a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r3.ebuild (+73 lines)
		1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KDE_HANDBOOK="optional"
		7	CPPUNIT_REQUIRED="optional"
		8	EGIT_BRANCH="KDE/4.14"
		9	inherit kde4-base
		10
		11	DESCRIPTION="Common library for KDE PIM apps"
		12	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
		13	LICENSE="LGPL-2.1"
		14	IUSE="debug ldap prison"
		15
		16	# some akonadi tests timeout, that probaly needs more work as its ~700 tests
		17	RESTRICT="test"
		18
		19	DEPEND="
		20	>=app-crypt/gpgme-1.8.0
		21	>=dev-libs/boost-1.35.0-r5:=
		22	dev-libs/libgpg-error
		23	>=dev-libs/libical-0.48-r2:=
		24	dev-libs/cyrus-sasl
		25	>=dev-libs/qjson-0.8.1
		26	kde-apps/akonadi:4
		27	media-libs/phonon[qt4]
		28	x11-misc/shared-mime-info
		29	prison? ( kde-frameworks/prison:4 )
		30	ldap? ( net-nds/openldap )
		31	"
		32	# boost is not linked to, but headers which include it are installed
		33	# bug #418071
		34	RDEPEND="${DEPEND}"
		35
		36	PATCHES=(
		37	"${FILESDIR}/${PN}-4.14.11-boostincludes.patch"
		38	"${FILESDIR}/${PN}-CVE-2016-7966-r1.patch"
		39	)
		40
		41	src_prepare() {
		42	eapply "${FILESDIR}/${P}-gpgme-1.8.patch"
		43
		44	# Avoid file collisions with >=app-crypt/gpgme-1.7.0[cxx,qt5].
		45	mv gpgme++ kde4_gpgme++ \|\| die
		46	mv qgpgme kde4_qgpgme \|\| die
		47	mv cmake/modules/FindQGpgme.cmake cmake/modules/FindKDE4_QGpgme.cmake \|\| die
		48	find kde4_gpgme++ kde4_qgpgme "(" -name ".cpp" -o -name ".h" ")" -exec \
		49	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
		50	eapply "${FILESDIR}/${P}-gpgme++_and_qgpgme_renaming.patch"
		51
		52	kde4-base_src_prepare
		53	}
		54
		55	src_configure() {
		56	local mycmakeargs=(
		57	-DBUILD_doc=$(usex handbook)
		58	$(cmake-utils_use_find_package ldap Ldap)
		59	$(cmake-utils_use_find_package prison Prison)
		60	)
		61
		62	kde4-base_src_configure
		63	}
		64
65	src_install() {
66	kde4-base_src_install
67
68	# Collides with net-im/choqok
69	rm "${ED}"usr/share/apps/cmake/modules/FindQtOAuth.cmake \|\| die
70
71	# contains constants/defines only
72	QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
73	}

Line 0 Link Here

(-)a/kde-apps/kaddressbook/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch (+348 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -153,8 +153,8 @@
		4
		5	# If the KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ 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.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -175,8 +175,8 @@
		15	find_package(ZLIB)
		16	set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
		17
		18	- find_package(QGpgme)
		19	- 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")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	find_package(Grantlee 0.4.0 QUIET CONFIG)
		24	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)." )
		25	@@ -253,13 +253,13 @@
		26	add_subdirectory(messagelist)
		27	add_subdirectory(templateparser)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if(Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif()
		34	endif()
		35
		36	- # The following components depend on QGpgME.
		37	+ # The following components depend on KDE4_QGpgME.
		38	add_subdirectory(messageviewer)
		39	macro_optional_add_subdirectory(messagecomposer)
		40	add_subdirectory(pimcommon)
		41	--- /examples/etm_usage/CMakeLists.txt
		42	+++ /examples/etm_usage/CMakeLists.txt
		43	@@ -45,7 +45,7 @@
		44	${KDEPIMLIBS_AKONADI_LIBS}
		45	${KDEPIMLIBS_KABC_LIBS}
		46	${KDEPIMLIBS_KMIME_LIBS}
		47	- ${KDEPIMLIBS_QGPGME_LIBSS}
		48	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		49	akonadi_next
		50	kdepim
		51	kleo
		52	--- /examples/mailreader/CMakeLists.txt
		53	+++ /examples/mailreader/CMakeLists.txt
		54	@@ -25,7 +25,7 @@
		55	${KDE4_KDEUI_LIBS}
		56	${KDEPIMLIBS_AKONADI_KMIME_LIBS}
		57	${KDEPIMLIBS_AKONADI_LIBS}
		58	- ${KDEPIMLIBS_QGPGME_LIBS}
		59	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		60	akonadi_next
		61	kdepim
		62	kleo
		63	--- /kaddressbook/CMakeLists.txt
		64	+++ /kaddressbook/CMakeLists.txt
65	@@ -28,8 +28,8 @@
66	add_subdirectory(icons)
67	add_subdirectory(printing)
68	add_subdirectory(tests)
69	-if(QGPGME_FOUND)
70	- add_definitions(-DQGPGME_FOUND)
71	+if(KDE4_QGPGME_FOUND)
72	+ add_definitions(-DKDE4_QGPGME_FOUND)
73	endif()
74
75	set(kaddressbook_sendmail_SRCS
76	@@ -166,8 +166,8 @@
77	add_subdirectory(gravatar/autotests)
78	add_subdirectory(gravatar/tests)
79
80	-if(QGPGME_FOUND)
81	- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
82	+if(KDE4_QGPGME_FOUND)
83	+ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
84	endif()
85
86	if(PRISON_FOUND)
87	@@ -200,8 +200,8 @@
88	grantleetheme
89	)
90
91	-if(QGPGME_FOUND)
92	- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
93	+if(KDE4_QGPGME_FOUND)
94	+ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
95	endif()
96
97	install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
98	--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
99	+++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
100	@@ -26,12 +26,12 @@
101
102	#include <kaddressbookgrantlee/widget/grantleecontactviewer.h>
103
104	-#ifdef QGPGME_FOUND
105	+#ifdef KDE4_QGPGME_FOUND
106	#include <kde4_gpgme++/context.h>
107	#include <kde4_gpgme++/data.h>
108	#include <kde4_gpgme++/key.h>
109	#include <kde4_qgpgme/dataprovider.h>
110	-#endif // QGPGME_FOUND
111	+#endif // KDE4_QGPGME_FOUND
112
113	#include <KABC/VCardConverter>
114
115	@@ -409,7 +409,7 @@
116
117	void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
118	{
119	-#ifdef QGPGME_FOUND
120	+#ifdef KDE4_QGPGME_FOUND
121	const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
122	( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
123	if ( fingerprint.isEmpty() ) {
124	--- /kleopatra/CMakeLists.txt
125	+++ /kleopatra/CMakeLists.txt
126	@@ -37,7 +37,7 @@
127	${CMAKE_SOURCE_DIR}/libkdepim
128	${CMAKE_SOURCE_DIR}/mobile/lib
129	${Boost_INCLUDE_DIR}
130	- ${QGPGME_INCLUDES}
131	+ ${KDE4_QGPGME_INCLUDE_DIR}
132	${GPGME_INCLUDES}
133	)
134
135	@@ -367,7 +367,7 @@
136	target_link_libraries(kleopatra_bin
137	${_kleopatra_extra_libs}
138	kleo
139	- ${QGPGME_LIBRARIES}
140	+ ${KDE4_QGPGME_LIBRARIES}
141	${KDE4_KDEUI_LIBS}
142	${KDEPIMLIBS_KMIME_LIBS}
143	${KDE4_KCMUTILS_LIBS}
144	--- /kleopatra/kgpgconf/CMakeLists.txt
145	+++ /kleopatra/kgpgconf/CMakeLists.txt
146	@@ -21,6 +21,6 @@
147
148	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
149
150	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
151	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
152
153	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
154	--- /kleopatra/kwatchgnupg/CMakeLists.txt
155	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
156	@@ -22,7 +22,7 @@
157	target_link_libraries(kwatchgnupg
158	${KDE4_KDEUI_LIBS}
159	kleo
160	- ${QGPGME_LIBRARIES}
161	+ ${KDE4_QGPGME_LIBRARIES}
162	)
163
164	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
165	--- /kleopatra/tests/CMakeLists.txt
166	+++ /kleopatra/tests/CMakeLists.txt
167	@@ -62,7 +62,7 @@
168	${QT_QTCORE_LIBRARY}
169	${QT_QTGUI_LIBRARY}
170	${KDE4_KDECORE_LIBS}
171	- ${QGPGME_LIBRARIES}
172	+ ${KDE4_QGPGME_LIBRARIES}
173	)
174
175	########### next target ###############
176	@@ -100,13 +100,13 @@
177	if(WIN32)
178	target_link_libraries(test_uiserver
179	${ASSUAN_VANILLA_LIBRARIES}
180	- ${QGPGME_LIBRARIES}
181	+ ${KDE4_QGPGME_LIBRARIES}
182	ws2_32
183	)
184	else()
185	target_link_libraries(test_uiserver
186	${ASSUAN_PTHREAD_LIBRARIES}
187	- ${QGPGME_LIBRARIES}
188	+ ${KDE4_QGPGME_LIBRARIES}
189	)
190	endif()
191
192	--- /kmail/CMakeLists.txt
193	+++ /kmail/CMakeLists.txt
194	@@ -315,7 +315,7 @@
195	${KDEPIMLIBS_KRESOURCES_LIBS}
196	${KDE4_KCMUTILS_LIBS}
197	kleo
198	- ${QGPGME_LIBRARIES}
199	+ ${KDE4_QGPGME_LIBRARIES}
200	ksieve
201	ksieveui
202	kpgp
203	--- /kmail/kcm_kpimidentities/CMakeLists.txt
204	+++ /kmail/kcm_kpimidentities/CMakeLists.txt
205	@@ -17,7 +17,7 @@
206	kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
207	kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
208	target_link_libraries(kcm_kpimidentities
209	- ${KDEPIMLIBS_GPGMEPP_LIBS}
210	+ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
211	${KDEPIMLIBS_AKONADI_LIBS}
212	${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
213	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
214	--- /kontact/plugins/CMakeLists.txt
215	+++ /kontact/plugins/CMakeLists.txt
216	@@ -6,7 +6,7 @@
217	)
218
219
220	-if(QGPGME_FOUND)
221	+if(KDE4_QGPGME_FOUND)
222	if(BUILD_kmail)
223	add_subdirectory(kmail)
224	endif()
225	--- /libkleo/CMakeLists.txt
226	+++ /libkleo/CMakeLists.txt
227	@@ -104,7 +104,7 @@
228	)
229
230	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
231	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
232	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
233	if ( NOT KDEPIM_ONLY_KLEO )
234	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
235	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
236	--- /libkleo/tests/CMakeLists.txt
237	+++ /libkleo/tests/CMakeLists.txt
238	@@ -12,7 +12,7 @@
239	kleo
240	${KDE4_KDECORE_LIBS}
241	${KDE4_KDEUI_LIBS}
242	- ${QGPGME_LIBRARIES}
243	+ ${KDE4_QGPGME_LIBRARIES}
244	${QT_QTGUI_LIBRARY} )
245	endif ()
246
247	@@ -25,7 +25,7 @@
248
249	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
250
251	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
252	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
253
254
255	########### next target ###############
256	@@ -35,7 +35,7 @@
257
258	kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
259
260	-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
261	+target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
262	endif ()
263
264	########### next target ###############
265	@@ -45,7 +45,7 @@
266
267	kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
268
269	-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
270	+target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
271
272	########### next target ###############
273
274	@@ -63,7 +63,7 @@
275
276	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
277
278	-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
279	+target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
280
281	########### next target ###############
282
283	--- /messagecomposer/CMakeLists.txt
284	+++ /messagecomposer/CMakeLists.txt
285	@@ -123,7 +123,7 @@
286
287	kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
288	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}
289	- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
290	+ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
291
292	set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
293
294	--- /messagecomposer/tests/CMakeLists.txt
295	+++ /messagecomposer/tests/CMakeLists.txt
296	@@ -41,7 +41,7 @@
297	${QT_QTGUI_LIBRARY}
298	${QT_QTCORE_LIBRARY}
299	${KDE4_KDEUI_LIBS}
300	- ${QGPGME_LIBRARIES}
301	+ ${KDE4_QGPGME_LIBRARIES}
302	)
303	endmacro()
304
305	--- /messageviewer/CMakeLists.txt
306	+++ /messageviewer/CMakeLists.txt
307	@@ -206,7 +206,7 @@
308	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
309	${KDE4_KDEUI_LIBS}
310	${KDE4_KPRINTUTILS_LIBS}
311	- ${QGPGME_LIBRARIES}
312	+ ${KDE4_QGPGME_LIBRARIES}
313	${_mailwebview_lib}
314	${Grantlee_CORE_LIBRARIES}
315	${KDE4_KNEWSTUFF3_LIBS}
316	--- /messageviewer/tests/CMakeLists.txt
317	+++ /messageviewer/tests/CMakeLists.txt
318	@@ -20,7 +20,7 @@
319	target_link_libraries( ${_name}
320	messageviewer
321	kleo
322	- ${QGPGME_LIBRARIES}
323	+ ${KDE4_QGPGME_LIBRARIES}
324	${QT_QTTEST_LIBRARY}
325	${QT_QTCORE_LIBRARY}
326	${QT_QTWEBKIT_LIBRARY}
327	--- /templateparser/CMakeLists.txt
328	+++ /templateparser/CMakeLists.txt
329	@@ -49,7 +49,7 @@
330	kleo
331	kpgp
332	pimcommon
333	- ${QGPGME_LIBRARIES}
334	+ ${KDE4_QGPGME_LIBRARIES}
335	${QT_QTWEBKIT_LIBRARY}
336	)
337	set_target_properties(templateparser PROPERTIES
338	--- /templateparser/tests/CMakeLists.txt
339	+++ /templateparser/tests/CMakeLists.txt
340	@@ -18,7 +18,7 @@
341	kleo
342	templateparser
343	messageviewer
344	- ${QGPGME_LIBRARIES}
345	+ ${KDE4_QGPGME_LIBRARIES}
346	${QT_QTTEST_LIBRARY}
347	${QT_QTCORE_LIBRARY}
348	${QT_QTWEBKIT_LIBRARY}

Line 0 Link Here

(-)a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211-r1.ebuild (+76 lines)
		1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KDE_HANDBOOK="optional"
		7	KMNAME="kdepim"
		8	EGIT_BRANCH="KDE/4.14"
		9	inherit kde4-meta
		10
		11	DESCRIPTION="The KDE Address Book"
		12	HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
		13	COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
		14	SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
		15
		16	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
		17	IUSE="debug"
		18
		19	DEPEND="
		20	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3)
		21	$(add_kdeapps_dep kdepim-common-libs)
		22	dev-libs/grantlee:0
		23	!kde-base/contactthemeeditor
		24	"
		25	RDEPEND="${DEPEND}"
		26
		27	KMEXTRA="
		28	grantleeeditor/contactthemeeditor
		29	plugins/kaddressbook/
		30	plugins/ktexteditor/
		31	"
		32	KMCOMPILEONLY="
		33	grantleetheme/
		34	kaddressbookgrantlee/
		35	"
		36	KMEXTRACTONLY="
		37	akonadi_next/
		38	calendarsupport/
		39	grantleeeditor/grantleethemeeditor/
		40	libkleo/
		41	pimcommon/
		42	"
		43
		44	KMLOADLIBS="kdepim-common-libs"
		45
		46	strip_patch_hunks_for_nonexistent_files() {
		47	local input_file="$1"
		48	local output_file="$2"
		49
		50	local line changed_file
		51	while IFS=$'\n' read -r line; do
		52	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
		53	if [[ -f "${changed_file}" ]]; then
		54	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
		55	fi
		56	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
		57	}
		58
		59	src_prepare() {
		60	find "(" -name ".cpp" -o -name ".h" ")" -exec \
		61	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
		62	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		63	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		64
65	kde4-meta_src_prepare
66	}
67
68	pkg_postinst() {
69	kde4-meta_pkg_postinst
70
71	if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
72	echo
73	elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
74	echo
75	fi
76	}

Line 0 Link Here

(-)a/kde-apps/kdepim-common-libs/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch (+348 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -153,8 +153,8 @@
		4
		5	# If the KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ 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.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -175,8 +175,8 @@
		15	find_package(ZLIB)
		16	set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
		17
		18	- find_package(QGpgme)
		19	- 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")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	find_package(Grantlee 0.4.0 QUIET CONFIG)
		24	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)." )
		25	@@ -253,13 +253,13 @@
		26	add_subdirectory(messagelist)
		27	add_subdirectory(templateparser)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if(Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif()
		34	endif()
		35
		36	- # The following components depend on QGpgME.
		37	+ # The following components depend on KDE4_QGpgME.
		38	add_subdirectory(messageviewer)
		39	macro_optional_add_subdirectory(messagecomposer)
		40	add_subdirectory(pimcommon)
		41	--- /examples/etm_usage/CMakeLists.txt
		42	+++ /examples/etm_usage/CMakeLists.txt
		43	@@ -45,7 +45,7 @@
		44	${KDEPIMLIBS_AKONADI_LIBS}
		45	${KDEPIMLIBS_KABC_LIBS}
		46	${KDEPIMLIBS_KMIME_LIBS}
		47	- ${KDEPIMLIBS_QGPGME_LIBSS}
		48	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		49	akonadi_next
		50	kdepim
		51	kleo
		52	--- /examples/mailreader/CMakeLists.txt
		53	+++ /examples/mailreader/CMakeLists.txt
		54	@@ -25,7 +25,7 @@
		55	${KDE4_KDEUI_LIBS}
		56	${KDEPIMLIBS_AKONADI_KMIME_LIBS}
		57	${KDEPIMLIBS_AKONADI_LIBS}
		58	- ${KDEPIMLIBS_QGPGME_LIBS}
		59	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		60	akonadi_next
		61	kdepim
		62	kleo
		63	--- /kaddressbook/CMakeLists.txt
		64	+++ /kaddressbook/CMakeLists.txt
65	@@ -28,8 +28,8 @@
66	add_subdirectory(icons)
67	add_subdirectory(printing)
68	add_subdirectory(tests)
69	-if(QGPGME_FOUND)
70	- add_definitions(-DQGPGME_FOUND)
71	+if(KDE4_QGPGME_FOUND)
72	+ add_definitions(-DKDE4_QGPGME_FOUND)
73	endif()
74
75	set(kaddressbook_sendmail_SRCS
76	@@ -166,8 +166,8 @@
77	add_subdirectory(gravatar/autotests)
78	add_subdirectory(gravatar/tests)
79
80	-if(QGPGME_FOUND)
81	- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
82	+if(KDE4_QGPGME_FOUND)
83	+ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
84	endif()
85
86	if(PRISON_FOUND)
87	@@ -200,8 +200,8 @@
88	grantleetheme
89	)
90
91	-if(QGPGME_FOUND)
92	- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
93	+if(KDE4_QGPGME_FOUND)
94	+ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
95	endif()
96
97	install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
98	--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
99	+++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
100	@@ -26,12 +26,12 @@
101
102	#include <kaddressbookgrantlee/widget/grantleecontactviewer.h>
103
104	-#ifdef QGPGME_FOUND
105	+#ifdef KDE4_QGPGME_FOUND
106	#include <kde4_gpgme++/context.h>
107	#include <kde4_gpgme++/data.h>
108	#include <kde4_gpgme++/key.h>
109	#include <kde4_qgpgme/dataprovider.h>
110	-#endif // QGPGME_FOUND
111	+#endif // KDE4_QGPGME_FOUND
112
113	#include <KABC/VCardConverter>
114
115	@@ -409,7 +409,7 @@
116
117	void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
118	{
119	-#ifdef QGPGME_FOUND
120	+#ifdef KDE4_QGPGME_FOUND
121	const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
122	( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
123	if ( fingerprint.isEmpty() ) {
124	--- /kleopatra/CMakeLists.txt
125	+++ /kleopatra/CMakeLists.txt
126	@@ -37,7 +37,7 @@
127	${CMAKE_SOURCE_DIR}/libkdepim
128	${CMAKE_SOURCE_DIR}/mobile/lib
129	${Boost_INCLUDE_DIR}
130	- ${QGPGME_INCLUDES}
131	+ ${KDE4_QGPGME_INCLUDE_DIR}
132	${GPGME_INCLUDES}
133	)
134
135	@@ -367,7 +367,7 @@
136	target_link_libraries(kleopatra_bin
137	${_kleopatra_extra_libs}
138	kleo
139	- ${QGPGME_LIBRARIES}
140	+ ${KDE4_QGPGME_LIBRARIES}
141	${KDE4_KDEUI_LIBS}
142	${KDEPIMLIBS_KMIME_LIBS}
143	${KDE4_KCMUTILS_LIBS}
144	--- /kleopatra/kgpgconf/CMakeLists.txt
145	+++ /kleopatra/kgpgconf/CMakeLists.txt
146	@@ -21,6 +21,6 @@
147
148	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
149
150	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
151	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
152
153	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
154	--- /kleopatra/kwatchgnupg/CMakeLists.txt
155	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
156	@@ -22,7 +22,7 @@
157	target_link_libraries(kwatchgnupg
158	${KDE4_KDEUI_LIBS}
159	kleo
160	- ${QGPGME_LIBRARIES}
161	+ ${KDE4_QGPGME_LIBRARIES}
162	)
163
164	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
165	--- /kleopatra/tests/CMakeLists.txt
166	+++ /kleopatra/tests/CMakeLists.txt
167	@@ -62,7 +62,7 @@
168	${QT_QTCORE_LIBRARY}
169	${QT_QTGUI_LIBRARY}
170	${KDE4_KDECORE_LIBS}
171	- ${QGPGME_LIBRARIES}
172	+ ${KDE4_QGPGME_LIBRARIES}
173	)
174
175	########### next target ###############
176	@@ -100,13 +100,13 @@
177	if(WIN32)
178	target_link_libraries(test_uiserver
179	${ASSUAN_VANILLA_LIBRARIES}
180	- ${QGPGME_LIBRARIES}
181	+ ${KDE4_QGPGME_LIBRARIES}
182	ws2_32
183	)
184	else()
185	target_link_libraries(test_uiserver
186	${ASSUAN_PTHREAD_LIBRARIES}
187	- ${QGPGME_LIBRARIES}
188	+ ${KDE4_QGPGME_LIBRARIES}
189	)
190	endif()
191
192	--- /kmail/CMakeLists.txt
193	+++ /kmail/CMakeLists.txt
194	@@ -315,7 +315,7 @@
195	${KDEPIMLIBS_KRESOURCES_LIBS}
196	${KDE4_KCMUTILS_LIBS}
197	kleo
198	- ${QGPGME_LIBRARIES}
199	+ ${KDE4_QGPGME_LIBRARIES}
200	ksieve
201	ksieveui
202	kpgp
203	--- /kmail/kcm_kpimidentities/CMakeLists.txt
204	+++ /kmail/kcm_kpimidentities/CMakeLists.txt
205	@@ -17,7 +17,7 @@
206	kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
207	kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
208	target_link_libraries(kcm_kpimidentities
209	- ${KDEPIMLIBS_GPGMEPP_LIBS}
210	+ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
211	${KDEPIMLIBS_AKONADI_LIBS}
212	${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
213	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
214	--- /kontact/plugins/CMakeLists.txt
215	+++ /kontact/plugins/CMakeLists.txt
216	@@ -6,7 +6,7 @@
217	)
218
219
220	-if(QGPGME_FOUND)
221	+if(KDE4_QGPGME_FOUND)
222	if(BUILD_kmail)
223	add_subdirectory(kmail)
224	endif()
225	--- /libkleo/CMakeLists.txt
226	+++ /libkleo/CMakeLists.txt
227	@@ -104,7 +104,7 @@
228	)
229
230	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
231	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
232	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
233	if ( NOT KDEPIM_ONLY_KLEO )
234	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
235	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
236	--- /libkleo/tests/CMakeLists.txt
237	+++ /libkleo/tests/CMakeLists.txt
238	@@ -12,7 +12,7 @@
239	kleo
240	${KDE4_KDECORE_LIBS}
241	${KDE4_KDEUI_LIBS}
242	- ${QGPGME_LIBRARIES}
243	+ ${KDE4_QGPGME_LIBRARIES}
244	${QT_QTGUI_LIBRARY} )
245	endif ()
246
247	@@ -25,7 +25,7 @@
248
249	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
250
251	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
252	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
253
254
255	########### next target ###############
256	@@ -35,7 +35,7 @@
257
258	kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
259
260	-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
261	+target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
262	endif ()
263
264	########### next target ###############
265	@@ -45,7 +45,7 @@
266
267	kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
268
269	-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
270	+target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
271
272	########### next target ###############
273
274	@@ -63,7 +63,7 @@
275
276	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
277
278	-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
279	+target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
280
281	########### next target ###############
282
283	--- /messagecomposer/CMakeLists.txt
284	+++ /messagecomposer/CMakeLists.txt
285	@@ -123,7 +123,7 @@
286
287	kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
288	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}
289	- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
290	+ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
291
292	set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
293
294	--- /messagecomposer/tests/CMakeLists.txt
295	+++ /messagecomposer/tests/CMakeLists.txt
296	@@ -41,7 +41,7 @@
297	${QT_QTGUI_LIBRARY}
298	${QT_QTCORE_LIBRARY}
299	${KDE4_KDEUI_LIBS}
300	- ${QGPGME_LIBRARIES}
301	+ ${KDE4_QGPGME_LIBRARIES}
302	)
303	endmacro()
304
305	--- /messageviewer/CMakeLists.txt
306	+++ /messageviewer/CMakeLists.txt
307	@@ -206,7 +206,7 @@
308	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
309	${KDE4_KDEUI_LIBS}
310	${KDE4_KPRINTUTILS_LIBS}
311	- ${QGPGME_LIBRARIES}
312	+ ${KDE4_QGPGME_LIBRARIES}
313	${_mailwebview_lib}
314	${Grantlee_CORE_LIBRARIES}
315	${KDE4_KNEWSTUFF3_LIBS}
316	--- /messageviewer/tests/CMakeLists.txt
317	+++ /messageviewer/tests/CMakeLists.txt
318	@@ -20,7 +20,7 @@
319	target_link_libraries( ${_name}
320	messageviewer
321	kleo
322	- ${QGPGME_LIBRARIES}
323	+ ${KDE4_QGPGME_LIBRARIES}
324	${QT_QTTEST_LIBRARY}
325	${QT_QTCORE_LIBRARY}
326	${QT_QTWEBKIT_LIBRARY}
327	--- /templateparser/CMakeLists.txt
328	+++ /templateparser/CMakeLists.txt
329	@@ -49,7 +49,7 @@
330	kleo
331	kpgp
332	pimcommon
333	- ${QGPGME_LIBRARIES}
334	+ ${KDE4_QGPGME_LIBRARIES}
335	${QT_QTWEBKIT_LIBRARY}
336	)
337	set_target_properties(templateparser PROPERTIES
338	--- /templateparser/tests/CMakeLists.txt
339	+++ /templateparser/tests/CMakeLists.txt
340	@@ -18,7 +18,7 @@
341	kleo
342	templateparser
343	messageviewer
344	- ${QGPGME_LIBRARIES}
345	+ ${KDE4_QGPGME_LIBRARIES}
346	${QT_QTTEST_LIBRARY}
347	${QT_QTCORE_LIBRARY}
348	${QT_QTWEBKIT_LIBRARY}

Line 0 Link Here

(-)a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild (-2 / +113 lines)
0	-	1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KMNAME="kdepim"
		7	EGIT_BRANCH="KDE/4.14"
		8	KMNOMODULE="true"
		9	WEBKIT_REQUIRED="always"
		10	inherit kde4-meta
		11
		12	DESCRIPTION="Common libraries for KDE PIM apps"
		13	COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
		14	SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
		15
		16	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
		17	IUSE="debug google"
		18
		19	DEPEND="
		20	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3)
		21	app-crypt/gpgme
		22	dev-libs/grantlee:0
		23	kde-apps/akonadi:4
		24	kde-frameworks/baloo:4
		25	google? ( $(add_kdeapps_dep libkgapi '' 2.2.0) )
		26	"
		27	RDEPEND="${DEPEND}
		28	!kde-apps/libkdepim:4
		29	!kde-apps/libkleo:4
		30	!kde-apps/libkpgp:4
		31	!<kde-apps/kaddressbook-4.11.50:4
		32	!kde-apps/kdepim-wizards:4
		33	!<kde-apps/kmail-4.14.5:4
		34	!<kde-apps/korganizer-4.5.67:4
		35	$(add_kdeapps_dep kdepim-runtime)
		36	app-crypt/gnupg
		37	"
		38
		39	RESTRICT="test"
		40	# bug 393131
		41
		42	KMEXTRA="
		43	agents/sendlateragent/
		44	akonadi_next/
		45	calendarsupport/
		46	calendarviews/
		47	composereditor-ng/
		48	grantleeeditor/grantleethemeeditor/
		49	grantleetheme/
		50	incidenceeditor-ng/
		51	libkdepim/
		52	libkdepimdbusinterfaces/
		53	libkleo/
		54	libkpgp/
		55	kaddressbookgrantlee/
		56	kdgantt2/
		57	mailcommon/
		58	mailimporter/
		59	messagecomposer/
		60	messagecore/
		61	messagelist/
		62	messageviewer/
		63	noteshared/
		64	pimcommon/
		65	templateparser/
66	"
67	KMEXTRACTONLY="
68	agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
69	kleopatra/
70	kmail/
71	knode/org.kde.knode.xml
72	korgac/org.kde.korganizer.KOrgac.xml
73	korganizer/data/org.kde.korganizer.Korganizer.xml
74	korganizer/data/org.kde.Korganizer.Calendar.xml
75	"
76	KMSAVELIBS="true"
77
78	PATCHES=(
79	"${FILESDIR}/install-composereditorng.patch"
80	"${FILESDIR}/${PN}-install-headers.patch"
81	)
82
83	strip_patch_hunks_for_nonexistent_files() {
84	local input_file="$1"
85	local output_file="$2"
86
87	local line changed_file
88	while IFS=$'\n' read -r line; do
89	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
90	if [[ -f "${changed_file}" ]]; then
91	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
92	fi
93	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
94	}
95
96	src_prepare() {
97	find "(" -name ".cpp" -o -name ".h" ")" -exec \
98	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
99	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
100	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
101
102	kde4-meta_src_prepare
103	sed -e '/folderarchiveagent.desktop/d' \
104	-i agents/CMakeLists.txt \|\| die
105	}
106
107	src_configure() {
108	local mycmakeargs=(
109	$(cmake-utils_use_find_package google LibKGAPI2)
110	)
111
112	kde4-meta_src_configure
113	}
1	references for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.	114	references for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.
2	--
3	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++++++++	115	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++++++++
4	.../kdepim-wizards-4.4.2016.01-r1.ebuild \| 57 +++++	116	.../kdepim-wizards-4.4.2016.01-r1.ebuild \| 57 +++++
5	2 files changed, 311 insertions(+)	117	2 files changed, 311 insertions(+)
6	create mode 100644 kde-apps/kdepim-wizards/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch	118	create mode 100644 kde-apps/kdepim-wizards/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
7	create mode 100644 kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01-r1.ebuild	119	create mode 100644 kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01-r1.ebuild

Line 0 Link Here

(-)a/kde-apps/kdepim-wizards/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch (+254 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -70,8 +70,8 @@
		4
		5	# The KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -96,8 +96,8 @@
		15	find_package(Strigi)
		16	macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
		17
		18	- find_package(QGpgme)
		19	- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	set(SDO_MIN_VERSION 0.2)
		24	set(SOPRANO_MIN_VERSION 2.3.70)
		25	@@ -188,12 +188,12 @@
		26	add_subdirectory(messagecore)
		27	add_subdirectory(messagelist)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if (Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif(Boost_TOPOLOGICAL_SORT_DIR)
		34	macro_optional_add_subdirectory(wizards)
		35	- # The following components depend on QGpgME.
		36	+ # The following components depend on KDE4_QGpgME.
		37	add_subdirectory(messageviewer)
		38	macro_optional_add_subdirectory(kmail)
		39
		40	@@ -214,7 +214,7 @@
		41	# include( SopranoAddOntology )
		42	# add_subdirectory( ontologies )
		43	# add_subdirectory( nepomuk_email_feeder )
		44	- endif(QGPGME_FOUND)
		45	+ endif(KDE4_QGPGME_FOUND)
		46
		47	if(KDEPIM_BUILD_EVERYTHING)
		48	macro_optional_add_subdirectory(knode)
		49	@@ -254,13 +254,13 @@
		50	macro_optional_add_subdirectory(doc)
		51
		52
		53	-# We really want to encourage users to enable/install QGpgME from kdepimlibs
		54	-if(NOT QGPGME_FOUND)
		55	- # Users must be aware that QGpgMe is really needed
		56	- message(STATUS "* WARNING: QGpgME is not installed on your system *")
		57	+# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
		58	+if(NOT KDE4_QGPGME_FOUND)
		59	+ # Users must be aware that KDE4_QGpgMe is really needed
		60	+ message(STATUS "* WARNING: KDE4_QGpgME is not installed on your system *")
		61	message(STATUS "* It is required if you want to use KMail, KOrganizer or Kleopatra *")
		62	message(STATUS "* You are really encouraged to install it *")
		63	-endif(NOT QGPGME_FOUND)
		64	+endif(NOT KDE4_QGPGME_FOUND)
65	# All done, let's display what we found...
66	macro_display_feature_log()
67
68	--- /examples/mailreader/CMakeLists.txt
69	+++ /examples/mailreader/CMakeLists.txt
70	@@ -19,7 +19,7 @@
71
72	target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
73	akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
74	- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
75	+ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
76	)
77
78	install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
79	--- /kaddressbook/CMakeLists.txt
80	+++ /kaddressbook/CMakeLists.txt
81	@@ -5,9 +5,9 @@
82	add_subdirectory( common )
83	add_subdirectory( interfaces )
84	add_subdirectory( printing )
85	-if(QGPGME_FOUND)
86	+if(KDE4_QGPGME_FOUND)
87	add_subdirectory( editors )
88	-endif(QGPGME_FOUND)
89	+endif(KDE4_QGPGME_FOUND)
90	add_subdirectory( views )
91	add_subdirectory( features )
92	add_subdirectory( kcmconfigs )
93	--- /kaddressbook/xxport/CMakeLists.txt
94	+++ /kaddressbook/xxport/CMakeLists.txt
95	@@ -22,7 +22,7 @@
96
97
98	########### next target ###############
99	-if(QGPGME_FOUND)
100	+if(KDE4_QGPGME_FOUND)
101	set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
102
103
104	@@ -30,10 +30,10 @@
105
106
107
108	-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
109	+target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
110
111	install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
112	-endif(QGPGME_FOUND)
113	+endif(KDE4_QGPGME_FOUND)
114
115	########### next target ###############
116
117	--- /kleopatra/CMakeLists.txt
118	+++ /kleopatra/CMakeLists.txt
119	@@ -25,7 +25,7 @@
120	${CMAKE_SOURCE_DIR}/libkleo
121	${CMAKE_SOURCE_DIR}/libkdepim
122	${Boost_INCLUDE_DIR}
123	- ${QGPGME_INCLUDES}
124	+ ${KDE4_QGPGME_INCLUDE_DIR}
125	${GPGME_INCLUDES} )
126	if (USABLE_ASSUAN_FOUND)
127	if (ASSUAN2_FOUND)
128	@@ -321,7 +321,7 @@
129	set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
130	endif ( NOT KDE4_KCMUTILS_LIBS )
131
132	-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})
133	+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})
134	if ( USABLE_ASSUAN_FOUND )
135	target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
136	ENDIF ( USABLE_ASSUAN_FOUND )
137	--- /kleopatra/kgpgconf/CMakeLists.txt
138	+++ /kleopatra/kgpgconf/CMakeLists.txt
139	@@ -21,7 +21,7 @@
140	kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
141
142	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
143	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
144	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
145
146	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
147
148	--- /kleopatra/kwatchgnupg/CMakeLists.txt
149	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
150	@@ -26,7 +26,7 @@
151	set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
152	endif ( NOT KDE4_KCMUTILS_LIBS )
153
154	-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
155	+target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
156
157	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
158
159	--- /kleopatra/tests/CMakeLists.txt
160	+++ /kleopatra/tests/CMakeLists.txt
161	@@ -40,7 +40,7 @@
162	add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
163	add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
164	kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
165	-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
166	+target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
167
168	########### next target ###############
169
170	@@ -67,9 +67,9 @@
171	endif ( ASSUAN2_FOUND )
172
173	if(WIN32)
174	- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
175	+ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
176	else(WIN32)
177	- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
178	+ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
179	endif(WIN32)
180	if (KDEPIM_ONLY_KLEO)
181	install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
182	--- /kmail/CMakeLists.txt
183	+++ /kmail/CMakeLists.txt
184	@@ -371,7 +371,7 @@
185	${KDE4_KPARTS_LIBRARY}
186	${KDE4_KRESOURCES_LIBRARY}
187	kleo
188	- ${QGPGME_LIBRARIES}
189	+ ${KDE4_QGPGME_LIBRARIES}
190	mimelib
191	ksieve
192	kpgp
193	--- /kontact/plugins/CMakeLists.txt
194	+++ /kontact/plugins/CMakeLists.txt
195	@@ -3,7 +3,7 @@
196	remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
197	add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
198
199	-if(QGPGME_FOUND)
200	+if(KDE4_QGPGME_FOUND)
201	if(BUILD_kmail)
202	add_subdirectory( kmail )
203	endif(BUILD_kmail)
204	@@ -15,7 +15,7 @@
205	add_subdirectory( specialdates )
206	add_subdirectory( planner )
207	endif()
208	-endif(QGPGME_FOUND)
209	+endif(KDE4_QGPGME_FOUND)
210	if (BUILD_knotes)
211	add_subdirectory( knotes )
212	endif (BUILD_knotes)
213	--- /libkleo/CMakeLists.txt
214	+++ /libkleo/CMakeLists.txt
215	@@ -99,7 +99,7 @@
216	)
217
218	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
219	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
220	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
221	if ( NOT KDEPIM_ONLY_KLEO )
222	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
223	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
224	--- /libkleo/tests/CMakeLists.txt
225	+++ /libkleo/tests/CMakeLists.txt
226	@@ -18,7 +18,7 @@
227
228	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
229
230	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
231	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
232
233
234	########### next target ###############
235	@@ -54,7 +54,7 @@
236
237	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
238
239	-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
240	+target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
241
242	########### next target ###############
243
244	--- /messageviewer/CMakeLists.txt
245	+++ /messageviewer/CMakeLists.txt
246	@@ -58,7 +58,7 @@
247	${KDEPIMLIBS_KMIME_LIBS}
248	${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
249	${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
250	- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
251	+ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
252	)
253
254	include_directories(

Line 0 Link Here

(-)a/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01-r1.ebuild (-2 / +57 lines)
0	-	1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KMNAME="kdepim"
		7	KMMODULE="wizards"
		8	inherit kde4-meta
		9
		10	DESCRIPTION="KDE PIM wizards (noakonadi branch)"
		11	HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
		12	IUSE="debug"
		13	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
		14
		15	DEPEND="
		16	$(add_kdeapps_dep kdepimlibs '' 4.14.10-r3)
		17	$(add_kdeapps_dep kdepim-kresources '' 4.4.2015)
		18	$(add_kdeapps_dep libkdepim '' 4.4.2015)
		19	"
		20	RDEPEND="${DEPEND}"
		21
		22	KMEXTRACTONLY="
		23	kmail/
		24	knotes/
		25	kresources/groupwise/
		26	kresources/kolab/
		27	kresources/slox/
		28	"
		29
		30	strip_patch_hunks_for_nonexistent_files() {
		31	local input_file="$1"
		32	local output_file="$2"
		33
		34	local line changed_file
		35	while IFS=$'\n' read -r line; do
		36	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
		37	if [[ -f "${changed_file}" ]]; then
		38	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
		39	fi
		40	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
		41	}
		42
		43	src_prepare() {
		44	find "(" -name ".cpp" -o -name ".h" ")" -exec \
		45	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
		46	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		47	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		48
		49	ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabcsloxprefs.h,kcalsloxprefs.h} \
		50	kresources/slox/ \
		51	\|\| die "Failed to link extra_headers."
		52	ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
		53	kresources/groupwise/ \
		54	\|\| die "Failed to link extra_headers."
		55
		56	kde4-meta_src_prepare
		57	}
1	references for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.	58	references for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.
2	--
3	...0211-update_gpgme++_and_qgpgme_references.patch \| 348 +++++++++++++++++++++	59	...0211-update_gpgme++_and_qgpgme_references.patch \| 348 +++++++++++++++++++++
4	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++	60	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++
5	.../kleopatra-4.14.11_pre20160211-r1.ebuild \| 67 ++++	61	.../kleopatra-4.14.11_pre20160211-r1.ebuild \| 67 ++++
6	kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild \| 73 +++++	62	kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild \| 73 +++++
7	4 files changed, 742 insertions(+)	63	4 files changed, 742 insertions(+)
8	create mode 100644 kde-apps/kleopatra/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch	64	create mode 100644 kde-apps/kleopatra/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
9	create mode 100644 kde-apps/kleopatra/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch	65	create mode 100644 kde-apps/kleopatra/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
10	create mode 100644 kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild	66	create mode 100644 kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild
11	create mode 100644 kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild	67	create mode 100644 kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild

Line 0 Link Here

(-)a/kde-apps/kleopatra/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch (+348 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -153,8 +153,8 @@
		4
		5	# If the KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ 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.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -175,8 +175,8 @@
		15	find_package(ZLIB)
		16	set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
		17
		18	- find_package(QGpgme)
		19	- 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")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	find_package(Grantlee 0.4.0 QUIET CONFIG)
		24	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)." )
		25	@@ -253,13 +253,13 @@
		26	add_subdirectory(messagelist)
		27	add_subdirectory(templateparser)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if(Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif()
		34	endif()
		35
		36	- # The following components depend on QGpgME.
		37	+ # The following components depend on KDE4_QGpgME.
		38	add_subdirectory(messageviewer)
		39	macro_optional_add_subdirectory(messagecomposer)
		40	add_subdirectory(pimcommon)
		41	--- /examples/etm_usage/CMakeLists.txt
		42	+++ /examples/etm_usage/CMakeLists.txt
		43	@@ -45,7 +45,7 @@
		44	${KDEPIMLIBS_AKONADI_LIBS}
		45	${KDEPIMLIBS_KABC_LIBS}
		46	${KDEPIMLIBS_KMIME_LIBS}
		47	- ${KDEPIMLIBS_QGPGME_LIBSS}
		48	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		49	akonadi_next
		50	kdepim
		51	kleo
		52	--- /examples/mailreader/CMakeLists.txt
		53	+++ /examples/mailreader/CMakeLists.txt
		54	@@ -25,7 +25,7 @@
		55	${KDE4_KDEUI_LIBS}
		56	${KDEPIMLIBS_AKONADI_KMIME_LIBS}
		57	${KDEPIMLIBS_AKONADI_LIBS}
		58	- ${KDEPIMLIBS_QGPGME_LIBS}
		59	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		60	akonadi_next
		61	kdepim
		62	kleo
		63	--- /kaddressbook/CMakeLists.txt
		64	+++ /kaddressbook/CMakeLists.txt
65	@@ -28,8 +28,8 @@
66	add_subdirectory(icons)
67	add_subdirectory(printing)
68	add_subdirectory(tests)
69	-if(QGPGME_FOUND)
70	- add_definitions(-DQGPGME_FOUND)
71	+if(KDE4_QGPGME_FOUND)
72	+ add_definitions(-DKDE4_QGPGME_FOUND)
73	endif()
74
75	set(kaddressbook_sendmail_SRCS
76	@@ -166,8 +166,8 @@
77	add_subdirectory(gravatar/autotests)
78	add_subdirectory(gravatar/tests)
79
80	-if(QGPGME_FOUND)
81	- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
82	+if(KDE4_QGPGME_FOUND)
83	+ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
84	endif()
85
86	if(PRISON_FOUND)
87	@@ -200,8 +200,8 @@
88	grantleetheme
89	)
90
91	-if(QGPGME_FOUND)
92	- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
93	+if(KDE4_QGPGME_FOUND)
94	+ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
95	endif()
96
97	install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
98	--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
99	+++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
100	@@ -26,12 +26,12 @@
101
102	#include <kaddressbookgrantlee/widget/grantleecontactviewer.h>
103
104	-#ifdef QGPGME_FOUND
105	+#ifdef KDE4_QGPGME_FOUND
106	#include <kde4_gpgme++/context.h>
107	#include <kde4_gpgme++/data.h>
108	#include <kde4_gpgme++/key.h>
109	#include <kde4_qgpgme/dataprovider.h>
110	-#endif // QGPGME_FOUND
111	+#endif // KDE4_QGPGME_FOUND
112
113	#include <KABC/VCardConverter>
114
115	@@ -409,7 +409,7 @@
116
117	void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
118	{
119	-#ifdef QGPGME_FOUND
120	+#ifdef KDE4_QGPGME_FOUND
121	const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
122	( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
123	if ( fingerprint.isEmpty() ) {
124	--- /kleopatra/CMakeLists.txt
125	+++ /kleopatra/CMakeLists.txt
126	@@ -37,7 +37,7 @@
127	${CMAKE_SOURCE_DIR}/libkdepim
128	${CMAKE_SOURCE_DIR}/mobile/lib
129	${Boost_INCLUDE_DIR}
130	- ${QGPGME_INCLUDES}
131	+ ${KDE4_QGPGME_INCLUDE_DIR}
132	${GPGME_INCLUDES}
133	)
134
135	@@ -367,7 +367,7 @@
136	target_link_libraries(kleopatra_bin
137	${_kleopatra_extra_libs}
138	kleo
139	- ${QGPGME_LIBRARIES}
140	+ ${KDE4_QGPGME_LIBRARIES}
141	${KDE4_KDEUI_LIBS}
142	${KDEPIMLIBS_KMIME_LIBS}
143	${KDE4_KCMUTILS_LIBS}
144	--- /kleopatra/kgpgconf/CMakeLists.txt
145	+++ /kleopatra/kgpgconf/CMakeLists.txt
146	@@ -21,6 +21,6 @@
147
148	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
149
150	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
151	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
152
153	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
154	--- /kleopatra/kwatchgnupg/CMakeLists.txt
155	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
156	@@ -22,7 +22,7 @@
157	target_link_libraries(kwatchgnupg
158	${KDE4_KDEUI_LIBS}
159	kleo
160	- ${QGPGME_LIBRARIES}
161	+ ${KDE4_QGPGME_LIBRARIES}
162	)
163
164	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
165	--- /kleopatra/tests/CMakeLists.txt
166	+++ /kleopatra/tests/CMakeLists.txt
167	@@ -62,7 +62,7 @@
168	${QT_QTCORE_LIBRARY}
169	${QT_QTGUI_LIBRARY}
170	${KDE4_KDECORE_LIBS}
171	- ${QGPGME_LIBRARIES}
172	+ ${KDE4_QGPGME_LIBRARIES}
173	)
174
175	########### next target ###############
176	@@ -100,13 +100,13 @@
177	if(WIN32)
178	target_link_libraries(test_uiserver
179	${ASSUAN_VANILLA_LIBRARIES}
180	- ${QGPGME_LIBRARIES}
181	+ ${KDE4_QGPGME_LIBRARIES}
182	ws2_32
183	)
184	else()
185	target_link_libraries(test_uiserver
186	${ASSUAN_PTHREAD_LIBRARIES}
187	- ${QGPGME_LIBRARIES}
188	+ ${KDE4_QGPGME_LIBRARIES}
189	)
190	endif()
191
192	--- /kmail/CMakeLists.txt
193	+++ /kmail/CMakeLists.txt
194	@@ -315,7 +315,7 @@
195	${KDEPIMLIBS_KRESOURCES_LIBS}
196	${KDE4_KCMUTILS_LIBS}
197	kleo
198	- ${QGPGME_LIBRARIES}
199	+ ${KDE4_QGPGME_LIBRARIES}
200	ksieve
201	ksieveui
202	kpgp
203	--- /kmail/kcm_kpimidentities/CMakeLists.txt
204	+++ /kmail/kcm_kpimidentities/CMakeLists.txt
205	@@ -17,7 +17,7 @@
206	kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
207	kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
208	target_link_libraries(kcm_kpimidentities
209	- ${KDEPIMLIBS_GPGMEPP_LIBS}
210	+ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
211	${KDEPIMLIBS_AKONADI_LIBS}
212	${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
213	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
214	--- /kontact/plugins/CMakeLists.txt
215	+++ /kontact/plugins/CMakeLists.txt
216	@@ -6,7 +6,7 @@
217	)
218
219
220	-if(QGPGME_FOUND)
221	+if(KDE4_QGPGME_FOUND)
222	if(BUILD_kmail)
223	add_subdirectory(kmail)
224	endif()
225	--- /libkleo/CMakeLists.txt
226	+++ /libkleo/CMakeLists.txt
227	@@ -104,7 +104,7 @@
228	)
229
230	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
231	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
232	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
233	if ( NOT KDEPIM_ONLY_KLEO )
234	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
235	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
236	--- /libkleo/tests/CMakeLists.txt
237	+++ /libkleo/tests/CMakeLists.txt
238	@@ -12,7 +12,7 @@
239	kleo
240	${KDE4_KDECORE_LIBS}
241	${KDE4_KDEUI_LIBS}
242	- ${QGPGME_LIBRARIES}
243	+ ${KDE4_QGPGME_LIBRARIES}
244	${QT_QTGUI_LIBRARY} )
245	endif ()
246
247	@@ -25,7 +25,7 @@
248
249	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
250
251	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
252	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
253
254
255	########### next target ###############
256	@@ -35,7 +35,7 @@
257
258	kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
259
260	-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
261	+target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
262	endif ()
263
264	########### next target ###############
265	@@ -45,7 +45,7 @@
266
267	kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
268
269	-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
270	+target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
271
272	########### next target ###############
273
274	@@ -63,7 +63,7 @@
275
276	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
277
278	-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
279	+target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
280
281	########### next target ###############
282
283	--- /messagecomposer/CMakeLists.txt
284	+++ /messagecomposer/CMakeLists.txt
285	@@ -123,7 +123,7 @@
286
287	kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
288	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}
289	- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
290	+ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
291
292	set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
293
294	--- /messagecomposer/tests/CMakeLists.txt
295	+++ /messagecomposer/tests/CMakeLists.txt
296	@@ -41,7 +41,7 @@
297	${QT_QTGUI_LIBRARY}
298	${QT_QTCORE_LIBRARY}
299	${KDE4_KDEUI_LIBS}
300	- ${QGPGME_LIBRARIES}
301	+ ${KDE4_QGPGME_LIBRARIES}
302	)
303	endmacro()
304
305	--- /messageviewer/CMakeLists.txt
306	+++ /messageviewer/CMakeLists.txt
307	@@ -206,7 +206,7 @@
308	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
309	${KDE4_KDEUI_LIBS}
310	${KDE4_KPRINTUTILS_LIBS}
311	- ${QGPGME_LIBRARIES}
312	+ ${KDE4_QGPGME_LIBRARIES}
313	${_mailwebview_lib}
314	${Grantlee_CORE_LIBRARIES}
315	${KDE4_KNEWSTUFF3_LIBS}
316	--- /messageviewer/tests/CMakeLists.txt
317	+++ /messageviewer/tests/CMakeLists.txt
318	@@ -20,7 +20,7 @@
319	target_link_libraries( ${_name}
320	messageviewer
321	kleo
322	- ${QGPGME_LIBRARIES}
323	+ ${KDE4_QGPGME_LIBRARIES}
324	${QT_QTTEST_LIBRARY}
325	${QT_QTCORE_LIBRARY}
326	${QT_QTWEBKIT_LIBRARY}
327	--- /templateparser/CMakeLists.txt
328	+++ /templateparser/CMakeLists.txt
329	@@ -49,7 +49,7 @@
330	kleo
331	kpgp
332	pimcommon
333	- ${QGPGME_LIBRARIES}
334	+ ${KDE4_QGPGME_LIBRARIES}
335	${QT_QTWEBKIT_LIBRARY}
336	)
337	set_target_properties(templateparser PROPERTIES
338	--- /templateparser/tests/CMakeLists.txt
339	+++ /templateparser/tests/CMakeLists.txt
340	@@ -18,7 +18,7 @@
341	kleo
342	templateparser
343	messageviewer
344	- ${QGPGME_LIBRARIES}
345	+ ${KDE4_QGPGME_LIBRARIES}
346	${QT_QTTEST_LIBRARY}
347	${QT_QTCORE_LIBRARY}
348	${QT_QTWEBKIT_LIBRARY}

Line 0 Link Here

(-)a/kde-apps/kleopatra/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch (+254 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -70,8 +70,8 @@
		4
		5	# The KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -96,8 +96,8 @@
		15	find_package(Strigi)
		16	macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
		17
		18	- find_package(QGpgme)
		19	- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	set(SDO_MIN_VERSION 0.2)
		24	set(SOPRANO_MIN_VERSION 2.3.70)
		25	@@ -188,12 +188,12 @@
		26	add_subdirectory(messagecore)
		27	add_subdirectory(messagelist)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if (Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif(Boost_TOPOLOGICAL_SORT_DIR)
		34	macro_optional_add_subdirectory(wizards)
		35	- # The following components depend on QGpgME.
		36	+ # The following components depend on KDE4_QGpgME.
		37	add_subdirectory(messageviewer)
		38	macro_optional_add_subdirectory(kmail)
		39
		40	@@ -214,7 +214,7 @@
		41	# include( SopranoAddOntology )
		42	# add_subdirectory( ontologies )
		43	# add_subdirectory( nepomuk_email_feeder )
		44	- endif(QGPGME_FOUND)
		45	+ endif(KDE4_QGPGME_FOUND)
		46
		47	if(KDEPIM_BUILD_EVERYTHING)
		48	macro_optional_add_subdirectory(knode)
		49	@@ -254,13 +254,13 @@
		50	macro_optional_add_subdirectory(doc)
		51
		52
		53	-# We really want to encourage users to enable/install QGpgME from kdepimlibs
		54	-if(NOT QGPGME_FOUND)
		55	- # Users must be aware that QGpgMe is really needed
		56	- message(STATUS "* WARNING: QGpgME is not installed on your system *")
		57	+# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
		58	+if(NOT KDE4_QGPGME_FOUND)
		59	+ # Users must be aware that KDE4_QGpgMe is really needed
		60	+ message(STATUS "* WARNING: KDE4_QGpgME is not installed on your system *")
		61	message(STATUS "* It is required if you want to use KMail, KOrganizer or Kleopatra *")
		62	message(STATUS "* You are really encouraged to install it *")
		63	-endif(NOT QGPGME_FOUND)
		64	+endif(NOT KDE4_QGPGME_FOUND)
65	# All done, let's display what we found...
66	macro_display_feature_log()
67
68	--- /examples/mailreader/CMakeLists.txt
69	+++ /examples/mailreader/CMakeLists.txt
70	@@ -19,7 +19,7 @@
71
72	target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
73	akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
74	- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
75	+ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
76	)
77
78	install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
79	--- /kaddressbook/CMakeLists.txt
80	+++ /kaddressbook/CMakeLists.txt
81	@@ -5,9 +5,9 @@
82	add_subdirectory( common )
83	add_subdirectory( interfaces )
84	add_subdirectory( printing )
85	-if(QGPGME_FOUND)
86	+if(KDE4_QGPGME_FOUND)
87	add_subdirectory( editors )
88	-endif(QGPGME_FOUND)
89	+endif(KDE4_QGPGME_FOUND)
90	add_subdirectory( views )
91	add_subdirectory( features )
92	add_subdirectory( kcmconfigs )
93	--- /kaddressbook/xxport/CMakeLists.txt
94	+++ /kaddressbook/xxport/CMakeLists.txt
95	@@ -22,7 +22,7 @@
96
97
98	########### next target ###############
99	-if(QGPGME_FOUND)
100	+if(KDE4_QGPGME_FOUND)
101	set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
102
103
104	@@ -30,10 +30,10 @@
105
106
107
108	-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
109	+target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
110
111	install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
112	-endif(QGPGME_FOUND)
113	+endif(KDE4_QGPGME_FOUND)
114
115	########### next target ###############
116
117	--- /kleopatra/CMakeLists.txt
118	+++ /kleopatra/CMakeLists.txt
119	@@ -25,7 +25,7 @@
120	${CMAKE_SOURCE_DIR}/libkleo
121	${CMAKE_SOURCE_DIR}/libkdepim
122	${Boost_INCLUDE_DIR}
123	- ${QGPGME_INCLUDES}
124	+ ${KDE4_QGPGME_INCLUDE_DIR}
125	${GPGME_INCLUDES} )
126	if (USABLE_ASSUAN_FOUND)
127	if (ASSUAN2_FOUND)
128	@@ -321,7 +321,7 @@
129	set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
130	endif ( NOT KDE4_KCMUTILS_LIBS )
131
132	-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})
133	+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})
134	if ( USABLE_ASSUAN_FOUND )
135	target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
136	ENDIF ( USABLE_ASSUAN_FOUND )
137	--- /kleopatra/kgpgconf/CMakeLists.txt
138	+++ /kleopatra/kgpgconf/CMakeLists.txt
139	@@ -21,7 +21,7 @@
140	kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
141
142	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
143	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
144	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
145
146	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
147
148	--- /kleopatra/kwatchgnupg/CMakeLists.txt
149	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
150	@@ -26,7 +26,7 @@
151	set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
152	endif ( NOT KDE4_KCMUTILS_LIBS )
153
154	-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
155	+target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
156
157	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
158
159	--- /kleopatra/tests/CMakeLists.txt
160	+++ /kleopatra/tests/CMakeLists.txt
161	@@ -40,7 +40,7 @@
162	add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
163	add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
164	kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
165	-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
166	+target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
167
168	########### next target ###############
169
170	@@ -67,9 +67,9 @@
171	endif ( ASSUAN2_FOUND )
172
173	if(WIN32)
174	- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
175	+ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
176	else(WIN32)
177	- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
178	+ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
179	endif(WIN32)
180	if (KDEPIM_ONLY_KLEO)
181	install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
182	--- /kmail/CMakeLists.txt
183	+++ /kmail/CMakeLists.txt
184	@@ -371,7 +371,7 @@
185	${KDE4_KPARTS_LIBRARY}
186	${KDE4_KRESOURCES_LIBRARY}
187	kleo
188	- ${QGPGME_LIBRARIES}
189	+ ${KDE4_QGPGME_LIBRARIES}
190	mimelib
191	ksieve
192	kpgp
193	--- /kontact/plugins/CMakeLists.txt
194	+++ /kontact/plugins/CMakeLists.txt
195	@@ -3,7 +3,7 @@
196	remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
197	add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
198
199	-if(QGPGME_FOUND)
200	+if(KDE4_QGPGME_FOUND)
201	if(BUILD_kmail)
202	add_subdirectory( kmail )
203	endif(BUILD_kmail)
204	@@ -15,7 +15,7 @@
205	add_subdirectory( specialdates )
206	add_subdirectory( planner )
207	endif()
208	-endif(QGPGME_FOUND)
209	+endif(KDE4_QGPGME_FOUND)
210	if (BUILD_knotes)
211	add_subdirectory( knotes )
212	endif (BUILD_knotes)
213	--- /libkleo/CMakeLists.txt
214	+++ /libkleo/CMakeLists.txt
215	@@ -99,7 +99,7 @@
216	)
217
218	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
219	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
220	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
221	if ( NOT KDEPIM_ONLY_KLEO )
222	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
223	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
224	--- /libkleo/tests/CMakeLists.txt
225	+++ /libkleo/tests/CMakeLists.txt
226	@@ -18,7 +18,7 @@
227
228	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
229
230	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
231	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
232
233
234	########### next target ###############
235	@@ -54,7 +54,7 @@
236
237	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
238
239	-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
240	+target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
241
242	########### next target ###############
243
244	--- /messageviewer/CMakeLists.txt
245	+++ /messageviewer/CMakeLists.txt
246	@@ -58,7 +58,7 @@
247	${KDEPIMLIBS_KMIME_LIBS}
248	${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
249	${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
250	- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
251	+ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
252	)
253
254	include_directories(

Line 0 Link Here

(-)a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild (+67 lines)
		1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KDE_HANDBOOK="optional"
		7	KMNAME="kdepim"
		8	EGIT_BRANCH="KDE/4.14"
		9	inherit kde4-meta
		10
		11	DESCRIPTION="Kleopatra - KDE X.509 key manager"
		12	HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra/"
		13	COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
		14	SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
		15
		16	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
		17	IUSE="debug"
		18
		19	DEPEND="
		20	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3)
		21	$(add_kdeapps_dep kdepim-common-libs)
		22	>=app-crypt/gpgme-1.3.2
		23	dev-libs/boost:=
		24	dev-libs/libassuan
		25	dev-libs/libgpg-error
		26	"
		27	RDEPEND="${DEPEND}
		28	app-crypt/gnupg
		29	"
		30
		31	KMEXTRACTONLY="
		32	libkleo/
		33	"
		34
		35	PATCHES=( "${FILESDIR}/${PN}-install-headers.patch" )
		36
		37	src_unpack() {
		38	if use handbook; then
		39	KMEXTRA="
		40	doc/kwatchgnupg
		41	"
		42	fi
		43
		44	kde4-meta_src_unpack
		45	}
		46
		47	strip_patch_hunks_for_nonexistent_files() {
		48	local input_file="$1"
		49	local output_file="$2"
		50
		51	local line changed_file
		52	while IFS=$'\n' read -r line; do
		53	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
		54	if [[ -f "${changed_file}" ]]; then
		55	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
		56	fi
		57	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
		58	}
		59
		60	src_prepare() {
		61	find "(" -name ".cpp" -o -name ".h" ")" -exec \
		62	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
		63	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		64	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
65
66	kde4-meta_src_prepare
67	}

Line 0 Link Here

(-)a/kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild (-2 / +73 lines)
0	-	1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KMNAME="kdepim"
		7	KDE_HANDBOOK=optional
		8	inherit kde4-meta
		9
		10	DESCRIPTION="Kleopatra - KDE X.509 key manager (noakonadi branch)"
		11	HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
		12	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
		13	IUSE="debug"
		14
		15	DEPEND="
		16	app-crypt/gpgme
		17	>=dev-libs/libassuan-2.0.0
		18	dev-libs/libgpg-error
		19	$(add_kdeapps_dep kdepimlibs '' 4.14.10-r3)
		20	$(add_kdeapps_dep libkdepim '' 4.4.2015)
		21	$(add_kdeapps_dep libkleo '' 4.4.2015)
		22	"
		23	RDEPEND="${DEPEND}
		24	app-crypt/gnupg
		25	"
		26
		27	RESTRICT=test
		28	# bug 399431
		29
		30	KMEXTRACTONLY="
		31	libkleo
		32	"
		33	KMLOADLIBS="libkleo"
		34
		35	src_unpack() {
		36	if use handbook; then
		37	KMEXTRA="
		38	doc/kwatchgnupg
		39	"
		40	fi
		41
		42	kde4-meta_src_unpack
		43	}
		44
		45	strip_patch_hunks_for_nonexistent_files() {
		46	local input_file="$1"
		47	local output_file="$2"
		48
		49	local line changed_file
		50	while IFS=$'\n' read -r line; do
		51	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
		52	if [[ -f "${changed_file}" ]]; then
		53	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
		54	fi
		55	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
		56	}
		57
		58	src_prepare() {
		59	find "(" -name ".cpp" -o -name ".h" ")" -exec \
		60	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
		61	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		62	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		63
		64	kde4-meta_src_prepare
		65	}
66
67	src_configure() {
68	mycmakeargs=(
69	-DWITH_QGPGME=ON
70	)
71
72	kde4-meta_src_configure
73	}
1	for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.	74	for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.
2	--
3	...0211-update_gpgme++_and_qgpgme_references.patch \| 348 +++++++++++++++++++++	75	...0211-update_gpgme++_and_qgpgme_references.patch \| 348 +++++++++++++++++++++
4	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++	76	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++
5	kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild \| 130 ++++++++	77	kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild \| 130 ++++++++
6	kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild \| 96 ++++++	78	kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild \| 96 ++++++
7	4 files changed, 828 insertions(+)	79	4 files changed, 828 insertions(+)
8	create mode 100644 kde-apps/kmail/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch	80	create mode 100644 kde-apps/kmail/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
9	create mode 100644 kde-apps/kmail/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch	81	create mode 100644 kde-apps/kmail/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
10	create mode 100644 kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild	82	create mode 100644 kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild
11	create mode 100644 kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild	83	create mode 100644 kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild

Line 0 Link Here

(-)a/kde-apps/kmail/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch (+348 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -153,8 +153,8 @@
		4
		5	# If the KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ 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.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -175,8 +175,8 @@
		15	find_package(ZLIB)
		16	set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
		17
		18	- find_package(QGpgme)
		19	- 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")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	find_package(Grantlee 0.4.0 QUIET CONFIG)
		24	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)." )
		25	@@ -253,13 +253,13 @@
		26	add_subdirectory(messagelist)
		27	add_subdirectory(templateparser)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if(Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif()
		34	endif()
		35
		36	- # The following components depend on QGpgME.
		37	+ # The following components depend on KDE4_QGpgME.
		38	add_subdirectory(messageviewer)
		39	macro_optional_add_subdirectory(messagecomposer)
		40	add_subdirectory(pimcommon)
		41	--- /examples/etm_usage/CMakeLists.txt
		42	+++ /examples/etm_usage/CMakeLists.txt
		43	@@ -45,7 +45,7 @@
		44	${KDEPIMLIBS_AKONADI_LIBS}
		45	${KDEPIMLIBS_KABC_LIBS}
		46	${KDEPIMLIBS_KMIME_LIBS}
		47	- ${KDEPIMLIBS_QGPGME_LIBSS}
		48	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		49	akonadi_next
		50	kdepim
		51	kleo
		52	--- /examples/mailreader/CMakeLists.txt
		53	+++ /examples/mailreader/CMakeLists.txt
		54	@@ -25,7 +25,7 @@
		55	${KDE4_KDEUI_LIBS}
		56	${KDEPIMLIBS_AKONADI_KMIME_LIBS}
		57	${KDEPIMLIBS_AKONADI_LIBS}
		58	- ${KDEPIMLIBS_QGPGME_LIBS}
		59	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		60	akonadi_next
		61	kdepim
		62	kleo
		63	--- /kaddressbook/CMakeLists.txt
		64	+++ /kaddressbook/CMakeLists.txt
65	@@ -28,8 +28,8 @@
66	add_subdirectory(icons)
67	add_subdirectory(printing)
68	add_subdirectory(tests)
69	-if(QGPGME_FOUND)
70	- add_definitions(-DQGPGME_FOUND)
71	+if(KDE4_QGPGME_FOUND)
72	+ add_definitions(-DKDE4_QGPGME_FOUND)
73	endif()
74
75	set(kaddressbook_sendmail_SRCS
76	@@ -166,8 +166,8 @@
77	add_subdirectory(gravatar/autotests)
78	add_subdirectory(gravatar/tests)
79
80	-if(QGPGME_FOUND)
81	- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
82	+if(KDE4_QGPGME_FOUND)
83	+ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
84	endif()
85
86	if(PRISON_FOUND)
87	@@ -200,8 +200,8 @@
88	grantleetheme
89	)
90
91	-if(QGPGME_FOUND)
92	- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
93	+if(KDE4_QGPGME_FOUND)
94	+ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
95	endif()
96
97	install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
98	--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
99	+++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
100	@@ -26,12 +26,12 @@
101
102	#include <kaddressbookgrantlee/widget/grantleecontactviewer.h>
103
104	-#ifdef QGPGME_FOUND
105	+#ifdef KDE4_QGPGME_FOUND
106	#include <kde4_gpgme++/context.h>
107	#include <kde4_gpgme++/data.h>
108	#include <kde4_gpgme++/key.h>
109	#include <kde4_qgpgme/dataprovider.h>
110	-#endif // QGPGME_FOUND
111	+#endif // KDE4_QGPGME_FOUND
112
113	#include <KABC/VCardConverter>
114
115	@@ -409,7 +409,7 @@
116
117	void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
118	{
119	-#ifdef QGPGME_FOUND
120	+#ifdef KDE4_QGPGME_FOUND
121	const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
122	( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
123	if ( fingerprint.isEmpty() ) {
124	--- /kleopatra/CMakeLists.txt
125	+++ /kleopatra/CMakeLists.txt
126	@@ -37,7 +37,7 @@
127	${CMAKE_SOURCE_DIR}/libkdepim
128	${CMAKE_SOURCE_DIR}/mobile/lib
129	${Boost_INCLUDE_DIR}
130	- ${QGPGME_INCLUDES}
131	+ ${KDE4_QGPGME_INCLUDE_DIR}
132	${GPGME_INCLUDES}
133	)
134
135	@@ -367,7 +367,7 @@
136	target_link_libraries(kleopatra_bin
137	${_kleopatra_extra_libs}
138	kleo
139	- ${QGPGME_LIBRARIES}
140	+ ${KDE4_QGPGME_LIBRARIES}
141	${KDE4_KDEUI_LIBS}
142	${KDEPIMLIBS_KMIME_LIBS}
143	${KDE4_KCMUTILS_LIBS}
144	--- /kleopatra/kgpgconf/CMakeLists.txt
145	+++ /kleopatra/kgpgconf/CMakeLists.txt
146	@@ -21,6 +21,6 @@
147
148	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
149
150	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
151	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
152
153	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
154	--- /kleopatra/kwatchgnupg/CMakeLists.txt
155	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
156	@@ -22,7 +22,7 @@
157	target_link_libraries(kwatchgnupg
158	${KDE4_KDEUI_LIBS}
159	kleo
160	- ${QGPGME_LIBRARIES}
161	+ ${KDE4_QGPGME_LIBRARIES}
162	)
163
164	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
165	--- /kleopatra/tests/CMakeLists.txt
166	+++ /kleopatra/tests/CMakeLists.txt
167	@@ -62,7 +62,7 @@
168	${QT_QTCORE_LIBRARY}
169	${QT_QTGUI_LIBRARY}
170	${KDE4_KDECORE_LIBS}
171	- ${QGPGME_LIBRARIES}
172	+ ${KDE4_QGPGME_LIBRARIES}
173	)
174
175	########### next target ###############
176	@@ -100,13 +100,13 @@
177	if(WIN32)
178	target_link_libraries(test_uiserver
179	${ASSUAN_VANILLA_LIBRARIES}
180	- ${QGPGME_LIBRARIES}
181	+ ${KDE4_QGPGME_LIBRARIES}
182	ws2_32
183	)
184	else()
185	target_link_libraries(test_uiserver
186	${ASSUAN_PTHREAD_LIBRARIES}
187	- ${QGPGME_LIBRARIES}
188	+ ${KDE4_QGPGME_LIBRARIES}
189	)
190	endif()
191
192	--- /kmail/CMakeLists.txt
193	+++ /kmail/CMakeLists.txt
194	@@ -315,7 +315,7 @@
195	${KDEPIMLIBS_KRESOURCES_LIBS}
196	${KDE4_KCMUTILS_LIBS}
197	kleo
198	- ${QGPGME_LIBRARIES}
199	+ ${KDE4_QGPGME_LIBRARIES}
200	ksieve
201	ksieveui
202	kpgp
203	--- /kmail/kcm_kpimidentities/CMakeLists.txt
204	+++ /kmail/kcm_kpimidentities/CMakeLists.txt
205	@@ -17,7 +17,7 @@
206	kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
207	kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
208	target_link_libraries(kcm_kpimidentities
209	- ${KDEPIMLIBS_GPGMEPP_LIBS}
210	+ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
211	${KDEPIMLIBS_AKONADI_LIBS}
212	${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
213	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
214	--- /kontact/plugins/CMakeLists.txt
215	+++ /kontact/plugins/CMakeLists.txt
216	@@ -6,7 +6,7 @@
217	)
218
219
220	-if(QGPGME_FOUND)
221	+if(KDE4_QGPGME_FOUND)
222	if(BUILD_kmail)
223	add_subdirectory(kmail)
224	endif()
225	--- /libkleo/CMakeLists.txt
226	+++ /libkleo/CMakeLists.txt
227	@@ -104,7 +104,7 @@
228	)
229
230	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
231	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
232	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
233	if ( NOT KDEPIM_ONLY_KLEO )
234	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
235	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
236	--- /libkleo/tests/CMakeLists.txt
237	+++ /libkleo/tests/CMakeLists.txt
238	@@ -12,7 +12,7 @@
239	kleo
240	${KDE4_KDECORE_LIBS}
241	${KDE4_KDEUI_LIBS}
242	- ${QGPGME_LIBRARIES}
243	+ ${KDE4_QGPGME_LIBRARIES}
244	${QT_QTGUI_LIBRARY} )
245	endif ()
246
247	@@ -25,7 +25,7 @@
248
249	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
250
251	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
252	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
253
254
255	########### next target ###############
256	@@ -35,7 +35,7 @@
257
258	kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
259
260	-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
261	+target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
262	endif ()
263
264	########### next target ###############
265	@@ -45,7 +45,7 @@
266
267	kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
268
269	-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
270	+target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
271
272	########### next target ###############
273
274	@@ -63,7 +63,7 @@
275
276	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
277
278	-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
279	+target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
280
281	########### next target ###############
282
283	--- /messagecomposer/CMakeLists.txt
284	+++ /messagecomposer/CMakeLists.txt
285	@@ -123,7 +123,7 @@
286
287	kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
288	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}
289	- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
290	+ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
291
292	set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
293
294	--- /messagecomposer/tests/CMakeLists.txt
295	+++ /messagecomposer/tests/CMakeLists.txt
296	@@ -41,7 +41,7 @@
297	${QT_QTGUI_LIBRARY}
298	${QT_QTCORE_LIBRARY}
299	${KDE4_KDEUI_LIBS}
300	- ${QGPGME_LIBRARIES}
301	+ ${KDE4_QGPGME_LIBRARIES}
302	)
303	endmacro()
304
305	--- /messageviewer/CMakeLists.txt
306	+++ /messageviewer/CMakeLists.txt
307	@@ -206,7 +206,7 @@
308	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
309	${KDE4_KDEUI_LIBS}
310	${KDE4_KPRINTUTILS_LIBS}
311	- ${QGPGME_LIBRARIES}
312	+ ${KDE4_QGPGME_LIBRARIES}
313	${_mailwebview_lib}
314	${Grantlee_CORE_LIBRARIES}
315	${KDE4_KNEWSTUFF3_LIBS}
316	--- /messageviewer/tests/CMakeLists.txt
317	+++ /messageviewer/tests/CMakeLists.txt
318	@@ -20,7 +20,7 @@
319	target_link_libraries( ${_name}
320	messageviewer
321	kleo
322	- ${QGPGME_LIBRARIES}
323	+ ${KDE4_QGPGME_LIBRARIES}
324	${QT_QTTEST_LIBRARY}
325	${QT_QTCORE_LIBRARY}
326	${QT_QTWEBKIT_LIBRARY}
327	--- /templateparser/CMakeLists.txt
328	+++ /templateparser/CMakeLists.txt
329	@@ -49,7 +49,7 @@
330	kleo
331	kpgp
332	pimcommon
333	- ${QGPGME_LIBRARIES}
334	+ ${KDE4_QGPGME_LIBRARIES}
335	${QT_QTWEBKIT_LIBRARY}
336	)
337	set_target_properties(templateparser PROPERTIES
338	--- /templateparser/tests/CMakeLists.txt
339	+++ /templateparser/tests/CMakeLists.txt
340	@@ -18,7 +18,7 @@
341	kleo
342	templateparser
343	messageviewer
344	- ${QGPGME_LIBRARIES}
345	+ ${KDE4_QGPGME_LIBRARIES}
346	${QT_QTTEST_LIBRARY}
347	${QT_QTCORE_LIBRARY}
348	${QT_QTWEBKIT_LIBRARY}

Line 0 Link Here

(-)a/kde-apps/kmail/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch (+254 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -70,8 +70,8 @@
		4
		5	# The KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -96,8 +96,8 @@
		15	find_package(Strigi)
		16	macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
		17
		18	- find_package(QGpgme)
		19	- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	set(SDO_MIN_VERSION 0.2)
		24	set(SOPRANO_MIN_VERSION 2.3.70)
		25	@@ -188,12 +188,12 @@
		26	add_subdirectory(messagecore)
		27	add_subdirectory(messagelist)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if (Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif(Boost_TOPOLOGICAL_SORT_DIR)
		34	macro_optional_add_subdirectory(wizards)
		35	- # The following components depend on QGpgME.
		36	+ # The following components depend on KDE4_QGpgME.
		37	add_subdirectory(messageviewer)
		38	macro_optional_add_subdirectory(kmail)
		39
		40	@@ -214,7 +214,7 @@
		41	# include( SopranoAddOntology )
		42	# add_subdirectory( ontologies )
		43	# add_subdirectory( nepomuk_email_feeder )
		44	- endif(QGPGME_FOUND)
		45	+ endif(KDE4_QGPGME_FOUND)
		46
		47	if(KDEPIM_BUILD_EVERYTHING)
		48	macro_optional_add_subdirectory(knode)
		49	@@ -254,13 +254,13 @@
		50	macro_optional_add_subdirectory(doc)
		51
		52
		53	-# We really want to encourage users to enable/install QGpgME from kdepimlibs
		54	-if(NOT QGPGME_FOUND)
		55	- # Users must be aware that QGpgMe is really needed
		56	- message(STATUS "* WARNING: QGpgME is not installed on your system *")
		57	+# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
		58	+if(NOT KDE4_QGPGME_FOUND)
		59	+ # Users must be aware that KDE4_QGpgMe is really needed
		60	+ message(STATUS "* WARNING: KDE4_QGpgME is not installed on your system *")
		61	message(STATUS "* It is required if you want to use KMail, KOrganizer or Kleopatra *")
		62	message(STATUS "* You are really encouraged to install it *")
		63	-endif(NOT QGPGME_FOUND)
		64	+endif(NOT KDE4_QGPGME_FOUND)
65	# All done, let's display what we found...
66	macro_display_feature_log()
67
68	--- /examples/mailreader/CMakeLists.txt
69	+++ /examples/mailreader/CMakeLists.txt
70	@@ -19,7 +19,7 @@
71
72	target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
73	akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
74	- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
75	+ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
76	)
77
78	install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
79	--- /kaddressbook/CMakeLists.txt
80	+++ /kaddressbook/CMakeLists.txt
81	@@ -5,9 +5,9 @@
82	add_subdirectory( common )
83	add_subdirectory( interfaces )
84	add_subdirectory( printing )
85	-if(QGPGME_FOUND)
86	+if(KDE4_QGPGME_FOUND)
87	add_subdirectory( editors )
88	-endif(QGPGME_FOUND)
89	+endif(KDE4_QGPGME_FOUND)
90	add_subdirectory( views )
91	add_subdirectory( features )
92	add_subdirectory( kcmconfigs )
93	--- /kaddressbook/xxport/CMakeLists.txt
94	+++ /kaddressbook/xxport/CMakeLists.txt
95	@@ -22,7 +22,7 @@
96
97
98	########### next target ###############
99	-if(QGPGME_FOUND)
100	+if(KDE4_QGPGME_FOUND)
101	set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
102
103
104	@@ -30,10 +30,10 @@
105
106
107
108	-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
109	+target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
110
111	install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
112	-endif(QGPGME_FOUND)
113	+endif(KDE4_QGPGME_FOUND)
114
115	########### next target ###############
116
117	--- /kleopatra/CMakeLists.txt
118	+++ /kleopatra/CMakeLists.txt
119	@@ -25,7 +25,7 @@
120	${CMAKE_SOURCE_DIR}/libkleo
121	${CMAKE_SOURCE_DIR}/libkdepim
122	${Boost_INCLUDE_DIR}
123	- ${QGPGME_INCLUDES}
124	+ ${KDE4_QGPGME_INCLUDE_DIR}
125	${GPGME_INCLUDES} )
126	if (USABLE_ASSUAN_FOUND)
127	if (ASSUAN2_FOUND)
128	@@ -321,7 +321,7 @@
129	set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
130	endif ( NOT KDE4_KCMUTILS_LIBS )
131
132	-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})
133	+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})
134	if ( USABLE_ASSUAN_FOUND )
135	target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
136	ENDIF ( USABLE_ASSUAN_FOUND )
137	--- /kleopatra/kgpgconf/CMakeLists.txt
138	+++ /kleopatra/kgpgconf/CMakeLists.txt
139	@@ -21,7 +21,7 @@
140	kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
141
142	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
143	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
144	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
145
146	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
147
148	--- /kleopatra/kwatchgnupg/CMakeLists.txt
149	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
150	@@ -26,7 +26,7 @@
151	set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
152	endif ( NOT KDE4_KCMUTILS_LIBS )
153
154	-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
155	+target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
156
157	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
158
159	--- /kleopatra/tests/CMakeLists.txt
160	+++ /kleopatra/tests/CMakeLists.txt
161	@@ -40,7 +40,7 @@
162	add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
163	add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
164	kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
165	-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
166	+target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
167
168	########### next target ###############
169
170	@@ -67,9 +67,9 @@
171	endif ( ASSUAN2_FOUND )
172
173	if(WIN32)
174	- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
175	+ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
176	else(WIN32)
177	- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
178	+ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
179	endif(WIN32)
180	if (KDEPIM_ONLY_KLEO)
181	install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
182	--- /kmail/CMakeLists.txt
183	+++ /kmail/CMakeLists.txt
184	@@ -371,7 +371,7 @@
185	${KDE4_KPARTS_LIBRARY}
186	${KDE4_KRESOURCES_LIBRARY}
187	kleo
188	- ${QGPGME_LIBRARIES}
189	+ ${KDE4_QGPGME_LIBRARIES}
190	mimelib
191	ksieve
192	kpgp
193	--- /kontact/plugins/CMakeLists.txt
194	+++ /kontact/plugins/CMakeLists.txt
195	@@ -3,7 +3,7 @@
196	remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
197	add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
198
199	-if(QGPGME_FOUND)
200	+if(KDE4_QGPGME_FOUND)
201	if(BUILD_kmail)
202	add_subdirectory( kmail )
203	endif(BUILD_kmail)
204	@@ -15,7 +15,7 @@
205	add_subdirectory( specialdates )
206	add_subdirectory( planner )
207	endif()
208	-endif(QGPGME_FOUND)
209	+endif(KDE4_QGPGME_FOUND)
210	if (BUILD_knotes)
211	add_subdirectory( knotes )
212	endif (BUILD_knotes)
213	--- /libkleo/CMakeLists.txt
214	+++ /libkleo/CMakeLists.txt
215	@@ -99,7 +99,7 @@
216	)
217
218	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
219	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
220	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
221	if ( NOT KDEPIM_ONLY_KLEO )
222	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
223	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
224	--- /libkleo/tests/CMakeLists.txt
225	+++ /libkleo/tests/CMakeLists.txt
226	@@ -18,7 +18,7 @@
227
228	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
229
230	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
231	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
232
233
234	########### next target ###############
235	@@ -54,7 +54,7 @@
236
237	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
238
239	-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
240	+target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
241
242	########### next target ###############
243
244	--- /messageviewer/CMakeLists.txt
245	+++ /messageviewer/CMakeLists.txt
246	@@ -58,7 +58,7 @@
247	${KDEPIMLIBS_KMIME_LIBS}
248	${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
249	${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
250	- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
251	+ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
252	)
253
254	include_directories(

Line 0 Link Here

(-)a/kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild (+130 lines)
		1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KDE_HANDBOOK="optional"
		7	KMNAME="kdepim"
		8	EGIT_BRANCH="KDE/4.14"
		9	VIRTUALX_REQUIRED="test"
		10	WEBKIT_REQUIRED="always"
		11	inherit flag-o-matic kde4-meta
		12
		13	DESCRIPTION="Email component of Kontact, the integrated personal information manager of KDE"
		14	HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
		15	COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
		16	SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
		17
		18	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
		19	IUSE="debug"
		20
		21	DEPEND="
		22	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3)
		23	$(add_kdeapps_dep kdepim-common-libs)
		24	$(add_kdeapps_dep korganizer)
		25	"
		26	RDEPEND="${DEPEND}"
		27
		28	RESTRICT="test"
		29	# bug 393147
		30
		31	KMEXTRACTONLY="
		32	agents/folderarchiveagent.desktop
		33	agents/sendlateragent/
		34	akonadi_next/
		35	calendarviews/
		36	grantleeeditor/grantleethemeeditor/
		37	kdgantt2/
		38	korganizer/
		39	kresources/
		40	libkdepimdbusinterfaces/
		41	libkleo/
		42	libkpgp/
		43	"
		44	KMCOMPILEONLY="
		45	calendarsupport/
		46	grantleetheme/
		47	incidenceeditor-ng/
		48	kaddressbookgrantlee/
		49	mailcommon/
		50	mailimporter/
		51	messagecomposer/
		52	messagecore/
		53	messagelist/
		54	messageviewer/
		55	mailcommon/
		56	mailimporter/
		57	noteshared/
		58	pimcommon/
		59	templateparser/
		60	"
		61	KMEXTRA="
		62	agents/archivemailagent/
		63	agents/followupreminderagent/
		64	agents/mailfilteragent/
65	grantleeeditor/headerthemeeditor/
66	importwizard/
67	kmailcvt/
68	ksendemail/
69	libksieve/
70	mboximporter/
71	pimsettingexporter/
72	plugins/messageviewer/
73	"
74
75	KMLOADLIBS="kdepim-common-libs"
76
77	strip_patch_hunks_for_nonexistent_files() {
78	local input_file="$1"
79	local output_file="$2"
80
81	local line changed_file
82	while IFS=$'\n' read -r line; do
83	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
84	if [[ -f "${changed_file}" ]]; then
85	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
86	fi
87	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
88	}
89
90	src_prepare() {
91	find "(" -name ".cpp" -o -name ".h" ")" -exec \
92	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
93	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
94	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
95
96	kde4-meta_src_prepare
97	}
98
99	src_compile() {
100	kde4-meta_src_compile kmail_xml
101	kde4-meta_src_compile
102	}
103
104	pkg_postinst() {
105	kde4-meta_pkg_postinst
106
107	if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
108	echo
109	elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
110	echo
111	fi
112	if ! has_version kde-apps/kleopatra:${SLOT}; then
113	echo
114	elog "For certificate management and the gnupg log viewer, please install kde-apps/kleopatra:${SLOT}"
115	echo
116	fi
117
118	if has_version "kde-apps/akonadi[sqlite]"; then
119	ewarn
120	ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
121	ewarn "user configuration. This is the backend recommended by KDE upstream."
122	ewarn "Reports indicate that kde-apps/kmail-4.10 does not work properly with the sqlite"
123	ewarn "backend anymore."
124	if has_version "kde-apps/akonadi[-mysql]"; then
125	ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD kde-apps/akonadi WITH mysql USEFLAG ENABLED."
126	fi
127	ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
128	ewarn
129	fi
130	}

Line 0 Link Here

(-)a/kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild (-2 / +96 lines)
0	-	1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KMNAME="kdepim"
		7	KDE_HANDBOOK=optional
		8	VIRTUALX_REQUIRED=test
		9	inherit flag-o-matic kde4-meta
		10
		11	DESCRIPTION="Email component of Kontact (noakonadi branch)"
		12	HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
		13	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
		14	IUSE="debug"
		15
		16	DEPEND="
		17	$(add_kdeapps_dep kdepimlibs '' 4.14.10-r3)
		18	$(add_kdeapps_dep libkdepim '' 4.4.11.1-r1)
		19	$(add_kdeapps_dep libkleo '' 4.4.2015)
		20	$(add_kdeapps_dep libkpgp '' 4.4.2015)
		21	kde-frameworks/kdelibs:4
		22	"
		23	RDEPEND="${DEPEND}
		24	!>=kde-apps/kdepimlibs-4.14.11_pre20160211
		25	"
		26
		27	KMEXTRACTONLY="
		28	korganizer/org.kde.Korganizer.Calendar.xml
		29	libkleo/
		30	libkpgp/
		31	"
		32	KMEXTRA="
		33	kmailcvt/
		34	ksendemail/
		35	libksieve/
		36	messagecore/
		37	messagelist/
		38	messageviewer/
		39	mimelib/
		40	plugins/kmail/
		41	"
		42	KMLOADLIBS="libkdepim"
		43
		44	PATCHES=(
		45	"${FILESDIR}/${PN}-4.4.9-nodbus.patch"
		46	)
		47
		48	strip_patch_hunks_for_nonexistent_files() {
		49	local input_file="$1"
		50	local output_file="$2"
		51
		52	local line changed_file
		53	while IFS=$'\n' read -r line; do
		54	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
		55	if [[ -f "${changed_file}" ]]; then
		56	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
		57	fi
		58	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
		59	}
		60
		61	src_prepare() {
		62	find "(" -name ".cpp" -o -name ".h" ")" -exec \
		63	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
		64	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		65	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
66
67	kde4-meta_src_prepare
68	}
69
70	src_configure() {
71	mycmakeargs=(
72	-DWITH_IndicateQt=OFF
73	)
74
75	kde4-meta_src_configure
76	}
77
78	src_compile() {
79	kde4-meta_src_compile kmail_xml
80	kde4-meta_src_compile
81	}
82
83	pkg_postinst() {
84	kde4-meta_pkg_postinst
85
86	if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
87	echo
88	elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
89	echo
90	fi
91	if ! has_version kde-apps/kleopatra:${SLOT}; then
92	echo
93	elog "For certificate management and the gnupg log viewer, please install kde-apps/kleopatra:${SLOT}"
94	echo
95	fi
96	}
1	references for compatibility with	97	references for compatibility with
2	>=kde-apps/kdepimlibs-4.14.11_pre20160211-r3.	98	>=kde-apps/kdepimlibs-4.14.11_pre20160211-r3.
3	--
4	...0211-update_gpgme++_and_qgpgme_references.patch \| 348 +++++++++++++++++++++	99	...0211-update_gpgme++_and_qgpgme_references.patch \| 348 +++++++++++++++++++++
5	.../konsolekalendar-4.14.11_pre20160211-r1.ebuild \| 72 +++++	100	.../konsolekalendar-4.14.11_pre20160211-r1.ebuild \| 72 +++++
6	2 files changed, 420 insertions(+)	101	2 files changed, 420 insertions(+)
7	create mode 100644 kde-apps/konsolekalendar/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch	102	create mode 100644 kde-apps/konsolekalendar/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
8	create mode 100644 kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211-r1.ebuild	103	create mode 100644 kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211-r1.ebuild

Line 0 Link Here

(-)a/kde-apps/konsolekalendar/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch (+348 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -153,8 +153,8 @@
		4
		5	# If the KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ 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.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -175,8 +175,8 @@
		15	find_package(ZLIB)
		16	set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
		17
		18	- find_package(QGpgme)
		19	- 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")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	find_package(Grantlee 0.4.0 QUIET CONFIG)
		24	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)." )
		25	@@ -253,13 +253,13 @@
		26	add_subdirectory(messagelist)
		27	add_subdirectory(templateparser)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if(Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif()
		34	endif()
		35
		36	- # The following components depend on QGpgME.
		37	+ # The following components depend on KDE4_QGpgME.
		38	add_subdirectory(messageviewer)
		39	macro_optional_add_subdirectory(messagecomposer)
		40	add_subdirectory(pimcommon)
		41	--- /examples/etm_usage/CMakeLists.txt
		42	+++ /examples/etm_usage/CMakeLists.txt
		43	@@ -45,7 +45,7 @@
		44	${KDEPIMLIBS_AKONADI_LIBS}
		45	${KDEPIMLIBS_KABC_LIBS}
		46	${KDEPIMLIBS_KMIME_LIBS}
		47	- ${KDEPIMLIBS_QGPGME_LIBSS}
		48	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		49	akonadi_next
		50	kdepim
		51	kleo
		52	--- /examples/mailreader/CMakeLists.txt
		53	+++ /examples/mailreader/CMakeLists.txt
		54	@@ -25,7 +25,7 @@
		55	${KDE4_KDEUI_LIBS}
		56	${KDEPIMLIBS_AKONADI_KMIME_LIBS}
		57	${KDEPIMLIBS_AKONADI_LIBS}
		58	- ${KDEPIMLIBS_QGPGME_LIBS}
		59	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		60	akonadi_next
		61	kdepim
		62	kleo
		63	--- /kaddressbook/CMakeLists.txt
		64	+++ /kaddressbook/CMakeLists.txt
65	@@ -28,8 +28,8 @@
66	add_subdirectory(icons)
67	add_subdirectory(printing)
68	add_subdirectory(tests)
69	-if(QGPGME_FOUND)
70	- add_definitions(-DQGPGME_FOUND)
71	+if(KDE4_QGPGME_FOUND)
72	+ add_definitions(-DKDE4_QGPGME_FOUND)
73	endif()
74
75	set(kaddressbook_sendmail_SRCS
76	@@ -166,8 +166,8 @@
77	add_subdirectory(gravatar/autotests)
78	add_subdirectory(gravatar/tests)
79
80	-if(QGPGME_FOUND)
81	- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
82	+if(KDE4_QGPGME_FOUND)
83	+ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
84	endif()
85
86	if(PRISON_FOUND)
87	@@ -200,8 +200,8 @@
88	grantleetheme
89	)
90
91	-if(QGPGME_FOUND)
92	- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
93	+if(KDE4_QGPGME_FOUND)
94	+ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
95	endif()
96
97	install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
98	--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
99	+++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
100	@@ -26,12 +26,12 @@
101
102	#include <kaddressbookgrantlee/widget/grantleecontactviewer.h>
103
104	-#ifdef QGPGME_FOUND
105	+#ifdef KDE4_QGPGME_FOUND
106	#include <kde4_gpgme++/context.h>
107	#include <kde4_gpgme++/data.h>
108	#include <kde4_gpgme++/key.h>
109	#include <kde4_qgpgme/dataprovider.h>
110	-#endif // QGPGME_FOUND
111	+#endif // KDE4_QGPGME_FOUND
112
113	#include <KABC/VCardConverter>
114
115	@@ -409,7 +409,7 @@
116
117	void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
118	{
119	-#ifdef QGPGME_FOUND
120	+#ifdef KDE4_QGPGME_FOUND
121	const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
122	( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
123	if ( fingerprint.isEmpty() ) {
124	--- /kleopatra/CMakeLists.txt
125	+++ /kleopatra/CMakeLists.txt
126	@@ -37,7 +37,7 @@
127	${CMAKE_SOURCE_DIR}/libkdepim
128	${CMAKE_SOURCE_DIR}/mobile/lib
129	${Boost_INCLUDE_DIR}
130	- ${QGPGME_INCLUDES}
131	+ ${KDE4_QGPGME_INCLUDE_DIR}
132	${GPGME_INCLUDES}
133	)
134
135	@@ -367,7 +367,7 @@
136	target_link_libraries(kleopatra_bin
137	${_kleopatra_extra_libs}
138	kleo
139	- ${QGPGME_LIBRARIES}
140	+ ${KDE4_QGPGME_LIBRARIES}
141	${KDE4_KDEUI_LIBS}
142	${KDEPIMLIBS_KMIME_LIBS}
143	${KDE4_KCMUTILS_LIBS}
144	--- /kleopatra/kgpgconf/CMakeLists.txt
145	+++ /kleopatra/kgpgconf/CMakeLists.txt
146	@@ -21,6 +21,6 @@
147
148	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
149
150	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
151	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
152
153	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
154	--- /kleopatra/kwatchgnupg/CMakeLists.txt
155	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
156	@@ -22,7 +22,7 @@
157	target_link_libraries(kwatchgnupg
158	${KDE4_KDEUI_LIBS}
159	kleo
160	- ${QGPGME_LIBRARIES}
161	+ ${KDE4_QGPGME_LIBRARIES}
162	)
163
164	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
165	--- /kleopatra/tests/CMakeLists.txt
166	+++ /kleopatra/tests/CMakeLists.txt
167	@@ -62,7 +62,7 @@
168	${QT_QTCORE_LIBRARY}
169	${QT_QTGUI_LIBRARY}
170	${KDE4_KDECORE_LIBS}
171	- ${QGPGME_LIBRARIES}
172	+ ${KDE4_QGPGME_LIBRARIES}
173	)
174
175	########### next target ###############
176	@@ -100,13 +100,13 @@
177	if(WIN32)
178	target_link_libraries(test_uiserver
179	${ASSUAN_VANILLA_LIBRARIES}
180	- ${QGPGME_LIBRARIES}
181	+ ${KDE4_QGPGME_LIBRARIES}
182	ws2_32
183	)
184	else()
185	target_link_libraries(test_uiserver
186	${ASSUAN_PTHREAD_LIBRARIES}
187	- ${QGPGME_LIBRARIES}
188	+ ${KDE4_QGPGME_LIBRARIES}
189	)
190	endif()
191
192	--- /kmail/CMakeLists.txt
193	+++ /kmail/CMakeLists.txt
194	@@ -315,7 +315,7 @@
195	${KDEPIMLIBS_KRESOURCES_LIBS}
196	${KDE4_KCMUTILS_LIBS}
197	kleo
198	- ${QGPGME_LIBRARIES}
199	+ ${KDE4_QGPGME_LIBRARIES}
200	ksieve
201	ksieveui
202	kpgp
203	--- /kmail/kcm_kpimidentities/CMakeLists.txt
204	+++ /kmail/kcm_kpimidentities/CMakeLists.txt
205	@@ -17,7 +17,7 @@
206	kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
207	kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
208	target_link_libraries(kcm_kpimidentities
209	- ${KDEPIMLIBS_GPGMEPP_LIBS}
210	+ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
211	${KDEPIMLIBS_AKONADI_LIBS}
212	${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
213	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
214	--- /kontact/plugins/CMakeLists.txt
215	+++ /kontact/plugins/CMakeLists.txt
216	@@ -6,7 +6,7 @@
217	)
218
219
220	-if(QGPGME_FOUND)
221	+if(KDE4_QGPGME_FOUND)
222	if(BUILD_kmail)
223	add_subdirectory(kmail)
224	endif()
225	--- /libkleo/CMakeLists.txt
226	+++ /libkleo/CMakeLists.txt
227	@@ -104,7 +104,7 @@
228	)
229
230	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
231	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
232	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
233	if ( NOT KDEPIM_ONLY_KLEO )
234	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
235	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
236	--- /libkleo/tests/CMakeLists.txt
237	+++ /libkleo/tests/CMakeLists.txt
238	@@ -12,7 +12,7 @@
239	kleo
240	${KDE4_KDECORE_LIBS}
241	${KDE4_KDEUI_LIBS}
242	- ${QGPGME_LIBRARIES}
243	+ ${KDE4_QGPGME_LIBRARIES}
244	${QT_QTGUI_LIBRARY} )
245	endif ()
246
247	@@ -25,7 +25,7 @@
248
249	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
250
251	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
252	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
253
254
255	########### next target ###############
256	@@ -35,7 +35,7 @@
257
258	kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
259
260	-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
261	+target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
262	endif ()
263
264	########### next target ###############
265	@@ -45,7 +45,7 @@
266
267	kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
268
269	-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
270	+target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
271
272	########### next target ###############
273
274	@@ -63,7 +63,7 @@
275
276	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
277
278	-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
279	+target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
280
281	########### next target ###############
282
283	--- /messagecomposer/CMakeLists.txt
284	+++ /messagecomposer/CMakeLists.txt
285	@@ -123,7 +123,7 @@
286
287	kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
288	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}
289	- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
290	+ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
291
292	set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
293
294	--- /messagecomposer/tests/CMakeLists.txt
295	+++ /messagecomposer/tests/CMakeLists.txt
296	@@ -41,7 +41,7 @@
297	${QT_QTGUI_LIBRARY}
298	${QT_QTCORE_LIBRARY}
299	${KDE4_KDEUI_LIBS}
300	- ${QGPGME_LIBRARIES}
301	+ ${KDE4_QGPGME_LIBRARIES}
302	)
303	endmacro()
304
305	--- /messageviewer/CMakeLists.txt
306	+++ /messageviewer/CMakeLists.txt
307	@@ -206,7 +206,7 @@
308	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
309	${KDE4_KDEUI_LIBS}
310	${KDE4_KPRINTUTILS_LIBS}
311	- ${QGPGME_LIBRARIES}
312	+ ${KDE4_QGPGME_LIBRARIES}
313	${_mailwebview_lib}
314	${Grantlee_CORE_LIBRARIES}
315	${KDE4_KNEWSTUFF3_LIBS}
316	--- /messageviewer/tests/CMakeLists.txt
317	+++ /messageviewer/tests/CMakeLists.txt
318	@@ -20,7 +20,7 @@
319	target_link_libraries( ${_name}
320	messageviewer
321	kleo
322	- ${QGPGME_LIBRARIES}
323	+ ${KDE4_QGPGME_LIBRARIES}
324	${QT_QTTEST_LIBRARY}
325	${QT_QTCORE_LIBRARY}
326	${QT_QTWEBKIT_LIBRARY}
327	--- /templateparser/CMakeLists.txt
328	+++ /templateparser/CMakeLists.txt
329	@@ -49,7 +49,7 @@
330	kleo
331	kpgp
332	pimcommon
333	- ${QGPGME_LIBRARIES}
334	+ ${KDE4_QGPGME_LIBRARIES}
335	${QT_QTWEBKIT_LIBRARY}
336	)
337	set_target_properties(templateparser PROPERTIES
338	--- /templateparser/tests/CMakeLists.txt
339	+++ /templateparser/tests/CMakeLists.txt
340	@@ -18,7 +18,7 @@
341	kleo
342	templateparser
343	messageviewer
344	- ${QGPGME_LIBRARIES}
345	+ ${KDE4_QGPGME_LIBRARIES}
346	${QT_QTTEST_LIBRARY}
347	${QT_QTCORE_LIBRARY}
348	${QT_QTWEBKIT_LIBRARY}

Line 0 Link Here

(-)a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211-r1.ebuild (-2 / +72 lines)
0	-	1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KDE_HANDBOOK="optional"
		7	KMNAME="kdepim"
		8	EGIT_BRANCH="KDE/4.14"
		9	KMMODULE="console/${PN}"
		10	inherit kde4-meta
		11
		12	DESCRIPTION="A command line interface to KDE calendars"
		13	HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
		14	COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
		15	SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
		16
		17	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
		18	IUSE="debug"
		19
		20	DEPEND="
		21	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3)
		22	$(add_kdeapps_dep kdepim-common-libs)
		23	"
		24	RDEPEND="${DEPEND}"
		25
		26	KMCOMPILEONLY="
		27	calendarsupport/
		28	grantleetheme/
		29	incidenceeditor-ng/
		30	kaddressbookgrantlee/
		31	mailcommon/
		32	messagecore/
		33	messageviewer/
		34	pimcommon/
		35	templateparser/
		36	"
		37	KMEXTRACTONLY="
		38	akonadi_next/
		39	agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
		40	calendarviews/
		41	kdgantt2/
		42	korganizer/data/org.kde.Korganizer.Calendar.xml
		43	mailimporter/
		44	messagecomposer/
		45	libkdepimdbusinterfaces/
		46	libkleo/
		47	libkpgp/
		48	"
		49
		50	KMLOADLIBS="kdepim-common-libs"
		51
		52	strip_patch_hunks_for_nonexistent_files() {
		53	local input_file="$1"
		54	local output_file="$2"
		55
		56	local line changed_file
		57	while IFS=$'\n' read -r line; do
		58	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
		59	if [[ -f "${changed_file}" ]]; then
		60	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
		61	fi
		62	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
		63	}
		64
		65	src_prepare() {
66	find "(" -name ".cpp" -o -name ".h" ")" -exec \
67	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
68	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
69	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
70
71	kde4-meta_src_prepare
72	}
1	for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.	73	for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.
2	--
3	...0211-update_gpgme++_and_qgpgme_references.patch \| 348 +++++++++++++++++++++	74	...0211-update_gpgme++_and_qgpgme_references.patch \| 348 +++++++++++++++++++++
4	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++	75	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++
5	.../kontact/kontact-4.14.11_pre20160211-r1.ebuild \| 76 +++++	76	.../kontact/kontact-4.14.11_pre20160211-r1.ebuild \| 76 +++++
6	kde-apps/kontact/kontact-4.4.2016.01-r1.ebuild \| 73 +++++	77	kde-apps/kontact/kontact-4.4.2016.01-r1.ebuild \| 73 +++++
7	4 files changed, 751 insertions(+)	78	4 files changed, 751 insertions(+)
8	create mode 100644 kde-apps/kontact/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch	79	create mode 100644 kde-apps/kontact/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
9	create mode 100644 kde-apps/kontact/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch	80	create mode 100644 kde-apps/kontact/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
10	create mode 100644 kde-apps/kontact/kontact-4.14.11_pre20160211-r1.ebuild	81	create mode 100644 kde-apps/kontact/kontact-4.14.11_pre20160211-r1.ebuild
11	create mode 100644 kde-apps/kontact/kontact-4.4.2016.01-r1.ebuild	82	create mode 100644 kde-apps/kontact/kontact-4.4.2016.01-r1.ebuild

Line 0 Link Here

(-)a/kde-apps/kontact/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch (+348 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -153,8 +153,8 @@
		4
		5	# If the KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ 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.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -175,8 +175,8 @@
		15	find_package(ZLIB)
		16	set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
		17
		18	- find_package(QGpgme)
		19	- 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")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	find_package(Grantlee 0.4.0 QUIET CONFIG)
		24	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)." )
		25	@@ -253,13 +253,13 @@
		26	add_subdirectory(messagelist)
		27	add_subdirectory(templateparser)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if(Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif()
		34	endif()
		35
		36	- # The following components depend on QGpgME.
		37	+ # The following components depend on KDE4_QGpgME.
		38	add_subdirectory(messageviewer)
		39	macro_optional_add_subdirectory(messagecomposer)
		40	add_subdirectory(pimcommon)
		41	--- /examples/etm_usage/CMakeLists.txt
		42	+++ /examples/etm_usage/CMakeLists.txt
		43	@@ -45,7 +45,7 @@
		44	${KDEPIMLIBS_AKONADI_LIBS}
		45	${KDEPIMLIBS_KABC_LIBS}
		46	${KDEPIMLIBS_KMIME_LIBS}
		47	- ${KDEPIMLIBS_QGPGME_LIBSS}
		48	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		49	akonadi_next
		50	kdepim
		51	kleo
		52	--- /examples/mailreader/CMakeLists.txt
		53	+++ /examples/mailreader/CMakeLists.txt
		54	@@ -25,7 +25,7 @@
		55	${KDE4_KDEUI_LIBS}
		56	${KDEPIMLIBS_AKONADI_KMIME_LIBS}
		57	${KDEPIMLIBS_AKONADI_LIBS}
		58	- ${KDEPIMLIBS_QGPGME_LIBS}
		59	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		60	akonadi_next
		61	kdepim
		62	kleo
		63	--- /kaddressbook/CMakeLists.txt
		64	+++ /kaddressbook/CMakeLists.txt
65	@@ -28,8 +28,8 @@
66	add_subdirectory(icons)
67	add_subdirectory(printing)
68	add_subdirectory(tests)
69	-if(QGPGME_FOUND)
70	- add_definitions(-DQGPGME_FOUND)
71	+if(KDE4_QGPGME_FOUND)
72	+ add_definitions(-DKDE4_QGPGME_FOUND)
73	endif()
74
75	set(kaddressbook_sendmail_SRCS
76	@@ -166,8 +166,8 @@
77	add_subdirectory(gravatar/autotests)
78	add_subdirectory(gravatar/tests)
79
80	-if(QGPGME_FOUND)
81	- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
82	+if(KDE4_QGPGME_FOUND)
83	+ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
84	endif()
85
86	if(PRISON_FOUND)
87	@@ -200,8 +200,8 @@
88	grantleetheme
89	)
90
91	-if(QGPGME_FOUND)
92	- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
93	+if(KDE4_QGPGME_FOUND)
94	+ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
95	endif()
96
97	install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
98	--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
99	+++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
100	@@ -26,12 +26,12 @@
101
102	#include <kaddressbookgrantlee/widget/grantleecontactviewer.h>
103
104	-#ifdef QGPGME_FOUND
105	+#ifdef KDE4_QGPGME_FOUND
106	#include <kde4_gpgme++/context.h>
107	#include <kde4_gpgme++/data.h>
108	#include <kde4_gpgme++/key.h>
109	#include <kde4_qgpgme/dataprovider.h>
110	-#endif // QGPGME_FOUND
111	+#endif // KDE4_QGPGME_FOUND
112
113	#include <KABC/VCardConverter>
114
115	@@ -409,7 +409,7 @@
116
117	void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
118	{
119	-#ifdef QGPGME_FOUND
120	+#ifdef KDE4_QGPGME_FOUND
121	const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
122	( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
123	if ( fingerprint.isEmpty() ) {
124	--- /kleopatra/CMakeLists.txt
125	+++ /kleopatra/CMakeLists.txt
126	@@ -37,7 +37,7 @@
127	${CMAKE_SOURCE_DIR}/libkdepim
128	${CMAKE_SOURCE_DIR}/mobile/lib
129	${Boost_INCLUDE_DIR}
130	- ${QGPGME_INCLUDES}
131	+ ${KDE4_QGPGME_INCLUDE_DIR}
132	${GPGME_INCLUDES}
133	)
134
135	@@ -367,7 +367,7 @@
136	target_link_libraries(kleopatra_bin
137	${_kleopatra_extra_libs}
138	kleo
139	- ${QGPGME_LIBRARIES}
140	+ ${KDE4_QGPGME_LIBRARIES}
141	${KDE4_KDEUI_LIBS}
142	${KDEPIMLIBS_KMIME_LIBS}
143	${KDE4_KCMUTILS_LIBS}
144	--- /kleopatra/kgpgconf/CMakeLists.txt
145	+++ /kleopatra/kgpgconf/CMakeLists.txt
146	@@ -21,6 +21,6 @@
147
148	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
149
150	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
151	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
152
153	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
154	--- /kleopatra/kwatchgnupg/CMakeLists.txt
155	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
156	@@ -22,7 +22,7 @@
157	target_link_libraries(kwatchgnupg
158	${KDE4_KDEUI_LIBS}
159	kleo
160	- ${QGPGME_LIBRARIES}
161	+ ${KDE4_QGPGME_LIBRARIES}
162	)
163
164	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
165	--- /kleopatra/tests/CMakeLists.txt
166	+++ /kleopatra/tests/CMakeLists.txt
167	@@ -62,7 +62,7 @@
168	${QT_QTCORE_LIBRARY}
169	${QT_QTGUI_LIBRARY}
170	${KDE4_KDECORE_LIBS}
171	- ${QGPGME_LIBRARIES}
172	+ ${KDE4_QGPGME_LIBRARIES}
173	)
174
175	########### next target ###############
176	@@ -100,13 +100,13 @@
177	if(WIN32)
178	target_link_libraries(test_uiserver
179	${ASSUAN_VANILLA_LIBRARIES}
180	- ${QGPGME_LIBRARIES}
181	+ ${KDE4_QGPGME_LIBRARIES}
182	ws2_32
183	)
184	else()
185	target_link_libraries(test_uiserver
186	${ASSUAN_PTHREAD_LIBRARIES}
187	- ${QGPGME_LIBRARIES}
188	+ ${KDE4_QGPGME_LIBRARIES}
189	)
190	endif()
191
192	--- /kmail/CMakeLists.txt
193	+++ /kmail/CMakeLists.txt
194	@@ -315,7 +315,7 @@
195	${KDEPIMLIBS_KRESOURCES_LIBS}
196	${KDE4_KCMUTILS_LIBS}
197	kleo
198	- ${QGPGME_LIBRARIES}
199	+ ${KDE4_QGPGME_LIBRARIES}
200	ksieve
201	ksieveui
202	kpgp
203	--- /kmail/kcm_kpimidentities/CMakeLists.txt
204	+++ /kmail/kcm_kpimidentities/CMakeLists.txt
205	@@ -17,7 +17,7 @@
206	kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
207	kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
208	target_link_libraries(kcm_kpimidentities
209	- ${KDEPIMLIBS_GPGMEPP_LIBS}
210	+ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
211	${KDEPIMLIBS_AKONADI_LIBS}
212	${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
213	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
214	--- /kontact/plugins/CMakeLists.txt
215	+++ /kontact/plugins/CMakeLists.txt
216	@@ -6,7 +6,7 @@
217	)
218
219
220	-if(QGPGME_FOUND)
221	+if(KDE4_QGPGME_FOUND)
222	if(BUILD_kmail)
223	add_subdirectory(kmail)
224	endif()
225	--- /libkleo/CMakeLists.txt
226	+++ /libkleo/CMakeLists.txt
227	@@ -104,7 +104,7 @@
228	)
229
230	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
231	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
232	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
233	if ( NOT KDEPIM_ONLY_KLEO )
234	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
235	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
236	--- /libkleo/tests/CMakeLists.txt
237	+++ /libkleo/tests/CMakeLists.txt
238	@@ -12,7 +12,7 @@
239	kleo
240	${KDE4_KDECORE_LIBS}
241	${KDE4_KDEUI_LIBS}
242	- ${QGPGME_LIBRARIES}
243	+ ${KDE4_QGPGME_LIBRARIES}
244	${QT_QTGUI_LIBRARY} )
245	endif ()
246
247	@@ -25,7 +25,7 @@
248
249	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
250
251	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
252	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
253
254
255	########### next target ###############
256	@@ -35,7 +35,7 @@
257
258	kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
259
260	-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
261	+target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
262	endif ()
263
264	########### next target ###############
265	@@ -45,7 +45,7 @@
266
267	kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
268
269	-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
270	+target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
271
272	########### next target ###############
273
274	@@ -63,7 +63,7 @@
275
276	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
277
278	-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
279	+target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
280
281	########### next target ###############
282
283	--- /messagecomposer/CMakeLists.txt
284	+++ /messagecomposer/CMakeLists.txt
285	@@ -123,7 +123,7 @@
286
287	kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
288	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}
289	- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
290	+ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
291
292	set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
293
294	--- /messagecomposer/tests/CMakeLists.txt
295	+++ /messagecomposer/tests/CMakeLists.txt
296	@@ -41,7 +41,7 @@
297	${QT_QTGUI_LIBRARY}
298	${QT_QTCORE_LIBRARY}
299	${KDE4_KDEUI_LIBS}
300	- ${QGPGME_LIBRARIES}
301	+ ${KDE4_QGPGME_LIBRARIES}
302	)
303	endmacro()
304
305	--- /messageviewer/CMakeLists.txt
306	+++ /messageviewer/CMakeLists.txt
307	@@ -206,7 +206,7 @@
308	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
309	${KDE4_KDEUI_LIBS}
310	${KDE4_KPRINTUTILS_LIBS}
311	- ${QGPGME_LIBRARIES}
312	+ ${KDE4_QGPGME_LIBRARIES}
313	${_mailwebview_lib}
314	${Grantlee_CORE_LIBRARIES}
315	${KDE4_KNEWSTUFF3_LIBS}
316	--- /messageviewer/tests/CMakeLists.txt
317	+++ /messageviewer/tests/CMakeLists.txt
318	@@ -20,7 +20,7 @@
319	target_link_libraries( ${_name}
320	messageviewer
321	kleo
322	- ${QGPGME_LIBRARIES}
323	+ ${KDE4_QGPGME_LIBRARIES}
324	${QT_QTTEST_LIBRARY}
325	${QT_QTCORE_LIBRARY}
326	${QT_QTWEBKIT_LIBRARY}
327	--- /templateparser/CMakeLists.txt
328	+++ /templateparser/CMakeLists.txt
329	@@ -49,7 +49,7 @@
330	kleo
331	kpgp
332	pimcommon
333	- ${QGPGME_LIBRARIES}
334	+ ${KDE4_QGPGME_LIBRARIES}
335	${QT_QTWEBKIT_LIBRARY}
336	)
337	set_target_properties(templateparser PROPERTIES
338	--- /templateparser/tests/CMakeLists.txt
339	+++ /templateparser/tests/CMakeLists.txt
340	@@ -18,7 +18,7 @@
341	kleo
342	templateparser
343	messageviewer
344	- ${QGPGME_LIBRARIES}
345	+ ${KDE4_QGPGME_LIBRARIES}
346	${QT_QTTEST_LIBRARY}
347	${QT_QTCORE_LIBRARY}
348	${QT_QTWEBKIT_LIBRARY}

Line 0 Link Here

(-)a/kde-apps/kontact/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch (+254 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -70,8 +70,8 @@
		4
		5	# The KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -96,8 +96,8 @@
		15	find_package(Strigi)
		16	macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
		17
		18	- find_package(QGpgme)
		19	- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	set(SDO_MIN_VERSION 0.2)
		24	set(SOPRANO_MIN_VERSION 2.3.70)
		25	@@ -188,12 +188,12 @@
		26	add_subdirectory(messagecore)
		27	add_subdirectory(messagelist)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if (Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif(Boost_TOPOLOGICAL_SORT_DIR)
		34	macro_optional_add_subdirectory(wizards)
		35	- # The following components depend on QGpgME.
		36	+ # The following components depend on KDE4_QGpgME.
		37	add_subdirectory(messageviewer)
		38	macro_optional_add_subdirectory(kmail)
		39
		40	@@ -214,7 +214,7 @@
		41	# include( SopranoAddOntology )
		42	# add_subdirectory( ontologies )
		43	# add_subdirectory( nepomuk_email_feeder )
		44	- endif(QGPGME_FOUND)
		45	+ endif(KDE4_QGPGME_FOUND)
		46
		47	if(KDEPIM_BUILD_EVERYTHING)
		48	macro_optional_add_subdirectory(knode)
		49	@@ -254,13 +254,13 @@
		50	macro_optional_add_subdirectory(doc)
		51
		52
		53	-# We really want to encourage users to enable/install QGpgME from kdepimlibs
		54	-if(NOT QGPGME_FOUND)
		55	- # Users must be aware that QGpgMe is really needed
		56	- message(STATUS "* WARNING: QGpgME is not installed on your system *")
		57	+# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
		58	+if(NOT KDE4_QGPGME_FOUND)
		59	+ # Users must be aware that KDE4_QGpgMe is really needed
		60	+ message(STATUS "* WARNING: KDE4_QGpgME is not installed on your system *")
		61	message(STATUS "* It is required if you want to use KMail, KOrganizer or Kleopatra *")
		62	message(STATUS "* You are really encouraged to install it *")
		63	-endif(NOT QGPGME_FOUND)
		64	+endif(NOT KDE4_QGPGME_FOUND)
65	# All done, let's display what we found...
66	macro_display_feature_log()
67
68	--- /examples/mailreader/CMakeLists.txt
69	+++ /examples/mailreader/CMakeLists.txt
70	@@ -19,7 +19,7 @@
71
72	target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
73	akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
74	- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
75	+ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
76	)
77
78	install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
79	--- /kaddressbook/CMakeLists.txt
80	+++ /kaddressbook/CMakeLists.txt
81	@@ -5,9 +5,9 @@
82	add_subdirectory( common )
83	add_subdirectory( interfaces )
84	add_subdirectory( printing )
85	-if(QGPGME_FOUND)
86	+if(KDE4_QGPGME_FOUND)
87	add_subdirectory( editors )
88	-endif(QGPGME_FOUND)
89	+endif(KDE4_QGPGME_FOUND)
90	add_subdirectory( views )
91	add_subdirectory( features )
92	add_subdirectory( kcmconfigs )
93	--- /kaddressbook/xxport/CMakeLists.txt
94	+++ /kaddressbook/xxport/CMakeLists.txt
95	@@ -22,7 +22,7 @@
96
97
98	########### next target ###############
99	-if(QGPGME_FOUND)
100	+if(KDE4_QGPGME_FOUND)
101	set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
102
103
104	@@ -30,10 +30,10 @@
105
106
107
108	-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
109	+target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
110
111	install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
112	-endif(QGPGME_FOUND)
113	+endif(KDE4_QGPGME_FOUND)
114
115	########### next target ###############
116
117	--- /kleopatra/CMakeLists.txt
118	+++ /kleopatra/CMakeLists.txt
119	@@ -25,7 +25,7 @@
120	${CMAKE_SOURCE_DIR}/libkleo
121	${CMAKE_SOURCE_DIR}/libkdepim
122	${Boost_INCLUDE_DIR}
123	- ${QGPGME_INCLUDES}
124	+ ${KDE4_QGPGME_INCLUDE_DIR}
125	${GPGME_INCLUDES} )
126	if (USABLE_ASSUAN_FOUND)
127	if (ASSUAN2_FOUND)
128	@@ -321,7 +321,7 @@
129	set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
130	endif ( NOT KDE4_KCMUTILS_LIBS )
131
132	-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})
133	+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})
134	if ( USABLE_ASSUAN_FOUND )
135	target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
136	ENDIF ( USABLE_ASSUAN_FOUND )
137	--- /kleopatra/kgpgconf/CMakeLists.txt
138	+++ /kleopatra/kgpgconf/CMakeLists.txt
139	@@ -21,7 +21,7 @@
140	kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
141
142	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
143	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
144	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
145
146	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
147
148	--- /kleopatra/kwatchgnupg/CMakeLists.txt
149	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
150	@@ -26,7 +26,7 @@
151	set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
152	endif ( NOT KDE4_KCMUTILS_LIBS )
153
154	-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
155	+target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
156
157	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
158
159	--- /kleopatra/tests/CMakeLists.txt
160	+++ /kleopatra/tests/CMakeLists.txt
161	@@ -40,7 +40,7 @@
162	add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
163	add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
164	kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
165	-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
166	+target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
167
168	########### next target ###############
169
170	@@ -67,9 +67,9 @@
171	endif ( ASSUAN2_FOUND )
172
173	if(WIN32)
174	- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
175	+ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
176	else(WIN32)
177	- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
178	+ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
179	endif(WIN32)
180	if (KDEPIM_ONLY_KLEO)
181	install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
182	--- /kmail/CMakeLists.txt
183	+++ /kmail/CMakeLists.txt
184	@@ -371,7 +371,7 @@
185	${KDE4_KPARTS_LIBRARY}
186	${KDE4_KRESOURCES_LIBRARY}
187	kleo
188	- ${QGPGME_LIBRARIES}
189	+ ${KDE4_QGPGME_LIBRARIES}
190	mimelib
191	ksieve
192	kpgp
193	--- /kontact/plugins/CMakeLists.txt
194	+++ /kontact/plugins/CMakeLists.txt
195	@@ -3,7 +3,7 @@
196	remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
197	add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
198
199	-if(QGPGME_FOUND)
200	+if(KDE4_QGPGME_FOUND)
201	if(BUILD_kmail)
202	add_subdirectory( kmail )
203	endif(BUILD_kmail)
204	@@ -15,7 +15,7 @@
205	add_subdirectory( specialdates )
206	add_subdirectory( planner )
207	endif()
208	-endif(QGPGME_FOUND)
209	+endif(KDE4_QGPGME_FOUND)
210	if (BUILD_knotes)
211	add_subdirectory( knotes )
212	endif (BUILD_knotes)
213	--- /libkleo/CMakeLists.txt
214	+++ /libkleo/CMakeLists.txt
215	@@ -99,7 +99,7 @@
216	)
217
218	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
219	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
220	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
221	if ( NOT KDEPIM_ONLY_KLEO )
222	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
223	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
224	--- /libkleo/tests/CMakeLists.txt
225	+++ /libkleo/tests/CMakeLists.txt
226	@@ -18,7 +18,7 @@
227
228	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
229
230	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
231	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
232
233
234	########### next target ###############
235	@@ -54,7 +54,7 @@
236
237	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
238
239	-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
240	+target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
241
242	########### next target ###############
243
244	--- /messageviewer/CMakeLists.txt
245	+++ /messageviewer/CMakeLists.txt
246	@@ -58,7 +58,7 @@
247	${KDEPIMLIBS_KMIME_LIBS}
248	${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
249	${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
250	- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
251	+ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
252	)
253
254	include_directories(

Line 0 Link Here

(-)a/kde-apps/kontact/kontact-4.14.11_pre20160211-r1.ebuild (+76 lines)
		1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KDE_HANDBOOK="optional"
		7	KMNAME="kdepim"
		8	EGIT_BRANCH="KDE/4.14"
		9	inherit kde4-meta
		10
		11	DESCRIPTION="KDE personal information manager"
		12	HOMEPAGE="https://www.kde.org/applications/office/kontact/"
		13	COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
		14	SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
		15
		16	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
		17	IUSE="debug"
		18
		19	DEPEND="
		20	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3)
		21	$(add_kdeapps_dep kdepim-common-libs)
		22	"
		23	RDEPEND="${DEPEND}"
		24
		25	KMLOADLIBS="kdepim-common-libs"
		26	KMSAVELIBS="true"
		27
		28	# We remove plugins that are related to external kdepim programs. This way
		29	# kontact doesn't have to depend on all programs it has plugins for.
		30	# kcontactmanager gone from kdesvn
		31	#
		32	KMEXTRACTONLY="
		33	kontact/plugins/akregator/
		34	kontact/plugins/kaddressbook/
		35	kontact/plugins/kjots/
		36	kontact/plugins/kmail/
		37	kontact/plugins/knode/
		38	kontact/plugins/knotes/
		39	kontact/plugins/korganizer/
		40	kontact/plugins/ktimetracker/
		41	kontact/plugins/planner/
		42	kontact/plugins/specialdates/
		43	libkdepimdbusinterfaces/
		44	"
		45
		46	src_unpack() {
		47	if use handbook; then
		48	KMEXTRA+="
		49	doc/kontact-admin/
		50	"
		51	fi
		52
		53	kde4-meta_src_unpack
		54	}
		55
		56	strip_patch_hunks_for_nonexistent_files() {
		57	local input_file="$1"
		58	local output_file="$2"
		59
		60	local line changed_file
		61	while IFS=$'\n' read -r line; do
		62	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
		63	if [[ -f "${changed_file}" ]]; then
		64	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
65	fi
66	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
67	}
68
69	src_prepare() {
70	find "(" -name ".cpp" -o -name ".h" ")" -exec \
71	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
72	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
73	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
74
75	kde4-meta_src_prepare
76	}

Line 0 Link Here

(-)a/kde-apps/kontact/kontact-4.4.2016.01-r1.ebuild (-2 / +73 lines)
0	-	1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KMNAME="kdepim"
		7	KDE_HANDBOOK=optional
		8	inherit kde4-meta
		9
		10	DESCRIPTION="KDE personal information manager (noakonadi branch)"
		11	HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
		12	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
		13	IUSE="debug"
		14
		15	DEPEND="
		16	$(add_kdeapps_dep kdepimlibs '' 4.14.10-r3)
		17	$(add_kdeapps_dep libkdepim '' 4.4.2015)
		18	"
		19	RDEPEND="${DEPEND}"
		20
		21	KMLOADLIBS="libkdepim"
		22	KMSAVELIBS="true"
		23
		24	# We remove plugins that are related to external kdepim programs. This way
		25	# kontact doesn't have to depend on all programs it has plugins for.
		26	# kcontactmanager gone from kdesvn
		27	#
		28	# xml targets from kmail/ are being uncommented by kde4-meta.eclass
		29	KMEXTRACTONLY="
		30	kmail/
		31	kontact/plugins/akregator/
		32	kontact/plugins/kaddressbook/
		33	kontact/plugins/kjots/
		34	kontact/plugins/kmail/
		35	kontact/plugins/knode/
		36	kontact/plugins/knotes/
		37	kontact/plugins/korganizer/
		38	kontact/plugins/ktimetracker/
		39	kontact/plugins/planner/
		40	kontact/plugins/specialdates/
		41	"
		42
		43	src_unpack() {
		44	if use handbook; then
		45	KMEXTRA+="
		46	doc/kontact-admin/
		47	"
		48	fi
		49
		50	kde4-meta_src_unpack
		51	}
		52
		53	strip_patch_hunks_for_nonexistent_files() {
		54	local input_file="$1"
		55	local output_file="$2"
		56
		57	local line changed_file
		58	while IFS=$'\n' read -r line; do
		59	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
		60	if [[ -f "${changed_file}" ]]; then
		61	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
		62	fi
		63	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
		64	}
		65
66	src_prepare() {
67	find "(" -name ".cpp" -o -name ".h" ")" -exec \
68	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
69	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
70	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
71
72	kde4-meta_src_prepare
73	}
1	references for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.	74	references for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.
2	--
3	...0211-update_gpgme++_and_qgpgme_references.patch \| 348 +++++++++++++++++++++	75	...0211-update_gpgme++_and_qgpgme_references.patch \| 348 +++++++++++++++++++++
4	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++	76	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++
5	.../korganizer-4.14.11_pre20160211-r1.ebuild \| 111 +++++++	77	.../korganizer-4.14.11_pre20160211-r1.ebuild \| 111 +++++++
6	.../korganizer/korganizer-4.4.2016.01-r1.ebuild \| 80 +++++	78	.../korganizer/korganizer-4.4.2016.01-r1.ebuild \| 80 +++++
7	4 files changed, 793 insertions(+)	79	4 files changed, 793 insertions(+)
8	create mode 100644 kde-apps/korganizer/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch	80	create mode 100644 kde-apps/korganizer/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch
9	create mode 100644 kde-apps/korganizer/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch	81	create mode 100644 kde-apps/korganizer/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
10	create mode 100644 kde-apps/korganizer/korganizer-4.14.11_pre20160211-r1.ebuild	82	create mode 100644 kde-apps/korganizer/korganizer-4.14.11_pre20160211-r1.ebuild
11	create mode 100644 kde-apps/korganizer/korganizer-4.4.2016.01-r1.ebuild	83	create mode 100644 kde-apps/korganizer/korganizer-4.4.2016.01-r1.ebuild

Line 0 Link Here

(-)a/kde-apps/korganizer/files/kdepim-4.14.11_pre20160211-update_gpgme++_and_qgpgme_references.patch (+348 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -153,8 +153,8 @@
		4
		5	# If the KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ 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.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -175,8 +175,8 @@
		15	find_package(ZLIB)
		16	set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED)
		17
		18	- find_package(QGpgme)
		19	- 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")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	find_package(Grantlee 0.4.0 QUIET CONFIG)
		24	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)." )
		25	@@ -253,13 +253,13 @@
		26	add_subdirectory(messagelist)
		27	add_subdirectory(templateparser)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if(Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif()
		34	endif()
		35
		36	- # The following components depend on QGpgME.
		37	+ # The following components depend on KDE4_QGpgME.
		38	add_subdirectory(messageviewer)
		39	macro_optional_add_subdirectory(messagecomposer)
		40	add_subdirectory(pimcommon)
		41	--- /examples/etm_usage/CMakeLists.txt
		42	+++ /examples/etm_usage/CMakeLists.txt
		43	@@ -45,7 +45,7 @@
		44	${KDEPIMLIBS_AKONADI_LIBS}
		45	${KDEPIMLIBS_KABC_LIBS}
		46	${KDEPIMLIBS_KMIME_LIBS}
		47	- ${KDEPIMLIBS_QGPGME_LIBSS}
		48	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		49	akonadi_next
		50	kdepim
		51	kleo
		52	--- /examples/mailreader/CMakeLists.txt
		53	+++ /examples/mailreader/CMakeLists.txt
		54	@@ -25,7 +25,7 @@
		55	${KDE4_KDEUI_LIBS}
		56	${KDEPIMLIBS_AKONADI_KMIME_LIBS}
		57	${KDEPIMLIBS_AKONADI_LIBS}
		58	- ${KDEPIMLIBS_QGPGME_LIBS}
		59	+ ${KDEPIMLIBS_KDE4_QGPGME_LIBS}
		60	akonadi_next
		61	kdepim
		62	kleo
		63	--- /kaddressbook/CMakeLists.txt
		64	+++ /kaddressbook/CMakeLists.txt
65	@@ -28,8 +28,8 @@
66	add_subdirectory(icons)
67	add_subdirectory(printing)
68	add_subdirectory(tests)
69	-if(QGPGME_FOUND)
70	- add_definitions(-DQGPGME_FOUND)
71	+if(KDE4_QGPGME_FOUND)
72	+ add_definitions(-DKDE4_QGPGME_FOUND)
73	endif()
74
75	set(kaddressbook_sendmail_SRCS
76	@@ -166,8 +166,8 @@
77	add_subdirectory(gravatar/autotests)
78	add_subdirectory(gravatar/tests)
79
80	-if(QGPGME_FOUND)
81	- target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
82	+if(KDE4_QGPGME_FOUND)
83	+ target_link_libraries(kaddressbookprivate ${KDE4_QGPGME_LIBRARIES})
84	endif()
85
86	if(PRISON_FOUND)
87	@@ -200,8 +200,8 @@
88	grantleetheme
89	)
90
91	-if(QGPGME_FOUND)
92	- target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
93	+if(KDE4_QGPGME_FOUND)
94	+ target_link_libraries(kaddressbook ${KDE4_QGPGME_LIBRARIES})
95	endif()
96
97	install(TARGETS kaddressbook ${INSTALL_TARGETS_DEFAULT_ARGS})
98	--- /kaddressbook/xxport/vcard/vcard_xxport.cpp
99	+++ /kaddressbook/xxport/vcard/vcard_xxport.cpp
100	@@ -26,12 +26,12 @@
101
102	#include <kaddressbookgrantlee/widget/grantleecontactviewer.h>
103
104	-#ifdef QGPGME_FOUND
105	+#ifdef KDE4_QGPGME_FOUND
106	#include <kde4_gpgme++/context.h>
107	#include <kde4_gpgme++/data.h>
108	#include <kde4_gpgme++/key.h>
109	#include <kde4_qgpgme/dataprovider.h>
110	-#endif // QGPGME_FOUND
111	+#endif // KDE4_QGPGME_FOUND
112
113	#include <KABC/VCardConverter>
114
115	@@ -409,7 +409,7 @@
116
117	void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Type type ) const
118	{
119	-#ifdef QGPGME_FOUND
120	+#ifdef KDE4_QGPGME_FOUND
121	const QString fingerprint = addr.custom( QLatin1String("KADDRESSBOOK"),
122	( type == KABC::Key::PGP ? QLatin1String("OPENPGPFP") : QLatin1String("SMIMEFP") ) );
123	if ( fingerprint.isEmpty() ) {
124	--- /kleopatra/CMakeLists.txt
125	+++ /kleopatra/CMakeLists.txt
126	@@ -37,7 +37,7 @@
127	${CMAKE_SOURCE_DIR}/libkdepim
128	${CMAKE_SOURCE_DIR}/mobile/lib
129	${Boost_INCLUDE_DIR}
130	- ${QGPGME_INCLUDES}
131	+ ${KDE4_QGPGME_INCLUDE_DIR}
132	${GPGME_INCLUDES}
133	)
134
135	@@ -367,7 +367,7 @@
136	target_link_libraries(kleopatra_bin
137	${_kleopatra_extra_libs}
138	kleo
139	- ${QGPGME_LIBRARIES}
140	+ ${KDE4_QGPGME_LIBRARIES}
141	${KDE4_KDEUI_LIBS}
142	${KDEPIMLIBS_KMIME_LIBS}
143	${KDE4_KCMUTILS_LIBS}
144	--- /kleopatra/kgpgconf/CMakeLists.txt
145	+++ /kleopatra/kgpgconf/CMakeLists.txt
146	@@ -21,6 +21,6 @@
147
148	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
149
150	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
151	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
152
153	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
154	--- /kleopatra/kwatchgnupg/CMakeLists.txt
155	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
156	@@ -22,7 +22,7 @@
157	target_link_libraries(kwatchgnupg
158	${KDE4_KDEUI_LIBS}
159	kleo
160	- ${QGPGME_LIBRARIES}
161	+ ${KDE4_QGPGME_LIBRARIES}
162	)
163
164	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
165	--- /kleopatra/tests/CMakeLists.txt
166	+++ /kleopatra/tests/CMakeLists.txt
167	@@ -62,7 +62,7 @@
168	${QT_QTCORE_LIBRARY}
169	${QT_QTGUI_LIBRARY}
170	${KDE4_KDECORE_LIBS}
171	- ${QGPGME_LIBRARIES}
172	+ ${KDE4_QGPGME_LIBRARIES}
173	)
174
175	########### next target ###############
176	@@ -100,13 +100,13 @@
177	if(WIN32)
178	target_link_libraries(test_uiserver
179	${ASSUAN_VANILLA_LIBRARIES}
180	- ${QGPGME_LIBRARIES}
181	+ ${KDE4_QGPGME_LIBRARIES}
182	ws2_32
183	)
184	else()
185	target_link_libraries(test_uiserver
186	${ASSUAN_PTHREAD_LIBRARIES}
187	- ${QGPGME_LIBRARIES}
188	+ ${KDE4_QGPGME_LIBRARIES}
189	)
190	endif()
191
192	--- /kmail/CMakeLists.txt
193	+++ /kmail/CMakeLists.txt
194	@@ -315,7 +315,7 @@
195	${KDEPIMLIBS_KRESOURCES_LIBS}
196	${KDE4_KCMUTILS_LIBS}
197	kleo
198	- ${QGPGME_LIBRARIES}
199	+ ${KDE4_QGPGME_LIBRARIES}
200	ksieve
201	ksieveui
202	kpgp
203	--- /kmail/kcm_kpimidentities/CMakeLists.txt
204	+++ /kmail/kcm_kpimidentities/CMakeLists.txt
205	@@ -17,7 +17,7 @@
206	kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
207	kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
208	target_link_libraries(kcm_kpimidentities
209	- ${KDEPIMLIBS_GPGMEPP_LIBS}
210	+ ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS}
211	${KDEPIMLIBS_AKONADI_LIBS}
212	${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
213	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
214	--- /kontact/plugins/CMakeLists.txt
215	+++ /kontact/plugins/CMakeLists.txt
216	@@ -6,7 +6,7 @@
217	)
218
219
220	-if(QGPGME_FOUND)
221	+if(KDE4_QGPGME_FOUND)
222	if(BUILD_kmail)
223	add_subdirectory(kmail)
224	endif()
225	--- /libkleo/CMakeLists.txt
226	+++ /libkleo/CMakeLists.txt
227	@@ -104,7 +104,7 @@
228	)
229
230	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
231	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} pimcommon)
232	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} pimcommon)
233	if ( NOT KDEPIM_ONLY_KLEO )
234	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
235	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
236	--- /libkleo/tests/CMakeLists.txt
237	+++ /libkleo/tests/CMakeLists.txt
238	@@ -12,7 +12,7 @@
239	kleo
240	${KDE4_KDECORE_LIBS}
241	${KDE4_KDEUI_LIBS}
242	- ${QGPGME_LIBRARIES}
243	+ ${KDE4_QGPGME_LIBRARIES}
244	${QT_QTGUI_LIBRARY} )
245	endif ()
246
247	@@ -25,7 +25,7 @@
248
249	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
250
251	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
252	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
253
254
255	########### next target ###############
256	@@ -35,7 +35,7 @@
257
258	kde4_add_executable(test_keyselectiondialog TEST ${test_keyselectiondialog_SRCS})
259
260	-target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
261	+target_link_libraries(test_keyselectiondialog kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
262	endif ()
263
264	########### next target ###############
265	@@ -45,7 +45,7 @@
266
267	kde4_add_executable(test_cryptoconfig TEST ${test_cryptoconfig_SRCS})
268
269	-target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
270	+target_link_libraries(test_cryptoconfig kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
271
272	########### next target ###############
273
274	@@ -63,7 +63,7 @@
275
276	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
277
278	-target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
279	+target_link_libraries(test_jobs kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
280
281	########### next target ###############
282
283	--- /messagecomposer/CMakeLists.txt
284	+++ /messagecomposer/CMakeLists.txt
285	@@ -123,7 +123,7 @@
286
287	kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
288	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}
289	- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
290	+ messagecore messageviewer templateparser kleo kdepim ${KDE4_QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
291
292	set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
293
294	--- /messagecomposer/tests/CMakeLists.txt
295	+++ /messagecomposer/tests/CMakeLists.txt
296	@@ -41,7 +41,7 @@
297	${QT_QTGUI_LIBRARY}
298	${QT_QTCORE_LIBRARY}
299	${KDE4_KDEUI_LIBS}
300	- ${QGPGME_LIBRARIES}
301	+ ${KDE4_QGPGME_LIBRARIES}
302	)
303	endmacro()
304
305	--- /messageviewer/CMakeLists.txt
306	+++ /messageviewer/CMakeLists.txt
307	@@ -206,7 +206,7 @@
308	${KDEPIMLIBS_MAILTRANSPORT_LIBS}
309	${KDE4_KDEUI_LIBS}
310	${KDE4_KPRINTUTILS_LIBS}
311	- ${QGPGME_LIBRARIES}
312	+ ${KDE4_QGPGME_LIBRARIES}
313	${_mailwebview_lib}
314	${Grantlee_CORE_LIBRARIES}
315	${KDE4_KNEWSTUFF3_LIBS}
316	--- /messageviewer/tests/CMakeLists.txt
317	+++ /messageviewer/tests/CMakeLists.txt
318	@@ -20,7 +20,7 @@
319	target_link_libraries( ${_name}
320	messageviewer
321	kleo
322	- ${QGPGME_LIBRARIES}
323	+ ${KDE4_QGPGME_LIBRARIES}
324	${QT_QTTEST_LIBRARY}
325	${QT_QTCORE_LIBRARY}
326	${QT_QTWEBKIT_LIBRARY}
327	--- /templateparser/CMakeLists.txt
328	+++ /templateparser/CMakeLists.txt
329	@@ -49,7 +49,7 @@
330	kleo
331	kpgp
332	pimcommon
333	- ${QGPGME_LIBRARIES}
334	+ ${KDE4_QGPGME_LIBRARIES}
335	${QT_QTWEBKIT_LIBRARY}
336	)
337	set_target_properties(templateparser PROPERTIES
338	--- /templateparser/tests/CMakeLists.txt
339	+++ /templateparser/tests/CMakeLists.txt
340	@@ -18,7 +18,7 @@
341	kleo
342	templateparser
343	messageviewer
344	- ${QGPGME_LIBRARIES}
345	+ ${KDE4_QGPGME_LIBRARIES}
346	${QT_QTTEST_LIBRARY}
347	${QT_QTCORE_LIBRARY}
348	${QT_QTWEBKIT_LIBRARY}

Line 0 Link Here

(-)a/kde-apps/korganizer/korganizer-4.14.11_pre20160211-r1.ebuild (+111 lines)
		1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KDE_HANDBOOK="optional"
		7	KMNAME="kdepim"
		8	EGIT_BRANCH="KDE/4.14"
		9	inherit kde4-meta
		10
		11	DESCRIPTION="Personal Organizer by KDE"
		12	HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
		13	COMMIT_ID="2aec255c6465676404e4694405c153e485e477d9"
		14	SRC_URI="https://quickgit.kde.org/?p=kdepim.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
		15
		16	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
		17	IUSE="debug"
		18
		19	DEPEND="
		20	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160211-r3)
		21	$(add_kdeapps_dep kdepim-common-libs)
		22	sys-libs/zlib
		23	"
		24	RDEPEND="${DEPEND}
		25	$(add_kdeapps_dep ktimezoned '' 4.14.3)
		26	"
		27
		28	RESTRICT="test"
		29	# bug 393135
		30
		31	KMLOADLIBS="kdepim-common-libs"
		32
		33	KMEXTRA="
		34	korgac/
		35	"
		36	KMEXTRACTONLY="
		37	agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
		38	akonadi_next/
		39	calendarviews/
		40	kdgantt2/
		41	kmail/
		42	knode/org.kde.knode.xml
		43	libkdepimdbusinterfaces/
		44	libkleo/
		45	libkpgp/
		46	mailimporter/
		47	messagecomposer/
		48	"
		49	KMCOMPILEONLY="
		50	calendarsupport/
		51	grantleetheme/
		52	incidenceeditor-ng/
		53	kaddressbookgrantlee/
		54	mailcommon/
		55	messagecore/
		56	messageviewer/
		57	pimcommon/
		58	templateparser/
		59	"
		60
		61	src_unpack() {
		62	if use kontact; then
		63	KMEXTRA="${KMEXTRA}
		64	kontact/plugins/planner/
65	kontact/plugins/specialdates/
66	"
67	fi
68
69	kde4-meta_src_unpack
70	}
71
72	strip_patch_hunks_for_nonexistent_files() {
73	local input_file="$1"
74	local output_file="$2"
75
76	local line changed_file
77	while IFS=$'\n' read -r line; do
78	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
79	if [[ -f "${changed_file}" ]]; then
80	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
81	fi
82	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
83	}
84
85	src_prepare() {
86	find "(" -name ".cpp" -o -name ".h" ")" -exec \
87	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
88	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
89	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
90
91	use handbook && epatch "${FILESDIR}/${PN}-4.14.10-handbook.patch"
92
93	kde4-meta_src_prepare
94	}
95
96	src_install() {
97	kde4-meta_src_install
98	# colliding with kdepim-common-libs
99	rm -rf "${ED}"usr/share/kde4/servicetypes/calendarplugin.desktop \|\| die
100	rm -rf "${ED}"usr/share/kde4/servicetypes/calendardecoration.desktop \|\| die
101	}
102
103	pkg_postinst() {
104	kde4-meta_pkg_postinst
105
106	if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
107	echo
108	elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
109	echo
110	fi
111	}

Line 0 Link Here

(-)a/kde-apps/korganizer/korganizer-4.4.2016.01-r1.ebuild (-2 / +80 lines)
0	-	1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KMNAME="kdepim"
		7	KDE_HANDBOOK=optional
		8	inherit kde4-meta
		9
		10	DESCRIPTION="A Personal Organizer for KDE (noakonadi branch)"
		11	HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
		12	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
		13	IUSE="debug"
		14
		15	DEPEND="
		16	$(add_kdeapps_dep kdepimlibs '' 4.14.10-r3)
		17	$(add_kdeapps_dep libkdepim '' 4.4.2015)
		18	sys-libs/zlib
		19	"
		20	RDEPEND="${DEPEND}
		21	$(add_kdeapps_dep ktimezoned '' 4.14.3)
		22	"
		23
		24	KMLOADLIBS="libkdepim"
		25	KMEXTRA="kdgantt1"
		26
		27	# xml targets from kmail are being uncommented by kde4-meta.eclass
		28	KMEXTRACTONLY="
		29	kmail/
		30	knode/org.kde.knode.xml
		31	kaddressbook/org.kde.KAddressbook.Core.xml
		32	"
		33
		34	# bug 378151
		35	RESTRICT=test
		36
		37	src_unpack() {
		38	if use kontact; then
		39	KMEXTRA="${KMEXTRA}
		40	kontact/plugins/planner/
		41	kontact/plugins/specialdates/
		42	"
		43	fi
		44
		45	kde4-meta_src_unpack
		46	}
		47
		48	strip_patch_hunks_for_nonexistent_files() {
		49	local input_file="$1"
		50	local output_file="$2"
		51
		52	local line changed_file
		53	while IFS=$'\n' read -r line; do
		54	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
		55	if [[ -f "${changed_file}" ]]; then
		56	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
		57	fi
		58	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
		59	}
		60
		61	src_prepare() {
		62	find "(" -name ".cpp" -o -name ".h" ")" -exec \
		63	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
		64	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		65	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
66
67	use handbook && epatch "${FILESDIR}/${PN}-4.4.2015.06-handbook.patch"
68
69	kde4-meta_src_prepare
70	}
71
72	pkg_postinst() {
73	kde4-meta_pkg_postinst
74
75	if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
76	echo
77	elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
78	echo
79	fi
80	}
1	for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.	81	for compatibility with >=kde-apps/kdepimlibs-4.14.10-r3.
2	--
3	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++++++++	82	...6.01-update_gpgme++_and_qgpgme_references.patch \| 254 +++++++++++++++++++++
4	kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild \| 45 ++++	83	kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild \| 45 ++++
5	2 files changed, 299 insertions(+)	84	2 files changed, 299 insertions(+)
6	create mode 100644 kde-apps/libkleo/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch	85	create mode 100644 kde-apps/libkleo/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch
7	create mode 100644 kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild	86	create mode 100644 kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild

Line 0 Link Here

(-)a/kde-apps/libkleo/files/kdepim-4.4.2016.01-update_gpgme++_and_qgpgme_references.patch (+254 lines)
		1	--- /CMakeLists.txt
		2	+++ /CMakeLists.txt
		3	@@ -70,8 +70,8 @@
		4
		5	# The KDEPIM_ONLY_KLEO option is true
		6	if(KDEPIM_ONLY_KLEO)
		7	- find_package(QGpgme)
		8	- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" TRUE "" "QGpgME is required to build Kleopatra.")
		9	+ find_package(KDE4_QGpgme)
		10	+ macro_log_feature(KDE4_QGPGME_FOUND "KDE4_QGpgME" "The KDE4_QGpgME library" "http://www.kde.org" TRUE "" "KDE4_QGpgME is required to build Kleopatra.")
		11
		12	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
		13	include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR})
		14	@@ -96,8 +96,8 @@
		15	find_package(Strigi)
		16	macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" TRUE "" "")
		17
		18	- find_package(QGpgme)
		19	- macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
		20	+ find_package(KDE4_QGpgme)
		21	+ 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")
		22
		23	set(SDO_MIN_VERSION 0.2)
		24	set(SOPRANO_MIN_VERSION 2.3.70)
		25	@@ -188,12 +188,12 @@
		26	add_subdirectory(messagecore)
		27	add_subdirectory(messagelist)
		28
		29	- if(QGPGME_FOUND)
		30	+ if(KDE4_QGPGME_FOUND)
		31	if (Boost_TOPOLOGICAL_SORT_DIR)
		32	macro_optional_add_subdirectory(kleopatra)
		33	endif(Boost_TOPOLOGICAL_SORT_DIR)
		34	macro_optional_add_subdirectory(wizards)
		35	- # The following components depend on QGpgME.
		36	+ # The following components depend on KDE4_QGpgME.
		37	add_subdirectory(messageviewer)
		38	macro_optional_add_subdirectory(kmail)
		39
		40	@@ -214,7 +214,7 @@
		41	# include( SopranoAddOntology )
		42	# add_subdirectory( ontologies )
		43	# add_subdirectory( nepomuk_email_feeder )
		44	- endif(QGPGME_FOUND)
		45	+ endif(KDE4_QGPGME_FOUND)
		46
		47	if(KDEPIM_BUILD_EVERYTHING)
		48	macro_optional_add_subdirectory(knode)
		49	@@ -254,13 +254,13 @@
		50	macro_optional_add_subdirectory(doc)
		51
		52
		53	-# We really want to encourage users to enable/install QGpgME from kdepimlibs
		54	-if(NOT QGPGME_FOUND)
		55	- # Users must be aware that QGpgMe is really needed
		56	- message(STATUS "* WARNING: QGpgME is not installed on your system *")
		57	+# We really want to encourage users to enable/install KDE4_QGpgME from kdepimlibs
		58	+if(NOT KDE4_QGPGME_FOUND)
		59	+ # Users must be aware that KDE4_QGpgMe is really needed
		60	+ message(STATUS "* WARNING: KDE4_QGpgME is not installed on your system *")
		61	message(STATUS "* It is required if you want to use KMail, KOrganizer or Kleopatra *")
		62	message(STATUS "* You are really encouraged to install it *")
		63	-endif(NOT QGPGME_FOUND)
		64	+endif(NOT KDE4_QGPGME_FOUND)
65	# All done, let's display what we found...
66	macro_display_feature_log()
67
68	--- /examples/mailreader/CMakeLists.txt
69	+++ /examples/mailreader/CMakeLists.txt
70	@@ -19,7 +19,7 @@
71
72	target_link_libraries(akonadimailreader messageviewer messagelist kdepim kpgp kleo akonadi-kde
73	akonadi-kmime akonadi_next ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS}
74	- ${KDE4_KTNEF_LIBRARY} ${QGPGME_LIBRARIES}
75	+ ${KDE4_KTNEF_LIBRARY} ${KDE4_QGPGME_LIBRARIES}
76	)
77
78	install(TARGETS akonadimailreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
79	--- /kaddressbook/CMakeLists.txt
80	+++ /kaddressbook/CMakeLists.txt
81	@@ -5,9 +5,9 @@
82	add_subdirectory( common )
83	add_subdirectory( interfaces )
84	add_subdirectory( printing )
85	-if(QGPGME_FOUND)
86	+if(KDE4_QGPGME_FOUND)
87	add_subdirectory( editors )
88	-endif(QGPGME_FOUND)
89	+endif(KDE4_QGPGME_FOUND)
90	add_subdirectory( views )
91	add_subdirectory( features )
92	add_subdirectory( kcmconfigs )
93	--- /kaddressbook/xxport/CMakeLists.txt
94	+++ /kaddressbook/xxport/CMakeLists.txt
95	@@ -22,7 +22,7 @@
96
97
98	########### next target ###############
99	-if(QGPGME_FOUND)
100	+if(KDE4_QGPGME_FOUND)
101	set(kaddrbk_vcard_xxport_PART_SRCS vcard_xxport.cpp )
102
103
104	@@ -30,10 +30,10 @@
105
106
107
108	-target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} )
109	+target_link_libraries(kaddrbk_vcard_xxport kaddressbookprivate kabinterfaces kabcommon kdepim ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} )
110
111	install(TARGETS kaddrbk_vcard_xxport DESTINATION ${PLUGIN_INSTALL_DIR})
112	-endif(QGPGME_FOUND)
113	+endif(KDE4_QGPGME_FOUND)
114
115	########### next target ###############
116
117	--- /kleopatra/CMakeLists.txt
118	+++ /kleopatra/CMakeLists.txt
119	@@ -25,7 +25,7 @@
120	${CMAKE_SOURCE_DIR}/libkleo
121	${CMAKE_SOURCE_DIR}/libkdepim
122	${Boost_INCLUDE_DIR}
123	- ${QGPGME_INCLUDES}
124	+ ${KDE4_QGPGME_INCLUDE_DIR}
125	${GPGME_INCLUDES} )
126	if (USABLE_ASSUAN_FOUND)
127	if (ASSUAN2_FOUND)
128	@@ -321,7 +321,7 @@
129	set( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
130	endif ( NOT KDE4_KCMUTILS_LIBS )
131
132	-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})
133	+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})
134	if ( USABLE_ASSUAN_FOUND )
135	target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
136	ENDIF ( USABLE_ASSUAN_FOUND )
137	--- /kleopatra/kgpgconf/CMakeLists.txt
138	+++ /kleopatra/kgpgconf/CMakeLists.txt
139	@@ -21,7 +21,7 @@
140	kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
141
142	kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
143	-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
144	+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
145
146	install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
147
148	--- /kleopatra/kwatchgnupg/CMakeLists.txt
149	+++ /kleopatra/kwatchgnupg/CMakeLists.txt
150	@@ -26,7 +26,7 @@
151	set ( KDE4_KCMUTILS_LIBS ${KDE4_KUTILS_LIBS} )
152	endif ( NOT KDE4_KCMUTILS_LIBS )
153
154	-target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_GPGMEPP_LIBS})
155	+target_link_libraries(kwatchgnupg ${KDE4_KDEUI_LIBS} kleo ${KDEPIMLIBS_KDE4_GPGMEPP_LIBS})
156
157	install(TARGETS kwatchgnupg ${INSTALL_TARGETS_DEFAULT_ARGS})
158
159	--- /kleopatra/tests/CMakeLists.txt
160	+++ /kleopatra/tests/CMakeLists.txt
161	@@ -40,7 +40,7 @@
162	add_definitions( -DKLEO_TEST_GNUPGHOME=\\"${CMAKE_CURRENT_SOURCE_DIR}/gnupg_home\\" )
163	add_definitions( -DKLEO_TEST_DATADIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
164	kde4_add_unit_test(test_verify TESTNAME kleo-verifytest ${test_verify_SRCS})
165	-target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${QGPGME_LIBRARIES})
166	+target_link_libraries(test_verify kleo ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_QGPGME_LIBRARIES})
167
168	########### next target ###############
169
170	@@ -67,9 +67,9 @@
171	endif ( ASSUAN2_FOUND )
172
173	if(WIN32)
174	- target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${QGPGME_LIBRARIES} ws2_32)
175	+ target_link_libraries(test_uiserver ${ASSUAN_VANILLA_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} ws2_32)
176	else(WIN32)
177	- target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${QGPGME_LIBRARIES} )
178	+ target_link_libraries(test_uiserver ${ASSUAN_PTHREAD_LIBRARIES} ${KDE4_QGPGME_LIBRARIES} )
179	endif(WIN32)
180	if (KDEPIM_ONLY_KLEO)
181	install( TARGETS test_uiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
182	--- /kmail/CMakeLists.txt
183	+++ /kmail/CMakeLists.txt
184	@@ -371,7 +371,7 @@
185	${KDE4_KPARTS_LIBRARY}
186	${KDE4_KRESOURCES_LIBRARY}
187	kleo
188	- ${QGPGME_LIBRARIES}
189	+ ${KDE4_QGPGME_LIBRARIES}
190	mimelib
191	ksieve
192	kpgp
193	--- /kontact/plugins/CMakeLists.txt
194	+++ /kontact/plugins/CMakeLists.txt
195	@@ -3,7 +3,7 @@
196	remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
197	add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
198
199	-if(QGPGME_FOUND)
200	+if(KDE4_QGPGME_FOUND)
201	if(BUILD_kmail)
202	add_subdirectory( kmail )
203	endif(BUILD_kmail)
204	@@ -15,7 +15,7 @@
205	add_subdirectory( specialdates )
206	add_subdirectory( planner )
207	endif()
208	-endif(QGPGME_FOUND)
209	+endif(KDE4_QGPGME_FOUND)
210	if (BUILD_knotes)
211	add_subdirectory( knotes )
212	endif (BUILD_knotes)
213	--- /libkleo/CMakeLists.txt
214	+++ /libkleo/CMakeLists.txt
215	@@ -99,7 +99,7 @@
216	)
217
218	set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS})
219	-set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
220	+set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} )
221	if ( NOT KDEPIM_ONLY_KLEO )
222	set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_ui_SRCS} ${libkleo_backend_chiasmus_SRCS} )
223	set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
224	--- /libkleo/tests/CMakeLists.txt
225	+++ /libkleo/tests/CMakeLists.txt
226	@@ -18,7 +18,7 @@
227
228	kde4_add_executable(test_keygen TEST ${test_keygen_SRCS})
229
230	-target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
231	+target_link_libraries(test_keygen kleo ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
232
233
234	########### next target ###############
235	@@ -54,7 +54,7 @@
236
237	kde4_add_executable(test_jobs TEST ${test_jobs_SRCS})
238
239	-target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES})
240	+target_link_libraries(test_jobs kleo ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_QGPGME_LIBRARIES})
241
242	########### next target ###############
243
244	--- /messageviewer/CMakeLists.txt
245	+++ /messageviewer/CMakeLists.txt
246	@@ -58,7 +58,7 @@
247	${KDEPIMLIBS_KMIME_LIBS}
248	${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_KABC_LIBS}
249	${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY}
250	- ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
251	+ ${KDE4_QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS}
252	)
253
254	include_directories(

Line 0 Link Here

(-)a/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild (-2 / +45 lines)
0	-	1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KMNAME="kdepim"
		7	inherit kde4-meta
		8
		9	DESCRIPTION="KDE library for encryption handling"
		10	HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
		11	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
		12	IUSE="debug"
		13
		14	DEPEND="
		15	app-crypt/gpgme
		16	$(add_kdeapps_dep kdepimlibs '' 4.14.10-r3)
		17	"
		18	RDEPEND="${DEPEND}
		19	app-crypt/gnupg
		20	"
		21
		22	KMSAVELIBS="true"
		23	KMEXTRACTONLY="kleopatra/"
		24
		25	strip_patch_hunks_for_nonexistent_files() {
		26	local input_file="$1"
		27	local output_file="$2"
		28
		29	local line changed_file
		30	while IFS=$'\n' read -r line; do
		31	[[ "${line}" == "--- "* ]] && changed_file="${line#--- /}"
		32	if [[ -f "${changed_file}" ]]; then
		33	echo "${line}" >> "${output_file}" \|\| die "Writing to '${output_file}' failed"
		34	fi
		35	done < "${input_file}" \|\| die "Reading from '${input_file}' failed"
		36	}
		37
		38	src_prepare() {
		39	find "(" -name ".cpp" -o -name ".h" ")" -exec \
		40	sed -e 's:\(#[[:space:]]*include[[:space:]]\+[<"]\)\(gpgme++\\|qgpgme\)\(/\):\1kde4_\2\3:' -i {} + \|\| die
		41	strip_patch_hunks_for_nonexistent_files "${FILESDIR}/kdepim-${PV}-update_gpgme++_and_qgpgme_references.patch" "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		42	eapply "${T}/${P}-update_gpgme++_and_qgpgme_references.patch"
		43
		44	kde4-meta_src_prepare
		45	}
1	cryptography plugin.	46	cryptography plugin.
2	--
3	.../libkleo-4.4.2016.01-install_headers.patch \| 69 ++++++++++++++++++++++	47	.../libkleo-4.4.2016.01-install_headers.patch \| 69 ++++++++++++++++++++++
4	kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild \| 4 ++	48	kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild \| 4 ++
5	2 files changed, 73 insertions(+)	49	2 files changed, 73 insertions(+)
6	create mode 100644 kde-apps/libkleo/files/libkleo-4.4.2016.01-install_headers.patch	50	create mode 100644 kde-apps/libkleo/files/libkleo-4.4.2016.01-install_headers.patch

Line 0 Link Here

(-)a/kde-apps/libkleo/files/libkleo-4.4.2016.01-install_headers.patch (+69 lines)
		1	Install headers needed by Kopete's cryptography plugin.
		2
		3	--- /libkleo/CMakeLists.txt
		4	+++ /libkleo/CMakeLists.txt
		5	@@ -118,3 +118,64 @@
		6	install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS})
		7
		8	install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc )
		9	+
		10	+install( FILES
		11	+ kleo/abstractimportjob.h
		12	+ kleo/adduseridjob.h
		13	+ kleo/changeexpiryjob.h
		14	+ kleo/changeownertrustjob.h
		15	+ kleo/cryptobackend.h
		16	+ kleo/cryptobackendfactory.h
		17	+ kleo/cryptoconfig.h
		18	+ kleo/cryptplug.h
		19	+ kleo/cryptplugfactory.h
		20	+ kleo/cryptplugwrapper.h
		21	+ kleo/cryptplugwrapperlist.h
		22	+ kleo/decryptjob.h
		23	+ kleo/decryptverifyjob.h
		24	+ kleo/deletejob.h
		25	+ kleo/dn.h
		26	+ kleo/downloadjob.h
		27	+ kleo/encryptjob.h
		28	+ kleo/enum.h
		29	+ kleo/exportjob.h
		30	+ kleo/hierarchicalkeylistjob.h
		31	+ kleo/importfromkeyserverjob.h
		32	+ kleo/importjob.h
		33	+ kleo/job.h
		34	+ kleo/kconfigbasedkeyfilter.h
		35	+ kleo/keyfilter.h
		36	+ kleo/keyfiltermanager.h
		37	+ kleo/keygenerationjob.h
		38	+ kleo/keylistjob.h
		39	+ kleo/kleo_export.h
		40	+ kleo/multideletejob.h
		41	+ kleo/oidmap.h
		42	+ kleo/refreshkeysjob.h
		43	+ kleo/signencryptjob.h
		44	+ kleo/signjob.h
		45	+ kleo/signkeyjob.h
		46	+ kleo/specialjob.h
		47	+ kleo/verifydetachedjob.h
		48	+ kleo/verifyopaquejob.h
		49	+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel)
		50	+
		51	+install ( FILES
		52	+ ui/adddirectoryservicedialogimpl.h
		53	+ ui/backendconfigwidget.h
		54	+ ui/cryptoconfigdialog.h
		55	+ ui/cryptoconfigmodule.h
		56	+ ui/cryptoconfigmodule_p.h
		57	+ ui/directoryserviceswidget.h
		58	+ ui/dnattributeorderconfigwidget.h
		59	+ ui/filenamerequester.h
		60	+ ui/kdhorizontalline.h
		61	+ ui/keyapprovaldialog.h
		62	+ ui/keylistview.h
		63	+ ui/keyrequester.h
		64	+ ui/keyselectiondialog.h
65	+ ui/messagebox.h
66	+ ui/messagebox_p.h
67	+ ui/progressbar.h
68	+ ui/progressdialog.h
69	+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel)

Line 0 Link Here

(-)a/kde-apps/kopete/kopete-16.12.2-r3.ebuild (+165 lines)
		1	# Copyright 1999-2017 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5
		6	KDE_HANDBOOK="optional"
		7	inherit kde4-base
		8
		9	DESCRIPTION="KDE multi-protocol IM client"
		10	HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
		11	KEYWORDS="~amd64 ~arm ~x86"
		12	IUSE="debug ssl v4l"
		13
		14	# tests hang, last checked for 4.2.96
		15	RESTRICT+=" test"
		16
		17	# Available plugins
		18	#
		19	# addbookmarks: NO DEPS
		20	# alias: NO DEPS (disabled upstream)
		21	# autoreplace: NO DEPS
		22	# contactnotes: NO DEPS
		23	# cryptography: kde-apps/kdepim-common-libs:4 or kde-apps/libkleo:4
		24	# highlight: NO DEPS
		25	# history: NO DEPS
		26	# latex: virtual/latex as RDEPEND
		27	# nowlistening: NO DEPS
		28	# otr: libotr
		29	# pipes: NO DEPS
		30	# privacy: NO DEPS
		31	# statistics: dev-db/sqlite:3
		32	# texteffect: NO DEPS
		33	# translator: NO DEPS
		34	# urlpicpreview: NO DEPS
		35	# webpresence: libxml2 libxslt
		36	# NOTE: By default we enable all plugins that don't have any dependencies
		37	PLUGINS="+addbookmarks +autoreplace +contactnotes cryptography +highlight
		38	+history latex +nowlistening otr +pipes +privacy +statistics +texteffect
		39	+translator +urlpicpreview webpresence"
		40
		41	# Available protocols
		42	#
		43	# gadu: net-libs/libgadu @since 4.3
		44	# groupwise: app-crypt/qca:2
		45	# irc: NO DEPS, probably will fail so inform user about it
		46	# xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
		47	# jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
		48	# meanwhile: net-libs/meanwhile
		49	# oscar: NO DEPS
		50	# telepathy: net-libs/decibel
		51	# testbed: NO DEPS
		52	# winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
		53	# yahoo: media-libs/jasper
		54	# zeroconf (bonjour): NO DEPS
		55	PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
		56	testbed winpopup +xmpp yahoo zeroconf"
		57
		58	# disabled protocols
		59	# telepathy: net-libs/decibel
		60	# irc: NO DEPS
		61	# msn: net-libs/libmsn
		62	# qq: NO DEPS
		63
		64	IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
65
66	COMMONDEPEND="
67	$(add_kdeapps_dep kdepimlibs)
68	dev-libs/libpcre
69	>=dev-qt/qtgui-4.4.0:4[mng]
70	kde-frameworks/kdelibs:4[zeroconf?]
71	media-libs/phonon[qt4]
72	media-libs/qimageblitz
73	!aqua? (
74	x11-libs/libX11
75	x11-libs/libXScrnSaver
76	)
77	cryptography? (
78	\|\| (
79	$(add_kdeapps_dep kdepim-common-libs)
80	$(add_kdeapps_dep libkleo '' 4.4.2016.01-r1)
81	)
82	)
83	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
84	groupwise? ( app-crypt/qca:2[qt4(+)] )
85	jingle? (
86	dev-libs/expat
87	dev-libs/openssl:0
88	>=media-libs/mediastreamer-2.3.0
89	media-libs/speex
90	net-libs/libsrtp:=
91	net-libs/ortp:=
92	)
93	meanwhile? ( net-libs/meanwhile )
94	otr? ( >=net-libs/libotr-4.0.0 )
95	statistics? ( dev-db/sqlite:3 )
96	v4l? ( media-libs/libv4l )
97	webpresence? (
98	dev-libs/libxml2
99	dev-libs/libxslt
100	)
101	xmpp? (
102	app-crypt/qca:2[qt4(+)]
103	dev-libs/qjson
104	net-dns/libidn
105	sys-libs/zlib
106	)
107	yahoo? ( media-libs/jasper )
108	"
109	RDEPEND="${COMMONDEPEND}
110	latex? (
111	virtual/imagemagick-tools
112	virtual/latex-base
113	)
114	ssl? ( app-crypt/qca:2[ssl] )
115	winpopup? ( net-fs/samba )
116	"
117	DEPEND="${COMMONDEPEND}
118	jingle? ( dev-libs/jsoncpp )
119	!aqua? ( x11-proto/scrnsaverproto )
120	"
121
122	PATCHES=( "${FILESDIR}/${P}-CVE-2017-5593.patch" )
123
124	src_configure() {
125	local x x2
126	# Handle common stuff
127	local mycmakeargs=(
128	-DWITH_GOOGLETALK=$(usex jingle)
129	-DWITH_LiboRTP=$(usex jingle)
130	-DWITH_Mediastreamer=$(usex jingle)
131	-DWITH_Speex=$(usex jingle)
132	-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
133	)
134	# enable protocols
135	for x in ${PROTOCOLS}; do
136	case ${x/+/} in
137	zeroconf) x2=bonjour ;;
138	xmpp) x2=jabber ;;
139	*) x2=${x/+/} ;;
140	esac
141	mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
142	done
143
144	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF -DWITH_sms=OFF )
145
146	# enable plugins
147	for x in ${PLUGINS}; do
148	mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
149	done
150
151	kde4-base_src_configure
152	}
153
154	pkg_postinst() {
155	kde4-base_pkg_postinst
156
157	if ! use ssl; then
158	if use xmpp ; then # \|\| use irc; then
159	if ! has_version "app-crypt/qca:2[ssl]" ; then
160	elog "In order to use ssl in xmpp you'll need to"
161	elog "install app-crypt/qca package with USE=ssl."
162	fi
163	fi
164	fi
165	}