Signed-off-by: David Seifert <s...@gentoo.org>
---
eclass/docs.eclass | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/eclass/docs.eclass b/eclass/docs.eclass
index 5a63044a864..ed1558bc9a8 100644
--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -7,7 +7,7 @@
# @AUTHOR:
# Author: Andrew Ammerlaan <andrewammerl...@gentoo.org>
# Based on the work of: Michał Górny <mgo...@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: A simple eclass to build documentation.
# @DESCRIPTION:
# A simple eclass providing basic functions and variables to build
@@ -57,15 +57,9 @@
# ...
# @CODE
-case "${EAPI:-0}" in
- 0|1|2|3|4|5)
- die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
- ;;
- 6|7|8)
- ;;
- *)
- die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
- ;;
+case ${EAPI} in
+ 7|8) ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
# @ECLASS_VARIABLE: DOCS_BUILDER
@@ -152,7 +146,8 @@ esac
# will initialize a dummy git repository before compiling. A dependency
# on dev-vcs/git is automatically added.
-if [[ ! ${_DOCS} ]]; then
+if [[ ! ${_DOCS_ECLASS} ]]; then
+_DOCS_ECLASS=1
# For the python based DOCS_BUILDERS we need to inherit any python eclass
case ${DOCS_BUILDER} in
@@ -423,11 +418,7 @@ esac
[[ ${DOCS_INITIALIZE_GIT} ]] && DOCS_DEPEND+=" dev-vcs/git "
-if [[ ${EAPI} != 6 ]]; then
- BDEPEND+=" doc? ( ${DOCS_DEPEND} )"
-else
- DEPEND+=" doc? ( ${DOCS_DEPEND} )"
-fi
+BDEPEND+=" doc? ( ${DOCS_DEPEND} )"
# If this is a python package using distutils-r1
# then put the compile function in the specific
@@ -437,5 +428,4 @@ if [[ ${_DISTUTILS_R1} && ( ${DOCS_BUILDER}="mkdocs" ||
${DOCS_BUILDER}="sphinx"
python_compile_all() { docs_compile; }
fi
-_DOCS=1
fi
--
2.39.0
