Remove kdeenablefinal patch. Build feature is gone.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 9 insertions, 43 deletions

diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index e1f04f9f881e..07b1c5601ecd 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.62 2012/01/16 22:22:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.63 2012/01/17 12:12:21 johu Exp $
+
+  17 Jan 2012; Johannes Huber <johu@gentoo.org>
+  -files/kdepim-runtime-4.4.10-enablefinal-1.patch,
+  -files/kdepim-runtime-4.4.10-enablefinal-2.patch,
+  kdepim-runtime-4.4.11.1.ebuild:
+  Remove kdeenablefinal patch. Build feature is gone.
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> kdepim-runtime-4.7.4.ebuild:
   Stable for amd64, wrt bug #396359
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch
deleted file mode 100644
index cfdaf21a69d7..000000000000
--- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libkdepim-copy/calendardiffalgo.cpp.orig	2011-01-01 19:19:25.798000269 +0100
-+++ libkdepim-copy/calendardiffalgo.cpp	2011-01-01 19:14:15.918000268 +0100
-@@ -26,7 +26,6 @@
- 
- using namespace KPIM;
- 
--#ifndef KDE_USE_FINAL
- static bool compareString( const QString &left, const QString &right )
- {
-   if ( left.isEmpty() && right.isEmpty() )
-@@ -34,7 +33,6 @@
-   else
-     return left == right;
- }
--#endif
- 
- static QString toString( KCal::Attendee *attendee )
- {
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch
deleted file mode 100644
index 67425fe7c3a4..000000000000
--- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- resources/kolabproxy/distributionlist.cpp.orig	2011-01-01 19:18:41.274000269 +0100
-+++ resources/kolabproxy/distributionlist.cpp	2011-01-01 19:16:44.378000268 +0100
-@@ -39,8 +39,6 @@
- 
- using namespace Kolab;
- 
--static const char* s_unhandledTagAppName = "KOLABUNHANDLED"; // no hyphens in appnames!
--
- // saving (contactgroup->xml)
- DistributionList::DistributionList( const KABC::ContactGroup* contactGroup )
- {
-@@ -149,7 +147,7 @@
-         // Unhandled tag - save for later storage
-         //kDebug() <<"Saving unhandled tag" << e.tagName();
-         Custom c;
--        c.app = s_unhandledTagAppName;
-+        c.app = "KOLABUNHANDLED";
-         c.name = e.tagName();
-         c.value = e.text();
-         mCustomList.append( c );
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild
index 82b591c7084d..d412ff414090 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild,v 1.6 2011/07/31 20:28:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1.ebuild,v 1.7 2012/01/17 12:12:21 johu Exp $
 
 EAPI=4
 
@@ -37,5 +37,3 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 add_blocker akonadi '<4.3.90'
-
-PATCHES=( "${FILESDIR}/${PN}"-4.4.10-enablefinal-{1,2}.patch )