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

hanetzer · Mar 11, 2016 · c27731d · c27731d
1 parent 812dabc
commit c27731d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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