gentoo resync : 18.11.2019

4 files changed, 54 insertions, 1 deletions

diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index dac2f1cfbdeb..086a4138cbaf 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,3 +1,6 @@
+AUX apipkg-1.5-pytest-4.patch 801 BLAKE2B 4fe40fb766f4e8654ef37f0796a88f74b81e2a1d237382f87745f33ac80e505c9e764f8b83d467c7f5051ce7eb3a80add369595556b5b6abf3e1a569d33cc071 SHA512 d50ecac0382e70124634a403c5010bc929f92f7a6768979497a5d2646626c6244f3c213f18989f71dda137bd4376f81d5d97a5f4979ff0e937046bffeef75b04
 DIST apipkg-1.4.tar.gz 11224 BLAKE2B b59e3fe39030f1f1f7f41e121d7a4e242d7155be5f7b2b8f3cd7550772acceacaf2d9540cf98bdb51e6d132af937d634bce3699b950b9d9aa9a618009cbaebb8 SHA512 118f806706944513f50d3cdef596b32f8ce585cfaf94d2531a6d260f90a0e2147177161aaa6f5d6823150e6182d0f73be3dc01259b8a2f8d710733a22ea54789
-EBUILD apipkg-1.4.ebuild 795 BLAKE2B 40f46d269dd2005e9d44f7d702e8616dc6d67935f8d68d8678b0e6ef3968ab8f75c8d2d38aad54d743d0b129c598af53a66cc597bdb6082bb3ed24b79c67ecae SHA512 798a53e974e22668dcfb7fad89921735ceb88c9b2aa9e1559032239d651aaa1e1c2fa6be49c0e8173298f5fbb5e48399ece358f5d913bd04fee987cc1af2627b
+DIST apipkg-1.5.tar.gz 11186 BLAKE2B f703a37b38b412228348520a9daa0276a69c3be47a9586e1c2797cf525a024bb0fda81dbfad7d4b1404e1ebcd3eec0e9ce2231beef5072bf9915240e2e5fb445 SHA512 828937ca5e203915248fac54db8e7c13f941e006403f2a415c27fa4d1aa114790be3d7b5dd892f528611e5e6dfe75114ee80f4f4589a03c3f789ae6ddfcae0bf
+EBUILD apipkg-1.4.ebuild 822 BLAKE2B 51edc31d7dbca921b9e6ca9cbb7ce197b5a033395dd09da343f55d40bde95302c79e32ba9b3df4b0207c89039dafaec037367defb8b59870d2b04baa844dd8f8 SHA512 ca325bcc5c89a6dfc5581a13f41ffcaa56085a04ee38197e6d8b4befbf2cb4e8514765f1f7c54b024c76bd6b9ad0be77f91c2e44d444a126515e7d76c3113c40
+EBUILD apipkg-1.5.ebuild 640 BLAKE2B 233ba393d3ca63100d915aeac24d28f96386096d6b5adcc1b36b8a88af7cfcc24cfca9ef33d7a52c2b5294b0d900cd3a0c83c851fb8c3e9cbf95b5690885e0f1 SHA512 f4ff6f66835d909d2950f5e9023381946410b9072b5effab7b7dd40d68de259372c212e76febea76801230a9946cf32be6c950a714d312bccbf96e2b9bfc8458
 MISC metadata.xml 309 BLAKE2B 693a9a5373548cbc3c78db6df12bd9dc7aad3bfd3665f702f65a18a1799dc089869d5577ff6d6dba67573393970d8b85c356387a53786376503d33f979bf6e52 SHA512 0f74900faac286382377f2233aaafc9a6e8d7b49c017f60c7c451728d67cb9b9505f57903901a56f67327364951e2e7ab7dae7c852ad70b16070ce48ff3f93cb
diff --git a/dev-python/apipkg/apipkg-1.4.ebuild b/dev-python/apipkg/apipkg-1.4.ebuild
index 291807feddca..e50d756e34d9 100644
--- a/dev-python/apipkg/apipkg-1.4.ebuild
+++ b/dev-python/apipkg/apipkg-1.4.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/hgdistver[${PYTHON_USEDEP}]
diff --git a/dev-python/apipkg/apipkg-1.5.ebuild b/dev-python/apipkg/apipkg-1.5.ebuild
new file mode 100644
index 000000000000..63525d9df7f6
--- /dev/null
+++ b/dev-python/apipkg/apipkg-1.5.ebuild
@@ -0,0 +1,24 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Namespace control and lazy-import mechanism"
+HOMEPAGE="https://pypi.org/project/apipkg/"
+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"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest-4.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch b/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch
new file mode 100644
index 000000000000..0053e7078e2b
--- /dev/null
+++ b/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch
@@ -0,0 +1,25 @@
+From 81dc0f46754afd44358b8c97ea832030436ac7cb Mon Sep 17 00:00:00 2001
+From: Andy Postnikov <apostnikov@gmail.com>
+Date: Sun, 27 Jan 2019 03:27:18 +0200
+Subject: [PATCH] testing/py-apipkg: fix tests
+
+https://github.com/pytest-dev/apipkg/issues/14
+---
+ testing/py-apipkg/14.patch | 11 +++++++++++
+ testing/py-apipkg/APKBUILD |  7 ++++---
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+ create mode 100644 testing/py-apipkg/14.patch
+
+[inner patch extracted for Gentoo use]
+
+--- a/test_apipkg.py
++++ b/test_apipkg.py
+@@ -13,7 +13,7 @@
+ class TestRealModule:
+ 
+     def setup_class(cls):
+-        cls.tmpdir = py.test.ensuretemp('test_apipkg')
++        cls.tmpdir = py.path.local('test_apipkg')
+         sys.path = [str(cls.tmpdir)] + sys.path
+         pkgdir = cls.tmpdir.ensure('realtest', dir=1)
+