gentoo resync : 08.08.2018

3 files changed, 40 insertions, 4 deletions

diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 91aa9fc92806..877bb24d1ef4 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,6 +1,8 @@
 DIST openpyxl-2.3.0.tar.gz 138746 BLAKE2B 74a6ebcee9f7c235a4e590de18b39fe04eccf4e37caad64f727a19317b302649821b2ce42bd4ae8d2f192e6cfbe284b2b07b452f28ec4c52850ad32de3c9025b SHA512 e0d438c753628618748af7511366936681e63046fdb9dfb8509db8701194dc2875394892392e6871a367a68c08b730efdac29a88db6b0589fd619066145fff9f
 DIST openpyxl-2.3.3.tar.gz 141530 BLAKE2B 5efb845e8a208a8214380c8766db0c448a59dc5976b23ab8ca8d88481390ac6fdb250a629389eff7f2072566ff640ad15b5d5969218b49f0fe44a2da806e1682 SHA512 b5fb65acb711affe40e466c91d58a8dc989ada06cc58cee046311b6e65073e49ebddac8912f1b5642eb2be36ed8ff4f9a8b07acd75cdd067807fa8898b47c065
+DIST openpyxl-2.4.11.tar.bz2 2139621 BLAKE2B 44fe7e471b50deabdea10e677e3b30f2eee62c661203517321e32442639e884c93ff3c4b6e7a0e5c5186bc8320c53d912832d955882b8cdb29c81d8319077c7c SHA512 9d1f9a3cadefec42bd7b6301bc3a37045e59e567a9f74eed3467547e81f060cf1c0ce2fc7f517911cd7f5716a42135a8567a0e0edc42eae0cc0c7a2370b320ae
 EBUILD openpyxl-2.3.0.ebuild 775 BLAKE2B 395e4676e98d33abdf8a12eb10b15b8b3e2a26e05404b7bc3d9f3649d2b937e4896ceb6a8a3b878fbafda6126b8f32805c8e6faec8987b3f18103c93d74010a4 SHA512 97b0e3e612c7e9b8b6d0ec7756553f8d5c871c89f69c9b4ecb549906f227a7edf1392ae6fce90d7e7c721dc799cf1147c117248dbd939f32adbf6d86b0908c79
 EBUILD openpyxl-2.3.3.ebuild 777 BLAKE2B 2b007a8e66710358304fb1c15749332b2b2ba62f3f16c416057d04dadd6cf0261ca2d6b26eed21376f5f7d1e00c08909d1dd5e4c91be38159bdbaf11d2c2bbf9 SHA512 bc248245f090f258fd23693f4019d0ac6e685e856c68ba5d85b08e2938eb89e1997195f7db311adb0f69614fbc70c77ecb723c66de0fdcc6e4d5371d7e6d1cb2
-EBUILD openpyxl-9999.ebuild 695 BLAKE2B 69ed8a8e5846e65781c5cbf393d98a341295910f0f3c50065d815d1def0a49dec30d3a4f9de3d2c83a6ff2088a3fc0af7477d6565244cbfc5e0da7b24329157b SHA512 9ee22333f44bf662c8664f1b1a3f7ed291254b192837dc432f8a9baca1e706c55e0dc3e486931abce877a53b22a7d193bf9aa8636852e3278b68d33dfc516fc1
+EBUILD openpyxl-2.4.11.ebuild 787 BLAKE2B 6c873df2c8338ca76323e50ba5564152a99da56624ef3dd1d3ffee79eb1dffbe8f00a5b0920299f5340404e2714b9dc56fa4176b41976bc5f272e24afeadfc5e SHA512 91888a75275ee9a9e43370e764ad108ee52b5f568980be72412fbdc4c746919423647f7d9299bec86d82d99ec6c2278ed78ca0eb98f347da7865470eaf4a5d6f
+EBUILD openpyxl-9999.ebuild 730 BLAKE2B 0004e3721d7030a39cc868ef38b33a8b9d99698797790216f0fbebb1e19d935a2b2c6c93934ad0de8bd09b151912e21934ca59761f09d0dc0a3116b996b376a9 SHA512 bae05045073de77d0c358f65c1b77fb22d8fc2aefcb60c6c3253114402e38044447d6dca308132ec780c336fca800c5593f6a4041090dd5906edb99518efdb41
 MISC metadata.xml 449 BLAKE2B f5d81266618fbf1f9b74005ff4b9cdb22fa7d059dbbecdba18dab50b488e48b27ba7d4eb814c1e3baa9a8bd92b232e28f00d21f25c18bea58790c1af5e3a5275 SHA512 c9aa0ab803cc15b6ecbcdcb01fb4c224ee32a53b9054b345329f9d66e2aaacece4b2320878e4f09c0bfac1631b6656bc93c6036d3cec84c1fee27d4737aacee0
diff --git a/dev-python/openpyxl/openpyxl-2.4.11.ebuild b/dev-python/openpyxl/openpyxl-2.4.11.ebuild
new file mode 100644
index 000000000000..3d62292acd11
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-2.4.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
+SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/openpyxl/openpyxl-9999.ebuild b/dev-python/openpyxl/openpyxl-9999.ebuild
index 5202a8eafd18..689dffb52654 100644
--- a/dev-python/openpyxl/openpyxl-9999.ebuild
+++ b/dev-python/openpyxl/openpyxl-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 mercurial
 
@@ -26,8 +26,9 @@ DEPEND="
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 	)"
 
 python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
+	pytest || die "Testing failed with ${EPYTHON}"
 }