diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2024-05-26 10:59:42 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2024-06-01 13:11:35 +0200 |
| commit | 5e1477724ec3e284c05dcbf71c45ca35f1ca100c (patch) | |
| tree | 087dd91415c6c378216d126a20dfa92d3e77f544 | |
| parent | atomic_ofstream: fix follow_symlinks fallback and default file mode (diff) | |
| download | portage-5e1477724ec3e284c05dcbf71c45ca35f1ca100c.tar.gz portage-5e1477724ec3e284c05dcbf71c45ca35f1ca100c.tar.bz2 portage-5e1477724ec3e284c05dcbf71c45ca35f1ca100c.zip | |
eapi.sh: Drop ___eapi_has_dohtml_deprecated()
This was added because of a council decision 10 years ago:
https://projects.gentoo.org/council/meeting-logs/20140909-summary.txt
It has outlived its usefulness since dohtml is banned in EAPI 7 and
later.
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rw-r--r-- | bin/eapi.sh | 6 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/dohtml | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/bin/eapi.sh b/bin/eapi.sh index ae815f3a6..5e894e17d 100644 --- a/bin/eapi.sh +++ b/bin/eapi.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 2012-2023 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # PHASES @@ -80,10 +80,6 @@ ___eapi_has_dohtml() { [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]] } -___eapi_has_dohtml_deprecated() { - [[ ${1-${EAPI-0}} == 6 ]] -} - ___eapi_has_dolib_libopts() { [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]] } diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml index 4d4efd496..b8929ceff 100755 --- a/bin/ebuild-helpers/dohtml +++ b/bin/ebuild-helpers/dohtml @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 2009-2018 Gentoo Foundation +# Copyright 2009-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 @@ -9,10 +9,6 @@ if ! ___eapi_has_dohtml; then exit 1 fi -if ___eapi_has_dohtml_deprecated; then - eqawarn "QA Notice: '${0##*/}' is deprecated in EAPI '${EAPI}'" -fi - # Use safe cwd, avoiding unsafe import for bug #469338. export __PORTAGE_HELPER_CWD=${PWD} cd "${PORTAGE_PYM_PATH}" || die |