gentoo resync : 15.12.2019

4 files changed, 42 insertions, 3 deletions

diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 84c9ba2a27cb..9efddc497a31 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,4 +1,5 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r1.ebuild 782 BLAKE2B 4896a269b4936b9505f6238df9ed9ea0e171fec11fb97067ac197bbaf158583f58e063594982e6c572c8b4adeba6b48a48d0b852620cdf2c1bf83bf5f07cf7e0 SHA512 4b4db64938eb874a6e5b1cee6fea004a97bf163caa0e20e68fa793c1e0fc06c636812bc81f7f729781b545802211c5f36683a8953422e9ae6f2fdb213689bb8d
-EBUILD fields-5.0.0.ebuild 773 BLAKE2B ba34665c8b027e9982dea8657453abafb2bee82ac5fd29731dadcd7cf345370ceca8d1c01b0432b72643af72feec2eec44419a1a50e7ec834d5d4eb332572172 SHA512 618d225cd8fbddf611b7dba3aa948a8103e7b803603eb342f81b412e5588db862d96e109a0c645fe2234294c9e09a68c782d5b160090f76d55642e51d314b891
+EBUILD fields-5.0.0-r1.ebuild 809 BLAKE2B c8e10cae833624cf09ba3adcc3e64700bba3472ecedd5b7e180de23b618dbb3bf741cd0cfa3acebfcea75f72ccf59d80ef56a7ebe27a40722f3177ccf07039aa SHA512 b0fc0b5873641661f2fc3e910f5137ac04932169f2a57f56ea6d1dc546dcfa86880db806963c978fe2fc7eacd1be2fb109c01a1ea3d09d1befc601a69028592c
+EBUILD fields-5.0.0-r2.ebuild 848 BLAKE2B d4fbf39defc3e23ce19a76d4abe509b22c6bffe8545df08fbd8b49dea9b5ad8856bd04362ae9d0b0b3dd812f02b5eba4562353aa32f276de0e65bea2ea263f99 SHA512 920d97525398acc40564f677860c90fa79b66147dc0bbe30dff7d3ba2f2b8dc529ef570d69b8d1c0d5e58cb23b941b100bd3044ccbc0f061b1bf59522023da99
+EBUILD fields-5.0.0.ebuild 801 BLAKE2B 4616ff6c3d331046a611108daa12b0622cbf5e28317c9e44db92e4659f1fbc9a4ded6eb80f4d023357d6a27e79e75927a8103287209610a9f7e8db8e926967a2 SHA512 a9dce28b6ae76b6fef7e4f285cdb1da15d0dc192213c4d70ec5cdea0e276b4d201c6215b62a5afc87f39e840f095eae77f3ebb344281c39d6fe32f60a73b1665
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0-r1.ebuild b/dev-python/fields/fields-5.0.0-r1.ebuild
index ed7f92bab9fc..923609a8116c 100644
--- a/dev-python/fields/fields-5.0.0-r1.ebuild
+++ b/dev-python/fields/fields-5.0.0-r1.ebuild
@@ -12,13 +12,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/characteristic[${PYTHON_USEDEP}] )"
 
+RESTRICT="!test? ( test )"
+
 python_prepare_all() {
 	sed -i -e "/--benchmark-disable/d" setup.cfg || die
 	rm -rf tests/test_perf.py || die
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
new file mode 100644
index 000000000000..80962dea5553
--- /dev/null
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="Container class boilerplate killer"
+HOMEPAGE="https://github.com/ionelmc/python-fields"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		dev-python/attrs[${PYTHON_USEDEP}]
+		dev-python/characteristic[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r \
+		-e "/--benchmark-disable/d" \
+		-e 's|\[pytest\]|\[tool:pytest\]|' \
+		-e '/^[[:space:]]*--doctest-modules[[:space:]]*$/ d' \
+		-i setup.cfg || die
+
+	rm -rf tests/test_perf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/fields/fields-5.0.0.ebuild b/dev-python/fields/fields-5.0.0.ebuild
index 7dd567ad9dc8..d38f9e90618e 100644
--- a/dev-python/fields/fields-5.0.0.ebuild
+++ b/dev-python/fields/fields-5.0.0.ebuild
@@ -19,6 +19,8 @@ DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/characteristic[${PYTHON_USEDEP}] )"
 
+RESTRICT="!test? ( test )"
+
 python_prepare_all() {
 	sed -i -e "/--benchmark-disable/d" setup.cfg || die
 	rm -rf tests/test_perf.py || die