Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 30 Jun 2021 08:56:10
Message-Id: 1625043364.9e47616fdcd6c62e5a4293d37d78896db4bc9bdd.andrewammerlaan@gentoo
1 commit: 9e47616fdcd6c62e5a4293d37d78896db4bc9bdd
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 25 17:30:26 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 30 08:56:04 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e47616f
7
8 eclass/docs.eclass: EAPI 8 support
9
10 Add support for EAPI 8, and update the PYTHON_COMPAT var in example.
11
12 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
13
14 eclass/docs.eclass | 8 ++++----
15 1 file changed, 4 insertions(+), 4 deletions(-)
16
17 diff --git a/eclass/docs.eclass b/eclass/docs.eclass
18 index 7ee7a11ca5e..f49c6aeab9d 100644
19 --- a/eclass/docs.eclass
20 +++ b/eclass/docs.eclass
21 @@ -7,7 +7,7 @@
22 # @AUTHOR:
23 # Author: Andrew Ammerlaan <andrewammerlaan@g.o>
24 # Based on the work of: Michał Górny <mgorny@g.o>
25 -# @SUPPORTED_EAPIS: 6 7
26 +# @SUPPORTED_EAPIS: 6 7 8
27 # @BLURB: A simple eclass to build documentation.
28 # @DESCRIPTION:
29 # A simple eclass providing basic functions and variables to build
30 @@ -50,7 +50,7 @@
31 # DOCS_DEPEND="dev-python/mkdocs-material"
32 # DOCS_DIR="doc"
33 #
34 -# PYTHON_COMPAT=( python3_{7,8,9} )
35 +# PYTHON_COMPAT=( python3_{8..10} )
36 #
37 # inherit distutils-r1 docs
38 #
39 @@ -61,7 +61,7 @@ case "${EAPI:-0}" in
40 0|1|2|3|4|5)
41 die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
42 ;;
43 - 6|7)
44 + 6|7|8)
45 ;;
46 *)
47 die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
48 @@ -378,7 +378,7 @@ case ${DOCS_BUILDER} in
49 ;;
50 esac
51
52 -if [[ ${EAPI} == [7] ]]; then
53 +if [[ ${EAPI} == [7,8] ]]; then
54 BDEPEND+=" doc? ( ${DOCS_DEPEND} )"
55 else
56 DEPEND+=" doc? ( ${DOCS_DEPEND} )"