- consolidate noman noinfo nodoc into a simple loop and use INSTALL_MASK. Add debug...

svn path=/main/trunk/; revision=2473

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 55d456b0ac23d7115aeefebad523cb39bee037c9..bf785ae7ae266eb3f8bd29ca4ee2c814894332e1 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1177,7 +1177,7 @@ dyn_install() {
 
        if hasq multilib-strict ${FEATURES} && [ -x /usr/bin/file -a -x /usr/bin/find -a \
             -n "${MULTILIB_STRICT_DIRS}" -a -n "${MULTILIB_STRICT_DENY}" ]; then
-               MULTILIB_STRICT_EXEMPT=${MULTILIB_STRICT_EXEMPT:-"(perl5|gcc|gcc-lib)"}
+               MULTILIB_STRICT_EXEMPT=${MULTILIB_STRICT_EXEMPT:-"(perl5|gcc|gcc-lib|debug)"}
                for dir in ${MULTILIB_STRICT_DIRS}; do
                        [ -d "${D}/${dir}" ] || continue
                        for file in $(find ${D}/${dir} -type f | egrep -v "^${D}/${dir}/${MULTILIB_STRICT_EXEMPT}"); do
@@ -1204,7 +1204,13 @@ dyn_preinst() {
        declare -r D=${IMAGE}
        pkg_preinst
 
-       # hopefully this will someday allow us to get rid of the no* feature flags
+       # remove man pages, info pages, docs if requested
+       for f in man info doc; do
+               if hasq no${f} $FEATURES; then
+                       INSTALL_MASK="${INSTALL_MASK} /usr/share/${f}"
+               fi
+       done
+
        # we don't want globbing for initial expansion, but afterwards, we do
        local shopts=$-
        set -o noglob
@@ -1221,21 +1227,6 @@ dyn_preinst() {
        set +o noglob
        set -${shopts}
 
-       # remove man pages
-       if hasq noman $FEATURES; then
-               rm -fR "${IMAGE}/usr/share/man"
-       fi
-
-       # remove info pages
-       if hasq noinfo $FEATURES; then
-               rm -fR "${IMAGE}/usr/share/info"
-       fi
-
-       # remove docs
-       if hasq nodoc $FEATURES; then
-               rm -fR "${IMAGE}/usr/share/doc"
-       fi
-
        # remove share dir if unnessesary
        if hasq nodoc $FEATURES -o hasq noman $FEATURES -o hasq noinfo $FEATURES; then
                rmdir "${IMAGE}/usr/share" &> /dev/null