From: Ingmar Vanhassel <ingmar@gentoo.org>
Date: Thu, 21 Feb 2008 17:16:11 +0000 (+0000)
Subject: Fix compilation with USE="kdeenablefinal", bug 210954.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ee0c06c499c9ed52792bc7cbc7b548ae944a253a;p=gentoo.git

Fix compilation with USE="kdeenablefinal", bug 210954.
Package-Manager: portage-2.1.4.4
---

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 5ce5f7a6725c..1d510a820cfb 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.301 2008/02/20 22:52:54 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.302 2008/02/21 17:16:10 ingmar Exp $
+
+  21 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/certmanager-3.5.9-fix-kdeenablefinal.patch, kdepim-3.5.9.ebuild:
+  Fix compilation with USE="kdeenablefinal", bug 210954.
 
 *kdepim-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 9bbc1e7f51e6..9064ad4f18cb 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX certmanager-3.5.9-fix-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 kdepim-3.5.8.ebuild 1587 RMD160 099e4d8555eebc2b00ca32cd84afbed922f54218 SHA1 10d22f525f909c96334be564ef2e1fb79c017355 SHA256 de1e022eef7d131467a2de62722692b40559306fc0f9c5fe2c05c3005a7c533f
-EBUILD kdepim-3.5.9.ebuild 1608 RMD160 7d23137b5cd994e08d0d9064b557b5abc8ede9fd SHA1 c2498a3fead49d3f416bb98d13109737ea967d8e SHA256 3f724ff7c484c55d6374771782108ab513b61d732aa921ec71fce111aea6612a
-MISC ChangeLog 41721 RMD160 3f52fe59bab4daf63eb0b752357960343fe0eccc SHA1 cad6c1d07ed22a86bff8a5882ed999d8fcb8ec2e SHA256 9402e3999caaac05afd349701b0057ba086817313ecf05fc5bde7c2f0e7310b0
+EBUILD kdepim-3.5.9.ebuild 1670 RMD160 44f402c61fa50efb8881ad416f4b260df329d37c SHA1 7acb59a571589658a47e7c4d3ec08f73397eb807 SHA256 676f4acfbd2efcd4ae7ccfb89073cb84a59c1075a0848e43bad526c63eba432b
+MISC ChangeLog 41901 RMD160 423401edd83acb124e52a14a47a4f601ac5b5381 SHA1 dc9d29acaf7436e69d01c2f0f23018fc269137e6 SHA256 e470c8def6cc982be327d2ff815156879be9703889649e3dcd9acda9d24304da
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHvK9NCkvF58q80IkRAptDAJ4lY3t9caGNVWdgkMPfmQkmfztDzACgg3wJ
-d7vKfNsLCKXjVWKNeSUaAsc=
-=V4A3
+iD8DBQFHvbGAB18eXLOpYdkRAjjTAJwLGJKECJVHvlWRGhJNeJXvPorg7QCfcrPE
+iJLIuHk7Tqby0SsxQ8Aew1Y=
+=BpZJ
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim/files/certmanager-3.5.9-fix-kdeenablefinal.patch b/kde-base/kdepim/files/certmanager-3.5.9-fix-kdeenablefinal.patch
new file mode 100644
index 000000000000..42da6b933055
--- /dev/null
+++ b/kde-base/kdepim/files/certmanager-3.5.9-fix-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
diff --git a/kde-base/kdepim/kdepim-3.5.9.ebuild b/kde-base/kdepim/kdepim-3.5.9.ebuild
index aaba9b44e812..7ef222b4c0a5 100644
--- a/kde-base/kdepim/kdepim-3.5.9.ebuild
+++ b/kde-base/kdepim/kdepim-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/kdepim/kdepim-3.5.9.ebuild,v 1.1 2008/02/20 22:52:54 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.9.ebuild,v 1.2 2008/02/21 17:16:10 ingmar Exp $
 
 EAPI="1"
 inherit kde-dist
@@ -33,6 +33,8 @@ DEPEND="${DEPEND}
 	x11-proto/scrnsaverproto
 	x11-apps/xhost"
 
+PATCHES="${FILESDIR}/certmanager-${PV}-fix-kdeenablefinal.patch"
+
 src_unpack() {
 	kde_src_unpack