diff options
| author | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2011-10-22 01:03:55 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2011-10-22 01:03:55 +0200 |
| commit | 5f1c11709404c9b1fb898fd8dc49309a5a9effe4 (patch) | |
| tree | 6097452bda7b8c425d096a32d66df140804e8c69 | |
| parent | c3c033c83a359328d0ca539b26c2d747029a9321 (diff) | |
| download | kde-5f1c11709404c9b1fb898fd8dc49309a5a9effe4.tar.gz kde-5f1c11709404c9b1fb898fd8dc49309a5a9effe4.tar.bz2 kde-5f1c11709404c9b1fb898fd8dc49309a5a9effe4.zip | |
[eclass] use MERGE_TYPE only for EAPI 4, bug 385589
| -rw-r--r-- | eclass/kde4-base.eclass | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index c6022311aea..e367c27591b 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -621,10 +621,14 @@ kde4-base_pkg_setup() { # In theory should be in pkg_pretend but we check it only for kdelibs there # and for others we do just quick scan in pkg_setup because pkg_pretend # executions consume quite some time. - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ - && die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)." + # We can only do this for EAPI 4 or later because the MERGE_TYPE variable + # is otherwise undefined. + if [[ ${EAPI:-0} != 3 ]]; then + if [[ ${MERGE_TYPE} != binary ]]; then + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ + && die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)." + fi fi KDEDIR=/usr |