gentoo resync : 29.01.2021

4 files changed, 2 insertions, 86 deletions

diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 0c170cd66799..cb79548d7d7d 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,8 +1,4 @@
 AUX cairosvg-2.5.1-no-ref.patch 923 BLAKE2B 4a14bdd5f19f9abbb9415c19cb15aecc6dee8bf34feef0cb551f4185c16e4a93ac29d6e46f81dab03f479b2e982c9d0a85a622c1292cfe6d52c6acc1c896aa7f SHA512 f1a45ba47fc3f1f4b91799d6d45b2388a2ac6b0be08695f2507b4bf34818b6a7e8c23cbfbb270c3d603d81acbe3c9bc0a867e5864b684f67540b449d684e6f0e
-DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441
-DIST CairoSVG-2.5.0.tar.gz 40481 BLAKE2B d177570710f54a7d64446de81a700a6ebe5dd475ab75e268575ee2d3a45cb1da14a349d6a5516ef965191093f12ba916a1919fe115fa4b6e4dc0f9a22657946b SHA512 9387273a5531f2e055871d3ccc3b770a46e549dceb443d9d7dbf3635f44da4a752f06ece2f86582f57eac08d59d78f833e1ed2e7badea340d5a0f1eb31beb24c
 DIST CairoSVG-2.5.1.tar.gz 8397716 BLAKE2B f5d307f3019df3b8e19a86c4f185bb6c95ff5f450705a06506f03447f7a4e97091fed4dbbdad7220da0b04c6bed3eb252f3f3e8d91bff55ab6432d0df7f62d70 SHA512 5f6732758ed8024b58173bc920a44fcafa65a2daf301ee07e088d542f1e82d0093bd853e58da2484c392d1b625fd27c0634d07ad58cf00e674741aa413013605
-EBUILD cairosvg-2.4.2.ebuild 872 BLAKE2B 4f326bdcaa5571e152cd438654fa0ffe4f9aa9465f0e88dce89f00c683506e932fd58fcd075d75f94f634e33d152c8b14a8dbdd8b467e087a6eb2c38d654a0fd SHA512 8bb35201de54b9f633516fa768925ac9b77245a8f8a89ddfea5ed12f01cf0ce57bb39deb24d3b3c11d8c0a59ace7fee30292b2ea175c29f88476e777b43935cf
-EBUILD cairosvg-2.5.0.ebuild 871 BLAKE2B 6e87fe608e0f1b9e86b72004b826338948762f087cc57042212e75f9e7f0d3928f7be13f071bfffebaa8a3b01236d067376244593359425c2759df888bfa2d87 SHA512 4d009897e43100a958ee7ffade1b4df3f2cf9a658228ba8931deb136f14d3bd1e09d3db690e05b538e0b6fae4fa22d63b0a0284366b8a930c58b4e0e7baf3262
-EBUILD cairosvg-2.5.1.ebuild 1087 BLAKE2B 66f0018bd5b785e25b410cb6d7fa1b5e221165b279ed2e50e78cf03ad4614eef73435df677b9814e273f4d560321f62225958f35568422f5d2f3e884d37f3e24 SHA512 b70dc5fbf78579b81d6ac336b843d3560be264410c4647d5c01860b7d36b177dda90f7cbd9102a0e6f1deb2e8dd39db1c1aac55b7aab4261d5373c20e3c46315
+EBUILD cairosvg-2.5.1.ebuild 1086 BLAKE2B 978ded1faf6d8518636e66522c6f4b28528699b4d4328d80256d69e7abf03ddd9ab1b2e5ee1456f03bdc1ed62b416c21101f101d96de219f85a07bb735c94c77 SHA512 39b6dc1758d0ae13f6f87ca4c88495f7e7f10e381b679e5afa79c1aea8a2b884fd1e07f973e2e25e29ac21d5f3b673ca89a746c9b1a80c0e009cdb028b1fcdad
 MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild b/media-gfx/cairosvg/cairosvg-2.4.2.ebuild
deleted file mode 100644
index 2341e26567f1..000000000000
--- a/media-gfx/cairosvg/cairosvg-2.4.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN="CairoSVG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
-HOMEPAGE="https://cairosvg.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	dev-python/cssselect2[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# junk deps
-	sed -e '/pytest-runner/d' \
-		-e '/--flake8/d' \
-		-e '/--isort/d' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
deleted file mode 100644
index 6bb86bcba458..000000000000
--- a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-MY_PN="CairoSVG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
-HOMEPAGE="https://cairosvg.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	dev-python/cssselect2[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# junk deps
-	sed -e '/pytest-runner/d' \
-		-e '/--flake8/d' \
-		-e '/--isort/d' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
index 4b84e379a4fe..0dcd811220f5 100644
--- a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cairocffi[${PYTHON_USEDEP}]