gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 51 deletions

diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index 2fd31e190be1..902340da005e 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,6 +1,3 @@
-DIST xmltodict-0.11.0.tar.gz 26589 BLAKE2B 29498ac9c2f80828aa24d6cc4866aa6846fe10eb411a3e3617d85989c88628cc7c87ab80adb9ded492545fa2b4796a14b540479da75bfe464d1dfd811bbe1dc9 SHA512 d42ef146a40f386a5389958f890605c560ce9db2da4447099b8725edc1998339b77ea732576fc7e77fbe5a755a2dc3239dfae4a82fc6593c5f977145ab445295
 DIST xmltodict-0.12.0.tar.gz 18481 BLAKE2B f7b7b71a6eaacc833a54369be38aa988b5c27845b19001c1d13e955df1f3a26c04dd2a1b45f0c0e704c4df6f4d380abdda7189944cc45b001eeef55405c43299 SHA512 1ec3de3ebd05adbe032ca569a71048e72097c0f5fc864b63f168d661f72d13d0981e6e62bb9ca2ffe925a3b2f7c2fb90a44177427d4bdf68137842342a9cd2c8
-EBUILD xmltodict-0.11.0.ebuild 645 BLAKE2B 3f18c44821e6ec59aaddb5591db656cd11affff5869ed6c67a593f8e197a559cb9806978feec7c66b1078acd010731b42b229506f6528632767e1a4e605a2976 SHA512 7f81f601b8b9c92d8dd9ffa9f5cc8ab160c9801dd16286b8ac2b36076520fad597140098bf32efaf9cb82c9b501e5b371579e81fd6aab12a5034446e917bfeed
-EBUILD xmltodict-0.12.0-r1.ebuild 529 BLAKE2B e54641c614d32d6934871db5851a910fc239258d0eb1cbd20457484a4394da5ef7e36916fc92a31645f11623044ad983428909fb007e4c574df7d1d91a448cc7 SHA512 097ba2ee78566697edb65ed4abb9211083a58709e6609d7480982d469c928ee367c93ed57f04759b114cf7f3b8ad98d095bcb94657ff662d5ea1f23b03ea49b3
-EBUILD xmltodict-0.12.0.ebuild 650 BLAKE2B d09a4fa2765a3ff120ee7246f0c2e3e250c170e0afed78d502a11e492a576ecefa22bbc397356d0ee3c0f79fd314220d9d8c6134596978ce32bc390d84a4b6dd SHA512 dc51f0c23bb866b128c5dd457b99828354097be126271bace07645a17375922b13b856e5df9e2c4539c0fd71dee28ba0362386c1eda6c7084e186efa231d6f92
+EBUILD xmltodict-0.12.0-r1.ebuild 527 BLAKE2B d7f3424865729d98b01b67f6a6d6ecfb7184d9d157bb95869534776f8e1763a0d7651208fc8d764e0b7365e46c72a1ad784f11bf752f2a08342bacb8c3c8ec32 SHA512 d57c2bc064ac228ee1b6bb990eba285e51e7f66f3095447c32268a330b66f26c6ae99c720f0dcf175cf8bbc113ed6ae6351c2c05db04cbc07b8e9c0c8d49e0a5
 MISC metadata.xml 385 BLAKE2B 6df98f89bbc4f9ce1e05dc86970c81d31f70559d4b87fd4d3908ceb1183906c1195544b2e99e96931ee26985f5e02b7fb4b036d8e6cd03c389cbe5764b964111 SHA512 ad748afd533651881c58295101e82097a0c4f4c15b205f4836315832ea3c08ee7cbbe18f652d09048c08532a3fe03b5fdd1f9da48d3378fac8624984c74df794
diff --git a/dev-python/xmltodict/xmltodict-0.11.0.ebuild b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
deleted file mode 100644
index ac46c50b0b32..000000000000
--- a/dev-python/xmltodict/xmltodict-0.11.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
index 1807b9ad43cd..89db3373996b 100644
--- a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/xmltodict/xmltodict-0.12.0.ebuild b/dev-python/xmltodict/xmltodict-0.12.0.ebuild
deleted file mode 100644
index 65ce209c0944..000000000000
--- a/dev-python/xmltodict/xmltodict-0.12.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}