summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-06-06 22:28:13 +0200
committerAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-06-06 22:28:13 +0200
commitd781c3aec2a752f6eea91f406d21023853bbaf77 (patch)
tree731780a7b785f9ae7fc9e87d09049b294f89dc71
parent4e8f24131fa843b2e1fade2f8d665563ac4e988b (diff)
downloadkde-d781c3aec2a752f6eea91f406d21023853bbaf77.tar.gz
kde-d781c3aec2a752f6eea91f406d21023853bbaf77.tar.bz2
kde-d781c3aec2a752f6eea91f406d21023853bbaf77.zip
[eclass] Add yet another special case for the kdeedu-4.6.4 extractlist
-rw-r--r--eclass/kde4-meta.eclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index c1b17e5f52c..e76f51f117c 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -391,7 +391,11 @@ kde4-meta_create_extractlists() {
# 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
# should not try in that case
- if [[ ${KMNAME} != kdegraphics ]] || { [[ ${SLOT} != 4.6 || ${PV} < 4.6.2 ]] && ! slot_is_at_least 4.7 ${SLOT}; }; then
+ # note2: kdeedu 4.6.4 does not have a cmake/modules/ subdir anymore :(
+ # it may be possible to formulate this shorter, but it should also
+ # still be understandable...
+ if { [[ ${KMNAME} != kdegraphics ]] || { [[ ${SLOT} != 4.6 || ${PV} < 4.6.2 ]] && ! slot_is_at_least 4.7 ${SLOT}; }; } \
+ && ! { [[ ${KMNAME} == kdeedu ]] && [[ ${PV} == 4.6.4 ]] ; }; then
case ${KMNAME} in
kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics)
case ${PN} in