gentoo resync : 14.05.2020

3 files changed, 2 insertions, 69 deletions

diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index 4ed9cbc26e78..cf7942e45668 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -1,4 +1,3 @@
 DIST pygal-2.4.0.tar.gz 4554802 BLAKE2B 9627558e734420bfb3137989d0cc1978a0a06a597d3d5d071e13653876a4bb3266f12f1a8a358076619d997998754c29ee75058356ba66da64b112a24c2cbe2a SHA512 d69fbcff3792cb0b952addc3bfbaea76628d5546482c291ef217c592a820a73a65b1eb522c5d7877e7a794d19b74636126d99a4ff280e8467ab07a95000ba823
-EBUILD pygal-2.4.0-r1.ebuild 1191 BLAKE2B 83bde0e7f98f47f3cf9cb8ce1f9730a47623f7d324b76011635b685da32df852e7123ebc97c57c781b9ad6f277309aa53a3c69bee935dbe1a8cab5e9b004508c SHA512 3f61574358b3de3b253822889e8250606221d57ce2c75264a60b16844a7805b962db4511248a2170fcb3d68fddc3de7f3ebbfeccd5a3ec6717aaf56a81c90696
-EBUILD pygal-2.4.0.ebuild 1578 BLAKE2B 6f8bcd822896d4fd8c9780400cc765c5d27f450c9aa9f2ddbcf35354275d1591b6fe4e3d8134488c6188b6734fa8db60a87174314b9025f37624aad3febb2920 SHA512 50c10760f58eff1400cec24ed8719540216985018da0150de858e4c41dbf48934294b2d743cdca902ac547db4c85e6bc5836f43a0be0666e16734a25710e0e86
+EBUILD pygal-2.4.0-r1.ebuild 1189 BLAKE2B 3d73e6d064663eafea04d38f94d00bcb966f09a1ca143637cfb6289f69f8bf921d9721921b08845bdb936adfc6142b9196b1730620f463a616cf38e25eae6789 SHA512 f004e6b6261122fb32c0aac74a1e215f184b810d0cdb1b5cb4e96cb05077a5f642de242f5fac25e1eb287c403780a9ad14a590e19923e6cd97ef6c617606b911
 MISC metadata.xml 432 BLAKE2B 935ce59a5a29aecbe4015fc52312fb03be02821a20863d20171378a68ced0aadfb43f7d1898fe52b8159cc0cd5a78ae0daedb97b730fd864de39abf3a617cd92 SHA512 1d2e68e4622a235b6df15390271b1f331b366a2ad1432740de81de20b494ccfc9e5f0e94f8b63acee67679e10267c0f21c66b58514e72f32d0fa3b5b262640d3
diff --git a/dev-python/pygal/pygal-2.4.0-r1.ebuild b/dev-python/pygal/pygal-2.4.0-r1.ebuild
index 314d9f5fee91..abafcd558675 100644
--- a/dev-python/pygal/pygal-2.4.0-r1.ebuild
+++ b/dev-python/pygal/pygal-2.4.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/pygal/pygal-2.4.0.ebuild b/dev-python/pygal/pygal-2.4.0.ebuild
deleted file mode 100644
index b50eb480cab9..000000000000
--- a/dev-python/pygal/pygal-2.4.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A python SVG charts generator"
-HOMEPAGE="https://github.com/Kozea/pygal/"
-# PyPI tarballs do not contain docs
-# https://github.com/Kozea/pygal/pull/428
-SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-# CHANGELOG is a symlink to docs/changelog.rst
-DOCS=( docs/changelog.rst README.md )
-
-python_prepare_all() {
-	sed -i "/sphinx.ext.intersphinx/d" docs/conf.py || die
-	# Not actually required unless we want to do setup.py test
-	# https://github.com/Kozea/pygal/issues/430
-	sed -i "s/'pytest-runner'\(,\)\?//" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}