diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index bbdcf8db20f44..6e64a9be14623 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -637,7 +637,7 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" kde4-base_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - if has handbook ${IUSE} || has "+handbook" ${IUSE} && [ "${KDE_HANDBOOK}" != optional ] ; then + if has handbook ${IUSE} || has "+handbook" ${IUSE} && [[ "${KDE_HANDBOOK}" != optional ]] ; then eqawarn "Handbook support is enabled via KDE_HANDBOOK=optional in the ebuild." eqawarn "Please do not just set IUSE=handbook, as this leads to dependency errors." fi @@ -645,16 +645,6 @@ kde4-base_pkg_setup() { # Don't set KDEHOME during compilation, it will cause access violations unset KDEHOME - # Check if gcc compiler is fresh enough. - # 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 (ie. when merging 300 packages at once will cause 300 checks) - if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 6 ]] ) \ - && die "Sorry, but gcc-4.6 and earlier wont work for some KDE packages." - fi - KDEDIR=/usr : ${PREFIX:=/usr} EKDEDIR=${EPREFIX}/usr