[gentoo-commits] proj/kde:master commit in: kde-base/kleopatra/files/, kde-base/kleopatra/

[gentoo-commits] proj/kde:master commit in: kde-base/kleopatra/files/, kde-base/kleopatra/

[Michael Palimaka]

commit:     3fca84ae909088998849a7835d7c41c9894950d2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  4 17:45:25 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun  4 17:45:25 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3fca84ae

[kde-base/kleopatra] Import patch from Fedora to install headers needed by Kopete's cryptography plugin.

Package-Manager: portage-2.2.20

 .../files/kleopatra-install-headers.patch          | 48 ++++++++++++++++++++++
 kde-base/kleopatra/kleopatra-4.9999.ebuild         |  2 +
 2 files changed, 50 insertions(+)

diff --git a/kde-base/kleopatra/files/kleopatra-install-headers.patch b/kde-base/kleopatra/files/kleopatra-install-headers.patch
new file mode 100644
index 0000000..0478141
--- /dev/null
+++ b/kde-base/kleopatra/files/kleopatra-install-headers.patch
@@ -0,0 +1,48 @@
+Install headers needed by Kopete's cryptography plugin.
+
+Patch borrowed from Fedora.
+
+diff --git a/kleopatra/libkleopatraclient/CMakeLists.txt b/kleopatra/libkleopatraclient/CMakeLists.txt
+index 17b4980..690b00d 100644
+--- a/kleopatra/libkleopatraclient/CMakeLists.txt
++++ b/kleopatra/libkleopatraclient/CMakeLists.txt
+@@ -6,3 +6,7 @@ add_subdirectory(gui)
+ 
+ add_subdirectory(tests)
+ 
++install(
++  FILES kleopatraclient_export.h
++  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient
++  )
+diff --git a/kleopatra/libkleopatraclient/core/CMakeLists.txt b/kleopatra/libkleopatraclient/core/CMakeLists.txt
+index d4f1ea2..17a6eb5 100644
+--- a/kleopatra/libkleopatraclient/core/CMakeLists.txt
++++ b/kleopatra/libkleopatraclient/core/CMakeLists.txt
+@@ -63,3 +63,13 @@ else()
+ endif()
+ 
+ install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS})
++
++install(
++  FILES
++    initialization.h
++    command.h
++    selectcertificatecommand.h
++    signencryptfilescommand.h
++    decryptverifyfilescommand.h
++  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core
++  )
+diff --git a/kleopatra/libkleopatraclient/gui/CMakeLists.txt b/kleopatra/libkleopatraclient/gui/CMakeLists.txt
+index 3c5bab2..78dde2e 100644
+--- a/kleopatra/libkleopatraclient/gui/CMakeLists.txt
++++ b/kleopatra/libkleopatraclient/gui/CMakeLists.txt
+@@ -16,3 +16,9 @@ set_target_properties(kleopatraclientgui PROPERTIES
+ )
+ 
+ install(TARGETS kleopatraclientgui ${INSTALL_TARGETS_DEFAULT_ARGS})
++
++install(
++  FILES
++    certificaterequester.h
++  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui
++  )

diff --git a/kde-base/kleopatra/kleopatra-4.9999.ebuild b/kde-base/kleopatra/kleopatra-4.9999.ebuild
index ac84726..6dd87dd 100644
--- a/kde-base/kleopatra/kleopatra-4.9999.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.9999.ebuild
@@ -30,6 +30,8 @@ KMEXTRACTONLY="
 	libkleo/
 "
 
+PATCHES=( "${FILESDIR}/${P}-install-headers.patch" )
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA="

[gentoo-commits] proj/kde:master commit in: kde-base/kleopatra/files/, kde-base/kleopatra/

[Andreas Hüttel]

commit:     8878e3268f8b1f05832f58d32fe9caac67160a11
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  1 20:43:26 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul  1 20:43:59 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8878e326

[kde-base/kleopatra] Add 4.4-noakonadi snapshot

Package-Manager: portage-2.2.20

 .../files/kleopatra-4.4.2015.06-reenable.patch     | 13 +++++
 kde-base/kleopatra/kleopatra-4.4.2015.06.ebuild    | 58 ++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/kde-base/kleopatra/files/kleopatra-4.4.2015.06-reenable.patch b/kde-base/kleopatra/files/kleopatra-4.4.2015.06-reenable.patch
new file mode 100644
index 0000000..f8c934e
--- /dev/null
+++ b/kde-base/kleopatra/files/kleopatra-4.4.2015.06-reenable.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8c450d3..b927ad9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -190,7 +190,7 @@ set(libkdgantt1_SRCS
+ 
+   if(QGPGME_FOUND)
+     if (Boost_TOPOLOGICAL_SORT_DIR)
+-#      macro_optional_add_subdirectory(kleopatra)
++      macro_optional_add_subdirectory(kleopatra)
+     endif(Boost_TOPOLOGICAL_SORT_DIR)
+     macro_optional_add_subdirectory(wizards)
+     # The following components depend on QGpgME.

diff --git a/kde-base/kleopatra/kleopatra-4.4.2015.06.ebuild b/kde-base/kleopatra/kleopatra-4.4.2015.06.ebuild
new file mode 100644
index 0000000..ad6e8e3
--- /dev/null
+++ b/kde-base/kleopatra/kleopatra-4.4.2015.06.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.4.11.1-r1.ebuild,v 1.7 2014/04/05 18:05:20 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="Kleopatra - KDE X.509 key manager (noakonadi branch)"
+KEYWORDS=""
+IUSE="debug"
+
+SRC_URI+=" http://dev.gentoo.org/~dilfridge/distfiles/${PN}-4.4.11.1-libassuan2.patch.bz2"
+
+DEPEND="
+	app-crypt/gpgme
+	>=dev-libs/libassuan-2.0.0
+	dev-libs/libgpg-error
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+	$(add_kdebase_dep libkleo)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+RESTRICT=test
+# bug 399431
+
+KMEXTRACTONLY="
+	libkleo
+"
+KMLOADLIBS="libkleo"
+
+PATCHES=(
+	"${DISTDIR}/${PN}-4.4.11.1-libassuan2.patch.bz2"
+	"${FILESDIR}/${PN}-4.4.2015.06-reenable.patch"
+)
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kwatchgnupg
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_QGPGME=ON
+	)
+
+	kde4-meta_src_configure
+}