From c27731d51cb57c8193e6c1c581d3d204f124a878 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 11 Mar 2016 01:20:52 -0500 Subject: [PATCH] toolchain-binutils.eclass: use versioned SLOT all the time --- eclass/toolchain-binutils.eclass | 7 ++----- profiles/updates/1Q-2016 | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 9d513ad0c4de..a23300ffda0f 100644 --- 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 7256c7d6c9b6..cd9ffc6c5c68 100644 --- 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 -- 2.26.2