commit: a73a4d0e2b4ef921a076c4f021503f4efdb12343
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 5 22:21:19 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 23:16:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a73a4d0e
kde-apps/kdepimlibs: Fix build with gpgme-1.8.0
Fake GPGME_PTHREAD_{FOUND,LIBRARIES} values for rdeps.
Gentoo-bug: 600510
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/kdepimlibs-4.14.11-gpgme-1.8.0.patch | 101 +++++++++++++++++++++
kde-apps/kdepimlibs/kdepimlibs-4.14.10-r3.ebuild | 62 +++++++++++++
.../kdepimlibs-4.14.11_pre20160211-r3.ebuild | 66 ++++++++++++++
3 files changed, 229 insertions(+)
diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-gpgme-1.8.0.patch
b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-gpgme-1.8.0.patch
new file mode 100644
index 00000000000..83a128c8f6c
--- /dev/null
+++ b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-gpgme-1.8.0.patch
@@ -0,0 +1,101 @@
+commit 0b684a86d8cf918a4c2ab047a4d6c3034a93c12b
+Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
+Date: Sun Mar 5 18:28:45 2017 +0100
+
+ Adapt to >=gpgme-1.8.0, need for -phtread is gone
+
+diff --git a/cmake/modules/FindGpgme.cmake b/cmake/modules/FindGpgme.cmake
+index 5da9a60..268314a 100644
+--- a/cmake/modules/FindGpgme.cmake
++++ b/cmake/modules/FindGpgme.cmake
+@@ -11,12 +11,12 @@
+ # - 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}.
++# There's also two variants: gpgme{,-pth}.
+ # - The variant used determines the multithreaded use possible:
+-# - gpgme: no multithreading support available
+-# - gpgme-pthread: multithreading available using POSIX threads
++# - gpgme: >=GpgME-1.8.0 multithreading support available
+ # - gpgme-pth: multithreading available using GNU PTH (cooperative
multithreading)
+-# - GPGME_{VANILLA,PTH,PTHREAD}_{FOUND,LIBRARIES} will be set for each of
the above
++# - GPGME_{VANILLA,PTH}_{FOUND,LIBRARIES} will be set for each of the above
++# - GPGME_PTHREAD_{FOUND,LIBRARIES} will be set for legacy compatibility
+ # - GPGME_INCLUDES is the same for all of the above
+ # - GPGME_FOUND is set if any of the above was found
+ #
+@@ -164,7 +164,7 @@ else() # not WIN32
+ 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_VANILLA_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 )
+@@ -189,7 +189,7 @@ else() # not WIN32
+
+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE
GPGME_VERSION )
+
+- set( _GPGME_MIN_VERSION "1.1.7" )
++ set( _GPGME_MIN_VERSION "1.7.99" )
+ if( ${GPGME_VERSION} VERSION_GREATER ${_GPGME_MIN_VERSION} )
+ set( _GPGME_INSTALLED_VERSION_OK TRUE )
+ endif()
+@@ -207,7 +207,7 @@ else() # not WIN32
+ set( _gpgme_config_vanilla_libs )
+ endif()
+
+- exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs
OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
++ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs
OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
+ if ( _ret )
+ set( _gpgme_config_pthread_libs )
+ endif()
+@@ -294,7 +294,7 @@ else() # not WIN32
+ # This comment above doesn't make sense, the four 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_PTHREAD_LIBRARIES ${GPGME_VANILLA_LIBRARIES} )
+ set( GPGME_PTH_LIBRARIES ${GPGME_PTH_LIBRARIES} )
+
+ if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
+@@ -319,7 +319,7 @@ else() # not WIN32
+
+ 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_VANILLA_FOUND HAVE_GPGME_PTHREAD )
+ macro_bool_to_01( GPGME_PTH_FOUND HAVE_GPGME_PTH )
+
+ endif() # WIN32 | Unix
+diff --git a/cmake/modules/FindQGpgme.cmake b/cmake/modules/FindQGpgme.cmake
+index 50013eb..4d94af6 100644
+--- a/cmake/modules/FindQGpgme.cmake
++++ b/cmake/modules/FindQGpgme.cmake
+@@ -12,13 +12,8 @@ find_package(Gpgme QUIET)
+
+ 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})
+@@ -34,7 +29,7 @@ if(GPGME_FOUND)
+ 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})
++ set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY}
${GPGME_VANILLA_LIBRARIES})
+ endif()
+
+ endif()
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r3.ebuild
b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r3.ebuild
new file mode 100644
index 00000000000..214ffd2b661
--- /dev/null
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r3.ebuild
@@ -0,0 +1,62 @@
+# 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}
+ !=kde-apps/kdepim-runtime-4.10*
+ !=kde-apps/kdepim-runtime-4.11*
+ !<kde-apps/kdepim-runtime-4.4.11.1-r2:4
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.14.11-boostincludes.patch"
+ "${FILESDIR}/${PN}-CVE-2016-7966-r1.patch"
+ "${FILESDIR}/${PN}-4.14.11-gpgme-1.8.0.patch"
+)
+
+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
+ rm "${ED}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides
with net-im/choqok
+
+ # contains constants/defines only
+ QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*'
-printf '/%P\n')"
+}
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r3.ebuild
b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r3.ebuild
new file mode 100644
index 00000000000..2a565133618
--- /dev/null
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r3.ebuild
@@ -0,0 +1,66 @@
+# 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}
+ !<kde-apps/kdepim-runtime-4.4.11.1-r2:4
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.14.11-boostincludes.patch"
+ "${FILESDIR}/${PN}-CVE-2016-7966-r1.patch"
+ "${FILESDIR}/${PN}-4.14.11-gpgme-1.8.0.patch"
+)
+
+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')"
+}
