[gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/

[Michał Górny]

commit:     9652aac4adf41834b6afabcc8a09b80c4e598592
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 06:59:06 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 07:00:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9652aac4

install-qa-check.d: Allow bdepend/rdepend mix in DUS check

Allow DISTUTILS_USE_SETUPTOOLS guess to partially evaluate to bdepend
and partially to rdepend.  That is the case in dev-python/hypothesis
that installs CLI tools for CPython but not PyPy3.  In this case,
rdepend is the expected value.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 metadata/install-qa-check.d/60distutils-use-setuptools | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools 
b/metadata/install-qa-check.d/60distutils-use-setuptools
index cc3434f586c..551cb0f0b6c 100644
--- a/metadata/install-qa-check.d/60distutils-use-setuptools
+++ b/metadata/install-qa-check.d/60distutils-use-setuptools
@@ -26,8 +26,15 @@ get_expected_distutils_use_setuptools() {
                fi
 
                if [[ ${expected} && ${new_expected} != ${expected} ]]; then
-                       integrity_error_new=${new_expected}
-                       return 1
+                       if [[ ${expected}${new_expected} == 
[br]depend[br]depend ]]
+                       then
+                               # packages can have scripts that are installed
+                               # conditionally to implementation
+                               expected=rdepend
+                       else
+                               integrity_error_new=${new_expected}
+                               return 1
+                       fi
                else
                        expected=${new_expected}
                fi