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

[Jonathan Callen]

commit:     fced2c53d4d8927982773e263e5443c2dd7733d5
Author:     abcd <abcd <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 23:29:00 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 23:29:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fced2c53

[eclass] kdegraphics >= 4.6.2 doesn't have cmake/ either

---
 eclass/kde4-meta.eclass |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 85ed4eb..24c8921 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -408,23 +408,24 @@ kde4-meta_create_extractlists() {
 			;;
 	esac
 	# Don't install cmake modules for split ebuilds, to avoid collisions.
-	# note: kdegraphics-4.6.2 does not even have code to do that, so we
+	# note: kdegraphics >= 4.6.2 does not even have code to do that, so we
 	#   should not try in that case
-	( [[ ${KMNAME} == kdegraphics ]] && [[ ${PV} == "4.6.2" ]] ) ||
-	case ${KMNAME} in
-		kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics)
-			case ${PN} in
-				libkdegames|libkdeedu|libkworkspace)
-					KMEXTRA+="
-						cmake/modules/"
-					;;
-				*)
-					KMCOMPILEONLY+="
-						cmake/modules/"
-					;;
-			esac
-		;;
-	esac
+	if [[ ${KMNAME} != kdegraphics ]] || { [[ ${SLOT} != 4.6 || ${PV} < 4.6.2 ]] && ! slot_is_at_least 4.7 ${SLOT}; }; then
+		case ${KMNAME} in
+			kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics)
+				case ${PN} in
+					libkdegames|libkdeedu|libkworkspace)
+						KMEXTRA+="
+							cmake/modules/"
+						;;
+					*)
+						KMCOMPILEONLY+="
+							cmake/modules/"
+						;;
+				esac
+			;;
+		esac
+	fi
 
 	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}"
 }