gentoo resync : 24.02.2018

4 files changed, 66 insertions, 3 deletions

diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 058085ed3776..3dab054f7f8a 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,5 +1,8 @@
+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
 EBUILD py-1.4.30.ebuild 1267 BLAKE2B 0bf04f6cb87a246da8bb59f350879ca0b8e7c260d1afeaa397ec279c0988e2dadf7e3dc9a723229631fe0589003ff0d55d23977dd845341cb7d4808102abdce4 SHA512 0eb97c51441aaa91215adda3cfb127518b4b784d785447e9568a9b6bbc880c9693ec6fe0e370840f56a157eb10102ef7eef1169a302a2f9a4672568ac9d3ca0e
-EBUILD py-1.4.34.ebuild 1275 BLAKE2B 3631338dab456c8a6cdb7974cc519b20347c861695581216b2b5b26dc69dbc24ea41cbba8047735ac4b65dad56afc118545b821c940ad3c3b13e94f61fbaec4c SHA512 d8baf73703766c1726b4c0e754d90d0df6703258eaa28cb5d1d17800ebfcd026c73150e8c71a527edf6683d20b740e47ee4159192485fca2194aecb5498217b6
+EBUILD py-1.4.34.ebuild 1287 BLAKE2B 8e6243ba9ae48f35fa5b5e0f96d1dfbb0ac5cc223a060e7da457045921b32fed7e8c4c6c3f484675ffc18985b5748404ab31dbdf030d5bef5a410e78a3ccb9ef SHA512 032d6143d990113b98b76147936fa702f7fb297a046bb74deff8b7c925969166d708bec3fc401d435f06b11f0af39d0c7020a88b3039165af9f3b454bd55490a
+EBUILD py-1.5.2.ebuild 1340 BLAKE2B 5da0b9d30caf08fba7428c3d0b46a777d5e3c7102cfa56498aa0b07340cbf64cc1dc61b8eb2642a1b4afbd6cf2e74808b2eaf83e0fc3440c28566707dbfa2746 SHA512 1fe600e0c84b50313b6b6422f630a2fb122d51aca8f1fa0862142dd291b4a0c969a84955a702ef89d3c437721f5987e85e00973adfea74a58898d5a43617551b
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
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/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
index 69b9e77d840e..e1e287c94818 100644
--- a/dev-python/py/py-1.4.34.ebuild
+++ b/dev-python/py/py-1.4.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ 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"
+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 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND=""
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..3c27d6bfde9d
--- /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="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/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
+}