summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-03-11 01:20:52 -0500
committerMike Frysinger <vapier@gentoo.org>2016-03-11 10:47:53 -0500
commitc27731d51cb57c8193e6c1c581d3d204f124a878 (patch)
tree4b416a9e24cafb5f99953ced410883fc7439b798 /eclass/toolchain-binutils.eclass
parentdev-java/tomcat-native: version bump (diff)
downloadgentoo-c27731d51cb57c8193e6c1c581d3d204f124a878.tar.gz
gentoo-c27731d51cb57c8193e6c1c581d3d204f124a878.tar.bz2
gentoo-c27731d51cb57c8193e6c1c581d3d204f124a878.zip
toolchain-binutils.eclass: use versioned SLOT all the time
Diffstat (limited to 'eclass/toolchain-binutils.eclass')
-rw-r--r--eclass/toolchain-binutils.eclass7
1 files changed, 2 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