toolchain-binutils.eclass: handle zlib better across multiple versions #591516

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 2445a722b7be979c037b41f5965417c8deafa159..a16eab7d90c84f0b24c5f983057e6d7dd80b6af8 100644 (file)
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -89,13 +89,17 @@ else
        LICENSE="|| ( GPL-2 LGPL-2 )"
 fi
 IUSE="cxx multitarget nls static-libs test vanilla"
-if ! version_is_at_least 2.26 ; then
+if version_is_at_least 2.19 && ! version_is_at_least 2.26 ; then
        IUSE+=" zlib"
 fi
 SLOT="${BVER}"
 
 RDEPEND=">=sys-devel/binutils-config-3"
-in_iuse zlib && RDEPEND+=" zlib? ( sys-libs/zlib )"
+if in_iuse zlib ; then
+       RDEPEND+=" zlib? ( sys-libs/zlib )"
+elif version_is_at_least 2.26 ; then
+       RDEPEND+=" sys-libs/zlib"
+fi
 DEPEND="${RDEPEND}
        test? ( dev-util/dejagnu )
        nls? ( sys-devel/gettext )
@@ -263,7 +267,7 @@ toolchain-binutils_src_configure() {
                # older versions did not have an explicit configure flag
                export ac_cv_search_zlibVersion=$(usex zlib -lz no)
                myconf+=( $(use_with zlib) )
-       else
+       elif version_is_at_least 2.26 ; then
                myconf+=( --with-system-zlib )
        fi