EAPI 5: econf --disable-silent-rules

See bug #379497 and the PMS patch:
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=b7750e67b4772c1064543defb7df6a556f09807b

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 3230870c211733fc282a2bdeb0d5af96680497c0..db1548ee2f17a168361b2419e31336f9204b99ef 100644 (file)
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -421,11 +421,29 @@ econf() {
                fi
 
                # EAPI=4 adds --disable-dependency-tracking to econf
-               if ! has "$EAPI" 0 1 2 3 && \
-                       "${ECONF_SOURCE}/configure" --help 2>/dev/null | \
-                       grep -q disable-dependency-tracking ; then
-                       set -- --disable-dependency-tracking "$@"
-               fi
+               case "${EAPI}" in
+                       0|1|2|3)
+                               ;;
+                       *)
+                               local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null)
+                               case "${conf_help}" in
+                                       *--disable-dependency-tracking*)
+                                               set -- --disable-dependency-tracking "$@"
+                                               ;;
+                               esac
+                               case "${EAPI}" in
+                                       4|4-python|4-slot-abi)
+                                               ;;
+                                       *)
+                                               case "${conf_help}" in
+                                                       *--disable-silent-rules*)
+                                                               set -- --disable-silent-rules "$@"
+                                                               ;;
+                                               esac
+                                               ;;
+                               esac
+                               ;;
+               esac
 
                # if the profile defines a location to install libs to aside from default, pass it on.
                # if the ebuild passes in --libdir, they're responsible for the conf_libdir fun.