let portage handle FEATURES="noman noinfo" #278749

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 16c1eca0acfe956bbc140adbdbe27bff62482571..7f25920ec2ff0fbd315c4012c8dd30586a446933 100644 (file)
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.89 2010/01/28 00:25:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.90 2010/03/07 16:32:07 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 #
@@ -230,10 +230,8 @@ toolchain-binutils_src_compile() {
 
        # only build info pages if we user wants them, and if
        # we have makeinfo (may not exist when we bootstrap)
-       if ! has noinfo ${FEATURES} ; then
-               if type -p makeinfo > /dev/null ; then
-                       emake info || die "make info failed"
-               fi
+       if type -p makeinfo > /dev/null ; then
+               emake info || die "make info failed"
        fi
        # we nuke the manpages when we're left with junk
        # (like when we bootstrap, no perl -> no manpages)
@@ -365,9 +363,6 @@ toolchain-binutils_src_install() {
                docinto opcodes
                dodoc opcodes/ChangeLog*
        fi
-       # Punt all the fun stuff if user doesn't want it :)
-       has noinfo ${FEATURES} && rm -r "${D}"/${DATAPATH}/info
-       has noman ${FEATURES} && rm -r "${D}"/${DATAPATH}/man
        # Remove shared info pages
        rm -f "${D}"/${DATAPATH}/info/{dir,configure.info,standards.info}
        # Trim all empty dirs