gentoo resync : 15.12.2019

4 files changed, 40 insertions, 2 deletions

diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 1e340eadbfb8..b30d25ac2a5b 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,4 +1,6 @@
 DIST portend-2.2.tar.gz 7974 BLAKE2B 77ffcf02b65f276a5ca1f1bdd76afd54e8f6afcb1c55b6948862017f973772dfe65c9b934ffbc98d2f36f799131d23d4a7128f46e46183010def8936f2dd0bad SHA512 1782132b0dec5b678892190b70ab795b1748dfa17e257b6655fc803f0cf19652725778cd329c3609353f969959501dd11fd2b9726cfcdf2c58689e2ce280c146
-EBUILD portend-2.2-r1.ebuild 721 BLAKE2B cd6671fe149be4eb4a40c7ab7c5e23c33ef24b8ba51b844be0bf4b51716e28a2f775baf2cf0e1b8657b8de4dc982bf900f392ead0f247f86347878829845256b SHA512 f5922f273474b3ec6c7aab969b155b7d89b0944ac640e2b288145f68784ecf222abf6be74850fbac5a4ccbe5eda3040da1c779c06e7a6b6dc9792769b8d3c262
-EBUILD portend-2.2.ebuild 716 BLAKE2B 1987b84cfbf3d01630b8e3d545273863b5d38f481bbe9872d3211a9c69a25afa67e06f070bc665033871496544145163edf74544ac123b687e8fab52ed52670c SHA512 2a7d43ef538a718e69f480e5f9cb4793a3157b416eb4d5aa97bc41b993f70d40fe8fd57518ddc9a423f4d9fabf7323d02d892ce304b3fe1e57fc08cd7f843bb6
+DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
+EBUILD portend-2.2-r1.ebuild 748 BLAKE2B 75b915d42195297b7a8730700847fdefc084331e871b5061aa4a7bb8afb9e770b121411f32731d0ce447f503b28a3424c8c4d1d704cb9c6671a72609c2277bd8 SHA512 52c09486808b7acfb53112468c674e96b8317da4b1fb18631c97e22771c68be7c5087107aa08ebf3d29cec0321fd695dc5b78aacb9cc90ce22eb2e009da480a2
+EBUILD portend-2.2.ebuild 743 BLAKE2B 9d8a7a2e4dc83e98b3b35add157b18f367a56b05a3117a94296e56178f23649058835edd1a5a67098355b20a7c75d32ab0a594c6c26b49f6cc38bb7f5e19f63d SHA512 b4584bdbc7dbe807c103f82297c5a66def56b4d76cb7158ac59275615d71723d02fa527a01d3232d4d667b4de9f02f213deaf2026189f6685e49bf0d28c8ebad
+EBUILD portend-2.6.ebuild 982 BLAKE2B 300aefc5395a2fb778ef52f010e980e1038ccb255e4d138930da6f83852db66a5f5f22017c1def9cefa0911afdee5e9e29f9582f4a24d62a82499f15e2335c4a SHA512 aec0e3b60556e19a03d19ece52e26976314c54f5e04ed9be459c663e5f9c168081a501b84117959c3708e5581826bf2533e4058fb644aa32dc943ecbee521bc0
 MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
diff --git a/dev-python/portend/portend-2.2-r1.ebuild b/dev-python/portend/portend-2.2-r1.ebuild
index 4a54a6290b9e..a54e188f38b2 100644
--- a/dev-python/portend/portend-2.2-r1.ebuild
+++ b/dev-python/portend/portend-2.2-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/portend/portend-2.2.ebuild b/dev-python/portend/portend-2.2.ebuild
index a5114afeb343..497ec4b43b99 100644
--- a/dev-python/portend/portend-2.2.ebuild
+++ b/dev-python/portend/portend-2.2.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
new file mode 100644
index 000000000000..62fb040f65a3
--- /dev/null
+++ b/dev-python/portend/portend-2.6.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=( python{2_7,3_{5,6,7,8}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="TCP port monitoring utilities"
+HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# avoid a setuptools_scm dependency
+	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
+	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
+		setup.cfg || die
+
+	# avoid extra test deps
+	sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}