summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-16 10:54:51 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-16 10:54:51 +0000
commitcdd2f8408101ca9368eeeaed453c85deb94d2c8d (patch)
treecb576260a6c2b8d40563668eeb1ed06377d7d8d3
parentf8a3d769f483aa6a43b2710d6ac3500ec65d3aed (diff)
downloadportage-cdd2f8408101ca9368eeeaed453c85deb94d2c8d.tar.gz
portage-cdd2f8408101ca9368eeeaed453c85deb94d2c8d.tar.bz2
portage-cdd2f8408101ca9368eeeaed453c85deb94d2c8d.zip
Fix the 'inherit.autotools' check to account for apache-2_src_unpack()
calling eautoreconf. (trunk r10653) svn path=/main/branches/2.1.2/; revision=10664
-rwxr-xr-xbin/repoman5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/repoman b/bin/repoman
index 60e10dc4c..54504faac 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1133,6 +1133,11 @@ _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
autotools_func_call = None
for num, line in enumerate(contents):
comment = _comment_re.match(line)