gentoo resync : 15.12.2019

6 files changed, 100 insertions, 3 deletions

diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 9a16942af9cb..524bded2f452 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,7 +1,10 @@
+AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
 DIST Automat-0.5.0.tar.gz 32599 BLAKE2B 951da8840c2334fe3cd86804b39beedaad0d344d66742e8bb72e2d2ace2029b037acac8ffccc5643fd37f81020a567374a25ed42f7bc386770a30956464f52eb SHA512 7b4fc64e1b3cc514e3513c4be7387309a9e0c6d59ef091131404642b517a324b4a0eb677bee99da038664bd6713f2d2078c621f056e98b35966caf324741eeeb
 DIST Automat-0.6.0.tar.gz 31767 BLAKE2B 28baa9d6cc7497f9c0a4b7f4050b197d3dff871b91f5f3e29bdc47ace443af8de0fbeacf1657dc6565b3ab824365362a42204d6d89a8dfc82eaa6cd92d4e2308 SHA512 94f2fa06b0e0e1c0538bcf4bd9046ea40600a018bdd1da2d5bed479877807ad56e448c4f1d7ec87341f80013ae6c35b01201cbe3c4ecae1105419038ed43024d
 DIST Automat-0.7.0.tar.gz 61461 BLAKE2B dd09ce090c7333ee17b701bde2c78e01dacf40cefee847061a2019bb27f0982091e7628737211421ada351937caf9c6734cb445ee6462ce84b381030b013bd05 SHA512 a6f307d312a3ceb721071b5212297c73d2306894b5fafd39265578041a2859bd6f041ac43a654bdda4175a70a4e90e0db1ee35cd43fa620cd5c594b5d1988a74
-EBUILD automat-0.5.0.ebuild 1218 BLAKE2B 403ff7532bd738941a3d2db4daca9a7f256ebe9d095a0d914a4d9e4f802caa5bb36a41085bd651ef19176430a130132d5a7d0c4f72cbba9239e364765064001d SHA512 50194fa033d7641619a51efa9c8d12710586f3758f329eff03d4ab7679cc7923f227355f7bc89dfe098ad5518bb10cb6d5a5ad9f35f53d406874c7bbbc254bf3
-EBUILD automat-0.6.0.ebuild 1224 BLAKE2B b8db90ca8057423eea77b880772ee1fcaf53cddbd3212eaa613a718aba37556ac5d2c329782e405def7cfbf5368e9bb000a4297af79fcf8895f965767a089f34 SHA512 8c156565002477f20c864bc185e5e4d8f8213d234f97f591a3ca2402eb2efd76b368f83106a04792445cf0186a592d4ca5ada68e047d5147e4ad181bf08512ed
-EBUILD automat-0.7.0.ebuild 1457 BLAKE2B 546195bfd40cbb607d47ba9d9132aa39baf2f8fd358d3ca2ec31bf9d6dd1ef53ba155df56bed20ee017ed45ba19b2a3408a956f9e8b8ae4e6c128a04b91151ec SHA512 46808b8dcfa01ada1391a938f0c4c3544afe2c2e81c647ae7dfe16c5bdd5c08eb177c9cab7a5fba2723f3241aca2d8085e7d98ece9385014142b4103267ca3c7
+DIST Automat-0.8.0.tar.gz 59687 BLAKE2B 56e4ec76564d321ca9a709c484077a4003eea2842160e226728aaaa4ec6ebc2486482f79cd919bef7bbec8baeee7a34ca2a11d48665bb36c79c5a45a3c97e992 SHA512 2dbd4e784f65b02a8c93fc5f15236df3649d667a9792f6cac929dbac5d971495bdab4825df0fcd6817b9a9f79b7a5d8cfbdf8e4d18605f0761546b31b3091ad7
+EBUILD automat-0.5.0.ebuild 1245 BLAKE2B 01b3b438368c5bfc7086976edd42af19881a2d1b04e1b370abc6c15e2b8673a4291b98e77dc01214215d09840eb67d04a0c60a7dce57800eba21aa089748de42 SHA512 9d01ad553de7702dba31f661e15e11504e6161c869cb091bc501a64baa5467600c34732650b3e86e95a46b510bfe16cb70a4ff4c272b64bda0eef1b99acdfba2
+EBUILD automat-0.6.0.ebuild 1251 BLAKE2B a2bc3fad13fa8f48da21627545352af7277abd169ad94088e79366c37c2a42dd6cefc9cd5658cc20447780a9b8138f337bd8c8c2927a99bbc59fde4f462797d0 SHA512 60252491e369204c3821694ffe432f6233a7ecdea86175869d4aa6ba3a27c5086faf8fa9837a6aefd7d262be0f4f16270b8d92a982ae93be69193b8f5b6e7061
+EBUILD automat-0.7.0.ebuild 1484 BLAKE2B c8785ffd5a35d726f4675831cc345ace1d355b9ccde3e6220577dbafacbf828083a10e2c2a8465ebcb56de63a044a7669a230edcd3921171da26f0e62b252853 SHA512 04d0d12ef7669e83bac1d042893f5e921775d262d36c880251b79676333ae9842e45f7e85127386b4e16892e7375fb46f6c95f9d4c54d0b4f4bcb9b7349f0a02
+EBUILD automat-0.8.0.ebuild 1531 BLAKE2B a6d8bb1c1dd714a2919de88f8d6d9d4971e20b54e8a81a91bea0aeea0b12af74dd78824cde83b26958fc03c6a6d2c6851e72f02d03327fd707391cd256b4c145 SHA512 4f72cdf8db42d91005b2587e4ff0b68ecab202020a151cb3f8216a0cb817b13bace5e1576dc65f9a44e5fe590d8e5b7da0c378451d50b9c08a2769deb4ecb9bf
 MISC metadata.xml 572 BLAKE2B 26d7ccc6325a7ff3f051d90ffd36a50485575cd78a2bb35e2f471b2ae5c0f2a579269633db2fa98be1682b5a53271acfd97f079d8c040e30188dd07ef886d509 SHA512 6514fa4351ceffc03f98fbafff044548b350b69d78b0926e598e230fbf6ba52e8a2e0346e89b14d8c4fee914d0a846e457bebe62354ea10186dcd24c1daef590
