gentoo resync : 05.02.2020

3 files changed, 2 insertions, 53 deletions

diff --git a/dev-python/datashape/Manifest b/dev-python/datashape/Manifest
index e3f3301b290a..8f148ea48f6d 100644
--- a/dev-python/datashape/Manifest
+++ b/dev-python/datashape/Manifest
@@ -1,4 +1,3 @@
 DIST datashape-0.5.4.tar.gz 99343 BLAKE2B f976a565e5a099949e359b6b2de0cd9ebf0520e780fc096b1e528e54b26d13fb68a27cc86a7ae6f402837ecd76a6f889308cc79adc9579a26173fdf2f8abf234 SHA512 3640c3871e6a00ad5c9961586821c0aab94ed10e82f5c2d361707c66853025aec70793f74f057c30a7bbc58d4645791b33df2916732e703586fd6bb84e91bdfa
-EBUILD datashape-0.5.4-r1.ebuild 1176 BLAKE2B f71271bb5dea9d4d8525f1818af0d6e5b30807eeacb423406eb9137004eb3272a5cec11b1e4d266d0247f35e4f05c7a4d04196db4bcc20d14f2a6d66e3e0bf55 SHA512 35193eff51b563333d09064340a602e739fae611729cc0a71d6c4c0962e2dcd564ddf0edc34a575283d649e12f640e80a9aad047ee248ccfbb1d4fb667a26133
-EBUILD datashape-0.5.4.ebuild 1180 BLAKE2B fd1b06c857a0710242647add17ee733a6cf91c6c10027b5f1acbb4080dea23f6894a3617b2eab118013d0de8ceb95b7939fe76dd97a12dfb7756a625b01e2ef9 SHA512 e909e1ce1c413db6927d4ea66c39bc7442d10a75fc18d90ac75eba3411cfd55cd7e94306581bffe89e99b72064f3b92fee5c606ee1e6127703ca112035d3027e
+EBUILD datashape-0.5.4-r1.ebuild 1174 BLAKE2B 5661e2f9ddde428d261d584aab5495721499bf31f18458cc17dc617b2f71dd6cdcb9c8140f5866ec2caa430d30b7d653fcfd5b2d1724a369fcb688ba1b3e1344 SHA512 66f5d78fcc944849f9a002b744a2aa1d8447222eac5ac11112d4a29984e813db41964e0a30f4b20f1002bf1dd3245bfabb35db1ac7516594b76711fe060f72cf
 MISC metadata.xml 510 BLAKE2B 631f7ed8106fd090953d4969cbf687d3ed5990af3803ca8315a848c95c9d8a0a5293cc79b7428e5f8f1c5e8bec76ec18b3cff2eac4f6cef8ab316cc28cc0d185 SHA512 7216551730e65c069c1315ccaaad65434106876e4a33304b9f7214610fdda9919a44bfce6e8f4cff680976ff51ca10ab23ee11abf5987e7b25cdaeac8a174bb8
diff --git a/dev-python/datashape/datashape-0.5.4-r1.ebuild b/dev-python/datashape/datashape-0.5.4-r1.ebuild
index ba87920acb00..e72858a26c4f 100644
--- a/dev-python/datashape/datashape-0.5.4-r1.ebuild
+++ b/dev-python/datashape/datashape-0.5.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/blaze/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/datashape/datashape-0.5.4.ebuild b/dev-python/datashape/datashape-0.5.4.ebuild
deleted file mode 100644
index d62fc5beed98..000000000000
--- a/dev-python/datashape/datashape-0.5.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Language defining a data description protocol"
-HOMEPAGE="https://github.com/blaze/datashape"
-SRC_URI="https://github.com/blaze/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? ( ${RDEPEND} dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/'sphinx.ext.intersphinx', //" -i docs/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}