diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-10 18:39:19 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-10 18:39:19 +0100 |
| commit | eee617c550f2c79f8de9edd4641e638795668388 (patch) | |
| tree | f20d3f46b9c98243f862807504e5ec4ed0a76b06 /eclass | |
| parent | 292ea0f8ed6cef4affc3fc97eed31f4e4f3f2727 (diff) | |
| download | kde-eee617c550f2c79f8de9edd4641e638795668388.tar.gz kde-eee617c550f2c79f8de9edd4641e638795668388.tar.bz2 kde-eee617c550f2c79f8de9edd4641e638795668388.zip | |
[eclass] Cleanup the gcc check
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index b11ef227c2f..cb59b4c9ef4 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -16,7 +16,15 @@ inherit kde4-base toolchain-funcs versionator -EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm +case ${EAPI:-0} in + 3) + KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm" + ;; + *) + KDEMETA_EXPF="pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm" + ;; +esac +EXPORT_FUNCTIONS ${KDEMETA_EXPF} # Add dependencies that all packages in a certain module share. case ${KMNAME} in @@ -135,7 +143,9 @@ fi kde4-meta_pkg_pretend() { debug-print-function ${FUNCNAME} "$@" - LANG=C [[ $(gcc-version) -le 4.3 ]] && slot_is_at_least 4.6 && die "Sorry, but gcc-4.3 and earlier wont work for >=kde-4.6 (see bug 354837)." + slot_is_at_least 4.6 && ( gcc-major-version -lt 4 || \ + ( gcc-major-version -eq 4 && gcc-minor-version -lt 3 ) ) \ + && die "Sorry, but gcc-4.3 and earlier wont work for KDE SC (see bug 354837)." } # @FUNCTION: kde4-meta_pkg_setup @@ -145,7 +155,7 @@ kde4-meta_pkg_pretend() { kde4-meta_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - LANG=C [[ $(gcc-version) -le 4.3 ]] && slot_is_at_least 4.6 && die "Sorry, but gcc-4.3 and earlier wont work for >=kde-4.6 (see bug 354837)." + has pkg_pretend ${KDEMETA_EXPF} || kde4-meta_pkg_pretend kde4-base_pkg_setup } |