gentoo resync : 25.11.2020

4 files changed, 2 insertions, 78 deletions

diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index a6d1689e9ef1..888dfc0e85fe 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,6 +1,3 @@
-AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbdcea1ce3785adc0c6ad2b198f4157336ee2f823f95023c0eae9724cb695fdf8576f754430baff5bfa2a77099649991f72ccde9 SHA512 08273d2d3ed14a88082ca1c21b9eed73bd7e878473509d2d00eff89f0be1b15441e9d60123f41f29afc7752d10a357a9457100ac2cc0f8f9daaaf76bdd24f659
-DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
 DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
-EBUILD blockdiag-1.5.4.ebuild 1750 BLAKE2B ece073452af02fe443aeac91de5684691fd0f7cb61a59d3ffb115e68c9a4c450c652ba9ab6d0decef9bc37d44ccb4e723ecfe9702eff91a975d7e2758debd854 SHA512 14d788ec56261ac0ee8d7c9c64bdc3e57ca04e5ae1c17c114ee239846cd0e1e0fb8b1f071587207968abb4f4d34f67a7ca481c2f2d6cb5bcf8faeae211744fcc
-EBUILD blockdiag-2.0.1.ebuild 1702 BLAKE2B 55b2a2251fc83b0d549b6e95e6d8db6010c6f124a264df1828b5414bd820f4e2fd73ce81d6567b9982545e83c4328c4093246847cb6e583f955837ffa5a6da12 SHA512 943c8b3a7db67b780db10992e30aa925639de9408cfe471f5d6a6b8d2a95802f127bd7feb0b3c556a2c74c4908652782a9f21385dd0b2edc1502e658682810bf
+EBUILD blockdiag-2.0.1.ebuild 1712 BLAKE2B dff8084e5e82cdaf0498d1661e50f508ee3d4409783561cc9d53b72c117d7dce0e12b4e9b7e03e0f67c9deec93ca07684f60555c559b254be5df452f79498943 SHA512 19343b002b011b9a93ebee3cd66a7c2495d367eb6cf8bb3935779ff63d84fcab3d4141eabfbfff3781765af7fa946de225d5d4978daf3ed6d9d467cf4c642151
 MISC metadata.xml 773 BLAKE2B 898f9291909c30bee45f6b25bfd9c2746d536eb9a238535cd7b7770565f64a6a91590fcf51f52fbc6a77cd4604014c3c9a8c66667b04359f7a686a284b8aaf41 SHA512 2d7ca8b92d199ed60f2035868175afb50a01e634da31cdbf0b6d583ca75c8362d186a613edcad83f42172c5abbf42063316116b62a4e6a7513493a734f51309d
diff --git a/dev-python/blockdiag/blockdiag-1.5.4.ebuild b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
deleted file mode 100644
index c6b80ef607a0..000000000000
--- a/dev-python/blockdiag/blockdiag-1.5.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generate block-diagram image from text"
-HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://github.com/blockdiag/blockdiag/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
-	>=dev-python/pillow-2.2.1[${PYTHON_USEDEP}]
-	dev-python/webcolors[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/reportlab[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		media-fonts/ja-ipafonts
-	)
-"
-
-PATCHES=( "${FILESDIR}/blockdiag-1.5.3-py2_7-test-fix.patch")
-python_prepare_all() {
-	sed -i -e /build-base/d setup.cfg || die
-	# unnecessary dep
-	sed -i -e '/pep8/d' setup.py || die
-	# disable tests requiring Internet access
-	sed -i -e 's:test_app_cleans_up_images:_&:' \
-		src/blockdiag/tests/test_command.py || die
-	sed -i -e 's:ghostscript_not_found_test:_&:' \
-		src/blockdiag/tests/test_generate_diagram.py || die
-	rm src/blockdiag/tests/diagrams/node_icon.diag || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	einfo "For additional functionality, install the following optional packages:"
-	einfo "    dev-python/reportlab for pdf format"
-	einfo "    media-gfx/imagemagick"
-	einfo "    wand: https://pypi.org/project/Wand"
-	einfo "          Ctypes-based simple MagickWand API binding for Python"
-}
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index 5aff478f9656..4620470514df 100644
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch b/dev-python/blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch
deleted file mode 100644
index e9ccfc82b9a0..000000000000
--- a/dev-python/blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 07f96892bfda src/blockdiag/tests/test_utils_fontmap.py
---- a/src/blockdiag/tests/test_utils_fontmap.py	Sat Aug 22 13:38:35 2015 +0900
-+++ b/src/blockdiag/tests/test_utils_fontmap.py	Mon Apr 10 05:56:48 2017 -0700
-@@ -223,7 +223,7 @@
-         _config = u("[fontmap]\nsansserif: %s\nsansserif: %s\n") % \
-                   (self.fontpath[0], self.fontpath[1])
-         config = StringIO(_config)
--        if sys.version_info[0] == 2:
-+        if sys.version_info < (2, 7):
-             fmap = FontMap(config)
- 
-             font1 = fmap.find()