Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: python@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH v2 02/20] distutils-r2.eclass: Remove EXAMPLES
Date: Thu, 05 Mar 2020 15:11:57
Message-Id: 20200305151024.125834-3-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH v2 00/20] python-r2 suite by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/distutils-r2.eclass | 28 +---------------------------
4 1 file changed, 1 insertion(+), 27 deletions(-)
5
6 diff --git a/eclass/distutils-r2.eclass b/eclass/distutils-r2.eclass
7 index 559ca2b72c1c..4995c95ea604 100644
8 --- a/eclass/distutils-r2.eclass
9 +++ b/eclass/distutils-r2.eclass
10 @@ -201,26 +201,6 @@ unset -f _distutils_set_globals
11 # HTML_DOCS=( doc/html/. )
12 # @CODE
13
14 -# @ECLASS-VARIABLE: EXAMPLES
15 -# @DEFAULT_UNSET
16 -# @DESCRIPTION:
17 -# OBSOLETE: this variable is deprecated and banned in EAPI 6
18 -#
19 -# An array containing examples installed into 'examples' doc
20 -# subdirectory. The files and directories listed there must exist
21 -# in the directory from which distutils-r2_python_install_all() is run
22 -# (${S} by default).
23 -#
24 -# The 'examples' subdirectory will be marked not to be compressed
25 -# automatically.
26 -#
27 -# If unset, no examples will be installed.
28 -#
29 -# Example:
30 -# @CODE
31 -# EXAMPLES=( examples/. demos/. )
32 -# @CODE
33 -
34 # @ECLASS-VARIABLE: DISTUTILS_IN_SOURCE_BUILD
35 # @DEFAULT_UNSET
36 # @DESCRIPTION:
37 @@ -911,13 +891,7 @@ distutils-r2_python_install_all() {
38 einstalldocs
39
40 if declare -p EXAMPLES &>/dev/null; then
41 - [[ ${EAPI} != [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}"
42 -
43 - (
44 - docinto examples
45 - dodoc -r "${EXAMPLES[@]}"
46 - )
47 - docompress -x "/usr/share/doc/${PF}/examples"
48 + die "EXAMPLES are no longer supported in distutils-r2"
49 fi
50 }
51
52 --
53 2.25.1