toolchain-binutils.eclass: use versioned SLOT all the time

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 9d513ad0c4de1cc3938231069592389d69ab4247..a23300ffda0f9f56e27c55eb1b9237a6a586b931 100644 (file)
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -92,15 +92,12 @@ IUSE="cxx multislot multitarget nls static-libs test vanilla"
 if version_is_at_least 2.19 ; then
        IUSE+=" zlib"
 fi
-if ! version_is_at_least 2.25 || [[ ${BTYPE} != "rel" ]] || is_cross || use multislot ; then
-       SLOT="${BVER}"
-else
-       SLOT="0"
-fi
+SLOT="${BVER}"
 
 RDEPEND=">=sys-devel/binutils-config-3"
 in_iuse zlib && RDEPEND+=" zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
+       !multislot? ( !<${CATEGORY}/${P} )
        test? ( dev-util/dejagnu )
        nls? ( sys-devel/gettext )
        sys-devel/flex

diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index 7256c7d6c9b6a4292c30279233d2a712595cce35..cd9ffc6c5c68db15052b7ec1e076ad85aef49eb3 100644 (file)
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -29,3 +29,4 @@ move dev-perl/net-sftp dev-perl/Net-SFTP
 move dev-perl/net-ssh-perl dev-perl/Net-SSH-Perl
 move dev-perl/DateManip dev-perl/Date-Manip
 move dev-perl/wxperl dev-perl/Wx
+slotmove sys-devel/binutils 0 2.25.1