gentoo resync : 25.08.2020

4 files changed, 68 insertions, 5 deletions

diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index e99401ee5262..0a0bf036ac0c 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,4 +1,6 @@
 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
-EBUILD blockdiag-1.5.4.ebuild 1747 BLAKE2B 42e379958fa8e1f481d72b2153fa18be6679b9f55d4adb0c7dd5caf1dac630c8d96887e2b068711652dd31f36821efb42d43f4a819801f618787a5755cfd93c3 SHA512 fc8f593da23e13aa221d6390317f6f0e02a7b5a1cf543f4337e7b19d03fb1b64225f53a66e418db972c22a3e28ec011d0f0d9ecae763ddcee6a3674f57e4f49c
-MISC metadata.xml 752 BLAKE2B 25048231ba8066a856109d0c6e785430481522dbc610d00f4fc08e77c09912325beaff486e79b0b557a81db0ad8f89de256b775cbee12e1add2e4196b0f43b97 SHA512 8f6aacd0a990cffb868162f374ff541a3d24cff90ef4e2cf7bac5a0b0062a8c82577e5ff71fbfd8b09dbc4f21d200c37d239c100755605e4d66635b56b8a754a
+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 1679 BLAKE2B 4cae7b80498e67fe1710d71fddfbb4821aa3c53c89cdfc6fe2765c132b367fd73c1c003a4df823b7a19672a422b1a568b9ba77418522305a1f2d5655f48f460b SHA512 b7c6a838931d5d53b5351d09b3f5792fde701eb8604b4ac5ab5f9f8e7555cff49a28a9f3297dc2cf0832bb4e8eea760f237bbadc69f9ca83bb94c1cf681333c6
+MISC metadata.xml 749 BLAKE2B e61c5eeedb3b8fbdaf84f013ae7b59c9502385583fb24728810acb9bf1996ad6fa45a4719b1f34d59081ddebd331b161e43c1a6fc74c357ee138e646f20adc22 SHA512 f3733f81850b4e1c332207c31ffe1a371e021fc9628246dea2a74f45cb0aa2812afcbf7311279fe618071fd3da876da6d4343a057d7c939fe20bc15d052cca72
diff --git a/dev-python/blockdiag/blockdiag-1.5.4.ebuild b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
index 7be9f5a83637..c6b80ef607a0 100644
--- a/dev-python/blockdiag/blockdiag-1.5.4.ebuild
+++ b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
@@ -7,12 +7,12 @@ 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://bitbucket.org/blockdiag/blockdiag/"
+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 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
new file mode 100644
index 000000000000..a7cc79d4de7d
--- /dev/null
+++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+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 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.0.0[${PYTHON_USEDEP}]
+	dev-python/webcolors[${PYTHON_USEDEP}]
+"
+DEPEND="
+	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
+	)
+"
+
+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/metadata.xml b/dev-python/blockdiag/metadata.xml
index 15110b7787e2..41032d801029 100644
--- a/dev-python/blockdiag/metadata.xml
+++ b/dev-python/blockdiag/metadata.xml
@@ -11,7 +11,7 @@
 			<name>Takeshi Komiya</name>
 		</maintainer>
 		<remote-id type="pypi">blockdiag</remote-id>
-		<remote-id type="bitbucket">blockdiag/blockdiag</remote-id>
+		<remote-id type="github">blockdiag/blockdiag</remote-id>
 	</upstream>
 	<longdescription>blockdiag generate block-diagram image file from spec-text
 	file.  Additional functionality is available with dev-python/reportlab