gentoo resync : 14.07.2018

8 files changed, 334 insertions, 0 deletions

diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
new file mode 100644
index 000000000000..f6d55a8dbe3b
--- /dev/null
+++ b/dev-python/py/Manifest
@@ -0,0 +1,11 @@
+AUX py-1.4.34-skip-broken-pytest3.patch 3991 BLAKE2B 4bb850c5e89d3ddc88a70c055b0e909ef26d692f721138a756b9bac6c2714c26546a89b58615d419cce72f6e205d38679724cc2ca651eeca3d759d585ba96aa2 SHA512 c2070aef37a410a0a8f9cd273396a1820170578f19fe1a8aeaf355171a7c83717aa91fd7b4121d429169a3cb496de498763cdc347f7553b799040ebce6ac76f0
+AUX py-1.5.2-skip-apiwarn-pytest31.patch 517 BLAKE2B a086d8130c1ead322461e7d89249f07e2dd9a6eee4f7e878bd8c01cf19df695a6a5698ec0cc50770f0514cbedbd2aa88e3fc356a72c78eab4b6bc378b5d1f590 SHA512 01da1bb928fe3b22a69a439481a1ebdac790811da781b7ee497ffa1b7362270628527b33f2d5dc0e83ebc2e57cdaf9fbd2974735f580931222f33e543fd69762
+DIST py-1.4.30.tar.gz 191796 BLAKE2B 1d908f5f29788868cb7c4da49bc8a9343176030df4549a992e06245d1d56d74ddf0477048992d282aa59e6ace1ff695a7e2c2c6f00b55f185bc91d0df8b6a6dd SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a
+DIST py-1.4.34.tar.gz 194450 BLAKE2B 3e5733bb53d4f7eb8e6d43a5140f2ddf692d4272b564a9dd4fe8ede2cb4d0296e7c8764957bf4615f5cc4272d07997d126133dfce8ac8837f01d91bf557023d2 SHA512 2e19c82c8315274bffe0ba2c7e20ae3af95f942c40c16121ec953af186f8ff33e8f427c070e137bb04b7cc6dcc6779e35df3911c08595fd3294b5ec9897706e1
+DIST py-1.5.2.tar.gz 189542 BLAKE2B f0c5995121492ebca7bab9e73b7db61edf014be8e7d76822c72ded9ea19dd647dc0a83cbbcbf732c4ddae9070126cecb00958b623ca43d2219b7be8519b5b58e SHA512 ad92110d56caba2be44c6759350b05ceb882165ad0f58e6cce8361273be874b20b01856d685b142a83edff77b41bcce2911cf5797db5253b4f3e9b36e703c07d
+DIST py-1.5.3.tar.gz 202335 BLAKE2B 6a7ef206bddd641cb5e2fe04966ae93db96a7ff757fcde604f8fd2d36c4a03ce5955c2f445a866dd5cd83026ab2a9fa17feeb0da0df3d40d9746c19d865f6325 SHA512 243c0da94c439163257c525ef00b30fd6d8add5897121ee0b1f19476b50f18823ce2b99a5ab27a9cf47598b538758d0534060123dce0820d2a65d98046548c96
+EBUILD py-1.4.30.ebuild 1274 BLAKE2B d1caf17f0e92b002bc8626b9aef00a0b6e60c9172b664ddf182849d01208a10184a042cc02f0e7ca085a3b8cf2601a8aa15d1f0da8a530145f9699b9e179a1cf SHA512 50ff67c63fe685cc9a242ba246e25ce107da52722bb38a961c2fb1064cc3e63fad2ac3dcfe34cc9a55076cb9d2cb921aa62e746171505f99075588017bf67cb7
+EBUILD py-1.4.34.ebuild 1342 BLAKE2B a10c42e96d96e05c966e438d4c34d1ee1958e4f1480762b4046a56da6838a11787b6600198967adadafd0a88d1d7cf5d07b8d42a38741320ac074b9c4a3dbafa SHA512 2ec30f5f6b4db6abedd335511154dde8f57a3530628bf515e18c0e9f12e0de91cd2efab6a6a25065c4694e649c6551d38df00e7fa1f4f510952533bc6c6ad4ac
+EBUILD py-1.5.2.ebuild 1347 BLAKE2B 1ae248e72c3a599004712f0dc6f91553d5fd22b9d0e62f79459a2dd0ca557fd1aef853c7c3c56f10cfe5761e6d9d99bff9a00d4983e125f34f96cb7394311dff SHA512 be0354d8358ed8f05725c475426c9c94772e089d293c88c541b8403c754a9b8942b189b5b51836711a8ef235fab79e38103bb61b422fb4d000ee5f41f9c18df7
+EBUILD py-1.5.3.ebuild 1354 BLAKE2B fbf3245fe4ec16bbc37776c9ed1ee06f4ef445de70b11bd4a737d8315f3bbe9517ceff92b32411b8ae96d9c567793f06c96090273ebf4133d17fec280ba82cc1 SHA512 9fd4e23a5b168e1db088413a5aec53af46c02a9a87a5e17c6a8a19862fda8ebcfc4d13e66acf18267776fb5203fa5833aed2738851ff42a464b5c288e13587bd
+MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch b/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch
new file mode 100644
index 000000000000..67b1f4eb95ac
--- /dev/null
+++ b/dev-python/py/files/py-1.4.34-skip-broken-pytest3.patch
@@ -0,0 +1,116 @@
+Backport of https://github.com/pytest-dev/py/commit/3305183b964bded36f9cd43976d22524f6ae15b2
+
+--- a/testing/code/test_assertion.py
++++ b/testing/code/test_assertion.py
+@@ -141,7 +141,10 @@ def test_assert_implicit_multiline():
+         e = exvalue()

