diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-20 22:56:53 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-20 22:56:53 +0100 |
| commit | 2e9574d19ba571d8a715516ae26fde34ad65fbe4 (patch) | |
| tree | 1d02b15735fd45059420bf60e519644f858101f0 /eclass/kde4-meta.eclass | |
| parent | 6b6f946b21158875541776dd4c809748a317f017 (diff) | |
| download | kde-2e9574d19ba571d8a715516ae26fde34ad65fbe4.tar.gz kde-2e9574d19ba571d8a715516ae26fde34ad65fbe4.tar.bz2 kde-2e9574d19ba571d8a715516ae26fde34ad65fbe4.zip | |
[eclass] Cleanup logic a bit.
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 5d91beeb762..90e0d8bfc95 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -144,7 +144,7 @@ kde4-meta_pkg_pretend() { debug-print-function ${FUNCNAME} "$@" slot_is_at_least 4.6 ${SLOT} && ( [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -le 3 ]] ) ) \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) ) \ && die "Sorry, but gcc-4.3 and earlier wont work for KDE SC 4.6 (see bug 354837)." } @@ -178,10 +178,8 @@ kde4-meta_src_unpack() { elif [[ "${KDE_SCM}" == "git" ]]; then git-2_src_unpack fi - kde4-meta_src_extract - else - kde4-meta_src_extract fi + kde4-meta_src_extract } # FIXME: the difference between kde4-meta_src_extract and kde4-meta_src_unpack? |