gentoo resync : 30.06.2018

4 files changed, 62 insertions, 51 deletions

diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index f3a4887c8ba9..ef37016e1ac7 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,5 +1,5 @@
-DIST jaraco.text-1.7.tar.gz 7020 BLAKE2B 33b17223cfcbc07c096803c7be698458d72f869399161476b718904cf4ceafe1178bbf8cd71cd8c229efafcc234fbdaa751c9ef72f01cd4ab6c4333c91c1c340 SHA512 b1418dc19b52e353da3b2a332ffbc9a4201c6696ecc962722e25fd6549c8748a9dbea2cf76f658111aa4e3fd411ee999b526fa4d8148259866dbe95ebc4cfa95
+DIST jaraco.text-1.10.1.tar.gz 8790 BLAKE2B 268c13a9a84c4b29ac9141d8a43c716d8248b87c2b71f6bb8a34c2cf1568acdd012e84b1be0469f70ee8e102f723e218b6d551a9bd0cab5192a28d712ed39f03 SHA512 5c09b90f586d5ddf7419013f7e36814598337c257e6bd1c1eec993d7df021440798ec9300a6d45c960c5458c4197b458d1863f478b60a9a003241e98a644f28e
 DIST jaraco.text-1.8.tar.gz 7364 BLAKE2B 60e3ce561ca5c6dca3093a51f8397e925279882ee5b1c02e5359b518f2344481f3d86a927fbd1c7fc903e3207c46cd052a6efbcfac693debce721884188ab87a SHA512 7f13eee9553d7531bf2f51af1b1c7fbb9d778cf082e6eb49948fc0943b7eb5a0268ec51b363ae9e96df854e0af5e38fbc4a679c746160e422759c044d4a33654
-EBUILD jaraco-text-1.7.ebuild 1156 BLAKE2B 1e8fb3ad74770ace56b40730674e60051e06d5ed27e791d22ac6815380932e4a6370fce5d569db2a783a5967c704c063c292565f9af218ec70b7a1b1f06d5c82 SHA512 3222d565c1422777e386475e7ad9a5d38c667f65cfbe40692d584e49acc90332465c7f3649a26180124030c1d814ed1816438a7a138c1e803ac8c2fd6e8106ce
+EBUILD jaraco-text-1.10.1.ebuild 1376 BLAKE2B 772f40965e0d9938e817d8926bca03467a53ae796c826cebd6a3e6c97a2761d321ebb5d86350dfc03411209f7e7719a4872d2b07be16d159b16df04f5ca5c837 SHA512 2216f9f1537b6a8ec4521b5133dcc91baa2df8a1b8eb35035b5e6d181e284a44241c0b507c8ea684f977df8d2aac04ff950b11e61561a53ed500202597863044
 EBUILD jaraco-text-1.8.ebuild 1154 BLAKE2B 671c07286fe601c381e75d0dbbe9b88abd9b1f0725b07131a007486c98e16593022628d3dd7023a9d028b3736a5532bd48e53ec7b2a507cac7d4f2cfd0c6668c SHA512 401b49fd1c77829f2a8f6e3173912948b6e44a3e7f4544bb6ade500d6c7b0ccef23b350a4161069c994313804777210053240b898e907d944d34c6aa750c6498
-MISC metadata.xml 443 BLAKE2B c84e839a11d32ab96ce3816919e659ffaa0ba76bfd427845df98e29690448baea81c10d347a4d3414e8a93c32ff88df526f4c3787b230066a88d81849f997304 SHA512 13598895acd5584875853441694b094fe85e25c72820d27fa9a97bcbd4f95b671febead27286d94da0ffffd42ce450ac696ed9152a73dfb8fcf7211633691b46
+MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
diff --git a/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild b/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild
new file mode 100644
index 000000000000..db6f55ce4a50
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${PDEPEND}
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jaraco-text/jaraco-text-1.7.ebuild b/dev-python/jaraco-text/jaraco-text-1.7.ebuild
deleted file mode 100644
index 2c1db8dfdd7e..000000000000
--- a/dev-python/jaraco-text/jaraco-text-1.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Text utilities used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.text"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jaraco-functools[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-text/metadata.xml b/dev-python/jaraco-text/metadata.xml
index b584b408c0e2..97eb016b7480 100644
--- a/dev-python/jaraco-text/metadata.xml
+++ b/dev-python/jaraco-text/metadata.xml
@@ -9,5 +9,6 @@
 		<remote-id type="pypi">jaraco.text</remote-id>
 		<remote-id type="github">jaraco/jaraco.text</remote-id>
 		<bugs-to>https://github.com/jaraco/jaraco.text/issues</bugs-to>
+		<changelog>https://github.com/jaraco/jaraco.text/blob/master/CHANGES.rst</changelog>
 	</upstream>
 </pkgmetadata>