+         assert str(e).find('assert [1, 2, 3] !=') != -1

+ 

+-

++@py.test.mark.xfail(py.test.__version__[0] != "2",
++                    reason="broken on modern pytest",
++                    run=False
++)
+ def test_assert_with_brokenrepr_arg():

+     class BrokenRepr:

+         def __repr__(self): 0 / 0

+@@ -278,7 +281,10 @@ def test_assert_raise_alias(testdir):
+     ])

+ 

+ 

+-@pytest.mark.skipif("sys.version_info < (2,5)")

++@py.test.mark.xfail(py.test.__version__[0] != "2",
++                    reason="broken on modern pytest",
++                    run=False)
++@py.test.mark.skipif("sys.version_info < (2,5)")
+ def test_assert_raise_subclass():

+     class SomeEx(AssertionError):

+         def __init__(self, *args):

+--- a/testing/code/test_excinfo.py
++++ b/testing/code/test_excinfo.py
+@@ -16,6 +16,13 @@ else:
+ 

+ import pytest

+ pytest_version_info = tuple(map(int, pytest.__version__.split(".")[:3]))

++
++broken_on_modern_pytest = pytest.mark.xfail(
++    pytest_version_info[0] != 2,
++    reason="this test hasn't been fixed after moving py.code into pytest",
++    run=False
++    )
++
+ 

+ class TWMock:

+     def __init__(self):

+@@ -355,6 +362,7 @@ class TestFormattedExcinfo:
+         assert lines[0] == "|   def f(x):"

+         assert lines[1] == "        pass"

+ 

++    @broken_on_modern_pytest
+     def test_repr_source_excinfo(self):

+         """ check if indentation is right """

+         pr = FormattedExcinfo()

+@@ -657,6 +665,7 @@ raise ValueError()
+         assert p._makepath(__file__) == __file__

+         reprtb = p.repr_traceback(excinfo)

+ 

++    @broken_on_modern_pytest
+     def test_repr_excinfo_addouterr(self, importasmod):

