diff options
| -rwxr-xr-x | bin/repoman | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bin/repoman b/bin/repoman index 54504faac..ffa2a8478 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1124,6 +1124,7 @@ _constant_checks = tuple((c() for c in ( _iuse_def_re = re.compile(r'^IUSE=.*') _comment_re = re.compile(r'(^|\s*)#') +_inherit_autotools_re = re.compile(r'^\s*inherit\s(.*\s)?autotools(\s|$)') _autotools_funcs = ( "eaclocal", "eautoconf", "eautoheader", "eautomake", "eautoreconf", "_elibtoolize") @@ -1132,17 +1133,15 @@ _autotools_func_re = re.compile(r'(^|\s)(' + \ def run_checks(contents, pkg): iuse_def = None - inherit_autotools = "autotools" in pkg.inherited - if inherit_autotools: - if "apache-2" in pkg.inherited: - # eautoreconf is called by apache-2_src_unpack(), - # so the ebuild doesn't need to call it. - inherit_autotools = False + inherit_autotools = None autotools_func_call = None for num, line in enumerate(contents): comment = _comment_re.match(line) if comment is None: - if inherit_autotools and autotools_func_call is None: + if inherit_autotools is None: + inherit_autotools = _inherit_autotools_re.match(line) + if inherit_autotools is not None and \ + autotools_func_call is None: autotools_func_call = _autotools_func_re.search(line) if iuse_def is None: iuse_def = _iuse_def_re.match(line) |