gentoo resync : 22.04.2018

5 files changed, 57 insertions, 23 deletions

diff --git a/dev-python/pyface/Manifest b/dev-python/pyface/Manifest
index 198d0f7dc9a9..43f33773a1a8 100644
--- a/dev-python/pyface/Manifest
+++ b/dev-python/pyface/Manifest
@@ -1,5 +1,7 @@
 DIST pyface-4.4.0.tar.gz 486490 BLAKE2B 59c3d2facb35da015a5625b8d5dbab8f6347d3e0d78cbe8fa15d9587cd9a62bb7a4dadb9ffdf86f3d9cb927ee378577320a23cfa63485fb74294e7ea2f874b85 SHA512 62c93cbd5e956d56c03580876d5f9191210beb3d81cf8fcd0dfc6b2919263e4bf01219f1372e292fcac4462eaffb45cf9cde62dbe16265134b357dabc47d719d
 DIST pyface-4.5.2.tar.gz 5089390 BLAKE2B 6615f9dd66dd8359df27ccc7ecab0678e0bf8370a81a43e74f7452b25e984ae806346dc56c61a2262c648cc580c59a095d06731f90d564b07596052efcfa15a2 SHA512 9f5f34960cce2180eec6c4ba1ef6e19069cb64a05db47644a70c1ff70b93927f80bc20f50cee72daf586722ad618bf19f53182986fef4b93ddb95d29f4a1fcbb
-EBUILD pyface-4.4.0.ebuild 1142 BLAKE2B a635d5eaf6fe68a1b2b691de92d9a41a32eac5e2f3574734a3a56899abbabcf2ba892afe2b32d5088b2b15a917bc3acf8603e61070ea36b0d67ea9cccea317bd SHA512 dbb05391c77b3f11bcb883821d5367fb888a88c7b514f98e1f1bf16a6bc06f31b27ea9d71820f9428ec47c927b696560b1b24997356a6a439198b68dc76fe42c
-EBUILD pyface-4.5.2.ebuild 1255 BLAKE2B f526ad8c007e499eb60baa783f4165af22e8b9aa27a7be592c8847ef9f47162726c0774b4547eb8388ad7412c52c1fd23d0fa2a800474dd7e86e314e3487cba9 SHA512 a81c0cb5f6e8a800ba1ef18deba83ba38adf5f4d53b01cc27d90cc7507b94125a347ffe73133c9d3f7ca40e78e0b285a05a25fead8dc43bca9b044e67ce7d3bc
-MISC metadata.xml 851 BLAKE2B 4414cdd8cb954b3d6b7b6e4799375a1672e871df808ab91c89857c25a477da7e230eb3ef16b7f80936fad9b0f25e3dae43da1f3cbc55f580696b119073f66a41 SHA512 a4e74c41f122d690f279ccb7cdf25cb06dfc187564e438dbe2ed94c912069e79dbfcb0c795a20371d75982207791273d37d37b9b54adbe4aaab079bb3a3d4e9c
+DIST pyface-6.0.0.tar.gz 5238590 BLAKE2B df96cf46e54f540d8dde7c8c3c4844655e30275e4ce93563c2e1aab5aecf766db65c0f098aba532adb27f824d81a7b51e5d9e0635057d81e12870773f1a8c41c SHA512 df411f737555b016e7801d4cb870d8553834150829a9c3fc5f4d3993633c4aee83dd4b41c14f254373d0334f3eba6e9e0f05b3276de5fd99290e3128949def00
+EBUILD pyface-4.4.0-r1.ebuild 1036 BLAKE2B 8d304c10587d85c61d2139e0a371f8675143dcbda8fcda296f6cbc88fc7501c65918878a289a3bea715be43a575144155b705d67e234dc124fa37d9f4c36248a SHA512 0a8237921aa5ea2363b31caf31e1be441470ff014f309d496eae685932084f2e4c32efa0153774326e8b09d6dcd47e8d28f0bf6fafb2272c07c279a9c66b94a9
+EBUILD pyface-4.5.2-r1.ebuild 1149 BLAKE2B 2f7082052508510a77e22ac5750a3889eb37cb1eaab8573c44273a93ef9b0adf69bc7bd76a98a882b0c1a67223ba53bdae5d98f21431921f752a739f0d42e253 SHA512 1fe79fe8562275b99313b31f28e514e0cfdff65c3dbafcf224422557135725ee7a1dfdb137bbb32dae90c892d6111d4e057d8ebd00c5abdea8ebe6bac3e73c0b
+EBUILD pyface-6.0.0.ebuild 1040 BLAKE2B 0d22055bbe1c35ef6e791b0a5e9b8cc92e9821b44bc5ac824993a2403f2b1eb9bbd2f43ea5c8bbbc2f405a56768d9c37cba3239948f7ddf3391fb6f823b907cc SHA512 bb1da876235b9db21236797739041ddce5b179c7e87d3984dd5195ce6ca311ff1d5b950f4913b6fe4918a556c28d45f9f6efcceb68e18972d2fe90cf0c5beca7
+MISC metadata.xml 773 BLAKE2B 5dfb734568ba000200d7e57a5259ef570296d783d45b93cabdba2037a8195701a086ca68f4e09b0ad9728eaef10c6d958e5e1d52bb6dd0800249b9453e0c5982 SHA512 6afb2eb5092995aedd528882a93f891b308ddcea9017743e1da89c0887ffa2575428170f969a62d6fb68e0acbfaf20a61817d67006cbf98fedfe4c4f4ed27631
diff --git a/dev-python/pyface/metadata.xml b/dev-python/pyface/metadata.xml
index 71665e5d0b75..04911f4f0ba6 100644
--- a/dev-python/pyface/metadata.xml
+++ b/dev-python/pyface/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
   The pyface project contains a toolkit-independent GUI abstraction
   layer, which is used to support the "visualization" features of the
