[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sergei Trofimovich]

commit:     89cbb961c926fee68cb451c9b649ff97ae9359f6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 17:43:09 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu May  3 20:45:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89cbb961

toolchain.eclass: drop IUSE=gcj from gcc-7 (removed upstream)

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 eclass/toolchain.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index f889c0f44cb..2cac026eefa 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -137,7 +137,8 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
        [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
        [[ -n ${D_VER}   ]] && IUSE+=" d"
        [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
-       tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"
+       tc_version_is_at_least 3 && IUSE+=" doc hardened multilib objc"
+       tc_version_is_between 3 7 && IUSE+=" awt gcj"
        tc_version_is_at_least 3.3 && IUSE+=" pgo"
        tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
        tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"