Fix compilation with USE="kdeenablefinal", bug 210954.

Package-Manager: portage-2.1.4.4

4 files changed, 42 insertions, 7 deletions

diff --git a/kde-base/certmanager/ChangeLog b/kde-base/certmanager/ChangeLog
index 61a2a2c4b1d8..0e6d5a70fe5d 100644
--- a/kde-base/certmanager/ChangeLog
+++ b/kde-base/certmanager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/certmanager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/ChangeLog,v 1.95 2008/02/20 22:31:25 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/ChangeLog,v 1.96 2008/02/21 15:55:08 ingmar Exp $
+
+  21 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/certmanager-3.5.9-no-kdeenablefinal.patch,
+  certmanager-3.5.9.ebuild:
+  Fix compilation with USE="kdeenablefinal", bug 210954.
 
 *certmanager-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/certmanager/Manifest b/kde-base/certmanager/Manifest
index 2b5d3a2f9644..75c5f78f61c8 100644
--- a/kde-base/certmanager/Manifest
+++ b/kde-base/certmanager/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX certmanager-3.5.9-no-kdeenablefinal.patch 1141 RMD160 c132934d60dc01c073850f8d5bc82452a430327f SHA1 ddad372007f5e28df1e7f20ced314229ab63c0fe SHA256 39dfa1543cef12b3db29f4f68b08dc6e80c895292a693f73e7b18b30083584c3
 DIST kdepim-3.5-patchset-04.tar.bz2 133990 RMD160 9d9fd1e7b04512f1f28bba78d5eeadfc3e3280ba SHA1 ff535be3a60938382094642af18776a529620209 SHA256 8b1968a7bef8ab2efdb2d87e96943ce636775b76365bc1bc99e1e377f9abfc61
 DIST kdepim-3.5.8.tar.bz2 14107449 RMD160 bb34c7e88227a1ebdd8ff38ee41445f85969175e SHA1 8284db2d3d767228cfb2cad4bf8d5221848d64f2 SHA256 433f8541af0a05e0a7e15df5ecca8463a29b6574871b941a8312b04b2233fef1
 DIST kdepim-3.5.9.tar.bz2 14497974 RMD160 7c2cbd5b5f9075bc8dcc7998fc04bf9b297bfd54 SHA1 53ab658c5cdf2e6f836d2e12e3bc4e2fe3b96f15 SHA256 ee3f02ac828f1915c09b8c0a1289efcfbae36321cd07bc071df8be041de10d3a
 EBUILD certmanager-3.5.8.ebuild 1042 RMD160 1bc71df64e1f04b99486c5ec2f13c18ed2a54274 SHA1 7bda85152bba013237842d8d75fa85ff79e9130f SHA256 fc8aebc148718bb789128bc6ac32a9ab39d7923af798af5aef827963bc844e6c
-EBUILD certmanager-3.5.9.ebuild 1008 RMD160 6a07097d7ca1753e99928e92909392410933a0b1 SHA1 80ae842bf05b7c5a8b7caa51222bdaa964e6aa8f SHA256 5039ea3a9acc652a7e43bc51adc0d54ffd5224b3c2a2a0e54b083be7a1c797aa
-MISC ChangeLog 12178 RMD160 65183ac9ef702ba3177d944d01259e2a0ca8aec6 SHA1 70bca6ffbd30d6e2a7360b5908e0ea9763b1a68b SHA256 2463a3febe1ffda02ed6b66f9bb01ffb102b04db2d669cfa0d50dba136aae588
+EBUILD certmanager-3.5.9.ebuild 1056 RMD160 0a70a2f49187fa3bff4b5ec86da3d2830f43682e SHA1 811239d1abd61798e9e0ffb762375d575ca329bd SHA256 8debf1178510533c03fe7d1fa53f22d7b29979b90096f09206ebb2d573f183c1
+MISC ChangeLog 12364 RMD160 545e18b2983f53e9904468b93c39b12b5f449ab8 SHA1 a91c9d4dcfbf6cd646ac97b044a03330c1307472 SHA256 c2d86a01e33f30a104f504173cfadc54c0a247963d9c79fb4f405e88a6bced4b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHvKpDCkvF58q80IkRArXkAKCPx/yZ0XDYWLuoASmxiL83vNBvYACfSAts
-DxVW8CoVjsnPaqqgt2NGXLM=
-=Qquq
+iD8DBQFHvZ6EB18eXLOpYdkRAkWmAKCo2/v0Pg1+gwgGtNp7jLpQKJNOGwCgoB8G
+8BeGZ7j2AE6gJACVBCDIWF0=
+=Iyuu
 -----END PGP SIGNATURE-----
diff --git a/kde-base/certmanager/certmanager-3.5.9.ebuild b/kde-base/certmanager/certmanager-3.5.9.ebuild
index a49ec1bffce8..9bc9c6c8f0d4 100644
--- a/kde-base/certmanager/certmanager-3.5.9.ebuild
+++ b/kde-base/certmanager/certmanager-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.9.ebuild,v 1.1 2008/02/20 22:31:25 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.9.ebuild,v 1.2 2008/02/21 15:55:08 ingmar Exp $
 
 KMNAME=kdepim
 EAPI="1"
@@ -26,6 +26,8 @@ KMEXTRACTONLY="libkdenetwork/
 KMEXTRA="doc/kleopatra
 	doc/kwatchgnupg"
 
+PATCHES="${FILESDIR}/${P}-no-kdeenablefinal.patch"
+
 src_compile() {
 	myconf="--with-gpg=/usr/bin/gpg"
 	kde_src_compile
diff --git a/kde-base/certmanager/files/certmanager-3.5.9-no-kdeenablefinal.patch b/kde-base/certmanager/files/certmanager-3.5.9-no-kdeenablefinal.patch
new file mode 100644
index 000000000000..42da6b933055
--- /dev/null
+++ b/kde-base/certmanager/files/certmanager-3.5.9-no-kdeenablefinal.patch
@@ -0,0 +1,27 @@
+Fix kdepim/certmanager compilation with --enable-final,
+	Ingmar Vanhassel <ingmar@gentoo.org>
+
+diff -Naur kdepim-3.5.9.orig/certmanager/lib/cryptplug.h kdepim-3.5.9/certmanager/lib/cryptplug.h
+--- kdepim-3.5.9.orig/certmanager/lib/cryptplug.h	2005-09-10 10:23:51.000000000 +0200
++++ kdepim-3.5.9/certmanager/lib/cryptplug.h	2008-02-21 15:38:24.000000000 +0100
+@@ -408,7 +408,7 @@
+    \note This function <b>must</b> be implemented by each plug-in using
+    this API specification.
+ */
+-bool hasFeature( Feature );
++bool hasFeature( ::Feature );
+ 
+ /*! \ingroup groupSignCryptAct
+    \brief Information record returned by signing and by encrypting
+diff -Naur kdepim-3.5.9.orig/certmanager/lib/cryptplugwrapper.h kdepim-3.5.9/certmanager/lib/cryptplugwrapper.h
+--- kdepim-3.5.9.orig/certmanager/lib/cryptplugwrapper.h	2008-02-13 10:39:29.000000000 +0100
++++ kdepim-3.5.9/certmanager/lib/cryptplugwrapper.h	2008-02-21 16:17:41.000000000 +0100
+@@ -718,7 +718,7 @@
+ 
+         \return  whether the relative feature is implemented or not
+     */
+-    bool hasFeature( Feature );
++    bool hasFeature( ::Feature );
+ 
+ 
+     /* \ingroup groupSignAct