commit: 17a5eec31983efe168a5e157f58b59fd736fb4e7
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun Sep 20 01:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 16:05:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a5eec3
dev-util/gyp: Add support for Python 3.8.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/gyp/gyp-20200512145953.ebuild | 13 ++++++++++++-
dev-util/gyp/gyp-99999999999999.ebuild | 17 ++++++++++++++---
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/dev-util/gyp/gyp-20200512145953.ebuild
b/dev-util/gyp/gyp-20200512145953.ebuild
index 95e9e43a2ee..12db11a3d62 100644
--- a/dev-util/gyp/gyp-20200512145953.ebuild
+++ b/dev-util/gyp/gyp-20200512145953.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_SINGLE_IMPL="1"
DISTUTILS_USE_SETUPTOOLS="rdepend"
@@ -31,6 +31,17 @@ BDEPEND=""
DEPEND=""
RDEPEND=""
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ sed -e "s/' Linux %s' % ' '\.join(platform.linux_distribution())/'
Linux'/" -i gyptest.py || die
+ sed -e "s/the_dict_key is 'variables'/the_dict_key == 'variables'/" -i
pylib/gyp/input.py || die
+ sed \
+ -e "s/os\.environ\['PRESERVE'\] is not
''/os.environ['PRESERVE'] != ''/" \
+ -e "s/conditions is ()/conditions == ()/" \
+ -i test/lib/TestCmd.py || die
+}
+
python_test() {
# More errors with DeprecationWarnings enabled.
local -x PYTHONWARNINGS=""
diff --git a/dev-util/gyp/gyp-99999999999999.ebuild
b/dev-util/gyp/gyp-99999999999999.ebuild
index da57f66635d..bf36a597b2c 100644
--- a/dev-util/gyp/gyp-99999999999999.ebuild
+++ b/dev-util/gyp/gyp-99999999999999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
DISTUTILS_SINGLE_IMPL="1"
DISTUTILS_USE_SETUPTOOLS="rdepend"
@@ -31,8 +31,19 @@ BDEPEND=""
DEPEND=""
RDEPEND=""
-src_test() {
- # More errors when DeprecationWarnings enabled.
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ sed -e "s/' Linux %s' % ' '\.join(platform.linux_distribution())/'
Linux'/" -i gyptest.py || die
+ sed -e "s/the_dict_key is 'variables'/the_dict_key == 'variables'/" -i
pylib/gyp/input.py || die
+ sed \
+ -e "s/os\.environ\['PRESERVE'\] is not
''/os.environ['PRESERVE'] != ''/" \
+ -e "s/conditions is ()/conditions == ()/" \
+ -i test/lib/TestCmd.py || die
+}
+
+python_test() {
+ # More errors with DeprecationWarnings enabled.
local -x PYTHONWARNINGS=""
"${PYTHON}" gyptest.py --all --verbose