gentoo resync : 15.06.2021

3 files changed, 126 insertions, 3 deletions

diff --git a/dev-python/pluginbase/Manifest b/dev-python/pluginbase/Manifest
index af70d637857c..8b974e739001 100644
--- a/dev-python/pluginbase/Manifest
+++ b/dev-python/pluginbase/Manifest
@@ -1,5 +1,6 @@
+AUX pluginbase-1.0.0-python3.9.patch 3324 BLAKE2B 4614baca44f897f16660e8dc0a8531627a896e3e15641103b958e744c07bfa9c9c1b729feb7a72d381cdc0d2af3deae8e5d4215dae3f9b4234fadb36ed84acd0 SHA512 159edb0608a432273fc1331f7229b3cfcd218a050ef5b58b230d92ab72f858c1a14ba2603d40d391fdf61140a0a21d3fdd1df92b19d8cc35b4ee40c7a33d3e15
 DIST pluginbase-1.0.0.tar.gz 41795 BLAKE2B 68d7704b52db39af4f0c2e1f790802eb5f2fd15d91726752605901b3e8a3c736204fad93d96b5dd1a4199586b4d9b42895cbe8290acaed1b4051e8103efb43f9 SHA512 95c3b770980fa5ec745b8d788df29c6219ed6e5af7666f9830d56c6acae01f90831655127bcef69b2dfc423d09429373ae7d4c8b45c76c62a41f909d0747c0a0
 DIST pluginbase-1.0.1.tar.gz 43588 BLAKE2B 8d72dc0afcf4e4e65670902bd3f28a1a36de7f7cc11fd56c624f871ced39e8b989bc6ac74d64e4f96b3bf32f0f4e187ae8b517f9a09cac94b7a735ffb08ec55b SHA512 20844fb78daf3e03a7a8013f82a059bf6b0723a184e89061ce5cb674b5a978900623f2eceed56fc9f9a34410e7e6ca8d41a5ac0a21e374b1b3ce32d4e522348e
-EBUILD pluginbase-1.0.0.ebuild 929 BLAKE2B e9485562e1881d15451b232d8c1e3c0b4e6c970b383b3f4b241f22aad82c439b257c510e9b2c575e84ad4d9c8f3bfc82339b7edc858066acaccf7be8c6be802e SHA512 d262af48713becb588d11213eed438f892ff9645a105ed63ff05e6e240841611c5d46b40709b0a27aef5302b4d3e694a875abff9ff5db1398ba64a76d6682b2b
+EBUILD pluginbase-1.0.0.ebuild 974 BLAKE2B d10c0fd2c11255202fff5b0d43dfc8159b632adf9e992c9e7ee951fdf928364a602d6709cfa7942a251e5c1dacc88f80f06663bc23cd5b1ae1362f6ed80d96b0 SHA512 68fbec4a9d72ccb09351eb02141f93f748aed1cbf21ee1086422df0aa8cf09fc5d68e143d4d65eb4760c816edc2442a40a0e9fb63712dc89d180cf38922c3780
 EBUILD pluginbase-1.0.1.ebuild 504 BLAKE2B 59abd779cae7dd3498ac47f4eca4c13943b8a7f5c7785ee729913761e53f480fb6f30ee17f732214bf89c1ed4b75e147253cdb1c110c0afc599f80b9d3c5fba2 SHA512 9cf3bbde8019c9e8e47ce3178547a8659f4fa3a22e34b9a0582610903360199cd7290c80474598f774c2fe5574b6abf779e87b0f9f5dccb5a4c256c61043e316
 MISC metadata.xml 373 BLAKE2B f6aba121e38caebe2406cceb3ceb2ffe92107c8c4a540f29a9befc70d0651b3bbd6c9e16d4f56c4462e105ad7e8a525c199bab32842b2507e351e9c10030ddb6 SHA512 077cce7d989c18f2a61a634801783f106f2c3839762da37e7835debdad5093cdda3f40934cd99d3c0e0759c4e856c450c9a8e229336de2d08c82a5204ffaf437
