[gentoo-commits] proj/kde:master commit in: eclass/, Documentation/maintainers/

[gentoo-commits] proj/kde:master commit in: eclass/, Documentation/maintainers/

[Alexey Shvetsov]

commit:     7e69a075168bd0033b033950f43c3610b6d3cc4b
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 12:28:12 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 12:28:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7e69a075

[kde-base] Fix ftbfs for kdepim

Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

---
 Documentation/maintainers/git-hooks-commit-msg |    2 +-
 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 f659c61..c1f2a72 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 54970d8..6b729d2 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