gentoo resync : 17.05.2018

4 files changed, 2 insertions, 114 deletions

diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 7a30555e8bfd..0f334b058f5f 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,8 +1,4 @@
 AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a26b1b8fa795472622efea1afa6d5df717c10fbfbf106180d1f6d5f8822350d9605de41fc7db9e37a7b4c7b887df9 SHA512 c27c2dda320d2c16239eb498b2f59f85746745ce1875879a17f41235081983fd1015f0dfd182c6823b998f85aaf460486a3ac6d955be969487692ed50c5648aa
-DIST testpath-0.2.tar.gz 13732 BLAKE2B e7a20fdbef3dff25d8e2072167d4eb078832c7b55057dbd6fa5f38dbbc3a84304eeb817b9a5294fc4215df56563906da0288ef2c349f14c9afb72ac5561337b2 SHA512 cc211bdc8f31ff4c286324e37bbce7fd84e19447d9735f396ce67f7568dd1d133be732c1fd7a08928c94566279d0f293a0caeed6a58ae6cd3dc293035fe164ea
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
-DIST testpath-0.3.tar.gz 91250 BLAKE2B 88ea7ad9c67eef9aaa49e435a4d56d86b8c87818a416f3630f8d34aecd85f478aff778b1fc3c13f1ad0aafb524dc649393a73ebfb6f74dd3391548f36f1c2e4d SHA512 71a3266e17616c4df4a4c465151e9d48b89f573e4562132e85982b62446396884a270a32b5d4956aac1f0be1a00096cab9d0dc1718ae8b6312b0436eca683bdf
-EBUILD testpath-0.2.ebuild 1117 BLAKE2B 593c5549b9934d2206421a63dec23baf08f7d6ea84dc2c6f3d73a4e276566fc6be7fd7de2c45f1aadee2b0148c686f73474766f9de4ce525ffa72c277b5c2288 SHA512 e59d7221078325f902df0f5eebbbad473bd90c0498ab458d7f2ab46b8efeaf83fc873902548f96aed289bee34d3d7d8386fb52376a97db2119c12a2b44078f36
-EBUILD testpath-0.3.1.ebuild 1076 BLAKE2B b7e5136567ffba2082ed4e74adfa0ee786cae8b4987ba057204e7daab7a28454518e72af0b10ee647e8056351e2cabb7e770f674e6de2c1401d9eb6ee001cef9 SHA512 9b89f06e0827d8a8e929fb1900506edd89ad14ddd44a9770454b56e253525f954aef028645fe55623fca42fa7f04e60a766f515675643e61fbcfc4a8472309cc
-EBUILD testpath-0.3.ebuild 1131 BLAKE2B c98c7bc36473f006ddcd47d772e08b06f8fb4cc5ed916332f6d300dfc0d334bc850fb0f0773ce64e3e9ad5991e82eeaa7d81dd56c92a15ce6b30d50c068ea9d2 SHA512 da68e5eec7b29fa5846b1dff424e657b987aa0f39a3767f158431fb66bfd93e542fbe9211329285fc1d1f00c72e6936236c7b280b79d49dd7e8ae450deea5bc9
+EBUILD testpath-0.3.1.ebuild 1075 BLAKE2B fc8afc03f456abd955fbf17acf7a650b239207e94ab1248ad2096af281f8e106ee690ff25c8be070285b059a815840f8b012ff1d7b9f58eb7ae2033427ce671d SHA512 144e4f1425e5da5274f9c05b27586beab55721087f81c55ccad1b32a32ad2f0d7c773449315bb05dc366ac77409c3e4f5bfce7737b38b6a1b2485ffa8139d42b
 MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
diff --git a/dev-python/testpath/testpath-0.2.ebuild b/dev-python/testpath/testpath-0.2.ebuild
deleted file mode 100644
index 8200f6e2480a..000000000000
--- a/dev-python/testpath/testpath-0.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-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="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/python-pathlib[${PYTHON_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-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() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-	}
-
-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.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
index 742f7797c7fa..bcdf26e59fa0 100644
--- a/dev-python/testpath/testpath-0.3.1.ebuild
+++ b/dev-python/testpath/testpath-0.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/testpath/testpath-0.3.ebuild b/dev-python/testpath/testpath-0.3.ebuild
deleted file mode 100644
index efa5591fab24..000000000000
--- a/dev-python/testpath/testpath-0.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-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 ~arm64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/python-pathlib[${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() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-	}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
-	py.test || die
-}