commit: c35ee2746e3f200d4f2d7472b13920d3dad4284d
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 06:06:22 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 06:06:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35ee274
eclass: Exchange obsolete and depreacted Python ABIs in documentation
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
eclass/python-any-r1.eclass | 8 ++++----
eclass/python-r1.eclass | 24 ++++++++++++------------
eclass/python-single-r1.eclass | 27 ++++++++++++++++-----------
3 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index e4eb2ed..0f641a8 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -191,10 +191,10 @@ _python_build_set_globals
#
dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
)
# )
# (
-# dev-lang/python:2.6
-#
dev-python/foo[python_targets_python2_6(-)?,python_single_target_python2_6(+)?]
-# || (
dev-python/bar[python_targets_python2_6(-)?,python_single_target_python2_6(+)?]
-#
dev-python/baz[python_targets_python2_6(-)?,python_single_target_python2_6(+)?]
)
+# dev-lang/python:3.3
+#
dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?]
+# || (
dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?]
+#
dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?]
)
# )
# )
# @CODE
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 82016c5..7113cfa 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -74,12 +74,12 @@ inherit multibuild python-utils-r1
#
# Example:
# @CODE
-# PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+# PYTHON_COMPAT=( python2_7 python3_3 python3_4} )
# @CODE
#
# Please note that you can also use bash brace expansion if you like:
# @CODE
-# PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+# PYTHON_COMPAT=( python2_7 python3_{3,4} )
# @CODE
if ! declare -p PYTHON_COMPAT &>/dev/null; then
die 'PYTHON_COMPAT not declared.'
@@ -139,8 +139,8 @@ fi
# Example value:
# @CODE
# dev-lang/python-exec:=
-# python_targets_python2_6? ( dev-lang/python:2.6[gdbm] )
# python_targets_python2_7? ( dev-lang/python:2.7[gdbm] )
+# python_targets_pypy? ( virtual/pypy[gdbm] )
# @CODE
# @ECLASS-VARIABLE: PYTHON_USEDEP
@@ -160,7 +160,7 @@ fi
#
# Example value:
# @CODE
-# python_targets_python2_6(-)?,python_targets_python2_7(-)?
+# python_targets_python2_7(-)?,python_targets_python3_4(-)?
# @CODE
# @ECLASS-VARIABLE: PYTHON_REQUIRED_USE
@@ -178,7 +178,7 @@ fi
#
# Example value:
# @CODE
-# || ( python_targets_python2_6 python_targets_python2_7 )
+# || ( python_targets_python2_7 python_targets_python3_4 )
# @CODE
_python_set_globals() {
@@ -355,17 +355,17 @@ python_gen_useflags() {
#
# Example:
# @CODE
-# PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+# PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy )
# RDEPEND="$(python_gen_cond_dep \
-# 'dev-python/unittest2[${PYTHON_USEDEP}]' python{2_5,2_6})"
+# 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy )"
# @CODE
#
# It will cause the variable to look like:
# @CODE
-# RDEPEND="python_targets_python2_5? (
-# dev-python/unittest2[python_targets_python2_5?] )
-# python_targets_python2_6? (
-# dev-python/unittest2[python_targets_python2_6?] )"
+# RDEPEND="python_targets_python2_7? (
+# dev-python/unittest2[python_targets_python2_7?] )
+# python_targets_pypy? (
+# dev-python/unittest2[python_targets_pypy?] )"
# @CODE
python_gen_cond_dep() {
debug-print-function ${FUNCNAME} "${@}"
@@ -410,7 +410,7 @@ python_gen_cond_dep() {
#
# Example value:
# @CODE
-# ${WORKDIR}/foo-1.3-python2_6
+# ${WORKDIR}/foo-1.3-python2_7
# @CODE
# @FUNCTION: python_copy_sources
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 4dec9f9..132d407 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -88,7 +88,12 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
#
# Example:
# @CODE
-# PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+# PYTHON_COMPAT=( python2_7 python3_3 python3_4} )
+# @CODE
+#
+# Please note that you can also use bash brace expansion if you like:
+# @CODE
+# PYTHON_COMPAT=( python2_7 python3_{3,4} )
# @CODE
if ! declare -p PYTHON_COMPAT &>/dev/null; then
die 'PYTHON_COMPAT not declared.'
@@ -131,8 +136,8 @@ fi
# Example value:
# @CODE
# dev-lang/python-exec:=
-# python_single_target_python2_6? ( dev-lang/python:2.6[gdbm] )
# python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] )
+# python_single_target_pypy? ( virtual/pypy[gdbm] )
# @CODE
# @ECLASS-VARIABLE: PYTHON_USEDEP
@@ -152,7 +157,7 @@ fi
#
# Example value:
# @CODE
-# python_targets_python2_7(-)?,python_single_target_python2_7(+)?
+# python_targets_python2_7(-)?,python_single_target_python3_4(+)?
# @CODE
# @ECLASS-VARIABLE: PYTHON_REQUIRED_USE
@@ -172,9 +177,9 @@ fi
#
# Example value:
# @CODE
-# python_single_target_python2_6? ( python_targets_python2_6 )
# python_single_target_python2_7? ( python_targets_python2_7 )
-# ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
+# python_single_target_python3_3? ( python_targets_python3_3 )
+# ^^ ( python_single_target_python2_7 python_single_target_python3_3 )
# @CODE
_python_single_set_globals() {
@@ -349,17 +354,17 @@ python_gen_useflags() {
#
# Example:
# @CODE
-# PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+# PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy )
# RDEPEND="$(python_gen_cond_dep \
-# 'dev-python/unittest2[${PYTHON_USEDEP}]' python{2_5,2_6})"
+# 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy )"
# @CODE
#
# It will cause the variable to look like:
# @CODE
-# RDEPEND="python_single_target_python2_5? (
-# dev-python/unittest2[python_targets_python2_5(-)?,...] )
-# python_single_target_python2_6? (
-# dev-python/unittest2[python_targets_python2_6(-)?,...] )"
+# RDEPEND="python_single_target_python2_7? (
+# dev-python/unittest2[python_targets_python2_7(-)?,...] )
+# python_single_target_pypy? (
+# dev-python/unittest2[python_targets_pypy(-)?,...] )"
# @CODE
python_gen_cond_dep() {
debug-print-function ${FUNCNAME} "${@}"
