--- toolchain.eclass.orig 2015-02-18 19:06:35.751355331 -0500 +++ toolchain.eclass.orig 2015-02-18 19:09:18.605344047 -0500 @@ -146,8 +146,8 @@ tc_version_is_at_least 4.1 && IUSE+=" libssp objc++" tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp ) tc_version_is_at_least 4.3 && IUSE+=" fixed-point" - tc_version_is_at_least 4.6 && IUSE+=" graphite" tc_version_is_at_least 4.7 && IUSE+=" go" + tc_version_is_at_least 4.8 && IUSE+=" graphite" tc_version_is_at_least 4.8 && IUSE_DEF+=( sanitize ) fi @@ -180,19 +180,11 @@ tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1" if in_iuse graphite ; then - if tc_version_is_at_least 4.8 ; then - RDEPEND+=" - graphite? ( - >=dev-libs/cloog-0.18.0 - >=dev-libs/isl-0.11.1 - )" - else - RDEPEND+=" - graphite? ( - >=dev-libs/cloog-ppl-0.15.10 - >=dev-libs/ppl-0.11 - )" - fi + RDEPEND+=" + graphite? ( + >=dev-libs/cloog-0.18.0 + >=dev-libs/isl-0.11.1 + )" fi DEPEND="${RDEPEND} @@ -1182,22 +1174,10 @@ confgcc+=( --disable-lto ) fi - # graphite was added in 4.4 but we only support it in 4.6+ due to external - # library issues. 4.6/4.7 uses cloog-ppl which is a fork of CLooG with a - # PPL backend. 4.8+ uses upstream CLooG with the ISL backend. We install - # cloog-ppl into a non-standard location to prevent collisions. - if tc_version_is_at_least 4.8 ; then - confgcc+=( $(use_with graphite cloog) ) - use graphite && confgcc+=( --disable-isl-version-check ) - elif tc_version_is_at_least 4.6 ; then - confgcc+=( $(use_with graphite cloog) ) - confgcc+=( $(use_with graphite ppl) ) - use graphite && confgcc+=( --with-cloog-include=/usr/include/cloog-ppl ) - use graphite && confgcc+=( --disable-ppl-version-check ) - elif tc_version_is_at_least 4.4 ; then - confgcc+=( --without-cloog ) - confgcc+=( --without-ppl ) - fi + # graphite was added in 4.4 but we only support it in 4.8+ due to external + # library issues. + confgcc+=( $(use_with graphite cloog) ) + use graphite && confgcc+=( --disable-isl-version-check ) if tc_version_is_at_least 4.8 ; then confgcc+=( $(use_enable sanitize libsanitizer) )