Patch not needed anymore, now it's handled by eclass

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 7 insertions, 49 deletions

diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index 3cabd806132b..9382b822a837 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kontact
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.148 2010/03/11 18:37:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.149 2010/03/15 03:54:10 reavertm Exp $
+
+  14 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org> kontact-4.4.0.ebuild,
+  kontact-4.4.1.ebuild, -files/fix-broken-gpgme-cmake-guard.diff:
+  Kdepim CMake override is handled by eclass now, dropping patch
 
   11 Mar 2010; Brent Baude <ranger@gentoo.org> kontact-4.3.5.ebuild:
   Marking kontact-4.3.5 ppc stable for bug 300393
diff --git a/kde-base/kontact/files/fix-broken-gpgme-cmake-guard.diff b/kde-base/kontact/files/fix-broken-gpgme-cmake-guard.diff
deleted file mode 100644
index 90aee5f5ce69..000000000000
--- a/kde-base/kontact/files/fix-broken-gpgme-cmake-guard.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: kontact/plugins/CMakeLists.txt
-===================================================================
---- kontact/plugins/CMakeLists.txt	(revision 1073383)
-+++ kontact/plugins/CMakeLists.txt	(working copy)
-@@ -1,18 +1,16 @@
- remove_definitions(-DKDE_DEFAULT_DEBUG_AREA=5600) #remove kontact debug area
- add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5602)
- 
--if(QGPGME_FOUND)
--  if(BUILD_kmail)
--    add_subdirectory( kmail )
--  endif(BUILD_kmail)
--  if (BUILD_kmail AND BUILD_korganizer)
--    add_subdirectory( korganizer )
--  endif (BUILD_kmail AND BUILD_korganizer)
--  add_subdirectory( summary )
--  add_subdirectory( specialdates )
-+if(BUILD_kmail)
-+  add_subdirectory( kmail )
-+endif(BUILD_kmail)
-+if (BUILD_kmail AND BUILD_korganizer)
-+  add_subdirectory( korganizer )
-+endif (BUILD_kmail AND BUILD_korganizer)
-+add_subdirectory( summary )
-+add_subdirectory( specialdates )
- #re-enable planner for 4.2 if we have people who want to develop it
--  add_subdirectory( planner )
--endif(QGPGME_FOUND)
-+add_subdirectory( planner )
- if (BUILD_knotes)
-   add_subdirectory( knotes )
- endif (BUILD_knotes)
diff --git a/kde-base/kontact/kontact-4.4.0.ebuild b/kde-base/kontact/kontact-4.4.0.ebuild
index 6876b540913e..90234a4f6625 100644
--- a/kde-base/kontact/kontact-4.4.0.ebuild
+++ b/kde-base/kontact/kontact-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.0.ebuild,v 1.1 2010/02/09 00:16:33 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.0.ebuild,v 1.2 2010/03/15 03:54:10 reavertm Exp $
 
 EAPI="2"
 
@@ -48,10 +48,3 @@ src_unpack() {
 
 	kde4-meta_src_unpack
 }
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff"
-
-	# Need to patch it this way
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/kontact/kontact-4.4.1.ebuild b/kde-base/kontact/kontact-4.4.1.ebuild
index ee7a4e179b9d..353f231ba407 100644
--- a/kde-base/kontact/kontact-4.4.1.ebuild
+++ b/kde-base/kontact/kontact-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.1.ebuild,v 1.1 2010/03/02 18:23:11 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.1.ebuild,v 1.2 2010/03/15 03:54:10 reavertm Exp $
 
 EAPI="3"
 
@@ -48,10 +48,3 @@ src_unpack() {
 
 	kde4-meta_src_unpack
 }
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff"
-
-	# Need to patch it this way
-	kde4-meta_src_prepare
-}