From a49b8dc91a4fd6911ff2462236a476f5440a90aa Mon Sep 17 00:00:00 2001 From: blshkv Date: Sun, 10 Feb 2019 10:50:39 +0800 Subject: [PATCH] profile: unmask and keyword ipython v7.2* and kids with prompt_toolkit 2 support --- profiles/pentoo/base/package.accept_keywords/dev-python | 4 ++++ profiles/pentoo/base/package.accept_keywords/dev-util | 8 ++++---- profiles/pentoo/base/package.unmask | 3 +++ profiles/pentoo/base/package.use/dev-python | 8 ++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python index 233ade89e..a27448628 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-python +++ b/profiles/pentoo/base/package.accept_keywords/dev-python @@ -323,3 +323,7 @@ dev-python/htmlentities #required by qark ~dev-python/javalang-0.12.0 + +#~dev-util/frida-tools-1.2.3 +~dev-python/backcall-0.1.0 +~dev-python/ipython-7.2.0 diff --git a/profiles/pentoo/base/package.accept_keywords/dev-util b/profiles/pentoo/base/package.accept_keywords/dev-util index 37cb82b5d..8e06c84ef 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-util +++ b/profiles/pentoo/base/package.accept_keywords/dev-util @@ -41,13 +41,13 @@ dev-util/intel-ocl-sdk ~dev-util/dependency-check-bin-3.3.2 -#1.2.3 requires prompt_toolkit 2 which breaks ipython which breaks androguard -~dev-util/frida-tools-1.2.2 +#1.2.3 requires prompt_toolkit 2 +>=dev-util/frida-tools-1.2.3 +#~dev-util/objection-1.4.1 +=dev-util/objection-1.4.1_p* dev-util/gn amd64 -~dev-util/objection-1.4.1 - dev-util/appmon ~dev-util/electron-packager-13.0.1 diff --git a/profiles/pentoo/base/package.unmask b/profiles/pentoo/base/package.unmask index 5a09ffe6d..661e6c34e 100644 --- a/profiles/pentoo/base/package.unmask +++ b/profiles/pentoo/base/package.unmask @@ -14,3 +14,6 @@ app-forensics/libewf net-analyzer/w3af app-forensics/libbfio + +#required for dev-python/prompt_toolkit 2 +=dev-python/ipython-7* diff --git a/profiles/pentoo/base/package.use/dev-python b/profiles/pentoo/base/package.use/dev-python index 2016a3641..b35f5c15a 100644 --- a/profiles/pentoo/base/package.use/dev-python +++ b/profiles/pentoo/base/package.use/dev-python @@ -16,3 +16,11 @@ dev-python/pyside webkit #urh dev-python/PyQt5 testlib + +# >=ipython-6 does not support python2 +dev-python/ipykernel -python_targets_python2_7 +dev-python/ipyparallel -python_targets_python2_7 +dev-python/notebook -python_targets_python2_7 +dev-python/qtconsole -python_targets_python2_7 + +dev-util/androguard -python_targets_python2_7