gentoo resync : 15.12.2019

4 files changed, 63 insertions, 3 deletions

diff --git a/dev-python/flask-script/Manifest b/dev-python/flask-script/Manifest
index 9b4099d506db..922d6a4f031f 100644
--- a/dev-python/flask-script/Manifest
+++ b/dev-python/flask-script/Manifest
@@ -1,5 +1,6 @@
+AUX flask-script-2.0.6-flask_script-everywhere.patch 1792 BLAKE2B d3d674ad325f04b9338fd50850850173a3bb8c89de64702a8c6f5e78b6ad3945dadff4ffeb24bfce20b8d7e032338ae58695f9ce6eaa56f130286197915c3110 SHA512 83acf9eca3b2ee87222e6d307367f1aa789c8c89d6d4cba8dc93ff69a6149bf05e958baa4f9d7e71d3878e90ddce54a2d89b258024bf3bafc39de86814e4ad4a
 DIST Flask-Script-2.0.5.tar.gz 42580 BLAKE2B e614890fcf57c4122098a6181171d288c83bc80611ab1d240a41d57de522079fa1be68a679fd27a84fe36a843e5ddf8aa7b29eded66761e75b4b2e9771468074 SHA512 257b724c05dde79c99b028c7fa1980b700f273010de82fa9f1bb090b23519297d8bad87e436fa88a63feabfcd8908041d4a5ad9a673e08f4ed15e97310f16fbb
 DIST Flask-Script-2.0.6.tar.gz 43146 BLAKE2B 146a65fce432063e67e5b6221a0c2437f2a8df1e2b72a5e14fb382dc51ef3f0755e4d8a0a67831c6c2c61d07acc332e8c87b7c9df3443a9f22aa2eeb580c4086 SHA512 03c51213be8e2b86f1f4450565cf4d7e3d9d7257ac017bd53830be57620d581f43bcfe959ef7b621af722c688c56495229aad3dd9654c8a8a5905db0105275fc
-EBUILD flask-script-2.0.5-r1.ebuild 1026 BLAKE2B 033e5003868fd3ca4a9f2c971d4573ba74cf4cf1b967d75ca2ee8694b038550e446332b44d861490150fdd426860702d3e655fc8eb0c2be16c90c7354541ec04 SHA512 1c5d74047b3e3465ced5e716c35f738e97ec242e7e9278f0ccfd1cd412eedd0bea61df7e6ab87702a746485e456dc653696ead0077d3997c34ab937920d7726b
-EBUILD flask-script-2.0.6.ebuild 1030 BLAKE2B 28e0bbe3025ba1646ab22220d8592281fb0f1ca9923da097afd513dcaf5b6f2c0327471a5953aa6d7552a891b8a1325e738ee04ba5a1cf9f0032886d087bf259 SHA512 ef35ac359ccb53c265b2ce93ca3507cf135d6d41562c7e3143471465d6b56f6b5b5615ed1d9a901a2226630c7aa9aa379884f036e79bc529ba31b242a6759659
+EBUILD flask-script-2.0.5-r1.ebuild 1053 BLAKE2B b111675c888eca9b99c872329d2b386fd30c570e4bc4a363cbaf67cfe1be1d7d9414dbb92704b93ed631a76dfd2c8464b75e7942f4911a7555756bc18a44818b SHA512 f431c8c8c0e102d6f909c8e673eb673927b99f207c99330b184a3a45492a8e6dd565b96e00a9b829cf0610b450a5b2017679173844959d83585694037e6f5882
+EBUILD flask-script-2.0.6.ebuild 1122 BLAKE2B 9e2718df8efda58d376f86c13b0b7ad5cf804690488530e44d72de651a8b496a1ef408d23301687d8e85780d7475587c9032c377b3a4ec66a5b5c5f181dc012a SHA512 77d3c11be69e28ee491c36e86b89f8ba76ab39c8384c4c9d75e74c51efa65bef40958f2493f065294b44ff03e9095962cbb811114e23e1f67387d50cad7ca560
 MISC metadata.xml 315 BLAKE2B 5baaa0a40d2641eecd8e326c8a585457f539a890c47fbc0bb63d041cccecefe5c3f0b9691cb837eabf7718a05a5ec95c1806684d6d4950d7793361bae804bf74 SHA512 95cc9ed58105d822599495d5a093550da1665276efdf4e13a885d730265d229fa01d72322a33598363a87bec9cb1e112b9bae7b7874d1f03c6465089779483f7
diff --git a/dev-python/flask-script/files/flask-script-2.0.6-flask_script-everywhere.patch b/dev-python/flask-script/files/flask-script-2.0.6-flask_script-everywhere.patch
new file mode 100644
index 000000000000..b10b2f0a2283
--- /dev/null
+++ b/dev-python/flask-script/files/flask-script-2.0.6-flask_script-everywhere.patch
@@ -0,0 +1,54 @@
+From fcf894b6e4d0ad17489480b722c870aaea600db1 Mon Sep 17 00:00:00 2001
+From: anthraxx <levente@leventepolyak.net>
+Date: Wed, 6 Sep 2017 12:03:22 +0200
+Subject: [PATCH] using flask_script everywhere instead of flask.ext.script
+
+---
+ docs/index.rst     | 2 +-
+ examples/manage.py | 4 ++--
+ tests.py           | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/docs/index.rst b/docs/index.rst
+index 775ffca..9266d4b 100644
+--- a/docs/index.rst
++++ b/docs/index.rst
+@@ -577,7 +577,7 @@ Then the user can register the sub-manager to their primary Manager (within mana
+ 
+     manager = Manager(app)
+ 
+-    from flask.ext.database import manager as database_manager
++    from flask_database import manager as database_manager
+     manager.add_command("database", database_manager)
+ 
+ The commands will then be available::
+#diff --git a/examples/manage.py b/examples/manage.py
+#index 5c0dc21..8129555 100755
+#--- a/examples/manage.py
+#+++ b/examples/manage.py
+#@@ -4,8 +4,8 @@
+# import pprint
+# 
+# from flask import Flask, current_app
+#-from flask.ext.script import Manager, prompt_choices, Server
+#-from flask.ext.script.commands import ShowUrls, Clean
+#+from flask_script import Manager, prompt_choices, Server
+#+from flask_script.commands import ShowUrls, Clean
+# 
+# 
+# def create_app(config=None):
+diff --git a/tests.py b/tests.py
+index 93d0071..24f3f15 100644
+--- a/tests.py
++++ b/tests.py
+@@ -5,8 +5,8 @@
+ import unittest
+ 
+ from flask import Flask
+-from flask.ext.script._compat import StringIO, text_type
+-from flask.ext.script import Command, Manager, Option, prompt, prompt_bool, prompt_choices
++from flask_script._compat import StringIO, text_type
++from flask_script import Command, Manager, Option, prompt, prompt_bool, prompt_choices
+ 
+ from pytest import raises
+ 
diff --git a/dev-python/flask-script/flask-script-2.0.5-r1.ebuild b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
index b5f8633b7038..7e2b014394a8 100644
--- a/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
@@ -19,6 +19,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/flask-0.10.1-r1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/flask-script/flask-script-2.0.6.ebuild b/dev-python/flask-script/flask-script-2.0.6.ebuild
index 8510f9ee8f00..29e92f3e53b4 100644
--- a/dev-python/flask-script/flask-script-2.0.6.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.6.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 
 inherit distutils-r1
 
@@ -19,6 +20,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/flask-0.10.1-r1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
@@ -28,6 +30,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${P}-flask_script-everywhere.patch" )
+
 python_compile_all() {
 	use doc && emake -C docs html
 }