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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-base/kdepim-wizards/ChangeLog
index b3d14b43dc2f53ca0028081465ee3520e0a9b87d..1bf1df82fb569f43424359c3939d3f9480fc9da2 100644 (file)
--- a/kde-base/kdepim-wizards/ChangeLog
+++ b/kde-base/kdepim-wizards/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdepim-wizards
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.138 2010/03/11 18:37:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.139 2010/03/15 03:49:51 reavertm Exp $
+
+  15 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  kdepim-wizards-4.4.0.ebuild, kdepim-wizards-4.4.1.ebuild,
+  -files/fix-broken-gpgme-cmake-guard.diff:
+  Removed patch, it's now handled in eclass
 
   11 Mar 2010; Brent Baude <ranger@gentoo.org> kdepim-wizards-4.3.5.ebuild:
   Marking kdepim-wizards-4.3.5 ppc stable for bug 300393

diff --git a/kde-base/kdepim-wizards/files/fix-broken-gpgme-cmake-guard.diff b/kde-base/kdepim-wizards/files/fix-broken-gpgme-cmake-guard.diff
deleted file mode 100644 (file)
index 084113a..0000000
--- a/kde-base/kdepim-wizards/files/fix-broken-gpgme-cmake-guard.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt     (revision 1073383)
-+++ CMakeLists.txt     (working copy)
-@@ -185,7 +185,6 @@
-   add_subdirectory(messagecore)
-   add_subdirectory(messagelist)
- 
--  if(QGPGME_FOUND)
-     if (Boost_TOPOLOGICAL_SORT_DIR)
-       macro_optional_add_subdirectory(kleopatra)
-     endif(Boost_TOPOLOGICAL_SORT_DIR)
-@@ -211,7 +210,6 @@
-     include( SopranoAddOntology )
-     add_subdirectory( ontologies )
-     add_subdirectory( nepomuk_email_feeder )
--  endif(QGPGME_FOUND)
- 
-   if(KDEPIM_BUILD_EVERYTHING)
-     macro_optional_add_subdirectory(knode)
- 
\ No newline at end of file

diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.4.0.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.4.0.ebuild
index af9fffd958132cbd673be51fe8da3a545845c791..98574f75331d7e08c46e447cfc8d4abf35ccdd08 100644 (file)
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.4.0.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-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/kdepim-wizards/kdepim-wizards-4.4.0.ebuild,v 1.1 2010/02/09 00:17:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.4.0.ebuild,v 1.2 2010/03/15 03:49:51 reavertm Exp $
 
 EAPI="2"
 
@@ -34,7 +34,6 @@ src_prepare() {
        ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
                kresources/groupwise/ \
                || die "Failed to link extra_headers."
-       epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff"
 
        kde4-meta_src_prepare
 }

diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.4.1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.4.1.ebuild
index c45167cb3cca0d89fa6fd1e9d2e0498fa7198e20..80c65d25c6a32171d2dd675d662447701f93bc21 100644 (file)
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.4.1.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-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/kdepim-wizards/kdepim-wizards-4.4.1.ebuild,v 1.1 2010/03/02 17:03:51 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.4.1.ebuild,v 1.2 2010/03/15 03:49:51 reavertm Exp $
 
 EAPI="3"
 
@@ -34,7 +34,6 @@ src_prepare() {
        ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
                kresources/groupwise/ \
                || die "Failed to link extra_headers."
-       epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff"
 
        kde4-meta_src_prepare
 }

diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index 3cabd806132bb1ab2fe9220e10b080154f1b3794..9382b822a83722098d0173fe1dd89596b07fbb97 100644 (file)
--- 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 (file)
index 90aee5f..0000000
--- 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 6876b540913e064103084e46cc83d6dca00ccc25..90234a4f662599bbae1a15887610b91e6a20c9fb 100644 (file)
--- 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 ee7a4e179b9dc7d26c694bdaec2d5823c7730300..353f231ba407259b3046011fce126797e8feaeb1 100644 (file)
--- 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
-}

diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog
index d67ec832b3db96faae8b51706d2d32293909b159..8a8f1eff668790abcad52cb83a441b325305dc08 100644 (file)
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-base/korganizer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/korganizer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.155 2010/03/11 18:38:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.156 2010/03/15 03:45:20 reavertm Exp $
+
+  14 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  korganizer-4.4.0.ebuild, korganizer-4.4.1.ebuild,
+  -files/fix-broken-gpgme-cmake-guard.diff:
+  Patch not needed anymore, now it's handled by eclass
 
   11 Mar 2010; Brent Baude <ranger@gentoo.org> korganizer-4.3.5.ebuild:
   Marking korganizer-4.3.5 ppc stable for bug 300393

diff --git a/kde-base/korganizer/files/fix-broken-gpgme-cmake-guard.diff b/kde-base/korganizer/files/fix-broken-gpgme-cmake-guard.diff
deleted file mode 100644 (file)
index 084113a..0000000
--- a/kde-base/korganizer/files/fix-broken-gpgme-cmake-guard.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt     (revision 1073383)
-+++ CMakeLists.txt     (working copy)
-@@ -185,7 +185,6 @@
-   add_subdirectory(messagecore)
-   add_subdirectory(messagelist)
- 
--  if(QGPGME_FOUND)
-     if (Boost_TOPOLOGICAL_SORT_DIR)
-       macro_optional_add_subdirectory(kleopatra)
-     endif(Boost_TOPOLOGICAL_SORT_DIR)
-@@ -211,7 +210,6 @@
-     include( SopranoAddOntology )
-     add_subdirectory( ontologies )
-     add_subdirectory( nepomuk_email_feeder )
--  endif(QGPGME_FOUND)
- 
-   if(KDEPIM_BUILD_EVERYTHING)
-     macro_optional_add_subdirectory(knode)
- 
\ No newline at end of file

diff --git a/kde-base/korganizer/korganizer-4.4.0.ebuild b/kde-base/korganizer/korganizer-4.4.0.ebuild
index 2b1c9610aee1b538527b25fc4b962a73a1da302f..5799c7f9c19102f12b1f51bbd3313ce8f7727bb5 100644 (file)
--- a/kde-base/korganizer/korganizer-4.4.0.ebuild
+++ b/kde-base/korganizer/korganizer-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/korganizer/korganizer-4.4.0.ebuild,v 1.1 2010/02/09 00:17:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.0.ebuild,v 1.2 2010/03/15 03:45:20 reavertm Exp $
 
 EAPI="2"
 
@@ -44,13 +44,6 @@ src_unpack() {
        kde4-meta_src_unpack
 }
 
-src_prepare() {
-       epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff"
-
-       # Needs to be done this way
-       kde4-meta_src_prepare
-}
-
 pkg_postinst() {
        kde4-meta_pkg_postinst
 

diff --git a/kde-base/korganizer/korganizer-4.4.1.ebuild b/kde-base/korganizer/korganizer-4.4.1.ebuild
index 044b370e19df162635dbf8251478fa7c3273b9bb..a868916b0afa1b1e74045d3584740bb8b73d32e5 100644 (file)
--- a/kde-base/korganizer/korganizer-4.4.1.ebuild
+++ b/kde-base/korganizer/korganizer-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/korganizer/korganizer-4.4.1.ebuild,v 1.1 2010/03/02 18:24:50 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.1.ebuild,v 1.2 2010/03/15 03:45:20 reavertm Exp $
 
 EAPI="3"
 
@@ -44,13 +44,6 @@ src_unpack() {
        kde4-meta_src_unpack
 }
 
-src_prepare() {
-       epatch "${FILESDIR}/fix-broken-gpgme-cmake-guard.diff"
-
-       # Needs to be done this way
-       kde4-meta_src_prepare
-}
-
 pkg_postinst() {
        kde4-meta_pkg_postinst