diff options
| -rw-r--r-- | eclass/kde4-meta.eclass | 2 | ||||
| -rw-r--r-- | kde-base/kdepim-wizards/Manifest | 5 | ||||
| -rw-r--r-- | kde-base/kdepim-wizards/files/fix-broken-gpgme-cmake-guard.diff | 21 | ||||
| -rw-r--r-- | kde-base/kdepim-wizards/kdepim-wizards-4.4.9999.ebuild | 1 | ||||
| -rw-r--r-- | kde-base/kdepim-wizards/kdepim-wizards-9999.ebuild | 1 |
5 files changed, 3 insertions, 27 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 691aa63cd8f..2ed10675386 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -584,7 +584,7 @@ kde4-meta_change_cmakelists() { fi if ! slot_is_at_least 4.5 ${SLOT}; then case ${PN} in - kaddressbook|kalarm|kmailcvt|kontact|korganizer|korn) + kalarm|kmailcvt|kontact|korganizer|korn) sed -n -e '/qt4_generate_dbus_interface(.*org\.kde\.kmail\.\(kmail\|mailcomposer\)\.xml/p' \ -e '/add_custom_target(kmail_xml /,/)/p' \ -i kmail/CMakeLists.txt || die "uncommenting xml failed" diff --git a/kde-base/kdepim-wizards/Manifest b/kde-base/kdepim-wizards/Manifest index c073ca74911..26f394b9606 100644 --- a/kde-base/kdepim-wizards/Manifest +++ b/kde-base/kdepim-wizards/Manifest @@ -1,4 +1,3 @@ -AUX fix-broken-gpgme-cmake-guard.diff 634 RMD160 d9e8e07b17e4555522e916bc87249729e42d4dc4 SHA1 3f1bf906a96889fbe068ae28d2161ddd622fb7fa SHA256 5492666251f59a396347eaf074fa0dd0b525b9842321415e92fb7098092e904f -EBUILD kdepim-wizards-4.4.9999.ebuild 873 RMD160 1d7a46641ef27376899213acb833b9dd33c2a702 SHA1 b7714f2f053afa749c17f2dcc6df4bbb929c83b3 SHA256 6197672db8c4e4b7b3fe739e3c0f77ccc1993e46d0eeacbabe1247a5993e4299 -EBUILD kdepim-wizards-9999.ebuild 854 RMD160 5fed6a9f38d244fb30fde5500e742e548746f3b3 SHA1 f6288a44497b30e361852cb059969dd2586f4784 SHA256 755c38199224d0bfa32167cf376dce3ca1c1530a34bd3ace1d28205408c27685 +EBUILD kdepim-wizards-4.4.9999.ebuild 817 RMD160 024a40075251896d16f30f4ada064dd02036b90a SHA1 8374a79ff18cdf94dea1e1772fd4ec8ddc68c8fb SHA256 89bcdcbf10d2d85575afe59f4309b0ec39859d5bf2dd70c7cb9caabf615873c0 +EBUILD kdepim-wizards-9999.ebuild 798 RMD160 20ac259506f6879039df859cc1e1ee89dd60c0db SHA1 dca3fede949b1262237781f482118df71a69b8f5 SHA256 1618f8de41604230466716b036c6d64fd09bfe2d799441aaaf7320ca28171ba6 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a 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 index 084113a5b2d..00000000000 --- 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.9999.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.4.9999.ebuild index af4219bc8c7..e30a08a27fa 100644 --- a/kde-base/kdepim-wizards/kdepim-wizards-4.4.9999.ebuild +++ b/kde-base/kdepim-wizards/kdepim-wizards-4.4.9999.ebuild @@ -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-9999.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-9999.ebuild index 468d9098239..8a1eae859ee 100644 --- a/kde-base/kdepim-wizards/kdepim-wizards-9999.ebuild +++ b/kde-base/kdepim-wizards/kdepim-wizards-9999.ebuild @@ -33,7 +33,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 } |