Fix support for app-crypt/gpgme-1.2.0 (bug #275006).

Package-Manager: portage-13717-svn/cvs/Linux x86_64

6 files changed, 119 insertions, 2 deletions

diff --git a/kde-base/certmanager/ChangeLog b/kde-base/certmanager/ChangeLog
index 7eeab549adb3..f9acd3f63a90 100644
--- a/kde-base/certmanager/ChangeLog
+++ b/kde-base/certmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/certmanager
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/ChangeLog,v 1.110 2009/06/18 04:08:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/ChangeLog,v 1.111 2009/06/28 18:51:49 arfrever Exp $
+
+*certmanager-3.5.10-r1 (28 Jun 2009)
+
+  28 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +certmanager-3.5.10-r1.ebuild,
+  +files/certmanager-3.5.10-gpgme-1.2.0.patch:
+  Fix support for app-crypt/gpgme-1.2.0 (bug #275006).
 
   18 Jun 2009; Jeroen Roovers <jer@gentoo.org> certmanager-3.5.10.ebuild:
   Stable for HPPA (bug #271889).
diff --git a/kde-base/certmanager/certmanager-3.5.10-r1.ebuild b/kde-base/certmanager/certmanager-3.5.10-r1.ebuild
new file mode 100644
index 000000000000..31c040d52167
--- /dev/null
+++ b/kde-base/certmanager/certmanager-3.5.10-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.10-r1.ebuild,v 1.1 2009/06/28 18:51:49 arfrever Exp $
+
+KMNAME=kdepim
+EAPI="1"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdepim-3.5-patchset-05.tar.bz2"
+
+DESCRIPTION="KDE certificate manager gui."
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=kde-base/libkdenetwork-${PV}-r1:${SLOT}
+	>=app-crypt/gpgme-1.1.2-r1
+	|| ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 )"
+	# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
+
+RDEPEND="${DEPEND}"
+
+KMCOPYLIB="libqgpgme libkdenetwork/qgpgme/"
+KMEXTRACTONLY="libkdenetwork/
+	libkpgp/
+	libkdepim/"
+
+KMEXTRA="doc/kleopatra
+	doc/kwatchgnupg"
+
+PATCHES=( "${FILESDIR}/${P}-gpgme-1.2.0.patch" )
+
+src_compile() {
+	myconf="--with-gpg=/usr/bin/gpg"
+	kde_src_compile
+}
+
+pkg_postinst() {
+	kde_pkg_postinst
+	elog "For X.509 CRL and OCSP support, install app-crypt/dirmngr, please."
+}
diff --git a/kde-base/certmanager/files/certmanager-3.5.10-gpgme-1.2.0.patch b/kde-base/certmanager/files/certmanager-3.5.10-gpgme-1.2.0.patch
new file mode 100644
index 000000000000..7996d971bc8d
--- /dev/null
+++ b/kde-base/certmanager/files/certmanager-3.5.10-gpgme-1.2.0.patch
@@ -0,0 +1,11 @@
+--- certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
++++ certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
+@@ -54,7 +54,7 @@
+     mOpenPGPProtocol( 0 ),
+     mSMIMEProtocol( 0 )
+ {
+-
++  GpgME::initializeLibrary();
+ }
+ 
+ Kleo::QGpgMEBackend::~QGpgMEBackend() {
diff --git a/kde-base/libkdenetwork/ChangeLog b/kde-base/libkdenetwork/ChangeLog
index 6733e15e9e30..e5c022ec0218 100644
--- a/kde-base/libkdenetwork/ChangeLog
+++ b/kde-base/libkdenetwork/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/libkdenetwork
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdenetwork/ChangeLog,v 1.81 2009/06/18 02:25:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdenetwork/ChangeLog,v 1.82 2009/06/28 18:47:54 arfrever Exp $
+
+*libkdenetwork-3.5.10-r1 (28 Jun 2009)
+
+  28 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +libkdenetwork-3.5.10-r1.ebuild,
+  +files/libkdenetwork-3.5.10-gpgme-1.2.0.patch:
+  Fix support for app-crypt/gpgme-1.2.0 (bug #275006).
 
   18 Jun 2009; Jeroen Roovers <jer@gentoo.org> libkdenetwork-3.5.10.ebuild:
   Stable for HPPA (bug #271889).
diff --git a/kde-base/libkdenetwork/files/libkdenetwork-3.5.10-gpgme-1.2.0.patch b/kde-base/libkdenetwork/files/libkdenetwork-3.5.10-gpgme-1.2.0.patch
new file mode 100644
index 000000000000..8acbd2566141
--- /dev/null
+++ b/kde-base/libkdenetwork/files/libkdenetwork-3.5.10-gpgme-1.2.0.patch
@@ -0,0 +1,35 @@
+--- libkdenetwork/gpgmepp/context.cpp
++++ libkdenetwork/gpgmepp/context.cpp
+@@ -53,6 +53,10 @@
+ 
+ namespace GpgME {
+ 
++  void initializeLibrary() {
++    gpgme_check_version( 0 );
++  }
++
+   const char * Error::source() const {
+     return gpgme_strsource( (gpgme_error_t)mErr );
+   }
+--- libkdenetwork/gpgmepp/context.h
++++ libkdenetwork/gpgmepp/context.h
+@@ -287,6 +287,8 @@
+   //
+   //
+ 
++  KDE_EXPORT void initializeLibrary();
++
+   KDE_EXPORT GpgME::Error setDefaultLocale( int category, const char * value );
+ 
+   KDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true );
+--- libkdenetwork/gpgmepp/Makefile.am
++++ libkdenetwork/gpgmepp/Makefile.am
+@@ -46,7 +46,7 @@
+ #   (Interfaces added/removed/changed:  CURRENT++, REVISION=0)
+ #   (Interfaces added:                  AGE++)
+ #   (Interfaces removed/changed:        AGE=0)
+-libgpgme___la_LDFLAGS = -no-undefined -version-info 3:0:3
++libgpgme___la_LDFLAGS = -no-undefined -version-info 4:0:4
+ libgpgme___la_LIBADD = $(GPGME_LIBS)
+ libgpgme___la_DEPENDENCIES = $(GPGME_LIBS_DEP)
+ 
diff --git a/kde-base/libkdenetwork/libkdenetwork-3.5.10-r1.ebuild b/kde-base/libkdenetwork/libkdenetwork-3.5.10-r1.ebuild
new file mode 100644
index 000000000000..c4df7b507c9b
--- /dev/null
+++ b/kde-base/libkdenetwork/libkdenetwork-3.5.10-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdenetwork/libkdenetwork-3.5.10-r1.ebuild,v 1.1 2009/06/28 18:47:54 arfrever Exp $
+
+KMNAME=kdepim
+EAPI="1"
+inherit kde-meta eutils
+
+DESCRIPTION="library common to many KDE network apps"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=app-crypt/gpgme-1.0.2"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gpgme-1.2.0.patch" )