[gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/files/, kde-apps/kdepim/

2015-08-06 Thread Johannes Huber
commit: d042684fc50129848dff1ab8c75890e2c425b57e
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sun Jun 21 16:53:41 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Thu Aug  6 21:40:18 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d042684f

[kde-apps/kdepim] Add monolithic KDE PIM ebuild

Package-Manager: portage-2.2.20

 kde-apps/kdepim/files/FindGpgme.cmake | 387 ++
 kde-apps/kdepim/files/kdepim-find-gpgme.patch |  11 +
 kde-apps/kdepim/kdepim-.ebuild| 152 ++
 kde-apps/kdepim/metadata.xml  |  10 +
 4 files changed, 560 insertions(+)

diff --git a/kde-apps/kdepim/files/FindGpgme.cmake 
b/kde-apps/kdepim/files/FindGpgme.cmake
new file mode 100644
index 000..957900e
--- /dev/null
+++ b/kde-apps/kdepim/files/FindGpgme.cmake
@@ -0,0 +1,387 @@
+# - Try to find the gpgme library
+#
+# Algorithm:
+#  - Windows:
+#On Windows, there's three gpgme variants: gpgme{,-glib,-qt}.
+#- 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_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
+#
+#  GPGME_LIBRARY_DIR - the directory where the libraries are located
+
+#
+# THIS IS ALMOST A 1:1 COPY OF FindAssuan.cmake in kdepim.
+# Any changes here likely apply there, too.
+#
+
+# do away with crappy condition repetition on else/endfoo
+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_gpgme_saved 
${CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS} )
+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true )
+
+#if this is built-in, please replace, if it isn't, export into a 
MacroToBool.cmake of it's own
+macro( macro_bool_to_bool FOUND_VAR )
+  foreach( _current_VAR ${ARGN} )
+if ( ${FOUND_VAR} )
+  set( ${_current_VAR} TRUE )
+else()
+  set( ${_current_VAR} FALSE )
+endif()
+  endforeach()
+endmacro()
+
+#HACK: local copy...
+MACRO(MACRO_BOOL_TO_01 FOUND_VAR )
+   FOREACH (_current_VAR ${ARGN})
+  IF(${FOUND_VAR})
+ SET(${_current_VAR} 1)
+  ELSE(${FOUND_VAR})
+ SET(${_current_VAR} 0)
+  ENDIF(${FOUND_VAR})
+   ENDFOREACH(_current_VAR)
+ENDMACRO(MACRO_BOOL_TO_01)
+
+
+if ( WIN32 )
+
+  # On Windows, we don't have a gpgme-config script, so we need to
+  # look for the stuff ourselves:
+
+  # in cmake, AND and OR have the same precedence, there's no
+  # subexpressions, and expressions are evaluated short-circuit'ed
+  # IOW: CMake if() suxx.
+  # Starting with CMake 2.6.3 you can group if expressions with (), but we 
+  # 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 
)
+  set( _seem_to_have_cached_gpgme true )
+endif()
+  endif()
+
+  if ( _seem_to_have_cached_gpgme )
+
+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 )
+  set( GPGME_FOUND true )
+else()
+  set( GPGME_FOUND false )
+endif()
+
+  else()
+
+set( GPGME_FOUND false )
+set( GPGME_VANILLA_FOUND false )
+set( GPGME_GLIB_FOUNDfalse )
+set( GPGME_QT_FOUND  false )
+
+find_path( GPGME_INCLUDES gpgme.h
+  ${CMAKE_INCLUDE_PATH}
+  ${CMAKE_INSTALL_PREFIX}/include
+)
+
+find_library( _gpgme_vanilla_library NAMES gpgme libgpgme gpgme-11 
libgpgme-11
+  PATHS 
+${CMAKE_LIBRARY_PATH}
+${CMAKE_INSTALL_PREFIX}/lib
+)
+
+find_library( _gpgme_glib_libraryNAMES gpgme-glib libgpgme-glib 
gpgme-glib-11 libgpgme-glib-11
+  PATHS 
+${CMAKE_LIBRARY_PATH}
+${CMAKE_INSTALL_PREFIX}/lib
+)

[gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/files/, kde-apps/kdepim/

2015-08-06 Thread Johannes Huber
commit: 5923c3cbf35dc862fddbb1581777dce81f284fed
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Wed Jul 29 22:04:25 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Thu Aug  6 21:40:18 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5923c3cb

[kde-apps/kdepim] Add stable branch

Package-Manager: portage-2.2.20

 kde-apps/kdepim/files/kdepim-4.81-includes.patch |  32 +
 kde-apps/kdepim/kdepim-15.08.49..ebuild  | 157 +++
 2 files changed, 189 insertions(+)

diff --git a/kde-apps/kdepim/files/kdepim-4.81-includes.patch 
b/kde-apps/kdepim/files/kdepim-4.81-includes.patch
new file mode 100644
index 000..fb31985
--- /dev/null
+++ b/kde-apps/kdepim/files/kdepim-4.81-includes.patch
@@ -0,0 +1,32 @@
+From: Montel Laurent mon...@kde.org
+Date: Mon, 03 Aug 2015 05:38:26 +
+Subject: Add includes needs for gentoo dev
+X-Git-Url: 
http://quickgit.kde.org/?p=kdepim.gita=commitdiffh=34f28a4df9b3266be809bd8b3c338d91db0e3cf5
+---
+Add includes needs for gentoo dev
+---
+
+
+--- a/kleopatra/CMakeLists.txt
 b/kleopatra/CMakeLists.txt
+@@ -33,6 +33,7 @@
+   ${CMAKE_SOURCE_DIR}/libkleo
+   ${CMAKE_SOURCE_DIR}/libkdepim
+   ${Boost_INCLUDE_DIR}
++  ${GPGME_INCLUDES}
+ )
+ 
+ if(USABLE_ASSUAN_FOUND)
+
+--- a/messageviewer/CMakeLists.txt
 b/messageviewer/CMakeLists.txt
+@@ -27,6 +27,8 @@
+ check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
+ macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H)
+ configure_file(config-messageviewer.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-messageviewer.h)
++
++include_directories( ${GPGME_INCLUDES} )
+ 
+ if(BUILD_TESTING)
+add_subdirectory(autotests)
+

diff --git a/kde-apps/kdepim/kdepim-15.08.49..ebuild 
b/kde-apps/kdepim/kdepim-15.08.49..ebuild
new file mode 100644
index 000..5d8602e
--- /dev/null
+++ b/kde-apps/kdepim/kdepim-15.08.49..ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK=true
+KDE_TEST=true
+inherit kde5
+
+DESCRIPTION=Personal Information Management Suite
+HOMEPAGE=https://www.kde.org/applications/office/kontact/;
+KEYWORDS=
+
+PIM_FTS=akonadiconsole akregator blogilo console kaddressbook kalarm 
kleopatra kmail knotes kontact korganizer ktnef
+IUSE=designer google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})
+
+DEPEND=
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kauth)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kdewebkit)
+   $(add_frameworks_dep kdnssd)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep khtml)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep knewstuff)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktexteditor)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep kxmlrpcclient)
+   $(add_frameworks_dep sonnet)
+   $(add_kdeapps_dep akonadi)
+   $(add_kdeapps_dep akonadi-calendar)
+   $(add_kdeapps_dep akonadi-search)
+   $(add_kdeapps_dep gpgmepp)
+   $(add_kdeapps_dep kalarmcal)
+   $(add_kdeapps_dep kblog)
+   $(add_kdeapps_dep kcalcore)
+   $(add_kdeapps_dep kcontacts)
+   $(add_kdeapps_dep kdepimlibs)
+   $(add_kdeapps_dep kholidays)
+   $(add_kdeapps_dep kidentitymanagement)
+   $(add_kdeapps_dep kimap)
+   $(add_kdeapps_dep kldap)
+   $(add_kdeapps_dep kmailtransport)
+   $(add_kdeapps_dep kmbox)
+   $(add_kdeapps_dep kmime)
+   $(add_kdeapps_dep kontactinterface)
+   $(add_kdeapps_dep kpimtextedit)
+   $(add_kdeapps_dep ktnef)
+   $(add_kdeapps_dep syndication)
+   =app-crypt/gpgme-1.3.2
+   dev-libs/boost:=
+   dev-libs/libxslt
+   dev-qt/qtconcurrent:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtscript:5
+   dev-qt/qtsql:5
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   media-libs/phonon[qt5]
+   sys-libs/zlib
+   designer? (