1 |
Signed-off-by: Michał Górny <mgorny@g.o> |
2 |
--- |
3 |
eclass/python-r2.eclass | 43 +---------------------------------------- |
4 |
1 file changed, 1 insertion(+), 42 deletions(-) |
5 |
|
6 |
diff --git a/eclass/python-r2.eclass b/eclass/python-r2.eclass |
7 |
index a71ebeba7c54..20d80940c31f 100644 |
8 |
--- a/eclass/python-r2.eclass |
9 |
+++ b/eclass/python-r2.eclass |
10 |
@@ -285,8 +285,7 @@ _python_validate_useflags() { |
11 |
# python_is_python3). Remember to escape or quote the fnmatch patterns |
12 |
# to prevent accidental shell filename expansion. |
13 |
# |
14 |
-# This is an internal function used to implement python_gen_cond_dep |
15 |
-# and deprecated python_gen_usedep. |
16 |
+# This is an internal function used to implement python_gen_cond_dep. |
17 |
_python_gen_usedep() { |
18 |
debug-print-function ${FUNCNAME} "${@}" |
19 |
|
20 |
@@ -307,46 +306,6 @@ _python_gen_usedep() { |
21 |
echo "${out// /,}" |
22 |
} |
23 |
|
24 |
-# @FUNCTION: python_gen_usedep |
25 |
-# @USAGE: <pattern> [...] |
26 |
-# @DESCRIPTION: |
27 |
-# DEPRECATED. Please use python_gen_cond_dep instead. |
28 |
-# |
29 |
-# Output a USE dependency string for Python implementations which |
30 |
-# are both in PYTHON_COMPAT and match any of the patterns passed |
31 |
-# as parameters to the function. |
32 |
-# |
33 |
-# The patterns can be either fnmatch-style patterns (matched via bash |
34 |
-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate |
35 |
-# appropriately all enabled Python 2/3 implementations (alike |
36 |
-# python_is_python3). Remember to escape or quote the fnmatch patterns |
37 |
-# to prevent accidental shell filename expansion. |
38 |
-# |
39 |
-# When all implementations are requested, please use ${PYTHON_USEDEP} |
40 |
-# instead. Please also remember to set an appropriate REQUIRED_USE |
41 |
-# to avoid ineffective USE flags. |
42 |
-# |
43 |
-# Example: |
44 |
-# @CODE |
45 |
-# PYTHON_COMPAT=( python{2_7,3_4} ) |
46 |
-# DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )" |
47 |
-# @CODE |
48 |
-# |
49 |
-# It will cause the dependency to look like: |
50 |
-# @CODE |
51 |
-# DEPEND="doc? ( dev-python/epydoc[python_targets_python2_7?] )" |
52 |
-# @CODE |
53 |
-python_gen_usedep() { |
54 |
- debug-print-function ${FUNCNAME} "${@}" |
55 |
- |
56 |
- # output only once, during some reasonable phase |
57 |
- # (avoid spamming cache regen runs) |
58 |
- if [[ ${EBUILD_PHASE} == setup ]]; then |
59 |
- eqawarn "python_gen_usedep() is deprecated. Please use python_gen_cond_dep instead." |
60 |
- fi |
61 |
- _python_gen_usedep "${@}" |
62 |
-} |
63 |
- |
64 |
# @FUNCTION: python_gen_useflags |
65 |
# @USAGE: [<pattern>...] |
66 |
# @DESCRIPTION: |
67 |
-- |
68 |
2.25.1 |