diff options
| -rw-r--r-- | eclass/kde4-meta.eclass | 2 | ||||
| -rw-r--r-- | kde-base/kontact/Manifest | 4 | ||||
| -rw-r--r-- | kde-base/kontact/files/4.5-fix-broken-gpgme-cmake-guard.patch | 29 | ||||
| -rw-r--r-- | kde-base/kontact/files/fix-broken-gpgme-cmake-guard.diff | 32 | ||||
| -rw-r--r-- | kde-base/kontact/kontact-4.4.9999.ebuild | 7 |
5 files changed, 2 insertions, 72 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index eec7acf8428..d27a1050191 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -578,7 +578,7 @@ kde4-meta_change_cmakelists() { sed -e '/if[[:space:]]*([[:space:]]*BUILD_.*)/s/^/#OVERRIDE /' \ -e '/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)/s/^/#OVERRIDE /' \ -i CMakeLists.txt \ - -i kontact/plugins/CMakeLists.txt || die 'failed to disable broken build logic' + -i kontact/plugins/CMakeLists.txt if ! slot_is_at_least 4.5 ${SLOT}; then case ${PN} in kaddressbook|kalarm|kmailcvt|kontact|korganizer|korn) diff --git a/kde-base/kontact/Manifest b/kde-base/kontact/Manifest index 0dfceb7590e..78477d2271f 100644 --- a/kde-base/kontact/Manifest +++ b/kde-base/kontact/Manifest @@ -1,5 +1,3 @@ -AUX 4.5-fix-broken-gpgme-cmake-guard.patch 1008 RMD160 0bf9edd1391d08072c99a5e61c00f57d5bfc997c SHA1 b8fd0dc9a0f1dfb0930305124a71f79ddf39a526 SHA256 8d080b7709f7dd1e4dd056d459abbf11e8c32a330da13518e381ae899669356d -AUX fix-broken-gpgme-cmake-guard.diff 1099 RMD160 dca1cd877fd627edc256798a58223c2482890ea4 SHA1 b91ec5bddd1a8956947915651651163ce03807ce SHA256 b5ba6b4ca8597af487db2e3a78e165f4585339467a8e547c3cb91757690e77cd -EBUILD kontact-4.4.9999.ebuild 1167 RMD160 d95264a023214de39c20d5c23b279a4fdba71468 SHA1 91f2cd6884ba1b03bcb8f5dd7eabdf18169c99d7 SHA256 655280a20b11918eeb0bd803167f37ac29791ff9614422496ae608f26ae209c9 +EBUILD kontact-4.4.9999.ebuild 1039 RMD160 d3c5c9639088031c4ed48a330cc11c08fa957384 SHA1 13a550335c8c130d5e5bd73bf07acccb2eb43a37 SHA256 e8bf2dc29cafbd47e9574e4b53b6aaeccb08854fe6b42e55a9982915d51f36cf EBUILD kontact-9999.ebuild 965 RMD160 8742b48f18e3d15159449346bfdda6888cc8a9af SHA1 ae184d144e760d5e8257e1dbe8ecdb2411fc42c5 SHA256 e2713fcd5d559899268f72bccc9ae5644261e1a71db16a67e54d84e5d71a151c MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kontact/files/4.5-fix-broken-gpgme-cmake-guard.patch b/kde-base/kontact/files/4.5-fix-broken-gpgme-cmake-guard.patch deleted file mode 100644 index cde2f342a87..00000000000 --- a/kde-base/kontact/files/4.5-fix-broken-gpgme-cmake-guard.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- kontact/plugins/CMakeLists.txt.orig 2010-01-23 22:39:56.000000000 +0100 -+++ kontact/plugins/CMakeLists.txt 2010-01-23 22:40:11.000000000 +0100 -@@ -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) - if (BUILD_knotes) - add_subdirectory( knotes ) - endif (BUILD_knotes) 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 90aee5f5ce6..00000000000 --- 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.9999.ebuild b/kde-base/kontact/kontact-4.4.9999.ebuild index ce415af2a08..31a0d13631a 100644 --- a/kde-base/kontact/kontact-4.4.9999.ebuild +++ b/kde-base/kontact/kontact-4.4.9999.ebuild @@ -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 -} |