+         mod = importasmod("""

+             def entry():

+@@ -699,6 +708,7 @@ raise ValueError()
+             assert reprtb.extraline == "!!! Recursion detected (same locals & position)"

+             assert str(reprtb)

+ 

++    @broken_on_modern_pytest
+     def test_tb_entry_AssertionError(self, importasmod):

+         # probably this test is a bit redundant

+         # as py/magic/testing/test_assertion.py

+@@ -742,6 +752,7 @@ raise ValueError()
+         x = py.builtin._totext(MyRepr())

+         assert x == py.builtin._totext("я", "utf-8")

+ 

++    @broken_on_modern_pytest
+     def test_toterminal_long(self, importasmod):

+         mod = importasmod("""

+             def g(x):

+@@ -768,6 +779,7 @@ raise ValueError()
+         assert tw.lines[9] == ""

+         assert tw.lines[10].endswith("mod.py:3: ValueError")

+ 

++    @broken_on_modern_pytest
+     def test_toterminal_long_missing_source(self, importasmod, tmpdir):

+         mod = importasmod("""

+             def g(x):

+@@ -793,6 +805,7 @@ raise ValueError()
+         assert tw.lines[7] == ""

+         assert tw.lines[8].endswith("mod.py:3: ValueError")

+ 

++    @broken_on_modern_pytest
+     def test_toterminal_long_incomplete_source(self, importasmod, tmpdir):

+         mod = importasmod("""

+             def g(x):

+@@ -818,6 +831,7 @@ raise ValueError()
+         assert tw.lines[7] == ""

+         assert tw.lines[8].endswith("mod.py:3: ValueError")

+ 

++    @broken_on_modern_pytest
+     def test_toterminal_long_filenames(self, importasmod):

+         mod = importasmod("""

+             def f():

+@@ -863,6 +877,7 @@ raise ValueError()
+         assert tw.stringio.getvalue()

+ 

+ 

++    @broken_on_modern_pytest
+     def test_native_style(self):

+         excinfo = self.excinfo_from_exec("""

+             assert 0

+@@ -877,6 +892,7 @@ raise ValueError()
+         if py.std.sys.version_info >= (2, 5):

+             assert s.count('assert 0') == 2

+ 

++    @broken_on_modern_pytest
+     def test_traceback_repr_style(self, importasmod):

+         mod = importasmod("""

+             def f():

diff --git a/dev-python/py/files/py-1.5.2-skip-apiwarn-pytest31.patch b/dev-python/py/files/py-1.5.2-skip-apiwarn-pytest31.patch
new file mode 100644
index 000000000000..36727df9366b
--- /dev/null
+++ b/dev-python/py/files/py-1.5.2-skip-apiwarn-pytest31.patch
@@ -0,0 +1,14 @@
+https://github.com/pytest-dev/py/issues/162
+
+--- a/testing/log/test_warning.py
++++ b/testing/log/test_warning.py
+@@ -8,8 +8,7 @@ import py
+ mypath = py.path.local(__file__).new(ext=".py")
+ 
+ 
+-win = sys.platform.startswith('win')
+-pytestmark = pytest.mark.skipif(win and LooseVersion(pytest.__version__) >= LooseVersion('3.1'),
++pytestmark = pytest.mark.skipif(LooseVersion(pytest.__version__) >= LooseVersion('3.1'),
+                                 reason='apiwarn is not compatible with pytest >= 3.1 (#162)')
+ 
+ 
diff --git a/dev-python/py/metadata.xml b/dev-python/py/metadata.xml
new file mode 100644
index 000000000000..b207ff96af21
--- /dev/null
+++ b/dev-python/py/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
new file mode 100644
index 000000000000..32df20dd8de1
--- /dev/null
+++ b/dev-python/py/py-1.4.30.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# 1 failure, test_comments, under both pypy only.
+	# Also appears the home repo has no issue tracker.
+	[[ "${EPYTHON}" == pypy ]] && return
+	py.test -v -v || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
new file mode 100644
index 000000000000..ab63400bdc09
--- /dev/null
+++ b/dev-python/py/py-1.4.34.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.34-skip-broken-pytest3.patch )
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# 1 failure, test_comments, under both pypy only.
+	# Also appears the home repo has no issue tracker.
+	[[ "${EPYTHON}" == pypy ]] && return
+	py.test -v -v || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py/py-1.5.2.ebuild b/dev-python/py/py-1.5.2.ebuild
new file mode 100644
index 000000000000..d35775cf94ec
--- /dev/null
+++ b/dev-python/py/py-1.5.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-skip-apiwarn-pytest31.patch )
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# 1 failure, test_comments, under both pypy only.
+	# Also appears the home repo has no issue tracker.
+	[[ "${EPYTHON}" == pypy ]] && return
+	py.test -v -v || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py/py-1.5.3.ebuild b/dev-python/py/py-1.5.3.ebuild
new file mode 100644
index 000000000000..fe04a533a82b
--- /dev/null
+++ b/dev-python/py/py-1.5.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch )
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# 1 failure, test_comments, under both pypy only.
+	# Also appears the home repo has no issue tracker.
+	[[ "${EPYTHON}" == pypy ]] && return
+	py.test -v -v || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}