From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 14 Jun 2008 13:15:44 +0000 (-0000)
Subject: Fix the 'inherit.autotools' check to account for apache-2_src_unpack()
X-Git-Tag: v2.2_rc1~38
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1947be0908f43bb644df6439e94e8aa0afbf19ee;p=portage.git

Fix the 'inherit.autotools' check to account for apache-2_src_unpack()
calling eautoreconf.

svn path=/main/trunk/; revision=10653
---

diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index e340a57f3..0f339adbc 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -230,6 +230,11 @@ def run_checks(contents, pkg):
 	checks.append(EbuildHeader(pkg.mtime))
 	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)