diff options
| author | Alexey Shvetsov <alexxy@gentoo.org> | 2012-11-18 16:28:12 +0400 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2012-11-18 16:28:52 +0400 |
| commit | 7e69a075168bd0033b033950f43c3610b6d3cc4b (patch) | |
| tree | 50d97e02c0b373ca9034a1731288eb25eb81d643 | |
| parent | ef82a2bf6ff0b5933d6ba43ed8a780b71013df29 (diff) | |
| download | kde-7e69a075168bd0033b033950f43c3610b6d3cc4b.tar.gz kde-7e69a075168bd0033b033950f43c3610b6d3cc4b.tar.bz2 kde-7e69a075168bd0033b033950f43c3610b6d3cc4b.zip | |
[kde-base] Fix ftbfs for kdepim
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
| -rwxr-xr-x | Documentation/maintainers/git-hooks-commit-msg | 2 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/Documentation/maintainers/git-hooks-commit-msg b/Documentation/maintainers/git-hooks-commit-msg index f659c61667c..c1f2a72f1f7 100755 --- a/Documentation/maintainers/git-hooks-commit-msg +++ b/Documentation/maintainers/git-hooks-commit-msg @@ -38,7 +38,7 @@ elif grep '^NO_REPOMAN' "$FILE" >& /dev/null ; then # Allow i-know-what-i-am-doing override sed -i -e '/^NO_REPOMAN/d' "$FILE" exit 0 -elif ! grep '^(Portage version' "$FILE" >& /dev/null ; then +elif ! grep -e '(Portage version|Package-Manager' "$FILE" >& /dev/null ; then die 'Please use repoman to commit' fi diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 54970d8e787..6b729d2c80a 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -561,16 +561,18 @@ kde4-meta_change_cmakelists() { -e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \ -i kontact/plugins/CMakeLists.txt || die 'failed to override build logic' fi - if [[ $(get_kde_version) < 4.5 ]]; then - case ${PN} in - 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" - _change_cmakelists_parent_dirs kmail + case ${PV} in + 4.4*) + case ${PN} in + 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" + _change_cmakelists_parent_dirs kmail + ;; + esac ;; - esac - fi + esac ;; kdewebdev) # Disable hardcoded checks |