diff --git a/dev-python/automat/automat-0.5.0.ebuild b/dev-python/automat/automat-0.5.0.ebuild
index 9e182474ba9d..5729d9769dd7 100644
--- a/dev-python/automat/automat-0.5.0.ebuild
+++ b/dev-python/automat/automat-0.5.0.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild
index 23a4da47ad1f..c1d2b9abb655 100644
--- a/dev-python/automat/automat-0.6.0.ebuild
+++ b/dev-python/automat/automat-0.6.0.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/automat/automat-0.7.0.ebuild b/dev-python/automat/automat-0.7.0.ebuild
index 686a9fe6dff0..3abfc8453262 100644
--- a/dev-python/automat/automat-0.7.0.ebuild
+++ b/dev-python/automat/automat-0.7.0.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/automat/automat-0.8.0.ebuild b/dev-python/automat/automat-0.8.0.ebuild
new file mode 100644
index 000000000000..97cd84600b35
--- /dev/null
+++ b/dev-python/automat/automat-0.8.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="A${PN:1}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Self-service finite-state machines for the programmer on the go"
+HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	dev-python/m2r[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/automat-0.8.0-no-setup-py-m2r-import.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	if use test ; then
+		# Remove since this is upstream benchmarking tests
+		rm -r benchmark || die "FAILED to remove benchmark tests"
+	fi
+
+	# avoid a setuptools_scm dependency
+	sed -r -i "s:use_scm_version=True:version='${PV}': ;
+		s:[\"']setuptools[_-]scm[\"'](,|)::" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc docs/examples/*.py
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo "For additional visualization functionality install these optional dependencies"
+	einfo "    >=dev-python/twisted-16.1.1"
+	einfo "    media-gfx/graphviz[python]"
+}
diff --git a/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch b/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch
new file mode 100644
index 000000000000..161b219626da
--- /dev/null
+++ b/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch
@@ -0,0 +1,27 @@
+diff --git a/setup.py b/setup.py
+index d0dec04..7a85a6e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -4,14 +4,6 @@ Setup file for automat
+ 
+ from setuptools import setup, find_packages
+ 
+-try:
+-    from m2r import parse_from_file
+-    long_description = parse_from_file('README.md')
+-except(IOError, ImportError):
+-    print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n")
+-    import io
+-    long_description = io.open('README.md', encoding="utf-8").read()
+-
+ setup(
+     name='Automat',
+     use_scm_version=True,
+@@ -19,7 +11,6 @@ setup(
+     description="""
+     Self-service finite-state machines for the programmer on the go.
+     """.strip(),
+-    long_description=long_description,
+     packages=find_packages(exclude=[]),
+     package_dir={'automat': 'automat'},
+     setup_requires=[