From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 19 Jun 2008 04:00:59 +0000 (-0000)
Subject: As suggested by remi`, make the 'inherit.autotools' check only ebuilds that
X-Git-Tag: v2.1.4.5~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1499b1f1f926bdbfce5e0fb8696b3118db5b4291;p=portage.git

As suggested by remi`, make the 'inherit.autotools' check only ebuilds that
inherit the autotools eclass directly (rather than indirectly through an
eclass such as apache-2 or x-modular). (trunk r10713:10715)

svn path=/main/branches/2.1.2/; revision=10721
---

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)