commit: 9326ac37c0163b111397594c289e728f3dcd4ad7 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Sep 21 14:35:47 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Mar 4 21:03:52 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9326ac37
Ban dohtml for EAPI 7 Bug: https://bugs.gentoo.org/show_bug.cgi?id=520546 bin/eapi.sh | 6 +++++- bin/ebuild-helpers/dohtml | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/eapi.sh b/bin/eapi.sh index 7d35852cd..38d91a17f 100644 --- a/bin/eapi.sh +++ b/bin/eapi.sh @@ -52,8 +52,12 @@ ___eapi_has_einstall() { [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress)$ ]] } +___eapi_has_dohtml() { + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress|6)$ ]] +} + ___eapi_has_dohtml_deprecated() { - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress)$ ]] + [[ ${1-${EAPI-0}} == 6 ]] } ___eapi_has_docompress() { diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml index 860d4abbe..49d6a6dfb 100755 --- a/bin/ebuild-helpers/dohtml +++ b/bin/ebuild-helpers/dohtml @@ -1,9 +1,14 @@ #!/bin/bash -# Copyright 2009-2013 Gentoo Foundation +# Copyright 2009-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 +if ! ___eapi_has_dohtml; then + die "'${0##*/}' has been banned for EAPI '$EAPI'" + exit 1 +fi + if ___eapi_has_dohtml_deprecated; then eqawarn "'${0##*/}' is deprecated in EAPI '$EAPI'" fi