diff --git a/dev-python/pluginbase/files/pluginbase-1.0.0-python3.9.patch b/dev-python/pluginbase/files/pluginbase-1.0.0-python3.9.patch
new file mode 100644
index 000000000000..8c83198dae3c
--- /dev/null
+++ b/dev-python/pluginbase/files/pluginbase-1.0.0-python3.9.patch
@@ -0,0 +1,120 @@
+From ad876a1282423c5e677392814eec09d826fd311e Mon Sep 17 00:00:00 2001
+From: Matthew Bakhtiari <dev@mtbk.me>
+Date: Mon, 10 May 2021 05:47:33 +0200
+Subject: [PATCH 1/5] Add python 3.8 and 3.9 support
+
+---
+ setup.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 012827f..ef63b70 100644
+--- a/setup.py
++++ b/setup.py
+@@ -37,6 +37,8 @@
+         'Programming Language :: Python :: 3.5',
+         'Programming Language :: Python :: 3.6',
+         'Programming Language :: Python :: 3.7',
++        'Programming Language :: Python :: 3.8',
++        'Programming Language :: Python :: 3.9',
+         'Programming Language :: Python :: Implementation :: PyPy',
+         'Environment :: Plugins',
+         'Intended Audience :: Developers',
+
+From 28d1baa81ac17c2281c8ca439ca0444910740ae5 Mon Sep 17 00:00:00 2001
+From: Matthew Bakhtiari <dev@mtbk.me>
+Date: Mon, 10 May 2021 05:49:53 +0200
+Subject: [PATCH 2/5] Remove deprecated yield_fixture
+
+---
+ tests/conftest.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index a43b8cf..e20513b 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -20,7 +20,7 @@ def source(base):
+                                    identifier='demo')
+ 
+ 
+-@pytest.yield_fixture(scope='function', autouse=True)
++@pytest.fixture(scope='function', autouse=True)
+ def run_garbage_collection():
+     gc.collect()
+     try:
+
+From 95edc820811dac75a5f8d11697cbe197b4024efb Mon Sep 17 00:00:00 2001
+From: Matthew Bakhtiari <dev@mtbk.me>
+Date: Mon, 10 May 2021 06:26:32 +0200
+Subject: [PATCH 3/5] Remove deprecated tests
+
+---
+ tox.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tox.ini b/tox.ini
+index dbea2bd..678eff6 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -1,5 +1,5 @@
+ [tox]
+-envlist = py26,py27,py33,py34,py35,py36,pypy
++envlist = py27,py34,py35,py36,py37,py38,py39,pypy
+ 
+ [testenv]
+ commands = make test
+
+From 06ab2ca2ee843e62a1a6bf26ef2d118995a4f210 Mon Sep 17 00:00:00 2001
+From: Matthew Bakhtiari <dev@mtbk.me>
+Date: Mon, 10 May 2021 06:32:07 +0200
+Subject: [PATCH 4/5] Remove old versions from travis.yml
+
+---
+ .travis.yml | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 743a38a..739db3e 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -1,11 +1,12 @@
+ language: python
+ python:
+-  - "2.6"
+   - "2.7"
+-  - "3.3"
+   - "3.4"
+   - "3.5"
+   - "3.6"
++  - "3.7"
++  - "3.8"
++  - "3.9"
+   - "pypy"
+ 
+ install:
+
+From 382037ce6cd81e2767143db744d1049081051ce3 Mon Sep 17 00:00:00 2001
+From: Matthew Bakhtiari <dev@mtbk.me>
+Date: Mon, 10 May 2021 06:37:02 +0200
+Subject: [PATCH 5/5] Remove old versions from setup.py
+
+---
+ setup.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index ef63b70..8f9f4e6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -29,10 +29,8 @@
+     classifiers=[
+         'License :: OSI Approved :: BSD License',
+         'Programming Language :: Python',
+-        'Programming Language :: Python :: 2.6',
+         'Programming Language :: Python :: 2.7',
+         'Programming Language :: Python :: 3',
+-        'Programming Language :: Python :: 3.3',
+         'Programming Language :: Python :: 3.4',
+         'Programming Language :: Python :: 3.5',
+         'Programming Language :: Python :: 3.6',
diff --git a/dev-python/pluginbase/pluginbase-1.0.0.ebuild b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
index 0524feaefd65..4a3320d7185e 100644
--- a/dev-python/pluginbase/pluginbase-1.0.0.ebuild
+++ b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
+PATCHES="${FILESDIR}/${P}-python3.9.patch"
+
 python_prepare_all() {
 	sed -e "s/, 'sphinx.ext.intersphinx'//" \
 		-i docs/conf.py || die