gentoo resync : 25.08.2020

5 files changed, 2 insertions, 122 deletions

diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 0386e41a5706..06196e0effd2 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,7 +1,3 @@
-AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a26b1b8fa795472622efea1afa6d5df717c10fbfbf106180d1f6d5f8822350d9605de41fc7db9e37a7b4c7b887df9 SHA512 c27c2dda320d2c16239eb498b2f59f85746745ce1875879a17f41235081983fd1015f0dfd182c6823b998f85aaf460486a3ac6d955be969487692ed50c5648aa
-DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
-EBUILD testpath-0.3.1.ebuild 1110 BLAKE2B cf610a2cc0a3b6f03e04fa6d5f36333b7253f8ac23ef4b3956fcb5d47dfcd18a62c9fc0e9ca863b64b66b4eb91ce8f7e23c8ac8daa00756c5cb741285d5c0c34 SHA512 adc56e47ba88f4e4275540ca2aca4c674a6ad6e61a491b8e2e523f52cf6fb45e5a7d56a9a661255490dfc5ff95e5ac44969748f27327688b057f550f759ec515
-EBUILD testpath-0.4.4-r1.ebuild 711 BLAKE2B 7f2a9b92b81f48cf54b7f726fa46b1ad79cefa3072216d5039b7e9eef0baef9a308cd323203a96bc520e61a4c779cb7bf5255a95f240332fcae72c089ad412af SHA512 e3bfda4606161759224486ce93479293df9f80523be392447def9116504ac864d02aa9887d76e7860c8f4af8e30b0e49899d44b0ee103cef6ee40da7b130738f
-EBUILD testpath-0.4.4.ebuild 896 BLAKE2B ad48594448f494d44922e12414d24a5930f8592d7f3df4ea90d4b00ac9a9aeef9db3b05dcda811a08c59b3b9e0f3eaf84cda85dc7b4dee03f3e57ae6e0e184a2 SHA512 734740462be1834f515151d6558c203e1f0f63be2e2545ef11937f845b29ce312e6df239f679dd859973f80ae746c45d161295db04084ed1e72df033530c9475
+EBUILD testpath-0.4.4-r1.ebuild 713 BLAKE2B 2c081d018ce1ea566b99d0f174b1f71370c8175c4b3e2641504e55d41d15256cdeee3f491eb0fce067334be42d7c15f561c755dadd2ccfc0b5a3229f6c344d9b SHA512 006c51a27608acbb7a386b8b77d25b9bcf37e178470b1f24c41d14cceff60cf0721821ddd4f5f85f5a1abe5b3430aeed2adf8476126b8708961500204e9fd8d7
 MISC metadata.xml 720 BLAKE2B 93bbf7d182fd5b9bacaf1da0044d0e145c14708a33dfc25aea2dd4c711e89848e0f2165acb98afb4ee383c01f8ff8d04233815169331047c0b8d7eedf25a244a SHA512 f4efcf08f277225e352339bb48104fdb33326bbd43c8dfea6f77f57d51f48e4e2b0657099fde91ae5f12e0ad661d10a6ac480b6e7dfce38c8d161dc88c163916
diff --git a/dev-python/testpath/files/testpath-0.2-setup.py.patch b/dev-python/testpath/files/testpath-0.2-setup.py.patch
deleted file mode 100644
index a1bf41acd352..000000000000
--- a/dev-python/testpath/files/testpath-0.2-setup.py.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Patch to bring back setup.py from
-https://github.com/jupyter/testpath/blob/086bd1bd1ec7da1b3dacfed1705c0c99fae231b3/setup.py
---- /dev/null
-+++ b/setup.py
-@@ -0,0 +1,22 @@
-+from distutils.core import setup
-+
-+with open("README.rst", "r") as f:
-+    readme = f.read()
-+
-+setup(name='testpath',
-+      version='0.1',
-+      description='Test utilities for code working with files and commands',
-+      long_description = readme,
-+      author='Thomas Kluyver',
-+      author_email='thomas@kluyver.me.uk',
-+      url='https://github.com/takluyver/testpath',
-+      packages=['testpath'],
-+      classifiers=[
-+          'Intended Audience :: Developers',
-+          'License :: OSI Approved :: MIT License',
-+          'Programming Language :: Python',
-+          'Programming Language :: Python :: 2',
-+          'Programming Language :: Python :: 3',
-+          'Topic :: Software Development :: Testing',
-+      ]
-+)
-\ No newline at end of file
diff --git a/dev-python/testpath/testpath-0.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
deleted file mode 100644
index d7c94e75a1f1..000000000000
--- a/dev-python/testpath/testpath-0.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Test utilities for code working with files and commands"
-HOMEPAGE="http://jupyter.org"
-SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2-setup.py.patch )
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
-	py.test || die
-}
diff --git a/dev-python/testpath/testpath-0.4.4-r1.ebuild b/dev-python/testpath/testpath-0.4.4-r1.ebuild
index 55d67c8608fe..58fd14108670 100644
--- a/dev-python/testpath/testpath-0.4.4-r1.ebuild
+++ b/dev-python/testpath/testpath-0.4.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/testpath/testpath-0.4.4.ebuild b/dev-python/testpath/testpath-0.4.4.ebuild
deleted file mode 100644
index 694fa324bacb..000000000000
--- a/dev-python/testpath/testpath-0.4.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Test utilities for code working with files and commands"
-HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2-setup.py.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}