diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-03 22:39:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-03 22:39:47 +0100 |
| commit | 7f0ccc917c7abe6223784c703d86cd14755691fb (patch) | |
| tree | 8c6793f68896b341e22f33d7e6cef88e481f4a8b /metadata/install-qa-check.d | |
| parent | 9aa80713372911cec499b3adb2cd746790920916 (diff) | |
gentoo resync : 03.07.2021
Diffstat (limited to 'metadata/install-qa-check.d')
| -rw-r--r-- | metadata/install-qa-check.d/60distutils-use-setuptools | 9 | ||||
| -rw-r--r-- | metadata/install-qa-check.d/60libcrypt-deps | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools b/metadata/install-qa-check.d/60distutils-use-setuptools index d08be885eb8e..25300fddda90 100644 --- a/metadata/install-qa-check.d/60distutils-use-setuptools +++ b/metadata/install-qa-check.d/60distutils-use-setuptools @@ -12,6 +12,15 @@ distutils_use_setuptools_check() { # pyproject.toml is verified by using it [[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]] && return + # setuptools dep is not set if distutils is optional + if [[ ${DISTUTILS_OPTIONAL} ]]; then + if [[ ${DISTUTILS_USE_SETUPTOOLS} != bdepend ]]; then + eerror "QA Notice: DISTUTILS_USE_SETUPTOOLS is not used when DISTUTILS_OPTIONAL" + eerror "is enabled." + fi + return + fi + local expected=() for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do local EPYTHON PYTHON diff --git a/metadata/install-qa-check.d/60libcrypt-deps b/metadata/install-qa-check.d/60libcrypt-deps index 26120f7cb8e7..5c45ff772ab5 100644 --- a/metadata/install-qa-check.d/60libcrypt-deps +++ b/metadata/install-qa-check.d/60libcrypt-deps @@ -17,7 +17,7 @@ libcrypt_check() { ;; esac - if grep -q "virtual/libcrypt" <<<${RDEPEND}; then + if grep -q -E "virtual/libcrypt|sys-libs/libxcrypt" <<<${RDEPEND}; then # nothing to do here return fi |