gentoo resync : 28.04.2018

3 files changed, 3 insertions, 64 deletions

diff --git a/dev-python/enaml/Manifest b/dev-python/enaml/Manifest
index f3c79969d756..7a44a24a6da8 100644
--- a/dev-python/enaml/Manifest
+++ b/dev-python/enaml/Manifest
@@ -1,5 +1,3 @@
 DIST enaml-0.10.2.tar.gz 1568147 BLAKE2B 627e34f0703a54a7298c405406c2d96eb29f0d278c535f9e0a49d981dc8c4264a935fe34e97e4a1cfbcf4f4f1b9c24e00596bd850bdc87a29ef4429f9d620dce SHA512 fb78d5202fb595d28aae92455a70d4e6057c8a5daf05b4487f6e3aca38b7e495684ef6ccd4ce5bdd04e53be7231e6d39db73341005c12922d69ccfde38b84957
-DIST enaml-0.9.8.tar.gz 1455642 BLAKE2B f17b5a4a531b231babc44ea9c81d607989fe0a80a4c2b1c9ea7c0ef880388523b72b5e276d7815196b515052cefce78f3d29b08c67c181ffd080557d87098e30 SHA512 e9b88d1fbb9e82564d3a865f74685b1b1f8b8918e29dd4d7ce7d6b4b2e6d386c6388e99f9bf0adb02fb9277a57519f8502a33bd6e0548fd1a4d52d0a4b33cf02
-EBUILD enaml-0.10.2.ebuild 1519 BLAKE2B 28d3df7615fab69193f9f7fb2b68b83c49ae898a1fea5c73f41ffbebc52aee3d3e6a2958f492c0d185f0a7727dc373b01b1fa2c441fdc4845b1d5a464b69cb90 SHA512 f22c63c15dc14bc926bc59b680b6aa89341fa545e260aade0fe9f385d12ae220a5080922bbfb94c76fca181d4642219a484e6a4dfcdab52a3fc18b6467085ae9
-EBUILD enaml-0.9.8.ebuild 1667 BLAKE2B d02ccd83665a7811b45ac0095deaa2b26997313e1ddb6252f98e37d19bc1b9c6f73db03c72ccc9417c76f4495965c244633a790cf0302f22e02942fe618fa8c2 SHA512 40bab29efc9a0f63578da8af707209ba31cf4cf1b6b7c0522517bf38e9dd64f1c4b0d58688d7a09bf6c46453550a0a2f8e9474ecfa61828d3f5b08debc29b6b8
+EBUILD enaml-0.10.2.ebuild 1518 BLAKE2B af909fd1a57d8019fe4d618bda5df2996b538f2ecf9d801d1382d009a0f5a9bbc1803d287f2697db35adc90c1002623c08bbec241a234c9d267581b298ae0194 SHA512 78417ac2695f765c355f502fe255f34e2396c21c2f57e11194e424b1c1e599ed6545434f0107e1d00edb5d36d7c6c0a5669ce9480d77c28a893b85d7f7beede9
 MISC metadata.xml 631 BLAKE2B c569dc2d11f6547b626497c18e70001cee289473eaae2c5bb7370a1df366b5860835371c416bbc2ddf4cb03b2b6edbc06ac7cb59acc2537fe52eb4ac501eed33 SHA512 2c642e89488173558b55516bfc7830c8e324f79508b133a4b238b85588f58417a8ed2edcea4dee94dea734e4e9d6adef873bffc12d53e4c6655a59bc7309b3b4
diff --git a/dev-python/enaml/enaml-0.10.2.ebuild b/dev-python/enaml/enaml-0.10.2.ebuild
index 96a05aeea168..b1675570e66c 100644
--- a/dev-python/enaml/enaml-0.10.2.ebuild
+++ b/dev-python/enaml/enaml-0.10.2.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1 flag-o-matic virtualx
 
 DESCRIPTION="Enthought Tool Suite: framework for writing declarative interfaces"
-HOMEPAGE="https://github.com/nucleic/enaml https://pypi.org/project/enaml"
+HOMEPAGE="https://github.com/nucleic/enaml https://pypi.org/project/enaml/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/enaml/enaml-0.9.8.ebuild b/dev-python/enaml/enaml-0.9.8.ebuild
deleted file mode 100644
index 7c36eb826f98..000000000000
--- a/dev-python/enaml/enaml-0.9.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx flag-o-matic
-
-DESCRIPTION="Enthought Tool Suite: framework for writing declarative interfaces"
-HOMEPAGE="https://github.com/nucleic/enaml https://pypi.org/project/enaml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/atom-0.3.8[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	|| (
-		dev-python/wxpython:*[${PYTHON_USEDEP}] \
-		dev-python/PyQt4[${PYTHON_USEDEP}] \
-		dev-python/pyside[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/wxpython[${PYTHON_USEDEP}]
-		dev-python/pyside[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-# The testsuite antagonises gentoo conventions far beyond what can currently be dealt with
-# It also passes all once run
-RESTRICT="test"
-
-# Doc build now fails, missing required folder, use doc removed for now
-# https://github.com/nucleic/enaml/issues/170
-#python_compile_all() {
-#	use doc && emake -C docs html
-#}
-
-python_prepare_all() {
-	append-flags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	export ETS_TOOLKIT=qt4
-	export QT_API=pyside
-	VIRTUALX_COMMAND="nosetests -v" virtualmake
-}
-
-python_install_all() {
-#	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}