gentoo resync : 20.10.2021

5 files changed, 2 insertions, 81 deletions

diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index e30c16cda74d..89b06b54791c 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,8 +1,3 @@
-AUX openpyxl-3.0.7-metadata.patch 361 BLAKE2B 7a5322e9fd568124bc2271f015fa284300ca7004d286b4f3c4dec35446948941e69c3d0b43d7cd4af59c05a633b73071290d65cc1e83bbaa28eef39cf9f03d58 SHA512 1926f83469f6b869ff5a923b1bfb112b0674b86aadaade6005f3921e6cc67118c771b36cd04af49447e99bbadfbfa0a03d56f1d6ffaa3fd27deb40b4ff2eb5ee
-DIST openpyxl-3.0.7.tar.bz2 2426608 BLAKE2B 5ce0a34ea4ec8f33da2224555f3d681c4cfa2145f4cba10ed182044e6a6d69ce61c500c51a26db7ded2a3a0e778d0d8e2bd996c3852732f565501f233b145db7 SHA512 bd697c353d0a9fe66a7947dc0f51530b8419e39b36833e5322cca544fafcbd6aba36e42e53c1a1672f44b3940de9b91417bc58955c87257b7b82782c480ef738
-DIST openpyxl-3.0.8.tar.bz2 2514689 BLAKE2B a640104c4afcafa5dad8615986a0d3acdac563c60c0ae4b6301978f2257dfbf64eb9413cfdea690600d6c267cc104e3667f51e1ebb23a2c8e74908c1aaeb62ed SHA512 921ee6e37a7242bf807cda3a86ba224edc80c64623b6cf0d3f344217485b53bcddbdd2a81a35bd8e80fe0dc9637d6c08988c191fb4a905287a8af340b97fadf3
 DIST openpyxl-3.0.9.tar.bz2 2428070 BLAKE2B b62133ee8e732142428b4f9eaf158e6f33daf314ed1ad620d921ad10265d1db93e2fcef807a61b3277e96f245392fd19b48da715eb0c560c882683fb1407f7a1 SHA512 33c313c842a43003a6e056b58869652377bef74bcaf267c50cc49f6abb7caa8a1b4e8f3b400a054f7d1776e03763ebebc984d331520bd63411ec4acfa8a03787
-EBUILD openpyxl-3.0.7-r1.ebuild 797 BLAKE2B 48128dbc0eac6f021d57fb05386f136b62d864ee66374f1538fbfdff2650358a4fcddadaac4c1ab13e8d4ea6589e19c001742b9d0c5dafdbaad43eb99c73b03e SHA512 1770a46808e4432cbdd5525bb041abd547c9638b088b94f9ceb219d58278fe2f40805b48ec64d443bb9b8bd4b48e78ef44136e233612843002dcde70e97ac692
-EBUILD openpyxl-3.0.8.ebuild 742 BLAKE2B 284ac817d6641accf668c2014f60f2da37786b865340027dbdf348551e68cc63acf3f6231518e9b78b26a10f9732a5ef37cc83f2793101892bd0caaa99884dd5 SHA512 cfb56bb31a14c37330d90bb4d55a0edf653fc73792fa41947d01fa209e2ed54cb0418fc1d85274715f1b6daf7c8d4b07295c153a5ef7126b4e07f3999d0fa642
-EBUILD openpyxl-3.0.9.ebuild 742 BLAKE2B 284ac817d6641accf668c2014f60f2da37786b865340027dbdf348551e68cc63acf3f6231518e9b78b26a10f9732a5ef37cc83f2793101892bd0caaa99884dd5 SHA512 cfb56bb31a14c37330d90bb4d55a0edf653fc73792fa41947d01fa209e2ed54cb0418fc1d85274715f1b6daf7c8d4b07295c153a5ef7126b4e07f3999d0fa642
+EBUILD openpyxl-3.0.9.ebuild 739 BLAKE2B a858f7bbc837cef3467d8ff4dbd2708e0600ad50830b258fdbe46feb0d6a3777bfcaa5118a59e80f2817101e648eeb8bf684e87c6dae11ae4891f8a2172bbbf6 SHA512 a5007b47f949f7f92bc06966d1cbabb56535a9d411c4a939c6a08986dc36372599d094443debab19fccd0aa47b027cd929b20d34237cf95f333facd567f7a187
 MISC metadata.xml 595 BLAKE2B c843c395f1b6a40fea607fa7f851af887fce236ad6fc5b6b77eea0b208954a3340f49ab66a5503f6951346718ecfaf5d43f1a0bbee9b86f4b11c29b1e4cb6394 SHA512 a0cc42713e9c67438050b44c810f17ab4946f8a1eece0159e71d4abe749047dd44ff430605bf5c34af12de2abe4937955c7aade0c5af708ed7f6b816684c8763
diff --git a/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch b/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch
deleted file mode 100644
index 08349787e6fc..000000000000
--- a/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dupr a/setup.py b/setup.py
---- a/setup.py	2021-05-29 19:21:13.876463476 +0200
-+++ b/setup.py	2021-05-29 19:21:21.986626313 +0200
-@@ -74,7 +74,7 @@ setup(
-     author_email=__author_email__,
-     url=__url__,
-     license=__license__,
--    python_requires=">=3.6, ",
-+    python_requires=">=3.6",
-     install_requires=[
-         'et_xmlfile',
-         ],
diff --git a/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
deleted file mode 100644
index 83804875c020..000000000000
--- a/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-# Upstream doesn't want to include tests in PyPI tarballs
-SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86"
-
-RDEPEND="
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/openpyxl-3.0.7-metadata.patch
-)
diff --git a/dev-python/openpyxl/openpyxl-3.0.8.ebuild b/dev-python/openpyxl/openpyxl-3.0.8.ebuild
deleted file mode 100644
index 23c8e219fb65..000000000000
--- a/dev-python/openpyxl/openpyxl-3.0.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-# Upstream doesn't want to include tests in PyPI tarballs
-SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
-
-RDEPEND="
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
diff --git a/dev-python/openpyxl/openpyxl-3.0.9.ebuild b/dev-python/openpyxl/openpyxl-3.0.9.ebuild
index 23c8e219fb65..0986d1be0c7c 100644
--- a/dev-python/openpyxl/openpyxl-3.0.9.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	dev-python/et_xmlfile[${PYTHON_USEDEP}]