From: Sebastian Pipping <sping@gentoo.org>
Date: Mon, 13 Jan 2020 18:56:12 +0000 (+0100)
Subject: distutils-r1.eclass: Fix detection of setuptools entry_points
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=aeefba0eeea1e6f03173331edcc26bf8c2f2a215;p=gentoo.git

distutils-r1.eclass: Fix detection of setuptools entry_points

Closes: https://bugs.gentoo.org/705362
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
---

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 65294a065da7..302651858352 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -447,7 +447,7 @@ _distutils_verify_use_setuptools() {
 		# as a special case, setuptools provides itself ;-)
 		:
 	elif grep -E -q -s '(from|import)\s+setuptools' setup.py; then
-		if grep -E -q -s 'entry_points\s+=' setup.py; then
+		if grep -E -q -s 'entry_points\s*=' setup.py; then
 			expected=rdepend
 		else
 			expected=bdepend