4 files changed, 2 insertions, 65 deletions
diff --git a/dev-python/tablib/Manifest b/dev-python/tablib/Manifest
index b314b36a6393..48cd6c1f7867 100644
--- a/dev-python/tablib/Manifest
+++ b/dev-python/tablib/Manifest
@@ -1,7 +1,4 @@
 AUX tablib-0.12.1-no-ujson.patch 335 BLAKE2B 199bb7440bbae26d0469b5d1963d26584d91ed4cf36e478260722404b6d2f7dd109467943599808a36cec20e792053bd5ada8495436a6f518f4637cd565197b6 SHA512 ac5dd04e07b09d0983f3aa51d9ba3b067eb758cedd67dfb38a443ae4aabf5413e789f031ced1687705a0445b791039af3efd35b4fa1f0a40f08b85bee5c5fa1a
-DIST tablib-0.11.2.tar.gz 758287 BLAKE2B 103ffaa755d7066b19243075fc0069fd7fa256e77f21c5a972a2077633e69064bdb433e3784780d2ac5a439aae62fb94dd128af755714de1fcdd5be46e3cb446 SHA512 356bf308df7c3d7d20800814a945c83fc64e98fb859d180cf5d9455ec2634e0a20f0c6ed788a75117c7c3d7bd4cda319c2049ce760109d102b2cb9a0707fa4f2
 DIST tablib-0.12.1.tar.gz 63420 BLAKE2B a4c4b2cd7f54045480fcac41ae55150ed903810de9f97df1a04ae74bdce16cd7c57027d38addbca8230a05ecd591290f2cdfe7736ccb02597a05cf7ffa0f5f4d SHA512 5207f59dab59f465584fc6c55d6322150f550c50f50a35d6901a39ed05a624a52dfdb5a9a9ddf0d6bc7285e5a3a4972c458895e4cc204a365c3df0d9ada0228a
-EBUILD tablib-0.11.2.ebuild 622 BLAKE2B c175fabd0d303cde927d31fcf594f18837c230c076196d84f6aaf07419b263bce34ec21bde797d4aff737cda373c6caa188294411e55e3a1d4a4a85af38da8aa SHA512 647dcd96e70d026c5f9627cfeb86c1cdd38a04f1fe900d7e10b6c7c88ce758386570320a8ad9661690c8126feb6c30987e6d12146162f64c059082eb5be466a7
-EBUILD tablib-0.12.1-r1.ebuild 1128 BLAKE2B 4ed5e841ecdb0b6438af795f02c73ae80c0d46267a283e27e8f32d4efd3e029392a1a090bdcce7001bc8c7aaf1f4722867be6f752582340c1bf371a60f5ddb3f SHA512 809997084686aab6402fc9f5531d56fa4a54e0acc28f878bcb3bd1bc82fe1f27fc49164fa59f76f57d3cf0a8a41d9e3d151e6040d792764657d166357939dc61
-EBUILD tablib-0.12.1.ebuild 735 BLAKE2B 7dcd50e3aaab71de9cb4dba6d389ffb43e12ea7687db6abd9484ea46e4bba73b7e94d512f8d0906048cf1572f73b288626a9311bbd89d721c5f5c80b20d37837 SHA512 21be349ec04136a2cc448cdae0a50ab6179f40175907cdd63a26a9c98e63775d0d7956457a2935762552d4a7bd8f3a763d4a7ac081756c5b2ae62ac45d9f03f0
+EBUILD tablib-0.12.1-r1.ebuild 1127 BLAKE2B 264bf78baca032adc68a4e54bd92ee204f961fc080897a49142fc22d5bbd1f392bf15f5931d9e7f1405bb35d9ef3b24b8052052248161707968e069c1c52be0c SHA512 f98dccbc1e856f46405a8cdab388ec8f17d9ff22d0e8115f61778d58199105205223a53cc111bbca4532fec47ba87cac3dfb659b2b0dc1e6d427e7317529a326
 MISC metadata.xml 325 BLAKE2B 0d538ffb3eded02a3816d40244c9561fbb269b14b2dcf16089ffb41f2b9808d416ab1adfd13329098d20a8887d0c41da5c3ef92a8342b82298dc503155d8a551 SHA512 abe357f80a305ac2f770f5fd7e40a7919abfe477cbebbe0ca36be32d49d630f7941f29d296222e5ed7b1d14482b794ccf86b3c4acaec47cada5fc7005e5dfc7f
diff --git a/dev-python/tablib/tablib-0.11.2.ebuild b/dev-python/tablib/tablib-0.11.2.ebuild
deleted file mode 100644
index faa0359f65ea..000000000000
--- a/dev-python/tablib/tablib-0.11.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A format-agnostic tabular dataset library written in Python"
-HOMEPAGE="http://python-tablib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/ujson[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v -v  || die
-}
diff --git a/dev-python/tablib/tablib-0.12.1-r1.ebuild b/dev-python/tablib/tablib-0.12.1-r1.ebuild
index 1ce9ba150f98..0d19104ca14b 100644
--- a/dev-python/tablib/tablib-0.12.1-r1.ebuild
+++ b/dev-python/tablib/tablib-0.12.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tablib/tablib-0.12.1.ebuild b/dev-python/tablib/tablib-0.12.1.ebuild
deleted file mode 100644
index b715f7e1fde7..000000000000
--- a/dev-python/tablib/tablib-0.12.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A format-agnostic tabular dataset library written in Python"
-HOMEPAGE="http://python-tablib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/openpyxl[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
-	dev-python/xlwt[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	py.test -v -v  || die
-}