diff --git a/dev-python/pyface/pyface-4.4.0.ebuild b/dev-python/pyface/pyface-4.4.0-r1.ebuild
index 72229f597c35..db5771d83587 100644
--- a/dev-python/pyface/pyface-4.4.0.ebuild
+++ b/dev-python/pyface/pyface-4.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,11 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/traits-4.1[${PYTHON_USEDEP}]
-	|| (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-		dev-python/pyside[${PYTHON_USEDEP}]
-	)"
+	dev-python/wxpython:*[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
@@ -34,8 +30,7 @@ DEPEND="
 	)"
 
 python_test() {
-	export ETS_TOOLKIT=qt4
-	export QT_API=pyqt
+	export ETS_TOOLKIT=wx
 	# set nosetests to ignore tests unpassable by these vars.
 	VIRTUALX_COMMAND="nosetests" virtualmake -v -I 'composite_grid_model_test_case*' \
 		-I 'simple_grid_model_test_case*' \
diff --git a/dev-python/pyface/pyface-4.5.2.ebuild b/dev-python/pyface/pyface-4.5.2-r1.ebuild
index a9a4621630c0..c68ecf3f3836 100644
--- a/dev-python/pyface/pyface-4.5.2.ebuild
+++ b/dev-python/pyface/pyface-4.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,11 +19,7 @@ IUSE="examples test"
 
 RDEPEND="
 	>=dev-python/traits-4.1[${PYTHON_USEDEP}]
-	|| (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-		dev-python/pyside[${PYTHON_USEDEP}]
-	)"
+	dev-python/wxpython:*[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
@@ -34,8 +30,7 @@ DEPEND="
 	)"
 
 python_test() {
-	export ETS_TOOLKIT=qt4
-	export QT_API=pyqt
+	export ETS_TOOLKIT=wx
 	# set nosetests to ignore tests unpassable by these vars.
 	VIRTUALX_COMMAND="nosetests" virtualmake -v -I 'composite_grid_model_test_case*' \
 		-I 'simple_grid_model_test_case*' \
diff --git a/dev-python/pyface/pyface-6.0.0.ebuild b/dev-python/pyface/pyface-6.0.0.ebuild
new file mode 100644
index 000000000000..584a3c09130c
--- /dev/null
+++ b/dev-python/pyface/pyface-6.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 ) # python3_{4,5,6} not supported by traits* deps
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Traits-capable windowing framework"
+HOMEPAGE="https://github.com/enthought/pyface"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="examples test"
+
+RDEPEND="
+	>=dev-python/traits-4.1[${PYTHON_USEDEP}]
+	|| (
+		(
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/PyQt5[gui,network,opengl,printsupport,svg,test?,webengine,widgets,${PYTHON_USEDEP}]
+		)
+		dev-python/wxpython:*[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/traitsui[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)
+"
+
+RESTRICT="test"
+
+python_install_all() {
+	use examples && EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}